Skip to content

Commit 0b821ee

Browse files
gagangupt16gagangupt16
authored
Merge branch 'main' into uuid
2 parents 430e7c7 + 2d65e88 commit 0b821ee

File tree

26 files changed

+412
-124
lines changed

26 files changed

+412
-124
lines changed

‎.github/workflows/ci.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ jobs:
5454
JOB_TYPE: test
5555
GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS: true
5656
GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS_PARTITIONED_OPS: true
57+
GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS_FOR_RW: true
5758
units-java8:
5859
# Building using Java 17 and run the tests with Java 8 runtime
5960
name: "units (8)"
@@ -94,6 +95,7 @@ jobs:
9495
JOB_TYPE: test
9596
GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS: true
9697
GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS_PARTITIONED_OPS: true
98+
GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS_FOR_RW: true
9799
windows:
98100
runs-on: windows-latest
99101
steps:

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,3 +41,8 @@ env_vars: {
4141
key: "GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS_PARTITIONED_OPS"
4242
value: "true"
4343
}
44+
45+
env_vars: {
46+
key: "GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS_FOR_RW"
47+
value: "true"
48+
}

‎benchmarks/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>com.google.cloud</groupId>
2626
<artifactId>google-cloud-spanner-parent</artifactId>
27-
<version>6.85.0</version><!-- {x-version-update:google-cloud-spanner:current} -->
27+
<version>6.85.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner:current} -->
2828
</parent>
2929

3030
<properties>

‎google-cloud-spanner-bom/pom.xml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>com.google.cloud</groupId>
55
<artifactId>google-cloud-spanner-bom</artifactId>
6-
<version>6.85.0</version><!-- {x-version-update:google-cloud-spanner:current} -->
6+
<version>6.85.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner:current} -->
77
<packaging>pom</packaging>
88
<parent>
99
<groupId>com.google.cloud</groupId>
@@ -53,43 +53,43 @@
5353
<dependency>
5454
<groupId>com.google.cloud</groupId>
5555
<artifactId>google-cloud-spanner</artifactId>
56-
<version>6.85.0</version><!-- {x-version-update:google-cloud-spanner:current} -->
56+
<version>6.85.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner:current} -->
5757
</dependency>
5858
<dependency>
5959
<groupId>com.google.cloud</groupId>
6060
<artifactId>google-cloud-spanner</artifactId>
6161
<type>test-jar</type>
62-
<version>6.85.0</version><!-- {x-version-update:google-cloud-spanner:current} -->
62+
<version>6.85.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner:current} -->
6363
</dependency>
6464
<dependency>
6565
<groupId>com.google.api.grpc</groupId>
6666
<artifactId>grpc-google-cloud-spanner-v1</artifactId>
67-
<version>6.85.0</version><!-- {x-version-update:grpc-google-cloud-spanner-v1:current} -->
67+
<version>6.85.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-spanner-v1:current} -->
6868
</dependency>
6969
<dependency>
7070
<groupId>com.google.api.grpc</groupId>
7171
<artifactId>grpc-google-cloud-spanner-admin-instance-v1</artifactId>
72-
<version>6.85.0</version><!-- {x-version-update:grpc-google-cloud-spanner-admin-instance-v1:current} -->
72+
<version>6.85.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-spanner-admin-instance-v1:current} -->
7373
</dependency>
7474
<dependency>
7575
<groupId>com.google.api.grpc</groupId>
7676
<artifactId>grpc-google-cloud-spanner-admin-database-v1</artifactId>
77-
<version>6.85.0</version><!-- {x-version-update:grpc-google-cloud-spanner-admin-database-v1:current} -->
77+
<version>6.85.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-spanner-admin-database-v1:current} -->
7878
</dependency>
7979
<dependency>
8080
<groupId>com.google.api.grpc</groupId>
8181
<artifactId>proto-google-cloud-spanner-admin-instance-v1</artifactId>
82-
<version>6.85.0</version><!-- {x-version-update:proto-google-cloud-spanner-admin-instance-v1:current} -->
82+
<version>6.85.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-spanner-admin-instance-v1:current} -->
8383
</dependency>
8484
<dependency>
8585
<groupId>com.google.api.grpc</groupId>
8686
<artifactId>proto-google-cloud-spanner-v1</artifactId>
87-
<version>6.85.0</version><!-- {x-version-update:proto-google-cloud-spanner-v1:current} -->
87+
<version>6.85.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-spanner-v1:current} -->
8888
</dependency>
8989
<dependency>
9090
<groupId>com.google.api.grpc</groupId>
9191
<artifactId>proto-google-cloud-spanner-admin-database-v1</artifactId>
92-
<version>6.85.0</version><!-- {x-version-update:proto-google-cloud-spanner-admin-database-v1:current} -->
92+
<version>6.85.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-spanner-admin-database-v1:current} -->
9393
</dependency>
9494
</dependencies>
9595
</dependencyManagement>

‎google-cloud-spanner-executor/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
<modelVersion>4.0.0</modelVersion>
66
<groupId>com.google.cloud</groupId>
77
<artifactId>google-cloud-spanner-executor</artifactId>
8-
<version>6.85.0</version><!-- {x-version-update:google-cloud-spanner-executor:current} -->
8+
<version>6.85.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner-executor:current} -->
99
<packaging>jar</packaging>
1010
<name>Google Cloud Spanner Executor</name>
1111

1212
<parent>
1313
<groupId>com.google.cloud</groupId>
1414
<artifactId>google-cloud-spanner-parent</artifactId>
15-
<version>6.85.0</version><!-- {x-version-update:google-cloud-spanner:current} -->
15+
<version>6.85.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner:current} -->
1616
</parent>
1717

1818
<properties>

‎google-cloud-spanner/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>com.google.cloud</groupId>
55
<artifactId>google-cloud-spanner</artifactId>
6-
<version>6.85.0</version><!-- {x-version-update:google-cloud-spanner:current} -->
6+
<version>6.85.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner:current} -->
77
<packaging>jar</packaging>
88
<name>Google Cloud Spanner</name>
99
<url>https://github.com/googleapis/java-spanner</url>
1010
<description>Java idiomatic client for Google Cloud Spanner.</description>
1111
<parent>
1212
<groupId>com.google.cloud</groupId>
1313
<artifactId>google-cloud-spanner-parent</artifactId>
14-
<version>6.85.0</version><!-- {x-version-update:google-cloud-spanner:current} -->
14+
<version>6.85.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner:current} -->
1515
</parent>
1616
<properties>
1717
<site.installationModule>google-cloud-spanner</site.installationModule>

‎google-cloud-spanner/src/test/java/com/google/cloud/spanner/AsyncRunnerTest.java‎

Lines changed: 39 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,17 @@ public void asyncRunnerUpdateAbortedWithoutGettingResult() throws Exception {
201201
executor);
202202
assertThat(result.get()).isNull();
203203
assertThat(attempt.get()).isEqualTo(2);
204-
if (isMultiplexedSessionsEnabled()) {
204+
if (isMultiplexedSessionsEnabledForRW()) {
205+
assertThat(mockSpanner.getRequestTypes())
206+
.containsExactly(
207+
CreateSessionRequest.class,
208+
ExecuteSqlRequest.class,
209+
// The retry will use an explicit BeginTransaction RPC because the first statement of
210+
// the transaction did not return a transaction id during the initial attempt.
211+
BeginTransactionRequest.class,
212+
ExecuteSqlRequest.class,
213+
CommitRequest.class);
214+
} else if (isMultiplexedSessionsEnabled()) {
205215
assertThat(mockSpanner.getRequestTypes())
206216
.containsExactly(
207217
CreateSessionRequest.class,
@@ -260,7 +270,11 @@ public void asyncRunnerWaitsUntilAsyncUpdateHasFinished() throws Exception {
260270
},
261271
executor);
262272
res.get();
263-
if (isMultiplexedSessionsEnabled()) {
273+
if (isMultiplexedSessionsEnabledForRW()) {
274+
assertThat(mockSpanner.getRequestTypes())
275+
.containsAtLeast(
276+
CreateSessionRequest.class, ExecuteSqlRequest.class, CommitRequest.class);
277+
} else if (isMultiplexedSessionsEnabled()) {
264278
// The mock server could have received a CreateSession request for a multiplexed session, but
265279
// it could also be that that request has not yet reached the server.
266280
assertThat(mockSpanner.getRequestTypes())
@@ -404,7 +418,17 @@ public void asyncRunnerBatchUpdateAbortedWithoutGettingResult() throws Exception
404418
executor);
405419
assertThat(result.get()).isNull();
406420
assertThat(attempt.get()).isEqualTo(2);
407-
if (isMultiplexedSessionsEnabled()) {
421+
if (isMultiplexedSessionsEnabledForRW()) {
422+
assertThat(mockSpanner.getRequestTypes())
423+
.containsExactly(
424+
CreateSessionRequest.class,
425+
ExecuteSqlRequest.class,
426+
ExecuteBatchDmlRequest.class,
427+
CommitRequest.class,
428+
ExecuteSqlRequest.class,
429+
ExecuteBatchDmlRequest.class,
430+
CommitRequest.class);
431+
} else if (isMultiplexedSessionsEnabled()) {
408432
assertThat(mockSpanner.getRequestTypes())
409433
.containsExactly(
410434
CreateSessionRequest.class,
@@ -463,7 +487,11 @@ public void asyncRunnerWaitsUntilAsyncBatchUpdateHasFinished() throws Exception
463487
},
464488
executor);
465489
res.get();
466-
if (isMultiplexedSessionsEnabled()) {
490+
if (isMultiplexedSessionsEnabledForRW()) {
491+
assertThat(mockSpanner.getRequestTypes())
492+
.containsExactly(
493+
CreateSessionRequest.class, ExecuteBatchDmlRequest.class, CommitRequest.class);
494+
} else if (isMultiplexedSessionsEnabled()) {
467495
assertThat(mockSpanner.getRequestTypes())
468496
.containsExactly(
469497
CreateSessionRequest.class,
@@ -576,4 +604,11 @@ private boolean isMultiplexedSessionsEnabled() {
576604
}
577605
return spanner.getOptions().getSessionPoolOptions().getUseMultiplexedSession();
578606
}
607+
608+
private boolean isMultiplexedSessionsEnabledForRW() {
609+
if (spanner.getOptions() == null || spanner.getOptions().getSessionPoolOptions() == null) {
610+
return false;
611+
}
612+
return spanner.getOptions().getSessionPoolOptions().getUseMultiplexedSessionForRW();
613+
}
579614
}

0 commit comments

Comments
 (0)