feat: Add LastStatement DML option

Author: sgorse12

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

@@ -696,6 +696,9 @@ ExecuteSqlRequest.Builder getExecuteSqlRequestBuilder(
     if (!isReadOnly()) {
       builder.setSeqno(getSeqNo());
     }
+    if (options.hasLastStatementSet()) {
+      builder.setLastStatement(options.lastStatementSet());
+    }
     builder.setQueryOptions(buildQueryOptions(statement.getQueryOptions()));
     builder.setRequestOptions(buildRequestOptions(options));
     return builder;
@@ -741,6 +744,9 @@ ExecuteBatchDmlRequest.Builder getExecuteBatchDmlRequestBuilder(
     if (selector != null) {
       builder.setTransaction(selector);
     }
+    if (options.hasLastStatementSet()) {
+      builder.setLastStatements(options.lastStatementSet());
+    }
     builder.setSeqno(getSeqNo());
     builder.setRequestOptions(buildRequestOptions(options));
     return builder;

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

@@ -212,6 +212,20 @@ public static DataBoostQueryOption dataBoostEnabled(Boolean dataBoostEnabled) {
     return new DataBoostQueryOption(dataBoostEnabled);
   }
 
+  /**
+   * If set to true, this option marks the end of the transaction. The transaction should be
+   * committed or aborted after this statement executes, and attempts to execute any other requests
+   * against this transaction (including reads and queries) will be rejected. Mixing mutations with
+   * statements that are marked as the last statement is not allowed.
+   *
+   * <p>For DML statements, setting this option may cause some error reporting to be deferred until
+   * commit time (e.g. validation of unique constraints). Given this, successful execution of a DML
+   * statement should not be assumed until the transaction commits.
+   */
+  public static LastStatementUpdateOption lastStatementSet(Boolean lastStatementSet) {
+    return new LastStatementUpdateOption(lastStatementSet);
+  }
+
   /**
    * Specifying this will cause the list operation to start fetching the record from this onwards.
    */
@@ -470,6 +484,8 @@ void appendToOptions(Options options) {
   private DecodeMode decodeMode;
   private RpcOrderBy orderBy;
 
+  private Boolean lastStatementSet;
+
   // Construction is via factory methods below.
   private Options() {}
 
@@ -605,6 +621,14 @@ OrderBy orderBy() {
     return orderBy == null ? null : orderBy.proto;
   }
 
+  boolean hasLastStatementSet() {
+    return lastStatementSet != null;
+  }
+
+  Boolean lastStatementSet() {
+    return lastStatementSet;
+  }
+
   @Override
   public String toString() {
     StringBuilder b = new StringBuilder();
@@ -661,6 +685,9 @@ public String toString() {
     if (orderBy != null) {
       b.append("orderBy: ").append(orderBy).append(' ');
     }
+    if (lastStatementSet != null) {
+      b.append("lastStatementSet: ").append(lastStatementSet).append(' ');
+    }
     return b.toString();
   }
 
@@ -700,7 +727,8 @@ public boolean equals(Object o) {
         && Objects.equals(withExcludeTxnFromChangeStreams(), that.withExcludeTxnFromChangeStreams())
         && Objects.equals(dataBoostEnabled(), that.dataBoostEnabled())
         && Objects.equals(directedReadOptions(), that.directedReadOptions())
-        && Objects.equals(orderBy(), that.orderBy());
+        && Objects.equals(orderBy(), that.orderBy())
+        && Objects.equals(lastStatementSet(), that.lastStatementSet());
   }
 
   @Override
@@ -760,6 +788,9 @@ public int hashCode() {
     if (orderBy != null) {
       result = 31 * result + orderBy.hashCode();
     }
+    if (lastStatementSet != null) {
+      result = 31 * result + lastStatementSet.hashCode();
+    }
     return result;
   }
 
@@ -912,4 +943,18 @@ public boolean equals(Object o) {
       return Objects.equals(filter, ((FilterOption) o).filter);
     }
   }
+
+  static final class LastStatementUpdateOption extends InternalOption implements UpdateOption {
+
+    private final Boolean lastStatementSet;
+
+    LastStatementUpdateOption(Boolean lastStatementSet) {
+      this.lastStatementSet = lastStatementSet;
+    }
+
+    @Override
+    void appendToOptions(Options options) {
+      options.lastStatementSet = lastStatementSet;
+    }
+  }
 }

samples/install-without-bom/pom.xml

@@ -33,7 +33,12 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-spanner</artifactId>
-      <version>6.81.1</version>
+      <version>6.83.1-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>com.google.api.grpc</groupId>
+      <artifactId>proto-google-cloud-spanner-v1</artifactId>
+      <version>6.83.1-SNAPSHOT</version>
     </dependency>
     <!-- [END spanner_install_without_bom] -->
 

samples/snippets/pom.xml

@@ -45,6 +45,12 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-spanner</artifactId>
+      <version>6.83.1-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>com.google.api.grpc</groupId>
+      <artifactId>proto-google-cloud-spanner-v1</artifactId>
+      <version>6.83.1-SNAPSHOT</version>
     </dependency>
     <!-- [END spanner_install_with_bom] -->
 

samples/snippets/src/main/java/com/example/spanner/SpannerSample.java

@@ -32,6 +32,7 @@
 import com.google.cloud.spanner.KeyRange;
 import com.google.cloud.spanner.KeySet;
 import com.google.cloud.spanner.Mutation;
+import com.google.cloud.spanner.Options;
 import com.google.cloud.spanner.ReadOnlyTransaction;
 import com.google.cloud.spanner.ResultSet;
 import com.google.cloud.spanner.Spanner;
@@ -996,15 +997,15 @@ static void queryNestedStructField(DatabaseClient dbClient) {
   // [START spanner_dml_standard_insert]
   static void insertUsingDml(DatabaseClient dbClient) {
     dbClient
-        .readWriteTransaction()
-        .run(transaction -> {
-          String sql =
-              "INSERT INTO Singers (SingerId, FirstName, LastName) "
-                  + " VALUES (10, 'Virginia', 'Watson')";
-          long rowCount = transaction.executeUpdate(Statement.of(sql));
-          System.out.printf("%d record inserted.\n", rowCount);
-          return null;
-        });
+            .readWriteTransaction()
+            .run(transaction -> {
+              String sql =
+                      "INSERT INTO Singers (SingerId, FirstName, LastName) "
+                              + " VALUES (10, 'Virginia', 'Watson')";
+              long rowCount = transaction.executeUpdate(Statement.of(sql));
+              System.out.printf("%d record inserted.\n", rowCount);
+              return null;
+            });
   }
   // [END spanner_dml_standard_insert]
 
@@ -2230,7 +2231,6 @@ public static void main(String[] args) {
       printUsageAndExit();
     }
     // [START init_client]
-    SpannerOptions options = SpannerOptions.newBuilder().build();
     Spanner spanner = options.getService();
     DatabaseAdminClient dbAdminClient = null;
     try {