Date: Thu, 24 Jun 2021 03:18:19 -0700
Subject: [PATCH 5/8] feat: spanner JSON type (#1260)
This PR was generated using Autosynth. :rainbow:
Synth log will be available here:
https://source.cloud.google.com/results/invocations/4d5db7cf-fc22-48ae-84c6-bc8d1a1a2408/targets
- [ ] To automatically regenerate this PR, check this box. (May take up to 24 hours.)
PiperOrigin-RevId: 381156241
Source-Link: https://github.com/googleapis/googleapis/commit/fb5c4fbc1ded09e6958d6be7ca36a9221dc7e52f
Source-Link: https://github.com/googleapis/googleapis/commit/02f62363cec528328b0efd1a4d168baa8cf0d9af
PiperOrigin-RevId: 380923948
Source-Link: https://github.com/googleapis/googleapis/commit/370df45ca2adb6f1cf046a0172b90225400874bf
---
.../java/com/google/spanner/v1/TypeCode.java | 34 +++++++++++++++++++
.../java/com/google/spanner/v1/TypeProto.java | 12 +++----
.../main/proto/google/spanner/v1/type.proto | 9 +++++
synth.metadata | 6 ++--
4 files changed, 52 insertions(+), 9 deletions(-)
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TypeCode.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TypeCode.java
index 77d751575cb..1fc2b42ef8e 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TypeCode.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TypeCode.java
@@ -161,6 +161,22 @@ public enum TypeCode implements com.google.protobuf.ProtocolMessageEnum {
* NUMERIC = 10;
*/
NUMERIC(10),
+ /**
+ *
+ *
+ *
+ * Encoded as a JSON-formatted 'string' as described in RFC 7159. The
+ * following rules will be applied when parsing JSON input:
+ * - Whitespace will be stripped from the document.
+ * - If a JSON object has duplicate keys, only the first key will be
+ * preserved.
+ * - Members of a JSON object are not guaranteed to have their order
+ * preserved. JSON array elements will have their order preserved.
+ *
+ *
+ * JSON = 11;
+ */
+ JSON(11),
UNRECOGNIZED(-1),
;
@@ -292,6 +308,22 @@ public enum TypeCode implements com.google.protobuf.ProtocolMessageEnum {
* NUMERIC = 10;
*/
public static final int NUMERIC_VALUE = 10;
+ /**
+ *
+ *
+ *
+ * Encoded as a JSON-formatted 'string' as described in RFC 7159. The
+ * following rules will be applied when parsing JSON input:
+ * - Whitespace will be stripped from the document.
+ * - If a JSON object has duplicate keys, only the first key will be
+ * preserved.
+ * - Members of a JSON object are not guaranteed to have their order
+ * preserved. JSON array elements will have their order preserved.
+ *
+ *
+ * JSON = 11;
+ */
+ public static final int JSON_VALUE = 11;
public final int getNumber() {
if (this == UNRECOGNIZED) {
@@ -339,6 +371,8 @@ public static TypeCode forNumber(int value) {
return STRUCT;
case 10:
return NUMERIC;
+ case 11:
+ return JSON;
default:
return null;
}
diff --git a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TypeProto.java b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TypeProto.java
index 042f2429197..e781dc621a0 100644
--- a/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TypeProto.java
+++ b/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TypeProto.java
@@ -58,15 +58,15 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
+ "ructType\0223\n\006fields\030\001 \003(\0132#.google.spanne"
+ "r.v1.StructType.Field\032<\n\005Field\022\014\n\004name\030\001"
+ " \001(\t\022%\n\004type\030\002 \001(\0132\027.google.spanner.v1.T"
- + "ype*\233\001\n\010TypeCode\022\031\n\025TYPE_CODE_UNSPECIFIE"
+ + "ype*\245\001\n\010TypeCode\022\031\n\025TYPE_CODE_UNSPECIFIE"
+ "D\020\000\022\010\n\004BOOL\020\001\022\t\n\005INT64\020\002\022\013\n\007FLOAT64\020\003\022\r\n"
+ "\tTIMESTAMP\020\004\022\010\n\004DATE\020\005\022\n\n\006STRING\020\006\022\t\n\005BY"
+ "TES\020\007\022\t\n\005ARRAY\020\010\022\n\n\006STRUCT\020\t\022\013\n\007NUMERIC\020"
- + "\nB\257\001\n\025com.google.spanner.v1B\tTypeProtoP\001"
- + "Z8google.golang.org/genproto/googleapis/"
- + "spanner/v1;spanner\252\002\027Google.Cloud.Spanne"
- + "r.V1\312\002\027Google\\Cloud\\Spanner\\V1\352\002\032Google:"
- + ":Cloud::Spanner::V1b\006proto3"
+ + "\n\022\010\n\004JSON\020\013B\257\001\n\025com.google.spanner.v1B\tT"
+ + "ypeProtoP\001Z8google.golang.org/genproto/g"
+ + "oogleapis/spanner/v1;spanner\252\002\027Google.Cl"
+ + "oud.Spanner.V1\312\002\027Google\\Cloud\\Spanner\\V1"
+ + "\352\002\032Google::Cloud::Spanner::V1b\006proto3"
};
descriptor =
com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
diff --git a/proto-google-cloud-spanner-v1/src/main/proto/google/spanner/v1/type.proto b/proto-google-cloud-spanner-v1/src/main/proto/google/spanner/v1/type.proto
index 4a5afd485d9..c1f30f51230 100644
--- a/proto-google-cloud-spanner-v1/src/main/proto/google/spanner/v1/type.proto
+++ b/proto-google-cloud-spanner-v1/src/main/proto/google/spanner/v1/type.proto
@@ -128,4 +128,13 @@ enum TypeCode {
//
`[+-][Digits].Digits[ExponentIndicator[+-]Digits]`
//
(ExponentIndicator is `"e"` or `"E"`)
NUMERIC = 10;
+
+ // Encoded as a JSON-formatted 'string' as described in RFC 7159. The
+ // following rules will be applied when parsing JSON input:
+ // - Whitespace will be stripped from the document.
+ // - If a JSON object has duplicate keys, only the first key will be
+ // preserved.
+ // - Members of a JSON object are not guaranteed to have their order
+ // preserved. JSON array elements will have their order preserved.
+ JSON = 11;
}
diff --git a/synth.metadata b/synth.metadata
index e74cb2126b3..7c7036a07a6 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,15 +4,15 @@
"git": {
"name": ".",
"remote": "https://github.com/googleapis/java-spanner.git",
- "sha": "0da851ba875a78c3d50042fe611e6e5204b6ceab"
+ "sha": "4593395d291f6e9370c2d3df2695cb28b7d27e8d"
}
},
{
"git": {
"name": "googleapis",
"remote": "https://github.com/googleapis/googleapis.git",
- "sha": "551681f25e36b11829e87e580281350461f4f3f5",
- "internalRef": "379784268"
+ "sha": "fb5c4fbc1ded09e6958d6be7ca36a9221dc7e52f",
+ "internalRef": "381156241"
}
},
{
From 1fa95a9993ea8c7a5f943ab39eced4ced4cb87e7 Mon Sep 17 00:00:00 2001
From: Yuri Golobokov
Date: Mon, 28 Jun 2021 20:18:14 -0700
Subject: [PATCH 6/8] feat: add gRPC-GCP channel pool as an option (#1227)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* add grpc-gcp extensions
* remove local files
* update read apiconfig
* update read apiconfig
* Add custom pool size for GCP extension
* add one more entry in aip config file
* change gcp package name
* Adjust grpc-gcp package name and group
* Set grpc-gcp low streams watermark to 1
This allows sessions to be spread across channels when the Spanner client starts up.
* Add gRPC-GCP extension options to SpannerOptions
* feat: add gRPC-GCP channel pool as an option
This enables a user to opt-in for using the gRPC-GCP extension channel pool and configure its options.
* Addressed comments.
* Fixed linting issues.
* Add integration test with enabled gRPC-GCP extension
* Remake gRPC-GCP extension related SpannerOptions
* Add ChannelUsageTest
Co-authored-by: Zhenli(Jenny) Jiang
Co-authored-by: Knut Olav Løite
---
google-cloud-spanner/pom.xml | 6 +
.../google/cloud/spanner/SpannerOptions.java | 41 ++-
.../cloud/spanner/spi/v1/GapicSpannerRpc.java | 68 +++++
.../spanner/spi/v1/grpc-gcp-apiconfig.json | 106 ++++++++
.../cloud/spanner/ChannelUsageTest.java | 235 ++++++++++++++++++
.../cloud/spanner/it/ITWithGrpcGcpTest.java | 115 +++++++++
6 files changed, 569 insertions(+), 2 deletions(-)
create mode 100644 google-cloud-spanner/src/main/resources/com/google/cloud/spanner/spi/v1/grpc-gcp-apiconfig.json
create mode 100644 google-cloud-spanner/src/test/java/com/google/cloud/spanner/ChannelUsageTest.java
create mode 100644 google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITWithGrpcGcpTest.java
diff --git a/google-cloud-spanner/pom.xml b/google-cloud-spanner/pom.xml
index 78dce01f091..bd22384789d 100644
--- a/google-cloud-spanner/pom.xml
+++ b/google-cloud-spanner/pom.xml
@@ -117,6 +117,12 @@
+
+
+ com.google.cloud
+ grpc-gcp
+ 1.0.0
+
io.grpc
grpc-api
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerOptions.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerOptions.java
index 3274048c61a..a58d93720ae 100644
--- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerOptions.java
+++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerOptions.java
@@ -29,10 +29,9 @@
import com.google.cloud.ServiceOptions;
import com.google.cloud.ServiceRpc;
import com.google.cloud.TransportOptions;
+import com.google.cloud.grpc.GcpManagedChannelOptions;
import com.google.cloud.grpc.GrpcTransportOptions;
import com.google.cloud.spanner.Options.QueryOption;
-import com.google.cloud.spanner.SpannerOptions.CallContextConfigurator;
-import com.google.cloud.spanner.SpannerOptions.SpannerCallContextTimeoutConfigurator;
import com.google.cloud.spanner.admin.database.v1.DatabaseAdminSettings;
import com.google.cloud.spanner.admin.database.v1.stub.DatabaseAdminStubSettings;
import com.google.cloud.spanner.admin.instance.v1.InstanceAdminSettings;
@@ -103,6 +102,8 @@ public class SpannerOptions extends ServiceOptions {
private final InstanceAdminStubSettings instanceAdminStubSettings;
private final DatabaseAdminStubSettings databaseAdminStubSettings;
private final Duration partitionedDmlTimeout;
+ private final boolean grpcGcpExtensionEnabled;
+ private final GcpManagedChannelOptions grpcGcpOptions;
private final boolean autoThrottleAdministrativeRequests;
private final RetrySettings retryAdministrativeRequestsSettings;
private final boolean trackTransactionStarter;
@@ -554,6 +555,8 @@ private SpannerOptions(Builder builder) {
throw SpannerExceptionFactory.newSpannerException(e);
}
partitionedDmlTimeout = builder.partitionedDmlTimeout;
+ grpcGcpExtensionEnabled = builder.grpcGcpExtensionEnabled;
+ grpcGcpOptions = builder.grpcGcpOptions;
autoThrottleAdministrativeRequests = builder.autoThrottleAdministrativeRequests;
retryAdministrativeRequestsSettings = builder.retryAdministrativeRequestsSettings;
trackTransactionStarter = builder.trackTransactionStarter;
@@ -658,6 +661,8 @@ public static class Builder
private DatabaseAdminStubSettings.Builder databaseAdminStubSettingsBuilder =
DatabaseAdminStubSettings.newBuilder();
private Duration partitionedDmlTimeout = Duration.ofHours(2L);
+ private boolean grpcGcpExtensionEnabled = false;
+ private GcpManagedChannelOptions grpcGcpOptions;
private RetrySettings retryAdministrativeRequestsSettings =
DEFAULT_ADMIN_REQUESTS_LIMIT_EXCEEDED_RETRY_SETTINGS;
private boolean autoThrottleAdministrativeRequests = false;
@@ -707,6 +712,8 @@ private Builder() {
this.instanceAdminStubSettingsBuilder = options.instanceAdminStubSettings.toBuilder();
this.databaseAdminStubSettingsBuilder = options.databaseAdminStubSettings.toBuilder();
this.partitionedDmlTimeout = options.partitionedDmlTimeout;
+ this.grpcGcpExtensionEnabled = options.grpcGcpExtensionEnabled;
+ this.grpcGcpOptions = options.grpcGcpOptions;
this.autoThrottleAdministrativeRequests = options.autoThrottleAdministrativeRequests;
this.retryAdministrativeRequestsSettings = options.retryAdministrativeRequestsSettings;
this.trackTransactionStarter = options.trackTransactionStarter;
@@ -1035,6 +1042,28 @@ public Builder setHost(String host) {
return this;
}
+ /** Enables gRPC-GCP extension with the default settings. */
+ public Builder enableGrpcGcpExtension() {
+ this.grpcGcpExtensionEnabled = true;
+ return this;
+ }
+
+ /**
+ * Enables gRPC-GCP extension and uses provided options for configuration. The metric registry
+ * and default Spanner metric labels will be added automatically.
+ */
+ public Builder enableGrpcGcpExtension(GcpManagedChannelOptions options) {
+ this.grpcGcpExtensionEnabled = true;
+ this.grpcGcpOptions = options;
+ return this;
+ }
+
+ /** Disables gRPC-GCP extension. */
+ public Builder disableGrpcGcpExtension() {
+ this.grpcGcpExtensionEnabled = false;
+ return this;
+ }
+
/**
* Sets the host of an emulator to use. By default the value is read from an environment
* variable. If the environment variable is not set, this will be null.
@@ -1128,6 +1157,14 @@ public Duration getPartitionedDmlTimeout() {
return partitionedDmlTimeout;
}
+ public boolean isGrpcGcpExtensionEnabled() {
+ return grpcGcpExtensionEnabled;
+ }
+
+ public GcpManagedChannelOptions getGrpcGcpOptions() {
+ return grpcGcpOptions;
+ }
+
public boolean isAutoThrottleAdministrativeRequests() {
return autoThrottleAdministrativeRequests;
}
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/GapicSpannerRpc.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/GapicSpannerRpc.java
index ef7966beed1..0f97898a40a 100644
--- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/GapicSpannerRpc.java
+++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/GapicSpannerRpc.java
@@ -18,6 +18,7 @@
import static com.google.cloud.spanner.SpannerExceptionFactory.newSpannerException;
+import com.google.api.core.ApiFunction;
import com.google.api.core.ApiFuture;
import com.google.api.core.InternalApi;
import com.google.api.core.NanoClock;
@@ -54,6 +55,9 @@
import com.google.api.pathtemplate.PathTemplate;
import com.google.cloud.RetryHelper;
import com.google.cloud.RetryHelper.RetryHelperException;
+import com.google.cloud.grpc.GcpManagedChannelBuilder;
+import com.google.cloud.grpc.GcpManagedChannelOptions;
+import com.google.cloud.grpc.GcpManagedChannelOptions.GcpMetricsOptions;
import com.google.cloud.grpc.GrpcTransportOptions;
import com.google.cloud.spanner.AdminRequestsPerMinuteExceededException;
import com.google.cloud.spanner.ErrorCode;
@@ -80,6 +84,7 @@
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
+import com.google.common.io.Resources;
import com.google.common.util.concurrent.RateLimiter;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import com.google.iam.v1.GetIamPolicyRequest;
@@ -156,10 +161,13 @@
import com.google.spanner.v1.Transaction;
import io.grpc.CallCredentials;
import io.grpc.Context;
+import io.grpc.ManagedChannelBuilder;
import io.grpc.MethodDescriptor;
+import io.opencensus.metrics.Metrics;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
+import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.util.Comparator;
import java.util.HashMap;
@@ -249,6 +257,7 @@ private void awaitTermination() throws InterruptedException {
private static final String CLIENT_LIBRARY_LANGUAGE = "spanner-java";
public static final String DEFAULT_USER_AGENT =
CLIENT_LIBRARY_LANGUAGE + "/" + GaxProperties.getLibraryVersion(GapicSpannerRpc.class);
+ private static final String API_FILE = "grpc-gcp-apiconfig.json";
private final ManagedInstantiatingExecutorProvider executorProvider;
private boolean rpcIsClosed;
@@ -368,6 +377,9 @@ public GapicSpannerRpc(final SpannerOptions options) {
// whether the attempt is allowed is totally controlled by service owner.
.setAttemptDirectPath(true);
+ // If it is enabled in options uses the channel pool provided by the gRPC-GCP extension.
+ maybeEnableGrpcGcpExtension(defaultChannelProviderBuilder, options);
+
TransportChannelProvider channelProvider =
MoreObjects.firstNonNull(
options.getChannelProvider(), defaultChannelProviderBuilder.build());
@@ -509,6 +521,62 @@ public UnaryCallable createUnaryCalla
}
}
+ private static String parseGrpcGcpApiConfig() {
+ try {
+ return Resources.toString(
+ GapicSpannerRpc.class.getResource(API_FILE), Charset.forName("UTF8"));
+ } catch (IOException e) {
+ throw newSpannerException(e);
+ }
+ }
+
+ // Enhance metric options for gRPC-GCP extension. Adds metric registry if not specified.
+ private static GcpManagedChannelOptions grpcGcpOptionsWithMetrics(SpannerOptions options) {
+ GcpManagedChannelOptions grpcGcpOptions =
+ MoreObjects.firstNonNull(options.getGrpcGcpOptions(), new GcpManagedChannelOptions());
+ GcpMetricsOptions metricsOptions =
+ MoreObjects.firstNonNull(
+ grpcGcpOptions.getMetricsOptions(), GcpMetricsOptions.newBuilder().build());
+ GcpMetricsOptions.Builder metricsOptionsBuilder = GcpMetricsOptions.newBuilder(metricsOptions);
+ if (metricsOptions.getMetricRegistry() == null) {
+ metricsOptionsBuilder.withMetricRegistry(Metrics.getMetricRegistry());
+ }
+ // TODO: Add default labels with values: client_id, database, instance_id.
+ if (metricsOptions.getNamePrefix().equals("")) {
+ metricsOptionsBuilder.withNamePrefix("cloud.google.com/java/spanner/gcp-channel-pool/");
+ }
+ return GcpManagedChannelOptions.newBuilder(grpcGcpOptions)
+ .withMetricsOptions(metricsOptionsBuilder.build())
+ .build();
+ }
+
+ @SuppressWarnings("rawtypes")
+ private static void maybeEnableGrpcGcpExtension(
+ InstantiatingGrpcChannelProvider.Builder defaultChannelProviderBuilder,
+ final SpannerOptions options) {
+ if (!options.isGrpcGcpExtensionEnabled()) {
+ return;
+ }
+
+ final String jsonApiConfig = parseGrpcGcpApiConfig();
+ final GcpManagedChannelOptions grpcGcpOptions = grpcGcpOptionsWithMetrics(options);
+
+ ApiFunction apiFunction =
+ channelBuilder -> {
+ if (options.getChannelConfigurator() != null) {
+ channelBuilder = options.getChannelConfigurator().apply(channelBuilder);
+ }
+ return GcpManagedChannelBuilder.forDelegateBuilder(channelBuilder)
+ .withApiConfigJsonString(jsonApiConfig)
+ .withOptions(grpcGcpOptions)
+ .setPoolSize(options.getNumChannels());
+ };
+
+ // Disable the GAX channel pooling functionality by setting the GAX channel pool size to 1.
+ // Enable gRPC-GCP channel pool via the channel configurator.
+ defaultChannelProviderBuilder.setPoolSize(1).setChannelConfigurator(apiFunction);
+ }
+
private static HeaderProvider headerProviderWithUserAgentFrom(HeaderProvider headerProvider) {
final Map headersWithUserAgent = new HashMap<>(headerProvider.getHeaders());
String userAgent = null;
diff --git a/google-cloud-spanner/src/main/resources/com/google/cloud/spanner/spi/v1/grpc-gcp-apiconfig.json b/google-cloud-spanner/src/main/resources/com/google/cloud/spanner/spi/v1/grpc-gcp-apiconfig.json
new file mode 100644
index 00000000000..1761bd2d382
--- /dev/null
+++ b/google-cloud-spanner/src/main/resources/com/google/cloud/spanner/spi/v1/grpc-gcp-apiconfig.json
@@ -0,0 +1,106 @@
+{
+ "channelPool": {
+ "maxSize": 3,
+ "maxConcurrentStreamsLowWatermark": 0
+ },
+ "method": [
+ {
+ "name": ["google.spanner.v1.Spanner/CreateSession"],
+ "affinity" : {
+ "command": "BIND",
+ "affinityKey": "name"
+ }
+ },
+ {
+ "name": ["google.spanner.v1.Spanner/BatchCreateSessions"],
+ "affinity" : {
+ "command": "BIND",
+ "affinityKey": "session.name"
+ }
+ },
+ {
+ "name": ["google.spanner.v1.Spanner/GetSession"],
+ "affinity": {
+ "command": "BOUND",
+ "affinityKey": "name"
+ }
+ },
+ {
+ "name": ["google.spanner.v1.Spanner/DeleteSession"],
+ "affinity": {
+ "command": "UNBIND",
+ "affinityKey": "name"
+ }
+ },
+ {
+ "name": ["google.spanner.v1.Spanner/ExecuteSql"],
+ "affinity": {
+ "command": "BOUND",
+ "affinityKey": "session"
+ }
+ },
+ {
+ "name": ["google.spanner.v1.Spanner/ExecuteBatchDml"],
+ "affinity": {
+ "command": "BOUND",
+ "affinityKey": "session"
+ }
+ },
+ {
+ "name": ["google.spanner.v1.Spanner/ExecuteStreamingSql"],
+ "affinity": {
+ "command": "BOUND",
+ "affinityKey": "session"
+ }
+ },
+ {
+ "name": ["google.spanner.v1.Spanner/Read"],
+ "affinity": {
+ "command": "BOUND",
+ "affinityKey": "session"
+ }
+ },
+ {
+ "name": ["google.spanner.v1.Spanner/StreamingRead"],
+ "affinity": {
+ "command": "BOUND",
+ "affinityKey": "session"
+ }
+ },
+ {
+ "name": ["google.spanner.v1.Spanner/BeginTransaction"],
+ "affinity": {
+ "command": "BOUND",
+ "affinityKey": "session"
+ }
+ },
+ {
+ "name": ["google.spanner.v1.Spanner/Commit"],
+ "affinity": {
+ "command": "BOUND",
+ "affinityKey": "session"
+ }
+ },
+ {
+ "name": ["google.spanner.v1.Spanner/PartitionRead"],
+ "affinity": {
+ "command": "BOUND",
+ "affinityKey": "session"
+ }
+ },
+ {
+ "name": ["google.spanner.v1.Spanner/PartitionQuery"],
+ "affinity": {
+ "command": "BOUND",
+ "affinityKey": "session"
+ }
+ },
+ {
+ "name": ["google.spanner.v1.Spanner/Rollback"],
+ "affinity": {
+ "command": "BOUND",
+ "affinityKey": "session"
+ }
+ }
+ ]
+}
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/ChannelUsageTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/ChannelUsageTest.java
new file mode 100644
index 00000000000..e390e581206
--- /dev/null
+++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/ChannelUsageTest.java
@@ -0,0 +1,235 @@
+/*
+ * Copyright 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.cloud.spanner;
+
+import static org.junit.Assert.assertEquals;
+
+import com.google.cloud.NoCredentials;
+import com.google.cloud.spanner.MockSpannerServiceImpl.StatementResult;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.ListeningExecutorService;
+import com.google.common.util.concurrent.MoreExecutors;
+import com.google.protobuf.ListValue;
+import com.google.spanner.v1.ResultSetMetadata;
+import com.google.spanner.v1.SpannerGrpc;
+import com.google.spanner.v1.StructType;
+import com.google.spanner.v1.StructType.Field;
+import com.google.spanner.v1.TypeCode;
+import io.grpc.Attributes;
+import io.grpc.Context;
+import io.grpc.Contexts;
+import io.grpc.Metadata;
+import io.grpc.Server;
+import io.grpc.ServerCall;
+import io.grpc.ServerCallHandler;
+import io.grpc.ServerInterceptor;
+import io.grpc.netty.shaded.io.grpc.netty.NettyServerBuilder;
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameter;
+import org.junit.runners.Parameterized.Parameters;
+
+/**
+ * Tests that the Spanner client opens multiple channels, and that each session is associated with
+ * one specific channel.
+ */
+@RunWith(Parameterized.class)
+public class ChannelUsageTest {
+
+ @Parameter(0)
+ public int numChannels;
+
+ @Parameter(1)
+ public boolean enableGcpPool;
+
+ @Parameters(name = "num channels = {0}, enable GCP pool = {1}")
+ public static Collection data() {
+ return Arrays.asList(
+ new Object[][] {{1, true}, {1, false}, {2, true}, {2, false}, {4, true}, {4, false}});
+ }
+
+ private static final Statement SELECT1 = Statement.of("SELECT 1 AS COL1");
+ private static final ResultSetMetadata SELECT1_METADATA =
+ ResultSetMetadata.newBuilder()
+ .setRowType(
+ StructType.newBuilder()
+ .addFields(
+ Field.newBuilder()
+ .setName("COL1")
+ .setType(
+ com.google.spanner.v1.Type.newBuilder()
+ .setCode(TypeCode.INT64)
+ .build())
+ .build())
+ .build())
+ .build();
+ private static final com.google.spanner.v1.ResultSet SELECT1_RESULTSET =
+ com.google.spanner.v1.ResultSet.newBuilder()
+ .addRows(
+ ListValue.newBuilder()
+ .addValues(com.google.protobuf.Value.newBuilder().setStringValue("1").build())
+ .build())
+ .setMetadata(SELECT1_METADATA)
+ .build();
+
+ private static MockSpannerServiceImpl mockSpanner;
+ private static Server server;
+ private static InetSocketAddress address;
+ private static final Set batchCreateSessionLocalIps =
+ ConcurrentHashMap.newKeySet();
+ private static final Set executeSqlLocalIps = ConcurrentHashMap.newKeySet();
+
+ @BeforeClass
+ public static void startServer() throws IOException {
+ mockSpanner = new MockSpannerServiceImpl();
+ mockSpanner.setAbortProbability(0.0D); // We don't want any unpredictable aborted transactions.
+ mockSpanner.putStatementResult(StatementResult.query(SELECT1, SELECT1_RESULTSET));
+
+ address = new InetSocketAddress("localhost", 0);
+ server =
+ NettyServerBuilder.forAddress(address)
+ .addService(mockSpanner)
+ // Add a server interceptor to register the remote addresses that we are seeing. This
+ // indicates how many channels are used client side to communicate with the server.
+ .intercept(
+ new ServerInterceptor() {
+ @Override
+ public ServerCall.Listener interceptCall(
+ ServerCall call,
+ Metadata headers,
+ ServerCallHandler next) {
+ Attributes attributes = call.getAttributes();
+ @SuppressWarnings({"unchecked", "deprecation"})
+ Attributes.Key key =
+ (Attributes.Key)
+ attributes.keys().stream()
+ .filter(k -> k.toString().equals("remote-addr"))
+ .findFirst()
+ .orElse(null);
+ if (key != null) {
+ if (call.getMethodDescriptor()
+ .equals(SpannerGrpc.getBatchCreateSessionsMethod())) {
+ batchCreateSessionLocalIps.add(attributes.get(key));
+ }
+ if (call.getMethodDescriptor()
+ .equals(SpannerGrpc.getExecuteStreamingSqlMethod())) {
+ executeSqlLocalIps.add(attributes.get(key));
+ }
+ }
+ return Contexts.interceptCall(Context.current(), call, headers, next);
+ }
+ })
+ .build()
+ .start();
+ }
+
+ @AfterClass
+ public static void stopServer() throws InterruptedException {
+ server.shutdown();
+ server.awaitTermination();
+ }
+
+ @After
+ public void reset() {
+ mockSpanner.reset();
+ batchCreateSessionLocalIps.clear();
+ executeSqlLocalIps.clear();
+ }
+
+ private SpannerOptions createSpannerOptions() {
+ String endpoint = address.getHostString() + ":" + server.getPort();
+ SpannerOptions.Builder builder =
+ SpannerOptions.newBuilder()
+ .setProjectId("[PROJECT]")
+ .setChannelConfigurator(
+ input -> {
+ input.usePlaintext();
+ return input;
+ })
+ .setNumChannels(numChannels)
+ .setSessionPoolOption(
+ SessionPoolOptions.newBuilder()
+ .setMinSessions(numChannels * 2)
+ .setMaxSessions(numChannels * 2)
+ .build())
+ .setHost("http://" + endpoint)
+ .setCredentials(NoCredentials.getInstance());
+ if (enableGcpPool) {
+ builder.enableGrpcGcpExtension();
+ }
+
+ return builder.build();
+ }
+
+ @Test
+ public void testCreatesNumChannels() {
+ try (Spanner spanner = createSpannerOptions().getService()) {
+ DatabaseClient client = spanner.getDatabaseClient(DatabaseId.of("p", "i", "d"));
+ try (ResultSet resultSet = client.singleUse().executeQuery(SELECT1)) {
+ while (resultSet.next()) {}
+ }
+ }
+ assertEquals(numChannels, batchCreateSessionLocalIps.size());
+ }
+
+ @Test
+ public void testUsesAllChannels() throws InterruptedException, ExecutionException {
+ try (Spanner spanner = createSpannerOptions().getService()) {
+ DatabaseClient client = spanner.getDatabaseClient(DatabaseId.of("p", "i", "d"));
+ ListeningExecutorService executor =
+ MoreExecutors.listeningDecorator(Executors.newFixedThreadPool(numChannels * 2));
+ CountDownLatch latch = new CountDownLatch(numChannels * 2);
+ List> futures = new ArrayList<>(numChannels * 2);
+ for (int run = 0; run < numChannels * 2; run++) {
+ futures.add(
+ executor.submit(
+ () -> {
+ try (ReadOnlyTransaction transaction = client.readOnlyTransaction()) {
+ try (ResultSet resultSet = transaction.executeQuery(SELECT1)) {
+ while (resultSet.next()) {}
+ latch.countDown();
+ try {
+ return latch.await(10L, TimeUnit.SECONDS);
+ } catch (InterruptedException e) {
+ throw SpannerExceptionFactory.asSpannerException(e);
+ }
+ }
+ }
+ }));
+ }
+ assertEquals(numChannels * 2, Futures.allAsList(futures).get().size());
+ }
+ assertEquals(numChannels, executeSqlLocalIps.size());
+ }
+}
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITWithGrpcGcpTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITWithGrpcGcpTest.java
new file mode 100644
index 00000000000..8fdf687e444
--- /dev/null
+++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITWithGrpcGcpTest.java
@@ -0,0 +1,115 @@
+/*
+ * Copyright 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.cloud.spanner.it;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import com.google.cloud.spanner.Database;
+import com.google.cloud.spanner.DatabaseClient;
+import com.google.cloud.spanner.IntegrationTestEnv;
+import com.google.cloud.spanner.Key;
+import com.google.cloud.spanner.Mutation;
+import com.google.cloud.spanner.ParallelIntegrationTest;
+import com.google.cloud.spanner.SpannerOptions;
+import com.google.cloud.spanner.Statement;
+import com.google.cloud.spanner.Struct;
+import com.google.cloud.spanner.TimestampBound;
+import com.google.cloud.spanner.testing.RemoteSpannerHelper;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import org.junit.BeforeClass;
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+/** Integration tests for using gRPC-GCP extension. */
+@Category(ParallelIntegrationTest.class)
+@RunWith(JUnit4.class)
+public class ITWithGrpcGcpTest {
+
+ @ClassRule public static IntegrationTestEnv env = new IntegrationTestEnv();
+ private static final String TABLE_NAME = "TestTable";
+ private static final List ALL_COLUMNS = Arrays.asList("Key", "StringValue");
+
+ private static RemoteSpannerHelper testHelper;
+ private static Database db;
+ private static DatabaseClient client;
+
+ @BeforeClass
+ public static void setUpDatabase() {
+ // Get default spanner options for an integration test.
+ SpannerOptions.Builder builder = env.getTestHelper().getOptions().toBuilder();
+ builder.enableGrpcGcpExtension();
+
+ // Create a new testHelper with the gRPC-GCP extension enabled.
+ testHelper = RemoteSpannerHelper.create(builder.build(), env.getTestHelper().getInstanceId());
+
+ db =
+ env.getTestHelper()
+ .createTestDatabase(
+ "CREATE TABLE "
+ + TABLE_NAME
+ + " ("
+ + " Key STRING(MAX) NOT NULL,"
+ + " StringValue STRING(MAX),"
+ + ") PRIMARY KEY (Key)");
+ client = testHelper.getDatabaseClient(db);
+
+ List mutations = new ArrayList<>();
+ for (int i = 0; i < 3; ++i) {
+ mutations.add(
+ Mutation.newInsertOrUpdateBuilder(TABLE_NAME)
+ .set("Key")
+ .to("k" + i)
+ .set("StringValue")
+ .to("v" + i)
+ .build());
+ }
+ client.write(mutations);
+ }
+
+ @Test
+ public void singleRead() {
+ Struct row =
+ client.singleUse(TimestampBound.strong()).readRow(TABLE_NAME, Key.of("k1"), ALL_COLUMNS);
+ assertThat(row).isNotNull();
+ assertThat(row.getString(0)).isEqualTo("k1");
+ assertThat(row.getString(1)).isEqualTo("v1");
+ }
+
+ @Test
+ public void usingTransaction() {
+ final Long updatedCount =
+ client
+ .readWriteTransaction()
+ .run(
+ transaction ->
+ transaction.executeUpdate(
+ Statement.of(
+ "UPDATE " + TABLE_NAME + " SET StringValue='v2upd' WHERE Key='k2'")));
+ assertThat(updatedCount).isEqualTo(1L);
+
+ Struct row =
+ client.singleUse(TimestampBound.strong()).readRow(TABLE_NAME, Key.of("k2"), ALL_COLUMNS);
+ assertThat(row).isNotNull();
+ assertThat(row.getString(0)).isEqualTo("k2");
+ assertThat(row.getString(1)).isEqualTo("v2upd");
+ }
+}
From 11213640091b7226931342d9476f41864da0594c Mon Sep 17 00:00:00 2001
From: Thiago Nunes
Date: Tue, 29 Jun 2021 14:09:28 +1000
Subject: [PATCH 7/8] samples: adds LCI samples (#1251)
* feat: add support for instance processing units
* docs: add sample for instance processing units
* fix: remove commented code + use junit asserts
* fix: remove Spanner snapshot reference
* test: add tests for InstanceInfo
* cleanup: fix formatting + tests
* chore: fix formatting
* test: fixes instanceinfo test
Due to master merge the compilation was failing. Fixes the builder
construction here.
* refactor: adds default impl for processing units
Adds default implementation for the InstanceInfo set processing units in
order to avoid a breaking change.
* samples: remove LCI samples for now
Removes the LCI samples for now, because they won't compile. We will
re-add them once the main implementation is released.
* Revert "samples: remove LCI samples for now"
This reverts commit dc178921927d28ceb54ba49f195752c44ce45f82.
* samples: fixes processing units samples for lci
Co-authored-by: Olav Loite
---
...ateInstanceWithProcessingUnitsExample.java | 74 +++++++++++++++++++
1 file changed, 74 insertions(+)
create mode 100644 samples/snippets/src/main/java/com/example/spanner/CreateInstanceWithProcessingUnitsExample.java
diff --git a/samples/snippets/src/main/java/com/example/spanner/CreateInstanceWithProcessingUnitsExample.java b/samples/snippets/src/main/java/com/example/spanner/CreateInstanceWithProcessingUnitsExample.java
new file mode 100644
index 00000000000..263c6f69fa7
--- /dev/null
+++ b/samples/snippets/src/main/java/com/example/spanner/CreateInstanceWithProcessingUnitsExample.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.example.spanner;
+
+//[START spanner_create_instance_with_processing_units]
+import com.google.api.gax.longrunning.OperationFuture;
+import com.google.cloud.spanner.Instance;
+import com.google.cloud.spanner.InstanceAdminClient;
+import com.google.cloud.spanner.InstanceConfigId;
+import com.google.cloud.spanner.InstanceId;
+import com.google.cloud.spanner.InstanceInfo;
+import com.google.cloud.spanner.Spanner;
+import com.google.cloud.spanner.SpannerOptions;
+import com.google.spanner.admin.instance.v1.CreateInstanceMetadata;
+import java.util.concurrent.ExecutionException;
+
+class CreateInstanceWithProcessingUnitsExample {
+
+ static void createInstance() {
+ // TODO(developer): Replace these variables before running the sample.
+ String projectId = "my-project";
+ String instanceId = "my-instance";
+ createInstance(projectId, instanceId);
+ }
+
+ static void createInstance(String projectId, String instanceId) {
+ Spanner spanner = SpannerOptions.newBuilder().setProjectId(projectId).build().getService();
+ InstanceAdminClient instanceAdminClient = spanner.getInstanceAdminClient();
+
+ // Set Instance configuration.
+ String configId = "regional-us-central1";
+ // This will create an instance with the processing power of 0.2 nodes.
+ int processingUnits = 500;
+ String displayName = "Descriptive name";
+
+ // Create an InstanceInfo object that will be used to create the instance.
+ InstanceInfo instanceInfo =
+ InstanceInfo.newBuilder(InstanceId.of(projectId, instanceId))
+ .setInstanceConfigId(InstanceConfigId.of(projectId, configId))
+ .setProcessingUnits(processingUnits)
+ .setDisplayName(displayName)
+ .build();
+ OperationFuture operation =
+ instanceAdminClient.createInstance(instanceInfo);
+ try {
+ // Wait for the createInstance operation to finish.
+ Instance instance = operation.get();
+ System.out.printf("Instance %s was successfully created with %d processing units%n",
+ instance.getId(), instance.getProcessingUnits());
+ } catch (ExecutionException e) {
+ System.out.printf(
+ "Error: Creating instance %s failed with error message %s%n",
+ instanceInfo.getId(), e.getMessage());
+ } catch (InterruptedException e) {
+ System.out.println("Error: Waiting for createInstance operation to finish was interrupted");
+ }
+ spanner.close();
+ }
+}
+//[END spanner_create_instance_with_processing_units]
From cca39372ba11ebf70c06c374bf4e4883e0c8eac3 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
<55107282+release-please[bot]@users.noreply.github.com>
Date: Wed, 30 Jun 2021 11:20:12 +1000
Subject: [PATCH 8/8] chore: release 6.8.0 (#1259)
Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
CHANGELOG.md | 13 +++++++++++++
google-cloud-spanner-bom/pom.xml | 18 +++++++++---------
google-cloud-spanner/pom.xml | 4 ++--
.../pom.xml | 4 ++--
.../pom.xml | 4 ++--
grpc-google-cloud-spanner-v1/pom.xml | 4 ++--
pom.xml | 16 ++++++++--------
.../pom.xml | 4 ++--
.../pom.xml | 4 ++--
proto-google-cloud-spanner-v1/pom.xml | 4 ++--
samples/snapshot/pom.xml | 2 +-
versions.txt | 14 +++++++-------
12 files changed, 52 insertions(+), 39 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2e19c2b5615..c0f60d97064 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,18 @@
# Changelog
+## [6.8.0](https://www.github.com/googleapis/java-spanner/compare/v6.7.0...v6.8.0) (2021-06-29)
+
+
+### Features
+
+* add gRPC-GCP channel pool as an option ([#1227](https://www.github.com/googleapis/java-spanner/issues/1227)) ([1fa95a9](https://www.github.com/googleapis/java-spanner/commit/1fa95a9993ea8c7a5f943ab39eced4ced4cb87e7))
+* spanner JSON type ([#1260](https://www.github.com/googleapis/java-spanner/issues/1260)) ([b2a56c6](https://www.github.com/googleapis/java-spanner/commit/b2a56c68695b6209e20f9f86d83d7c5a0f39c7a8))
+
+
+### Bug Fixes
+
+* Add `shopt -s nullglob` to dependencies script ([#1256](https://www.github.com/googleapis/java-spanner/issues/1256)) ([d1712f7](https://www.github.com/googleapis/java-spanner/commit/d1712f7c51752c2359045e5eabac8fc0530a2421))
+
## [6.7.0](https://www.github.com/googleapis/java-spanner/compare/v6.6.1...v6.7.0) (2021-06-21)
diff --git a/google-cloud-spanner-bom/pom.xml b/google-cloud-spanner-bom/pom.xml
index 77cdca841db..28db29dde37 100644
--- a/google-cloud-spanner-bom/pom.xml
+++ b/google-cloud-spanner-bom/pom.xml
@@ -3,7 +3,7 @@
4.0.0
com.google.cloud
google-cloud-spanner-bom
- 6.7.1-SNAPSHOT
+ 6.8.0
pom
com.google.cloud
@@ -64,43 +64,43 @@
com.google.api.grpc
proto-google-cloud-spanner-admin-instance-v1
- 6.7.1-SNAPSHOT
+ 6.8.0
com.google.api.grpc
grpc-google-cloud-spanner-v1
- 6.7.1-SNAPSHOT
+ 6.8.0
com.google.api.grpc
proto-google-cloud-spanner-v1
- 6.7.1-SNAPSHOT
+ 6.8.0
com.google.api.grpc
proto-google-cloud-spanner-admin-database-v1
- 6.7.1-SNAPSHOT
+ 6.8.0
com.google.cloud
google-cloud-spanner
- 6.7.1-SNAPSHOT
+ 6.8.0
com.google.cloud
google-cloud-spanner
test-jar
- 6.7.1-SNAPSHOT
+ 6.8.0
com.google.api.grpc
grpc-google-cloud-spanner-admin-instance-v1
- 6.7.1-SNAPSHOT
+ 6.8.0
com.google.api.grpc
grpc-google-cloud-spanner-admin-database-v1
- 6.7.1-SNAPSHOT
+ 6.8.0
diff --git a/google-cloud-spanner/pom.xml b/google-cloud-spanner/pom.xml
index bd22384789d..1eb4991e35b 100644
--- a/google-cloud-spanner/pom.xml
+++ b/google-cloud-spanner/pom.xml
@@ -3,7 +3,7 @@
4.0.0
com.google.cloud
google-cloud-spanner
- 6.7.1-SNAPSHOT
+ 6.8.0
jar
Google Cloud Spanner
https://github.com/googleapis/java-spanner
@@ -11,7 +11,7 @@
com.google.cloud
google-cloud-spanner-parent
- 6.7.1-SNAPSHOT
+ 6.8.0
google-cloud-spanner
diff --git a/grpc-google-cloud-spanner-admin-database-v1/pom.xml b/grpc-google-cloud-spanner-admin-database-v1/pom.xml
index 72f0ecb396b..bae824e7a6c 100644
--- a/grpc-google-cloud-spanner-admin-database-v1/pom.xml
+++ b/grpc-google-cloud-spanner-admin-database-v1/pom.xml
@@ -4,13 +4,13 @@
4.0.0
com.google.api.grpc
grpc-google-cloud-spanner-admin-database-v1
- 6.7.1-SNAPSHOT
+ 6.8.0
grpc-google-cloud-spanner-admin-database-v1
GRPC library for grpc-google-cloud-spanner-admin-database-v1
com.google.cloud
google-cloud-spanner-parent
- 6.7.1-SNAPSHOT
+ 6.8.0
diff --git a/grpc-google-cloud-spanner-admin-instance-v1/pom.xml b/grpc-google-cloud-spanner-admin-instance-v1/pom.xml
index efda3a80f6e..f88e5fb3839 100644
--- a/grpc-google-cloud-spanner-admin-instance-v1/pom.xml
+++ b/grpc-google-cloud-spanner-admin-instance-v1/pom.xml
@@ -4,13 +4,13 @@
4.0.0
com.google.api.grpc
grpc-google-cloud-spanner-admin-instance-v1
- 6.7.1-SNAPSHOT
+ 6.8.0
grpc-google-cloud-spanner-admin-instance-v1
GRPC library for grpc-google-cloud-spanner-admin-instance-v1
com.google.cloud
google-cloud-spanner-parent
- 6.7.1-SNAPSHOT
+ 6.8.0
diff --git a/grpc-google-cloud-spanner-v1/pom.xml b/grpc-google-cloud-spanner-v1/pom.xml
index 67e44f9cc07..3410473e345 100644
--- a/grpc-google-cloud-spanner-v1/pom.xml
+++ b/grpc-google-cloud-spanner-v1/pom.xml
@@ -4,13 +4,13 @@
4.0.0
com.google.api.grpc
grpc-google-cloud-spanner-v1
- 6.7.1-SNAPSHOT
+ 6.8.0
grpc-google-cloud-spanner-v1
GRPC library for grpc-google-cloud-spanner-v1
com.google.cloud
google-cloud-spanner-parent
- 6.7.1-SNAPSHOT
+ 6.8.0
diff --git a/pom.xml b/pom.xml
index db67d8de109..11237243254 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
com.google.cloud
google-cloud-spanner-parent
pom
- 6.7.1-SNAPSHOT
+ 6.8.0
Google Cloud Spanner Parent
https://github.com/googleapis/java-spanner
@@ -71,37 +71,37 @@
com.google.api.grpc
proto-google-cloud-spanner-admin-instance-v1
- 6.7.1-SNAPSHOT
+ 6.8.0
com.google.api.grpc
proto-google-cloud-spanner-v1
- 6.7.1-SNAPSHOT
+ 6.8.0
com.google.api.grpc
proto-google-cloud-spanner-admin-database-v1
- 6.7.1-SNAPSHOT
+ 6.8.0
com.google.api.grpc
grpc-google-cloud-spanner-v1
- 6.7.1-SNAPSHOT
+ 6.8.0
com.google.api.grpc
grpc-google-cloud-spanner-admin-instance-v1
- 6.7.1-SNAPSHOT
+ 6.8.0
com.google.api.grpc
grpc-google-cloud-spanner-admin-database-v1
- 6.7.1-SNAPSHOT
+ 6.8.0
com.google.cloud
google-cloud-spanner
- 6.7.1-SNAPSHOT
+ 6.8.0
diff --git a/proto-google-cloud-spanner-admin-database-v1/pom.xml b/proto-google-cloud-spanner-admin-database-v1/pom.xml
index 0edf5c58d2a..faf0c01ae08 100644
--- a/proto-google-cloud-spanner-admin-database-v1/pom.xml
+++ b/proto-google-cloud-spanner-admin-database-v1/pom.xml
@@ -4,13 +4,13 @@
4.0.0
com.google.api.grpc
proto-google-cloud-spanner-admin-database-v1
- 6.7.1-SNAPSHOT
+ 6.8.0
proto-google-cloud-spanner-admin-database-v1
PROTO library for proto-google-cloud-spanner-admin-database-v1
com.google.cloud
google-cloud-spanner-parent
- 6.7.1-SNAPSHOT
+ 6.8.0
diff --git a/proto-google-cloud-spanner-admin-instance-v1/pom.xml b/proto-google-cloud-spanner-admin-instance-v1/pom.xml
index a01988fde8a..cd9b9d5af80 100644
--- a/proto-google-cloud-spanner-admin-instance-v1/pom.xml
+++ b/proto-google-cloud-spanner-admin-instance-v1/pom.xml
@@ -4,13 +4,13 @@
4.0.0
com.google.api.grpc
proto-google-cloud-spanner-admin-instance-v1
- 6.7.1-SNAPSHOT
+ 6.8.0
proto-google-cloud-spanner-admin-instance-v1
PROTO library for proto-google-cloud-spanner-admin-instance-v1
com.google.cloud
google-cloud-spanner-parent
- 6.7.1-SNAPSHOT
+ 6.8.0
diff --git a/proto-google-cloud-spanner-v1/pom.xml b/proto-google-cloud-spanner-v1/pom.xml
index 44bed8902d7..ca8697cd1fc 100644
--- a/proto-google-cloud-spanner-v1/pom.xml
+++ b/proto-google-cloud-spanner-v1/pom.xml
@@ -4,13 +4,13 @@
4.0.0
com.google.api.grpc
proto-google-cloud-spanner-v1
- 6.7.1-SNAPSHOT
+ 6.8.0
proto-google-cloud-spanner-v1
PROTO library for proto-google-cloud-spanner-v1
com.google.cloud
google-cloud-spanner-parent
- 6.7.1-SNAPSHOT
+ 6.8.0
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 3be52e9694c..82bbc1c254d 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -31,7 +31,7 @@
com.google.cloud
google-cloud-spanner
- 6.7.1-SNAPSHOT
+ 6.8.0
diff --git a/versions.txt b/versions.txt
index 2f075fe1277..5beda867e0b 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,10 +1,10 @@
# Format:
# module:released-version:current-version
-proto-google-cloud-spanner-admin-instance-v1:6.7.0:6.7.1-SNAPSHOT
-proto-google-cloud-spanner-v1:6.7.0:6.7.1-SNAPSHOT
-proto-google-cloud-spanner-admin-database-v1:6.7.0:6.7.1-SNAPSHOT
-grpc-google-cloud-spanner-v1:6.7.0:6.7.1-SNAPSHOT
-grpc-google-cloud-spanner-admin-instance-v1:6.7.0:6.7.1-SNAPSHOT
-grpc-google-cloud-spanner-admin-database-v1:6.7.0:6.7.1-SNAPSHOT
-google-cloud-spanner:6.7.0:6.7.1-SNAPSHOT
\ No newline at end of file
+proto-google-cloud-spanner-admin-instance-v1:6.8.0:6.8.0
+proto-google-cloud-spanner-v1:6.8.0:6.8.0
+proto-google-cloud-spanner-admin-database-v1:6.8.0:6.8.0
+grpc-google-cloud-spanner-v1:6.8.0:6.8.0
+grpc-google-cloud-spanner-admin-instance-v1:6.8.0:6.8.0
+grpc-google-cloud-spanner-admin-database-v1:6.8.0:6.8.0
+google-cloud-spanner:6.8.0:6.8.0
\ No newline at end of file