Skip to content

Commit 5849a97

Browse files
olavloiteolavloite
authored
deps: update dependency com.google.cloud:google-cloud-spanner-bom to v6.6.0 (#498)
* deps: update dependency com.google.cloud:google-cloud-spanner-bom to v6.6.0 Updates to Spanner client 6.6.0 and adds tests for optimizer stats package. Replaces #497 * test: implement missing method for integration test
1 parent e27e947 commit 5849a97

File tree

3 files changed

+117
-35
lines changed

3 files changed

+117
-35
lines changed

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
<dependency>
7272
<groupId>com.google.cloud</groupId>
7373
<artifactId>google-cloud-spanner-bom</artifactId>
74-
<version>6.5.0</version>
74+
<version>6.6.0</version>
7575
<type>pom</type>
7676
<scope>import</scope>
7777
</dependency>

‎src/test/java/com/google/cloud/spanner/jdbc/JdbcQueryOptionsTest.java‎

Lines changed: 88 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
import com.google.cloud.spanner.MockSpannerServiceImpl.StatementResult;
2222
import com.google.cloud.spanner.SpannerOptions;
23+
import com.google.cloud.spanner.SpannerOptions.SpannerEnvironment;
2324
import com.google.cloud.spanner.Statement;
2425
import com.google.cloud.spanner.connection.AbstractMockServerTest;
2526
import com.google.common.base.MoreObjects;
@@ -40,33 +41,47 @@ public void setup() throws Exception {
4041
}
4142

4243
@Test
43-
public void testDefaultOptimizerVersion() throws SQLException {
44+
public void testDefaultOptions() throws SQLException {
4445
try (java.sql.Connection connection = createJdbcConnection()) {
4546
try (java.sql.ResultSet rs =
4647
connection.createStatement().executeQuery("SHOW VARIABLE OPTIMIZER_VERSION")) {
4748
assertThat(rs.next()).isTrue();
4849
assertThat(rs.getString("OPTIMIZER_VERSION")).isEqualTo("");
4950
assertThat(rs.next()).isFalse();
5051
}
52+
try (java.sql.ResultSet rs =
53+
connection.createStatement().executeQuery("SHOW VARIABLE OPTIMIZER_STATISTICS_PACKAGE")) {
54+
assertThat(rs.next()).isTrue();
55+
assertThat(rs.getString("OPTIMIZER_STATISTICS_PACKAGE")).isEqualTo("");
56+
assertThat(rs.next()).isFalse();
57+
}
5158
}
5259
}
5360

5461
@Test
55-
public void testOptimizerVersionInConnectionUrl() throws SQLException {
62+
public void testOptionsInConnectionUrl() throws SQLException {
5663
try (java.sql.Connection connection =
5764
DriverManager.getConnection(
58-
String.format("jdbc:%s;optimizerVersion=%s", getBaseUrl(), "100"))) {
65+
String.format(
66+
"jdbc:%s;optimizerVersion=%s;optimizerStatisticsPackage=%s",
67+
getBaseUrl(), "100", "url_package"))) {
5968
try (java.sql.ResultSet rs =
6069
connection.createStatement().executeQuery("SHOW VARIABLE OPTIMIZER_VERSION")) {
6170
assertThat(rs.next()).isTrue();
6271
assertThat(rs.getString("OPTIMIZER_VERSION")).isEqualTo("100");
6372
assertThat(rs.next()).isFalse();
6473
}
74+
try (java.sql.ResultSet rs =
75+
connection.createStatement().executeQuery("SHOW VARIABLE OPTIMIZER_STATISTICS_PACKAGE")) {
76+
assertThat(rs.next()).isTrue();
77+
assertThat(rs.getString("OPTIMIZER_STATISTICS_PACKAGE")).isEqualTo("url_package");
78+
assertThat(rs.next()).isFalse();
79+
}
6580
}
6681
}
6782

6883
@Test
69-
public void testSetOptimizerVersion() throws SQLException {
84+
public void testSetOptions() throws SQLException {
7085
try (java.sql.Connection connection = createJdbcConnection()) {
7186
connection.createStatement().execute("SET OPTIMIZER_VERSION='20'");
7287
try (java.sql.ResultSet rs =
@@ -89,41 +104,64 @@ public void testSetOptimizerVersion() throws SQLException {
89104
assertThat(rs.getString("OPTIMIZER_VERSION")).isEqualTo("");
90105
assertThat(rs.next()).isFalse();
91106
}
107+
108+
connection.createStatement().execute("SET OPTIMIZER_STATISTICS_PACKAGE='20210609'");
109+
try (java.sql.ResultSet rs =
110+
connection.createStatement().executeQuery("SHOW VARIABLE OPTIMIZER_STATISTICS_PACKAGE")) {
111+
assertThat(rs.next()).isTrue();
112+
assertThat(rs.getString("OPTIMIZER_STATISTICS_PACKAGE")).isEqualTo("20210609");
113+
assertThat(rs.next()).isFalse();
114+
}
115+
connection.createStatement().execute("SET OPTIMIZER_STATISTICS_PACKAGE='latest'");
116+
try (java.sql.ResultSet rs =
117+
connection.createStatement().executeQuery("SHOW VARIABLE OPTIMIZER_STATISTICS_PACKAGE")) {
118+
assertThat(rs.next()).isTrue();
119+
assertThat(rs.getString("OPTIMIZER_STATISTICS_PACKAGE")).isEqualTo("latest");
120+
assertThat(rs.next()).isFalse();
121+
}
122+
connection.createStatement().execute("SET OPTIMIZER_STATISTICS_PACKAGE=''");
123+
try (java.sql.ResultSet rs =
124+
connection.createStatement().executeQuery("SHOW VARIABLE OPTIMIZER_STATISTICS_PACKAGE")) {
125+
assertThat(rs.next()).isTrue();
126+
assertThat(rs.getString("OPTIMIZER_STATISTICS_PACKAGE")).isEqualTo("");
127+
assertThat(rs.next()).isFalse();
128+
}
92129
}
93130
}
94131

95132
@Test
96-
public void testSetAndUseOptimizerVersion() throws SQLException {
133+
public void testSetAndUseOptions() throws SQLException {
97134
try (java.sql.Connection connection = createJdbcConnection()) {
98135
connection.createStatement().execute("SET OPTIMIZER_VERSION='20'");
136+
connection.createStatement().execute("SET OPTIMIZER_STATISTICS_PACKAGE='20210609'");
99137
try (java.sql.ResultSet rs =
100138
connection.createStatement().executeQuery(SELECT_COUNT_STATEMENT.getSql())) {
101139
assertThat(rs.next()).isTrue();
102140
assertThat(rs.getLong(1)).isEqualTo(COUNT_BEFORE_INSERT);
103141
assertThat(rs.next()).isFalse();
104-
// Verify that the last ExecuteSqlRequest that the server received specified optimizer
105-
// version 20.
142+
// Verify that the last ExecuteSqlRequest that the server received used the options that
143+
// were set.
106144
ExecuteSqlRequest request = getLastExecuteSqlRequest();
107145
assertThat(request.getQueryOptions().getOptimizerVersion()).isEqualTo("20");
146+
assertThat(request.getQueryOptions().getOptimizerStatisticsPackage()).isEqualTo("20210609");
108147
}
109148

110-
// Do another query, but now with optimizer version 'latest'.
111149
connection.createStatement().execute("SET OPTIMIZER_VERSION='latest'");
150+
connection.createStatement().execute("SET OPTIMIZER_STATISTICS_PACKAGE='latest'");
112151
try (java.sql.ResultSet rs =
113152
connection.createStatement().executeQuery(SELECT_COUNT_STATEMENT.getSql())) {
114153
assertThat(rs.next()).isTrue();
115154
assertThat(rs.getLong(1)).isEqualTo(COUNT_BEFORE_INSERT);
116155
assertThat(rs.next()).isFalse();
117-
// Verify that the last ExecuteSqlRequest that the server received specified optimizer
118-
// version 'latest'.
119156
ExecuteSqlRequest request = getLastExecuteSqlRequest();
120157
assertThat(request.getQueryOptions().getOptimizerVersion()).isEqualTo("latest");
158+
assertThat(request.getQueryOptions().getOptimizerStatisticsPackage()).isEqualTo("latest");
121159
}
122160

123-
// Set the optimizer version to ''. This will do a fallback to the default, meaning that it
124-
// will be read from the environment variable SPANNER_OPTIMIZER_VERSION as we have nothing set
125-
// on the connection URL.
161+
// Set the options to ''. This will do a fallback to the default, meaning that it will be read
162+
// from the environment variables as we have nothing set on the connection URL.
126163
connection.createStatement().execute("SET OPTIMIZER_VERSION=''");
164+
connection.createStatement().execute("SET OPTIMIZER_STATISTICS_PACKAGE=''");
127165
try (java.sql.ResultSet rs =
128166
connection.createStatement().executeQuery(SELECT_COUNT_STATEMENT.getSql())) {
129167
assertThat(rs.next()).isTrue();
@@ -134,31 +172,49 @@ public void testSetAndUseOptimizerVersion() throws SQLException {
134172
ExecuteSqlRequest request = getLastExecuteSqlRequest();
135173
assertThat(request.getQueryOptions().getOptimizerVersion())
136174
.isEqualTo(MoreObjects.firstNonNull(System.getenv("SPANNER_OPTIMIZER_VERSION"), ""));
175+
assertThat(request.getQueryOptions().getOptimizerStatisticsPackage())
176+
.isEqualTo(MoreObjects.firstNonNull(System.getenv("OPTIMIZER_STATISTICS_PACKAGE"), ""));
137177
}
138178
}
139179
}
140180

141181
@Test
142-
public void testUseOptimizerVersionFromConnectionUrl() throws SQLException {
182+
public void testUseOptionsFromConnectionUrl() throws SQLException {
143183
try (java.sql.Connection connection =
144-
DriverManager.getConnection(String.format("jdbc:%s;optimizerVersion=10", getBaseUrl()))) {
184+
DriverManager.getConnection(
185+
String.format(
186+
"jdbc:%s;optimizerVersion=10;optimizerStatisticsPackage=20210609_10_00_00",
187+
getBaseUrl()))) {
145188
// Do a query and verify that the version from the connection URL is used.
146189
try (java.sql.ResultSet rs =
147190
connection.createStatement().executeQuery(SELECT_COUNT_STATEMENT.getSql())) {
148191
assertThat(rs.next()).isTrue();
149192
assertThat(rs.getLong(1)).isEqualTo(COUNT_BEFORE_INSERT);
150193
assertThat(rs.next()).isFalse();
151-
// The optimizer version used should be '10' from the connection URL.
194+
// The options should come from the connection URL.
152195
ExecuteSqlRequest request = getLastExecuteSqlRequest();
153196
assertThat(request.getQueryOptions().getOptimizerVersion()).isEqualTo("10");
197+
assertThat(request.getQueryOptions().getOptimizerStatisticsPackage())
198+
.isEqualTo("20210609_10_00_00");
154199
}
155200
}
156201
}
157202

158203
@Test
159-
public void testUseOptimizerVersionFromEnvironment() throws SQLException {
204+
public void testUseOptionsFromEnvironment() throws SQLException {
160205
try {
161-
SpannerOptions.useEnvironment(() -> "20");
206+
SpannerOptions.useEnvironment(
207+
new SpannerEnvironment() {
208+
@Override
209+
public String getOptimizerVersion() {
210+
return "20";
211+
}
212+
213+
@Override
214+
public String getOptimizerStatisticsPackage() {
215+
return "env_package";
216+
}
217+
});
162218
try (java.sql.Connection connection =
163219
DriverManager.getConnection(String.format("jdbc:%s", getBaseUrl()))) {
164220
// Do a query and verify that the version from the environment is used.
@@ -170,6 +226,8 @@ public void testUseOptimizerVersionFromEnvironment() throws SQLException {
170226
// Verify query options from the environment.
171227
ExecuteSqlRequest request = getLastExecuteSqlRequest();
172228
assertThat(request.getQueryOptions().getOptimizerVersion()).isEqualTo("20");
229+
assertThat(request.getQueryOptions().getOptimizerStatisticsPackage())
230+
.isEqualTo("env_package");
173231
}
174232
// Now set one of the query options on the connection. That option should be used in
175233
// combination with the other option from the environment.
@@ -183,6 +241,9 @@ public void testUseOptimizerVersionFromEnvironment() throws SQLException {
183241
ExecuteSqlRequest request = getLastExecuteSqlRequest();
184242
// Optimizer version should come from the connection.
185243
assertThat(request.getQueryOptions().getOptimizerVersion()).isEqualTo("30");
244+
// Optimizer statistics package should come from the environment.
245+
assertThat(request.getQueryOptions().getOptimizerStatisticsPackage())
246+
.isEqualTo("env_package");
186247
}
187248
}
188249
} finally {
@@ -195,22 +256,27 @@ public void testUseQueryHint() throws SQLException {
195256
mockSpanner.putStatementResult(
196257
StatementResult.query(
197258
Statement.of(
198-
String.format("@{optimizer_version=1} %s", SELECT_COUNT_STATEMENT.getSql())),
259+
String.format(
260+
"@{optimizer_version=1, optimizer_statistics_package=hint_package} %s",
261+
SELECT_COUNT_STATEMENT.getSql())),
199262
SELECT_COUNT_RESULTSET_BEFORE_INSERT));
200263
try (java.sql.Connection connection =
201264
DriverManager.getConnection(String.format("jdbc:%s", getBaseUrl()))) {
202265
try (java.sql.ResultSet rs =
203266
connection
204267
.createStatement()
205268
.executeQuery(
206-
String.format("@{optimizer_version=1} %s", SELECT_COUNT_STATEMENT.getSql()))) {
269+
String.format(
270+
"@{optimizer_version=1, optimizer_statistics_package=hint_package} %s",
271+
SELECT_COUNT_STATEMENT.getSql()))) {
207272
assertThat(rs.next()).isTrue();
208273
assertThat(rs.getLong(1)).isEqualTo(COUNT_BEFORE_INSERT);
209274
assertThat(rs.next()).isFalse();
210-
// The optimizer version used in the ExecuteSqlRequest should be empty as the query hint is
211-
// parsed by the backend.
275+
// The options used in the ExecuteSqlRequest should be empty as the query hint is parsed by
276+
// the backend.
212277
ExecuteSqlRequest request = getLastExecuteSqlRequest();
213278
assertThat(request.getQueryOptions().getOptimizerVersion()).isEqualTo("");
279+
assertThat(request.getQueryOptions().getOptimizerStatisticsPackage()).isEqualTo("");
214280
}
215281
}
216282
}

‎src/test/java/com/google/cloud/spanner/jdbc/it/ITJdbcQueryOptionsTest.java‎

Lines changed: 28 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717
package com.google.cloud.spanner.jdbc.it;
1818

1919
import static com.google.common.truth.Truth.assertThat;
20+
import static org.junit.Assert.assertEquals;
21+
import static org.junit.Assert.assertThrows;
22+
import static org.junit.Assert.assertTrue;
2023
import static org.junit.Assert.fail;
2124
import static org.junit.Assume.assumeFalse;
2225

@@ -25,6 +28,7 @@
2528
import com.google.cloud.spanner.connection.SpannerPool;
2629
import com.google.cloud.spanner.jdbc.ITAbstractJdbcTest;
2730
import com.google.cloud.spanner.jdbc.JdbcSqlException;
31+
import com.google.cloud.spanner.testing.EmulatorSpannerHelper;
2832
import com.google.rpc.Code;
2933
import com.google.spanner.v1.ExecuteSqlRequest.QueryOptions;
3034
import java.sql.Connection;
@@ -96,7 +100,8 @@ public void connectionUrl() throws SQLException {
96100

97101
@Test
98102
public void connectionUrlWithInvalidOptimizerVersion() throws SQLException {
99-
assumeFalse("optimizer version is ignored on emulator", env.getTestHelper().isEmulator());
103+
assumeFalse(
104+
"optimizer version is ignored on emulator", EmulatorSpannerHelper.isUsingEmulator());
100105
this.connectionUriSuffix = ";optimizerVersion=9999999";
101106
try (Connection connection = createConnection()) {
102107
try (ResultSet rs = connection.createStatement().executeQuery("SELECT 1")) {
@@ -139,7 +144,8 @@ public void setLatestOptimizerVersion() throws SQLException {
139144

140145
@Test
141146
public void setInvalidOptimizerVersion() throws SQLException {
142-
assumeFalse("optimizer version is ignored on emulator", env.getTestHelper().isEmulator());
147+
assumeFalse(
148+
"optimizer version is ignored on emulator", EmulatorSpannerHelper.isUsingEmulator());
143149
try (Connection connection = createConnection()) {
144150
connection.createStatement().execute("SET OPTIMIZER_VERSION='9999999'");
145151
try (ResultSet rs = connection.createStatement().executeQuery("SELECT 1")) {
@@ -156,7 +162,7 @@ public void setInvalidOptimizerVersion() throws SQLException {
156162
public void optimizerVersionInQueryHint() throws SQLException {
157163
assumeFalse(
158164
"optimizer version in query hint is not supported on emulator",
159-
env.getTestHelper().isEmulator());
165+
EmulatorSpannerHelper.isUsingEmulator());
160166
try (Connection connection = createConnection()) {
161167
verifyOptimizerVersion(connection, "");
162168
try (ResultSet rs =
@@ -175,15 +181,21 @@ public void optimizerVersionInQueryHint() throws SQLException {
175181
}
176182

177183
@Test
178-
public void optimizerVersionInEnvironment() throws SQLException {
179-
assumeFalse("optimizer version is ignored on emulator", env.getTestHelper().isEmulator());
184+
public void testOptionsInEnvironment() throws SQLException {
185+
assumeFalse(
186+
"optimizer version is ignored on emulator", EmulatorSpannerHelper.isUsingEmulator());
180187
try {
181188
SpannerOptions.useEnvironment(
182189
new SpannerOptions.SpannerEnvironment() {
183190
@Override
184191
public String getOptimizerVersion() {
185192
return "1";
186193
}
194+
195+
@Override
196+
public String getOptimizerStatisticsPackage() {
197+
return "latest";
198+
}
187199
});
188200
try (Connection connection = createConnection()) {
189201
// Environment query options are not visible to the connection.
@@ -204,15 +216,19 @@ public String getOptimizerVersion() {
204216
public String getOptimizerVersion() {
205217
return "9999999";
206218
}
219+
220+
@Override
221+
public String getOptimizerStatisticsPackage() {
222+
return "latest";
223+
}
207224
});
208225
try (Connection connection = createConnection()) {
209-
try (ResultSet rs = connection.createStatement().executeQuery("SELECT 1")) {
210-
fail("missing expected exception");
211-
} catch (SQLException e) {
212-
assertThat((Throwable) e).isInstanceOf(JdbcSqlException.class);
213-
JdbcSqlException je = (JdbcSqlException) e;
214-
assertThat(je.getCode()).isEqualTo(Code.INVALID_ARGUMENT);
215-
}
226+
SQLException e =
227+
assertThrows(
228+
SQLException.class, () -> connection.createStatement().executeQuery("SELECT 1"));
229+
assertTrue(e instanceof JdbcSqlException);
230+
JdbcSqlException je = (JdbcSqlException) e;
231+
assertEquals(Code.INVALID_ARGUMENT, je.getCode());
216232
}
217233
} finally {
218234
SpannerOptions.useDefaultEnvironment();

0 commit comments

Comments
 (0)