Merge branch 'main' into renovate/opentelemetry.version

Author: sakthivelmanii

.kokoro/presubmit/samples.cfg

@@ -0,0 +1,38 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-kokoro-resources/java8"
+}
+
+env_vars: {
+  key: "JOB_TYPE"
+  value: "samples"
+}
+
+# TODO: remove this after we've migrated all tests and scripts
+env_vars: {
+  key: "GCLOUD_PROJECT"
+  value: "gcloud-devel"
+}
+
+env_vars: {
+  key: "GOOGLE_CLOUD_PROJECT"
+  value: "gcloud-devel"
+}
+
+env_vars: {
+  key: "GOOGLE_APPLICATION_CREDENTIALS"
+  value: "secret_manager/java-it-service-account"
+}
+
+env_vars: {
+  key: "SECRET_MANAGER_KEYS"
+  value: "java-it-service-account"
+}
+
+env_vars: {
+  key: "ENABLE_BUILD_COP"
+  value: "true"
+}

README.md

@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>libraries-bom</artifactId>
-      <version>26.57.0</version>
+      <version>26.60.0</version>
       <type>pom</type>
       <scope>import</scope>
     </dependency>
@@ -41,7 +41,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 <dependency>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-spanner</artifactId>
-  <version>6.89.0</version>
+  <version>6.93.0</version>
 </dependency>
 
 ```
@@ -575,6 +575,7 @@ Samples are in the [`samples/`](https://github.com/googleapis/java-spanner/tree/
 | Tag Sample | [source code](https://github.com/googleapis/java-spanner/blob/main/samples/snippets/src/main/java/com/example/spanner/TagSample.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-spanner&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/spanner/TagSample.java) |
 | Tracing Sample | [source code](https://github.com/googleapis/java-spanner/blob/main/samples/snippets/src/main/java/com/example/spanner/TracingSample.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-spanner&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/spanner/TracingSample.java) |
 | Transaction Timeout Example | [source code](https://github.com/googleapis/java-spanner/blob/main/samples/snippets/src/main/java/com/example/spanner/TransactionTimeoutExample.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-spanner&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/spanner/TransactionTimeoutExample.java) |
+| Unnamed Parameters Example | [source code](https://github.com/googleapis/java-spanner/blob/main/samples/snippets/src/main/java/com/example/spanner/UnnamedParametersExample.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-spanner&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/spanner/UnnamedParametersExample.java) |
 | Update Backup Schedule Sample | [source code](https://github.com/googleapis/java-spanner/blob/main/samples/snippets/src/main/java/com/example/spanner/UpdateBackupScheduleSample.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-spanner&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/spanner/UpdateBackupScheduleSample.java) |
 | Update Database Sample | [source code](https://github.com/googleapis/java-spanner/blob/main/samples/snippets/src/main/java/com/example/spanner/UpdateDatabaseSample.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-spanner&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/spanner/UpdateDatabaseSample.java) |
 | Update Database With Default Leader Sample | [source code](https://github.com/googleapis/java-spanner/blob/main/samples/snippets/src/main/java/com/example/spanner/UpdateDatabaseWithDefaultLeaderSample.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-spanner&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/spanner/UpdateDatabaseWithDefaultLeaderSample.java) |

benchmarks/pom.xml

@@ -92,7 +92,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-spanner</artifactId>
-      <version>6.92.0</version>
+      <version>6.93.0</version>
     </dependency>
     <dependency>
       <groupId>commons-cli</groupId>

google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/ConnectionOptions.java

@@ -556,7 +556,11 @@ Builder setCredentials(Credentials credentials) {
       return this;
     }
 
-    Builder setStatementExecutorType(StatementExecutorType statementExecutorType) {
+    /**
+     * Sets the executor type to use for connections. See {@link StatementExecutorType} for more
+     * information on what the different options mean.
+     */
+    public Builder setStatementExecutorType(StatementExecutorType statementExecutorType) {
       this.statementExecutorType = statementExecutorType;
       return this;
     }
@@ -920,7 +924,11 @@ CredentialsProvider getCredentialsProvider() {
     return getInitialConnectionPropertyValue(CREDENTIALS_PROVIDER);
   }
 
-  StatementExecutorType getStatementExecutorType() {
+  /**
+   * Returns the executor type that is used by connections that are created from this {@link
+   * ConnectionOptions} instance.
+   */
+  public StatementExecutorType getStatementExecutorType() {
     return this.statementExecutorType;
   }
 

google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/StatementExecutor.java

@@ -172,9 +172,23 @@ private static ListeningExecutorService createExecutorService(StatementExecutorT
    */
   private final List<StatementExecutionInterceptor> interceptors;
 
-  enum StatementExecutorType {
+  /** The executor type that is used for statements that are executed on a connection. */
+  public enum StatementExecutorType {
+    /**
+     * Use a platform thread per connection. This allows async execution of statements, but costs
+     * more resources than the other options.
+     */
     PLATFORM_THREAD,
+    /**
+     * Use a virtual thread per connection. This allows async execution of statements. Virtual
+     * threads are only supported on Java 21 and higher.
+     */
     VIRTUAL_THREAD,
+    /**
+     * Use the calling thread for execution. This does not support async execution of statements.
+     * This option is used by drivers that do not support async execution, such as JDBC and
+     * PGAdapter.
+     */
     DIRECT_EXECUTOR,
   }
 

samples/install-without-bom/pom.xml

@@ -33,7 +33,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-spanner</artifactId>
-      <version>6.92.0</version>
+      <version>6.93.0</version>
     </dependency>
     <!-- [END spanner_install_without_bom] -->
 

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

@@ -66,8 +66,7 @@ static void addSplitPoints(String projectId, String instanceId, String databaseI
       com.google.spanner.admin.database.v1.SplitPoints splitPointForTable =
           SplitPoints.newBuilder()
               .setTable("Singers")
-              .setKeys(
-                  0,
+              .addKeys(
                   com.google.spanner.admin.database.v1.SplitPoints.Key.newBuilder()
                       .setKeyParts(
                           ListValue.newBuilder()
@@ -79,8 +78,7 @@ static void addSplitPoints(String projectId, String instanceId, String databaseI
       com.google.spanner.admin.database.v1.SplitPoints splitPointForIndex =
           SplitPoints.newBuilder()
               .setIndex("SingersByFirstLastName")
-              .setKeys(
-                  0,
+              .addKeys(
                   com.google.spanner.admin.database.v1.SplitPoints.Key.newBuilder()
                       .setKeyParts(
                           ListValue.newBuilder()
@@ -93,16 +91,14 @@ static void addSplitPoints(String projectId, String instanceId, String databaseI
       com.google.spanner.admin.database.v1.SplitPoints splitPointForIndexWitTableKey =
           SplitPoints.newBuilder()
               .setIndex("SingersByFirstLastName")
-              .setKeys(
-                  0,
+              .addKeys(
                   com.google.spanner.admin.database.v1.SplitPoints.Key.newBuilder()
                       .setKeyParts(
                           ListValue.newBuilder()
                               .addValues(Value.newBuilder().setStringValue("Jane").build())
                               .addValues(Value.newBuilder().setStringValue("Doe").build())
                               .build()))
-              .setKeys(
-                  1,
+              .addKeys(
                   com.google.spanner.admin.database.v1.SplitPoints.Key.newBuilder()
                       .setKeyParts(
                           ListValue.newBuilder()

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

@@ -0,0 +1,84 @@
+/*
+ * Copyright 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.example.spanner;
+
+import com.google.cloud.Timestamp;
+import com.google.cloud.spanner.DatabaseClient;
+import com.google.cloud.spanner.DatabaseId;
+import com.google.cloud.spanner.ResultSet;
+import com.google.cloud.spanner.Spanner;
+import com.google.cloud.spanner.SpannerOptions;
+import com.google.cloud.spanner.Statement;
+import com.google.cloud.spanner.Statement.StatementFactory;
+import java.time.LocalDate;
+
+public class UnnamedParametersExample {
+
+  static void executeQueryWithUnnamedParameters() {
+    // TODO(developer): Replace these variables before running the sample.
+    String projectId = "my-project";
+    String instanceId = "my-instance";
+    String databaseId = "my-database";
+
+    executeQueryWithUnnamedParameters(projectId, instanceId, databaseId);
+  }
+
+  static void executeQueryWithUnnamedParameters(
+      String projectId, String instanceId, String databaseId) {
+    try (Spanner spanner =
+        SpannerOptions.newBuilder().setProjectId(projectId).build().getService()) {
+
+      DatabaseClient client =
+          spanner.getDatabaseClient(DatabaseId.of(projectId, instanceId, databaseId));
+      StatementFactory statementFactory = client.getStatementFactory();
+
+      // Insert a row with unnamed parameters
+      client
+          .readWriteTransaction()
+          .run(
+              transaction -> {
+                Statement statement = statementFactory
+                    .withUnnamedParameters("INSERT INTO Students(StudentId, Name, IsNRI, AvgMarks, "
+                            + "JoinedAt, PinCode, CreatedAt) VALUES(?, ?, ?, ?, ?, ?, ?)",
+                        1000001,
+                        "Google",
+                        false,
+                        (float) 34.5,
+                        LocalDate.of(2024, 3, 31),
+                        "123456",
+                        Timestamp.now());
+                transaction.executeUpdate(statement);
+
+                return null;
+              });
+      System.out.println("Row is inserted.");
+
+      // Query the table with unnamed parameters
+      try (ResultSet resultSet =
+          client
+              .singleUse()
+              .executeQuery(
+                  statementFactory.withUnnamedParameters(
+                      "SELECT * FROM Students WHERE StudentId = ?", 1000001))) {
+        while (resultSet.next()) {
+          System.out.println(resultSet.getString("Name"));
+        }
+      }
+      System.out.println("Row is fetched.");
+    }
+  }
+}

samples/snippets/src/test/java/com/example/spanner/UnnamedParametersIT.java

@@ -0,0 +1,61 @@
+/*
+ * Copyright 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.example.spanner;
+
+import static org.junit.Assert.assertTrue;
+
+import com.google.cloud.spanner.DatabaseId;
+import com.google.common.collect.ImmutableList;
+import java.util.concurrent.ExecutionException;
+import org.junit.Before;
+import org.junit.Test;
+
+public class UnnamedParametersIT extends SampleTestBase {
+  private static String databaseId;
+
+  @Before
+  public void setup() throws ExecutionException, InterruptedException {
+    databaseId = idGenerator.generateDatabaseId();
+    databaseAdminClient
+        .createDatabase(
+            databaseAdminClient
+                .newDatabaseBuilder(DatabaseId.of(projectId, instanceId, databaseId))
+                .build(),
+            ImmutableList.of(
+                "CREATE TABLE Students ("
+                    + "  StudentId INT64 NOT NULL PRIMARY KEY,"
+                    + "  Name STRING(1024) NOT NULL,"
+                    + "  IsNRI BOOL NOT NULL,"
+                    + "  AvgMarks FLOAT32 NOT NULL,"
+                    + "  JoinedAt DATE NOT NULL,"
+                    + "  PinCode  INT64 NOT NULL,"
+                    + "  CreatedAt TIMESTAMP NOT NULL"
+                    + ")"))
+        .get();
+  }
+
+  @Test
+  public void testUnnamedParameters() throws Exception {
+    final String out =
+        SampleRunner.runSample(
+            () -> UnnamedParametersExample.executeQueryWithUnnamedParameters(projectId, instanceId,
+                databaseId));
+    assertTrue(out.contains("Row is inserted."));
+    assertTrue(out.contains("Google"));
+    assertTrue(out.contains("Row is fetched."));
+  }
+}