Merge branch 'main' into renovate/io.opentelemetry-opentelemetry-bom-1.x

Author: rahul2393

.github/workflows/ci.yaml

@@ -53,6 +53,7 @@ jobs:
       env:
         JOB_TYPE: test
         GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS: true
+        GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS_PARTITIONED_OPS: true
   units-java8:
     # Building using Java 17 and run the tests with Java 8 runtime
     name: "units (8)"
@@ -92,6 +93,7 @@ jobs:
         env:
           JOB_TYPE: test
           GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS: true
+          GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS_PARTITIONED_OPS: true
   windows:
     runs-on: windows-latest
     steps:

.kokoro/continuous/java8.cfg

@@ -36,3 +36,8 @@ env_vars: {
     key: "GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS"
     value: "true"
 }
+
+env_vars: {
+    key: "GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS_PARTITIONED_OPS"
+    value: "true"
+}

.kokoro/nightly/java7.cfg

@@ -7,4 +7,9 @@
     <method>CloudExecutorImpl(boolean)</method>
     <to>CloudExecutorImpl(boolean, double)</to>
   </difference>
+  <difference>
+    <differenceType>7002</differenceType>
+    <className>com/google/cloud/spanner/SessionPoolOptionsHelper</className>
+    <method>com.google.cloud.spanner.SessionPoolOptions$Builder setUseMultiplexedSessionBlindWrite(com.google.cloud.spanner.SessionPoolOptions$Builder, boolean)</method>
+  </difference>
 </differences>

.kokoro/nightly/java8-win.cfg

@@ -189,6 +189,13 @@
       <scope>test</scope>
     </dependency>
 
+    <dependency>
+      <groupId>org.apache.maven.surefire</groupId>
+      <artifactId>surefire-junit4</artifactId>
+      <version>3.5.2</version>
+      <scope>test</scope>
+    </dependency>
+
   </dependencies>
   <build>
     <plugins>
@@ -259,7 +266,7 @@
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-dependency-plugin</artifactId>
           <configuration>
-            <ignoredDependencies> com.google.api:gax</ignoredDependencies>
+            <ignoredDependencies> com.google.api:gax,org.apache.maven.surefire:surefire-junit4 </ignoredDependencies>
           </configuration>
         </plugin>
       </plugins>

.kokoro/presubmit/clirr.cfg

@@ -830,10 +830,10 @@ private synchronized Spanner getClient(long timeoutSeconds, boolean useMultiplex
     com.google.cloud.spanner.SessionPoolOptions.Builder poolOptionsBuilder =
         com.google.cloud.spanner.SessionPoolOptions.newBuilder();
     SessionPoolOptionsHelper.setUseMultiplexedSession(poolOptionsBuilder, useMultiplexedSession);
-    SessionPoolOptionsHelper.setUseMultiplexedSessionBlindWrite(
-        poolOptionsBuilder, useMultiplexedSession);
     SessionPoolOptionsHelper.setUseMultiplexedSessionForRW(
         poolOptionsBuilder, useMultiplexedSession);
+    SessionPoolOptionsHelper.setUseMultiplexedSessionForPartitionedOperations(
+        poolOptionsBuilder, useMultiplexedSession);
     LOGGER.log(
         Level.INFO,
         String.format(

.kokoro/presubmit/integration-cloud-devel.cfg

@@ -31,17 +31,17 @@ public static SessionPoolOptions.Builder setUseMultiplexedSession(
     return sessionPoolOptionsBuilder.setUseMultiplexedSession(useMultiplexedSession);
   }
 
-  // TODO: Remove when multiplexed session for blind write is released.
-  public static SessionPoolOptions.Builder setUseMultiplexedSessionBlindWrite(
-      SessionPoolOptions.Builder sessionPoolOptionsBuilder,
-      boolean useMultiplexedSessionBlindWrite) {
-    return sessionPoolOptionsBuilder.setUseMultiplexedSessionBlindWrite(
-        useMultiplexedSessionBlindWrite);
-  }
-
   // TODO: Remove when multiplexed session for read write is released.
   public static SessionPoolOptions.Builder setUseMultiplexedSessionForRW(
       SessionPoolOptions.Builder sessionPoolOptionsBuilder, boolean useMultiplexedSessionForRW) {
     return sessionPoolOptionsBuilder.setUseMultiplexedSessionForRW(useMultiplexedSessionForRW);
   }
+
+  // TODO: Remove when multiplexed session for partitioned operations are released.
+  public static SessionPoolOptions.Builder setUseMultiplexedSessionForPartitionedOperations(
+      SessionPoolOptions.Builder sessionPoolOptionsBuilder,
+      boolean useMultiplexedSessionForPartitionedOps) {
+    return sessionPoolOptionsBuilder.setUseMultiplexedSessionPartitionedOps(
+        useMultiplexedSessionForPartitionedOps);
+  }
 }

.kokoro/presubmit/integration-multiplexed-sessions-enabled.cfg

@@ -19,7 +19,6 @@
 import com.google.api.gax.rpc.ServerStream;
 import com.google.cloud.Timestamp;
 import com.google.cloud.spanner.Options.TransactionOption;
-import com.google.cloud.spanner.Options.UpdateOption;
 import com.google.spanner.v1.BatchWriteResponse;
 
 /**
@@ -51,9 +50,4 @@ public ServerStream<BatchWriteResponse> batchWriteAtLeastOnce(
       throws SpannerException {
     throw new UnsupportedOperationException();
   }
-
-  @Override
-  public long executePartitionedUpdate(Statement stmt, UpdateOption... options) {
-    throw new UnsupportedOperationException();
-  }
 }