Skip to content

Commit b11ccc9

Browse files
lqiu96lqiu96
committed
Merge branch 'main' into PR #3928 to update
2 parents 65e128d + 5874f8b commit b11ccc9

File tree

28 files changed

+134
-98
lines changed

28 files changed

+134
-98
lines changed

‎benchmarks/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>com.google.cloud</groupId>
2626
<artifactId>google-cloud-spanner-parent</artifactId>
27-
<version>6.103.0</version><!-- {x-version-update:google-cloud-spanner:current} -->
27+
<version>6.103.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner:current} -->
2828
</parent>
2929

3030
<properties>

‎google-cloud-spanner-bom/pom.xml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>com.google.cloud</groupId>
55
<artifactId>google-cloud-spanner-bom</artifactId>
6-
<version>6.103.0</version><!-- {x-version-update:google-cloud-spanner:current} -->
6+
<version>6.103.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner:current} -->
77
<packaging>pom</packaging>
88
<parent>
99
<groupId>com.google.cloud</groupId>
@@ -53,43 +53,43 @@
5353
<dependency>
5454
<groupId>com.google.cloud</groupId>
5555
<artifactId>google-cloud-spanner</artifactId>
56-
<version>6.103.0</version><!-- {x-version-update:google-cloud-spanner:current} -->
56+
<version>6.103.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner:current} -->
5757
</dependency>
5858
<dependency>
5959
<groupId>com.google.cloud</groupId>
6060
<artifactId>google-cloud-spanner</artifactId>
6161
<type>test-jar</type>
62-
<version>6.103.0</version><!-- {x-version-update:google-cloud-spanner:current} -->
62+
<version>6.103.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner:current} -->
6363
</dependency>
6464
<dependency>
6565
<groupId>com.google.api.grpc</groupId>
6666
<artifactId>grpc-google-cloud-spanner-v1</artifactId>
67-
<version>6.103.0</version><!-- {x-version-update:grpc-google-cloud-spanner-v1:current} -->
67+
<version>6.103.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-spanner-v1:current} -->
6868
</dependency>
6969
<dependency>
7070
<groupId>com.google.api.grpc</groupId>
7171
<artifactId>grpc-google-cloud-spanner-admin-instance-v1</artifactId>
72-
<version>6.103.0</version><!-- {x-version-update:grpc-google-cloud-spanner-admin-instance-v1:current} -->
72+
<version>6.103.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-spanner-admin-instance-v1:current} -->
7373
</dependency>
7474
<dependency>
7575
<groupId>com.google.api.grpc</groupId>
7676
<artifactId>grpc-google-cloud-spanner-admin-database-v1</artifactId>
77-
<version>6.103.0</version><!-- {x-version-update:grpc-google-cloud-spanner-admin-database-v1:current} -->
77+
<version>6.103.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-spanner-admin-database-v1:current} -->
7878
</dependency>
7979
<dependency>
8080
<groupId>com.google.api.grpc</groupId>
8181
<artifactId>proto-google-cloud-spanner-admin-instance-v1</artifactId>
82-
<version>6.103.0</version><!-- {x-version-update:proto-google-cloud-spanner-admin-instance-v1:current} -->
82+
<version>6.103.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-spanner-admin-instance-v1:current} -->
8383
</dependency>
8484
<dependency>
8585
<groupId>com.google.api.grpc</groupId>
8686
<artifactId>proto-google-cloud-spanner-v1</artifactId>
87-
<version>6.103.0</version><!-- {x-version-update:proto-google-cloud-spanner-v1:current} -->
87+
<version>6.103.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-spanner-v1:current} -->
8888
</dependency>
8989
<dependency>
9090
<groupId>com.google.api.grpc</groupId>
9191
<artifactId>proto-google-cloud-spanner-admin-database-v1</artifactId>
92-
<version>6.103.0</version><!-- {x-version-update:proto-google-cloud-spanner-admin-database-v1:current} -->
92+
<version>6.103.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-spanner-admin-database-v1:current} -->
9393
</dependency>
9494
</dependencies>
9595
</dependencyManagement>

‎google-cloud-spanner-executor/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
<modelVersion>4.0.0</modelVersion>
66
<groupId>com.google.cloud</groupId>
77
<artifactId>google-cloud-spanner-executor</artifactId>
8-
<version>6.103.0</version><!-- {x-version-update:google-cloud-spanner-executor:current} -->
8+
<version>6.103.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner-executor:current} -->
99
<packaging>jar</packaging>
1010
<name>Google Cloud Spanner Executor</name>
1111

1212
<parent>
1313
<groupId>com.google.cloud</groupId>
1414
<artifactId>google-cloud-spanner-parent</artifactId>
15-
<version>6.103.0</version><!-- {x-version-update:google-cloud-spanner:current} -->
15+
<version>6.103.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner:current} -->
1616
</parent>
1717

1818
<properties>

‎google-cloud-spanner/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>com.google.cloud</groupId>
55
<artifactId>google-cloud-spanner</artifactId>
6-
<version>6.103.0</version><!-- {x-version-update:google-cloud-spanner:current} -->
6+
<version>6.103.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner:current} -->
77
<packaging>jar</packaging>
88
<name>Google Cloud Spanner</name>
99
<url>https://github.com/googleapis/java-spanner</url>
1010
<description>Java idiomatic client for Google Cloud Spanner.</description>
1111
<parent>
1212
<groupId>com.google.cloud</groupId>
1313
<artifactId>google-cloud-spanner-parent</artifactId>
14-
<version>6.103.0</version><!-- {x-version-update:google-cloud-spanner:current} -->
14+
<version>6.103.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner:current} -->
1515
</parent>
1616
<properties>
1717
<site.installationModule>google-cloud-spanner</site.installationModule>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ private <R> R runTransaction(final AsyncWork<R> work) {
5959
try {
6060
return work.doWorkAsync(transaction).get();
6161
} catch (ExecutionException e) {
62-
throw SpannerExceptionFactory.newSpannerException(e.getCause());
62+
throw SpannerExceptionFactory.asSpannerException(e.getCause());
6363
} catch (InterruptedException e) {
6464
throw SpannerExceptionFactory.propagateInterrupt(e);
6565
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ private ApiFuture<TransactionContext> internalBeginAsync(
123123
@Override
124124
public void onFailure(Throwable t) {
125125
onError(t);
126-
res.setException(SpannerExceptionFactory.newSpannerException(t));
126+
res.setException(SpannerExceptionFactory.asSpannerException(t));
127127
}
128128

129129
@Override

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

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

1717
package com.google.cloud.spanner;
1818

19-
import static com.google.cloud.spanner.SpannerExceptionFactory.newSpannerException;
19+
import static com.google.cloud.spanner.SpannerExceptionFactory.asSpannerException;
2020
import static com.google.common.base.Preconditions.checkState;
2121

2222
import com.google.api.core.InternalApi;
@@ -76,7 +76,7 @@ protected GrpcStruct currRow() {
7676
@Override
7777
public boolean next() throws SpannerException {
7878
if (error != null) {
79-
throw newSpannerException(error);
79+
throw asSpannerException(error);
8080
}
8181
try {
8282
if (currRow == null) {
@@ -108,7 +108,7 @@ public boolean next() throws SpannerException {
108108
return hasNext;
109109
} catch (Throwable t) {
110110
throw yieldError(
111-
SpannerExceptionFactory.asSpannerException(t),
111+
asSpannerException(t),
112112
iterator.isWithBeginTransaction() && currRow == null,
113113
iterator.isLastStatement());
114114
}

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

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ protected final PartialResultSet computeNext() {
155155
call = null;
156156

157157
if (error != null) {
158-
throw SpannerExceptionFactory.newSpannerException(error);
158+
throw SpannerExceptionFactory.asSpannerException(error);
159159
}
160160

161161
endOfData();
@@ -192,25 +192,17 @@ public void onCompleted() {
192192
}
193193

194194
@Override
195-
public void onError(SpannerException e) {
195+
public void onError(SpannerException exception) {
196196
if (statement != null) {
197197
if (logger.isLoggable(Level.FINEST)) {
198198
// Include parameter values if logging level is set to FINEST or higher.
199-
e =
200-
SpannerExceptionFactory.newSpannerExceptionPreformatted(
201-
e.getErrorCode(),
202-
String.format("%s - Statement: '%s'", e.getMessage(), statement.toString()),
203-
e);
204-
logger.log(Level.FINEST, "Error executing statement", e);
199+
exception.setStatement(statement.toString());
200+
logger.log(Level.FINEST, "Error executing statement", exception);
205201
} else {
206-
e =
207-
SpannerExceptionFactory.newSpannerExceptionPreformatted(
208-
e.getErrorCode(),
209-
String.format("%s - Statement: '%s'", e.getMessage(), statement.getSql()),
210-
e);
202+
exception.setStatement(statement.getSql());
211203
}
212204
}
213-
error = e;
205+
error = exception;
214206
addToStream(END_OF_STREAM);
215207
}
216208

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -498,7 +498,7 @@ private void verifyBeginTransactionWithRWOnMultiplexedSessionAsync(String sessio
498498
}
499499
readWriteBeginTransactionReferenceFuture.set(txn);
500500
} catch (Exception e) {
501-
SpannerException spannerException = SpannerExceptionFactory.newSpannerException(e);
501+
SpannerException spannerException = SpannerExceptionFactory.asSpannerException(e);
502502
// Mark multiplexed sessions for RW as unimplemented and fall back to regular sessions
503503
// if UNIMPLEMENTED is returned.
504504
maybeMarkUnimplementedForRW(spannerException);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public static <T> T getOrNull(ApiFuture<T> future) throws SpannerException {
3333
if (e.getCause() instanceof SpannerException) {
3434
throw (SpannerException) e.getCause();
3535
}
36-
throw SpannerExceptionFactory.newSpannerException(e.getCause());
36+
throw SpannerExceptionFactory.asSpannerException(e.getCause());
3737
} catch (InterruptedException e) {
3838
throw SpannerExceptionFactory.propagateInterrupt(e, null /*TODO: requestId*/);
3939
} catch (CancellationException e) {

0 commit comments

Comments
 (0)