Skip to content

Commit fdd308d

Browse files
mpeddada1mpeddada1
authored
Merge branch 'main' into use-nativeimage
2 parents 00675fc + 43ea4fa commit fdd308d

File tree

11 files changed

+394
-526
lines changed

11 files changed

+394
-526
lines changed

‎google-cloud-spanner/clirr-ignored-differences.xml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1008,4 +1008,24 @@
10081008
<className>com/google/cloud/spanner/TransactionManager</className>
10091009
<method>com.google.cloud.spanner.TransactionContext begin(com.google.cloud.spanner.AbortedException)</method>
10101010
</difference>
1011+
<difference>
1012+
<differenceType>7012</differenceType>
1013+
<className>com/google/cloud/spanner/StructReader</className>
1014+
<method>java.lang.Object getOrNull(int, java.util.function.BiFunction)</method>
1015+
</difference>
1016+
<difference>
1017+
<differenceType>7012</differenceType>
1018+
<className>com/google/cloud/spanner/StructReader</className>
1019+
<method>java.lang.Object getOrNull(java.lang.String, java.util.function.BiFunction)</method>
1020+
</difference>
1021+
<difference>
1022+
<differenceType>7012</differenceType>
1023+
<className>com/google/cloud/spanner/StructReader</className>
1024+
<method>java.lang.Object getOrDefault(int, java.util.function.BiFunction, java.lang.Object)</method>
1025+
</difference>
1026+
<difference>
1027+
<differenceType>7012</differenceType>
1028+
<className>com/google/cloud/spanner/StructReader</className>
1029+
<method>java.lang.Object getOrDefault(java.lang.String, java.util.function.BiFunction, java.lang.Object)</method>
1030+
</difference>
10111031
</differences>

‎google-cloud-spanner/src/main/java/com/google/cloud/spanner/StructReader.java‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import java.math.BigDecimal;
2525
import java.util.List;
2626
import java.util.UUID;
27+
import java.util.function.BiFunction;
2728
import java.util.function.Function;
2829

2930
/**
@@ -176,6 +177,60 @@ default float getFloat(String columnName) {
176177
*/
177178
String getString(String columnName);
178179

180+
/**
181+
* @param columnIndex index of the column
182+
* @return the value of a column with type T or null if the column contains a null value
183+
* <p>Example
184+
* <pre>{@code
185+
* Struct row = ...
186+
* String name = row.getOrNull(1, StructReader::getString)
187+
* }</pre>
188+
*/
189+
default <T> T getOrNull(int columnIndex, BiFunction<StructReader, Integer, T> function) {
190+
return isNull(columnIndex) ? null : function.apply(this, columnIndex);
191+
}
192+
193+
/**
194+
* @param columnName index of the column
195+
* @return the value of a column with type T or null if the column contains a null value
196+
* <p>Example
197+
* <pre>{@code
198+
* Struct row = ...
199+
* String name = row.getOrNull("name", StructReader::getString)
200+
* }</pre>
201+
*/
202+
default <T> T getOrNull(String columnName, BiFunction<StructReader, String, T> function) {
203+
return isNull(columnName) ? null : function.apply(this, columnName);
204+
}
205+
206+
/**
207+
* @param columnIndex index of the column
208+
* @return the value of a column with type T, or the given default if the column value is null
209+
* <p>Example
210+
* <pre>{@code
211+
* Struct row = ...
212+
* String name = row.getOrDefault(1, StructReader::getString, "")
213+
* }</pre>
214+
*/
215+
default <T> T getOrDefault(
216+
int columnIndex, BiFunction<StructReader, Integer, T> function, T defaultValue) {
217+
return isNull(columnIndex) ? defaultValue : function.apply(this, columnIndex);
218+
}
219+
220+
/**
221+
* @param columnName name of the column
222+
* @return the value of a column with type T, or the given default if the column value is null
223+
* <p>Example
224+
* <pre>{@code
225+
* Struct row = ...
226+
* String name = row.getOrDefault("name", StructReader::getString, "")
227+
* }</pre>
228+
*/
229+
default <T> T getOrDefault(
230+
String columnName, BiFunction<StructReader, String, T> function, T defaultValue) {
231+
return isNull(columnName) ? defaultValue : function.apply(this, columnName);
232+
}
233+
179234
/**
180235
* @param columnIndex index of the column
181236
* @return the value of a non-{@code NULL} column with type {@link Type#json()}.

‎google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/ClientSideStatementValueConverters.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,8 @@ public Duration convert(String value) {
248248
} else {
249249
duration = Duration.ofMillis(Long.parseLong(value.trim()));
250250
}
251-
if (duration.isZero()) {
251+
// Converters should return null for invalid values.
252+
if (duration.isNegative()) {
252253
return null;
253254
}
254255
return duration;

‎google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/ConnectionStatementExecutorImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ public StatementResult statementShowReturnCommitStats() {
361361

362362
@Override
363363
public StatementResult statementSetMaxCommitDelay(Duration duration) {
364-
getConnection().setMaxCommitDelay(duration == null || duration.isZero() ? null : duration);
364+
getConnection().setMaxCommitDelay(duration);
365365
return noResult(SET_MAX_COMMIT_DELAY);
366366
}
367367

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

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,48 @@ public void builder() {
5757
assertThat(struct.getLong(1)).isEqualTo(2);
5858
}
5959

60+
@Test
61+
public void getOrNullTests() {
62+
Struct struct =
63+
Struct.newBuilder()
64+
.set("f1")
65+
.to("x")
66+
.set("f2")
67+
.to(2)
68+
.set("f3")
69+
.to(Value.bool(null))
70+
.build();
71+
String column1 = struct.getOrNull(0, StructReader::getString);
72+
assertThat(column1).isEqualTo("x");
73+
74+
Long column2 = struct.getOrNull(1, StructReader::getLong);
75+
assertThat(column2).isEqualTo(2);
76+
77+
String column3 = struct.getOrNull("f3", StructReader::getString);
78+
assertThat(column3).isNull();
79+
}
80+
81+
@Test
82+
public void getOrDefaultTests() {
83+
Struct struct =
84+
Struct.newBuilder()
85+
.set("f1")
86+
.to("x")
87+
.set("f2")
88+
.to(2)
89+
.set("f3")
90+
.to(Value.bool(null))
91+
.build();
92+
String column1 = struct.getOrDefault(0, StructReader::getString, "");
93+
assertThat(column1).isEqualTo("x");
94+
95+
Long column2 = struct.getOrDefault("f2", StructReader::getLong, -1L);
96+
assertThat(column2).isEqualTo(2);
97+
98+
String column3 = struct.getOrDefault(2, StructReader::getString, "");
99+
assertThat(column3).isEqualTo("");
100+
}
101+
60102
@Test
61103
public void duplicateFields() {
62104
// Duplicate fields are allowed - some SQL queries produce this type of value.

‎google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/AbstractConnectionImplTest.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -276,13 +276,14 @@ public void testSetStatementTimeout() {
276276
assertThat(connection.hasStatementTimeout(), is(false));
277277
boolean gotException = false;
278278
try {
279-
log("@EXPECT EXCEPTION INVALID_ARGUMENT");
279+
// log("@EXPECT EXCEPTION INVALID_ARGUMENT");
280280
log(String.format("SET STATEMENT_TIMEOUT='0%s';", getTimeUnitAbbreviation(unit)));
281-
connection.setStatementTimeout(0L, unit);
281+
connection.clearStatementTimeout();
282+
// connection.setStatementTimeout(0L, unit);
282283
} catch (IllegalArgumentException e) {
283284
gotException = true;
284285
}
285-
assertThat(gotException, is(true));
286+
assertThat(gotException, is(false));
286287
log(
287288
String.format(
288289
"@EXPECT RESULT_SET 'STATEMENT_TIMEOUT',%s",

‎google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/DurationConverterTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public void testConvert() throws CompileException {
4242
DurationConverter converter = new DurationConverter(allowedValues);
4343
assertThat(converter.convert("'100ms'"), is(equalTo(Duration.ofMillis(100L))));
4444
assertThat(converter.convert("100"), is(equalTo(Duration.ofMillis(100))));
45-
assertThat(converter.convert("'0ms'"), is(nullValue()));
45+
assertThat(converter.convert("'0ms'"), is(Duration.ZERO));
4646
assertThat(converter.convert("'-100ms'"), is(nullValue()));
4747
assertThat(
4848
converter.convert("'315576000000000ms'"), is(equalTo(Duration.ofSeconds(315576000000L))));

‎google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/MaxCommitDelayTest.java‎

Lines changed: 44 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,20 @@ public void testNoMaxCommitDelayByDefault() {
8383
for (boolean autocommit : new boolean[] {true, false}) {
8484
connection.setAutocommit(autocommit);
8585
executeCommit(connection);
86-
assertMaxCommitDelay(Duration.getDefaultInstance());
86+
assertMaxCommitDelay(Duration.getDefaultInstance(), false);
87+
mockSpanner.clearRequests();
88+
}
89+
}
90+
}
91+
92+
@Test
93+
public void testZeroMaxCommitDelay() {
94+
try (Connection connection = createConnection()) {
95+
for (boolean autocommit : new boolean[] {true, false}) {
96+
connection.setAutocommit(autocommit);
97+
connection.setMaxCommitDelay(java.time.Duration.ZERO);
98+
executeCommit(connection);
99+
assertMaxCommitDelay(Duration.getDefaultInstance(), true);
87100
mockSpanner.clearRequests();
88101
}
89102
}
@@ -95,7 +108,19 @@ public void testMaxCommitDelayInConnectionString() {
95108
for (boolean autocommit : new boolean[] {true, false}) {
96109
connection.setAutocommit(autocommit);
97110
executeCommit(connection);
98-
assertMaxCommitDelay(Duration.newBuilder().setSeconds(1).build());
111+
assertMaxCommitDelay(Duration.newBuilder().setSeconds(1).build(), true);
112+
mockSpanner.clearRequests();
113+
}
114+
}
115+
}
116+
117+
@Test
118+
public void testZeroMaxCommitDelayInConnectionString() {
119+
try (Connection connection = createConnection(";maxCommitDelay=0")) {
120+
for (boolean autocommit : new boolean[] {true, false}) {
121+
connection.setAutocommit(autocommit);
122+
executeCommit(connection);
123+
assertMaxCommitDelay(Duration.getDefaultInstance(), true);
99124
mockSpanner.clearRequests();
100125
}
101126
}
@@ -121,20 +146,31 @@ public void testSetMaxCommitDelay() {
121146
() -> {
122147
executeCommit(connection);
123148
assertMaxCommitDelay(
124-
Duration.newBuilder()
125-
.setNanos((int) TimeUnit.MILLISECONDS.toNanos(40))
126-
.build());
149+
Duration.newBuilder().setNanos((int) TimeUnit.MILLISECONDS.toNanos(40)).build(),
150+
true);
127151
mockSpanner.clearRequests();
128152
});
129153

130154
if (useSql) {
155+
// This is translated to Duration.ZERO.
131156
connection.execute(
132157
Statement.of(String.format("set %smax_commit_delay=null", getVariablePrefix())));
133158
} else {
134159
connection.setMaxCommitDelay(null);
135160
}
136161
executeCommit(connection);
137-
assertMaxCommitDelay(Duration.getDefaultInstance());
162+
// The SQL statement set max_commit_delay=null is translated to Duration.ZERO.
163+
assertMaxCommitDelay(Duration.getDefaultInstance(), useSql);
164+
mockSpanner.clearRequests();
165+
166+
if (useSql) {
167+
connection.execute(
168+
Statement.of(String.format("set %smax_commit_delay=0", getVariablePrefix())));
169+
} else {
170+
connection.setMaxCommitDelay(java.time.Duration.ZERO);
171+
}
172+
executeCommit(connection);
173+
assertMaxCommitDelay(Duration.getDefaultInstance(), true);
138174
mockSpanner.clearRequests();
139175
}
140176
}
@@ -150,10 +186,11 @@ void executeCommit(Connection connection) {
150186
}
151187
}
152188

153-
private void assertMaxCommitDelay(Duration expected) {
189+
private void assertMaxCommitDelay(Duration expected, boolean hasMaxCommitDelay) {
154190
List<CommitRequest> requests = mockSpanner.getRequestsOfType(CommitRequest.class);
155191
assertEquals(1, requests.size());
156192
CommitRequest request = requests.get(0);
157193
assertEquals(expected, request.getMaxCommitDelay());
194+
assertEquals(hasMaxCommitDelay, request.hasMaxCommitDelay());
158195
}
159196
}

‎google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/PgDurationConverterTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public void testConvert() throws CompileException {
4545

4646
assertEquals(
4747
Duration.ofNanos((int) TimeUnit.MILLISECONDS.toNanos(100L)), converter.convert("'100ms'"));
48-
assertNull(converter.convert("'0ms'"));
48+
assertEquals(Duration.ZERO, converter.convert("'0ms'"));
4949
assertNull(converter.convert("'-100ms'"));
5050
assertEquals(Duration.ofSeconds(315576000000L), converter.convert("'315576000000000ms'"));
5151
assertEquals(Duration.ofSeconds(1L), converter.convert("'1s'"));

0 commit comments

Comments
 (0)