Merge remote-tracking branch 'origin/main' into introduce-graalvm-c

diegomarquezp · diegomarquezp · commit 1e1a982a90fd · 2025-04-24T13:03:12.000-04:00
diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml
@@ -14,6 +14,6 @@ jobs:
       shell: bash
       run: .kokoro/build.sh
     - name: Unmanaged dependency check
-      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.45.1
+      uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.46.0
       with:
         bom-path: pom.xml
diff --git a/.kokoro/build.sh b/.kokoro/build.sh
@@ -76,6 +76,8 @@ integration)
       -DtrimStackTrace=false \
       -Dclirr.skip=true \
       -Denforcer.skip=true \
+      -Dspanner.testenv.instance=projects/span-cloud-testing/instances/java-client-integration-test \
+      -Dspanner.gce.config.project_id=span-cloud-testing \
       -fae \
       verify
     RETURN_CODE=$?
diff --git a/.kokoro/presubmit/integration.cfg b/.kokoro/presubmit/integration.cfg
@@ -11,24 +11,13 @@ env_vars: {
   value: "integration"
 }
 
-# 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"
+  value: "secret_manager/java-client-testing"
 }
 
 env_vars: {
   key: "SECRET_MANAGER_KEYS"
-  value: "java-it-service-account"
+  value: "java-client-testing"
 }
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,21 @@
 # Changelog
 
+## [2.29.0](https://github.com/googleapis/java-spanner-jdbc/compare/v2.28.0...v2.29.0) (2025-04-22)
+
+
+### Features
+
+* Support isolation level repeatable read ([#1973](https://github.com/googleapis/java-spanner-jdbc/issues/1973)) ([010a502](https://github.com/googleapis/java-spanner-jdbc/commit/010a502310db88f8c676960c641a7e9a6581bf11))
+
+
+### Dependencies
+
+* Update dependency com.google.cloud:google-cloud-spanner-bom to v6.90.0 ([#1970](https://github.com/googleapis/java-spanner-jdbc/issues/1970)) ([7153c39](https://github.com/googleapis/java-spanner-jdbc/commit/7153c39464fd9b83609bb7cc2ada5c0f9aab3af8))
+* Update dependency com.google.cloud:google-cloud-spanner-bom to v6.91.1 ([#1993](https://github.com/googleapis/java-spanner-jdbc/issues/1993)) ([97d4840](https://github.com/googleapis/java-spanner-jdbc/commit/97d4840bd3e7cee7f1ddb9b26f3946f1b10ed894))
+* Update dependency com.google.cloud:sdk-platform-java-config to v3.46.0 ([#1992](https://github.com/googleapis/java-spanner-jdbc/issues/1992)) ([ea0b557](https://github.com/googleapis/java-spanner-jdbc/commit/ea0b55729d1bf9e8b5994758314841591ea0c883))
+* Update dependency io.opentelemetry:opentelemetry-bom to v1.49.0 ([#1982](https://github.com/googleapis/java-spanner-jdbc/issues/1982)) ([6b7ddf4](https://github.com/googleapis/java-spanner-jdbc/commit/6b7ddf4352d4db87eab6d9f3fd4945e5650e7798))
+* Update dependency org.springframework.data:spring-data-bom to v2024.1.5 ([#1995](https://github.com/googleapis/java-spanner-jdbc/issues/1995)) ([6bedf12](https://github.com/googleapis/java-spanner-jdbc/commit/6bedf124b9da233e6f4001dff2c1b56f0249aaad))
+
 ## [2.28.0](https://github.com/googleapis/java-spanner-jdbc/compare/v2.27.1...v2.28.0) (2025-03-21)
 
 
diff --git a/README.md b/README.md
@@ -20,7 +20,7 @@ If you are using Maven, add this to your pom.xml file:
 <dependency>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-spanner-jdbc</artifactId>
-  <version>2.28.0</version>
+  <version>2.29.0</version>
 </dependency>
 ```
 <!--- {x-version-update-end} -->
@@ -30,15 +30,15 @@ If you are using Gradle without BOM, add this to your dependencies
 
 <!--- {x-version-update-start:google-cloud-spanner-jdbc:released} -->
 ```Groovy
-implementation 'com.google.cloud:google-cloud-spanner-jdbc:2.28.0'
+implementation 'com.google.cloud:google-cloud-spanner-jdbc:2.29.0'
 ```
 <!--- {x-version-update-end} -->
 
 If you are using SBT, add this to your dependencies
 
 <!--- {x-version-update-start:google-cloud-spanner-jdbc:released} -->
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-spanner-jdbc" % "2.28.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-spanner-jdbc" % "2.29.0"
 ```
 <!--- {x-version-update-end} -->
 
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>google-cloud-spanner-jdbc</artifactId>
-  <version>2.28.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner-jdbc:current} -->
+  <version>2.29.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner-jdbc:current} -->
   <packaging>jar</packaging>
   <name>Google Cloud Spanner JDBC</name>
   <url>https://github.com/googleapis/java-spanner-jdbc</url>
@@ -14,7 +14,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>sdk-platform-java-config</artifactId>
-    <version>3.45.1</version>
+    <version>3.46.0</version>
   </parent>
   <developers>
     <developer>
@@ -61,7 +61,7 @@
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-spanner-bom</artifactId>
-        <version>6.90.0</version>
+        <version>6.91.1</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-spanner-jdbc</artifactId>
-      <version>2.28.0</version>
+      <version>2.29.0</version>
     </dependency>
     <!-- [END spanner-jdbc_install_without_bom] -->
 
diff --git a/samples/quickperf/pom.xml b/samples/quickperf/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>sdk-platform-java-config</artifactId>
-    <version>3.45.1</version>
+    <version>3.46.0</version>
     <relativePath/>
   </parent>
 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-spanner-jdbc</artifactId>
-      <version>2.28.1-SNAPSHOT</version>
+      <version>2.29.1-SNAPSHOT</version>
     </dependency>
     <!-- {x-version-update-end} -->
 
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>sdk-platform-java-config</artifactId>
-    <version>3.45.1</version>
+    <version>3.46.0</version>
     <relativePath/>
   </parent>
 
diff --git a/samples/spring-data-jdbc/pom.xml b/samples/spring-data-jdbc/pom.xml
@@ -23,14 +23,14 @@
       <dependency>
         <groupId>org.springframework.data</groupId>
         <artifactId>spring-data-bom</artifactId>
-        <version>2024.1.4</version>
+        <version>2024.1.5</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-spanner-bom</artifactId>
-        <version>6.90.0</version>
+        <version>6.91.1</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
diff --git a/samples/spring-data-mybatis/pom.xml b/samples/spring-data-mybatis/pom.xml
@@ -28,7 +28,7 @@
       <dependency>
         <groupId>org.springframework.data</groupId>
         <artifactId>spring-data-bom</artifactId>
-        <version>2024.1.4</version>
+        <version>2024.1.5</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
diff --git a/src/main/java/com/google/cloud/spanner/jdbc/JdbcStatement.java b/src/main/java/com/google/cloud/spanner/jdbc/JdbcStatement.java
@@ -201,15 +201,13 @@ Statement addReturningToStatement(Statement statement, ImmutableList<String> gen
       if (generatedKeysColumns.size() == 1
           && ALL_COLUMNS.get(0).equals(generatedKeysColumns.get(0))) {
         // Add a 'THEN RETURN/RETURNING *' clause to the statement.
-        return statement
-            .toBuilder()
+        return statement.toBuilder()
             .replace(statement.getSql() + getReturningAllColumnsClause())
             .build();
       }
       // Add a 'THEN RETURN/RETURNING col1, col2, ...' to the statement.
       // The column names will be quoted using the dialect-specific identifier quoting character.
-      return statement
-          .toBuilder()
+      return statement.toBuilder()
           .replace(
               generatedKeysColumns.stream()
                   .map(this::quoteColumn)
diff --git a/src/test/java/com/google/cloud/spanner/jdbc/AllTypesMockServerTest.java b/src/test/java/com/google/cloud/spanner/jdbc/AllTypesMockServerTest.java
@@ -144,8 +144,7 @@ public void testInsertAllTypes() {
     if (dialect == Dialect.POSTGRESQL) {
       Statement insertStatement = createInsertStatement(dialect);
       insertStatement =
-          insertStatement
-              .toBuilder()
+          insertStatement.toBuilder()
               .replace(insertStatement.getSql().replaceAll("@p", "\\$"))
               .bind("p16")
               .to(
diff --git a/src/test/java/com/google/cloud/spanner/jdbc/BatchMockServerTest.java b/src/test/java/com/google/cloud/spanner/jdbc/BatchMockServerTest.java
@@ -0,0 +1,100 @@
+/*
+ * 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.google.cloud.spanner.jdbc;
+
+import static com.google.cloud.spanner.jdbc.FallbackToPartitionedDMLMockServerTest.createTransactionMutationLimitExceededException;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertThrows;
+
+import com.google.cloud.spanner.MockSpannerServiceImpl.StatementResult;
+import com.google.cloud.spanner.SpannerBatchUpdateException;
+import com.google.cloud.spanner.TransactionMutationLimitExceededException;
+import com.google.cloud.spanner.connection.AbstractMockServerTest;
+import com.google.spanner.v1.ExecuteBatchDmlRequest;
+import com.google.spanner.v1.ExecuteSqlRequest;
+import java.sql.BatchUpdateException;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.sql.Statement;
+import org.junit.After;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+@RunWith(JUnit4.class)
+public class BatchMockServerTest extends AbstractMockServerTest {
+  private static final String NON_PARAMETERIZED_INSERT =
+      "insert into foo (id, value) values (1, 'One')";
+  private static final String NON_PARAMETERIZED_UPDATE = "update foo set value='Zero' where id=0";
+  private static final String LARGE_UPDATE = "update foo set value='Zero' where true";
+
+  @BeforeClass
+  public static void setup() {
+    mockSpanner.putStatementResult(
+        StatementResult.update(
+            com.google.cloud.spanner.Statement.of(NON_PARAMETERIZED_INSERT), 1L));
+    mockSpanner.putStatementResult(
+        StatementResult.update(
+            com.google.cloud.spanner.Statement.of(NON_PARAMETERIZED_UPDATE), 1L));
+    mockSpanner.putStatementResult(
+        StatementResult.exception(
+            com.google.cloud.spanner.Statement.of(LARGE_UPDATE),
+            createTransactionMutationLimitExceededException()));
+  }
+
+  @After
+  public void clearRequests() {
+    mockSpanner.clearRequests();
+  }
+
+  @Test
+  public void testStatementBatch() throws SQLException {
+    try (Connection connection = createJdbcConnection()) {
+      try (Statement statement = connection.createStatement()) {
+        statement.addBatch(NON_PARAMETERIZED_INSERT);
+        statement.addBatch(NON_PARAMETERIZED_UPDATE);
+        assertArrayEquals(new int[] {1, 1}, statement.executeBatch());
+      }
+    }
+    assertEquals(1, mockSpanner.countRequestsOfType(ExecuteBatchDmlRequest.class));
+    assertEquals(0, mockSpanner.countRequestsOfType(ExecuteSqlRequest.class));
+  }
+
+  @Test
+  public void testStatementBatchFailsDueToMutationLimit() throws SQLException {
+    try (Connection connection = createJdbcConnection()) {
+      try (Statement statement = connection.createStatement()) {
+        statement.addBatch(NON_PARAMETERIZED_INSERT);
+        statement.addBatch(LARGE_UPDATE);
+
+        BatchUpdateException batchUpdateException =
+            assertThrows(BatchUpdateException.class, statement::executeBatch);
+        assertNotNull(batchUpdateException.getCause());
+        assertEquals(SpannerBatchUpdateException.class, batchUpdateException.getCause().getClass());
+        assertNotNull(batchUpdateException.getCause().getCause());
+        assertEquals(
+            TransactionMutationLimitExceededException.class,
+            batchUpdateException.getCause().getCause().getClass());
+      }
+    }
+    assertEquals(1, mockSpanner.countRequestsOfType(ExecuteBatchDmlRequest.class));
+    assertEquals(0, mockSpanner.countRequestsOfType(ExecuteSqlRequest.class));
+  }
+}
diff --git a/src/test/java/com/google/cloud/spanner/jdbc/ExecuteMockServerTest.java b/src/test/java/com/google/cloud/spanner/jdbc/ExecuteMockServerTest.java
@@ -176,22 +176,19 @@ public void setupResults() {
       mockSpanner.putStatementResult(
           StatementResult.query(
               com.google.cloud.spanner.Statement.of(dmlReturning),
-              resultSet
-                  .toBuilder()
+              resultSet.toBuilder()
                   .setStats(ResultSetStats.newBuilder().setRowCountExact(1L).build())
                   .build()));
       mockSpanner.putStatementResult(
           StatementResult.query(
               com.google.cloud.spanner.Statement.of(DML_THEN_RETURN_ID),
-              returnIdResultSet
-                  .toBuilder()
+              returnIdResultSet.toBuilder()
                   .setStats(ResultSetStats.newBuilder().setRowCountExact(1L).build())
                   .build()));
       mockSpanner.putStatementResult(
           StatementResult.query(
               com.google.cloud.spanner.Statement.of(LARGE_DML_THEN_RETURN_ID),
-              returnIdResultSet
-                  .toBuilder()
+              returnIdResultSet.toBuilder()
                   .setStats(
                       ResultSetStats.newBuilder().setRowCountExact(LARGE_UPDATE_COUNT).build())
                   .build()));
diff --git a/src/test/java/com/google/cloud/spanner/jdbc/MultiplexedSessionsTest.java b/src/test/java/com/google/cloud/spanner/jdbc/MultiplexedSessionsTest.java
@@ -167,15 +167,13 @@ public void setupResults() {
     mockSpanner.putStatementResult(
         StatementResult.query(
             com.google.cloud.spanner.Statement.of(dmlReturning),
-            resultSet
-                .toBuilder()
+            resultSet.toBuilder()
                 .setStats(ResultSetStats.newBuilder().setRowCountExact(1L).build())
                 .build()));
     mockSpanner.putStatementResult(
         StatementResult.query(
             com.google.cloud.spanner.Statement.of(DML_THEN_RETURN_ID),
-            returnIdResultSet
-                .toBuilder()
+            returnIdResultSet.toBuilder()
                 .setStats(ResultSetStats.newBuilder().setRowCountExact(1L).build())
                 .build()));
   }
diff --git a/versions.txt b/versions.txt
@@ -1,4 +1,4 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-spanner-jdbc:2.28.0:2.28.1-SNAPSHOT
+google-cloud-spanner-jdbc:2.29.0:2.29.1-SNAPSHOT
