chore: some additional cleanup

Author: olavloite

google-cloud-spanner/src/main/java/com/google/cloud/spanner/BatchClientImpl.java

@@ -22,7 +22,6 @@
 import com.google.cloud.spanner.Options.QueryOption;
 import com.google.cloud.spanner.Options.ReadOption;
 import com.google.cloud.spanner.spi.v1.SpannerRpc;
-import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 import com.google.protobuf.Struct;
@@ -36,7 +35,6 @@
 import java.time.Instant;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.concurrent.locks.ReentrantLock;
 import javax.annotation.Nullable;
@@ -46,8 +44,6 @@
 public class BatchClientImpl implements BatchClient {
   private final SessionClient sessionClient;
 
-  private final boolean isMultiplexedSessionEnabled;
-
   /** Lock to protect the multiplexed session. */
   private final ReentrantLock multiplexedSessionLock = new ReentrantLock();
 
@@ -61,16 +57,8 @@ public class BatchClientImpl implements BatchClient {
   @GuardedBy("multiplexedSessionLock")
   private final AtomicReference<SessionImpl> multiplexedSessionReference;
 
-  /**
-   * This flag is set to true if the server return UNIMPLEMENTED when partitioned transaction is
-   * executed on a multiplexed session. TODO: Remove once this is guaranteed to be available.
-   */
-  @VisibleForTesting
-  static final AtomicBoolean unimplementedForPartitionedOps = new AtomicBoolean(false);
-
-  BatchClientImpl(SessionClient sessionClient, boolean isMultiplexedSessionEnabled) {
+  BatchClientImpl(SessionClient sessionClient) {
     this.sessionClient = checkNotNull(sessionClient);
-    this.isMultiplexedSessionEnabled = isMultiplexedSessionEnabled;
     this.sessionExpirationDuration =
         Duration.ofMillis(
             sessionClient
@@ -93,12 +81,7 @@ public String getDatabaseRole() {
 
   @Override
   public BatchReadOnlyTransaction batchReadOnlyTransaction(TimestampBound bound) {
-    SessionImpl session;
-    if (canUseMultiplexedSession()) {
-      session = getMultiplexedSession();
-    } else {
-      session = sessionClient.createSession();
-    }
+    SessionImpl session = getMultiplexedSession();
     return new BatchReadOnlyTransactionImpl(
         MultiUseReadOnlyTransaction.newBuilder()
             .setSession(session)
@@ -114,8 +97,7 @@ public BatchReadOnlyTransaction batchReadOnlyTransaction(TimestampBound bound) {
                 sessionClient.getSpanner().getOptions().getDirectedReadOptions())
             .setSpan(sessionClient.getSpanner().getTracer().getCurrentSpan())
             .setTracer(sessionClient.getSpanner().getTracer()),
-        checkNotNull(bound),
-        sessionClient);
+        checkNotNull(bound));
   }
 
   @Override
@@ -138,12 +120,7 @@ public BatchReadOnlyTransaction batchReadOnlyTransaction(BatchTransactionId batc
                 sessionClient.getSpanner().getOptions().getDirectedReadOptions())
             .setSpan(sessionClient.getSpanner().getTracer().getCurrentSpan())
             .setTracer(sessionClient.getSpanner().getTracer()),
-        batchTransactionId,
-        sessionClient);
-  }
-
-  private boolean canUseMultiplexedSession() {
-    return isMultiplexedSessionEnabled && !unimplementedForPartitionedOps.get();
+        batchTransactionId);
   }
 
   private SessionImpl getMultiplexedSession() {
@@ -162,28 +139,20 @@ private SessionImpl getMultiplexedSession() {
 
   private static class BatchReadOnlyTransactionImpl extends MultiUseReadOnlyTransaction
       implements BatchReadOnlyTransaction {
-    private String sessionName;
+    private final String sessionName;
     private final Map<SpannerRpc.Option, ?> options;
-    private final SessionClient sessionClient;
-    private final AtomicBoolean fallbackInitiated = new AtomicBoolean(false);
 
     BatchReadOnlyTransactionImpl(
-        MultiUseReadOnlyTransaction.Builder builder,
-        TimestampBound bound,
-        SessionClient sessionClient) {
+        MultiUseReadOnlyTransaction.Builder builder, TimestampBound bound) {
       super(builder.setTimestampBound(bound));
-      this.sessionClient = sessionClient;
       this.sessionName = session.getName();
       this.options = session.getOptions();
       initTransaction();
     }
 
     BatchReadOnlyTransactionImpl(
-        MultiUseReadOnlyTransaction.Builder builder,
-        BatchTransactionId batchTransactionId,
-        SessionClient sessionClient) {
+        MultiUseReadOnlyTransaction.Builder builder, BatchTransactionId batchTransactionId) {
       super(builder.setTransactionId(batchTransactionId.getTransactionId()));
-      this.sessionClient = sessionClient;
       this.sessionName = session.getName();
       this.options = session.getOptions();
     }
@@ -214,18 +183,6 @@ public List<Partition> partitionReadUsingIndex(
         Iterable<String> columns,
         ReadOption... option)
         throws SpannerException {
-      return partitionReadUsingIndex(partitionOptions, table, index, keys, columns, false, option);
-    }
-
-    private List<Partition> partitionReadUsingIndex(
-        PartitionOptions partitionOptions,
-        String table,
-        String index,
-        KeySet keys,
-        Iterable<String> columns,
-        boolean isFallback,
-        ReadOption... option)
-        throws SpannerException {
       Options readOptions = Options.fromReadOptions(option);
       Preconditions.checkArgument(
           !readOptions.hasLimit(),

google-cloud-spanner/src/main/java/com/google/cloud/spanner/DatabaseClientImpl.java

@@ -153,15 +153,6 @@ public CommitResponse writeAtLeastOnceWithOptions(
     }
   }
 
-  private int nextNthRequest() {
-    return this.nthRequest.incrementAndGet();
-  }
-
-  @VisibleForTesting
-  int getNthRequest() {
-    return this.nthRequest.get();
-  }
-
   @Override
   public ServerStream<BatchWriteResponse> batchWriteAtLeastOnce(
       final Iterable<MutationGroup> mutationGroups, final TransactionOption... options)
@@ -306,41 +297,13 @@ private Future<Dialect> getDialectAsync() {
     return multiplexedSessionDatabaseClient.getDialectAsync();
   }
 
-  private UpdateOption[] withReqId(
-      final XGoogSpannerRequestId reqId, final UpdateOption... options) {
-    if (reqId == null) {
-      return options;
-    }
-    if (options == null || options.length == 0) {
-      return new UpdateOption[] {new Options.RequestIdOption(reqId)};
-    }
-    UpdateOption[] allOptions = new UpdateOption[options.length + 1];
-    System.arraycopy(options, 0, allOptions, 0, options.length);
-    allOptions[options.length] = new Options.RequestIdOption(reqId);
-    return allOptions;
-  }
-
-  private TransactionOption[] withReqId(
-      final XGoogSpannerRequestId reqId, final TransactionOption... options) {
-    if (reqId == null) {
-      return options;
-    }
-    if (options == null || options.length == 0) {
-      return new TransactionOption[] {new Options.RequestIdOption(reqId)};
-    }
-    TransactionOption[] allOptions = new TransactionOption[options.length + 1];
-    System.arraycopy(options, 0, allOptions, 0, options.length);
-    allOptions[options.length] = new Options.RequestIdOption(reqId);
-    return allOptions;
-  }
-
   boolean isValid() {
     return multiplexedSessionDatabaseClient.isValid();
   }
 
   ListenableFuture<Void> closeAsync(ClosedException closedException) {
     // This method is non-blocking.
     this.multiplexedSessionDatabaseClient.close();
-    return Futures.immediateFuture(null);
+    return Futures.immediateVoidFuture();
   }
 }

google-cloud-spanner/src/main/java/com/google/cloud/spanner/SessionPoolOptions.java

@@ -27,9 +27,15 @@
 import java.util.Locale;
 import java.util.Objects;
 
-/** Options for the session pool used by {@code DatabaseClient}. */
+/**
+ * Options for the session pool used by {@code DatabaseClient}.
+ *
+ * @deprecated The Spanner Java client uses a single multiplexed session. All options related to the
+ *     session pool are no longer functional and will be removed in a future version.
+ */
 @Deprecated
 public class SessionPoolOptions {
+  @Deprecated
   enum Position {
     FIRST,
     LAST,
@@ -228,10 +234,12 @@ public Builder toBuilder() {
     return new Builder(this);
   }
 
+  @Deprecated
   public int getMinSessions() {
     return minSessions;
   }
 
+  @Deprecated
   public int getMaxSessions() {
     return maxSessions;
   }
@@ -268,6 +276,7 @@ Duration getMultiplexedSessionMaintenanceLoopFrequency() {
     return this.multiplexedSessionMaintenanceLoopFrequency;
   }
 
+  @Deprecated
   public int getKeepAliveIntervalMinutes() {
     return keepAliveIntervalMinutes;
   }
@@ -278,14 +287,17 @@ public org.threeten.bp.Duration getRemoveInactiveSessionAfter() {
     return toThreetenDuration(getRemoveInactiveSessionAfterDuration());
   }
 
+  @Deprecated
   public Duration getRemoveInactiveSessionAfterDuration() {
     return removeInactiveSessionAfter;
   }
 
+  @Deprecated
   public boolean isFailIfPoolExhausted() {
     return actionOnExhaustion == ActionOnExhaustion.FAIL;
   }
 
+  @Deprecated
   public boolean isBlockIfPoolExhausted() {
     return actionOnExhaustion == ActionOnExhaustion.BLOCK;
   }
@@ -333,6 +345,7 @@ Clock getPoolMaintainerClock() {
     return poolMaintainerClock;
   }
 
+  @Deprecated
   public boolean isTrackStackTraceOfSessionCheckout() {
     return trackStackTraceOfSessionCheckout;
   }
@@ -687,6 +700,7 @@ private Builder(SessionPoolOptions options) {
      * Minimum number of sessions that this pool will always maintain. These will be created eagerly
      * in parallel. Defaults to 100.
      */
+    @Deprecated
     public Builder setMinSessions(int minSessions) {
       Preconditions.checkArgument(minSessions >= 0, "minSessions must be >= 0");
       this.minSessionsSet = true;
@@ -700,6 +714,7 @@ public Builder setMinSessions(int minSessions) {
      * operation. If current number of in use sessions is same as this and a new request comes, pool
      * can either block or fail. Defaults to 400.
      */
+    @Deprecated
     public Builder setMaxSessions(int maxSessions) {
       Preconditions.checkArgument(maxSessions > 0, "maxSessions must be > 0");
       this.maxSessions = maxSessions;
@@ -753,10 +768,12 @@ Builder setInactiveTransactionRemovalOptions(
      * instead.
      */
     @ObsoleteApi("Use setRemoveInactiveSessionAfterDuration(Duration) instead")
+    @Deprecated
     public Builder setRemoveInactiveSessionAfter(org.threeten.bp.Duration duration) {
       return setRemoveInactiveSessionAfterDuration(toJavaTimeDuration(duration));
     }
 
+    @Deprecated
     public Builder setRemoveInactiveSessionAfterDuration(Duration duration) {
       this.removeInactiveSessionAfter = duration;
       return this;
@@ -767,16 +784,18 @@ public Builder setRemoveInactiveSessionAfterDuration(Duration duration) {
      * is automatically closed after 60 minutes. Sessions will be kept alive by sending a dummy
      * query "Select 1". Default value is 30 minutes.
      */
+    @Deprecated
     public Builder setKeepAliveIntervalMinutes(int intervalMinutes) {
       this.keepAliveIntervalMinutes = intervalMinutes;
       return this;
     }
 
     /**
-     * If all sessions are in use and and {@code maxSessions} has been reached, fail the request by
+     * If all sessions are in use and {@code maxSessions} has been reached, fail the request by
      * throwing a {@link SpannerException} with the error code {@code RESOURCE_EXHAUSTED}. Default
      * behavior is to block the request.
      */
+    @Deprecated
     public Builder setFailIfPoolExhausted() {
       this.actionOnExhaustion = ActionOnExhaustion.FAIL;
       return this;
@@ -791,6 +810,7 @@ public Builder setFailIfPoolExhausted() {
      * different period use the option {@link Builder#setAcquireSessionTimeoutDuration(Duration)}
      * ()}
      */
+    @Deprecated
     public Builder setBlockIfPoolExhausted() {
       this.actionOnExhaustion = ActionOnExhaustion.BLOCK;
       return this;
@@ -806,6 +826,7 @@ public Builder setBlockIfPoolExhausted() {
      *
      * @return this builder for chaining
      */
+    @Deprecated
     public Builder setWarnIfInactiveTransactions() {
       this.inactiveTransactionRemovalOptions =
           InactiveTransactionRemovalOptions.newBuilder()
@@ -825,6 +846,7 @@ public Builder setWarnIfInactiveTransactions() {
      *
      * @return this builder for chaining
      */
+    @Deprecated
     public Builder setWarnAndCloseIfInactiveTransactions() {
       this.inactiveTransactionRemovalOptions =
           InactiveTransactionRemovalOptions.newBuilder()
@@ -976,6 +998,7 @@ Builder setFailOnSessionLeak() {
      * <p>Some monitoring tools might log these exceptions even though they are not thrown. This
      * option can be used to suppress the creation and logging of these exceptions.
      */
+    @Deprecated
     public Builder setTrackStackTraceOfSessionCheckout(boolean trackStackTraceOfSessionCheckout) {
       this.trackStackTraceOfSessionCheckout = trackStackTraceOfSessionCheckout;
       return this;
@@ -988,6 +1011,7 @@ public Builder setTrackStackTraceOfSessionCheckout(boolean trackStackTraceOfSess
      *     BeginTransaction option with that statement.
      *     <p>This method may be removed in a future release.
      */
+    @Deprecated
     public Builder setWriteSessionsFraction(float writeSessionsFraction) {
       this.writeSessionsFraction = writeSessionsFraction;
       return this;
@@ -1016,6 +1040,7 @@ public Builder setWaitForMinSessionsDuration(Duration waitForMinSessions) {
 
     /** This method is obsolete. Use {@link #setAcquireSessionTimeoutDuration(Duration)} instead. */
     @ObsoleteApi("Use setAcquireSessionTimeoutDuration(Duration) instead")
+    @Deprecated
     public Builder setAcquireSessionTimeout(org.threeten.bp.Duration acquireSessionTimeout) {
       return setAcquireSessionTimeoutDuration(toJavaTimeDuration(acquireSessionTimeout));
     }
@@ -1024,6 +1049,7 @@ public Builder setAcquireSessionTimeout(org.threeten.bp.Duration acquireSessionT
      * If greater than zero, we wait for said duration when no sessions are available in the
      * SessionPool. The default is a 60s timeout. Set the value to null to disable the timeout.
      */
+    @Deprecated
     public Builder setAcquireSessionTimeoutDuration(Duration acquireSessionTimeout) {
       try {
         if (acquireSessionTimeout != null) {