Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: automatic fallback to Partitioned DML #2593

Merged
merged 2 commits into from
Dec 6, 2024
Merged

feat: automatic fallback to Partitioned DML #2593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b6b2052
feat: automatic fallback to Partitioned DML
olavloite Dec 6, 2024
c4fbf72
Merge branch 'postgresql-dialect' into fallback-to-pdml
olavloite Dec 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions src/test/java/com/google/cloud/spanner/pgadapter/AbstractMockServerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@
import com.google.protobuf.ListValue;
import com.google.protobuf.NullValue;
import com.google.protobuf.Value;
import com.google.rpc.Help;
import com.google.rpc.Help.Link;
import com.google.spanner.admin.database.v1.UpdateDatabaseDdlMetadata;
import com.google.spanner.v1.Partition;
import com.google.spanner.v1.PartitionQueryRequest;
Expand All @@ -61,6 +63,7 @@
import io.grpc.Context;
import io.grpc.Contexts;
import io.grpc.Metadata;
import io.grpc.Metadata.Key;
import io.grpc.Server;
import io.grpc.ServerCall;
import io.grpc.ServerCall.Listener;
Expand Down Expand Up @@ -1375,6 +1378,25 @@ protected void closeSpannerPool(boolean ignoreException) {
}
}

static StatusRuntimeException createTransactionMutationLimitExceededException() {
Metadata.Key<byte[]> key = Key.of("grpc-status-details-bin", Metadata.BINARY_BYTE_MARSHALLER);
Help help =
Help.newBuilder()
.addLinks(
Link.newBuilder()
.setDescription("Cloud Spanner limits documentation.")
.setUrl("https://cloud.google.com/spanner/docs/limits")
.build())
.build();
com.google.rpc.Status status =
com.google.rpc.Status.newBuilder().addDetails(Any.pack(help)).build();
Metadata trailers = new Metadata();
trailers.put(key, status.toByteArray());
return io.grpc.Status.INVALID_ARGUMENT
.withDescription("The transaction contains too many mutations.")
.asRuntimeException(trailers);
}

@Before
public void clearRequests() {
mockSpanner.clearRequests();
Expand Down
27 changes: 27 additions & 0 deletions src/test/java/com/google/cloud/spanner/pgadapter/JdbcMockServerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5599,6 +5599,33 @@ public void testGSSAPI() throws SQLException {
exception.getMessage().contains("The server does not support GSS Encryption"));
}

@Test
public void testRetryDmlAsPdml() throws SQLException {
String sql = "update foo set bar=0 where bar is null";
mockSpanner.setExecuteSqlExecutionTime(
SimulatedExecutionTime.ofException(createTransactionMutationLimitExceededException()));
mockSpanner.putStatementResult(StatementResult.update(Statement.of(sql), 100_000L));

try (Connection connection = DriverManager.getConnection(createUrl());
java.sql.Statement statement = connection.createStatement()) {
assertTrue(connection.getAutoCommit());
statement.execute(
"set spanner.autocommit_dml_mode='TRANSACTIONAL_WITH_FALLBACK_TO_PARTITIONED_NON_ATOMIC'");
assertEquals(100_000, statement.executeUpdate(sql));
}
assertEquals(1, mockSpanner.countRequestsOfType(BeginTransactionRequest.class));
BeginTransactionRequest beginTransactionRequest =
mockSpanner.getRequestsOfType(BeginTransactionRequest.class).get(0);
assertTrue(beginTransactionRequest.getOptions().hasPartitionedDml());
assertEquals(2, mockSpanner.countRequestsOfType(ExecuteSqlRequest.class));
ExecuteSqlRequest atomicRequest = mockSpanner.getRequestsOfType(ExecuteSqlRequest.class).get(0);
assertTrue(atomicRequest.getTransaction().hasBegin());
assertTrue(atomicRequest.getTransaction().getBegin().hasReadWrite());
ExecuteSqlRequest pdmlRequest = mockSpanner.getRequestsOfType(ExecuteSqlRequest.class).get(1);
assertTrue(pdmlRequest.getTransaction().hasId());
assertEquals(0, mockSpanner.countRequestsOfType(CommitRequest.class));
}

@Test
public void testShutdown_failsByDefault() throws SQLException {
try (Connection connection = DriverManager.getConnection(createUrl());
Expand Down
Loading