Skip to content

Commit 6fd894e

Browse files
feat: Enable Multiplex session by default
1 parent 7bfc62d commit 6fd894e

14 files changed

+48
-14
lines changed

.github/workflows/ci.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ jobs:
3636
- run: .kokoro/build.sh
3737
env:
3838
JOB_TYPE: test
39+
GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS: false
3940
units-with-multiplexed-session:
4041
runs-on: ubuntu-latest
4142
strategy:
@@ -52,7 +53,6 @@ jobs:
5253
- run: .kokoro/build.sh
5354
env:
5455
JOB_TYPE: test
55-
GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS: true
5656
GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS_PARTITIONED_OPS: true
5757
GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS_FOR_RW: true
5858
units-java8:
@@ -74,6 +74,7 @@ jobs:
7474
- run: .kokoro/build.sh
7575
env:
7676
JOB_TYPE: test
77+
GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS: false
7778
units-with-multiplexed-session8:
7879
# Building using Java 17 and run the tests with Java 8 runtime
7980
name: "units-with-multiplexed-session (8)"
@@ -93,7 +94,6 @@ jobs:
9394
- run: .kokoro/build.sh
9495
env:
9596
JOB_TYPE: test
96-
GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS: true
9797
GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS_PARTITIONED_OPS: true
9898
GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS_FOR_RW: true
9999
windows:
@@ -116,6 +116,7 @@ jobs:
116116
- run: .kokoro/build.bat
117117
env:
118118
JOB_TYPE: test
119+
GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS: false
119120
dependencies:
120121
runs-on: ubuntu-latest
121122
strategy:

.github/workflows/integration-tests-against-emulator-with-multiplexed-session.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,5 +38,4 @@ jobs:
3838
-Dmaven.main.skip=true -fae verify
3939
env:
4040
JOB_TYPE: test
41-
SPANNER_EMULATOR_HOST: localhost:9010
42-
GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS: true
41+
SPANNER_EMULATOR_HOST: localhost:9010

.github/workflows/integration-tests-against-emulator.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ jobs:
3737
-DtrimStackTrace=false -Dclirr.skip=true -Denforcer.skip=true \
3838
-Dmaven.main.skip=true -fae verify
3939
env:
40+
GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS: false
4041
JOB_TYPE: test
4142
SPANNER_EMULATOR_HOST: localhost:9010
4243
GOOGLE_CLOUD_PROJECT: emulator-test-project

.kokoro/continuous/common.cfg

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,8 @@ env_vars: {
2828
key: "GCLOUD_PROJECT"
2929
value: "gcloud-devel"
3030
}
31+
32+
env_vars: {
33+
key: "GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS"
34+
value: "false"
35+
}

.kokoro/nightly/common.cfg

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,7 @@ env_vars: {
2929
value: "gcloud-devel"
3030
}
3131

32+
env_vars: {
33+
key: "GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS"
34+
value: "false"
35+
}

.kokoro/presubmit/graalvm-native-a.cfg

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,9 @@ env_vars: {
3535
env_vars: {
3636
key: "IT_SERVICE_ACCOUNT_EMAIL"
3737
38+
}
39+
40+
env_vars: {
41+
key: "GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS"
42+
value: "false"
3843
}

.kokoro/presubmit/graalvm-native-b.cfg

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,9 @@ env_vars: {
3535
env_vars: {
3636
key: "IT_SERVICE_ACCOUNT_EMAIL"
3737
38+
}
39+
40+
env_vars: {
41+
key: "GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS"
42+
value: "false"
3843
}

.kokoro/presubmit/graalvm-native-c.cfg

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,9 @@ env_vars: {
3535
env_vars: {
3636
key: "IT_SERVICE_ACCOUNT_EMAIL"
3737
38+
}
39+
40+
env_vars: {
41+
key: "GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS"
42+
value: "false"
3843
}

.kokoro/presubmit/integration-directpath-enabled.cfg

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,9 @@ env_vars: {
3535
env_vars: {
3636
key: "GOOGLE_SPANNER_ENABLE_DIRECT_ACCESS"
3737
value: "true"
38+
}
39+
40+
env_vars: {
41+
key: "GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS"
42+
value: "false"
3843
}

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,6 @@ env_vars: {
3232
value: "java-it-service-account"
3333
}
3434

35-
env_vars: {
36-
key: "GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS"
37-
value: "true"
38-
}
39-
4035
env_vars: {
4136
key: "GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS_PARTITIONED_OPS"
4237
value: "true"

.kokoro/presubmit/integration.cfg

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,7 @@ env_vars: {
3232
value: "java-it-service-account"
3333
}
3434

35+
env_vars: {
36+
key: "GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS"
37+
value: "false"
38+
}

.kokoro/presubmit/samples.cfg

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,8 @@ env_vars: {
3636
key: "ENABLE_BUILD_COP"
3737
value: "true"
3838
}
39+
40+
env_vars: {
41+
key: "GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS"
42+
value: "false"
43+
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -613,7 +613,7 @@ public static class Builder {
613613

614614
// This field controls the default behavior of session management in Java client.
615615
// Set useMultiplexedSession to true to make multiplexed session the default.
616-
private boolean useMultiplexedSession = false;
616+
private boolean useMultiplexedSession = true;
617617

618618
// This field controls the default behavior of session management for RW operations in Java
619619
// client.

google-cloud-spanner/src/test/java/com/google/cloud/spanner/MultiplexedSessionDatabaseClientTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ public void testMaintainer() {
116116
@Test
117117
public void testDisableMultiplexedSessionEnvVar() throws Exception {
118118
assumeTrue(isJava8() && !isWindows());
119-
assumeFalse(System.getenv().containsKey("GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS"));
119+
assumeTrue(System.getenv().containsKey("GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS"));
120120

121121
// Assert that the mux sessions setting is respected by default.
122122
assertTrue(
@@ -147,7 +147,7 @@ public void testDisableMultiplexedSessionEnvVar() throws Exception {
147147
@Test
148148
public void testEnableMultiplexedSessionEnvVar() throws Exception {
149149
assumeTrue(isJava8() && !isWindows());
150-
assumeFalse(System.getenv().containsKey("GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS"));
150+
assumeTrue(System.getenv().containsKey("GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS"));
151151

152152
// Assert that the mux sessions setting is respected by default.
153153
assertFalse(
@@ -178,7 +178,7 @@ public void testEnableMultiplexedSessionEnvVar() throws Exception {
178178
@Test
179179
public void testIgnoreMultiplexedSessionEnvVar() throws Exception {
180180
assumeTrue(isJava8() && !isWindows());
181-
assumeFalse(System.getenv().containsKey("GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS"));
181+
assumeTrue(System.getenv().containsKey("GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS"));
182182

183183
// Assert that the mux sessions setting is respected by default.
184184
assertFalse(
@@ -209,7 +209,7 @@ public void testIgnoreMultiplexedSessionEnvVar() throws Exception {
209209
@Test
210210
public void testThrowExceptionMultiplexedSessionEnvVarInvalidValues() throws Exception {
211211
assumeTrue(isJava8() && !isWindows());
212-
assumeFalse(System.getenv().containsKey("GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS"));
212+
assumeTrue(System.getenv().containsKey("GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS"));
213213

214214
// Assert that the mux sessions setting is respected by default.
215215
assertFalse(

0 commit comments

Comments
 (0)