Skip to content

Commit 7153c39

Browse files
renovate-botolavloitediegomarquezp
authored
deps: update dependency com.google.cloud:google-cloud-spanner-bom to v6.90.0 (#1970)
* deps: update dependency com.google.cloud:google-cloud-spanner-bom to v6.90.0 * chore: regenerate properties and fix a NullPointerException * chore: skip test for graalvm * chore: use `--strict-image-heap` on native tests This follows from the recent configuration adjustments from bringing GraalVM for JDK 23, which enabled this option by default. This commit uses such option for the JDK 21 GraalVM tests to consume the configuration in the same way. --------- Co-authored-by: Knut Olav Løite <[email protected]> Co-authored-by: diegomarquezp <[email protected]>
1 parent a68656a commit 7153c39

File tree

7 files changed

+14
-8
lines changed

7 files changed

+14
-8
lines changed

documentation/connection_properties.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ The 'Context' value indicates whether the property can only be set when a connec
1010
| auto_batch_dml_update_count | DML statements that are executed when auto_batch_dml is set to true, are not directly sent to Spanner, but are buffered in the client until the batch is flushed. This property determines the update count that is returned for these DML statements. The default is 1, as that is the update count that is expected by most ORMs (e.g. Hibernate). | 1 | | USER |
1111
| auto_batch_dml_update_count_verification | The update count that is returned for DML statements that are buffered during an automatic DML batch is by default 1. This value can be changed by setting the connection variable auto_batch_dml_update_count. The update counts that are returned by Spanner when the DML statements are actually executed are verified against the update counts that were returned when they were buffered. If these do not match, a com.google.cloud.spanner.DmlBatchUpdateCountVerificationFailedException will be thrown. You can disable this verification by setting auto_batch_dml_update_count_verification to false. | true | true, false | USER |
1212
| autocommit | Should the connection start in autocommit (true/false) | true | true, false | USER |
13-
| autocommit_dml_mode | Determines the transaction type that is used to execute DML statements when the connection is in auto-commit mode. | TRANSACTIONAL | TRANSACTIONAL, PARTITIONED_NON_ATOMIC, TRANSACTIONAL_WITH_FALLBACK_TO_PARTITIONED_NON_ATOMIC | USER |
13+
| autocommit_dml_mode | Determines the transaction type that is used to execute DML statements when the connection is in auto-commit mode. | TRANSACTIONAL | TRANSACTIONAL, PARTITIONED_NON_ATOMIC, TRANSACTIONAL_WITH_FALLBACK_TO_PARTITIONED_NON_ATOMIC, null | USER |
1414
| autoconfigemulator | Automatically configure the connection to try to connect to the Cloud Spanner emulator (true/false). The instance and database in the connection string will automatically be created if these do not yet exist on the emulator. Add dialect=postgresql to the connection string to make sure that the database that is created uses the PostgreSQL dialect. | false | true, false | STARTUP |
1515
| autopartitionmode | Execute all queries on this connection as partitioned queries. Executing a query that cannot be partitioned will fail. Executing a query in a read/write transaction will also fail. | false | true, false | USER |
1616
| channelprovider | The name of the channel provider class. The name must reference an implementation of ExternalChannelProvider. If this property is not set, the connection will use the default grpc channel provider. | | | STARTUP |
@@ -22,6 +22,7 @@ The 'Context' value indicates whether the property can only be set when a connec
2222
| databaserole | Sets the database role to use for this connection. The default is privileges assigned to IAM role | | | STARTUP |
2323
| databoostenabled | Enable data boost for all partitioned queries that are executed by this connection. This setting is only used for partitioned queries and is ignored by all other statements. | false | true, false | USER |
2424
| ddlintransactionmode | Determines how the connection should handle DDL statements in a read/write transaction. | ALLOW_IN_EMPTY_TRANSACTION | FAIL, ALLOW_IN_EMPTY_TRANSACTION, AUTO_COMMIT_TRANSACTION | USER |
25+
| default_isolation_level | The transaction isolation level that is used by default for read/write transactions. The default is isolation_level_unspecified, which means that the connection will use the default isolation level of the database that it is connected to. | ISOLATION_LEVEL_UNSPECIFIED | ISOLATION_LEVEL_UNSPECIFIED, SERIALIZABLE, REPEATABLE_READ | USER |
2526
| defaultsequencekind | The default sequence kind that should be used for the database. This property is only used when a DDL statement that requires a default sequence kind is executed on this connection. | | | USER |
2627
| delaytransactionstartuntilfirstwrite | Enabling this option will delay the actual start of a read/write transaction until the first write operation is seen in that transaction. All reads that happen before the first write in a transaction will instead be executed as if the connection was in auto-commit mode. Enabling this option will make read/write transactions lose their SERIALIZABLE isolation level. Read operations that are executed after the first write operation in a read/write transaction will be executed using the read/write transaction. Enabling this mode can reduce locking and improve performance for applications that can handle the lower transaction isolation semantics. | false | true, false | USER |
2728
| dialect | Sets the dialect to use for new databases that are created by this connection. | GOOGLE_STANDARD_SQL | GOOGLE_STANDARD_SQL, POSTGRESQL | STARTUP |
@@ -48,7 +49,7 @@ The 'Context' value indicates whether the property can only be set when a connec
4849
| retryabortsinternally | Should the connection automatically retry Aborted errors (true/false) | true | true, false | USER |
4950
| returncommitstats | Request that Spanner returns commit statistics for read/write transactions (true/false) | false | true, false | USER |
5051
| routetoleader | Should read/write transactions and partitioned DML be routed to leader region (true/false) | true | true, false | STARTUP |
51-
| rpcpriority | Sets the priority for all RPC invocations from this connection (HIGH/MEDIUM/LOW). The default is HIGH. | | LOW, MEDIUM, HIGH, UNSPECIFIED | USER |
52+
| rpcpriority | Sets the priority for all RPC invocations from this connection (HIGH/MEDIUM/LOW). The default is HIGH. | | LOW, MEDIUM, HIGH, UNSPECIFIED, null | USER |
5253
| savepoint_support | Determines the behavior of the connection when savepoints are used. | FAIL_AFTER_ROLLBACK | ENABLED, FAIL_AFTER_ROLLBACK, DISABLED | USER |
5354
| tracing_prefix | The prefix that will be prepended to all OpenTelemetry traces that are generated by a Connection. | CloudSpanner | | STARTUP |
5455
| trackconnectionleaks | Capture the call stack of the thread that created a connection. This will pre-create a LeakedConnectionException already when a connection is created. This can be disabled, for example if a monitoring system logs the pre-created exception. If disabled, the LeakedConnectionException will only be created when an actual connection leak is detected. The stack trace of the exception will in that case not contain the call stack of when the connection was created. | true | true, false | STARTUP |

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
<dependency>
6262
<groupId>com.google.cloud</groupId>
6363
<artifactId>google-cloud-spanner-bom</artifactId>
64-
<version>6.89.0</version>
64+
<version>6.90.0</version>
6565
<type>pom</type>
6666
<scope>import</scope>
6767
</dependency>

samples/spring-data-jdbc/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<dependency>
3131
<groupId>com.google.cloud</groupId>
3232
<artifactId>google-cloud-spanner-bom</artifactId>
33-
<version>6.89.0</version>
33+
<version>6.90.0</version>
3434
<scope>import</scope>
3535
<type>pom</type>
3636
</dependency>

src/main/java/com/google/cloud/spanner/connection/ConnectionPropertiesHelper.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import java.sql.DriverPropertyInfo;
2222
import java.util.Arrays;
2323
import java.util.Comparator;
24+
import java.util.Objects;
2425
import java.util.regex.Matcher;
2526
import java.util.regex.Pattern;
2627
import java.util.stream.Collectors;
@@ -50,7 +51,7 @@ public static DriverPropertyInfo toDriverPropertyInfo(
5051
connectionProperty.getValidValues() == null
5152
? null
5253
: Arrays.stream(connectionProperty.getValidValues())
53-
.map(Object::toString)
54+
.map(Objects::toString)
5455
.toArray(String[]::new);
5556
return result;
5657
}

src/test/java/com/google/cloud/spanner/connection/ConnectionPropertiesFileGenerator.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import java.io.FileWriter;
2121
import java.io.IOException;
2222
import java.util.Arrays;
23+
import java.util.Objects;
2324
import java.util.stream.Collectors;
2425

2526
/** Generator for the documentation/connection_properties.md file. */
@@ -65,7 +66,7 @@ static <T> String getValidValues(ConnectionProperty<T> connectionProperty) {
6566
return connectionProperty.getValidValues() == null
6667
? ""
6768
: Arrays.stream(connectionProperty.getValidValues())
68-
.map(Object::toString)
69+
.map(Objects::toString)
6970
.collect(Collectors.joining(", "));
7071
}
7172
}

src/test/java/com/google/cloud/spanner/jdbc/it/ITJdbcPreparedStatementTest.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -745,7 +745,8 @@ public void test04_Timestamps() throws SQLException {
745745
// Then get it in the test timezone.
746746
if (testCalendar != null
747747
&& !System.getProperty("java.vm.name", "").toLowerCase().contains("graalvm")
748-
&& !System.getProperty("java.vendor", "").toLowerCase().contains("graalvm")) {
748+
&& !System.getProperty("java.vendor", "").toLowerCase().contains("graalvm")
749+
&& !System.getProperty("java.vendor", "").toLowerCase().contains("oracle")) {
749750
Timestamp inOtherTZ = rs.getTimestamp(4, testCalendar);
750751
assertEquals(
751752
"Timezone: "
@@ -768,7 +769,8 @@ public void test04_Timestamps() throws SQLException {
768769
if (testCalendar == null) {
769770
assertEquals(testTimestamp.getTime(), inDefaultTZ.getTime());
770771
} else if (!System.getProperty("java.vm.name", "").toLowerCase().contains("graalvm")
771-
&& !System.getProperty("java.vendor", "").toLowerCase().contains("graalvm")) {
772+
&& !System.getProperty("java.vendor", "").toLowerCase().contains("graalvm")
773+
&& !System.getProperty("java.vendor", "").toLowerCase().contains("oracle")) {
772774
assertEquals(
773775
"Timezone: "
774776
+ testCalendar
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Args=--strict-image-heap

0 commit comments

Comments
 (0)