Skip to content

Commit f8f71cb

Browse files
guangyuskolea2
guangyus
authored and
kolea2
committed
---
yaml --- r: 20223 b: refs/heads/autosynth-redis c: cc04990 h: refs/heads/master i: 20221: f023427 20219: 14c240b 20215: e6e2e23 20207: 6b8a01d 20191: 3ba49e9 20159: 928c7b7 20095: 4f89658 19967: b8a8707
1 parent 304d372 commit f8f71cb

8 files changed

Lines changed: 336 additions & 1 deletion

File tree

‎[refs]‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ refs/heads/autosynth-iot: f03bdd338a9056ca3b7ea6d9ca901649ba9aab78
136136
refs/heads/autosynth-kms: 2828edfe3d2c53dd6e71912eae8a53c87bf40c87
137137
refs/heads/autosynth-language: c3d990dd34d81e7e935041e7147fb9dd27f8a557
138138
refs/heads/autosynth-os-login: 092fdbed6d5317948f92b708e9f50dedd89fc666
139-
refs/heads/autosynth-redis: 5b4e36c84e74e5e3ecc420df2a08a8beba395f90
139+
refs/heads/autosynth-redis: cc04990d8e57f5804f6963b2a3ce8c1e2e18ab18
140140
refs/heads/autosynth-scheduler: d97f8743ba965c7d5e492c8dc1f51d023104e260
141141
refs/heads/autosynth-spanner: 9bff86d057df31e04c76d72865e8e073ac5794fb
142142
refs/heads/autosynth-speech: 75d6c62a9d07d3a3642980502a25d07fbde0f232

‎branches/autosynth-redis/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerBatchUpdateException.java‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
/*
2+
* Copyright 2019 Google LLC
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package com.google.cloud.spanner;
18+
19+
public class SpannerBatchUpdateException extends SpannerException {
20+
private long[] updateCounts;
21+
/** Private constructor. Use {@link SpannerExceptionFactory} to create instances. */
22+
SpannerBatchUpdateException(
23+
DoNotConstructDirectly token, ErrorCode code, String message, long[] counts) {
24+
super(token, code, false, message, null);
25+
updateCounts = counts;
26+
}
27+
28+
/** Returns the number of rows affected by each statement that is successfully run. */
29+
public long[] getUpdateCounts() {
30+
return updateCounts;
31+
}
32+
}

‎branches/autosynth-redis/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerExceptionFactory.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,12 @@ public static SpannerException newSpannerException(Throwable cause) {
8282
return newSpannerException(null, cause);
8383
}
8484

85+
public static SpannerBatchUpdateException newSpannerBatchUpdateException(
86+
ErrorCode code, String message, long[] updateCounts) {
87+
DoNotConstructDirectly token = DoNotConstructDirectly.ALLOWED;
88+
return new SpannerBatchUpdateException(token, code, message, updateCounts);
89+
}
90+
8591
/**
8692
* Creates a new exception based on {@code cause}. If {@code cause} indicates cancellation, {@code
8793
* context} will be inspected to establish the type of cancellation.

‎branches/autosynth-redis/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerImpl.java‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
package com.google.cloud.spanner;
1818

19+
import static com.google.cloud.spanner.SpannerExceptionFactory.newSpannerBatchUpdateException;
1920
import static com.google.cloud.spanner.SpannerExceptionFactory.newSpannerException;
2021
import static com.google.cloud.spanner.SpannerExceptionFactory.newSpannerExceptionForCancellation;
2122
import static com.google.common.base.Preconditions.checkArgument;
@@ -69,6 +70,7 @@
6970
import com.google.spanner.v1.BeginTransactionRequest;
7071
import com.google.spanner.v1.CommitRequest;
7172
import com.google.spanner.v1.CommitResponse;
73+
import com.google.spanner.v1.ExecuteBatchDmlRequest;
7274
import com.google.spanner.v1.ExecuteSqlRequest;
7375
import com.google.spanner.v1.ExecuteSqlRequest.QueryMode;
7476
import com.google.spanner.v1.PartialResultSet;
@@ -1080,6 +1082,36 @@ ExecuteSqlRequest.Builder getExecuteSqlRequestBuilder(
10801082
return builder;
10811083
}
10821084

1085+
ExecuteBatchDmlRequest.Builder getExecuteBatchDmlRequestBuilder(
1086+
Iterable<Statement> statements) {
1087+
ExecuteBatchDmlRequest.Builder builder =
1088+
ExecuteBatchDmlRequest.newBuilder().setSession(session.name);
1089+
int idx = 0;
1090+
for (Statement stmt : statements) {
1091+
builder.addStatementsBuilder();
1092+
builder.getStatementsBuilder(idx).setSql(stmt.getSql());
1093+
Map<String, Value> stmtParameters = stmt.getParameters();
1094+
if (!stmtParameters.isEmpty()) {
1095+
com.google.protobuf.Struct.Builder paramsBuilder =
1096+
builder.getStatementsBuilder(idx).getParamsBuilder();
1097+
for (Map.Entry<String, Value> param : stmtParameters.entrySet()) {
1098+
paramsBuilder.putFields(param.getKey(), param.getValue().toProto());
1099+
builder
1100+
.getStatementsBuilder(idx)
1101+
.putParamTypes(param.getKey(), param.getValue().getType().toProto());
1102+
}
1103+
}
1104+
idx++;
1105+
}
1106+
1107+
TransactionSelector selector = getTransactionSelector();
1108+
if (selector != null) {
1109+
builder.setTransaction(selector);
1110+
}
1111+
builder.setSeqno(getSeqNo());
1112+
return builder;
1113+
}
1114+
10831115
ResultSet executeQueryInternalWithOptions(
10841116
Statement statement,
10851117
com.google.spanner.v1.ExecuteSqlRequest.QueryMode queryMode,
@@ -1660,6 +1692,32 @@ public com.google.spanner.v1.ResultSet call() throws Exception {
16601692
// For standard DML, using the exact row count.
16611693
return resultSet.getStats().getRowCountExact();
16621694
}
1695+
1696+
@Override
1697+
public long[] batchUpdate(Iterable<Statement> statements) {
1698+
beforeReadOrQuery();
1699+
final ExecuteBatchDmlRequest.Builder builder = getExecuteBatchDmlRequestBuilder(statements);
1700+
com.google.spanner.v1.ExecuteBatchDmlResponse response =
1701+
runWithRetries(
1702+
new Callable<com.google.spanner.v1.ExecuteBatchDmlResponse>() {
1703+
@Override
1704+
public com.google.spanner.v1.ExecuteBatchDmlResponse call() throws Exception {
1705+
return rpc.executeBatchDml(builder.build(), session.options);
1706+
}
1707+
});
1708+
long[] results = new long[response.getResultSetsCount()];
1709+
for (int i = 0; i < response.getResultSetsCount(); ++i) {
1710+
results[i] = response.getResultSets(i).getStats().getRowCountExact();
1711+
}
1712+
1713+
if (response.getStatus().getCode() != 0) {
1714+
throw newSpannerBatchUpdateException(
1715+
ErrorCode.fromRpcStatus(response.getStatus()),
1716+
response.getStatus().getMessage(),
1717+
results);
1718+
}
1719+
return results;
1720+
}
16631721
}
16641722

16651723
/**

‎branches/autosynth-redis/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/TransactionContext.java‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,4 +101,21 @@ public interface TransactionContext extends ReadContext {
101101
* visible to subsequent operations in the transaction.
102102
*/
103103
long executeUpdate(Statement statement);
104+
105+
/**
106+
* Executes a list of DML statements in a single request. The statements will be executed in order
107+
* and the semantics is the same as if each statement is executed by {@code executeUpdate} in a
108+
* loop. This method returns an array of long integers, each representing the number of rows
109+
* modified by each statement.
110+
*
111+
* <p>If an individual statement fails, execution stops and a {@code SpannerBatchUpdateException}
112+
* is returned, which includes the error and the number of rows affected by the statements that
113+
* are run prior to the error.
114+
*
115+
* <p>For example, if statements contains 3 statements, and the 2nd one is not a valid DML. This
116+
* method throws a {@code SpannerBatchUpdateException} that contains the error message from the
117+
* 2nd statement, and an array of length 1 that contains the number of rows modified by the 1st
118+
* statement. The 3rd statement will not run.
119+
*/
120+
long[] batchUpdate(Iterable<Statement> statements);
104121
}

‎branches/autosynth-redis/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/GapicSpannerRpc.java‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,8 @@
9090
import com.google.spanner.v1.CommitResponse;
9191
import com.google.spanner.v1.CreateSessionRequest;
9292
import com.google.spanner.v1.DeleteSessionRequest;
93+
import com.google.spanner.v1.ExecuteBatchDmlRequest;
94+
import com.google.spanner.v1.ExecuteBatchDmlResponse;
9395
import com.google.spanner.v1.ExecuteSqlRequest;
9496
import com.google.spanner.v1.PartialResultSet;
9597
import com.google.spanner.v1.PartitionQueryRequest;
@@ -514,6 +516,14 @@ public void cancel(String message) {
514516
};
515517
}
516518

519+
@Override
520+
public ExecuteBatchDmlResponse executeBatchDml(
521+
ExecuteBatchDmlRequest request, @Nullable Map<Option, ?> options) {
522+
523+
GrpcCallContext context = newCallContext(options, request.getSession());
524+
return get(spannerStub.executeBatchDmlCallable().futureCall(request, context));
525+
}
526+
517527
@Override
518528
public Transaction beginTransaction(
519529
BeginTransactionRequest request, @Nullable Map<Option, ?> options) throws SpannerException {

‎branches/autosynth-redis/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/SpannerRpc.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@
3434
import com.google.spanner.v1.BeginTransactionRequest;
3535
import com.google.spanner.v1.CommitRequest;
3636
import com.google.spanner.v1.CommitResponse;
37+
import com.google.spanner.v1.ExecuteBatchDmlRequest;
38+
import com.google.spanner.v1.ExecuteBatchDmlResponse;
3739
import com.google.spanner.v1.ExecuteSqlRequest;
3840
import com.google.spanner.v1.PartialResultSet;
3941
import com.google.spanner.v1.PartitionQueryRequest;
@@ -214,6 +216,8 @@ StreamingCall read(
214216
StreamingCall executeQuery(
215217
ExecuteSqlRequest request, ResultStreamConsumer consumer, @Nullable Map<Option, ?> options);
216218

219+
ExecuteBatchDmlResponse executeBatchDml(ExecuteBatchDmlRequest build, Map<Option, ?> options);
220+
217221
Transaction beginTransaction(BeginTransactionRequest request, @Nullable Map<Option, ?> options)
218222
throws SpannerException;
219223

0 commit comments

Comments
 (0)