googleapis · olavloite · May 29, 2019 · Apr 6, 2019 · Apr 12, 2019 · Apr 13, 2019
diff --git a/...ents/google-cloud-spanner/src/main/java/com/google/cloud/spanner/AbstractReadContext.java b/...ents/google-cloud-spanner/src/main/java/com/google/cloud/spanner/AbstractReadContext.java
@@ -43,7 +43,6 @@
 import io.opencensus.trace.Span;
 import io.opencensus.trace.Tracing;
 import java.util.Map;
-import java.util.concurrent.Callable;
 import java.util.concurrent.atomic.AtomicLong;
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.GuardedBy;
@@ -226,14 +225,7 @@ void initTransaction() {
                   .setSession(session.getName())
                   .setOptions(options)
                   .build();
-          Transaction transaction =
-              SpannerImpl.runWithRetries(
-                  new Callable<Transaction>() {
-                    @Override
-                    public Transaction call() throws Exception {
-                      return rpc.beginTransaction(request, session.getOptions());
-                    }
-                  });
+          Transaction transaction = rpc.beginTransaction(request, session.getOptions());
           if (!transaction.hasReadTimestamp()) {
             throw SpannerExceptionFactory.newSpannerException(
                 ErrorCode.INTERNAL, "Missing expected transaction.read_timestamp metadata field");

diff --git a/...-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/BatchClientImpl.java b/...-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/BatchClientImpl.java
@@ -32,7 +32,6 @@
 import com.google.spanner.v1.TransactionSelector;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.Callable;
 
 /** Default implementation for Batch Client interface. */
 public class BatchClientImpl implements BatchClient {
@@ -135,14 +134,7 @@ public List<Partition> partitionReadUsingIndex(
       builder.setPartitionOptions(pbuilder.build());
 
       final PartitionReadRequest request = builder.build();
-      PartitionResponse response =
-          SpannerImpl.runWithRetries(
-              new Callable<PartitionResponse>() {
-                @Override
-                public PartitionResponse call() throws Exception {
-                  return rpc.partitionRead(request, options);
-                }
-              });
+      PartitionResponse response = rpc.partitionRead(request, options);
       ImmutableList.Builder<Partition> partitions = ImmutableList.builder();
       for (com.google.spanner.v1.Partition p : response.getPartitionsList()) {
         Partition partition =
@@ -180,14 +172,7 @@ public List<Partition> partitionQuery(
       builder.setPartitionOptions(pbuilder.build());
 
       final PartitionQueryRequest request = builder.build();
-      PartitionResponse response =
-          SpannerImpl.runWithRetries(
-              new Callable<PartitionResponse>() {
-                @Override
-                public PartitionResponse call() throws Exception {
-                  return rpc.partitionQuery(request, options);
-                }
-              });
+      PartitionResponse response = rpc.partitionQuery(request, options);
       ImmutableList.Builder<Partition> partitions = ImmutableList.builder();
       for (com.google.spanner.v1.Partition p : response.getPartitionsList()) {
         Partition partition =

diff --git a/.../google-cloud-spanner/src/main/java/com/google/cloud/spanner/DatabaseAdminClientImpl.java b/.../google-cloud-spanner/src/main/java/com/google/cloud/spanner/DatabaseAdminClientImpl.java
@@ -32,7 +32,6 @@
 import com.google.spanner.admin.database.v1.UpdateDatabaseDdlMetadata;
 import java.util.List;
 import java.util.UUID;
-import java.util.concurrent.Callable;
 import javax.annotation.Nullable;
 
 /** Default implementation of {@link DatabaseAdminClient}. */
@@ -83,15 +82,8 @@ public Database apply(Exception e) {
 
   @Override
   public Database getDatabase(String instanceId, String databaseId) throws SpannerException {
-    final String dbName = getDatabaseName(instanceId, databaseId);
-    Callable<Database> callable =
-        new Callable<Database>() {
-          @Override
-          public Database call() throws Exception {
-            return Database.fromProto(rpc.getDatabase(dbName), DatabaseAdminClientImpl.this);
-          }
-        };
-    return SpannerImpl.runWithRetries(callable);
+    String dbName = getDatabaseName(instanceId, databaseId);
+    return Database.fromProto(rpc.getDatabase(dbName), DatabaseAdminClientImpl.this);
   }
 
   @Override
@@ -126,29 +118,14 @@ public Void apply(Exception e) {
 
   @Override
   public void dropDatabase(String instanceId, String databaseId) throws SpannerException {
-    final String dbName = getDatabaseName(instanceId, databaseId);
-    Callable<Void> callable =
-        new Callable<Void>() {
-          @Override
-          public Void call() throws Exception {
-            rpc.dropDatabase(dbName);
-            return null;
-          }
-        };
-    SpannerImpl.runWithRetries(callable);
+    String dbName = getDatabaseName(instanceId, databaseId);
+    rpc.dropDatabase(dbName);
   }
 
   @Override
   public List<String> getDatabaseDdl(String instanceId, String databaseId) {
-    final String dbName = getDatabaseName(instanceId, databaseId);
-    Callable<List<String>> callable =
-        new Callable<List<String>>() {
-          @Override
-          public List<String> call() throws Exception {
-            return rpc.getDatabaseDdl(dbName);
-          }
-        };
-    return SpannerImpl.runWithRetries(callable);
+    String dbName = getDatabaseName(instanceId, databaseId);
+    return rpc.getDatabaseDdl(dbName);
   }
 
   @Override

diff --git a/.../google-cloud-spanner/src/main/java/com/google/cloud/spanner/InstanceAdminClientImpl.java b/.../google-cloud-spanner/src/main/java/com/google/cloud/spanner/InstanceAdminClientImpl.java
@@ -31,7 +31,6 @@
 import com.google.protobuf.FieldMask;
 import com.google.spanner.admin.instance.v1.CreateInstanceMetadata;
 import com.google.spanner.admin.instance.v1.UpdateInstanceMetadata;
-import java.util.concurrent.Callable;
 
 /** Default implementation of {@link InstanceAdminClient} */
 class InstanceAdminClientImpl implements InstanceAdminClient {
@@ -49,15 +48,9 @@ class InstanceAdminClientImpl implements InstanceAdminClient {
 
   @Override
   public InstanceConfig getInstanceConfig(String configId) throws SpannerException {
-    final String instanceConfigName = new InstanceConfigId(projectId, configId).getName();
-    return SpannerImpl.runWithRetries(
-        new Callable<InstanceConfig>() {
-          @Override
-          public InstanceConfig call() {
-            return InstanceConfig.fromProto(
-                rpc.getInstanceConfig(instanceConfigName), InstanceAdminClientImpl.this);
-          }
-        });
+    String instanceConfigName = new InstanceConfigId(projectId, configId).getName();
+    return InstanceConfig.fromProto(
+        rpc.getInstanceConfig(instanceConfigName), InstanceAdminClientImpl.this);
   }
 
   @Override
@@ -119,15 +112,9 @@ public Instance apply(Exception e) {
 
   @Override
   public Instance getInstance(String instanceId) throws SpannerException {
-    final String instanceName = new InstanceId(projectId, instanceId).getName();
-    return SpannerImpl.runWithRetries(
-        new Callable<Instance>() {
-          @Override
-          public Instance call() {
-            return Instance.fromProto(
-                rpc.getInstance(instanceName), InstanceAdminClientImpl.this, dbClient);
-          }
-        });
+    String instanceName = new InstanceId(projectId, instanceId).getName();
+    return Instance.fromProto(
+        rpc.getInstance(instanceName), InstanceAdminClientImpl.this, dbClient);
   }
 
   @Override
@@ -156,14 +143,7 @@ public Instance fromProto(com.google.spanner.admin.instance.v1.Instance proto) {
 
   @Override
   public void deleteInstance(final String instanceId) throws SpannerException {
-    SpannerImpl.runWithRetries(
-        new Callable<Void>() {
-          @Override
-          public Void call() {
-            rpc.deleteInstance(new InstanceId(projectId, instanceId).getName());
-            return null;
-          }
-        });
+    rpc.deleteInstance(new InstanceId(projectId, instanceId).getName());
   }
 
   @Override

diff --git a/...oogle-cloud-spanner/src/main/java/com/google/cloud/spanner/PartitionedDMLTransaction.java b/...oogle-cloud-spanner/src/main/java/com/google/cloud/spanner/PartitionedDMLTransaction.java
@@ -28,7 +28,6 @@
 import com.google.spanner.v1.TransactionOptions;
 import com.google.spanner.v1.TransactionSelector;
 import java.util.Map;
-import java.util.concurrent.Callable;
 
 /** Partitioned DML transaction for bulk updates and deletes. */
 class PartitionedDMLTransaction implements SessionTransaction {
@@ -51,14 +50,7 @@ private ByteString initTransaction() {
                 TransactionOptions.newBuilder()
                     .setPartitionedDml(TransactionOptions.PartitionedDml.getDefaultInstance()))
             .build();
-    Transaction txn =
-        SpannerImpl.runWithRetries(
-            new Callable<Transaction>() {
-              @Override
-              public Transaction call() throws Exception {
-                return rpc.beginTransaction(request, session.getOptions());
-              }
-            });
+    Transaction txn = rpc.beginTransaction(request, session.getOptions());
     if (txn.getId().isEmpty()) {
       throw SpannerExceptionFactory.newSpannerException(
           ErrorCode.INTERNAL,
@@ -84,13 +76,7 @@ long executePartitionedUpdate(Statement statement) {
       }
     }
     com.google.spanner.v1.ResultSet resultSet =
-        SpannerImpl.runWithRetries(
-            new Callable<com.google.spanner.v1.ResultSet>() {
-              @Override
-              public com.google.spanner.v1.ResultSet call() throws Exception {
-                return rpc.executeQuery(builder.build(), session.getOptions());
-              }
-            });
+        rpc.executeQuery(builder.build(), session.getOptions());
     if (!resultSet.hasStats()) {
       throw new IllegalArgumentException(
           "Partitioned DML response missing stats possibly due to non-DML statement as input");

diff --git a/...loud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SessionImpl.java b/...loud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SessionImpl.java
@@ -40,7 +40,6 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.Callable;
 import javax.annotation.Nullable;
 
 /**
@@ -137,14 +136,7 @@ public Timestamp writeAtLeastOnce(Iterable<Mutation> mutations) throws SpannerEx
             .build();
     Span span = tracer.spanBuilder(SpannerImpl.COMMIT).startSpan();
     try (Scope s = tracer.withSpan(span)) {
-      CommitResponse response =
-          SpannerImpl.runWithRetries(
-              new Callable<CommitResponse>() {
-                @Override
-                public CommitResponse call() throws Exception {
-                  return spanner.getRpc().commit(request, options);
-                }
-              });
+      CommitResponse response = spanner.getRpc().commit(request, options);
       Timestamp t = Timestamp.fromProto(response.getCommitTimestamp());
       span.end();
       return t;
@@ -208,14 +200,7 @@ public void prepareReadWriteTransaction() {
   public void close() {
     Span span = tracer.spanBuilder(SpannerImpl.DELETE_SESSION).startSpan();
     try (Scope s = tracer.withSpan(span)) {
-      SpannerImpl.runWithRetries(
-          new Callable<Void>() {
-            @Override
-            public Void call() throws Exception {
-              spanner.getRpc().deleteSession(name, options);
-              return null;
-            }
-          });
+      spanner.getRpc().deleteSession(name, options);
       span.end();
     } catch (RuntimeException e) {
       TraceUtil.endSpanWithFailure(span, e);
@@ -233,14 +218,7 @@ ByteString beginTransaction() {
                   TransactionOptions.newBuilder()
                       .setReadWrite(TransactionOptions.ReadWrite.getDefaultInstance()))
               .build();
-      Transaction txn =
-          SpannerImpl.runWithRetries(
-              new Callable<Transaction>() {
-                @Override
-                public Transaction call() throws Exception {
-                  return spanner.getRpc().beginTransaction(request, options);
-                }
-              });
+      Transaction txn = spanner.getRpc().beginTransaction(request, options);
       if (txn.getId().isEmpty()) {
         throw newSpannerException(ErrorCode.INTERNAL, "Missing id in transaction\n" + getName());
       }