feat: addressed review comments

Author: shobhitsg

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

@@ -641,8 +641,8 @@ private ResultSet executeQueryInternal(
    *   <li>Specific {@link QueryOptions} passed in for this query.
    *   <li>Any value specified in a valid environment variable when the {@link SpannerOptions}
    *       instance was created.
-   *   <li>The default {@link SpannerOptions#getDefaultQueryOptions()} specified for the database
-   *       where the query is executed.
+   *   <li>The default {@link SpannerOptions#getDefaultQueryOptions(DatabaseId)} ()} specified for
+   *       the database where the query is executed.
    * </ol>
    */
   @VisibleForTesting

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

@@ -22,6 +22,7 @@
 import com.google.cloud.spanner.Options.TransactionOption;
 import com.google.cloud.spanner.Options.UpdateOption;
 import com.google.spanner.v1.BatchWriteResponse;
+import com.google.spanner.v1.TransactionOptions.IsolationLevel;
 
 /**
  * Interface for all the APIs that are used to read/write data into a Cloud Spanner database. An
@@ -111,10 +112,6 @@ default String getDatabaseRole() {
    *       applied to any other requests on the transaction.
    *   <li>{@link Options#commitStats()}: Request that the server includes commit statistics in the
    *       {@link CommitResponse}.
-   *   <li>{@link Options#repeatableReadIsolationLevel()}: Request Repeatable Read Isolation Level
-   *       from the backend.
-   *   <li>{@link Options#serializableIsolationLevel()}: Request Serializable Isolation Level from
-   *       the backend.
    * </ul>
    *
    * @return a response with the timestamp at which the write was committed
@@ -190,10 +187,6 @@ CommitResponse writeWithOptions(Iterable<Mutation> mutations, TransactionOption.
    *       applied to any other requests on the transaction.
    *   <li>{@link Options#commitStats()}: Request that the server includes commit statistics in the
    *       {@link CommitResponse}.
-   *   <li>{@link Options#repeatableReadIsolationLevel()}: Request Repeatable Read Isolation Level
-   *       from the backend.
-   *   <li>{@link Options#serializableIsolationLevel()}: Request Serializable Isolation Level from
-   *       the backend.
    * </ul>
    *
    * @return a response with the timestamp at which the write was committed
@@ -422,10 +415,8 @@ ServerStream<BatchWriteResponse> batchWriteAtLeastOnce(
    *       applied to any other requests on the transaction.
    *   <li>{@link Options#commitStats()}: Request that the server includes commit statistics in the
    *       {@link CommitResponse}.
-   *   <li>{@link Options#repeatableReadIsolationLevel()}: Request Repeatable Read Isolation Level
-   *       from the backend.
-   *   <li>{@link Options#serializableIsolationLevel()}: Request Serializable Isolation Level from
-   *       the backend.
+   *   <li>{@link Options#isolationLevelOption(IsolationLevel)}: The isolation level for the
+   *       transaction
    * </ul>
    */
   TransactionRunner readWriteTransaction(TransactionOption... options);
@@ -466,10 +457,8 @@ ServerStream<BatchWriteResponse> batchWriteAtLeastOnce(
    *       applied to any other requests on the transaction.
    *   <li>{@link Options#commitStats()}: Request that the server includes commit statistics in the
    *       {@link CommitResponse}.
-   *   <li>{@link Options#repeatableReadIsolationLevel()}: Request Repeatable Read Isolation Level
-   *       from the backend.
-   *   <li>{@link Options#serializableIsolationLevel()}: Request Serializable Isolation Level from
-   *       the backend.
+   *   <li>{@link Options#isolationLevelOption(IsolationLevel)}: The isolation level for the
+   *       transaction
    * </ul>
    */
   TransactionManager transactionManager(TransactionOption... options);
@@ -510,10 +499,8 @@ ServerStream<BatchWriteResponse> batchWriteAtLeastOnce(
    *       applied to any other requests on the transaction.
    *   <li>{@link Options#commitStats()}: Request that the server includes commit statistics in the
    *       {@link CommitResponse}.
-   *   <li>{@link Options#repeatableReadIsolationLevel()}: Request Repeatable Read Isolation Level
-   *       from the backend.
-   *   <li>{@link Options#serializableIsolationLevel()}: Request Serializable Isolation Level from
-   *       the backend.
+   *   <li>{@link Options#isolationLevelOption(IsolationLevel)}: The isolation level for the
+   *       transaction
    * </ul>
    */
   AsyncRunner runAsync(TransactionOption... options);
@@ -568,10 +555,8 @@ ServerStream<BatchWriteResponse> batchWriteAtLeastOnce(
    *       applied to any other requests on the transaction.
    *   <li>{@link Options#commitStats()}: Request that the server includes commit statistics in the
    *       {@link CommitResponse}.
-   *   <li>{@link Options#repeatableReadIsolationLevel()}: Request Repeatable Read Isolation Level
-   *       from the backend.
-   *   <li>{@link Options#serializableIsolationLevel()}: Request Serializable Isolation Level from
-   *       the backend.
+   *   <li>{@link Options#isolationLevelOption(IsolationLevel)}: The isolation level for the
+   *       transaction
    * </ul>
    */
   AsyncTransactionManager transactionManagerAsync(TransactionOption... options);

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

@@ -16,6 +16,7 @@
 
 package com.google.cloud.spanner;
 
+import com.google.cloud.spanner.SpannerOptions.Builder.TransactionOptions;
 import com.google.common.base.Preconditions;
 import com.google.spanner.v1.DirectedReadOptions;
 import com.google.spanner.v1.ReadRequest.LockHint;
@@ -26,7 +27,6 @@
 import java.time.Duration;
 import java.util.Arrays;
 import java.util.Objects;
-import java.util.function.Predicate;
 import java.util.stream.Stream;
 
 /** Specifies options for various spanner operations */
@@ -135,29 +135,7 @@ public interface UpdateAdminApiOption extends AdminApiOption {}
   public interface QueryOption {}
 
   /** Marker interface to mark options applicable to write operations */
-  public interface TransactionOption {
-    Predicate<TransactionOption> isValidIsolationLevelOption =
-        txnOption ->
-            txnOption instanceof RepeatableReadOption || txnOption instanceof SerializableOption;
-
-    /**
-     * Combines two arrays of TransactionOption, with primaryOptions taking precedence in case of
-     * conflicts. Note that {@link
-     * com.google.cloud.spanner.SpannerOptions.Builder.TransactionOptions} supports only the {@link
-     * IsolationLevel} TransactionOption, meaning spannerOptions will contain a maximum of one
-     * TransactionOption.
-     */
-    static TransactionOption[] combine(
-        TransactionOption[] primaryOptions, TransactionOption[] spannerOptions) {
-      if (spannerOptions == null
-          || Arrays.stream(primaryOptions).anyMatch(isValidIsolationLevelOption)) {
-        return primaryOptions;
-      } else {
-        return Stream.concat(Arrays.stream(primaryOptions), Arrays.stream(spannerOptions))
-            .toArray(TransactionOption[]::new);
-      }
-    }
-  }
+  public interface TransactionOption {}
 
   /** Marker interface to mark options applicable to update operation. */
   public interface UpdateOption {}
@@ -186,19 +164,10 @@ public static TransactionOption optimisticLock() {
   }
 
   /**
-   * Specifying this instructs the transaction to request Repeatable Read Isolation Level from the
-   * backend.
-   */
-  public static TransactionOption repeatableReadIsolationLevel() {
-    return REPEATABLE_READ_OPTION;
-  }
-
-  /**
-   * Specifying this instructs the transaction to request Serializable Isolation Level from the
-   * backend.
+   * Specifying this instructs the transaction to request {@link IsolationLevel} from the backend.
    */
-  public static TransactionOption serializableIsolationLevel() {
-    return SERIALIZABLE_OPTION;
+  public static IsolationLevelOption isolationLevelOption(IsolationLevel isolationLevel) {
+    return new IsolationLevelOption(isolationLevel);
   }
 
   /**
@@ -532,26 +501,20 @@ void appendToOptions(Options options) {
     }
   }
 
-  /** Option to request REPEATABLE READ isolation level for read/write transactions. */
-  static final class RepeatableReadOption extends InternalOption implements TransactionOption {
-    @Override
-    void appendToOptions(Options options) {
-      options.isolationLevel = IsolationLevel.REPEATABLE_READ;
-    }
-  }
+  /** Option to set isolation level for read/write transactions. */
+  static final class IsolationLevelOption extends InternalOption implements TransactionOption {
+    private final IsolationLevel isolationLevel;
 
-  static final RepeatableReadOption REPEATABLE_READ_OPTION = new RepeatableReadOption();
+    public IsolationLevelOption(IsolationLevel isolationLevel) {
+      this.isolationLevel = isolationLevel;
+    }
 
-  /** Option to request SERIALIZABLE isolation level for read/write transactions. */
-  static final class SerializableOption extends InternalOption implements TransactionOption {
     @Override
     void appendToOptions(Options options) {
-      options.isolationLevel = IsolationLevel.SERIALIZABLE;
+      options.isolationLevel = isolationLevel;
     }
   }
 
-  static final SerializableOption SERIALIZABLE_OPTION = new SerializableOption();
-
   private boolean withCommitStats;
 
   private Duration maxCommitDelay;

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

@@ -30,6 +30,7 @@
 import com.google.cloud.spanner.Options.TransactionOption;
 import com.google.cloud.spanner.Options.UpdateOption;
 import com.google.cloud.spanner.SessionClient.SessionOption;
+import com.google.cloud.spanner.SpannerOptions.Builder.TransactionOptions;
 import com.google.cloud.spanner.TransactionRunnerImpl.TransactionContextImpl;
 import com.google.cloud.spanner.spi.v1.SpannerRpc;
 import com.google.common.base.Ticker;
@@ -44,7 +45,6 @@
 import com.google.spanner.v1.CommitRequest;
 import com.google.spanner.v1.RequestOptions;
 import com.google.spanner.v1.Transaction;
-import com.google.spanner.v1.TransactionOptions;
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -69,15 +69,18 @@ static void throwIfTransactionsPending() {
     }
   }
 
-  static TransactionOptions createReadWriteTransactionOptions(
+  static com.google.spanner.v1.TransactionOptions createReadWriteTransactionOptions(
       Options options, ByteString previousTransactionId) {
-    TransactionOptions.Builder transactionOptions = TransactionOptions.newBuilder();
+    com.google.spanner.v1.TransactionOptions.Builder transactionOptions =
+        com.google.spanner.v1.TransactionOptions.newBuilder();
     if (options.withExcludeTxnFromChangeStreams() == Boolean.TRUE) {
       transactionOptions.setExcludeTxnFromChangeStreams(true);
     }
-    TransactionOptions.ReadWrite.Builder readWrite = TransactionOptions.ReadWrite.newBuilder();
+    com.google.spanner.v1.TransactionOptions.ReadWrite.Builder readWrite =
+        com.google.spanner.v1.TransactionOptions.ReadWrite.newBuilder();
     if (options.withOptimisticLock() == Boolean.TRUE) {
-      readWrite.setReadLockMode(TransactionOptions.ReadWrite.ReadLockMode.OPTIMISTIC);
+      readWrite.setReadLockMode(
+          com.google.spanner.v1.TransactionOptions.ReadWrite.ReadLockMode.OPTIMISTIC);
     }
     if (previousTransactionId != null
         && previousTransactionId != com.google.protobuf.ByteString.EMPTY) {
@@ -196,6 +199,14 @@ void markUsed(Instant instant) {
     sessionReference.markUsed(instant);
   }
 
+  com.google.spanner.v1.TransactionOptions defaultTransactionOptions() {
+    TransactionOptions transactionOptions =
+        this.spanner.getOptions().getDefaultTransactionOptions();
+    return transactionOptions != null
+        ? transactionOptions.getTransactionOptions()
+        : com.google.spanner.v1.TransactionOptions.getDefaultInstance();
+  }
+
   public DatabaseId getDatabaseId() {
     return sessionReference.getDatabaseId();
   }
@@ -242,26 +253,24 @@ public CommitResponse writeAtLeastOnceWithOptions(
     setActive(null);
     List<com.google.spanner.v1.Mutation> mutationsProto = new ArrayList<>();
     Mutation.toProtoAndReturnRandomMutation(mutations, mutationsProto);
-    Options options =
-        Options.fromTransactionOptions(
-            TransactionOption.combine(
-                transactionOptions, this.spanner.getOptions().getTransactionOptions()));
+    Options options = Options.fromTransactionOptions(transactionOptions);
     final CommitRequest.Builder requestBuilder =
         CommitRequest.newBuilder()
             .setSession(getName())
             .setReturnCommitStats(options.withCommitStats())
             .addAllMutations(mutationsProto);
 
-    TransactionOptions.Builder transactionOptionsBuilder =
-        TransactionOptions.newBuilder()
-            .setReadWrite(TransactionOptions.ReadWrite.getDefaultInstance());
+    com.google.spanner.v1.TransactionOptions.Builder transactionOptionsBuilder =
+        com.google.spanner.v1.TransactionOptions.newBuilder()
+            .setReadWrite(com.google.spanner.v1.TransactionOptions.ReadWrite.getDefaultInstance());
     if (options.withExcludeTxnFromChangeStreams() == Boolean.TRUE) {
       transactionOptionsBuilder.setExcludeTxnFromChangeStreams(true);
     }
     if (options.isolationLevel() != null) {
       transactionOptionsBuilder.setIsolationLevel(options.isolationLevel());
     }
-    requestBuilder.setSingleUseTransaction(transactionOptionsBuilder);
+    requestBuilder.setSingleUseTransaction(
+        this.defaultTransactionOptions().toBuilder().mergeFrom(transactionOptionsBuilder.build()));
 
     if (options.hasMaxCommitDelay()) {
       requestBuilder.setMaxCommitDelay(
@@ -405,37 +414,22 @@ public ReadOnlyTransaction readOnlyTransaction(TimestampBound bound) {
 
   @Override
   public TransactionRunner readWriteTransaction(TransactionOption... options) {
-    return setActive(
-        new TransactionRunnerImpl(
-            this,
-            TransactionOption.combine(options, this.spanner.getOptions().getTransactionOptions())));
+    return setActive(new TransactionRunnerImpl(this, options));
   }
 
   @Override
   public AsyncRunner runAsync(TransactionOption... options) {
-    return new AsyncRunnerImpl(
-        setActive(
-            new TransactionRunnerImpl(
-                this,
-                TransactionOption.combine(
-                    options, this.spanner.getOptions().getTransactionOptions()))));
+    return new AsyncRunnerImpl(setActive(new TransactionRunnerImpl(this, options)));
   }
 
   @Override
   public TransactionManager transactionManager(TransactionOption... options) {
-    return new TransactionManagerImpl(
-        this,
-        currentSpan,
-        tracer,
-        TransactionOption.combine(options, this.spanner.getOptions().getTransactionOptions()));
+    return new TransactionManagerImpl(this, currentSpan, tracer, options);
   }
 
   @Override
   public AsyncTransactionManagerImpl transactionManagerAsync(TransactionOption... options) {
-    return new AsyncTransactionManagerImpl(
-        this,
-        currentSpan,
-        TransactionOption.combine(options, this.spanner.getOptions().getTransactionOptions()));
+    return new AsyncTransactionManagerImpl(this, currentSpan, options);
   }
 
   @Override
@@ -468,7 +462,11 @@ ApiFuture<Transaction> beginTransactionAsync(
         BeginTransactionRequest.newBuilder()
             .setSession(getName())
             .setOptions(
-                createReadWriteTransactionOptions(transactionOptions, previousTransactionId));
+                defaultTransactionOptions()
+                    .toBuilder()
+                    .mergeFrom(
+                        createReadWriteTransactionOptions(
+                            transactionOptions, previousTransactionId)));
     if (sessionReference.getIsMultiplexed() && mutation != null) {
       requestBuilder.setMutationKey(mutation);
     }
@@ -513,7 +511,6 @@ TransactionContextImpl newTransaction(Options options, ByteString previousTransa
         .setOptions(options)
         .setTransactionId(null)
         .setPreviousTransactionId(previousTransactionId)
-        .setOptions(options)
         .setTrackTransactionStarter(spanner.getOptions().isTrackTransactionStarter())
         .setRpc(spanner.getRpc())
         .setDefaultQueryOptions(spanner.getDefaultQueryOptions(getDatabaseId()))