} is resolved.
- */
- SessionReference getMultiplexedSessionInstance() {
- try {
- return currentMultiplexedSessionReference.get().get();
- } catch (InterruptedException e) {
- throw SpannerExceptionFactory.propagateInterrupt(e);
- } catch (ExecutionException e) {
- throw asSpannerException(e.getCause());
- }
+ PooledSessionFutureWrapper getMultiplexedSessionWithFallback() throws SpannerException {
+ return new PooledSessionFutureWrapper(getSession());
}
/**
@@ -3271,14 +2703,12 @@ private PooledSessionFuture checkoutSession(
return res;
}
- private void incrementNumSessionsInUse(boolean isMultiplexed) {
+ private void incrementNumSessionsInUse() {
synchronized (lock) {
- if (!isMultiplexed) {
- if (maxSessionsInUse < ++numSessionsInUse) {
- maxSessionsInUse = numSessionsInUse;
- }
- numSessionsAcquired++;
+ if (maxSessionsInUse < ++numSessionsInUse) {
+ maxSessionsInUse = numSessionsInUse;
}
+ numSessionsAcquired++;
}
}
@@ -3496,7 +2926,7 @@ static boolean isUnbalanced(
private void handleCreateSessionsFailure(SpannerException e, int count) {
synchronized (lock) {
for (int i = 0; i < count; i++) {
- if (waiters.size() > 0) {
+ if (!waiters.isEmpty()) {
waiters.poll().put(e);
} else {
break;
@@ -3638,20 +3068,6 @@ private boolean canCreateSession() {
}
}
- private void maybeCreateMultiplexedSession(SessionConsumer sessionConsumer) {
- synchronized (lock) {
- if (!multiplexedSessionBeingCreated) {
- logger.log(Level.FINE, String.format("Creating multiplexed sessions"));
- try {
- multiplexedSessionBeingCreated = true;
- sessionClient.asyncCreateMultiplexedSession(sessionConsumer);
- } catch (Throwable ignore) {
- // such an exception will never be thrown. the exception will be passed onto the consumer.
- }
- }
- }
- }
-
private void createSessions(final int sessionCount, boolean distributeOverChannels) {
logger.log(Level.FINE, String.format("Creating %d sessions", sessionCount));
synchronized (lock) {
@@ -3674,99 +3090,6 @@ private void createSessions(final int sessionCount, boolean distributeOverChanne
}
}
- /**
- * Callback interface which is invoked when a multiplexed session is being replaced by the
- * background maintenance thread. When a multiplexed session creation fails during background
- * thread, it would simply log the exception and retry the session creation in the next background
- * thread invocation.
- *
- * This consumer is not used when the multiplexed session is getting initialized for the first
- * time during application startup. We instead use {@link
- * MultiplexedSessionInitializationConsumer} for the first time when multiplexed session is
- * getting created.
- */
- class MultiplexedSessionMaintainerConsumer implements SessionConsumer {
- @Override
- public void onSessionReady(SessionImpl sessionImpl) {
- final SessionReference sessionReference = sessionImpl.getSessionReference();
- final SettableFuture settableFuture = SettableFuture.create();
- settableFuture.set(sessionReference);
-
- synchronized (lock) {
- SessionReference oldSession = null;
- if (currentMultiplexedSessionReference.get().isDone()) {
- oldSession = getMultiplexedSessionInstance();
- }
- SettableApiFuture settableApiFuture = SettableApiFuture.create();
- settableApiFuture.set(sessionReference);
- currentMultiplexedSessionReference.set(settableApiFuture);
- if (oldSession != null) {
- logger.log(
- Level.INFO,
- String.format(
- "Removed Multiplexed Session => %s created at => %s",
- oldSession.getName(), oldSession.getCreateTime()));
- if (multiplexedSessionRemovedListener != null) {
- multiplexedSessionRemovedListener.apply(oldSession);
- }
- }
- multiplexedSessionBeingCreated = false;
- }
- }
-
- /**
- * Method which logs the exception so that session creation can be re-attempted in the next
- * background thread invocation.
- */
- @Override
- public void onSessionCreateFailure(Throwable t, int createFailureForSessionCount) {
- synchronized (lock) {
- multiplexedSessionBeingCreated = false;
- }
- logger.log(
- Level.WARNING,
- String.format(
- "Failed to create multiplexed session. "
- + "Pending replacing stale multiplexed session",
- t));
- }
- }
-
- /**
- * Callback interface which is invoked when a multiplexed session is getting initialised for the
- * first time when a session is getting created.
- */
- class MultiplexedSessionInitializationConsumer implements SessionConsumer {
- @Override
- public void onSessionReady(SessionImpl sessionImpl) {
- final SessionReference sessionReference = sessionImpl.getSessionReference();
- synchronized (lock) {
- SettableApiFuture settableApiFuture =
- currentMultiplexedSessionReference.get();
- settableApiFuture.set(sessionReference);
- multiplexedSessionBeingCreated = false;
- waitOnMultiplexedSessionsLatch.countDown();
- }
- }
-
- /**
- * When a multiplexed session fails during initialization we would like all pending threads to
- * receive the exception and throw the error. This is done because at the time of start up there
- * is no other multiplexed session which could have been assigned to the pending requests.
- */
- @Override
- public void onSessionCreateFailure(Throwable t, int createFailureForSessionCount) {
- synchronized (lock) {
- multiplexedSessionBeingCreated = false;
- if (isDatabaseOrInstanceNotFound(asSpannerException(t))) {
- setResourceNotFoundException((ResourceNotFoundException) t);
- poolMaintainer.close();
- }
- currentMultiplexedSessionReference.get().setException(asSpannerException(t));
- }
- }
- }
-
/**
* {@link SessionConsumer} that receives the created sessions from a {@link SessionClient} and
* releases these into the pool. The session pool only needs one instance of this, as all sessions
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/TransactionRunnerImpl.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/TransactionRunnerImpl.java
index 692a60e97b5..7219389e775 100644
--- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/TransactionRunnerImpl.java
+++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/TransactionRunnerImpl.java
@@ -306,12 +306,23 @@ private void createTxnAsync(final SettableApiFuture res) {
void commit() {
try {
- commitResponse = commitAsync().get();
- } catch (InterruptedException e) {
+ // Normally, Gax will take care of any timeouts, but we add a timeout for getting the value
+ // from the future here as well to make sure the call always finishes, even if the future
+ // never resolves.
+ commitResponse =
+ commitAsync()
+ .get(
+ rpc.getCommitRetrySettings().getTotalTimeout().getSeconds() + 5,
+ TimeUnit.SECONDS);
+ } catch (InterruptedException | TimeoutException e) {
if (commitFuture != null) {
commitFuture.cancel(true);
}
- throw SpannerExceptionFactory.propagateInterrupt(e);
+ if (e instanceof InterruptedException) {
+ throw SpannerExceptionFactory.propagateInterrupt((InterruptedException) e);
+ } else {
+ throw SpannerExceptionFactory.propagateTimeout((TimeoutException) e);
+ }
} catch (ExecutionException e) {
throw SpannerExceptionFactory.newSpannerException(e.getCause() == null ? e : e.getCause());
}
@@ -422,6 +433,14 @@ public void run() {
commitFuture.addListener(
() -> {
try (IScope ignore = tracer.withSpan(opSpan)) {
+ if (!commitFuture.isDone()) {
+ // This should not be possible, considering that we are in a listener for the
+ // future, but we add a result here as well as a safety precaution.
+ res.setException(
+ SpannerExceptionFactory.newSpannerException(
+ ErrorCode.INTERNAL, "commitFuture is not done"));
+ return;
+ }
com.google.spanner.v1.CommitResponse proto = commitFuture.get();
if (!proto.hasCommitTimestamp()) {
throw newSpannerException(
@@ -430,20 +449,28 @@ public void run() {
span.addAnnotation("Commit Done");
opSpan.end();
res.set(new CommitResponse(proto));
- } catch (Throwable e) {
- if (e instanceof ExecutionException) {
- e =
- SpannerExceptionFactory.newSpannerException(
- e.getCause() == null ? e : e.getCause());
- } else if (e instanceof InterruptedException) {
- e = SpannerExceptionFactory.propagateInterrupt((InterruptedException) e);
- } else {
- e = SpannerExceptionFactory.newSpannerException(e);
+ } catch (Throwable throwable) {
+ SpannerException resultException;
+ try {
+ if (throwable instanceof ExecutionException) {
+ resultException =
+ SpannerExceptionFactory.asSpannerException(
+ throwable.getCause() == null ? throwable : throwable.getCause());
+ } else if (throwable instanceof InterruptedException) {
+ resultException =
+ SpannerExceptionFactory.propagateInterrupt(
+ (InterruptedException) throwable);
+ } else {
+ resultException = SpannerExceptionFactory.asSpannerException(throwable);
+ }
+ span.addAnnotation("Commit Failed", resultException);
+ opSpan.setStatus(resultException);
+ opSpan.end();
+ res.setException(onError(resultException, false));
+ } catch (Throwable unexpectedError) {
+ // This is a safety precaution to make sure that a result is always returned.
+ res.setException(unexpectedError);
}
- span.addAnnotation("Commit Failed", e);
- opSpan.setStatus(e);
- opSpan.end();
- res.setException(onError((SpannerException) e, false));
}
},
MoreExecutors.directExecutor());
@@ -451,9 +478,6 @@ public void run() {
res.setException(SpannerExceptionFactory.propagateInterrupt(e));
} catch (TimeoutException e) {
res.setException(SpannerExceptionFactory.propagateTimeout(e));
- } catch (ExecutionException e) {
- res.setException(
- SpannerExceptionFactory.newSpannerException(e.getCause() == null ? e : e.getCause()));
} catch (Throwable e) {
res.setException(
SpannerExceptionFactory.newSpannerException(e.getCause() == null ? e : e.getCause()));
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/stub/DatabaseAdminStubSettings.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/stub/DatabaseAdminStubSettings.java
index 7ee75687221..2865fcd8d08 100644
--- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/stub/DatabaseAdminStubSettings.java
+++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/database/v1/stub/DatabaseAdminStubSettings.java
@@ -26,6 +26,7 @@
import com.google.api.core.ApiFunction;
import com.google.api.core.ApiFuture;
import com.google.api.core.BetaApi;
+import com.google.api.core.ObsoleteApi;
import com.google.api.gax.core.GaxProperties;
import com.google.api.gax.core.GoogleCredentialsProvider;
import com.google.api.gax.core.InstantiatingExecutorProvider;
@@ -774,6 +775,7 @@ public static InstantiatingExecutorProvider.Builder defaultExecutorProviderBuild
}
/** Returns the default service endpoint. */
+ @ObsoleteApi("Use getEndpoint() instead")
public static String getDefaultEndpoint() {
return "spanner.googleapis.com:443";
}
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/instance/v1/stub/InstanceAdminStubSettings.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/instance/v1/stub/InstanceAdminStubSettings.java
index 9a00b312c61..a74094a3149 100644
--- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/instance/v1/stub/InstanceAdminStubSettings.java
+++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/admin/instance/v1/stub/InstanceAdminStubSettings.java
@@ -25,6 +25,7 @@
import com.google.api.core.ApiFunction;
import com.google.api.core.ApiFuture;
import com.google.api.core.BetaApi;
+import com.google.api.core.ObsoleteApi;
import com.google.api.gax.core.GaxProperties;
import com.google.api.gax.core.GoogleCredentialsProvider;
import com.google.api.gax.core.InstantiatingExecutorProvider;
@@ -738,6 +739,7 @@ public static InstantiatingExecutorProvider.Builder defaultExecutorProviderBuild
}
/** Returns the default service endpoint. */
+ @ObsoleteApi("Use getEndpoint() instead")
public static String getDefaultEndpoint() {
return "spanner.googleapis.com:443";
}
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/ReadWriteTransaction.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/ReadWriteTransaction.java
index 520a2e180e5..0362ffc2050 100644
--- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/ReadWriteTransaction.java
+++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/ReadWriteTransaction.java
@@ -461,7 +461,10 @@ public void run() {
CallType.SYNC,
SELECT1_STATEMENT,
AnalyzeMode.NONE,
- Options.tag("connection.transaction-keep-alive"));
+ Options.tag(
+ System.getProperty(
+ "spanner.connection.keep_alive_query_tag",
+ "connection.transaction-keep-alive")));
future.addListener(
ReadWriteTransaction.this::maybeScheduleKeepAlivePing, MoreExecutors.directExecutor());
}
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 b6016f04f78..00ae72f169a 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
@@ -56,6 +56,7 @@
import com.google.api.pathtemplate.PathTemplate;
import com.google.cloud.RetryHelper;
import com.google.cloud.RetryHelper.RetryHelperException;
+import com.google.cloud.grpc.GcpManagedChannel;
import com.google.cloud.grpc.GcpManagedChannelBuilder;
import com.google.cloud.grpc.GcpManagedChannelOptions;
import com.google.cloud.grpc.GcpManagedChannelOptions.GcpMetricsOptions;
@@ -240,6 +241,7 @@ public class GapicSpannerRpc implements SpannerRpc {
private final Set executeQueryRetryableCodes;
private final RetrySettings readRetrySettings;
private final Set readRetryableCodes;
+ private final RetrySettings commitRetrySettings;
private final SpannerStub partitionedDmlStub;
private final RetrySettings partitionedDmlRetrySettings;
private final InstanceAdminStubSettings instanceAdminStubSettings;
@@ -266,6 +268,8 @@ public class GapicSpannerRpc implements SpannerRpc {
private static final ConcurrentMap ADMINISTRATIVE_REQUESTS_RATE_LIMITERS =
new ConcurrentHashMap<>();
private final boolean leaderAwareRoutingEnabled;
+ private final int numChannels;
+ private final boolean isGrpcGcpExtensionEnabled;
public static GapicSpannerRpc create(SpannerOptions options) {
return new GapicSpannerRpc(options);
@@ -317,6 +321,8 @@ public GapicSpannerRpc(final SpannerOptions options) {
this.callCredentialsProvider = options.getCallCredentialsProvider();
this.compressorName = options.getCompressorName();
this.leaderAwareRoutingEnabled = options.isLeaderAwareRoutingEnabled();
+ this.numChannels = options.getNumChannels();
+ this.isGrpcGcpExtensionEnabled = options.isGrpcGcpExtensionEnabled();
if (initializeStubs) {
// First check if SpannerOptions provides a TransportChannelProvider. Create one
@@ -398,6 +404,8 @@ public GapicSpannerRpc(final SpannerOptions options) {
options.getSpannerStubSettings().executeStreamingSqlSettings().getRetrySettings();
this.executeQueryRetryableCodes =
options.getSpannerStubSettings().executeStreamingSqlSettings().getRetryableCodes();
+ this.commitRetrySettings =
+ options.getSpannerStubSettings().commitSettings().getRetrySettings();
partitionedDmlRetrySettings =
options
.getSpannerStubSettings()
@@ -508,6 +516,8 @@ public UnaryCallable createUnaryCalla
this.readRetryableCodes = null;
this.executeQueryRetrySettings = null;
this.executeQueryRetryableCodes = null;
+ this.commitRetrySettings =
+ SpannerStubSettings.newBuilder().commitSettings().getRetrySettings();
this.partitionedDmlStub = null;
this.databaseAdminStubSettings = null;
this.instanceAdminStubSettings = null;
@@ -1801,6 +1811,11 @@ public CommitResponse commit(CommitRequest commitRequest, @Nullable Map rollbackAsync(RollbackRequest request, @Nullable Map options) {
GrpcCallContext context =
@@ -1950,7 +1965,20 @@ GrpcCallContext newCallContext(
boolean routeToLeader) {
GrpcCallContext context = GrpcCallContext.createDefault();
if (options != null) {
- context = context.withChannelAffinity(Option.CHANNEL_HINT.getLong(options).intValue());
+ if (this.isGrpcGcpExtensionEnabled) {
+ // Set channel affinity in gRPC-GCP.
+ // Compute bounded channel hint to prevent gRPC-GCP affinity map from getting unbounded.
+ int boundedChannelHint = Option.CHANNEL_HINT.getLong(options).intValue() % this.numChannels;
+ context =
+ context.withCallOptions(
+ context
+ .getCallOptions()
+ .withOption(
+ GcpManagedChannel.AFFINITY_KEY, String.valueOf(boundedChannelHint)));
+ } else {
+ // Set channel affinity in GAX.
+ context = context.withChannelAffinity(Option.CHANNEL_HINT.getLong(options).intValue());
+ }
}
if (compressorName != null) {
// This sets the compressor for Client -> Server.
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/SpannerRpc.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/SpannerRpc.java
index f063a7a3138..f07a28fb918 100644
--- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/SpannerRpc.java
+++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/SpannerRpc.java
@@ -469,6 +469,10 @@ CommitResponse commit(CommitRequest commitRequest, @Nullable Map opti
ApiFuture commitAsync(
CommitRequest commitRequest, @Nullable Map options);
+ default RetrySettings getCommitRetrySettings() {
+ return SpannerStubSettings.newBuilder().commitSettings().getRetrySettings();
+ }
+
void rollback(RollbackRequest request, @Nullable Map options) throws SpannerException;
ApiFuture rollbackAsync(RollbackRequest request, @Nullable Map options);
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/v1/stub/SpannerStubSettings.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/v1/stub/SpannerStubSettings.java
index db96f17542a..fa6b86633b3 100644
--- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/v1/stub/SpannerStubSettings.java
+++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/v1/stub/SpannerStubSettings.java
@@ -21,6 +21,7 @@
import com.google.api.core.ApiFunction;
import com.google.api.core.ApiFuture;
import com.google.api.core.BetaApi;
+import com.google.api.core.ObsoleteApi;
import com.google.api.gax.core.GaxProperties;
import com.google.api.gax.core.GoogleCredentialsProvider;
import com.google.api.gax.core.InstantiatingExecutorProvider;
@@ -311,6 +312,7 @@ public static InstantiatingExecutorProvider.Builder defaultExecutorProviderBuild
}
/** Returns the default service endpoint. */
+ @ObsoleteApi("Use getEndpoint() instead")
public static String getDefaultEndpoint() {
return "spanner.googleapis.com:443";
}
diff --git a/google-cloud-spanner/src/main/resources/META-INF/native-image/com.google.cloud.spanner.admin.database.v1/reflect-config.json b/google-cloud-spanner/src/main/resources/META-INF/native-image/com.google.cloud.spanner.admin.database.v1/reflect-config.json
index 51848a41299..37bd9977c19 100644
--- a/google-cloud-spanner/src/main/resources/META-INF/native-image/com.google.cloud.spanner.admin.database.v1/reflect-config.json
+++ b/google-cloud-spanner/src/main/resources/META-INF/native-image/com.google.cloud.spanner.admin.database.v1/reflect-config.json
@@ -2159,6 +2159,24 @@
"allDeclaredClasses": true,
"allPublicClasses": true
},
+ {
+ "name": "com.google.spanner.admin.database.v1.IncrementalBackupSpec",
+ "queryAllDeclaredConstructors": true,
+ "queryAllPublicConstructors": true,
+ "queryAllDeclaredMethods": true,
+ "allPublicMethods": true,
+ "allDeclaredClasses": true,
+ "allPublicClasses": true
+ },
+ {
+ "name": "com.google.spanner.admin.database.v1.IncrementalBackupSpec$Builder",
+ "queryAllDeclaredConstructors": true,
+ "queryAllPublicConstructors": true,
+ "queryAllDeclaredMethods": true,
+ "allPublicMethods": true,
+ "allDeclaredClasses": true,
+ "allPublicClasses": true
+ },
{
"name": "com.google.spanner.admin.database.v1.ListBackupOperationsRequest",
"queryAllDeclaredConstructors": true,
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/AsyncTransactionManagerTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/AsyncTransactionManagerTest.java
index 7318e6e2c31..9b05a18d714 100644
--- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/AsyncTransactionManagerTest.java
+++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/AsyncTransactionManagerTest.java
@@ -46,6 +46,7 @@
import com.google.common.collect.Range;
import com.google.common.util.concurrent.MoreExecutors;
import com.google.protobuf.AbstractMessage;
+import com.google.protobuf.GeneratedMessageV3;
import com.google.spanner.v1.BatchCreateSessionsRequest;
import com.google.spanner.v1.BeginTransactionRequest;
import com.google.spanner.v1.CommitRequest;
@@ -345,33 +346,22 @@ public void asyncTransactionManagerFireAndForgetInvalidUpdate() throws Exception
}
}
}
+ ImmutableList> expectedRequests =
+ ImmutableList.of(
+ BatchCreateSessionsRequest.class,
+ // The first update that fails. This will cause a transaction retry.
+ ExecuteSqlRequest.class,
+ // The retry will use an explicit BeginTransaction call.
+ BeginTransactionRequest.class,
+ // The first update will again fail, but now there is a transaction id, so the
+ // transaction can continue.
+ ExecuteSqlRequest.class,
+ ExecuteSqlRequest.class,
+ CommitRequest.class);
if (isMultiplexedSessionsEnabled()) {
- assertThat(mockSpanner.getRequestTypes())
- .containsExactly(
- CreateSessionRequest.class,
- BatchCreateSessionsRequest.class,
- // The first update that fails. This will cause a transaction retry.
- ExecuteSqlRequest.class,
- // The retry will use an explicit BeginTransaction call.
- BeginTransactionRequest.class,
- // The first update will again fail, but now there is a transaction id, so the
- // transaction can continue.
- ExecuteSqlRequest.class,
- ExecuteSqlRequest.class,
- CommitRequest.class);
+ assertThat(mockSpanner.getRequestTypes()).containsAtLeastElementsIn(expectedRequests);
} else {
- assertThat(mockSpanner.getRequestTypes())
- .containsExactly(
- BatchCreateSessionsRequest.class,
- // The first update that fails. This will cause a transaction retry.
- ExecuteSqlRequest.class,
- // The retry will use an explicit BeginTransaction call.
- BeginTransactionRequest.class,
- // The first update will again fail, but now there is a transaction id, so the
- // transaction can continue.
- ExecuteSqlRequest.class,
- ExecuteSqlRequest.class,
- CommitRequest.class);
+ assertThat(mockSpanner.getRequestTypes()).containsExactlyElementsIn(expectedRequests);
}
}
@@ -681,21 +671,16 @@ public void asyncTransactionManagerFireAndForgetInvalidBatchUpdate() throws Exce
}
}
}
+ ImmutableList> expectedRequests =
+ ImmutableList.of(
+ BatchCreateSessionsRequest.class,
+ ExecuteBatchDmlRequest.class,
+ ExecuteBatchDmlRequest.class,
+ CommitRequest.class);
if (isMultiplexedSessionsEnabled()) {
- assertThat(mockSpanner.getRequestTypes())
- .containsExactly(
- CreateSessionRequest.class,
- BatchCreateSessionsRequest.class,
- ExecuteBatchDmlRequest.class,
- ExecuteBatchDmlRequest.class,
- CommitRequest.class);
+ assertThat(mockSpanner.getRequestTypes()).containsAtLeastElementsIn(expectedRequests);
} else {
- assertThat(mockSpanner.getRequestTypes())
- .containsExactly(
- BatchCreateSessionsRequest.class,
- ExecuteBatchDmlRequest.class,
- ExecuteBatchDmlRequest.class,
- CommitRequest.class);
+ assertThat(mockSpanner.getRequestTypes()).containsExactlyElementsIn(expectedRequests);
}
}
@@ -729,23 +714,17 @@ public void asyncTransactionManagerBatchUpdateAborted() throws Exception {
assertThat(attempt.get()).isEqualTo(2);
// There should only be 1 CommitRequest, as the first attempt should abort already after the
// ExecuteBatchDmlRequest.
+ ImmutableList> expectedRequests =
+ ImmutableList.of(
+ BatchCreateSessionsRequest.class,
+ ExecuteBatchDmlRequest.class,
+ BeginTransactionRequest.class,
+ ExecuteBatchDmlRequest.class,
+ CommitRequest.class);
if (isMultiplexedSessionsEnabled()) {
- assertThat(mockSpanner.getRequestTypes())
- .containsExactly(
- CreateSessionRequest.class,
- BatchCreateSessionsRequest.class,
- ExecuteBatchDmlRequest.class,
- BeginTransactionRequest.class,
- ExecuteBatchDmlRequest.class,
- CommitRequest.class);
+ assertThat(mockSpanner.getRequestTypes()).containsAtLeastElementsIn(expectedRequests);
} else {
- assertThat(mockSpanner.getRequestTypes())
- .containsExactly(
- BatchCreateSessionsRequest.class,
- ExecuteBatchDmlRequest.class,
- BeginTransactionRequest.class,
- ExecuteBatchDmlRequest.class,
- CommitRequest.class);
+ assertThat(mockSpanner.getRequestTypes()).containsExactlyElementsIn(expectedRequests);
}
}
@@ -777,23 +756,17 @@ public void asyncTransactionManagerBatchUpdateAbortedBeforeFirstStatement() thro
assertThat(attempt.get()).isEqualTo(2);
// There should only be 1 CommitRequest, as the first attempt should abort already after the
// ExecuteBatchDmlRequest.
+ ImmutableList> expectedRequests =
+ ImmutableList.of(
+ BatchCreateSessionsRequest.class,
+ ExecuteBatchDmlRequest.class,
+ BeginTransactionRequest.class,
+ ExecuteBatchDmlRequest.class,
+ CommitRequest.class);
if (isMultiplexedSessionsEnabled()) {
- assertThat(mockSpanner.getRequestTypes())
- .containsExactly(
- CreateSessionRequest.class,
- BatchCreateSessionsRequest.class,
- ExecuteBatchDmlRequest.class,
- BeginTransactionRequest.class,
- ExecuteBatchDmlRequest.class,
- CommitRequest.class);
+ assertThat(mockSpanner.getRequestTypes()).containsAtLeastElementsIn(expectedRequests);
} else {
- assertThat(mockSpanner.getRequestTypes())
- .containsExactly(
- BatchCreateSessionsRequest.class,
- ExecuteBatchDmlRequest.class,
- BeginTransactionRequest.class,
- ExecuteBatchDmlRequest.class,
- CommitRequest.class);
+ assertThat(mockSpanner.getRequestTypes()).containsExactlyElementsIn(expectedRequests);
}
}
@@ -843,25 +816,18 @@ public void asyncTransactionManagerWithBatchUpdateCommitAborted() throws Excepti
} finally {
mockSpanner.putStatementResult(StatementResult.update(UPDATE_STATEMENT, UPDATE_COUNT));
}
+ ImmutableList> expectedRequests =
+ ImmutableList.of(
+ BatchCreateSessionsRequest.class,
+ ExecuteBatchDmlRequest.class,
+ CommitRequest.class,
+ BeginTransactionRequest.class,
+ ExecuteBatchDmlRequest.class,
+ CommitRequest.class);
if (isMultiplexedSessionsEnabled()) {
- assertThat(mockSpanner.getRequestTypes())
- .containsExactly(
- CreateSessionRequest.class,
- BatchCreateSessionsRequest.class,
- ExecuteBatchDmlRequest.class,
- CommitRequest.class,
- BeginTransactionRequest.class,
- ExecuteBatchDmlRequest.class,
- CommitRequest.class);
+ assertThat(mockSpanner.getRequestTypes()).containsAtLeastElementsIn(expectedRequests);
} else {
- assertThat(mockSpanner.getRequestTypes())
- .containsExactly(
- BatchCreateSessionsRequest.class,
- ExecuteBatchDmlRequest.class,
- CommitRequest.class,
- BeginTransactionRequest.class,
- ExecuteBatchDmlRequest.class,
- CommitRequest.class);
+ assertThat(mockSpanner.getRequestTypes()).containsExactlyElementsIn(expectedRequests);
}
}
@@ -925,7 +891,7 @@ public void asyncTransactionManagerBatchUpdateAbortedWithoutGettingResult() thro
}
@Test
- public void asyncTransactionManagerWithBatchUpdateCommitFails() throws Exception {
+ public void asyncTransactionManagerWithBatchUpdateCommitFails() {
mockSpanner.setCommitExecutionTime(
SimulatedExecutionTime.ofException(
Status.INVALID_ARGUMENT
@@ -948,17 +914,13 @@ public void asyncTransactionManagerWithBatchUpdateCommitFails() throws Exception
assertThat(e.getErrorCode()).isEqualTo(ErrorCode.INVALID_ARGUMENT);
assertThat(e.getMessage()).contains("mutation limit exceeded");
}
+ ImmutableList> expectedRequests =
+ ImmutableList.of(
+ BatchCreateSessionsRequest.class, ExecuteBatchDmlRequest.class, CommitRequest.class);
if (isMultiplexedSessionsEnabled()) {
- assertThat(mockSpanner.getRequestTypes())
- .containsExactly(
- CreateSessionRequest.class,
- BatchCreateSessionsRequest.class,
- ExecuteBatchDmlRequest.class,
- CommitRequest.class);
+ assertThat(mockSpanner.getRequestTypes()).containsAtLeastElementsIn(expectedRequests);
} else {
- assertThat(mockSpanner.getRequestTypes())
- .containsExactly(
- BatchCreateSessionsRequest.class, ExecuteBatchDmlRequest.class, CommitRequest.class);
+ assertThat(mockSpanner.getRequestTypes()).containsExactlyElementsIn(expectedRequests);
}
}
@@ -983,17 +945,13 @@ public void asyncTransactionManagerWaitsUntilAsyncBatchUpdateHasFinished() throw
}
}
}
+ ImmutableList> expectedRequests =
+ ImmutableList.of(
+ BatchCreateSessionsRequest.class, ExecuteBatchDmlRequest.class, CommitRequest.class);
if (isMultiplexedSessionsEnabled()) {
- assertThat(mockSpanner.getRequestTypes())
- .containsExactly(
- CreateSessionRequest.class,
- BatchCreateSessionsRequest.class,
- ExecuteBatchDmlRequest.class,
- CommitRequest.class);
+ assertThat(mockSpanner.getRequestTypes()).containsAtLeastElementsIn(expectedRequests);
} else {
- assertThat(mockSpanner.getRequestTypes())
- .containsExactly(
- BatchCreateSessionsRequest.class, ExecuteBatchDmlRequest.class, CommitRequest.class);
+ assertThat(mockSpanner.getRequestTypes()).containsExactlyElementsIn(expectedRequests);
}
}
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/BatchCreateSessionsTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/BatchCreateSessionsTest.java
index c252bb19238..8d359428c77 100644
--- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/BatchCreateSessionsTest.java
+++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/BatchCreateSessionsTest.java
@@ -207,13 +207,13 @@ public void testSpannerReturnsAllAvailableSessionsAndThenNoSessions()
}
@Test
- public void testSpannerReturnsResourceExhausted() throws InterruptedException {
+ public void testSpannerReturnsFailedPrecondition() throws InterruptedException {
int minSessions = 100;
int maxSessions = 1000;
int expectedSessions;
DatabaseClientImpl client;
// Make the first BatchCreateSessions return an error.
- mockSpanner.addException(Status.RESOURCE_EXHAUSTED.asRuntimeException());
+ mockSpanner.addException(Status.FAILED_PRECONDITION.asRuntimeException());
try (Spanner spanner = createSpanner(minSessions, maxSessions)) {
// Create a database client which will create a session pool.
client =
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseClientImplTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseClientImplTest.java
index 3dacd43a55e..62a10c0adb4 100644
--- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseClientImplTest.java
+++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/DatabaseClientImplTest.java
@@ -3859,7 +3859,8 @@ public void testBatchCreateSessionsFailure_shouldNotPropagateToCloseMethod() {
try {
// Simulate session creation failures on the backend.
mockSpanner.setBatchCreateSessionsExecutionTime(
- SimulatedExecutionTime.ofStickyException(Status.RESOURCE_EXHAUSTED.asRuntimeException()));
+ SimulatedExecutionTime.ofStickyException(
+ Status.FAILED_PRECONDITION.asRuntimeException()));
DatabaseClient client =
spannerWithEmptySessionPool.getDatabaseClient(
DatabaseId.of(TEST_PROJECT, TEST_INSTANCE, TEST_DATABASE));
@@ -3867,7 +3868,7 @@ public void testBatchCreateSessionsFailure_shouldNotPropagateToCloseMethod() {
// non-blocking, and any exceptions will be delayed until actual query execution.
try (ResultSet rs = client.singleUse().executeQuery(SELECT1)) {
SpannerException e = assertThrows(SpannerException.class, rs::next);
- assertThat(e.getErrorCode()).isEqualTo(ErrorCode.RESOURCE_EXHAUSTED);
+ assertThat(e.getErrorCode()).isEqualTo(ErrorCode.FAILED_PRECONDITION);
}
} finally {
mockSpanner.setBatchCreateSessionsExecutionTime(SimulatedExecutionTime.none());
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/IntegrationTestEnv.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/IntegrationTestEnv.java
index 6dd9c29e23f..2c6f886522e 100644
--- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/IntegrationTestEnv.java
+++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/IntegrationTestEnv.java
@@ -87,6 +87,10 @@ protected void initializeConfig()
throw new NullPointerException("Property " + TEST_ENV_CONFIG_CLASS_NAME + " needs to be set");
}
Class configClass;
+ if (EmulatorSpannerHelper.isUsingEmulator()) {
+ // Make sure that we use an owned instance on the emulator.
+ System.setProperty(TEST_INSTANCE_PROPERTY, "");
+ }
configClass = (Class) Class.forName(CONFIG_CLASS);
config = configClass.newInstance();
}
@@ -143,7 +147,7 @@ protected void after() {
private void initializeInstance(InstanceId instanceId) throws Exception {
InstanceConfig instanceConfig;
try {
- instanceConfig = instanceAdminClient.getInstanceConfig("regional-us-central1");
+ instanceConfig = instanceAdminClient.getInstanceConfig("regional-us-east4");
} catch (Throwable ignore) {
instanceConfig =
Iterators.get(instanceAdminClient.listInstanceConfigs().iterateAll().iterator(), 0, null);
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/MockSpannerServiceImpl.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/MockSpannerServiceImpl.java
index 54b992b69ff..5266ecad7c8 100644
--- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/MockSpannerServiceImpl.java
+++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/MockSpannerServiceImpl.java
@@ -808,7 +808,7 @@ public void batchCreateSessions(
batchCreateSessionsExecutionTime.simulateExecutionTime(
exceptions, stickyGlobalExceptions, freezeLock);
if (sessions.size() >= maxTotalSessions) {
- throw Status.RESOURCE_EXHAUSTED
+ throw Status.FAILED_PRECONDITION
.withDescription("Maximum number of sessions reached")
.asRuntimeException();
}
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/MultiplexedSessionMaintainerTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/MultiplexedSessionMaintainerTest.java
deleted file mode 100644
index ca7f8386894..00000000000
--- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/MultiplexedSessionMaintainerTest.java
+++ /dev/null
@@ -1,310 +0,0 @@
-/*
- * Copyright 2024 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;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assume.assumeTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.doAnswer;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-import static org.mockito.MockitoAnnotations.initMocks;
-
-import com.google.cloud.Timestamp;
-import com.google.cloud.spanner.SessionPool.CachedSession;
-import com.google.cloud.spanner.SessionPool.MultiplexedSessionInitializationConsumer;
-import com.google.cloud.spanner.SessionPool.MultiplexedSessionMaintainerConsumer;
-import com.google.cloud.spanner.SessionPool.Position;
-import com.google.cloud.spanner.SessionPool.SessionFutureWrapper;
-import io.opencensus.trace.Tracing;
-import io.opentelemetry.api.OpenTelemetry;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.stream.Collectors;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-import org.mockito.Mock;
-import org.threeten.bp.Duration;
-import org.threeten.bp.Instant;
-
-@RunWith(JUnit4.class)
-public class MultiplexedSessionMaintainerTest extends BaseSessionPoolTest {
-
- private ExecutorService executor = Executors.newSingleThreadExecutor();
- private @Mock SpannerImpl client;
- private @Mock SessionClient sessionClient;
- private @Mock SpannerOptions spannerOptions;
- private DatabaseId db = DatabaseId.of("projects/p/instances/i/databases/unused");
- private SessionPoolOptions options;
- private FakeClock clock = new FakeClock();
- private List multiplexedSessionsRemoved = new ArrayList<>();
-
- @BeforeClass
- public static void checkUsesMultiplexedSessionPool() {
- assumeTrue("Only run if the maintainer in the session pool is used", false);
- }
-
- @Before
- public void setUp() {
- initMocks(this);
- when(client.getOptions()).thenReturn(spannerOptions);
- when(client.getSessionClient(db)).thenReturn(sessionClient);
- when(sessionClient.getSpanner()).thenReturn(client);
- when(spannerOptions.getNumChannels()).thenReturn(4);
- when(spannerOptions.getDatabaseRole()).thenReturn("role");
- options =
- SessionPoolOptions.newBuilder()
- .setMinSessions(1)
- .setMaxIdleSessions(1)
- .setMaxSessions(5)
- .setIncStep(1)
- .setKeepAliveIntervalMinutes(2)
- .setUseMultiplexedSession(true)
- .setPoolMaintainerClock(clock)
- .build();
- when(spannerOptions.getSessionPoolOptions()).thenReturn(options);
- assumeTrue(options.getUseMultiplexedSession());
- multiplexedSessionsRemoved.clear();
- }
-
- @Test
- public void testMaintainMultiplexedSession_whenNewSessionCreated_assertThatStaleSessionIsRemoved()
- throws Exception {
- doAnswer(
- invocation -> {
- MultiplexedSessionInitializationConsumer consumer =
- invocation.getArgument(0, MultiplexedSessionInitializationConsumer.class);
- ReadContext mockContext = mock(ReadContext.class);
- Timestamp timestamp =
- Timestamp.ofTimeSecondsAndNanos(
- Instant.ofEpochMilli(clock.currentTimeMillis.get()).getEpochSecond(), 0);
- consumer.onSessionReady(
- setupMockSession(
- buildMockMultiplexedSession(client, mockContext, timestamp.toProto()),
- mockContext));
- return null;
- })
- .when(sessionClient)
- .asyncCreateMultiplexedSession(any(MultiplexedSessionInitializationConsumer.class));
- doAnswer(
- invocation -> {
- MultiplexedSessionMaintainerConsumer consumer =
- invocation.getArgument(0, MultiplexedSessionMaintainerConsumer.class);
- ReadContext mockContext = mock(ReadContext.class);
- Timestamp timestamp =
- Timestamp.ofTimeSecondsAndNanos(
- Instant.ofEpochMilli(clock.currentTimeMillis.get()).getEpochSecond(), 0);
- consumer.onSessionReady(
- setupMockSession(
- buildMockMultiplexedSession(client, mockContext, timestamp.toProto()),
- mockContext));
- return null;
- })
- .when(sessionClient)
- .asyncCreateMultiplexedSession(any(MultiplexedSessionMaintainerConsumer.class));
-
- SessionPool pool = createPool();
-
- // Run one maintenance loop.
- CachedSession session1 = pool.getMultiplexedSessionWithFallback().get().get();
- runMaintenanceLoop(clock, pool, 1);
- assertTrue(multiplexedSessionsRemoved.isEmpty());
-
- // Advance clock by 8 days
- clock.currentTimeMillis.addAndGet(Duration.ofDays(8).toMillis());
-
- // Run second maintenance loop. the first session would now be stale since it has now existed
- // for more than 7 days.
- runMaintenanceLoop(clock, pool, 1);
-
- CachedSession session2 = pool.getMultiplexedSessionWithFallback().get().get();
- assertNotEquals(session1.getName(), session2.getName());
- assertEquals(1, multiplexedSessionsRemoved.size());
- assertTrue(getNameOfSessionRemoved().contains(session1.getName()));
-
- // Advance clock by 8 days
- clock.currentTimeMillis.addAndGet(Duration.ofDays(8).toMillis());
-
- // Run third maintenance loop. the second session would now be stale since it has now existed
- // for more than 7 days
- runMaintenanceLoop(clock, pool, 1);
-
- CachedSession session3 = pool.getMultiplexedSessionWithFallback().get().get();
- assertNotEquals(session2.getName(), session3.getName());
- assertEquals(2, multiplexedSessionsRemoved.size());
- assertTrue(getNameOfSessionRemoved().contains(session2.getName()));
- }
-
- @Test
- public void
- testMaintainMultiplexedSession_whenMultiplexedSessionNotStale_assertThatSessionIsNotRemoved() {
- doAnswer(
- invocation -> {
- MultiplexedSessionInitializationConsumer consumer =
- invocation.getArgument(0, MultiplexedSessionInitializationConsumer.class);
- ReadContext mockContext = mock(ReadContext.class);
- Timestamp timestamp =
- Timestamp.ofTimeSecondsAndNanos(
- Instant.ofEpochMilli(clock.currentTimeMillis.get()).getEpochSecond(), 0);
- consumer.onSessionReady(
- setupMockSession(
- buildMockMultiplexedSession(client, mockContext, timestamp.toProto()),
- mockContext));
- return null;
- })
- .when(sessionClient)
- .asyncCreateMultiplexedSession(any(MultiplexedSessionInitializationConsumer.class));
- SessionPool pool = createPool();
-
- // Run one maintenance loop.
- SessionFutureWrapper session1 = pool.getMultiplexedSessionWithFallback();
- runMaintenanceLoop(clock, pool, 1);
- assertTrue(multiplexedSessionsRemoved.isEmpty());
-
- // Advance clock by 4 days
- clock.currentTimeMillis.addAndGet(Duration.ofDays(4).toMillis());
- // Run one maintenance loop. the first session would not be stale yet since it has now existed
- // for less than 7 days.
- runMaintenanceLoop(clock, pool, 1);
- SessionFutureWrapper session2 = pool.getMultiplexedSessionWithFallback();
- assertTrue(multiplexedSessionsRemoved.isEmpty());
- assertEquals(session1.get().getName(), session2.get().getName());
- }
-
- @Test
- public void
- testMaintainMultiplexedSession_whenMultiplexedSessionCreationFailed_testRetryAfterDelay() {
- doAnswer(
- invocation -> {
- MultiplexedSessionInitializationConsumer consumer =
- invocation.getArgument(0, MultiplexedSessionInitializationConsumer.class);
- ReadContext mockContext = mock(ReadContext.class);
- Timestamp timestamp =
- Timestamp.ofTimeSecondsAndNanos(
- Instant.ofEpochMilli(clock.currentTimeMillis.get()).getEpochSecond(), 0);
- consumer.onSessionReady(
- setupMockSession(
- buildMockMultiplexedSession(client, mockContext, timestamp.toProto()),
- mockContext));
- return null;
- })
- .when(sessionClient)
- .asyncCreateMultiplexedSession(any(MultiplexedSessionInitializationConsumer.class));
- doAnswer(
- invocation -> {
- MultiplexedSessionMaintainerConsumer consumer =
- invocation.getArgument(0, MultiplexedSessionMaintainerConsumer.class);
- consumer.onSessionCreateFailure(
- SpannerExceptionFactory.newSpannerException(ErrorCode.DEADLINE_EXCEEDED, ""), 1);
- return null;
- })
- .when(sessionClient)
- .asyncCreateMultiplexedSession(any(MultiplexedSessionMaintainerConsumer.class));
- SessionPool pool = createPool();
-
- // Advance clock by 8 days
- clock.currentTimeMillis.addAndGet(Duration.ofDays(8).toMillis());
-
- // Run one maintenance loop. Attempt replacing stale session should fail.
- SessionFutureWrapper session1 = pool.getMultiplexedSessionWithFallback();
- runMaintenanceLoop(clock, pool, 1);
- assertTrue(multiplexedSessionsRemoved.isEmpty());
- verify(sessionClient, times(1))
- .asyncCreateMultiplexedSession(any(MultiplexedSessionMaintainerConsumer.class));
-
- // Advance clock by 10s and now mock session creation to be successful.
- clock.currentTimeMillis.addAndGet(Duration.ofSeconds(10).toMillis());
- doAnswer(
- invocation -> {
- MultiplexedSessionMaintainerConsumer consumer =
- invocation.getArgument(0, MultiplexedSessionMaintainerConsumer.class);
- ReadContext mockContext = mock(ReadContext.class);
- Timestamp timestamp =
- Timestamp.ofTimeSecondsAndNanos(
- Instant.ofEpochMilli(clock.currentTimeMillis.get()).getEpochSecond(), 0);
- consumer.onSessionReady(
- setupMockSession(
- buildMockMultiplexedSession(client, mockContext, timestamp.toProto()),
- mockContext));
- return null;
- })
- .when(sessionClient)
- .asyncCreateMultiplexedSession(any(MultiplexedSessionMaintainerConsumer.class));
- // Run one maintenance loop. Attempt should be ignored as it has not been 10 minutes since last
- // attempt.
- runMaintenanceLoop(clock, pool, 1);
- SessionFutureWrapper session2 = pool.getMultiplexedSessionWithFallback();
- assertTrue(multiplexedSessionsRemoved.isEmpty());
- assertEquals(session1.get().getName(), session2.get().getName());
- verify(sessionClient, times(1))
- .asyncCreateMultiplexedSession(any(MultiplexedSessionMaintainerConsumer.class));
-
- // Advance clock by 15 minutes
- clock.currentTimeMillis.addAndGet(Duration.ofMinutes(15).toMillis());
- // Run one maintenance loop. Attempt should succeed since its already more than 10 minutes since
- // the last attempt.
- runMaintenanceLoop(clock, pool, 1);
- SessionFutureWrapper session3 = pool.getMultiplexedSessionWithFallback();
- assertTrue(getNameOfSessionRemoved().contains(session1.get().get().getName()));
- assertNotEquals(session1.get().getName(), session3.get().getName());
- verify(sessionClient, times(2))
- .asyncCreateMultiplexedSession(any(MultiplexedSessionMaintainerConsumer.class));
- }
-
- private SessionImpl setupMockSession(final SessionImpl session, final ReadContext mockContext) {
- final ResultSet mockResult = mock(ResultSet.class);
- when(mockContext.executeQuery(any(Statement.class))).thenAnswer(invocation -> mockResult);
- when(mockResult.next()).thenReturn(true);
- return session;
- }
-
- private SessionPool createPool() {
- // Allow sessions to be added to the head of the pool in all cases in this test, as it is
- // otherwise impossible to know which session exactly is getting pinged at what point in time.
- SessionPool pool =
- SessionPool.createPool(
- options,
- new TestExecutorFactory(),
- client.getSessionClient(db),
- clock,
- Position.FIRST,
- new TraceWrapper(Tracing.getTracer(), OpenTelemetry.noop().getTracer(""), false),
- OpenTelemetry.noop());
- pool.multiplexedSessionRemovedListener =
- input -> {
- multiplexedSessionsRemoved.add(input);
- return null;
- };
- return pool;
- }
-
- Set getNameOfSessionRemoved() {
- return multiplexedSessionsRemoved.stream()
- .map(session -> session.getName())
- .collect(Collectors.toSet());
- }
-}
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/MultiplexedSessionPoolTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/MultiplexedSessionPoolTest.java
deleted file mode 100644
index fcad1ff22c6..00000000000
--- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/MultiplexedSessionPoolTest.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- * Copyright 2024 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;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThrows;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assume.assumeTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.doAnswer;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-import static org.mockito.MockitoAnnotations.initMocks;
-
-import com.google.cloud.spanner.SessionPool.MultiplexedSessionFuture;
-import com.google.cloud.spanner.SessionPool.MultiplexedSessionInitializationConsumer;
-import com.google.cloud.spanner.SessionPool.SessionFutureWrapper;
-import com.google.cloud.spanner.SpannerImpl.ClosedException;
-import io.opencensus.trace.Tracing;
-import io.opentelemetry.api.OpenTelemetry;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.mockito.Mock;
-import org.threeten.bp.Duration;
-
-/**
- * Tests for {@link com.google.cloud.spanner.SessionPool.MultiplexedSession} component within the
- * {@link SessionPool} class.
- */
-public class MultiplexedSessionPoolTest extends BaseSessionPoolTest {
-
- @Mock SpannerImpl client;
- @Mock SessionClient sessionClient;
- @Mock SpannerOptions spannerOptions;
- private final DatabaseId db = DatabaseId.of("projects/p/instances/i/databases/unused");
- private final TraceWrapper tracer =
- new TraceWrapper(Tracing.getTracer(), OpenTelemetry.noop().getTracer(""), false);
- SessionPoolOptions options;
- SessionPool pool;
-
- private SessionPool createPool() {
- return SessionPool.createPool(
- options,
- new TestExecutorFactory(),
- client.getSessionClient(db),
- tracer,
- OpenTelemetry.noop());
- }
-
- @BeforeClass
- public static void checkUsesMultiplexedSessionPool() {
- assumeTrue("Only run if the maintainer in the session pool is used", false);
- }
-
- @Before
- public void setUp() {
- initMocks(this);
- SpannerOptions.resetActiveTracingFramework();
- SpannerOptions.enableOpenTelemetryTraces();
- when(client.getOptions()).thenReturn(spannerOptions);
- when(client.getSessionClient(db)).thenReturn(sessionClient);
- when(sessionClient.getSpanner()).thenReturn(client);
- when(spannerOptions.getNumChannels()).thenReturn(4);
- when(spannerOptions.getDatabaseRole()).thenReturn("role");
- options =
- SessionPoolOptions.newBuilder()
- .setMinSessions(2)
- .setMaxSessions(2)
- .setUseMultiplexedSession(true)
- .build();
- when(spannerOptions.getSessionPoolOptions()).thenReturn(options);
- assumeTrue(options.getUseMultiplexedSession());
- }
-
- @Test
- public void testGetMultiplexedSession_whenSessionInitializationSucceeded_assertSessionReturned() {
- setupMockMultiplexedSessionCreation();
-
- pool = createPool();
- assertTrue(pool.isValid());
-
- // create 5 requests which require a session
- for (int i = 0; i < 5; i++) {
- // checking out a multiplexed session
- SessionFutureWrapper multiplexedSessionFuture = pool.getMultiplexedSessionWithFallback();
- assertNotNull(multiplexedSessionFuture.get());
- }
- verify(sessionClient, times(1))
- .asyncCreateMultiplexedSession(any(MultiplexedSessionInitializationConsumer.class));
- }
-
- @Test
- public void testGetMultiplexedSession_whenClosedPool_assertSessionReturned() {
- setupMockMultiplexedSessionCreation();
-
- pool = createPool();
- assertTrue(pool.isValid());
- closePoolWithStacktrace();
-
- // checking out a multiplexed session does not throw error even if pool is closed
- MultiplexedSessionFuture multiplexedSessionFuture =
- (MultiplexedSessionFuture) pool.getMultiplexedSessionWithFallback().get();
- assertNotNull(multiplexedSessionFuture);
-
- // checking out a regular session throws error.
- IllegalStateException e = assertThrows(IllegalStateException.class, () -> pool.getSession());
- assertThat(e.getCause()).isInstanceOf(ClosedException.class);
- StringWriter sw = new StringWriter();
- e.getCause().printStackTrace(new PrintWriter(sw));
- assertThat(sw.toString()).contains("closePoolWithStacktrace");
- }
-
- private void closePoolWithStacktrace() {
- pool.closeAsync(new SpannerImpl.ClosedException());
- }
-
- @Test
- public void testGetMultiplexedSession_whenSessionCreationFailed_assertErrorForWaiters() {
- doAnswer(
- invocation -> {
- MultiplexedSessionInitializationConsumer consumer =
- invocation.getArgument(0, MultiplexedSessionInitializationConsumer.class);
- consumer.onSessionCreateFailure(
- SpannerExceptionFactory.newSpannerException(ErrorCode.DEADLINE_EXCEEDED, ""), 1);
- return null;
- })
- .when(sessionClient)
- .asyncCreateMultiplexedSession(any(MultiplexedSessionInitializationConsumer.class));
- options =
- options
- .toBuilder()
- .setMinSessions(2)
- .setUseMultiplexedSession(true)
- .setAcquireSessionTimeout(
- Duration.ofMillis(50)) // block for a max of 50 ms for session to be available
- .build();
- pool = createPool();
-
- // create 5 requests which require a session
- for (int i = 0; i < 5; i++) {
- SpannerException e =
- assertThrows(
- SpannerException.class, () -> pool.getMultiplexedSessionWithFallback().get().get());
- assertEquals(ErrorCode.DEADLINE_EXCEEDED, e.getErrorCode());
- }
- // assert that all 5 requests failed with exception
- assertEquals(0, pool.getNumWaiterTimeouts());
- assertEquals(0, pool.getNumberOfSessionsInPool());
- }
-
- private void setupMockMultiplexedSessionCreation() {
- doAnswer(
- invocation -> {
- MultiplexedSessionInitializationConsumer consumer =
- invocation.getArgument(0, MultiplexedSessionInitializationConsumer.class);
- consumer.onSessionReady(mockSession());
- return null;
- })
- .when(sessionClient)
- .asyncCreateMultiplexedSession(any(MultiplexedSessionInitializationConsumer.class));
- }
-}
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/OpenTelemetrySpanTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/OpenTelemetrySpanTest.java
index c309932f0b2..a2aeb887733 100644
--- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/OpenTelemetrySpanTest.java
+++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/OpenTelemetrySpanTest.java
@@ -572,22 +572,13 @@ public void transactionRunnerWithError() {
@Test
public void transactionRunnerWithFailedAndBeginTransaction() {
List expectedReadWriteTransactionWithCommitAndBeginTransactionSpans =
- isMultiplexedSessionsEnabled()
- ? ImmutableList.of(
- "CloudSpannerOperation.CreateMultiplexedSession",
- "CloudSpannerOperation.BeginTransaction",
- "CloudSpannerOperation.BatchCreateSessionsRequest",
- "CloudSpannerOperation.ExecuteUpdate",
- "CloudSpannerOperation.Commit",
- "CloudSpannerOperation.BatchCreateSessions",
- "CloudSpanner.ReadWriteTransaction")
- : ImmutableList.of(
- "CloudSpannerOperation.BeginTransaction",
- "CloudSpannerOperation.BatchCreateSessionsRequest",
- "CloudSpannerOperation.ExecuteUpdate",
- "CloudSpannerOperation.Commit",
- "CloudSpannerOperation.BatchCreateSessions",
- "CloudSpanner.ReadWriteTransaction");
+ ImmutableList.of(
+ "CloudSpannerOperation.BeginTransaction",
+ "CloudSpannerOperation.BatchCreateSessionsRequest",
+ "CloudSpannerOperation.ExecuteUpdate",
+ "CloudSpannerOperation.Commit",
+ "CloudSpannerOperation.BatchCreateSessions",
+ "CloudSpanner.ReadWriteTransaction");
DatabaseClient client = getClient();
assertEquals(
Long.valueOf(1L),
@@ -612,7 +603,7 @@ public void transactionRunnerWithFailedAndBeginTransaction() {
Stopwatch stopwatch = Stopwatch.createStarted();
while (spanExporter.getFinishedSpanItems().size()
< expectedReadWriteTransactionWithCommitAndBeginTransactionSpans.size()
- && stopwatch.elapsed().compareTo(java.time.Duration.ofMillis(1000)) < 0) {
+ && stopwatch.elapsed(TimeUnit.MILLISECONDS) < 2000) {
Thread.yield();
}
@@ -621,7 +612,11 @@ public void transactionRunnerWithFailedAndBeginTransaction() {
.getFinishedSpanItems()
.forEach(
spanItem -> {
- actualSpanItems.add(spanItem.getName());
+ // Ignore multiplexed sessions, as they are not used by this test and can therefore
+ // best be ignored, as it is not 100% certain that it has already been created.
+ if (!"CloudSpannerOperation.CreateMultiplexedSession".equals(spanItem.getName())) {
+ actualSpanItems.add(spanItem.getName());
+ }
switch (spanItem.getName()) {
case "CloudSpannerOperation.CreateMultiplexedSession":
verifyRequestEvents(
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionImplTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionImplTest.java
index 72befe8a2b4..2a850514d0d 100644
--- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionImplTest.java
+++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionImplTest.java
@@ -138,6 +138,8 @@ public void setUp() {
when(rpc.getExecuteQueryRetryableCodes())
.thenReturn(
SpannerStubSettings.newBuilder().executeStreamingSqlSettings().getRetryableCodes());
+ when(rpc.getCommitRetrySettings())
+ .thenReturn(SpannerStubSettings.newBuilder().commitSettings().getRetrySettings());
session = spanner.getSessionClient(db).createSession();
Span oTspan = mock(Span.class);
ISpan span = new OpenTelemetrySpan(oTspan);
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionPoolOptionsTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionPoolOptionsTest.java
index 82cc5f8ea31..9b15ddea13b 100644
--- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionPoolOptionsTest.java
+++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionPoolOptionsTest.java
@@ -332,11 +332,11 @@ public void testToBuilder() {
.build());
assertToBuilderRoundtrip(
SessionPoolOptions.newBuilder()
- .setMaxSessions(ThreadLocalRandom.current().nextInt(1000))
+ .setMaxSessions(ThreadLocalRandom.current().nextInt(1, 1000))
.build());
assertToBuilderRoundtrip(
SessionPoolOptions.newBuilder()
- .setIncStep(ThreadLocalRandom.current().nextInt(1000))
+ .setIncStep(ThreadLocalRandom.current().nextInt(1, 1000))
.build());
assertToBuilderRoundtrip(
SessionPoolOptions.newBuilder()
@@ -393,7 +393,7 @@ public void testToBuilder() {
assertToBuilderRoundtrip(
SessionPoolOptions.newBuilder()
.setAcquireSessionTimeout(
- Duration.ofMillis(ThreadLocalRandom.current().nextLong(10000)))
+ Duration.ofMillis(ThreadLocalRandom.current().nextLong(1, 10000)))
.build());
assertToBuilderRoundtrip(
SessionPoolOptions.newBuilder()
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionPoolTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionPoolTest.java
index 8ffc4f21a10..f4430861194 100644
--- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionPoolTest.java
+++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionPoolTest.java
@@ -64,7 +64,6 @@
import com.google.cloud.spanner.MetricRegistryTestUtils.PointWithFunction;
import com.google.cloud.spanner.ReadContext.QueryAnalyzeMode;
import com.google.cloud.spanner.SessionClient.SessionConsumer;
-import com.google.cloud.spanner.SessionPool.MultiplexedSessionInitializationConsumer;
import com.google.cloud.spanner.SessionPool.PooledSession;
import com.google.cloud.spanner.SessionPool.PooledSessionFuture;
import com.google.cloud.spanner.SessionPool.Position;
@@ -75,6 +74,7 @@
import com.google.cloud.spanner.spi.v1.SpannerRpc;
import com.google.cloud.spanner.spi.v1.SpannerRpc.ResultStreamConsumer;
import com.google.cloud.spanner.v1.stub.SpannerStubSettings;
+import com.google.common.base.Stopwatch;
import com.google.common.collect.Lists;
import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.Uninterruptibles;
@@ -1294,7 +1294,7 @@ public void blockAndTimeoutOnPoolExhaustion_withAcquireSessionTimeout() throws E
.setMinSessions(minSessions)
.setMaxSessions(1)
.setInitialWaitForSessionTimeoutMillis(20L)
- .setAcquireSessionTimeout(Duration.ofMillis(20L))
+ .setAcquireSessionTimeout(null)
.build();
setupMockSessionCreation();
pool = createPool();
@@ -1307,18 +1307,18 @@ public void blockAndTimeoutOnPoolExhaustion_withAcquireSessionTimeout() throws E
Future fut =
executor.submit(
() -> {
- latch.countDown();
PooledSessionFuture session = pool.getSession();
+ latch.countDown();
+ session.get();
session.close();
return null;
});
// Wait until the background thread is actually waiting for a session.
latch.await();
// Wait until the request has timed out.
- int waitCount = 0;
- while (pool.getNumWaiterTimeouts() == 0L && waitCount < 5000) {
- Thread.sleep(1L);
- waitCount++;
+ Stopwatch watch = Stopwatch.createStarted();
+ while (pool.getNumWaiterTimeouts() == 0L && watch.elapsed(TimeUnit.MILLISECONDS) < 1000) {
+ Thread.yield();
}
// Return the checked out session to the pool so the async request will get a session and
// finish.
@@ -1326,10 +1326,11 @@ public void blockAndTimeoutOnPoolExhaustion_withAcquireSessionTimeout() throws E
// Verify that the async request also succeeds.
fut.get(10L, TimeUnit.SECONDS);
executor.shutdown();
+ assertTrue(executor.awaitTermination(10L, TimeUnit.SECONDS));
// Verify that the session was returned to the pool and that we can get it again.
- Session session = pool.getSession();
- assertThat(session).isNotNull();
+ PooledSessionFuture session = pool.getSession();
+ assertThat(session.get()).isNotNull();
session.close();
assertThat(pool.getNumWaiterTimeouts()).isAtLeast(1L);
}
@@ -2023,14 +2024,16 @@ public void testOpenCensusMetricsDisable() {
public void testOpenTelemetrySessionMetrics() throws Exception {
SpannerOptions.resetActiveTracingFramework();
SpannerOptions.enableOpenTelemetryMetrics();
- // Create a session pool with max 2 session and a low timeout for waiting for a session.
+ // Create a session pool with max 3 session and a low timeout for waiting for a session.
if (minSessions == 1) {
options =
SessionPoolOptions.newBuilder()
.setMinSessions(1)
.setMaxSessions(3)
- .setMaxIdleSessions(0)
- .setInitialWaitForSessionTimeoutMillis(50L)
+ // This must be set to null for the setInitialWaitForSessionTimeoutMillis call to have
+ // any effect.
+ .setAcquireSessionTimeout(null)
+ .setInitialWaitForSessionTimeoutMillis(1L)
.build();
FakeClock clock = new FakeClock();
clock.currentTimeMillis.set(System.currentTimeMillis());
@@ -2081,26 +2084,29 @@ public void testOpenTelemetrySessionMetrics() throws Exception {
Future fut =
executor.submit(
() -> {
+ PooledSessionFuture session = pool.getSession();
latch.countDown();
- Session session = pool.getSession();
+ session.get();
session.close();
return null;
});
// Wait until the background thread is actually waiting for a session.
latch.await();
// Wait until the request has timed out.
- int waitCount = 0;
- while (pool.getNumWaiterTimeouts() == 0L && waitCount < 1000) {
- Thread.sleep(5L);
- waitCount++;
+ Stopwatch watch = Stopwatch.createStarted();
+ while (pool.getNumWaiterTimeouts() == 0L && watch.elapsed(TimeUnit.MILLISECONDS) < 100) {
+ Thread.yield();
}
+ assertTrue(pool.getNumWaiterTimeouts() > 0);
// Return the checked out session to the pool so the async request will get a session and
// finish.
session2.close();
// Verify that the async request also succeeds.
fut.get(10L, TimeUnit.SECONDS);
executor.shutdown();
+ assertTrue(executor.awaitTermination(10L, TimeUnit.SECONDS));
+ inMemoryMetricReader.forceFlush();
metricDataCollection = inMemoryMetricReader.collectAllMetrics();
// Max Allowed sessions should be 3
@@ -2212,16 +2218,6 @@ public void testWaitOnMinSessionsWhenSessionsAreCreatedBeforeTimeout() {
}))
.when(sessionClient)
.asyncBatchCreateSessions(Mockito.eq(1), Mockito.anyBoolean(), any(SessionConsumer.class));
- doAnswer(
- invocation ->
- executor.submit(
- () -> {
- MultiplexedSessionInitializationConsumer consumer =
- invocation.getArgument(0, MultiplexedSessionInitializationConsumer.class);
- consumer.onSessionReady(mockMultiplexedSession());
- }))
- .when(sessionClient)
- .asyncCreateMultiplexedSession(any(MultiplexedSessionInitializationConsumer.class));
pool = createPool(new FakeClock(), new FakeMetricRegistry(), SPANNER_DEFAULT_LABEL_VALUES);
pool.maybeWaitOnMinSessions();
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/TransactionContextImplTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/TransactionContextImplTest.java
index c1da423760d..561bfb89008 100644
--- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/TransactionContextImplTest.java
+++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/TransactionContextImplTest.java
@@ -28,6 +28,7 @@
import com.google.api.core.ApiFutures;
import com.google.cloud.spanner.TransactionRunnerImpl.TransactionContextImpl;
import com.google.cloud.spanner.spi.v1.SpannerRpc;
+import com.google.cloud.spanner.v1.stub.SpannerStubSettings;
import com.google.protobuf.ByteString;
import com.google.protobuf.Timestamp;
import com.google.rpc.Code;
@@ -80,6 +81,8 @@ public void setup() {
when(tracer.spanBuilderWithExplicitParent(
eq(SpannerImpl.BATCH_UPDATE), eq(span), any(Attributes.class)))
.thenReturn(span);
+ when(rpc.getCommitRetrySettings())
+ .thenReturn(SpannerStubSettings.newBuilder().commitSettings().getRetrySettings());
}
private TransactionContextImpl createContext() {
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/TransactionManagerImplTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/TransactionManagerImplTest.java
index dc28b333c4f..c3fcf1c7480 100644
--- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/TransactionManagerImplTest.java
+++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/TransactionManagerImplTest.java
@@ -35,6 +35,7 @@
import com.google.cloud.grpc.GrpcTransportOptions.ExecutorFactory;
import com.google.cloud.spanner.TransactionManager.TransactionState;
import com.google.cloud.spanner.spi.v1.SpannerRpc;
+import com.google.cloud.spanner.v1.stub.SpannerStubSettings;
import com.google.protobuf.ByteString;
import com.google.protobuf.Empty;
import com.google.spanner.v1.BeginTransactionRequest;
@@ -248,6 +249,8 @@ public void usesPreparedTransaction() {
com.google.protobuf.Timestamp.newBuilder()
.setSeconds(System.currentTimeMillis() * 1000))
.build()));
+ when(rpc.getCommitRetrySettings())
+ .thenReturn(SpannerStubSettings.newBuilder().commitSettings().getRetrySettings());
DatabaseId db = DatabaseId.of("test", "test", "test");
try (SpannerImpl spanner = new SpannerImpl(rpc, options)) {
DatabaseClient client = spanner.getDatabaseClient(db);
@@ -332,6 +335,8 @@ public void inlineBegin() {
com.google.protobuf.Timestamp.newBuilder()
.setSeconds(System.currentTimeMillis() * 1000))
.build()));
+ when(rpc.getCommitRetrySettings())
+ .thenReturn(SpannerStubSettings.newBuilder().commitSettings().getRetrySettings());
DatabaseId db = DatabaseId.of("test", "test", "test");
try (SpannerImpl spanner = new SpannerImpl(rpc, options)) {
DatabaseClient client = spanner.getDatabaseClient(db);
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/TransactionRunnerImplTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/TransactionRunnerImplTest.java
index 6a707a490dc..f5d9f1841a2 100644
--- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/TransactionRunnerImplTest.java
+++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/TransactionRunnerImplTest.java
@@ -35,6 +35,7 @@
import com.google.cloud.spanner.SessionClient.SessionId;
import com.google.cloud.spanner.TransactionRunnerImpl.TransactionContextImpl;
import com.google.cloud.spanner.spi.v1.SpannerRpc;
+import com.google.cloud.spanner.v1.stub.SpannerStubSettings;
import com.google.common.base.Preconditions;
import com.google.protobuf.ByteString;
import com.google.protobuf.Duration;
@@ -141,6 +142,8 @@ public void setUp() {
CommitResponse.newBuilder()
.setCommitTimestamp(Timestamp.getDefaultInstance())
.build()));
+ when(rpc.getCommitRetrySettings())
+ .thenReturn(SpannerStubSettings.newBuilder().commitSettings().getRetrySettings());
when(rpc.rollbackAsync(Mockito.any(RollbackRequest.class), Mockito.anyMap()))
.thenReturn(ApiFutures.immediateFuture(Empty.getDefaultInstance()));
Span oTspan = mock(Span.class);
@@ -196,6 +199,8 @@ public void usesPreparedTransaction() {
.setCommitTimestamp(
Timestamp.newBuilder().setSeconds(System.currentTimeMillis() * 1000))
.build()));
+ when(rpc.getCommitRetrySettings())
+ .thenReturn(SpannerStubSettings.newBuilder().commitSettings().getRetrySettings());
DatabaseId db = DatabaseId.of("test", "test", "test");
try (SpannerImpl spanner = new SpannerImpl(rpc, options)) {
DatabaseClient client = spanner.getDatabaseClient(db);
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/database/v1/DatabaseAdminClientHttpJsonTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/database/v1/DatabaseAdminClientHttpJsonTest.java
index 5e0d53da4ce..b5a045b24a0 100644
--- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/database/v1/DatabaseAdminClientHttpJsonTest.java
+++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/database/v1/DatabaseAdminClientHttpJsonTest.java
@@ -1086,6 +1086,8 @@ public void createBackupTest() throws Exception {
.setName(BackupName.of("[PROJECT]", "[INSTANCE]", "[BACKUP]").toString())
.setCreateTime(Timestamp.newBuilder().build())
.setSizeBytes(-1796325715)
+ .setFreeableSizeBytes(1302251206)
+ .setExclusiveSizeBytes(-1085921554)
.addAllReferencingDatabases(new ArrayList())
.setEncryptionInfo(EncryptionInfo.newBuilder().build())
.addAllEncryptionInformation(new ArrayList())
@@ -1093,6 +1095,8 @@ public void createBackupTest() throws Exception {
.addAllReferencingBackups(new ArrayList())
.setMaxExpireTime(Timestamp.newBuilder().build())
.addAllBackupSchedules(new ArrayList())
+ .setIncrementalBackupChainId("incrementalBackupChainId1926005216")
+ .setOldestVersionTime(Timestamp.newBuilder().build())
.build();
Operation resultOperation =
Operation.newBuilder()
@@ -1151,6 +1155,8 @@ public void createBackupTest2() throws Exception {
.setName(BackupName.of("[PROJECT]", "[INSTANCE]", "[BACKUP]").toString())
.setCreateTime(Timestamp.newBuilder().build())
.setSizeBytes(-1796325715)
+ .setFreeableSizeBytes(1302251206)
+ .setExclusiveSizeBytes(-1085921554)
.addAllReferencingDatabases(new ArrayList())
.setEncryptionInfo(EncryptionInfo.newBuilder().build())
.addAllEncryptionInformation(new ArrayList())
@@ -1158,6 +1164,8 @@ public void createBackupTest2() throws Exception {
.addAllReferencingBackups(new ArrayList())
.setMaxExpireTime(Timestamp.newBuilder().build())
.addAllBackupSchedules(new ArrayList())
+ .setIncrementalBackupChainId("incrementalBackupChainId1926005216")
+ .setOldestVersionTime(Timestamp.newBuilder().build())
.build();
Operation resultOperation =
Operation.newBuilder()
@@ -1216,6 +1224,8 @@ public void copyBackupTest() throws Exception {
.setName(BackupName.of("[PROJECT]", "[INSTANCE]", "[BACKUP]").toString())
.setCreateTime(Timestamp.newBuilder().build())
.setSizeBytes(-1796325715)
+ .setFreeableSizeBytes(1302251206)
+ .setExclusiveSizeBytes(-1085921554)
.addAllReferencingDatabases(new ArrayList())
.setEncryptionInfo(EncryptionInfo.newBuilder().build())
.addAllEncryptionInformation(new ArrayList())
@@ -1223,6 +1233,8 @@ public void copyBackupTest() throws Exception {
.addAllReferencingBackups(new ArrayList())
.setMaxExpireTime(Timestamp.newBuilder().build())
.addAllBackupSchedules(new ArrayList())
+ .setIncrementalBackupChainId("incrementalBackupChainId1926005216")
+ .setOldestVersionTime(Timestamp.newBuilder().build())
.build();
Operation resultOperation =
Operation.newBuilder()
@@ -1284,6 +1296,8 @@ public void copyBackupTest2() throws Exception {
.setName(BackupName.of("[PROJECT]", "[INSTANCE]", "[BACKUP]").toString())
.setCreateTime(Timestamp.newBuilder().build())
.setSizeBytes(-1796325715)
+ .setFreeableSizeBytes(1302251206)
+ .setExclusiveSizeBytes(-1085921554)
.addAllReferencingDatabases(new ArrayList())
.setEncryptionInfo(EncryptionInfo.newBuilder().build())
.addAllEncryptionInformation(new ArrayList())
@@ -1291,6 +1305,8 @@ public void copyBackupTest2() throws Exception {
.addAllReferencingBackups(new ArrayList())
.setMaxExpireTime(Timestamp.newBuilder().build())
.addAllBackupSchedules(new ArrayList())
+ .setIncrementalBackupChainId("incrementalBackupChainId1926005216")
+ .setOldestVersionTime(Timestamp.newBuilder().build())
.build();
Operation resultOperation =
Operation.newBuilder()
@@ -1352,6 +1368,8 @@ public void copyBackupTest3() throws Exception {
.setName(BackupName.of("[PROJECT]", "[INSTANCE]", "[BACKUP]").toString())
.setCreateTime(Timestamp.newBuilder().build())
.setSizeBytes(-1796325715)
+ .setFreeableSizeBytes(1302251206)
+ .setExclusiveSizeBytes(-1085921554)
.addAllReferencingDatabases(new ArrayList())
.setEncryptionInfo(EncryptionInfo.newBuilder().build())
.addAllEncryptionInformation(new ArrayList())
@@ -1359,6 +1377,8 @@ public void copyBackupTest3() throws Exception {
.addAllReferencingBackups(new ArrayList())
.setMaxExpireTime(Timestamp.newBuilder().build())
.addAllBackupSchedules(new ArrayList())
+ .setIncrementalBackupChainId("incrementalBackupChainId1926005216")
+ .setOldestVersionTime(Timestamp.newBuilder().build())
.build();
Operation resultOperation =
Operation.newBuilder()
@@ -1420,6 +1440,8 @@ public void copyBackupTest4() throws Exception {
.setName(BackupName.of("[PROJECT]", "[INSTANCE]", "[BACKUP]").toString())
.setCreateTime(Timestamp.newBuilder().build())
.setSizeBytes(-1796325715)
+ .setFreeableSizeBytes(1302251206)
+ .setExclusiveSizeBytes(-1085921554)
.addAllReferencingDatabases(new ArrayList())
.setEncryptionInfo(EncryptionInfo.newBuilder().build())
.addAllEncryptionInformation(new ArrayList())
@@ -1427,6 +1449,8 @@ public void copyBackupTest4() throws Exception {
.addAllReferencingBackups(new ArrayList())
.setMaxExpireTime(Timestamp.newBuilder().build())
.addAllBackupSchedules(new ArrayList())
+ .setIncrementalBackupChainId("incrementalBackupChainId1926005216")
+ .setOldestVersionTime(Timestamp.newBuilder().build())
.build();
Operation resultOperation =
Operation.newBuilder()
@@ -1488,6 +1512,8 @@ public void getBackupTest() throws Exception {
.setName(BackupName.of("[PROJECT]", "[INSTANCE]", "[BACKUP]").toString())
.setCreateTime(Timestamp.newBuilder().build())
.setSizeBytes(-1796325715)
+ .setFreeableSizeBytes(1302251206)
+ .setExclusiveSizeBytes(-1085921554)
.addAllReferencingDatabases(new ArrayList())
.setEncryptionInfo(EncryptionInfo.newBuilder().build())
.addAllEncryptionInformation(new ArrayList())
@@ -1495,6 +1521,8 @@ public void getBackupTest() throws Exception {
.addAllReferencingBackups(new ArrayList())
.setMaxExpireTime(Timestamp.newBuilder().build())
.addAllBackupSchedules(new ArrayList())
+ .setIncrementalBackupChainId("incrementalBackupChainId1926005216")
+ .setOldestVersionTime(Timestamp.newBuilder().build())
.build();
mockService.addResponse(expectedResponse);
@@ -1544,6 +1572,8 @@ public void getBackupTest2() throws Exception {
.setName(BackupName.of("[PROJECT]", "[INSTANCE]", "[BACKUP]").toString())
.setCreateTime(Timestamp.newBuilder().build())
.setSizeBytes(-1796325715)
+ .setFreeableSizeBytes(1302251206)
+ .setExclusiveSizeBytes(-1085921554)
.addAllReferencingDatabases(new ArrayList())
.setEncryptionInfo(EncryptionInfo.newBuilder().build())
.addAllEncryptionInformation(new ArrayList())
@@ -1551,6 +1581,8 @@ public void getBackupTest2() throws Exception {
.addAllReferencingBackups(new ArrayList())
.setMaxExpireTime(Timestamp.newBuilder().build())
.addAllBackupSchedules(new ArrayList())
+ .setIncrementalBackupChainId("incrementalBackupChainId1926005216")
+ .setOldestVersionTime(Timestamp.newBuilder().build())
.build();
mockService.addResponse(expectedResponse);
@@ -1600,6 +1632,8 @@ public void updateBackupTest() throws Exception {
.setName(BackupName.of("[PROJECT]", "[INSTANCE]", "[BACKUP]").toString())
.setCreateTime(Timestamp.newBuilder().build())
.setSizeBytes(-1796325715)
+ .setFreeableSizeBytes(1302251206)
+ .setExclusiveSizeBytes(-1085921554)
.addAllReferencingDatabases(new ArrayList())
.setEncryptionInfo(EncryptionInfo.newBuilder().build())
.addAllEncryptionInformation(new ArrayList())
@@ -1607,6 +1641,8 @@ public void updateBackupTest() throws Exception {
.addAllReferencingBackups(new ArrayList())
.setMaxExpireTime(Timestamp.newBuilder().build())
.addAllBackupSchedules(new ArrayList())
+ .setIncrementalBackupChainId("incrementalBackupChainId1926005216")
+ .setOldestVersionTime(Timestamp.newBuilder().build())
.build();
mockService.addResponse(expectedResponse);
@@ -1618,6 +1654,8 @@ public void updateBackupTest() throws Exception {
.setName(BackupName.of("[PROJECT]", "[INSTANCE]", "[BACKUP]").toString())
.setCreateTime(Timestamp.newBuilder().build())
.setSizeBytes(-1796325715)
+ .setFreeableSizeBytes(1302251206)
+ .setExclusiveSizeBytes(-1085921554)
.addAllReferencingDatabases(new ArrayList())
.setEncryptionInfo(EncryptionInfo.newBuilder().build())
.addAllEncryptionInformation(new ArrayList())
@@ -1625,6 +1663,8 @@ public void updateBackupTest() throws Exception {
.addAllReferencingBackups(new ArrayList())
.setMaxExpireTime(Timestamp.newBuilder().build())
.addAllBackupSchedules(new ArrayList())
+ .setIncrementalBackupChainId("incrementalBackupChainId1926005216")
+ .setOldestVersionTime(Timestamp.newBuilder().build())
.build();
FieldMask updateMask = FieldMask.newBuilder().build();
@@ -1662,6 +1702,8 @@ public void updateBackupExceptionTest() throws Exception {
.setName(BackupName.of("[PROJECT]", "[INSTANCE]", "[BACKUP]").toString())
.setCreateTime(Timestamp.newBuilder().build())
.setSizeBytes(-1796325715)
+ .setFreeableSizeBytes(1302251206)
+ .setExclusiveSizeBytes(-1085921554)
.addAllReferencingDatabases(new ArrayList())
.setEncryptionInfo(EncryptionInfo.newBuilder().build())
.addAllEncryptionInformation(new ArrayList())
@@ -1669,6 +1711,8 @@ public void updateBackupExceptionTest() throws Exception {
.addAllReferencingBackups(new ArrayList())
.setMaxExpireTime(Timestamp.newBuilder().build())
.addAllBackupSchedules(new ArrayList())
+ .setIncrementalBackupChainId("incrementalBackupChainId1926005216")
+ .setOldestVersionTime(Timestamp.newBuilder().build())
.build();
FieldMask updateMask = FieldMask.newBuilder().build();
client.updateBackup(backup, updateMask);
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/database/v1/DatabaseAdminClientTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/database/v1/DatabaseAdminClientTest.java
index 469c0f53a1c..a4de864ee6f 100644
--- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/database/v1/DatabaseAdminClientTest.java
+++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/admin/database/v1/DatabaseAdminClientTest.java
@@ -999,6 +999,8 @@ public void createBackupTest() throws Exception {
.setName(BackupName.of("[PROJECT]", "[INSTANCE]", "[BACKUP]").toString())
.setCreateTime(Timestamp.newBuilder().build())
.setSizeBytes(-1796325715)
+ .setFreeableSizeBytes(1302251206)
+ .setExclusiveSizeBytes(-1085921554)
.addAllReferencingDatabases(new ArrayList())
.setEncryptionInfo(EncryptionInfo.newBuilder().build())
.addAllEncryptionInformation(new ArrayList())
@@ -1006,6 +1008,8 @@ public void createBackupTest() throws Exception {
.addAllReferencingBackups(new ArrayList())
.setMaxExpireTime(Timestamp.newBuilder().build())
.addAllBackupSchedules(new ArrayList())
+ .setIncrementalBackupChainId("incrementalBackupChainId1926005216")
+ .setOldestVersionTime(Timestamp.newBuilder().build())
.build();
Operation resultOperation =
Operation.newBuilder()
@@ -1063,6 +1067,8 @@ public void createBackupTest2() throws Exception {
.setName(BackupName.of("[PROJECT]", "[INSTANCE]", "[BACKUP]").toString())
.setCreateTime(Timestamp.newBuilder().build())
.setSizeBytes(-1796325715)
+ .setFreeableSizeBytes(1302251206)
+ .setExclusiveSizeBytes(-1085921554)
.addAllReferencingDatabases(new ArrayList())
.setEncryptionInfo(EncryptionInfo.newBuilder().build())
.addAllEncryptionInformation(new ArrayList())
@@ -1070,6 +1076,8 @@ public void createBackupTest2() throws Exception {
.addAllReferencingBackups(new ArrayList())
.setMaxExpireTime(Timestamp.newBuilder().build())
.addAllBackupSchedules(new ArrayList())
+ .setIncrementalBackupChainId("incrementalBackupChainId1926005216")
+ .setOldestVersionTime(Timestamp.newBuilder().build())
.build();
Operation resultOperation =
Operation.newBuilder()
@@ -1127,6 +1135,8 @@ public void copyBackupTest() throws Exception {
.setName(BackupName.of("[PROJECT]", "[INSTANCE]", "[BACKUP]").toString())
.setCreateTime(Timestamp.newBuilder().build())
.setSizeBytes(-1796325715)
+ .setFreeableSizeBytes(1302251206)
+ .setExclusiveSizeBytes(-1085921554)
.addAllReferencingDatabases(new ArrayList())
.setEncryptionInfo(EncryptionInfo.newBuilder().build())
.addAllEncryptionInformation(new ArrayList())
@@ -1134,6 +1144,8 @@ public void copyBackupTest() throws Exception {
.addAllReferencingBackups(new ArrayList())
.setMaxExpireTime(Timestamp.newBuilder().build())
.addAllBackupSchedules(new ArrayList())
+ .setIncrementalBackupChainId("incrementalBackupChainId1926005216")
+ .setOldestVersionTime(Timestamp.newBuilder().build())
.build();
Operation resultOperation =
Operation.newBuilder()
@@ -1195,6 +1207,8 @@ public void copyBackupTest2() throws Exception {
.setName(BackupName.of("[PROJECT]", "[INSTANCE]", "[BACKUP]").toString())
.setCreateTime(Timestamp.newBuilder().build())
.setSizeBytes(-1796325715)
+ .setFreeableSizeBytes(1302251206)
+ .setExclusiveSizeBytes(-1085921554)
.addAllReferencingDatabases(new ArrayList())
.setEncryptionInfo(EncryptionInfo.newBuilder().build())
.addAllEncryptionInformation(new ArrayList())
@@ -1202,6 +1216,8 @@ public void copyBackupTest2() throws Exception {
.addAllReferencingBackups(new ArrayList())
.setMaxExpireTime(Timestamp.newBuilder().build())
.addAllBackupSchedules(new ArrayList())
+ .setIncrementalBackupChainId("incrementalBackupChainId1926005216")
+ .setOldestVersionTime(Timestamp.newBuilder().build())
.build();
Operation resultOperation =
Operation.newBuilder()
@@ -1263,6 +1279,8 @@ public void copyBackupTest3() throws Exception {
.setName(BackupName.of("[PROJECT]", "[INSTANCE]", "[BACKUP]").toString())
.setCreateTime(Timestamp.newBuilder().build())
.setSizeBytes(-1796325715)
+ .setFreeableSizeBytes(1302251206)
+ .setExclusiveSizeBytes(-1085921554)
.addAllReferencingDatabases(new ArrayList())
.setEncryptionInfo(EncryptionInfo.newBuilder().build())
.addAllEncryptionInformation(new ArrayList())
@@ -1270,6 +1288,8 @@ public void copyBackupTest3() throws Exception {
.addAllReferencingBackups(new ArrayList())
.setMaxExpireTime(Timestamp.newBuilder().build())
.addAllBackupSchedules(new ArrayList())
+ .setIncrementalBackupChainId("incrementalBackupChainId1926005216")
+ .setOldestVersionTime(Timestamp.newBuilder().build())
.build();
Operation resultOperation =
Operation.newBuilder()
@@ -1331,6 +1351,8 @@ public void copyBackupTest4() throws Exception {
.setName(BackupName.of("[PROJECT]", "[INSTANCE]", "[BACKUP]").toString())
.setCreateTime(Timestamp.newBuilder().build())
.setSizeBytes(-1796325715)
+ .setFreeableSizeBytes(1302251206)
+ .setExclusiveSizeBytes(-1085921554)
.addAllReferencingDatabases(new ArrayList())
.setEncryptionInfo(EncryptionInfo.newBuilder().build())
.addAllEncryptionInformation(new ArrayList())
@@ -1338,6 +1360,8 @@ public void copyBackupTest4() throws Exception {
.addAllReferencingBackups(new ArrayList())
.setMaxExpireTime(Timestamp.newBuilder().build())
.addAllBackupSchedules(new ArrayList())
+ .setIncrementalBackupChainId("incrementalBackupChainId1926005216")
+ .setOldestVersionTime(Timestamp.newBuilder().build())
.build();
Operation resultOperation =
Operation.newBuilder()
@@ -1399,6 +1423,8 @@ public void getBackupTest() throws Exception {
.setName(BackupName.of("[PROJECT]", "[INSTANCE]", "[BACKUP]").toString())
.setCreateTime(Timestamp.newBuilder().build())
.setSizeBytes(-1796325715)
+ .setFreeableSizeBytes(1302251206)
+ .setExclusiveSizeBytes(-1085921554)
.addAllReferencingDatabases(new ArrayList())
.setEncryptionInfo(EncryptionInfo.newBuilder().build())
.addAllEncryptionInformation(new ArrayList())
@@ -1406,6 +1432,8 @@ public void getBackupTest() throws Exception {
.addAllReferencingBackups(new ArrayList())
.setMaxExpireTime(Timestamp.newBuilder().build())
.addAllBackupSchedules(new ArrayList())
+ .setIncrementalBackupChainId("incrementalBackupChainId1926005216")
+ .setOldestVersionTime(Timestamp.newBuilder().build())
.build();
mockDatabaseAdmin.addResponse(expectedResponse);
@@ -1449,6 +1477,8 @@ public void getBackupTest2() throws Exception {
.setName(BackupName.of("[PROJECT]", "[INSTANCE]", "[BACKUP]").toString())
.setCreateTime(Timestamp.newBuilder().build())
.setSizeBytes(-1796325715)
+ .setFreeableSizeBytes(1302251206)
+ .setExclusiveSizeBytes(-1085921554)
.addAllReferencingDatabases(new ArrayList())
.setEncryptionInfo(EncryptionInfo.newBuilder().build())
.addAllEncryptionInformation(new ArrayList())
@@ -1456,6 +1486,8 @@ public void getBackupTest2() throws Exception {
.addAllReferencingBackups(new ArrayList())
.setMaxExpireTime(Timestamp.newBuilder().build())
.addAllBackupSchedules(new ArrayList())
+ .setIncrementalBackupChainId("incrementalBackupChainId1926005216")
+ .setOldestVersionTime(Timestamp.newBuilder().build())
.build();
mockDatabaseAdmin.addResponse(expectedResponse);
@@ -1499,6 +1531,8 @@ public void updateBackupTest() throws Exception {
.setName(BackupName.of("[PROJECT]", "[INSTANCE]", "[BACKUP]").toString())
.setCreateTime(Timestamp.newBuilder().build())
.setSizeBytes(-1796325715)
+ .setFreeableSizeBytes(1302251206)
+ .setExclusiveSizeBytes(-1085921554)
.addAllReferencingDatabases(new ArrayList())
.setEncryptionInfo(EncryptionInfo.newBuilder().build())
.addAllEncryptionInformation(new ArrayList())
@@ -1506,6 +1540,8 @@ public void updateBackupTest() throws Exception {
.addAllReferencingBackups(new ArrayList())
.setMaxExpireTime(Timestamp.newBuilder().build())
.addAllBackupSchedules(new ArrayList())
+ .setIncrementalBackupChainId("incrementalBackupChainId1926005216")
+ .setOldestVersionTime(Timestamp.newBuilder().build())
.build();
mockDatabaseAdmin.addResponse(expectedResponse);
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/SavepointMockServerTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/SavepointMockServerTest.java
index e615b78e9de..31972481629 100644
--- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/SavepointMockServerTest.java
+++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/SavepointMockServerTest.java
@@ -682,14 +682,16 @@ public void testRollbackToSavepointWithoutInternalRetriesInReadOnlyTransaction()
@Test
public void testKeepAlive() throws InterruptedException, TimeoutException {
+ String keepAliveTag = "test_keep_alive_tag";
System.setProperty("spanner.connection.keep_alive_interval_millis", "1");
+ System.setProperty("spanner.connection.keep_alive_query_tag", keepAliveTag);
try (Connection connection = createConnection()) {
connection.setSavepointSupport(SavepointSupport.ENABLED);
connection.setKeepTransactionAlive(true);
// Start a transaction by executing a statement.
connection.execute(INSERT_STATEMENT);
// Verify that we get a keep-alive request.
- verifyHasKeepAliveRequest();
+ verifyHasKeepAliveRequest(keepAliveTag);
// Set a savepoint, execute another statement, and rollback to the savepoint.
// The keep-alive should not be sent after the transaction has been rolled back to the
// savepoint.
@@ -697,38 +699,22 @@ public void testKeepAlive() throws InterruptedException, TimeoutException {
connection.execute(INSERT_STATEMENT);
connection.rollbackToSavepoint("s1");
mockSpanner.waitForRequestsToContain(RollbackRequest.class, 1000L);
- // Wait for up to 2 milliseconds to make sure that any keep-alive requests that were in flight
- // have finished.
- try {
- mockSpanner.waitForRequestsToContain(
- r -> {
- if (!(r instanceof ExecuteSqlRequest)) {
- return false;
- }
- ExecuteSqlRequest request = (ExecuteSqlRequest) r;
- return request.getSql().equals("SELECT 1")
- && request
- .getRequestOptions()
- .getRequestTag()
- .equals("connection.transaction-keep-alive");
- },
- 2L);
- } catch (TimeoutException ignore) {
- }
+ String keepAliveTagAfterRollback = "test_keep_alive_tag_after_rollback";
+ System.setProperty("spanner.connection.keep_alive_query_tag", keepAliveTagAfterRollback);
- // Verify that we don't get any keep-alive requests from this point.
- mockSpanner.clearRequests();
+ // Verify that we don't get any new keep-alive requests from this point.
Thread.sleep(2L);
- assertEquals(0, countKeepAliveRequest());
+ assertEquals(0, countKeepAliveRequest(keepAliveTagAfterRollback));
// Resume the transaction and verify that we get a keep-alive again.
connection.execute(INSERT_STATEMENT);
- verifyHasKeepAliveRequest();
+ verifyHasKeepAliveRequest(keepAliveTagAfterRollback);
} finally {
System.clearProperty("spanner.connection.keep_alive_interval_millis");
+ System.clearProperty("spanner.connection.keep_alive_query_tag");
}
}
- private void verifyHasKeepAliveRequest() throws InterruptedException, TimeoutException {
+ private void verifyHasKeepAliveRequest(String tag) throws InterruptedException, TimeoutException {
mockSpanner.waitForRequestsToContain(
r -> {
if (!(r instanceof ExecuteSqlRequest)) {
@@ -736,23 +722,17 @@ private void verifyHasKeepAliveRequest() throws InterruptedException, TimeoutExc
}
ExecuteSqlRequest request = (ExecuteSqlRequest) r;
return request.getSql().equals("SELECT 1")
- && request
- .getRequestOptions()
- .getRequestTag()
- .equals("connection.transaction-keep-alive");
+ && request.getRequestOptions().getRequestTag().equals(tag);
},
1000L);
}
- private long countKeepAliveRequest() {
+ private long countKeepAliveRequest(String tag) {
return mockSpanner.getRequestsOfType(ExecuteSqlRequest.class).stream()
.filter(
request ->
request.getSql().equals("SELECT 1")
- && request
- .getRequestOptions()
- .getRequestTag()
- .equals("connection.transaction-keep-alive"))
+ && request.getRequestOptions().getRequestTag().equals(tag))
.count();
}
}
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITBulkConnectionTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITBulkConnectionTest.java
index 9cc46e6ee13..42358a647a1 100644
--- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITBulkConnectionTest.java
+++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITBulkConnectionTest.java
@@ -36,8 +36,8 @@
/**
* Test opening multiple generic (not JDBC) Spanner connections. This test should not be run in
- * parallel with other tests, as it tries to close all active connections, and should not try to
- * close connections of other integration tests.
+ * parallel with other tests in the same JVM, as it tries to close all active connections, and
+ * should not try to close connections of other integration tests.
*/
@Category(SerialIntegrationTest.class)
@RunWith(JUnit4.class)
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITDmlReturningTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITDmlReturningTest.java
index 5e5ca800402..83f9beb7cf7 100644
--- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITDmlReturningTest.java
+++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITDmlReturningTest.java
@@ -22,12 +22,13 @@
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertThrows;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assume.assumeFalse;
import com.google.cloud.spanner.AsyncResultSet;
import com.google.cloud.spanner.AsyncResultSet.CallbackResponse;
+import com.google.cloud.spanner.DatabaseClient;
import com.google.cloud.spanner.Dialect;
import com.google.cloud.spanner.ErrorCode;
+import com.google.cloud.spanner.KeySet;
import com.google.cloud.spanner.Mutation;
import com.google.cloud.spanner.ParallelIntegrationTest;
import com.google.cloud.spanner.ResultSet;
@@ -39,15 +40,15 @@
import com.google.cloud.spanner.connection.StatementResult;
import com.google.cloud.spanner.connection.StatementResult.ResultType;
import com.google.cloud.spanner.connection.TransactionMode;
-import com.google.cloud.spanner.testing.EmulatorSpannerHelper;
+import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
-import java.util.HashMap;
+import java.util.HashSet;
import java.util.List;
-import java.util.Map;
+import java.util.Set;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Executors;
import org.junit.Before;
@@ -81,12 +82,7 @@ public class ITDmlReturningTest extends ITAbstractSpannerTest {
+ " SingerId BIGINT PRIMARY KEY,"
+ " FirstName character varying(1024),"
+ " LastName character varying(1024))");
- private final Map IS_INITIALIZED = new HashMap<>();
-
- public ITDmlReturningTest() {
- IS_INITIALIZED.put(Dialect.GOOGLE_STANDARD_SQL, false);
- IS_INITIALIZED.put(Dialect.POSTGRESQL, false);
- }
+ private static final Set IS_INITIALIZED = new HashSet<>();
@Parameter public Dialect dialect;
@@ -96,41 +92,34 @@ public static Object[] data() {
}
private boolean checkAndSetInitialized() {
- if ((dialect == Dialect.GOOGLE_STANDARD_SQL) && !IS_INITIALIZED.get(dialect)) {
- IS_INITIALIZED.put(dialect, true);
- return true;
- }
- if ((dialect == Dialect.POSTGRESQL) && !IS_INITIALIZED.get(dialect)) {
- IS_INITIALIZED.put(dialect, true);
- return true;
- }
- return false;
+ return !IS_INITIALIZED.add(dialect);
}
@Before
public void setupTable() {
- assumeFalse(
- "DML Returning is not supported in the emulator", EmulatorSpannerHelper.isUsingEmulator());
- if (checkAndSetInitialized()) {
+ if (!checkAndSetInitialized()) {
database =
env.getTestHelper()
.createTestDatabase(dialect, Collections.singleton(DDL_MAP.get(dialect)));
- List firstNames = Arrays.asList("ABC", "ABC", "DEF", "PQR", "ABC");
- List lastNames = Arrays.asList("XYZ", "DEF", "XYZ", "ABC", "GHI");
- List mutations = new ArrayList<>();
- for (int id = 1; id <= 5; id++) {
- mutations.add(
- Mutation.newInsertBuilder("SINGERS")
- .set("SINGERID")
- .to(id)
- .set("FIRSTNAME")
- .to(firstNames.get(id - 1))
- .set("LASTNAME")
- .to(lastNames.get(id - 1))
- .build());
- }
- env.getTestHelper().getDatabaseClient(database).write(mutations);
}
+ DatabaseClient client = env.getTestHelper().getDatabaseClient(database);
+ client.write(ImmutableList.of(Mutation.delete("SINGERS", KeySet.all())));
+
+ List firstNames = Arrays.asList("ABC", "ABC", "DEF", "PQR", "ABC");
+ List lastNames = Arrays.asList("XYZ", "DEF", "XYZ", "ABC", "GHI");
+ List mutations = new ArrayList<>();
+ for (int id = 1; id <= 5; id++) {
+ mutations.add(
+ Mutation.newInsertBuilder("SINGERS")
+ .set("SINGERID")
+ .to(id)
+ .set("FIRSTNAME")
+ .to(firstNames.get(id - 1))
+ .set("LASTNAME")
+ .to(lastNames.get(id - 1))
+ .build());
+ }
+ env.getTestHelper().getDatabaseClient(database).write(mutations);
}
@Test
@@ -211,9 +200,9 @@ public void testDmlReturningExecuteUpdateAsync() {
public void testDmlReturningExecuteBatchUpdate() {
try (Connection connection = createConnection()) {
connection.setAutocommit(false);
- final Statement UPDATE_STMT = UPDATE_RETURNING_MAP.get(dialect);
+ final Statement updateStmt = Preconditions.checkNotNull(UPDATE_RETURNING_MAP.get(dialect));
long[] counts =
- connection.executeBatchUpdate(ImmutableList.of(UPDATE_STMT, UPDATE_STMT, UPDATE_STMT));
+ connection.executeBatchUpdate(ImmutableList.of(updateStmt, updateStmt, updateStmt));
assertArrayEquals(counts, new long[] {3, 3, 3});
}
}
@@ -222,10 +211,10 @@ public void testDmlReturningExecuteBatchUpdate() {
public void testDmlReturningExecuteBatchUpdateAsync() {
try (Connection connection = createConnection()) {
connection.setAutocommit(false);
- final Statement UPDATE_STMT = UPDATE_RETURNING_MAP.get(dialect);
+ final Statement updateStmt = Preconditions.checkNotNull(UPDATE_RETURNING_MAP.get(dialect));
long[] counts =
connection
- .executeBatchUpdateAsync(ImmutableList.of(UPDATE_STMT, UPDATE_STMT, UPDATE_STMT))
+ .executeBatchUpdateAsync(ImmutableList.of(updateStmt, updateStmt, updateStmt))
.get();
assertArrayEquals(counts, new long[] {3, 3, 3});
} catch (ExecutionException | InterruptedException e) {
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITQueryOptionsTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITQueryOptionsTest.java
index 09f4ada43a8..62eba4f4315 100644
--- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITQueryOptionsTest.java
+++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITQueryOptionsTest.java
@@ -16,12 +16,18 @@
package com.google.cloud.spanner.connection.it;
+import com.google.cloud.spanner.ParallelIntegrationTest;
import com.google.cloud.spanner.connection.ITAbstractSpannerTest;
import com.google.cloud.spanner.connection.SqlScriptVerifier;
import com.google.cloud.spanner.connection.SqlScriptVerifier.SpannerGenericConnection;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+@Category(ParallelIntegrationTest.class)
+@RunWith(JUnit4.class)
public class ITQueryOptionsTest extends ITAbstractSpannerTest {
private static final String TEST_QUERY_OPTIONS = "ITSqlScriptTest_TestQueryOptions.sql";
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITAsyncAPITest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITAsyncAPITest.java
index ebd3ab4883f..1ca69fe975d 100644
--- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITAsyncAPITest.java
+++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITAsyncAPITest.java
@@ -42,7 +42,7 @@
import com.google.cloud.spanner.KeySet;
import com.google.cloud.spanner.Mutation;
import com.google.cloud.spanner.Options;
-import com.google.cloud.spanner.SerialIntegrationTest;
+import com.google.cloud.spanner.ParallelIntegrationTest;
import com.google.cloud.spanner.SpannerException;
import com.google.cloud.spanner.Statement;
import com.google.cloud.spanner.Struct;
@@ -58,6 +58,7 @@
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
+import java.util.concurrent.ThreadLocalRandom;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
@@ -68,7 +69,7 @@
import org.junit.runners.JUnit4;
/** Integration tests for asynchronous APIs. */
-@Category(SerialIntegrationTest.class)
+@Category(ParallelIntegrationTest.class)
@RunWith(JUnit4.class)
public class ITAsyncAPITest {
@ClassRule public static IntegrationTestEnv env = new IntegrationTestEnv();
@@ -237,17 +238,24 @@ public void invalidDatabase() throws Exception {
RemoteSpannerHelper helper = env.getTestHelper();
DatabaseClient invalidClient =
helper.getClient().getDatabaseClient(DatabaseId.of(helper.getInstanceId(), "invalid"));
- ApiFuture row =
- invalidClient
- .singleUse(TimestampBound.strong())
- .readRowAsync(TABLE_NAME, Key.of("k99"), ALL_COLUMNS);
+ Thread.sleep(ThreadLocalRandom.current().nextLong(100L));
try {
+ // The NOT_FOUND error can come from both the call to invalidClient.singleUse() as well as
+ // from the call to row.get(), which is why both need to be inside the try block.
+ ApiFuture row =
+ invalidClient
+ .singleUse(TimestampBound.strong())
+ .readRowAsync(TABLE_NAME, Key.of("k99"), ALL_COLUMNS);
row.get();
fail("missing expected exception");
- } catch (ExecutionException e) {
- assertThat(e.getCause()).isInstanceOf(SpannerException.class);
- SpannerException se = (SpannerException) e.getCause();
- assertThat(se.getErrorCode()).isEqualTo(ErrorCode.NOT_FOUND);
+ } catch (ExecutionException | SpannerException thrownException) {
+ SpannerException spannerException;
+ if (thrownException instanceof ExecutionException) {
+ spannerException = (SpannerException) thrownException.getCause();
+ } else {
+ spannerException = (SpannerException) thrownException;
+ }
+ assertEquals(ErrorCode.NOT_FOUND, spannerException.getErrorCode());
}
}
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITAsyncExamplesTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITAsyncExamplesTest.java
index 87f26da9049..dc5abd77afd 100644
--- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITAsyncExamplesTest.java
+++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITAsyncExamplesTest.java
@@ -33,8 +33,8 @@
import com.google.cloud.spanner.Key;
import com.google.cloud.spanner.KeySet;
import com.google.cloud.spanner.Mutation;
+import com.google.cloud.spanner.ParallelIntegrationTest;
import com.google.cloud.spanner.ReadOnlyTransaction;
-import com.google.cloud.spanner.SerialIntegrationTest;
import com.google.cloud.spanner.SpannerException;
import com.google.cloud.spanner.Statement;
import com.google.cloud.spanner.Struct;
@@ -59,7 +59,7 @@
import org.junit.runners.JUnit4;
/** Integration tests for asynchronous APIs. */
-@Category(SerialIntegrationTest.class)
+@Category(ParallelIntegrationTest.class)
@RunWith(JUnit4.class)
public class ITAsyncExamplesTest {
@ClassRule public static IntegrationTestEnv env = new IntegrationTestEnv();
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITAutogeneratedAdminClientTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITAutogeneratedAdminClientTest.java
index a1c6a35819f..de5597da4f9 100644
--- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITAutogeneratedAdminClientTest.java
+++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITAutogeneratedAdminClientTest.java
@@ -266,9 +266,9 @@ private Database createAndUpdateDatabase(
private String getCreateTableStatement() {
if (dialect == DatabaseDialect.POSTGRESQL) {
- return "CREATE TABLE T (" + " \"K\" VARCHAR PRIMARY KEY" + ")";
+ return "CREATE TABLE IF NOT EXISTS T (" + " \"K\" VARCHAR PRIMARY KEY" + ")";
} else {
- return "CREATE TABLE T (" + " K STRING(MAX)" + ") PRIMARY KEY (K)";
+ return "CREATE TABLE IF NOT EXISTS T (" + " K STRING(MAX)" + ") PRIMARY KEY (K)";
}
}
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/spi/v1/GfeLatencyTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/spi/v1/GfeLatencyTest.java
index 9bb09aace70..908a4ad5573 100644
--- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/spi/v1/GfeLatencyTest.java
+++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/spi/v1/GfeLatencyTest.java
@@ -17,6 +17,7 @@
package com.google.cloud.spanner.spi.v1;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
import com.google.auth.oauth2.AccessToken;
import com.google.auth.oauth2.OAuth2Credentials;
@@ -27,6 +28,8 @@
import com.google.cloud.spanner.Spanner;
import com.google.cloud.spanner.SpannerOptions;
import com.google.cloud.spanner.Statement;
+import com.google.common.base.MoreObjects;
+import com.google.common.base.Preconditions;
import com.google.protobuf.ListValue;
import com.google.spanner.v1.ResultSetMetadata;
import com.google.spanner.v1.StructType;
@@ -47,7 +50,6 @@
import io.opencensus.tags.TagValue;
import java.io.IOException;
import java.net.InetSocketAddress;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Random;
@@ -80,26 +82,22 @@ public class GfeLatencyTest {
private static MockSpannerServiceImpl mockSpanner;
private static Server server;
- private static InetSocketAddress address;
private static Spanner spanner;
private static DatabaseClient databaseClient;
- private static final Map optionsMap = new HashMap<>();
-
private static MockSpannerServiceImpl mockSpannerNoHeader;
private static Server serverNoHeader;
- private static InetSocketAddress addressNoHeader;
private static Spanner spannerNoHeader;
private static DatabaseClient databaseClientNoHeader;
- private static String instanceId = "fake-instance";
- private static String databaseId = "fake-database";
- private static String projectId = "fake-project";
+ private static final String INSTANCE_ID = "fake-instance";
+ private static final String DATABASE_ID = "fake-database";
+ private static final String PROJECT_ID = "fake-project";
- private static final long WAIT_FOR_METRICS_TIME_MS = 1_000;
- private static final int MAXIMUM_RETRIES = 5;
+ private static final int MAXIMUM_RETRIES = 50000;
- private static AtomicInteger fakeServerTiming = new AtomicInteger(new Random().nextInt(1000) + 1);
+ private static final AtomicInteger FAKE_SERVER_TIMING =
+ new AtomicInteger(new Random().nextInt(1000) + 1);
private static final Statement SELECT1AND2 =
Statement.of("SELECT 1 AS COL1 UNION ALL SELECT 2 AS COL1");
@@ -135,6 +133,7 @@ public class GfeLatencyTest {
@BeforeClass
public static void startServer() throws IOException {
+ //noinspection deprecation
SpannerRpcViews.registerGfeLatencyAndHeaderMissingCountViews();
mockSpanner = new MockSpannerServiceImpl();
@@ -143,7 +142,7 @@ public static void startServer() throws IOException {
MockSpannerServiceImpl.StatementResult.query(SELECT1AND2, SELECT1_RESULTSET));
mockSpanner.putStatementResult(
MockSpannerServiceImpl.StatementResult.update(UPDATE_FOO_STATEMENT, 1L));
- address = new InetSocketAddress("localhost", 0);
+ InetSocketAddress address = new InetSocketAddress("localhost", 0);
server =
NettyServerBuilder.forAddress(address)
.addService(mockSpanner)
@@ -161,7 +160,7 @@ public ServerCall.Listener interceptCall(
public void sendHeaders(Metadata headers) {
headers.put(
Metadata.Key.of("server-timing", Metadata.ASCII_STRING_MARSHALLER),
- String.format("gfet4t7; dur=%d", fakeServerTiming.get()));
+ String.format("gfet4t7; dur=%d", FAKE_SERVER_TIMING.get()));
super.sendHeaders(headers);
}
},
@@ -170,9 +169,8 @@ public void sendHeaders(Metadata headers) {
})
.build()
.start();
- optionsMap.put(SpannerRpc.Option.CHANNEL_HINT, 1L);
spanner = createSpannerOptions(address, server).getService();
- databaseClient = spanner.getDatabaseClient(DatabaseId.of(projectId, instanceId, databaseId));
+ databaseClient = spanner.getDatabaseClient(DatabaseId.of(PROJECT_ID, INSTANCE_ID, DATABASE_ID));
mockSpannerNoHeader = new MockSpannerServiceImpl();
mockSpannerNoHeader.setAbortProbability(0.0D);
@@ -180,7 +178,7 @@ public void sendHeaders(Metadata headers) {
MockSpannerServiceImpl.StatementResult.query(SELECT1AND2, SELECT1_RESULTSET));
mockSpannerNoHeader.putStatementResult(
MockSpannerServiceImpl.StatementResult.update(UPDATE_FOO_STATEMENT, 1L));
- addressNoHeader = new InetSocketAddress("localhost", 0);
+ InetSocketAddress addressNoHeader = new InetSocketAddress("localhost", 0);
serverNoHeader =
NettyServerBuilder.forAddress(addressNoHeader)
.addService(mockSpannerNoHeader)
@@ -188,7 +186,7 @@ public void sendHeaders(Metadata headers) {
.start();
spannerNoHeader = createSpannerOptions(addressNoHeader, serverNoHeader).getService();
databaseClientNoHeader =
- spannerNoHeader.getDatabaseClient(DatabaseId.of(projectId, instanceId, databaseId));
+ spannerNoHeader.getDatabaseClient(DatabaseId.of(PROJECT_ID, INSTANCE_ID, DATABASE_ID));
}
@AfterClass
@@ -221,12 +219,9 @@ public void testGfeLatencyExecuteStreamingSql() throws InterruptedException {
long latency =
getMetric(
SpannerRpcViews.SPANNER_GFE_LATENCY_VIEW,
- projectId,
- instanceId,
- databaseId,
"google.spanner.v1.Spanner/ExecuteStreamingSql",
false);
- assertEquals(fakeServerTiming.get(), latency);
+ assertEquals(FAKE_SERVER_TIMING.get(), latency);
}
@Test
@@ -238,12 +233,9 @@ public void testGfeLatencyExecuteSql() throws InterruptedException {
long latency =
getMetric(
SpannerRpcViews.SPANNER_GFE_LATENCY_VIEW,
- projectId,
- instanceId,
- databaseId,
"google.spanner.v1.Spanner/ExecuteSql",
false);
- assertEquals(fakeServerTiming.get(), latency);
+ assertEquals(FAKE_SERVER_TIMING.get(), latency);
}
@Test
@@ -254,9 +246,6 @@ public void testGfeMissingHeaderCountExecuteStreamingSql() throws InterruptedExc
long count =
getMetric(
SpannerRpcViews.SPANNER_GFE_HEADER_MISSING_COUNT_VIEW,
- projectId,
- instanceId,
- databaseId,
"google.spanner.v1.Spanner/ExecuteStreamingSql",
false);
assertEquals(0, count);
@@ -267,9 +256,6 @@ public void testGfeMissingHeaderCountExecuteStreamingSql() throws InterruptedExc
long count1 =
getMetric(
SpannerRpcViews.SPANNER_GFE_HEADER_MISSING_COUNT_VIEW,
- projectId,
- instanceId,
- databaseId,
"google.spanner.v1.Spanner/ExecuteStreamingSql",
true);
assertEquals(1, count1);
@@ -283,9 +269,6 @@ public void testGfeMissingHeaderExecuteSql() throws InterruptedException {
long count =
getMetric(
SpannerRpcViews.SPANNER_GFE_HEADER_MISSING_COUNT_VIEW,
- projectId,
- instanceId,
- databaseId,
"google.spanner.v1.Spanner/ExecuteSql",
false);
assertEquals(0, count);
@@ -296,9 +279,6 @@ public void testGfeMissingHeaderExecuteSql() throws InterruptedException {
long count1 =
getMetric(
SpannerRpcViews.SPANNER_GFE_HEADER_MISSING_COUNT_VIEW,
- projectId,
- instanceId,
- databaseId,
"google.spanner.v1.Spanner/ExecuteSql",
true);
assertEquals(1, count1);
@@ -321,78 +301,75 @@ private static SpannerOptions createSpannerOptions(InetSocketAddress address, Se
}
private long getAggregationValueAsLong(AggregationData aggregationData) {
- return aggregationData.match(
- new io.opencensus.common.Function() {
- @Override
- public Long apply(AggregationData.SumDataDouble arg) {
- return (long) arg.getSum();
- }
- },
- new io.opencensus.common.Function() {
- @Override
- public Long apply(AggregationData.SumDataLong arg) {
- return arg.getSum();
- }
- },
- new io.opencensus.common.Function() {
- @Override
- public Long apply(AggregationData.CountData arg) {
- return arg.getCount();
- }
- },
- new io.opencensus.common.Function() {
- @Override
- public Long apply(AggregationData.DistributionData arg) {
- return (long) arg.getMean();
- }
- },
- new io.opencensus.common.Function() {
- @Override
- public Long apply(AggregationData.LastValueDataDouble arg) {
- return (long) arg.getLastValue();
- }
- },
- new io.opencensus.common.Function() {
- @Override
- public Long apply(AggregationData.LastValueDataLong arg) {
- return arg.getLastValue();
- }
- },
- new io.opencensus.common.Function() {
- @Override
- public Long apply(AggregationData arg) {
- throw new UnsupportedOperationException();
- }
- });
+ return MoreObjects.firstNonNull(
+ aggregationData.match(
+ new io.opencensus.common.Function() {
+ @Override
+ public Long apply(AggregationData.SumDataDouble arg) {
+ return (long) Preconditions.checkNotNull(arg).getSum();
+ }
+ },
+ new io.opencensus.common.Function() {
+ @Override
+ public Long apply(AggregationData.SumDataLong arg) {
+ return Preconditions.checkNotNull(arg).getSum();
+ }
+ },
+ new io.opencensus.common.Function() {
+ @Override
+ public Long apply(AggregationData.CountData arg) {
+ return Preconditions.checkNotNull(arg).getCount();
+ }
+ },
+ new io.opencensus.common.Function() {
+ @Override
+ public Long apply(AggregationData.DistributionData arg) {
+ return (long) Preconditions.checkNotNull(arg).getMean();
+ }
+ },
+ new io.opencensus.common.Function() {
+ @Override
+ public Long apply(AggregationData.LastValueDataDouble arg) {
+ return (long) Preconditions.checkNotNull(arg).getLastValue();
+ }
+ },
+ new io.opencensus.common.Function() {
+ @Override
+ public Long apply(AggregationData.LastValueDataLong arg) {
+ return Preconditions.checkNotNull(arg).getLastValue();
+ }
+ },
+ new io.opencensus.common.Function() {
+ @Override
+ public Long apply(AggregationData arg) {
+ throw new UnsupportedOperationException();
+ }
+ }),
+ -1L);
}
- private long getMetric(
- View view,
- String projectId,
- String instanceId,
- String databaseId,
- String method,
- boolean withOverride)
- throws InterruptedException {
+ private long getMetric(View view, String method, boolean withOverride) {
List tagValues = new java.util.ArrayList<>();
for (TagKey column : view.getColumns()) {
if (column == SpannerRpcViews.INSTANCE_ID) {
- tagValues.add(TagValue.create(instanceId));
+ tagValues.add(TagValue.create(INSTANCE_ID));
} else if (column == SpannerRpcViews.DATABASE_ID) {
- tagValues.add(TagValue.create(databaseId));
+ tagValues.add(TagValue.create(DATABASE_ID));
} else if (column == SpannerRpcViews.METHOD) {
tagValues.add(TagValue.create(method));
} else if (column == SpannerRpcViews.PROJECT_ID) {
- tagValues.add(TagValue.create(projectId));
+ tagValues.add(TagValue.create(PROJECT_ID));
}
}
for (int i = 0; i < MAXIMUM_RETRIES; i++) {
- Thread.sleep(WAIT_FOR_METRICS_TIME_MS);
+ Thread.yield();
ViewData viewData = SpannerRpcViews.viewManager.getView(view.getName());
+ assertNotNull(viewData);
if (viewData.getAggregationMap() != null) {
Map, AggregationData> aggregationMap = viewData.getAggregationMap();
AggregationData aggregationData = aggregationMap.get(tagValues);
- if (withOverride && getAggregationValueAsLong(aggregationData) == 0) {
+ if (aggregationData == null
+ || withOverride && getAggregationValueAsLong(aggregationData) == 0) {
continue;
}
return getAggregationValueAsLong(aggregationData);
diff --git a/grpc-google-cloud-spanner-admin-database-v1/clirr-ignored-differences.xml b/grpc-google-cloud-spanner-admin-database-v1/clirr-ignored-differences.xml
new file mode 100644
index 00000000000..80e6f1d59cb
--- /dev/null
+++ b/grpc-google-cloud-spanner-admin-database-v1/clirr-ignored-differences.xml
@@ -0,0 +1,9 @@
+
+
+
+
+ 7012
+ com/google/spanner/admin/database/v1/*
+ *
+
+
diff --git a/grpc-google-cloud-spanner-admin-database-v1/pom.xml b/grpc-google-cloud-spanner-admin-database-v1/pom.xml
index 7f6e5c0e324..3f94aa9b0ff 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.71.1-SNAPSHOT
+ 6.72.1-SNAPSHOT
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.71.1-SNAPSHOT
+ 6.72.1-SNAPSHOT
diff --git a/grpc-google-cloud-spanner-admin-instance-v1/pom.xml b/grpc-google-cloud-spanner-admin-instance-v1/pom.xml
index fe49c116d0f..1fd3088a153 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.71.1-SNAPSHOT
+ 6.72.1-SNAPSHOT
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.71.1-SNAPSHOT
+ 6.72.1-SNAPSHOT
diff --git a/grpc-google-cloud-spanner-executor-v1/pom.xml b/grpc-google-cloud-spanner-executor-v1/pom.xml
index 0030c485007..76fce9b99b8 100644
--- a/grpc-google-cloud-spanner-executor-v1/pom.xml
+++ b/grpc-google-cloud-spanner-executor-v1/pom.xml
@@ -4,13 +4,13 @@
4.0.0
com.google.api.grpc
grpc-google-cloud-spanner-executor-v1
- 6.71.1-SNAPSHOT
+ 6.72.1-SNAPSHOT
grpc-google-cloud-spanner-executor-v1
GRPC library for google-cloud-spanner
com.google.cloud
google-cloud-spanner-parent
- 6.71.1-SNAPSHOT
+ 6.72.1-SNAPSHOT
diff --git a/grpc-google-cloud-spanner-v1/pom.xml b/grpc-google-cloud-spanner-v1/pom.xml
index ace9fd79f0b..239a219a917 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.71.1-SNAPSHOT
+ 6.72.1-SNAPSHOT
grpc-google-cloud-spanner-v1
GRPC library for grpc-google-cloud-spanner-v1
com.google.cloud
google-cloud-spanner-parent
- 6.71.1-SNAPSHOT
+ 6.72.1-SNAPSHOT
diff --git a/pom.xml b/pom.xml
index 1be1af76409..519caf49a47 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
com.google.cloud
google-cloud-spanner-parent
pom
- 6.71.1-SNAPSHOT
+ 6.72.1-SNAPSHOT
Google Cloud Spanner Parent
https://github.com/googleapis/java-spanner
@@ -14,7 +14,7 @@
com.google.cloud
sdk-platform-java-config
- 3.32.0
+ 3.33.0
@@ -61,47 +61,47 @@
com.google.api.grpc
proto-google-cloud-spanner-admin-instance-v1
- 6.71.1-SNAPSHOT
+ 6.72.1-SNAPSHOT
com.google.api.grpc
proto-google-cloud-spanner-executor-v1
- 6.71.1-SNAPSHOT
+ 6.72.1-SNAPSHOT
com.google.api.grpc
grpc-google-cloud-spanner-executor-v1
- 6.71.1-SNAPSHOT
+ 6.72.1-SNAPSHOT
com.google.api.grpc
proto-google-cloud-spanner-v1
- 6.71.1-SNAPSHOT
+ 6.72.1-SNAPSHOT
com.google.api.grpc
proto-google-cloud-spanner-admin-database-v1
- 6.71.1-SNAPSHOT
+ 6.72.1-SNAPSHOT
com.google.api.grpc
grpc-google-cloud-spanner-v1
- 6.71.1-SNAPSHOT
+ 6.72.1-SNAPSHOT
com.google.api.grpc
grpc-google-cloud-spanner-admin-instance-v1
- 6.71.1-SNAPSHOT
+ 6.72.1-SNAPSHOT
com.google.api.grpc
grpc-google-cloud-spanner-admin-database-v1
- 6.71.1-SNAPSHOT
+ 6.72.1-SNAPSHOT
com.google.cloud
google-cloud-spanner
- 6.71.1-SNAPSHOT
+ 6.72.1-SNAPSHOT
@@ -121,7 +121,7 @@
com.google.truth
truth
- 1.4.2
+ 1.4.4
test
@@ -171,7 +171,7 @@
org.apache.maven.plugins
maven-project-info-reports-plugin
- 3.5.0
+ 3.6.2
diff --git a/proto-google-cloud-spanner-admin-database-v1/pom.xml b/proto-google-cloud-spanner-admin-database-v1/pom.xml
index 96f7667a713..f9005584620 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.71.1-SNAPSHOT
+ 6.72.1-SNAPSHOT
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.71.1-SNAPSHOT
+ 6.72.1-SNAPSHOT
diff --git a/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/Backup.java b/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/Backup.java
index 813c859b36e..96dc6990ec0 100644
--- a/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/Backup.java
+++ b/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/Backup.java
@@ -47,6 +47,7 @@ private Backup() {
databaseDialect_ = 0;
referencingBackups_ = com.google.protobuf.LazyStringArrayList.emptyList();
backupSchedules_ = com.google.protobuf.LazyStringArrayList.emptyList();
+ incrementalBackupChainId_ = "";
}
@java.lang.Override
@@ -565,6 +566,54 @@ public long getSizeBytes() {
return sizeBytes_;
}
+ public static final int FREEABLE_SIZE_BYTES_FIELD_NUMBER = 15;
+ private long freeableSizeBytes_ = 0L;
+ /**
+ *
+ *
+ *
+ * Output only. The number of bytes that will be freed by deleting this
+ * backup. This value will be zero if, for example, this backup is part of an
+ * incremental backup chain and younger backups in the chain require that we
+ * keep its data. For backups not in an incremental backup chain, this is
+ * always the size of the backup. This value may change if backups on the same
+ * chain get created, deleted or expired.
+ *
+ *
+ * int64 freeable_size_bytes = 15 [(.google.api.field_behavior) = OUTPUT_ONLY];
+ *
+ * @return The freeableSizeBytes.
+ */
+ @java.lang.Override
+ public long getFreeableSizeBytes() {
+ return freeableSizeBytes_;
+ }
+
+ public static final int EXCLUSIVE_SIZE_BYTES_FIELD_NUMBER = 16;
+ private long exclusiveSizeBytes_ = 0L;
+ /**
+ *
+ *
+ *
+ * Output only. For a backup in an incremental backup chain, this is the
+ * storage space needed to keep the data that has changed since the previous
+ * backup. For all other backups, this is always the size of the backup. This
+ * value may change if backups on the same chain get deleted or expired.
+ *
+ * This field can be used to calculate the total storage space used by a set
+ * of backups. For example, the total space used by all backups of a database
+ * can be computed by summing up this field.
+ *
+ *
+ * int64 exclusive_size_bytes = 16 [(.google.api.field_behavior) = OUTPUT_ONLY];
+ *
+ * @return The exclusiveSizeBytes.
+ */
+ @java.lang.Override
+ public long getExclusiveSizeBytes() {
+ return exclusiveSizeBytes_;
+ }
+
public static final int STATE_FIELD_NUMBER = 6;
private int state_ = 0;
/**
@@ -1170,6 +1219,138 @@ public com.google.protobuf.ByteString getBackupSchedulesBytes(int index) {
return backupSchedules_.getByteString(index);
}
+ public static final int INCREMENTAL_BACKUP_CHAIN_ID_FIELD_NUMBER = 17;
+
+ @SuppressWarnings("serial")
+ private volatile java.lang.Object incrementalBackupChainId_ = "";
+ /**
+ *
+ *
+ *
+ * Output only. Populated only for backups in an incremental backup chain.
+ * Backups share the same chain id if and only if they belong to the same
+ * incremental backup chain. Use this field to determine which backups are
+ * part of the same incremental backup chain. The ordering of backups in the
+ * chain can be determined by ordering the backup `version_time`.
+ *
+ *
+ * string incremental_backup_chain_id = 17 [(.google.api.field_behavior) = OUTPUT_ONLY];
+ *
+ *
+ * @return The incrementalBackupChainId.
+ */
+ @java.lang.Override
+ public java.lang.String getIncrementalBackupChainId() {
+ java.lang.Object ref = incrementalBackupChainId_;
+ if (ref instanceof java.lang.String) {
+ return (java.lang.String) ref;
+ } else {
+ com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ incrementalBackupChainId_ = s;
+ return s;
+ }
+ }
+ /**
+ *
+ *
+ *
+ * Output only. Populated only for backups in an incremental backup chain.
+ * Backups share the same chain id if and only if they belong to the same
+ * incremental backup chain. Use this field to determine which backups are
+ * part of the same incremental backup chain. The ordering of backups in the
+ * chain can be determined by ordering the backup `version_time`.
+ *
+ *
+ * string incremental_backup_chain_id = 17 [(.google.api.field_behavior) = OUTPUT_ONLY];
+ *
+ *
+ * @return The bytes for incrementalBackupChainId.
+ */
+ @java.lang.Override
+ public com.google.protobuf.ByteString getIncrementalBackupChainIdBytes() {
+ java.lang.Object ref = incrementalBackupChainId_;
+ if (ref instanceof java.lang.String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+ incrementalBackupChainId_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+
+ public static final int OLDEST_VERSION_TIME_FIELD_NUMBER = 18;
+ private com.google.protobuf.Timestamp oldestVersionTime_;
+ /**
+ *
+ *
+ *
+ * Output only. Data deleted at a time older than this is guaranteed not to be
+ * retained in order to support this backup. For a backup in an incremental
+ * backup chain, this is the version time of the oldest backup that exists or
+ * ever existed in the chain. For all other backups, this is the version time
+ * of the backup. This field can be used to understand what data is being
+ * retained by the backup system.
+ *
+ *
+ *
+ * .google.protobuf.Timestamp oldest_version_time = 18 [(.google.api.field_behavior) = OUTPUT_ONLY];
+ *
+ *
+ * @return Whether the oldestVersionTime field is set.
+ */
+ @java.lang.Override
+ public boolean hasOldestVersionTime() {
+ return ((bitField0_ & 0x00000020) != 0);
+ }
+ /**
+ *
+ *
+ *
+ * Output only. Data deleted at a time older than this is guaranteed not to be
+ * retained in order to support this backup. For a backup in an incremental
+ * backup chain, this is the version time of the oldest backup that exists or
+ * ever existed in the chain. For all other backups, this is the version time
+ * of the backup. This field can be used to understand what data is being
+ * retained by the backup system.
+ *
+ *
+ *
+ * .google.protobuf.Timestamp oldest_version_time = 18 [(.google.api.field_behavior) = OUTPUT_ONLY];
+ *
+ *
+ * @return The oldestVersionTime.
+ */
+ @java.lang.Override
+ public com.google.protobuf.Timestamp getOldestVersionTime() {
+ return oldestVersionTime_ == null
+ ? com.google.protobuf.Timestamp.getDefaultInstance()
+ : oldestVersionTime_;
+ }
+ /**
+ *
+ *
+ *
+ * Output only. Data deleted at a time older than this is guaranteed not to be
+ * retained in order to support this backup. For a backup in an incremental
+ * backup chain, this is the version time of the oldest backup that exists or
+ * ever existed in the chain. For all other backups, this is the version time
+ * of the backup. This field can be used to understand what data is being
+ * retained by the backup system.
+ *
+ *
+ *
+ * .google.protobuf.Timestamp oldest_version_time = 18 [(.google.api.field_behavior) = OUTPUT_ONLY];
+ *
+ */
+ @java.lang.Override
+ public com.google.protobuf.TimestampOrBuilder getOldestVersionTimeOrBuilder() {
+ return oldestVersionTime_ == null
+ ? com.google.protobuf.Timestamp.getDefaultInstance()
+ : oldestVersionTime_;
+ }
+
private byte memoizedIsInitialized = -1;
@java.lang.Override
@@ -1229,6 +1410,18 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
for (int i = 0; i < backupSchedules_.size(); i++) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 14, backupSchedules_.getRaw(i));
}
+ if (freeableSizeBytes_ != 0L) {
+ output.writeInt64(15, freeableSizeBytes_);
+ }
+ if (exclusiveSizeBytes_ != 0L) {
+ output.writeInt64(16, exclusiveSizeBytes_);
+ }
+ if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(incrementalBackupChainId_)) {
+ com.google.protobuf.GeneratedMessageV3.writeString(output, 17, incrementalBackupChainId_);
+ }
+ if (((bitField0_ & 0x00000020) != 0)) {
+ output.writeMessage(18, getOldestVersionTime());
+ }
getUnknownFields().writeTo(output);
}
@@ -1299,6 +1492,19 @@ public int getSerializedSize() {
size += dataSize;
size += 1 * getBackupSchedulesList().size();
}
+ if (freeableSizeBytes_ != 0L) {
+ size += com.google.protobuf.CodedOutputStream.computeInt64Size(15, freeableSizeBytes_);
+ }
+ if (exclusiveSizeBytes_ != 0L) {
+ size += com.google.protobuf.CodedOutputStream.computeInt64Size(16, exclusiveSizeBytes_);
+ }
+ if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(incrementalBackupChainId_)) {
+ size +=
+ com.google.protobuf.GeneratedMessageV3.computeStringSize(17, incrementalBackupChainId_);
+ }
+ if (((bitField0_ & 0x00000020) != 0)) {
+ size += com.google.protobuf.CodedOutputStream.computeMessageSize(18, getOldestVersionTime());
+ }
size += getUnknownFields().getSerializedSize();
memoizedSize = size;
return size;
@@ -1330,6 +1536,8 @@ public boolean equals(final java.lang.Object obj) {
if (!getCreateTime().equals(other.getCreateTime())) return false;
}
if (getSizeBytes() != other.getSizeBytes()) return false;
+ if (getFreeableSizeBytes() != other.getFreeableSizeBytes()) return false;
+ if (getExclusiveSizeBytes() != other.getExclusiveSizeBytes()) return false;
if (state_ != other.state_) return false;
if (!getReferencingDatabasesList().equals(other.getReferencingDatabasesList())) return false;
if (hasEncryptionInfo() != other.hasEncryptionInfo()) return false;
@@ -1344,6 +1552,11 @@ public boolean equals(final java.lang.Object obj) {
if (!getMaxExpireTime().equals(other.getMaxExpireTime())) return false;
}
if (!getBackupSchedulesList().equals(other.getBackupSchedulesList())) return false;
+ if (!getIncrementalBackupChainId().equals(other.getIncrementalBackupChainId())) return false;
+ if (hasOldestVersionTime() != other.hasOldestVersionTime()) return false;
+ if (hasOldestVersionTime()) {
+ if (!getOldestVersionTime().equals(other.getOldestVersionTime())) return false;
+ }
if (!getUnknownFields().equals(other.getUnknownFields())) return false;
return true;
}
@@ -1373,6 +1586,10 @@ public int hashCode() {
}
hash = (37 * hash) + SIZE_BYTES_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashLong(getSizeBytes());
+ hash = (37 * hash) + FREEABLE_SIZE_BYTES_FIELD_NUMBER;
+ hash = (53 * hash) + com.google.protobuf.Internal.hashLong(getFreeableSizeBytes());
+ hash = (37 * hash) + EXCLUSIVE_SIZE_BYTES_FIELD_NUMBER;
+ hash = (53 * hash) + com.google.protobuf.Internal.hashLong(getExclusiveSizeBytes());
hash = (37 * hash) + STATE_FIELD_NUMBER;
hash = (53 * hash) + state_;
if (getReferencingDatabasesCount() > 0) {
@@ -1401,6 +1618,12 @@ public int hashCode() {
hash = (37 * hash) + BACKUP_SCHEDULES_FIELD_NUMBER;
hash = (53 * hash) + getBackupSchedulesList().hashCode();
}
+ hash = (37 * hash) + INCREMENTAL_BACKUP_CHAIN_ID_FIELD_NUMBER;
+ hash = (53 * hash) + getIncrementalBackupChainId().hashCode();
+ if (hasOldestVersionTime()) {
+ hash = (37 * hash) + OLDEST_VERSION_TIME_FIELD_NUMBER;
+ hash = (53 * hash) + getOldestVersionTime().hashCode();
+ }
hash = (29 * hash) + getUnknownFields().hashCode();
memoizedHashCode = hash;
return hash;
@@ -1547,6 +1770,7 @@ private void maybeForceBuilderInitialization() {
getEncryptionInfoFieldBuilder();
getEncryptionInformationFieldBuilder();
getMaxExpireTimeFieldBuilder();
+ getOldestVersionTimeFieldBuilder();
}
}
@@ -1572,6 +1796,8 @@ public Builder clear() {
createTimeBuilder_ = null;
}
sizeBytes_ = 0L;
+ freeableSizeBytes_ = 0L;
+ exclusiveSizeBytes_ = 0L;
state_ = 0;
referencingDatabases_ = com.google.protobuf.LazyStringArrayList.emptyList();
encryptionInfo_ = null;
@@ -1585,7 +1811,7 @@ public Builder clear() {
encryptionInformation_ = null;
encryptionInformationBuilder_.clear();
}
- bitField0_ = (bitField0_ & ~0x00000200);
+ bitField0_ = (bitField0_ & ~0x00000800);
databaseDialect_ = 0;
referencingBackups_ = com.google.protobuf.LazyStringArrayList.emptyList();
maxExpireTime_ = null;
@@ -1594,6 +1820,12 @@ public Builder clear() {
maxExpireTimeBuilder_ = null;
}
backupSchedules_ = com.google.protobuf.LazyStringArrayList.emptyList();
+ incrementalBackupChainId_ = "";
+ oldestVersionTime_ = null;
+ if (oldestVersionTimeBuilder_ != null) {
+ oldestVersionTimeBuilder_.dispose();
+ oldestVersionTimeBuilder_ = null;
+ }
return this;
}
@@ -1631,9 +1863,9 @@ public com.google.spanner.admin.database.v1.Backup buildPartial() {
private void buildPartialRepeatedFields(com.google.spanner.admin.database.v1.Backup result) {
if (encryptionInformationBuilder_ == null) {
- if (((bitField0_ & 0x00000200) != 0)) {
+ if (((bitField0_ & 0x00000800) != 0)) {
encryptionInformation_ = java.util.Collections.unmodifiableList(encryptionInformation_);
- bitField0_ = (bitField0_ & ~0x00000200);
+ bitField0_ = (bitField0_ & ~0x00000800);
}
result.encryptionInformation_ = encryptionInformation_;
} else {
@@ -1667,33 +1899,49 @@ private void buildPartial0(com.google.spanner.admin.database.v1.Backup result) {
result.sizeBytes_ = sizeBytes_;
}
if (((from_bitField0_ & 0x00000040) != 0)) {
- result.state_ = state_;
+ result.freeableSizeBytes_ = freeableSizeBytes_;
}
if (((from_bitField0_ & 0x00000080) != 0)) {
+ result.exclusiveSizeBytes_ = exclusiveSizeBytes_;
+ }
+ if (((from_bitField0_ & 0x00000100) != 0)) {
+ result.state_ = state_;
+ }
+ if (((from_bitField0_ & 0x00000200) != 0)) {
referencingDatabases_.makeImmutable();
result.referencingDatabases_ = referencingDatabases_;
}
- if (((from_bitField0_ & 0x00000100) != 0)) {
+ if (((from_bitField0_ & 0x00000400) != 0)) {
result.encryptionInfo_ =
encryptionInfoBuilder_ == null ? encryptionInfo_ : encryptionInfoBuilder_.build();
to_bitField0_ |= 0x00000008;
}
- if (((from_bitField0_ & 0x00000400) != 0)) {
+ if (((from_bitField0_ & 0x00001000) != 0)) {
result.databaseDialect_ = databaseDialect_;
}
- if (((from_bitField0_ & 0x00000800) != 0)) {
+ if (((from_bitField0_ & 0x00002000) != 0)) {
referencingBackups_.makeImmutable();
result.referencingBackups_ = referencingBackups_;
}
- if (((from_bitField0_ & 0x00001000) != 0)) {
+ if (((from_bitField0_ & 0x00004000) != 0)) {
result.maxExpireTime_ =
maxExpireTimeBuilder_ == null ? maxExpireTime_ : maxExpireTimeBuilder_.build();
to_bitField0_ |= 0x00000010;
}
- if (((from_bitField0_ & 0x00002000) != 0)) {
+ if (((from_bitField0_ & 0x00008000) != 0)) {
backupSchedules_.makeImmutable();
result.backupSchedules_ = backupSchedules_;
}
+ if (((from_bitField0_ & 0x00010000) != 0)) {
+ result.incrementalBackupChainId_ = incrementalBackupChainId_;
+ }
+ if (((from_bitField0_ & 0x00020000) != 0)) {
+ result.oldestVersionTime_ =
+ oldestVersionTimeBuilder_ == null
+ ? oldestVersionTime_
+ : oldestVersionTimeBuilder_.build();
+ to_bitField0_ |= 0x00000020;
+ }
result.bitField0_ |= to_bitField0_;
}
@@ -1764,13 +2012,19 @@ public Builder mergeFrom(com.google.spanner.admin.database.v1.Backup other) {
if (other.getSizeBytes() != 0L) {
setSizeBytes(other.getSizeBytes());
}
+ if (other.getFreeableSizeBytes() != 0L) {
+ setFreeableSizeBytes(other.getFreeableSizeBytes());
+ }
+ if (other.getExclusiveSizeBytes() != 0L) {
+ setExclusiveSizeBytes(other.getExclusiveSizeBytes());
+ }
if (other.state_ != 0) {
setStateValue(other.getStateValue());
}
if (!other.referencingDatabases_.isEmpty()) {
if (referencingDatabases_.isEmpty()) {
referencingDatabases_ = other.referencingDatabases_;
- bitField0_ |= 0x00000080;
+ bitField0_ |= 0x00000200;
} else {
ensureReferencingDatabasesIsMutable();
referencingDatabases_.addAll(other.referencingDatabases_);
@@ -1784,7 +2038,7 @@ public Builder mergeFrom(com.google.spanner.admin.database.v1.Backup other) {
if (!other.encryptionInformation_.isEmpty()) {
if (encryptionInformation_.isEmpty()) {
encryptionInformation_ = other.encryptionInformation_;
- bitField0_ = (bitField0_ & ~0x00000200);
+ bitField0_ = (bitField0_ & ~0x00000800);
} else {
ensureEncryptionInformationIsMutable();
encryptionInformation_.addAll(other.encryptionInformation_);
@@ -1797,7 +2051,7 @@ public Builder mergeFrom(com.google.spanner.admin.database.v1.Backup other) {
encryptionInformationBuilder_.dispose();
encryptionInformationBuilder_ = null;
encryptionInformation_ = other.encryptionInformation_;
- bitField0_ = (bitField0_ & ~0x00000200);
+ bitField0_ = (bitField0_ & ~0x00000800);
encryptionInformationBuilder_ =
com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders
? getEncryptionInformationFieldBuilder()
@@ -1813,7 +2067,7 @@ public Builder mergeFrom(com.google.spanner.admin.database.v1.Backup other) {
if (!other.referencingBackups_.isEmpty()) {
if (referencingBackups_.isEmpty()) {
referencingBackups_ = other.referencingBackups_;
- bitField0_ |= 0x00000800;
+ bitField0_ |= 0x00002000;
} else {
ensureReferencingBackupsIsMutable();
referencingBackups_.addAll(other.referencingBackups_);
@@ -1826,13 +2080,21 @@ public Builder mergeFrom(com.google.spanner.admin.database.v1.Backup other) {
if (!other.backupSchedules_.isEmpty()) {
if (backupSchedules_.isEmpty()) {
backupSchedules_ = other.backupSchedules_;
- bitField0_ |= 0x00002000;
+ bitField0_ |= 0x00008000;
} else {
ensureBackupSchedulesIsMutable();
backupSchedules_.addAll(other.backupSchedules_);
}
onChanged();
}
+ if (!other.getIncrementalBackupChainId().isEmpty()) {
+ incrementalBackupChainId_ = other.incrementalBackupChainId_;
+ bitField0_ |= 0x00010000;
+ onChanged();
+ }
+ if (other.hasOldestVersionTime()) {
+ mergeOldestVersionTime(other.getOldestVersionTime());
+ }
this.mergeUnknownFields(other.getUnknownFields());
onChanged();
return this;
@@ -1892,7 +2154,7 @@ public Builder mergeFrom(
case 48:
{
state_ = input.readEnum();
- bitField0_ |= 0x00000040;
+ bitField0_ |= 0x00000100;
break;
} // case 48
case 58:
@@ -1905,7 +2167,7 @@ public Builder mergeFrom(
case 66:
{
input.readMessage(getEncryptionInfoFieldBuilder().getBuilder(), extensionRegistry);
- bitField0_ |= 0x00000100;
+ bitField0_ |= 0x00000400;
break;
} // case 66
case 74:
@@ -1917,7 +2179,7 @@ public Builder mergeFrom(
case 80:
{
databaseDialect_ = input.readEnum();
- bitField0_ |= 0x00000400;
+ bitField0_ |= 0x00001000;
break;
} // case 80
case 90:
@@ -1930,7 +2192,7 @@ public Builder mergeFrom(
case 98:
{
input.readMessage(getMaxExpireTimeFieldBuilder().getBuilder(), extensionRegistry);
- bitField0_ |= 0x00001000;
+ bitField0_ |= 0x00004000;
break;
} // case 98
case 106:
@@ -1954,6 +2216,31 @@ public Builder mergeFrom(
backupSchedules_.add(s);
break;
} // case 114
+ case 120:
+ {
+ freeableSizeBytes_ = input.readInt64();
+ bitField0_ |= 0x00000040;
+ break;
+ } // case 120
+ case 128:
+ {
+ exclusiveSizeBytes_ = input.readInt64();
+ bitField0_ |= 0x00000080;
+ break;
+ } // case 128
+ case 138:
+ {
+ incrementalBackupChainId_ = input.readStringRequireUtf8();
+ bitField0_ |= 0x00010000;
+ break;
+ } // case 138
+ case 146:
+ {
+ input.readMessage(
+ getOldestVersionTimeFieldBuilder().getBuilder(), extensionRegistry);
+ bitField0_ |= 0x00020000;
+ break;
+ } // case 146
default:
{
if (!super.parseUnknownField(input, extensionRegistry, tag)) {
@@ -3014,6 +3301,148 @@ public Builder clearSizeBytes() {
return this;
}
+ private long freeableSizeBytes_;
+ /**
+ *
+ *
+ *
+ * Output only. The number of bytes that will be freed by deleting this
+ * backup. This value will be zero if, for example, this backup is part of an
+ * incremental backup chain and younger backups in the chain require that we
+ * keep its data. For backups not in an incremental backup chain, this is
+ * always the size of the backup. This value may change if backups on the same
+ * chain get created, deleted or expired.
+ *
+ *
+ * int64 freeable_size_bytes = 15 [(.google.api.field_behavior) = OUTPUT_ONLY];
+ *
+ * @return The freeableSizeBytes.
+ */
+ @java.lang.Override
+ public long getFreeableSizeBytes() {
+ return freeableSizeBytes_;
+ }
+ /**
+ *
+ *
+ *
+ * Output only. The number of bytes that will be freed by deleting this
+ * backup. This value will be zero if, for example, this backup is part of an
+ * incremental backup chain and younger backups in the chain require that we
+ * keep its data. For backups not in an incremental backup chain, this is
+ * always the size of the backup. This value may change if backups on the same
+ * chain get created, deleted or expired.
+ *
+ *
+ * int64 freeable_size_bytes = 15 [(.google.api.field_behavior) = OUTPUT_ONLY];
+ *
+ * @param value The freeableSizeBytes to set.
+ * @return This builder for chaining.
+ */
+ public Builder setFreeableSizeBytes(long value) {
+
+ freeableSizeBytes_ = value;
+ bitField0_ |= 0x00000040;
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ *
+ *
+ * Output only. The number of bytes that will be freed by deleting this
+ * backup. This value will be zero if, for example, this backup is part of an
+ * incremental backup chain and younger backups in the chain require that we
+ * keep its data. For backups not in an incremental backup chain, this is
+ * always the size of the backup. This value may change if backups on the same
+ * chain get created, deleted or expired.
+ *
+ *
+ * int64 freeable_size_bytes = 15 [(.google.api.field_behavior) = OUTPUT_ONLY];
+ *
+ * @return This builder for chaining.
+ */
+ public Builder clearFreeableSizeBytes() {
+ bitField0_ = (bitField0_ & ~0x00000040);
+ freeableSizeBytes_ = 0L;
+ onChanged();
+ return this;
+ }
+
+ private long exclusiveSizeBytes_;
+ /**
+ *
+ *
+ *
+ * Output only. For a backup in an incremental backup chain, this is the
+ * storage space needed to keep the data that has changed since the previous
+ * backup. For all other backups, this is always the size of the backup. This
+ * value may change if backups on the same chain get deleted or expired.
+ *
+ * This field can be used to calculate the total storage space used by a set
+ * of backups. For example, the total space used by all backups of a database
+ * can be computed by summing up this field.
+ *
+ *
+ * int64 exclusive_size_bytes = 16 [(.google.api.field_behavior) = OUTPUT_ONLY];
+ *
+ * @return The exclusiveSizeBytes.
+ */
+ @java.lang.Override
+ public long getExclusiveSizeBytes() {
+ return exclusiveSizeBytes_;
+ }
+ /**
+ *
+ *
+ *
+ * Output only. For a backup in an incremental backup chain, this is the
+ * storage space needed to keep the data that has changed since the previous
+ * backup. For all other backups, this is always the size of the backup. This
+ * value may change if backups on the same chain get deleted or expired.
+ *
+ * This field can be used to calculate the total storage space used by a set
+ * of backups. For example, the total space used by all backups of a database
+ * can be computed by summing up this field.
+ *
+ *
+ * int64 exclusive_size_bytes = 16 [(.google.api.field_behavior) = OUTPUT_ONLY];
+ *
+ * @param value The exclusiveSizeBytes to set.
+ * @return This builder for chaining.
+ */
+ public Builder setExclusiveSizeBytes(long value) {
+
+ exclusiveSizeBytes_ = value;
+ bitField0_ |= 0x00000080;
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ *
+ *
+ * Output only. For a backup in an incremental backup chain, this is the
+ * storage space needed to keep the data that has changed since the previous
+ * backup. For all other backups, this is always the size of the backup. This
+ * value may change if backups on the same chain get deleted or expired.
+ *
+ * This field can be used to calculate the total storage space used by a set
+ * of backups. For example, the total space used by all backups of a database
+ * can be computed by summing up this field.
+ *
+ *
+ * int64 exclusive_size_bytes = 16 [(.google.api.field_behavior) = OUTPUT_ONLY];
+ *
+ * @return This builder for chaining.
+ */
+ public Builder clearExclusiveSizeBytes() {
+ bitField0_ = (bitField0_ & ~0x00000080);
+ exclusiveSizeBytes_ = 0L;
+ onChanged();
+ return this;
+ }
+
private int state_ = 0;
/**
*
@@ -3048,7 +3477,7 @@ public int getStateValue() {
*/
public Builder setStateValue(int value) {
state_ = value;
- bitField0_ |= 0x00000040;
+ bitField0_ |= 0x00000100;
onChanged();
return this;
}
@@ -3091,7 +3520,7 @@ public Builder setState(com.google.spanner.admin.database.v1.Backup.State value)
if (value == null) {
throw new NullPointerException();
}
- bitField0_ |= 0x00000040;
+ bitField0_ |= 0x00000100;
state_ = value.getNumber();
onChanged();
return this;
@@ -3110,7 +3539,7 @@ public Builder setState(com.google.spanner.admin.database.v1.Backup.State value)
* @return This builder for chaining.
*/
public Builder clearState() {
- bitField0_ = (bitField0_ & ~0x00000040);
+ bitField0_ = (bitField0_ & ~0x00000100);
state_ = 0;
onChanged();
return this;
@@ -3123,7 +3552,7 @@ private void ensureReferencingDatabasesIsMutable() {
if (!referencingDatabases_.isModifiable()) {
referencingDatabases_ = new com.google.protobuf.LazyStringArrayList(referencingDatabases_);
}
- bitField0_ |= 0x00000080;
+ bitField0_ |= 0x00000200;
}
/**
*
@@ -3243,7 +3672,7 @@ public Builder setReferencingDatabases(int index, java.lang.String value) {
}
ensureReferencingDatabasesIsMutable();
referencingDatabases_.set(index, value);
- bitField0_ |= 0x00000080;
+ bitField0_ |= 0x00000200;
onChanged();
return this;
}
@@ -3273,7 +3702,7 @@ public Builder addReferencingDatabases(java.lang.String value) {
}
ensureReferencingDatabasesIsMutable();
referencingDatabases_.add(value);
- bitField0_ |= 0x00000080;
+ bitField0_ |= 0x00000200;
onChanged();
return this;
}
@@ -3300,7 +3729,7 @@ public Builder addReferencingDatabases(java.lang.String value) {
public Builder addAllReferencingDatabases(java.lang.Iterable values) {
ensureReferencingDatabasesIsMutable();
com.google.protobuf.AbstractMessageLite.Builder.addAll(values, referencingDatabases_);
- bitField0_ |= 0x00000080;
+ bitField0_ |= 0x00000200;
onChanged();
return this;
}
@@ -3325,7 +3754,7 @@ public Builder addAllReferencingDatabases(java.lang.Iterable v
*/
public Builder clearReferencingDatabases() {
referencingDatabases_ = com.google.protobuf.LazyStringArrayList.emptyList();
- bitField0_ = (bitField0_ & ~0x00000080);
+ bitField0_ = (bitField0_ & ~0x00000200);
;
onChanged();
return this;
@@ -3357,7 +3786,7 @@ public Builder addReferencingDatabasesBytes(com.google.protobuf.ByteString value
checkByteStringIsUtf8(value);
ensureReferencingDatabasesIsMutable();
referencingDatabases_.add(value);
- bitField0_ |= 0x00000080;
+ bitField0_ |= 0x00000200;
onChanged();
return this;
}
@@ -3382,7 +3811,7 @@ public Builder addReferencingDatabasesBytes(com.google.protobuf.ByteString value
* @return Whether the encryptionInfo field is set.
*/
public boolean hasEncryptionInfo() {
- return ((bitField0_ & 0x00000100) != 0);
+ return ((bitField0_ & 0x00000400) != 0);
}
/**
*
@@ -3426,7 +3855,7 @@ public Builder setEncryptionInfo(com.google.spanner.admin.database.v1.Encryption
} else {
encryptionInfoBuilder_.setMessage(value);
}
- bitField0_ |= 0x00000100;
+ bitField0_ |= 0x00000400;
onChanged();
return this;
}
@@ -3448,7 +3877,7 @@ public Builder setEncryptionInfo(
} else {
encryptionInfoBuilder_.setMessage(builderForValue.build());
}
- bitField0_ |= 0x00000100;
+ bitField0_ |= 0x00000400;
onChanged();
return this;
}
@@ -3465,7 +3894,7 @@ public Builder setEncryptionInfo(
*/
public Builder mergeEncryptionInfo(com.google.spanner.admin.database.v1.EncryptionInfo value) {
if (encryptionInfoBuilder_ == null) {
- if (((bitField0_ & 0x00000100) != 0)
+ if (((bitField0_ & 0x00000400) != 0)
&& encryptionInfo_ != null
&& encryptionInfo_
!= com.google.spanner.admin.database.v1.EncryptionInfo.getDefaultInstance()) {
@@ -3477,7 +3906,7 @@ public Builder mergeEncryptionInfo(com.google.spanner.admin.database.v1.Encrypti
encryptionInfoBuilder_.mergeFrom(value);
}
if (encryptionInfo_ != null) {
- bitField0_ |= 0x00000100;
+ bitField0_ |= 0x00000400;
onChanged();
}
return this;
@@ -3494,7 +3923,7 @@ public Builder mergeEncryptionInfo(com.google.spanner.admin.database.v1.Encrypti
*
*/
public Builder clearEncryptionInfo() {
- bitField0_ = (bitField0_ & ~0x00000100);
+ bitField0_ = (bitField0_ & ~0x00000400);
encryptionInfo_ = null;
if (encryptionInfoBuilder_ != null) {
encryptionInfoBuilder_.dispose();
@@ -3515,7 +3944,7 @@ public Builder clearEncryptionInfo() {
*
*/
public com.google.spanner.admin.database.v1.EncryptionInfo.Builder getEncryptionInfoBuilder() {
- bitField0_ |= 0x00000100;
+ bitField0_ |= 0x00000400;
onChanged();
return getEncryptionInfoFieldBuilder().getBuilder();
}
@@ -3572,11 +4001,11 @@ public com.google.spanner.admin.database.v1.EncryptionInfo.Builder getEncryption
encryptionInformation_ = java.util.Collections.emptyList();
private void ensureEncryptionInformationIsMutable() {
- if (!((bitField0_ & 0x00000200) != 0)) {
+ if (!((bitField0_ & 0x00000800) != 0)) {
encryptionInformation_ =
new java.util.ArrayList(
encryptionInformation_);
- bitField0_ |= 0x00000200;
+ bitField0_ |= 0x00000800;
}
}
@@ -3873,7 +4302,7 @@ public Builder addAllEncryptionInformation(
public Builder clearEncryptionInformation() {
if (encryptionInformationBuilder_ == null) {
encryptionInformation_ = java.util.Collections.emptyList();
- bitField0_ = (bitField0_ & ~0x00000200);
+ bitField0_ = (bitField0_ & ~0x00000800);
onChanged();
} else {
encryptionInformationBuilder_.clear();
@@ -4050,7 +4479,7 @@ public Builder removeEncryptionInformation(int index) {
com.google.spanner.admin.database.v1.EncryptionInfo.Builder,
com.google.spanner.admin.database.v1.EncryptionInfoOrBuilder>(
encryptionInformation_,
- ((bitField0_ & 0x00000200) != 0),
+ ((bitField0_ & 0x00000800) != 0),
getParentForChildren(),
isClean());
encryptionInformation_ = null;
@@ -4092,7 +4521,7 @@ public int getDatabaseDialectValue() {
*/
public Builder setDatabaseDialectValue(int value) {
databaseDialect_ = value;
- bitField0_ |= 0x00000400;
+ bitField0_ |= 0x00001000;
onChanged();
return this;
}
@@ -4135,7 +4564,7 @@ public Builder setDatabaseDialect(com.google.spanner.admin.database.v1.DatabaseD
if (value == null) {
throw new NullPointerException();
}
- bitField0_ |= 0x00000400;
+ bitField0_ |= 0x00001000;
databaseDialect_ = value.getNumber();
onChanged();
return this;
@@ -4154,7 +4583,7 @@ public Builder setDatabaseDialect(com.google.spanner.admin.database.v1.DatabaseD
* @return This builder for chaining.
*/
public Builder clearDatabaseDialect() {
- bitField0_ = (bitField0_ & ~0x00000400);
+ bitField0_ = (bitField0_ & ~0x00001000);
databaseDialect_ = 0;
onChanged();
return this;
@@ -4167,7 +4596,7 @@ private void ensureReferencingBackupsIsMutable() {
if (!referencingBackups_.isModifiable()) {
referencingBackups_ = new com.google.protobuf.LazyStringArrayList(referencingBackups_);
}
- bitField0_ |= 0x00000800;
+ bitField0_ |= 0x00002000;
}
/**
*
@@ -4287,7 +4716,7 @@ public Builder setReferencingBackups(int index, java.lang.String value) {
}
ensureReferencingBackupsIsMutable();
referencingBackups_.set(index, value);
- bitField0_ |= 0x00000800;
+ bitField0_ |= 0x00002000;
onChanged();
return this;
}
@@ -4317,7 +4746,7 @@ public Builder addReferencingBackups(java.lang.String value) {
}
ensureReferencingBackupsIsMutable();
referencingBackups_.add(value);
- bitField0_ |= 0x00000800;
+ bitField0_ |= 0x00002000;
onChanged();
return this;
}
@@ -4344,7 +4773,7 @@ public Builder addReferencingBackups(java.lang.String value) {
public Builder addAllReferencingBackups(java.lang.Iterable values) {
ensureReferencingBackupsIsMutable();
com.google.protobuf.AbstractMessageLite.Builder.addAll(values, referencingBackups_);
- bitField0_ |= 0x00000800;
+ bitField0_ |= 0x00002000;
onChanged();
return this;
}
@@ -4369,7 +4798,7 @@ public Builder addAllReferencingBackups(java.lang.Iterable val
*/
public Builder clearReferencingBackups() {
referencingBackups_ = com.google.protobuf.LazyStringArrayList.emptyList();
- bitField0_ = (bitField0_ & ~0x00000800);
+ bitField0_ = (bitField0_ & ~0x00002000);
;
onChanged();
return this;
@@ -4401,7 +4830,7 @@ public Builder addReferencingBackupsBytes(com.google.protobuf.ByteString value)
checkByteStringIsUtf8(value);
ensureReferencingBackupsIsMutable();
referencingBackups_.add(value);
- bitField0_ |= 0x00000800;
+ bitField0_ |= 0x00002000;
onChanged();
return this;
}
@@ -4430,7 +4859,7 @@ public Builder addReferencingBackupsBytes(com.google.protobuf.ByteString value)
* @return Whether the maxExpireTime field is set.
*/
public boolean hasMaxExpireTime() {
- return ((bitField0_ & 0x00001000) != 0);
+ return ((bitField0_ & 0x00004000) != 0);
}
/**
*
@@ -4482,7 +4911,7 @@ public Builder setMaxExpireTime(com.google.protobuf.Timestamp value) {
} else {
maxExpireTimeBuilder_.setMessage(value);
}
- bitField0_ |= 0x00001000;
+ bitField0_ |= 0x00004000;
onChanged();
return this;
}
@@ -4507,7 +4936,7 @@ public Builder setMaxExpireTime(com.google.protobuf.Timestamp.Builder builderFor
} else {
maxExpireTimeBuilder_.setMessage(builderForValue.build());
}
- bitField0_ |= 0x00001000;
+ bitField0_ |= 0x00004000;
onChanged();
return this;
}
@@ -4528,7 +4957,7 @@ public Builder setMaxExpireTime(com.google.protobuf.Timestamp.Builder builderFor
*/
public Builder mergeMaxExpireTime(com.google.protobuf.Timestamp value) {
if (maxExpireTimeBuilder_ == null) {
- if (((bitField0_ & 0x00001000) != 0)
+ if (((bitField0_ & 0x00004000) != 0)
&& maxExpireTime_ != null
&& maxExpireTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
getMaxExpireTimeBuilder().mergeFrom(value);
@@ -4539,7 +4968,7 @@ public Builder mergeMaxExpireTime(com.google.protobuf.Timestamp value) {
maxExpireTimeBuilder_.mergeFrom(value);
}
if (maxExpireTime_ != null) {
- bitField0_ |= 0x00001000;
+ bitField0_ |= 0x00004000;
onChanged();
}
return this;
@@ -4560,7 +4989,7 @@ public Builder mergeMaxExpireTime(com.google.protobuf.Timestamp value) {
*
*/
public Builder clearMaxExpireTime() {
- bitField0_ = (bitField0_ & ~0x00001000);
+ bitField0_ = (bitField0_ & ~0x00004000);
maxExpireTime_ = null;
if (maxExpireTimeBuilder_ != null) {
maxExpireTimeBuilder_.dispose();
@@ -4585,7 +5014,7 @@ public Builder clearMaxExpireTime() {
*
*/
public com.google.protobuf.Timestamp.Builder getMaxExpireTimeBuilder() {
- bitField0_ |= 0x00001000;
+ bitField0_ |= 0x00004000;
onChanged();
return getMaxExpireTimeFieldBuilder().getBuilder();
}
@@ -4652,7 +5081,7 @@ private void ensureBackupSchedulesIsMutable() {
if (!backupSchedules_.isModifiable()) {
backupSchedules_ = new com.google.protobuf.LazyStringArrayList(backupSchedules_);
}
- bitField0_ |= 0x00002000;
+ bitField0_ |= 0x00008000;
}
/**
*
@@ -4777,7 +5206,7 @@ public Builder setBackupSchedules(int index, java.lang.String value) {
}
ensureBackupSchedulesIsMutable();
backupSchedules_.set(index, value);
- bitField0_ |= 0x00002000;
+ bitField0_ |= 0x00008000;
onChanged();
return this;
}
@@ -4808,7 +5237,7 @@ public Builder addBackupSchedules(java.lang.String value) {
}
ensureBackupSchedulesIsMutable();
backupSchedules_.add(value);
- bitField0_ |= 0x00002000;
+ bitField0_ |= 0x00008000;
onChanged();
return this;
}
@@ -4836,7 +5265,7 @@ public Builder addBackupSchedules(java.lang.String value) {
public Builder addAllBackupSchedules(java.lang.Iterable values) {
ensureBackupSchedulesIsMutable();
com.google.protobuf.AbstractMessageLite.Builder.addAll(values, backupSchedules_);
- bitField0_ |= 0x00002000;
+ bitField0_ |= 0x00008000;
onChanged();
return this;
}
@@ -4862,7 +5291,7 @@ public Builder addAllBackupSchedules(java.lang.Iterable values
*/
public Builder clearBackupSchedules() {
backupSchedules_ = com.google.protobuf.LazyStringArrayList.emptyList();
- bitField0_ = (bitField0_ & ~0x00002000);
+ bitField0_ = (bitField0_ & ~0x00008000);
;
onChanged();
return this;
@@ -4895,10 +5324,389 @@ public Builder addBackupSchedulesBytes(com.google.protobuf.ByteString value) {
checkByteStringIsUtf8(value);
ensureBackupSchedulesIsMutable();
backupSchedules_.add(value);
- bitField0_ |= 0x00002000;
+ bitField0_ |= 0x00008000;
+ onChanged();
+ return this;
+ }
+
+ private java.lang.Object incrementalBackupChainId_ = "";
+ /**
+ *
+ *
+ *
+ * Output only. Populated only for backups in an incremental backup chain.
+ * Backups share the same chain id if and only if they belong to the same
+ * incremental backup chain. Use this field to determine which backups are
+ * part of the same incremental backup chain. The ordering of backups in the
+ * chain can be determined by ordering the backup `version_time`.
+ *
+ *
+ * string incremental_backup_chain_id = 17 [(.google.api.field_behavior) = OUTPUT_ONLY];
+ *
+ *
+ * @return The incrementalBackupChainId.
+ */
+ public java.lang.String getIncrementalBackupChainId() {
+ java.lang.Object ref = incrementalBackupChainId_;
+ if (!(ref instanceof java.lang.String)) {
+ com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ incrementalBackupChainId_ = s;
+ return s;
+ } else {
+ return (java.lang.String) ref;
+ }
+ }
+ /**
+ *
+ *
+ *
+ * Output only. Populated only for backups in an incremental backup chain.
+ * Backups share the same chain id if and only if they belong to the same
+ * incremental backup chain. Use this field to determine which backups are
+ * part of the same incremental backup chain. The ordering of backups in the
+ * chain can be determined by ordering the backup `version_time`.
+ *
+ *
+ * string incremental_backup_chain_id = 17 [(.google.api.field_behavior) = OUTPUT_ONLY];
+ *
+ *
+ * @return The bytes for incrementalBackupChainId.
+ */
+ public com.google.protobuf.ByteString getIncrementalBackupChainIdBytes() {
+ java.lang.Object ref = incrementalBackupChainId_;
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+ incrementalBackupChainId_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+ /**
+ *
+ *
+ *
+ * Output only. Populated only for backups in an incremental backup chain.
+ * Backups share the same chain id if and only if they belong to the same
+ * incremental backup chain. Use this field to determine which backups are
+ * part of the same incremental backup chain. The ordering of backups in the
+ * chain can be determined by ordering the backup `version_time`.
+ *
+ *
+ * string incremental_backup_chain_id = 17 [(.google.api.field_behavior) = OUTPUT_ONLY];
+ *
+ *
+ * @param value The incrementalBackupChainId to set.
+ * @return This builder for chaining.
+ */
+ public Builder setIncrementalBackupChainId(java.lang.String value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ incrementalBackupChainId_ = value;
+ bitField0_ |= 0x00010000;
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ *
+ *
+ * Output only. Populated only for backups in an incremental backup chain.
+ * Backups share the same chain id if and only if they belong to the same
+ * incremental backup chain. Use this field to determine which backups are
+ * part of the same incremental backup chain. The ordering of backups in the
+ * chain can be determined by ordering the backup `version_time`.
+ *
+ *
+ * string incremental_backup_chain_id = 17 [(.google.api.field_behavior) = OUTPUT_ONLY];
+ *
+ *
+ * @return This builder for chaining.
+ */
+ public Builder clearIncrementalBackupChainId() {
+ incrementalBackupChainId_ = getDefaultInstance().getIncrementalBackupChainId();
+ bitField0_ = (bitField0_ & ~0x00010000);
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ *
+ *
+ * Output only. Populated only for backups in an incremental backup chain.
+ * Backups share the same chain id if and only if they belong to the same
+ * incremental backup chain. Use this field to determine which backups are
+ * part of the same incremental backup chain. The ordering of backups in the
+ * chain can be determined by ordering the backup `version_time`.
+ *
+ *
+ * string incremental_backup_chain_id = 17 [(.google.api.field_behavior) = OUTPUT_ONLY];
+ *
+ *
+ * @param value The bytes for incrementalBackupChainId to set.
+ * @return This builder for chaining.
+ */
+ public Builder setIncrementalBackupChainIdBytes(com.google.protobuf.ByteString value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ checkByteStringIsUtf8(value);
+ incrementalBackupChainId_ = value;
+ bitField0_ |= 0x00010000;
+ onChanged();
+ return this;
+ }
+
+ private com.google.protobuf.Timestamp oldestVersionTime_;
+ private com.google.protobuf.SingleFieldBuilderV3<
+ com.google.protobuf.Timestamp,
+ com.google.protobuf.Timestamp.Builder,
+ com.google.protobuf.TimestampOrBuilder>
+ oldestVersionTimeBuilder_;
+ /**
+ *
+ *
+ *
+ * Output only. Data deleted at a time older than this is guaranteed not to be
+ * retained in order to support this backup. For a backup in an incremental
+ * backup chain, this is the version time of the oldest backup that exists or
+ * ever existed in the chain. For all other backups, this is the version time
+ * of the backup. This field can be used to understand what data is being
+ * retained by the backup system.
+ *
+ *
+ *
+ * .google.protobuf.Timestamp oldest_version_time = 18 [(.google.api.field_behavior) = OUTPUT_ONLY];
+ *
+ *
+ * @return Whether the oldestVersionTime field is set.
+ */
+ public boolean hasOldestVersionTime() {
+ return ((bitField0_ & 0x00020000) != 0);
+ }
+ /**
+ *
+ *
+ *
+ * Output only. Data deleted at a time older than this is guaranteed not to be
+ * retained in order to support this backup. For a backup in an incremental
+ * backup chain, this is the version time of the oldest backup that exists or
+ * ever existed in the chain. For all other backups, this is the version time
+ * of the backup. This field can be used to understand what data is being
+ * retained by the backup system.
+ *
+ *
+ *
+ * .google.protobuf.Timestamp oldest_version_time = 18 [(.google.api.field_behavior) = OUTPUT_ONLY];
+ *
+ *
+ * @return The oldestVersionTime.
+ */
+ public com.google.protobuf.Timestamp getOldestVersionTime() {
+ if (oldestVersionTimeBuilder_ == null) {
+ return oldestVersionTime_ == null
+ ? com.google.protobuf.Timestamp.getDefaultInstance()
+ : oldestVersionTime_;
+ } else {
+ return oldestVersionTimeBuilder_.getMessage();
+ }
+ }
+ /**
+ *
+ *
+ *
+ * Output only. Data deleted at a time older than this is guaranteed not to be
+ * retained in order to support this backup. For a backup in an incremental
+ * backup chain, this is the version time of the oldest backup that exists or
+ * ever existed in the chain. For all other backups, this is the version time
+ * of the backup. This field can be used to understand what data is being
+ * retained by the backup system.
+ *
+ *
+ *
+ * .google.protobuf.Timestamp oldest_version_time = 18 [(.google.api.field_behavior) = OUTPUT_ONLY];
+ *
+ */
+ public Builder setOldestVersionTime(com.google.protobuf.Timestamp value) {
+ if (oldestVersionTimeBuilder_ == null) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ oldestVersionTime_ = value;
+ } else {
+ oldestVersionTimeBuilder_.setMessage(value);
+ }
+ bitField0_ |= 0x00020000;
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ *
+ *
+ * Output only. Data deleted at a time older than this is guaranteed not to be
+ * retained in order to support this backup. For a backup in an incremental
+ * backup chain, this is the version time of the oldest backup that exists or
+ * ever existed in the chain. For all other backups, this is the version time
+ * of the backup. This field can be used to understand what data is being
+ * retained by the backup system.
+ *
+ *
+ *
+ * .google.protobuf.Timestamp oldest_version_time = 18 [(.google.api.field_behavior) = OUTPUT_ONLY];
+ *
+ */
+ public Builder setOldestVersionTime(com.google.protobuf.Timestamp.Builder builderForValue) {
+ if (oldestVersionTimeBuilder_ == null) {
+ oldestVersionTime_ = builderForValue.build();
+ } else {
+ oldestVersionTimeBuilder_.setMessage(builderForValue.build());
+ }
+ bitField0_ |= 0x00020000;
onChanged();
return this;
}
+ /**
+ *
+ *
+ *
+ * Output only. Data deleted at a time older than this is guaranteed not to be
+ * retained in order to support this backup. For a backup in an incremental
+ * backup chain, this is the version time of the oldest backup that exists or
+ * ever existed in the chain. For all other backups, this is the version time
+ * of the backup. This field can be used to understand what data is being
+ * retained by the backup system.
+ *
+ *
+ *
+ * .google.protobuf.Timestamp oldest_version_time = 18 [(.google.api.field_behavior) = OUTPUT_ONLY];
+ *
+ */
+ public Builder mergeOldestVersionTime(com.google.protobuf.Timestamp value) {
+ if (oldestVersionTimeBuilder_ == null) {
+ if (((bitField0_ & 0x00020000) != 0)
+ && oldestVersionTime_ != null
+ && oldestVersionTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
+ getOldestVersionTimeBuilder().mergeFrom(value);
+ } else {
+ oldestVersionTime_ = value;
+ }
+ } else {
+ oldestVersionTimeBuilder_.mergeFrom(value);
+ }
+ if (oldestVersionTime_ != null) {
+ bitField0_ |= 0x00020000;
+ onChanged();
+ }
+ return this;
+ }
+ /**
+ *
+ *
+ *
+ * Output only. Data deleted at a time older than this is guaranteed not to be
+ * retained in order to support this backup. For a backup in an incremental
+ * backup chain, this is the version time of the oldest backup that exists or
+ * ever existed in the chain. For all other backups, this is the version time
+ * of the backup. This field can be used to understand what data is being
+ * retained by the backup system.
+ *
+ *
+ *
+ * .google.protobuf.Timestamp oldest_version_time = 18 [(.google.api.field_behavior) = OUTPUT_ONLY];
+ *
+ */
+ public Builder clearOldestVersionTime() {
+ bitField0_ = (bitField0_ & ~0x00020000);
+ oldestVersionTime_ = null;
+ if (oldestVersionTimeBuilder_ != null) {
+ oldestVersionTimeBuilder_.dispose();
+ oldestVersionTimeBuilder_ = null;
+ }
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ *
+ *
+ * Output only. Data deleted at a time older than this is guaranteed not to be
+ * retained in order to support this backup. For a backup in an incremental
+ * backup chain, this is the version time of the oldest backup that exists or
+ * ever existed in the chain. For all other backups, this is the version time
+ * of the backup. This field can be used to understand what data is being
+ * retained by the backup system.
+ *
+ *
+ *
+ * .google.protobuf.Timestamp oldest_version_time = 18 [(.google.api.field_behavior) = OUTPUT_ONLY];
+ *
+ */
+ public com.google.protobuf.Timestamp.Builder getOldestVersionTimeBuilder() {
+ bitField0_ |= 0x00020000;
+ onChanged();
+ return getOldestVersionTimeFieldBuilder().getBuilder();
+ }
+ /**
+ *
+ *
+ *
+ * Output only. Data deleted at a time older than this is guaranteed not to be
+ * retained in order to support this backup. For a backup in an incremental
+ * backup chain, this is the version time of the oldest backup that exists or
+ * ever existed in the chain. For all other backups, this is the version time
+ * of the backup. This field can be used to understand what data is being
+ * retained by the backup system.
+ *
+ *
+ *
+ * .google.protobuf.Timestamp oldest_version_time = 18 [(.google.api.field_behavior) = OUTPUT_ONLY];
+ *
+ */
+ public com.google.protobuf.TimestampOrBuilder getOldestVersionTimeOrBuilder() {
+ if (oldestVersionTimeBuilder_ != null) {
+ return oldestVersionTimeBuilder_.getMessageOrBuilder();
+ } else {
+ return oldestVersionTime_ == null
+ ? com.google.protobuf.Timestamp.getDefaultInstance()
+ : oldestVersionTime_;
+ }
+ }
+ /**
+ *
+ *
+ *
+ * Output only. Data deleted at a time older than this is guaranteed not to be
+ * retained in order to support this backup. For a backup in an incremental
+ * backup chain, this is the version time of the oldest backup that exists or
+ * ever existed in the chain. For all other backups, this is the version time
+ * of the backup. This field can be used to understand what data is being
+ * retained by the backup system.
+ *
+ *
+ *
+ * .google.protobuf.Timestamp oldest_version_time = 18 [(.google.api.field_behavior) = OUTPUT_ONLY];
+ *
+ */
+ private com.google.protobuf.SingleFieldBuilderV3<
+ com.google.protobuf.Timestamp,
+ com.google.protobuf.Timestamp.Builder,
+ com.google.protobuf.TimestampOrBuilder>
+ getOldestVersionTimeFieldBuilder() {
+ if (oldestVersionTimeBuilder_ == null) {
+ oldestVersionTimeBuilder_ =
+ new com.google.protobuf.SingleFieldBuilderV3<
+ com.google.protobuf.Timestamp,
+ com.google.protobuf.Timestamp.Builder,
+ com.google.protobuf.TimestampOrBuilder>(
+ getOldestVersionTime(), getParentForChildren(), isClean());
+ oldestVersionTime_ = null;
+ }
+ return oldestVersionTimeBuilder_;
+ }
@java.lang.Override
public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
diff --git a/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/BackupOrBuilder.java b/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/BackupOrBuilder.java
index ac1eec6a02e..a89a0fdc2f8 100644
--- a/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/BackupOrBuilder.java
+++ b/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/BackupOrBuilder.java
@@ -269,6 +269,44 @@ public interface BackupOrBuilder
*/
long getSizeBytes();
+ /**
+ *
+ *
+ *
+ * Output only. The number of bytes that will be freed by deleting this
+ * backup. This value will be zero if, for example, this backup is part of an
+ * incremental backup chain and younger backups in the chain require that we
+ * keep its data. For backups not in an incremental backup chain, this is
+ * always the size of the backup. This value may change if backups on the same
+ * chain get created, deleted or expired.
+ *
+ *
+ * int64 freeable_size_bytes = 15 [(.google.api.field_behavior) = OUTPUT_ONLY];
+ *
+ * @return The freeableSizeBytes.
+ */
+ long getFreeableSizeBytes();
+
+ /**
+ *
+ *
+ *
+ * Output only. For a backup in an incremental backup chain, this is the
+ * storage space needed to keep the data that has changed since the previous
+ * backup. For all other backups, this is always the size of the backup. This
+ * value may change if backups on the same chain get deleted or expired.
+ *
+ * This field can be used to calculate the total storage space used by a set
+ * of backups. For example, the total space used by all backups of a database
+ * can be computed by summing up this field.
+ *
+ *
+ * int64 exclusive_size_bytes = 16 [(.google.api.field_behavior) = OUTPUT_ONLY];
+ *
+ * @return The exclusiveSizeBytes.
+ */
+ long getExclusiveSizeBytes();
+
/**
*
*
@@ -762,4 +800,95 @@ com.google.spanner.admin.database.v1.EncryptionInfoOrBuilder getEncryptionInform
* @return The bytes of the backupSchedules at the given index.
*/
com.google.protobuf.ByteString getBackupSchedulesBytes(int index);
+
+ /**
+ *
+ *
+ *
+ * Output only. Populated only for backups in an incremental backup chain.
+ * Backups share the same chain id if and only if they belong to the same
+ * incremental backup chain. Use this field to determine which backups are
+ * part of the same incremental backup chain. The ordering of backups in the
+ * chain can be determined by ordering the backup `version_time`.
+ *
+ *
+ * string incremental_backup_chain_id = 17 [(.google.api.field_behavior) = OUTPUT_ONLY];
+ *
+ *
+ * @return The incrementalBackupChainId.
+ */
+ java.lang.String getIncrementalBackupChainId();
+ /**
+ *
+ *
+ *
+ * Output only. Populated only for backups in an incremental backup chain.
+ * Backups share the same chain id if and only if they belong to the same
+ * incremental backup chain. Use this field to determine which backups are
+ * part of the same incremental backup chain. The ordering of backups in the
+ * chain can be determined by ordering the backup `version_time`.
+ *
+ *
+ * string incremental_backup_chain_id = 17 [(.google.api.field_behavior) = OUTPUT_ONLY];
+ *
+ *
+ * @return The bytes for incrementalBackupChainId.
+ */
+ com.google.protobuf.ByteString getIncrementalBackupChainIdBytes();
+
+ /**
+ *
+ *
+ *
+ * Output only. Data deleted at a time older than this is guaranteed not to be
+ * retained in order to support this backup. For a backup in an incremental
+ * backup chain, this is the version time of the oldest backup that exists or
+ * ever existed in the chain. For all other backups, this is the version time
+ * of the backup. This field can be used to understand what data is being
+ * retained by the backup system.
+ *
+ *
+ *
+ * .google.protobuf.Timestamp oldest_version_time = 18 [(.google.api.field_behavior) = OUTPUT_ONLY];
+ *
+ *
+ * @return Whether the oldestVersionTime field is set.
+ */
+ boolean hasOldestVersionTime();
+ /**
+ *
+ *
+ *
+ * Output only. Data deleted at a time older than this is guaranteed not to be
+ * retained in order to support this backup. For a backup in an incremental
+ * backup chain, this is the version time of the oldest backup that exists or
+ * ever existed in the chain. For all other backups, this is the version time
+ * of the backup. This field can be used to understand what data is being
+ * retained by the backup system.
+ *
+ *
+ *
+ * .google.protobuf.Timestamp oldest_version_time = 18 [(.google.api.field_behavior) = OUTPUT_ONLY];
+ *
+ *
+ * @return The oldestVersionTime.
+ */
+ com.google.protobuf.Timestamp getOldestVersionTime();
+ /**
+ *
+ *
+ *
+ * Output only. Data deleted at a time older than this is guaranteed not to be
+ * retained in order to support this backup. For a backup in an incremental
+ * backup chain, this is the version time of the oldest backup that exists or
+ * ever existed in the chain. For all other backups, this is the version time
+ * of the backup. This field can be used to understand what data is being
+ * retained by the backup system.
+ *
+ *
+ *
+ * .google.protobuf.Timestamp oldest_version_time = 18 [(.google.api.field_behavior) = OUTPUT_ONLY];
+ *
+ */
+ com.google.protobuf.TimestampOrBuilder getOldestVersionTimeOrBuilder();
}
diff --git a/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/BackupProto.java b/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/BackupProto.java
index 4f00e1d577c..d2f0f5c38e3 100644
--- a/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/BackupProto.java
+++ b/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/BackupProto.java
@@ -92,6 +92,10 @@ public static void registerAllExtensions(com.google.protobuf.ExtensionRegistry r
internal_static_google_spanner_admin_database_v1_FullBackupSpec_descriptor;
static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
internal_static_google_spanner_admin_database_v1_FullBackupSpec_fieldAccessorTable;
+ static final com.google.protobuf.Descriptors.Descriptor
+ internal_static_google_spanner_admin_database_v1_IncrementalBackupSpec_descriptor;
+ static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+ internal_static_google_spanner_admin_database_v1_IncrementalBackupSpec_fieldAccessorTable;
public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
return descriptor;
@@ -108,111 +112,116 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
+ "g/operations.proto\032 google/protobuf/fiel"
+ "d_mask.proto\032\037google/protobuf/timestamp."
+ "proto\032-google/spanner/admin/database/v1/"
- + "common.proto\"\271\007\n\006Backup\0226\n\010database\030\002 \001("
+ + "common.proto\"\346\010\n\006Backup\0226\n\010database\030\002 \001("
+ "\tB$\372A!\n\037spanner.googleapis.com/Database\022"
+ "0\n\014version_time\030\t \001(\0132\032.google.protobuf."
+ "Timestamp\022/\n\013expire_time\030\003 \001(\0132\032.google."
+ "protobuf.Timestamp\022\014\n\004name\030\001 \001(\t\0224\n\013crea"
+ "te_time\030\004 \001(\0132\032.google.protobuf.Timestam"
- + "pB\003\340A\003\022\027\n\nsize_bytes\030\005 \001(\003B\003\340A\003\022B\n\005state"
- + "\030\006 \001(\0162..google.spanner.admin.database.v"
- + "1.Backup.StateB\003\340A\003\022F\n\025referencing_datab"
- + "ases\030\007 \003(\tB\'\340A\003\372A!\n\037spanner.googleapis.c"
- + "om/Database\022N\n\017encryption_info\030\010 \001(\01320.g"
- + "oogle.spanner.admin.database.v1.Encrypti"
- + "onInfoB\003\340A\003\022U\n\026encryption_information\030\r "
- + "\003(\01320.google.spanner.admin.database.v1.E"
- + "ncryptionInfoB\003\340A\003\022P\n\020database_dialect\030\n"
- + " \001(\01621.google.spanner.admin.database.v1."
- + "DatabaseDialectB\003\340A\003\022B\n\023referencing_back"
- + "ups\030\013 \003(\tB%\340A\003\372A\037\n\035spanner.googleapis.co"
- + "m/Backup\0228\n\017max_expire_time\030\014 \001(\0132\032.goog"
- + "le.protobuf.TimestampB\003\340A\003\022\035\n\020backup_sch"
- + "edules\030\016 \003(\tB\003\340A\003\"7\n\005State\022\025\n\021STATE_UNSP"
- + "ECIFIED\020\000\022\014\n\010CREATING\020\001\022\t\n\005READY\020\002:\\\352AY\n"
- + "\035spanner.googleapis.com/Backup\0228projects"
- + "/{project}/instances/{instance}/backups/"
- + "{backup}\"\205\002\n\023CreateBackupRequest\0227\n\006pare"
- + "nt\030\001 \001(\tB\'\340A\002\372A!\n\037spanner.googleapis.com"
- + "/Instance\022\026\n\tbackup_id\030\002 \001(\tB\003\340A\002\022=\n\006bac"
- + "kup\030\003 \001(\0132(.google.spanner.admin.databas"
- + "e.v1.BackupB\003\340A\002\022^\n\021encryption_config\030\004 "
- + "\001(\0132>.google.spanner.admin.database.v1.C"
- + "reateBackupEncryptionConfigB\003\340A\001\"\370\001\n\024Cre"
- + "ateBackupMetadata\0220\n\004name\030\001 \001(\tB\"\372A\037\n\035sp"
- + "anner.googleapis.com/Backup\0226\n\010database\030"
- + "\002 \001(\tB$\372A!\n\037spanner.googleapis.com/Datab"
- + "ase\022E\n\010progress\030\003 \001(\01323.google.spanner.a"
- + "dmin.database.v1.OperationProgress\022/\n\013ca"
- + "ncel_time\030\004 \001(\0132\032.google.protobuf.Timest"
- + "amp\"\266\002\n\021CopyBackupRequest\0227\n\006parent\030\001 \001("
+ + "pB\003\340A\003\022\027\n\nsize_bytes\030\005 \001(\003B\003\340A\003\022 \n\023freea"
+ + "ble_size_bytes\030\017 \001(\003B\003\340A\003\022!\n\024exclusive_s"
+ + "ize_bytes\030\020 \001(\003B\003\340A\003\022B\n\005state\030\006 \001(\0162..go"
+ + "ogle.spanner.admin.database.v1.Backup.St"
+ + "ateB\003\340A\003\022F\n\025referencing_databases\030\007 \003(\tB"
+ + "\'\340A\003\372A!\n\037spanner.googleapis.com/Database"
+ + "\022N\n\017encryption_info\030\010 \001(\01320.google.spann"
+ + "er.admin.database.v1.EncryptionInfoB\003\340A\003"
+ + "\022U\n\026encryption_information\030\r \003(\01320.googl"
+ + "e.spanner.admin.database.v1.EncryptionIn"
+ + "foB\003\340A\003\022P\n\020database_dialect\030\n \001(\01621.goog"
+ + "le.spanner.admin.database.v1.DatabaseDia"
+ + "lectB\003\340A\003\022B\n\023referencing_backups\030\013 \003(\tB%"
+ + "\340A\003\372A\037\n\035spanner.googleapis.com/Backup\0228\n"
+ + "\017max_expire_time\030\014 \001(\0132\032.google.protobuf"
+ + ".TimestampB\003\340A\003\022\035\n\020backup_schedules\030\016 \003("
+ + "\tB\003\340A\003\022(\n\033incremental_backup_chain_id\030\021 "
+ + "\001(\tB\003\340A\003\022<\n\023oldest_version_time\030\022 \001(\0132\032."
+ + "google.protobuf.TimestampB\003\340A\003\"7\n\005State\022"
+ + "\025\n\021STATE_UNSPECIFIED\020\000\022\014\n\010CREATING\020\001\022\t\n\005"
+ + "READY\020\002:\\\352AY\n\035spanner.googleapis.com/Bac"
+ + "kup\0228projects/{project}/instances/{insta"
+ + "nce}/backups/{backup}\"\205\002\n\023CreateBackupRe"
+ + "quest\0227\n\006parent\030\001 \001(\tB\'\340A\002\372A!\n\037spanner.g"
+ + "oogleapis.com/Instance\022\026\n\tbackup_id\030\002 \001("
+ + "\tB\003\340A\002\022=\n\006backup\030\003 \001(\0132(.google.spanner."
+ + "admin.database.v1.BackupB\003\340A\002\022^\n\021encrypt"
+ + "ion_config\030\004 \001(\0132>.google.spanner.admin."
+ + "database.v1.CreateBackupEncryptionConfig"
+ + "B\003\340A\001\"\370\001\n\024CreateBackupMetadata\0220\n\004name\030\001"
+ + " \001(\tB\"\372A\037\n\035spanner.googleapis.com/Backup"
+ + "\0226\n\010database\030\002 \001(\tB$\372A!\n\037spanner.googlea"
+ + "pis.com/Database\022E\n\010progress\030\003 \001(\01323.goo"
+ + "gle.spanner.admin.database.v1.OperationP"
+ + "rogress\022/\n\013cancel_time\030\004 \001(\0132\032.google.pr"
+ + "otobuf.Timestamp\"\266\002\n\021CopyBackupRequest\0227"
+ + "\n\006parent\030\001 \001(\tB\'\340A\002\372A!\n\037spanner.googleap"
+ + "is.com/Instance\022\026\n\tbackup_id\030\002 \001(\tB\003\340A\002\022"
+ + "<\n\rsource_backup\030\003 \001(\tB%\340A\002\372A\037\n\035spanner."
+ + "googleapis.com/Backup\0224\n\013expire_time\030\004 \001"
+ + "(\0132\032.google.protobuf.TimestampB\003\340A\002\022\\\n\021e"
+ + "ncryption_config\030\005 \001(\0132<.google.spanner."
+ + "admin.database.v1.CopyBackupEncryptionCo"
+ + "nfigB\003\340A\001\"\371\001\n\022CopyBackupMetadata\0220\n\004name"
+ + "\030\001 \001(\tB\"\372A\037\n\035spanner.googleapis.com/Back"
+ + "up\0229\n\rsource_backup\030\002 \001(\tB\"\372A\037\n\035spanner."
+ + "googleapis.com/Backup\022E\n\010progress\030\003 \001(\0132"
+ + "3.google.spanner.admin.database.v1.Opera"
+ + "tionProgress\022/\n\013cancel_time\030\004 \001(\0132\032.goog"
+ + "le.protobuf.Timestamp\"\212\001\n\023UpdateBackupRe"
+ + "quest\022=\n\006backup\030\001 \001(\0132(.google.spanner.a"
+ + "dmin.database.v1.BackupB\003\340A\002\0224\n\013update_m"
+ + "ask\030\002 \001(\0132\032.google.protobuf.FieldMaskB\003\340"
+ + "A\002\"G\n\020GetBackupRequest\0223\n\004name\030\001 \001(\tB%\340A"
+ + "\002\372A\037\n\035spanner.googleapis.com/Backup\"J\n\023D"
+ + "eleteBackupRequest\0223\n\004name\030\001 \001(\tB%\340A\002\372A\037"
+ + "\n\035spanner.googleapis.com/Backup\"\204\001\n\022List"
+ + "BackupsRequest\0227\n\006parent\030\001 \001(\tB\'\340A\002\372A!\n\037"
+ + "spanner.googleapis.com/Instance\022\016\n\006filte"
+ + "r\030\002 \001(\t\022\021\n\tpage_size\030\003 \001(\005\022\022\n\npage_token"
+ + "\030\004 \001(\t\"i\n\023ListBackupsResponse\0229\n\007backups"
+ + "\030\001 \003(\0132(.google.spanner.admin.database.v"
+ + "1.Backup\022\027\n\017next_page_token\030\002 \001(\t\"\215\001\n\033Li"
+ + "stBackupOperationsRequest\0227\n\006parent\030\001 \001("
+ "\tB\'\340A\002\372A!\n\037spanner.googleapis.com/Instan"
- + "ce\022\026\n\tbackup_id\030\002 \001(\tB\003\340A\002\022<\n\rsource_bac"
- + "kup\030\003 \001(\tB%\340A\002\372A\037\n\035spanner.googleapis.co"
- + "m/Backup\0224\n\013expire_time\030\004 \001(\0132\032.google.p"
- + "rotobuf.TimestampB\003\340A\002\022\\\n\021encryption_con"
- + "fig\030\005 \001(\0132<.google.spanner.admin.databas"
- + "e.v1.CopyBackupEncryptionConfigB\003\340A\001\"\371\001\n"
- + "\022CopyBackupMetadata\0220\n\004name\030\001 \001(\tB\"\372A\037\n\035"
- + "spanner.googleapis.com/Backup\0229\n\rsource_"
- + "backup\030\002 \001(\tB\"\372A\037\n\035spanner.googleapis.co"
- + "m/Backup\022E\n\010progress\030\003 \001(\01323.google.span"
- + "ner.admin.database.v1.OperationProgress\022"
- + "/\n\013cancel_time\030\004 \001(\0132\032.google.protobuf.T"
- + "imestamp\"\212\001\n\023UpdateBackupRequest\022=\n\006back"
- + "up\030\001 \001(\0132(.google.spanner.admin.database"
- + ".v1.BackupB\003\340A\002\0224\n\013update_mask\030\002 \001(\0132\032.g"
- + "oogle.protobuf.FieldMaskB\003\340A\002\"G\n\020GetBack"
- + "upRequest\0223\n\004name\030\001 \001(\tB%\340A\002\372A\037\n\035spanner"
- + ".googleapis.com/Backup\"J\n\023DeleteBackupRe"
- + "quest\0223\n\004name\030\001 \001(\tB%\340A\002\372A\037\n\035spanner.goo"
- + "gleapis.com/Backup\"\204\001\n\022ListBackupsReques"
- + "t\0227\n\006parent\030\001 \001(\tB\'\340A\002\372A!\n\037spanner.googl"
- + "eapis.com/Instance\022\016\n\006filter\030\002 \001(\t\022\021\n\tpa"
- + "ge_size\030\003 \001(\005\022\022\n\npage_token\030\004 \001(\t\"i\n\023Lis"
- + "tBackupsResponse\0229\n\007backups\030\001 \003(\0132(.goog"
- + "le.spanner.admin.database.v1.Backup\022\027\n\017n"
- + "ext_page_token\030\002 \001(\t\"\215\001\n\033ListBackupOpera"
- + "tionsRequest\0227\n\006parent\030\001 \001(\tB\'\340A\002\372A!\n\037sp"
- + "anner.googleapis.com/Instance\022\016\n\006filter\030"
- + "\002 \001(\t\022\021\n\tpage_size\030\003 \001(\005\022\022\n\npage_token\030\004"
- + " \001(\t\"j\n\034ListBackupOperationsResponse\0221\n\n"
- + "operations\030\001 \003(\0132\035.google.longrunning.Op"
- + "eration\022\027\n\017next_page_token\030\002 \001(\t\"\342\001\n\nBac"
- + "kupInfo\0222\n\006backup\030\001 \001(\tB\"\372A\037\n\035spanner.go"
- + "ogleapis.com/Backup\0220\n\014version_time\030\004 \001("
- + "\0132\032.google.protobuf.Timestamp\022/\n\013create_"
- + "time\030\002 \001(\0132\032.google.protobuf.Timestamp\022="
- + "\n\017source_database\030\003 \001(\tB$\372A!\n\037spanner.go"
- + "ogleapis.com/Database\"\237\003\n\034CreateBackupEn"
- + "cryptionConfig\022k\n\017encryption_type\030\001 \001(\0162"
- + "M.google.spanner.admin.database.v1.Creat"
- + "eBackupEncryptionConfig.EncryptionTypeB\003"
- + "\340A\002\022?\n\014kms_key_name\030\002 \001(\tB)\340A\001\372A#\n!cloud"
- + "kms.googleapis.com/CryptoKey\022@\n\rkms_key_"
- + "names\030\003 \003(\tB)\340A\001\372A#\n!cloudkms.googleapis"
- + ".com/CryptoKey\"\216\001\n\016EncryptionType\022\037\n\033ENC"
- + "RYPTION_TYPE_UNSPECIFIED\020\000\022\033\n\027USE_DATABA"
- + "SE_ENCRYPTION\020\001\022\035\n\031GOOGLE_DEFAULT_ENCRYP"
- + "TION\020\002\022\037\n\033CUSTOMER_MANAGED_ENCRYPTION\020\003\""
- + "\253\003\n\032CopyBackupEncryptionConfig\022i\n\017encryp"
- + "tion_type\030\001 \001(\0162K.google.spanner.admin.d"
- + "atabase.v1.CopyBackupEncryptionConfig.En"
- + "cryptionTypeB\003\340A\002\022?\n\014kms_key_name\030\002 \001(\tB"
- + ")\340A\001\372A#\n!cloudkms.googleapis.com/CryptoK"
- + "ey\022@\n\rkms_key_names\030\003 \003(\tB)\340A\001\372A#\n!cloud"
- + "kms.googleapis.com/CryptoKey\"\236\001\n\016Encrypt"
- + "ionType\022\037\n\033ENCRYPTION_TYPE_UNSPECIFIED\020\000"
- + "\022+\n\'USE_CONFIG_DEFAULT_OR_BACKUP_ENCRYPT"
- + "ION\020\001\022\035\n\031GOOGLE_DEFAULT_ENCRYPTION\020\002\022\037\n\033"
- + "CUSTOMER_MANAGED_ENCRYPTION\020\003\"\020\n\016FullBac"
- + "kupSpecB\375\001\n$com.google.spanner.admin.dat"
- + "abase.v1B\013BackupProtoP\001ZFcloud.google.co"
- + "m/go/spanner/admin/database/apiv1/databa"
- + "sepb;databasepb\252\002&Google.Cloud.Spanner.A"
- + "dmin.Database.V1\312\002&Google\\Cloud\\Spanner\\"
- + "Admin\\Database\\V1\352\002+Google::Cloud::Spann"
- + "er::Admin::Database::V1b\006proto3"
+ + "ce\022\016\n\006filter\030\002 \001(\t\022\021\n\tpage_size\030\003 \001(\005\022\022\n"
+ + "\npage_token\030\004 \001(\t\"j\n\034ListBackupOperation"
+ + "sResponse\0221\n\noperations\030\001 \003(\0132\035.google.l"
+ + "ongrunning.Operation\022\027\n\017next_page_token\030"
+ + "\002 \001(\t\"\342\001\n\nBackupInfo\0222\n\006backup\030\001 \001(\tB\"\372A"
+ + "\037\n\035spanner.googleapis.com/Backup\0220\n\014vers"
+ + "ion_time\030\004 \001(\0132\032.google.protobuf.Timesta"
+ + "mp\022/\n\013create_time\030\002 \001(\0132\032.google.protobu"
+ + "f.Timestamp\022=\n\017source_database\030\003 \001(\tB$\372A"
+ + "!\n\037spanner.googleapis.com/Database\"\237\003\n\034C"
+ + "reateBackupEncryptionConfig\022k\n\017encryptio"
+ + "n_type\030\001 \001(\0162M.google.spanner.admin.data"
+ + "base.v1.CreateBackupEncryptionConfig.Enc"
+ + "ryptionTypeB\003\340A\002\022?\n\014kms_key_name\030\002 \001(\tB)"
+ + "\340A\001\372A#\n!cloudkms.googleapis.com/CryptoKe"
+ + "y\022@\n\rkms_key_names\030\003 \003(\tB)\340A\001\372A#\n!cloudk"
+ + "ms.googleapis.com/CryptoKey\"\216\001\n\016Encrypti"
+ + "onType\022\037\n\033ENCRYPTION_TYPE_UNSPECIFIED\020\000\022"
+ + "\033\n\027USE_DATABASE_ENCRYPTION\020\001\022\035\n\031GOOGLE_D"
+ + "EFAULT_ENCRYPTION\020\002\022\037\n\033CUSTOMER_MANAGED_"
+ + "ENCRYPTION\020\003\"\253\003\n\032CopyBackupEncryptionCon"
+ + "fig\022i\n\017encryption_type\030\001 \001(\0162K.google.sp"
+ + "anner.admin.database.v1.CopyBackupEncryp"
+ + "tionConfig.EncryptionTypeB\003\340A\002\022?\n\014kms_ke"
+ + "y_name\030\002 \001(\tB)\340A\001\372A#\n!cloudkms.googleapi"
+ + "s.com/CryptoKey\022@\n\rkms_key_names\030\003 \003(\tB)"
+ + "\340A\001\372A#\n!cloudkms.googleapis.com/CryptoKe"
+ + "y\"\236\001\n\016EncryptionType\022\037\n\033ENCRYPTION_TYPE_"
+ + "UNSPECIFIED\020\000\022+\n\'USE_CONFIG_DEFAULT_OR_B"
+ + "ACKUP_ENCRYPTION\020\001\022\035\n\031GOOGLE_DEFAULT_ENC"
+ + "RYPTION\020\002\022\037\n\033CUSTOMER_MANAGED_ENCRYPTION"
+ + "\020\003\"\020\n\016FullBackupSpec\"\027\n\025IncrementalBacku"
+ + "pSpecB\375\001\n$com.google.spanner.admin.datab"
+ + "ase.v1B\013BackupProtoP\001ZFcloud.google.com/"
+ + "go/spanner/admin/database/apiv1/database"
+ + "pb;databasepb\252\002&Google.Cloud.Spanner.Adm"
+ + "in.Database.V1\312\002&Google\\Cloud\\Spanner\\Ad"
+ + "min\\Database\\V1\352\002+Google::Cloud::Spanner"
+ + "::Admin::Database::V1b\006proto3"
};
descriptor =
com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
@@ -237,6 +246,8 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
"Name",
"CreateTime",
"SizeBytes",
+ "FreeableSizeBytes",
+ "ExclusiveSizeBytes",
"State",
"ReferencingDatabases",
"EncryptionInfo",
@@ -245,6 +256,8 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
"ReferencingBackups",
"MaxExpireTime",
"BackupSchedules",
+ "IncrementalBackupChainId",
+ "OldestVersionTime",
});
internal_static_google_spanner_admin_database_v1_CreateBackupRequest_descriptor =
getDescriptor().getMessageTypes().get(1);
@@ -364,6 +377,12 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_google_spanner_admin_database_v1_FullBackupSpec_descriptor,
new java.lang.String[] {});
+ internal_static_google_spanner_admin_database_v1_IncrementalBackupSpec_descriptor =
+ getDescriptor().getMessageTypes().get(16);
+ internal_static_google_spanner_admin_database_v1_IncrementalBackupSpec_fieldAccessorTable =
+ new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+ internal_static_google_spanner_admin_database_v1_IncrementalBackupSpec_descriptor,
+ new java.lang.String[] {});
com.google.protobuf.ExtensionRegistry registry =
com.google.protobuf.ExtensionRegistry.newInstance();
registry.add(com.google.api.FieldBehaviorProto.fieldBehavior);
diff --git a/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/BackupSchedule.java b/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/BackupSchedule.java
index eb5fc00ab96..c4f54956514 100644
--- a/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/BackupSchedule.java
+++ b/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/BackupSchedule.java
@@ -76,6 +76,7 @@ public enum BackupTypeSpecCase
com.google.protobuf.Internal.EnumLite,
com.google.protobuf.AbstractMessage.InternalOneOfEnum {
FULL_BACKUP_SPEC(7),
+ INCREMENTAL_BACKUP_SPEC(8),
BACKUPTYPESPEC_NOT_SET(0);
private final int value;
@@ -96,6 +97,8 @@ public static BackupTypeSpecCase forNumber(int value) {
switch (value) {
case 7:
return FULL_BACKUP_SPEC;
+ case 8:
+ return INCREMENTAL_BACKUP_SPEC;
case 0:
return BACKUPTYPESPEC_NOT_SET;
default:
@@ -414,6 +417,61 @@ public com.google.spanner.admin.database.v1.FullBackupSpecOrBuilder getFullBacku
return com.google.spanner.admin.database.v1.FullBackupSpec.getDefaultInstance();
}
+ public static final int INCREMENTAL_BACKUP_SPEC_FIELD_NUMBER = 8;
+ /**
+ *
+ *
+ *
+ * The schedule creates incremental backup chains.
+ *
+ *
+ * .google.spanner.admin.database.v1.IncrementalBackupSpec incremental_backup_spec = 8;
+ *
+ *
+ * @return Whether the incrementalBackupSpec field is set.
+ */
+ @java.lang.Override
+ public boolean hasIncrementalBackupSpec() {
+ return backupTypeSpecCase_ == 8;
+ }
+ /**
+ *
+ *
+ *
+ * The schedule creates incremental backup chains.
+ *
+ *
+ * .google.spanner.admin.database.v1.IncrementalBackupSpec incremental_backup_spec = 8;
+ *
+ *
+ * @return The incrementalBackupSpec.
+ */
+ @java.lang.Override
+ public com.google.spanner.admin.database.v1.IncrementalBackupSpec getIncrementalBackupSpec() {
+ if (backupTypeSpecCase_ == 8) {
+ return (com.google.spanner.admin.database.v1.IncrementalBackupSpec) backupTypeSpec_;
+ }
+ return com.google.spanner.admin.database.v1.IncrementalBackupSpec.getDefaultInstance();
+ }
+ /**
+ *
+ *
+ *
+ * The schedule creates incremental backup chains.
+ *
+ *
+ * .google.spanner.admin.database.v1.IncrementalBackupSpec incremental_backup_spec = 8;
+ *
+ */
+ @java.lang.Override
+ public com.google.spanner.admin.database.v1.IncrementalBackupSpecOrBuilder
+ getIncrementalBackupSpecOrBuilder() {
+ if (backupTypeSpecCase_ == 8) {
+ return (com.google.spanner.admin.database.v1.IncrementalBackupSpec) backupTypeSpec_;
+ }
+ return com.google.spanner.admin.database.v1.IncrementalBackupSpec.getDefaultInstance();
+ }
+
public static final int UPDATE_TIME_FIELD_NUMBER = 9;
private com.google.protobuf.Timestamp updateTime_;
/**
@@ -498,6 +556,10 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
if (backupTypeSpecCase_ == 7) {
output.writeMessage(7, (com.google.spanner.admin.database.v1.FullBackupSpec) backupTypeSpec_);
}
+ if (backupTypeSpecCase_ == 8) {
+ output.writeMessage(
+ 8, (com.google.spanner.admin.database.v1.IncrementalBackupSpec) backupTypeSpec_);
+ }
if (((bitField0_ & 0x00000008) != 0)) {
output.writeMessage(9, getUpdateTime());
}
@@ -527,6 +589,11 @@ public int getSerializedSize() {
com.google.protobuf.CodedOutputStream.computeMessageSize(
7, (com.google.spanner.admin.database.v1.FullBackupSpec) backupTypeSpec_);
}
+ if (backupTypeSpecCase_ == 8) {
+ size +=
+ com.google.protobuf.CodedOutputStream.computeMessageSize(
+ 8, (com.google.spanner.admin.database.v1.IncrementalBackupSpec) backupTypeSpec_);
+ }
if (((bitField0_ & 0x00000008) != 0)) {
size += com.google.protobuf.CodedOutputStream.computeMessageSize(9, getUpdateTime());
}
@@ -568,6 +635,9 @@ public boolean equals(final java.lang.Object obj) {
case 7:
if (!getFullBackupSpec().equals(other.getFullBackupSpec())) return false;
break;
+ case 8:
+ if (!getIncrementalBackupSpec().equals(other.getIncrementalBackupSpec())) return false;
+ break;
case 0:
default:
}
@@ -605,6 +675,10 @@ public int hashCode() {
hash = (37 * hash) + FULL_BACKUP_SPEC_FIELD_NUMBER;
hash = (53 * hash) + getFullBackupSpec().hashCode();
break;
+ case 8:
+ hash = (37 * hash) + INCREMENTAL_BACKUP_SPEC_FIELD_NUMBER;
+ hash = (53 * hash) + getIncrementalBackupSpec().hashCode();
+ break;
case 0:
default:
}
@@ -780,6 +854,9 @@ public Builder clear() {
if (fullBackupSpecBuilder_ != null) {
fullBackupSpecBuilder_.clear();
}
+ if (incrementalBackupSpecBuilder_ != null) {
+ incrementalBackupSpecBuilder_.clear();
+ }
updateTime_ = null;
if (updateTimeBuilder_ != null) {
updateTimeBuilder_.dispose();
@@ -844,7 +921,7 @@ private void buildPartial0(com.google.spanner.admin.database.v1.BackupSchedule r
encryptionConfigBuilder_ == null ? encryptionConfig_ : encryptionConfigBuilder_.build();
to_bitField0_ |= 0x00000004;
}
- if (((from_bitField0_ & 0x00000020) != 0)) {
+ if (((from_bitField0_ & 0x00000040) != 0)) {
result.updateTime_ = updateTimeBuilder_ == null ? updateTime_ : updateTimeBuilder_.build();
to_bitField0_ |= 0x00000008;
}
@@ -857,6 +934,9 @@ private void buildPartialOneofs(com.google.spanner.admin.database.v1.BackupSched
if (backupTypeSpecCase_ == 7 && fullBackupSpecBuilder_ != null) {
result.backupTypeSpec_ = fullBackupSpecBuilder_.build();
}
+ if (backupTypeSpecCase_ == 8 && incrementalBackupSpecBuilder_ != null) {
+ result.backupTypeSpec_ = incrementalBackupSpecBuilder_.build();
+ }
}
@java.lang.Override
@@ -928,6 +1008,11 @@ public Builder mergeFrom(com.google.spanner.admin.database.v1.BackupSchedule oth
mergeFullBackupSpec(other.getFullBackupSpec());
break;
}
+ case INCREMENTAL_BACKUP_SPEC:
+ {
+ mergeIncrementalBackupSpec(other.getIncrementalBackupSpec());
+ break;
+ }
case BACKUPTYPESPEC_NOT_SET:
{
break;
@@ -991,10 +1076,17 @@ public Builder mergeFrom(
backupTypeSpecCase_ = 7;
break;
} // case 58
+ case 66:
+ {
+ input.readMessage(
+ getIncrementalBackupSpecFieldBuilder().getBuilder(), extensionRegistry);
+ backupTypeSpecCase_ = 8;
+ break;
+ } // case 66
case 74:
{
input.readMessage(getUpdateTimeFieldBuilder().getBuilder(), extensionRegistry);
- bitField0_ |= 0x00000020;
+ bitField0_ |= 0x00000040;
break;
} // case 74
default:
@@ -2051,6 +2143,231 @@ public com.google.spanner.admin.database.v1.FullBackupSpec.Builder getFullBackup
return fullBackupSpecBuilder_;
}
+ private com.google.protobuf.SingleFieldBuilderV3<
+ com.google.spanner.admin.database.v1.IncrementalBackupSpec,
+ com.google.spanner.admin.database.v1.IncrementalBackupSpec.Builder,
+ com.google.spanner.admin.database.v1.IncrementalBackupSpecOrBuilder>
+ incrementalBackupSpecBuilder_;
+ /**
+ *
+ *
+ *
+ * The schedule creates incremental backup chains.
+ *
+ *
+ * .google.spanner.admin.database.v1.IncrementalBackupSpec incremental_backup_spec = 8;
+ *
+ *
+ * @return Whether the incrementalBackupSpec field is set.
+ */
+ @java.lang.Override
+ public boolean hasIncrementalBackupSpec() {
+ return backupTypeSpecCase_ == 8;
+ }
+ /**
+ *
+ *
+ *
+ * The schedule creates incremental backup chains.
+ *
+ *
+ * .google.spanner.admin.database.v1.IncrementalBackupSpec incremental_backup_spec = 8;
+ *
+ *
+ * @return The incrementalBackupSpec.
+ */
+ @java.lang.Override
+ public com.google.spanner.admin.database.v1.IncrementalBackupSpec getIncrementalBackupSpec() {
+ if (incrementalBackupSpecBuilder_ == null) {
+ if (backupTypeSpecCase_ == 8) {
+ return (com.google.spanner.admin.database.v1.IncrementalBackupSpec) backupTypeSpec_;
+ }
+ return com.google.spanner.admin.database.v1.IncrementalBackupSpec.getDefaultInstance();
+ } else {
+ if (backupTypeSpecCase_ == 8) {
+ return incrementalBackupSpecBuilder_.getMessage();
+ }
+ return com.google.spanner.admin.database.v1.IncrementalBackupSpec.getDefaultInstance();
+ }
+ }
+ /**
+ *
+ *
+ *
+ * The schedule creates incremental backup chains.
+ *
+ *
+ * .google.spanner.admin.database.v1.IncrementalBackupSpec incremental_backup_spec = 8;
+ *
+ */
+ public Builder setIncrementalBackupSpec(
+ com.google.spanner.admin.database.v1.IncrementalBackupSpec value) {
+ if (incrementalBackupSpecBuilder_ == null) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ backupTypeSpec_ = value;
+ onChanged();
+ } else {
+ incrementalBackupSpecBuilder_.setMessage(value);
+ }
+ backupTypeSpecCase_ = 8;
+ return this;
+ }
+ /**
+ *
+ *
+ *
+ * The schedule creates incremental backup chains.
+ *
+ *
+ * .google.spanner.admin.database.v1.IncrementalBackupSpec incremental_backup_spec = 8;
+ *
+ */
+ public Builder setIncrementalBackupSpec(
+ com.google.spanner.admin.database.v1.IncrementalBackupSpec.Builder builderForValue) {
+ if (incrementalBackupSpecBuilder_ == null) {
+ backupTypeSpec_ = builderForValue.build();
+ onChanged();
+ } else {
+ incrementalBackupSpecBuilder_.setMessage(builderForValue.build());
+ }
+ backupTypeSpecCase_ = 8;
+ return this;
+ }
+ /**
+ *
+ *
+ *
+ * The schedule creates incremental backup chains.
+ *
+ *
+ * .google.spanner.admin.database.v1.IncrementalBackupSpec incremental_backup_spec = 8;
+ *
+ */
+ public Builder mergeIncrementalBackupSpec(
+ com.google.spanner.admin.database.v1.IncrementalBackupSpec value) {
+ if (incrementalBackupSpecBuilder_ == null) {
+ if (backupTypeSpecCase_ == 8
+ && backupTypeSpec_
+ != com.google.spanner.admin.database.v1.IncrementalBackupSpec
+ .getDefaultInstance()) {
+ backupTypeSpec_ =
+ com.google.spanner.admin.database.v1.IncrementalBackupSpec.newBuilder(
+ (com.google.spanner.admin.database.v1.IncrementalBackupSpec) backupTypeSpec_)
+ .mergeFrom(value)
+ .buildPartial();
+ } else {
+ backupTypeSpec_ = value;
+ }
+ onChanged();
+ } else {
+ if (backupTypeSpecCase_ == 8) {
+ incrementalBackupSpecBuilder_.mergeFrom(value);
+ } else {
+ incrementalBackupSpecBuilder_.setMessage(value);
+ }
+ }
+ backupTypeSpecCase_ = 8;
+ return this;
+ }
+ /**
+ *
+ *
+ *
+ * The schedule creates incremental backup chains.
+ *
+ *
+ * .google.spanner.admin.database.v1.IncrementalBackupSpec incremental_backup_spec = 8;
+ *
+ */
+ public Builder clearIncrementalBackupSpec() {
+ if (incrementalBackupSpecBuilder_ == null) {
+ if (backupTypeSpecCase_ == 8) {
+ backupTypeSpecCase_ = 0;
+ backupTypeSpec_ = null;
+ onChanged();
+ }
+ } else {
+ if (backupTypeSpecCase_ == 8) {
+ backupTypeSpecCase_ = 0;
+ backupTypeSpec_ = null;
+ }
+ incrementalBackupSpecBuilder_.clear();
+ }
+ return this;
+ }
+ /**
+ *
+ *
+ *
+ * The schedule creates incremental backup chains.
+ *
+ *
+ * .google.spanner.admin.database.v1.IncrementalBackupSpec incremental_backup_spec = 8;
+ *
+ */
+ public com.google.spanner.admin.database.v1.IncrementalBackupSpec.Builder
+ getIncrementalBackupSpecBuilder() {
+ return getIncrementalBackupSpecFieldBuilder().getBuilder();
+ }
+ /**
+ *
+ *
+ *
+ * The schedule creates incremental backup chains.
+ *
+ *
+ * .google.spanner.admin.database.v1.IncrementalBackupSpec incremental_backup_spec = 8;
+ *
+ */
+ @java.lang.Override
+ public com.google.spanner.admin.database.v1.IncrementalBackupSpecOrBuilder
+ getIncrementalBackupSpecOrBuilder() {
+ if ((backupTypeSpecCase_ == 8) && (incrementalBackupSpecBuilder_ != null)) {
+ return incrementalBackupSpecBuilder_.getMessageOrBuilder();
+ } else {
+ if (backupTypeSpecCase_ == 8) {
+ return (com.google.spanner.admin.database.v1.IncrementalBackupSpec) backupTypeSpec_;
+ }
+ return com.google.spanner.admin.database.v1.IncrementalBackupSpec.getDefaultInstance();
+ }
+ }
+ /**
+ *
+ *
+ *
+ * The schedule creates incremental backup chains.
+ *
+ *
+ * .google.spanner.admin.database.v1.IncrementalBackupSpec incremental_backup_spec = 8;
+ *
+ */
+ private com.google.protobuf.SingleFieldBuilderV3<
+ com.google.spanner.admin.database.v1.IncrementalBackupSpec,
+ com.google.spanner.admin.database.v1.IncrementalBackupSpec.Builder,
+ com.google.spanner.admin.database.v1.IncrementalBackupSpecOrBuilder>
+ getIncrementalBackupSpecFieldBuilder() {
+ if (incrementalBackupSpecBuilder_ == null) {
+ if (!(backupTypeSpecCase_ == 8)) {
+ backupTypeSpec_ =
+ com.google.spanner.admin.database.v1.IncrementalBackupSpec.getDefaultInstance();
+ }
+ incrementalBackupSpecBuilder_ =
+ new com.google.protobuf.SingleFieldBuilderV3<
+ com.google.spanner.admin.database.v1.IncrementalBackupSpec,
+ com.google.spanner.admin.database.v1.IncrementalBackupSpec.Builder,
+ com.google.spanner.admin.database.v1.IncrementalBackupSpecOrBuilder>(
+ (com.google.spanner.admin.database.v1.IncrementalBackupSpec) backupTypeSpec_,
+ getParentForChildren(),
+ isClean());
+ backupTypeSpec_ = null;
+ }
+ backupTypeSpecCase_ = 8;
+ onChanged();
+ return incrementalBackupSpecBuilder_;
+ }
+
private com.google.protobuf.Timestamp updateTime_;
private com.google.protobuf.SingleFieldBuilderV3<
com.google.protobuf.Timestamp,
@@ -2073,7 +2390,7 @@ public com.google.spanner.admin.database.v1.FullBackupSpec.Builder getFullBackup
* @return Whether the updateTime field is set.
*/
public boolean hasUpdateTime() {
- return ((bitField0_ & 0x00000020) != 0);
+ return ((bitField0_ & 0x00000040) != 0);
}
/**
*
@@ -2121,7 +2438,7 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp value) {
} else {
updateTimeBuilder_.setMessage(value);
}
- bitField0_ |= 0x00000020;
+ bitField0_ |= 0x00000040;
onChanged();
return this;
}
@@ -2144,7 +2461,7 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp.Builder builderForVal
} else {
updateTimeBuilder_.setMessage(builderForValue.build());
}
- bitField0_ |= 0x00000020;
+ bitField0_ |= 0x00000040;
onChanged();
return this;
}
@@ -2163,7 +2480,7 @@ public Builder setUpdateTime(com.google.protobuf.Timestamp.Builder builderForVal
*/
public Builder mergeUpdateTime(com.google.protobuf.Timestamp value) {
if (updateTimeBuilder_ == null) {
- if (((bitField0_ & 0x00000020) != 0)
+ if (((bitField0_ & 0x00000040) != 0)
&& updateTime_ != null
&& updateTime_ != com.google.protobuf.Timestamp.getDefaultInstance()) {
getUpdateTimeBuilder().mergeFrom(value);
@@ -2174,7 +2491,7 @@ public Builder mergeUpdateTime(com.google.protobuf.Timestamp value) {
updateTimeBuilder_.mergeFrom(value);
}
if (updateTime_ != null) {
- bitField0_ |= 0x00000020;
+ bitField0_ |= 0x00000040;
onChanged();
}
return this;
@@ -2193,7 +2510,7 @@ public Builder mergeUpdateTime(com.google.protobuf.Timestamp value) {
*
*/
public Builder clearUpdateTime() {
- bitField0_ = (bitField0_ & ~0x00000020);
+ bitField0_ = (bitField0_ & ~0x00000040);
updateTime_ = null;
if (updateTimeBuilder_ != null) {
updateTimeBuilder_.dispose();
@@ -2216,7 +2533,7 @@ public Builder clearUpdateTime() {
*
*/
public com.google.protobuf.Timestamp.Builder getUpdateTimeBuilder() {
- bitField0_ |= 0x00000020;
+ bitField0_ |= 0x00000040;
onChanged();
return getUpdateTimeFieldBuilder().getBuilder();
}
diff --git a/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/BackupScheduleOrBuilder.java b/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/BackupScheduleOrBuilder.java
index cb1db14d217..128bc441f78 100644
--- a/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/BackupScheduleOrBuilder.java
+++ b/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/BackupScheduleOrBuilder.java
@@ -239,6 +239,45 @@ public interface BackupScheduleOrBuilder
*/
com.google.spanner.admin.database.v1.FullBackupSpecOrBuilder getFullBackupSpecOrBuilder();
+ /**
+ *
+ *
+ *
+ * The schedule creates incremental backup chains.
+ *
+ *
+ * .google.spanner.admin.database.v1.IncrementalBackupSpec incremental_backup_spec = 8;
+ *
+ *
+ * @return Whether the incrementalBackupSpec field is set.
+ */
+ boolean hasIncrementalBackupSpec();
+ /**
+ *
+ *
+ *
+ * The schedule creates incremental backup chains.
+ *
+ *
+ * .google.spanner.admin.database.v1.IncrementalBackupSpec incremental_backup_spec = 8;
+ *
+ *
+ * @return The incrementalBackupSpec.
+ */
+ com.google.spanner.admin.database.v1.IncrementalBackupSpec getIncrementalBackupSpec();
+ /**
+ *
+ *
+ *
+ * The schedule creates incremental backup chains.
+ *
+ *
+ * .google.spanner.admin.database.v1.IncrementalBackupSpec incremental_backup_spec = 8;
+ *
+ */
+ com.google.spanner.admin.database.v1.IncrementalBackupSpecOrBuilder
+ getIncrementalBackupSpecOrBuilder();
+
/**
*
*
diff --git a/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/BackupScheduleProto.java b/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/BackupScheduleProto.java
index d2227049ae4..9f018585afd 100644
--- a/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/BackupScheduleProto.java
+++ b/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/BackupScheduleProto.java
@@ -83,7 +83,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
+ "/v1/backup.proto\"i\n\022BackupScheduleSpec\022B"
+ "\n\tcron_spec\030\001 \001(\0132-.google.spanner.admin"
+ ".database.v1.CrontabSpecH\000B\017\n\rschedule_s"
- + "pec\"\310\004\n\016BackupSchedule\022\021\n\004name\030\001 \001(\tB\003\340A"
+ + "pec\"\244\005\n\016BackupSchedule\022\021\n\004name\030\001 \001(\tB\003\340A"
+ "\010\022G\n\004spec\030\006 \001(\01324.google.spanner.admin.d"
+ "atabase.v1.BackupScheduleSpecB\003\340A\001\022:\n\022re"
+ "tention_duration\030\003 \001(\0132\031.google.protobuf"
@@ -91,43 +91,46 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
+ "\0132>.google.spanner.admin.database.v1.Cre"
+ "ateBackupEncryptionConfigB\003\340A\001\022L\n\020full_b"
+ "ackup_spec\030\007 \001(\01320.google.spanner.admin."
- + "database.v1.FullBackupSpecH\000\0224\n\013update_t"
- + "ime\030\t \001(\0132\032.google.protobuf.TimestampB\003\340"
- + "A\003:\245\001\352A\241\001\n%spanner.googleapis.com/Backup"
- + "Schedule\022Wprojects/{project}/instances/{"
- + "instance}/databases/{database}/backupSch"
- + "edules/{schedule}*\017backupSchedules2\016back"
- + "upScheduleB\022\n\020backup_type_spec\"q\n\013Cronta"
- + "bSpec\022\021\n\004text\030\001 \001(\tB\003\340A\002\022\026\n\ttime_zone\030\002 "
- + "\001(\tB\003\340A\003\0227\n\017creation_window\030\003 \001(\0132\031.goog"
- + "le.protobuf.DurationB\003\340A\003\"\307\001\n\033CreateBack"
- + "upScheduleRequest\0227\n\006parent\030\001 \001(\tB\'\340A\002\372A"
- + "!\n\037spanner.googleapis.com/Database\022\037\n\022ba"
- + "ckup_schedule_id\030\002 \001(\tB\003\340A\002\022N\n\017backup_sc"
- + "hedule\030\003 \001(\01320.google.spanner.admin.data"
- + "base.v1.BackupScheduleB\003\340A\002\"W\n\030GetBackup"
- + "ScheduleRequest\022;\n\004name\030\001 \001(\tB-\340A\002\372A\'\n%s"
- + "panner.googleapis.com/BackupSchedule\"Z\n\033"
- + "DeleteBackupScheduleRequest\022;\n\004name\030\001 \001("
+ + "database.v1.FullBackupSpecH\000\022Z\n\027incremen"
+ + "tal_backup_spec\030\010 \001(\01327.google.spanner.a"
+ + "dmin.database.v1.IncrementalBackupSpecH\000"
+ + "\0224\n\013update_time\030\t \001(\0132\032.google.protobuf."
+ + "TimestampB\003\340A\003:\245\001\352A\241\001\n%spanner.googleapi"
+ + "s.com/BackupSchedule\022Wprojects/{project}"
+ + "/instances/{instance}/databases/{databas"
+ + "e}/backupSchedules/{schedule}*\017backupSch"
+ + "edules2\016backupScheduleB\022\n\020backup_type_sp"
+ + "ec\"q\n\013CrontabSpec\022\021\n\004text\030\001 \001(\tB\003\340A\002\022\026\n\t"
+ + "time_zone\030\002 \001(\tB\003\340A\003\0227\n\017creation_window\030"
+ + "\003 \001(\0132\031.google.protobuf.DurationB\003\340A\003\"\307\001"
+ + "\n\033CreateBackupScheduleRequest\0227\n\006parent\030"
+ + "\001 \001(\tB\'\340A\002\372A!\n\037spanner.googleapis.com/Da"
+ + "tabase\022\037\n\022backup_schedule_id\030\002 \001(\tB\003\340A\002\022"
+ + "N\n\017backup_schedule\030\003 \001(\01320.google.spanne"
+ + "r.admin.database.v1.BackupScheduleB\003\340A\002\""
+ + "W\n\030GetBackupScheduleRequest\022;\n\004name\030\001 \001("
+ "\tB-\340A\002\372A\'\n%spanner.googleapis.com/Backup"
- + "Schedule\"\206\001\n\032ListBackupSchedulesRequest\022"
- + "7\n\006parent\030\001 \001(\tB\'\340A\002\372A!\n\037spanner.googlea"
- + "pis.com/Database\022\026\n\tpage_size\030\002 \001(\005B\003\340A\001"
- + "\022\027\n\npage_token\030\004 \001(\tB\003\340A\001\"\202\001\n\033ListBackup"
- + "SchedulesResponse\022J\n\020backup_schedules\030\001 "
- + "\003(\01320.google.spanner.admin.database.v1.B"
- + "ackupSchedule\022\027\n\017next_page_token\030\002 \001(\t\"\243"
- + "\001\n\033UpdateBackupScheduleRequest\022N\n\017backup"
- + "_schedule\030\001 \001(\01320.google.spanner.admin.d"
- + "atabase.v1.BackupScheduleB\003\340A\002\0224\n\013update"
- + "_mask\030\002 \001(\0132\032.google.protobuf.FieldMaskB"
- + "\003\340A\002B\205\002\n$com.google.spanner.admin.databa"
- + "se.v1B\023BackupScheduleProtoP\001ZFcloud.goog"
- + "le.com/go/spanner/admin/database/apiv1/d"
- + "atabasepb;databasepb\252\002&Google.Cloud.Span"
- + "ner.Admin.Database.V1\312\002&Google\\Cloud\\Spa"
- + "nner\\Admin\\Database\\V1\352\002+Google::Cloud::"
- + "Spanner::Admin::Database::V1b\006proto3"
+ + "Schedule\"Z\n\033DeleteBackupScheduleRequest\022"
+ + ";\n\004name\030\001 \001(\tB-\340A\002\372A\'\n%spanner.googleapi"
+ + "s.com/BackupSchedule\"\206\001\n\032ListBackupSched"
+ + "ulesRequest\0227\n\006parent\030\001 \001(\tB\'\340A\002\372A!\n\037spa"
+ + "nner.googleapis.com/Database\022\026\n\tpage_siz"
+ + "e\030\002 \001(\005B\003\340A\001\022\027\n\npage_token\030\004 \001(\tB\003\340A\001\"\202\001"
+ + "\n\033ListBackupSchedulesResponse\022J\n\020backup_"
+ + "schedules\030\001 \003(\01320.google.spanner.admin.d"
+ + "atabase.v1.BackupSchedule\022\027\n\017next_page_t"
+ + "oken\030\002 \001(\t\"\243\001\n\033UpdateBackupScheduleReque"
+ + "st\022N\n\017backup_schedule\030\001 \001(\01320.google.spa"
+ + "nner.admin.database.v1.BackupScheduleB\003\340"
+ + "A\002\0224\n\013update_mask\030\002 \001(\0132\032.google.protobu"
+ + "f.FieldMaskB\003\340A\002B\205\002\n$com.google.spanner."
+ + "admin.database.v1B\023BackupScheduleProtoP\001"
+ + "ZFcloud.google.com/go/spanner/admin/data"
+ + "base/apiv1/databasepb;databasepb\252\002&Googl"
+ + "e.Cloud.Spanner.Admin.Database.V1\312\002&Goog"
+ + "le\\Cloud\\Spanner\\Admin\\Database\\V1\352\002+Goo"
+ + "gle::Cloud::Spanner::Admin::Database::V1"
+ + "b\006proto3"
};
descriptor =
com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
@@ -159,6 +162,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
"RetentionDuration",
"EncryptionConfig",
"FullBackupSpec",
+ "IncrementalBackupSpec",
"UpdateTime",
"BackupTypeSpec",
});
diff --git a/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/IncrementalBackupSpec.java b/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/IncrementalBackupSpec.java
new file mode 100644
index 00000000000..36a605c8aad
--- /dev/null
+++ b/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/IncrementalBackupSpec.java
@@ -0,0 +1,443 @@
+/*
+ * Copyright 2024 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.
+ */
+// Generated by the protocol buffer compiler. DO NOT EDIT!
+// source: google/spanner/admin/database/v1/backup.proto
+
+// Protobuf Java Version: 3.25.3
+package com.google.spanner.admin.database.v1;
+
+/**
+ *
+ *
+ *
+ * The specification for incremental backup chains.
+ * An incremental backup stores the delta of changes between a previous
+ * backup and the database contents at a given version time. An
+ * incremental backup chain consists of a full backup and zero or more
+ * successive incremental backups. The first backup created for an
+ * incremental backup chain is always a full backup.
+ *
+ *
+ * Protobuf type {@code google.spanner.admin.database.v1.IncrementalBackupSpec}
+ */
+public final class IncrementalBackupSpec extends com.google.protobuf.GeneratedMessageV3
+ implements
+ // @@protoc_insertion_point(message_implements:google.spanner.admin.database.v1.IncrementalBackupSpec)
+ IncrementalBackupSpecOrBuilder {
+ private static final long serialVersionUID = 0L;
+ // Use IncrementalBackupSpec.newBuilder() to construct.
+ private IncrementalBackupSpec(com.google.protobuf.GeneratedMessageV3.Builder builder) {
+ super(builder);
+ }
+
+ private IncrementalBackupSpec() {}
+
+ @java.lang.Override
+ @SuppressWarnings({"unused"})
+ protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+ return new IncrementalBackupSpec();
+ }
+
+ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+ return com.google.spanner.admin.database.v1.BackupProto
+ .internal_static_google_spanner_admin_database_v1_IncrementalBackupSpec_descriptor;
+ }
+
+ @java.lang.Override
+ protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+ internalGetFieldAccessorTable() {
+ return com.google.spanner.admin.database.v1.BackupProto
+ .internal_static_google_spanner_admin_database_v1_IncrementalBackupSpec_fieldAccessorTable
+ .ensureFieldAccessorsInitialized(
+ com.google.spanner.admin.database.v1.IncrementalBackupSpec.class,
+ com.google.spanner.admin.database.v1.IncrementalBackupSpec.Builder.class);
+ }
+
+ private byte memoizedIsInitialized = -1;
+
+ @java.lang.Override
+ public final boolean isInitialized() {
+ byte isInitialized = memoizedIsInitialized;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
+
+ memoizedIsInitialized = 1;
+ return true;
+ }
+
+ @java.lang.Override
+ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+ getUnknownFields().writeTo(output);
+ }
+
+ @java.lang.Override
+ public int getSerializedSize() {
+ int size = memoizedSize;
+ if (size != -1) return size;
+
+ size = 0;
+ size += getUnknownFields().getSerializedSize();
+ memoizedSize = size;
+ return size;
+ }
+
+ @java.lang.Override
+ public boolean equals(final java.lang.Object obj) {
+ if (obj == this) {
+ return true;
+ }
+ if (!(obj instanceof com.google.spanner.admin.database.v1.IncrementalBackupSpec)) {
+ return super.equals(obj);
+ }
+ com.google.spanner.admin.database.v1.IncrementalBackupSpec other =
+ (com.google.spanner.admin.database.v1.IncrementalBackupSpec) obj;
+
+ if (!getUnknownFields().equals(other.getUnknownFields())) return false;
+ return true;
+ }
+
+ @java.lang.Override
+ public int hashCode() {
+ if (memoizedHashCode != 0) {
+ return memoizedHashCode;
+ }
+ int hash = 41;
+ hash = (19 * hash) + getDescriptor().hashCode();
+ hash = (29 * hash) + getUnknownFields().hashCode();
+ memoizedHashCode = hash;
+ return hash;
+ }
+
+ public static com.google.spanner.admin.database.v1.IncrementalBackupSpec parseFrom(
+ java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data);
+ }
+
+ public static com.google.spanner.admin.database.v1.IncrementalBackupSpec parseFrom(
+ java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data, extensionRegistry);
+ }
+
+ public static com.google.spanner.admin.database.v1.IncrementalBackupSpec parseFrom(
+ com.google.protobuf.ByteString data)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data);
+ }
+
+ public static com.google.spanner.admin.database.v1.IncrementalBackupSpec parseFrom(
+ com.google.protobuf.ByteString data,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data, extensionRegistry);
+ }
+
+ public static com.google.spanner.admin.database.v1.IncrementalBackupSpec parseFrom(byte[] data)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data);
+ }
+
+ public static com.google.spanner.admin.database.v1.IncrementalBackupSpec parseFrom(
+ byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data, extensionRegistry);
+ }
+
+ public static com.google.spanner.admin.database.v1.IncrementalBackupSpec parseFrom(
+ java.io.InputStream input) throws java.io.IOException {
+ return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+ }
+
+ public static com.google.spanner.admin.database.v1.IncrementalBackupSpec parseFrom(
+ java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+ PARSER, input, extensionRegistry);
+ }
+
+ public static com.google.spanner.admin.database.v1.IncrementalBackupSpec parseDelimitedFrom(
+ java.io.InputStream input) throws java.io.IOException {
+ return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+ }
+
+ public static com.google.spanner.admin.database.v1.IncrementalBackupSpec parseDelimitedFrom(
+ java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+ PARSER, input, extensionRegistry);
+ }
+
+ public static com.google.spanner.admin.database.v1.IncrementalBackupSpec parseFrom(
+ com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+ return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+ }
+
+ public static com.google.spanner.admin.database.v1.IncrementalBackupSpec parseFrom(
+ com.google.protobuf.CodedInputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+ PARSER, input, extensionRegistry);
+ }
+
+ @java.lang.Override
+ public Builder newBuilderForType() {
+ return newBuilder();
+ }
+
+ public static Builder newBuilder() {
+ return DEFAULT_INSTANCE.toBuilder();
+ }
+
+ public static Builder newBuilder(
+ com.google.spanner.admin.database.v1.IncrementalBackupSpec prototype) {
+ return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+ }
+
+ @java.lang.Override
+ public Builder toBuilder() {
+ return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+ }
+
+ @java.lang.Override
+ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+ Builder builder = new Builder(parent);
+ return builder;
+ }
+ /**
+ *
+ *
+ *
+ * The specification for incremental backup chains.
+ * An incremental backup stores the delta of changes between a previous
+ * backup and the database contents at a given version time. An
+ * incremental backup chain consists of a full backup and zero or more
+ * successive incremental backups. The first backup created for an
+ * incremental backup chain is always a full backup.
+ *
+ *
+ * Protobuf type {@code google.spanner.admin.database.v1.IncrementalBackupSpec}
+ */
+ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
+ implements
+ // @@protoc_insertion_point(builder_implements:google.spanner.admin.database.v1.IncrementalBackupSpec)
+ com.google.spanner.admin.database.v1.IncrementalBackupSpecOrBuilder {
+ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+ return com.google.spanner.admin.database.v1.BackupProto
+ .internal_static_google_spanner_admin_database_v1_IncrementalBackupSpec_descriptor;
+ }
+
+ @java.lang.Override
+ protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+ internalGetFieldAccessorTable() {
+ return com.google.spanner.admin.database.v1.BackupProto
+ .internal_static_google_spanner_admin_database_v1_IncrementalBackupSpec_fieldAccessorTable
+ .ensureFieldAccessorsInitialized(
+ com.google.spanner.admin.database.v1.IncrementalBackupSpec.class,
+ com.google.spanner.admin.database.v1.IncrementalBackupSpec.Builder.class);
+ }
+
+ // Construct using com.google.spanner.admin.database.v1.IncrementalBackupSpec.newBuilder()
+ private Builder() {}
+
+ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+ super(parent);
+ }
+
+ @java.lang.Override
+ public Builder clear() {
+ super.clear();
+ return this;
+ }
+
+ @java.lang.Override
+ public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+ return com.google.spanner.admin.database.v1.BackupProto
+ .internal_static_google_spanner_admin_database_v1_IncrementalBackupSpec_descriptor;
+ }
+
+ @java.lang.Override
+ public com.google.spanner.admin.database.v1.IncrementalBackupSpec getDefaultInstanceForType() {
+ return com.google.spanner.admin.database.v1.IncrementalBackupSpec.getDefaultInstance();
+ }
+
+ @java.lang.Override
+ public com.google.spanner.admin.database.v1.IncrementalBackupSpec build() {
+ com.google.spanner.admin.database.v1.IncrementalBackupSpec result = buildPartial();
+ if (!result.isInitialized()) {
+ throw newUninitializedMessageException(result);
+ }
+ return result;
+ }
+
+ @java.lang.Override
+ public com.google.spanner.admin.database.v1.IncrementalBackupSpec buildPartial() {
+ com.google.spanner.admin.database.v1.IncrementalBackupSpec result =
+ new com.google.spanner.admin.database.v1.IncrementalBackupSpec(this);
+ onBuilt();
+ return result;
+ }
+
+ @java.lang.Override
+ public Builder clone() {
+ return super.clone();
+ }
+
+ @java.lang.Override
+ public Builder setField(
+ com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+ return super.setField(field, value);
+ }
+
+ @java.lang.Override
+ public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
+ return super.clearField(field);
+ }
+
+ @java.lang.Override
+ public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+ return super.clearOneof(oneof);
+ }
+
+ @java.lang.Override
+ public Builder setRepeatedField(
+ com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
+ return super.setRepeatedField(field, index, value);
+ }
+
+ @java.lang.Override
+ public Builder addRepeatedField(
+ com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
+ return super.addRepeatedField(field, value);
+ }
+
+ @java.lang.Override
+ public Builder mergeFrom(com.google.protobuf.Message other) {
+ if (other instanceof com.google.spanner.admin.database.v1.IncrementalBackupSpec) {
+ return mergeFrom((com.google.spanner.admin.database.v1.IncrementalBackupSpec) other);
+ } else {
+ super.mergeFrom(other);
+ return this;
+ }
+ }
+
+ public Builder mergeFrom(com.google.spanner.admin.database.v1.IncrementalBackupSpec other) {
+ if (other == com.google.spanner.admin.database.v1.IncrementalBackupSpec.getDefaultInstance())
+ return this;
+ this.mergeUnknownFields(other.getUnknownFields());
+ onChanged();
+ return this;
+ }
+
+ @java.lang.Override
+ public final boolean isInitialized() {
+ return true;
+ }
+
+ @java.lang.Override
+ public Builder mergeFrom(
+ com.google.protobuf.CodedInputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ if (extensionRegistry == null) {
+ throw new java.lang.NullPointerException();
+ }
+ try {
+ boolean done = false;
+ while (!done) {
+ int tag = input.readTag();
+ switch (tag) {
+ case 0:
+ done = true;
+ break;
+ default:
+ {
+ if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+ done = true; // was an endgroup tag
+ }
+ break;
+ } // default:
+ } // switch (tag)
+ } // while (!done)
+ } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ throw e.unwrapIOException();
+ } finally {
+ onChanged();
+ } // finally
+ return this;
+ }
+
+ @java.lang.Override
+ public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
+ return super.setUnknownFields(unknownFields);
+ }
+
+ @java.lang.Override
+ public final Builder mergeUnknownFields(
+ final com.google.protobuf.UnknownFieldSet unknownFields) {
+ return super.mergeUnknownFields(unknownFields);
+ }
+
+ // @@protoc_insertion_point(builder_scope:google.spanner.admin.database.v1.IncrementalBackupSpec)
+ }
+
+ // @@protoc_insertion_point(class_scope:google.spanner.admin.database.v1.IncrementalBackupSpec)
+ private static final com.google.spanner.admin.database.v1.IncrementalBackupSpec DEFAULT_INSTANCE;
+
+ static {
+ DEFAULT_INSTANCE = new com.google.spanner.admin.database.v1.IncrementalBackupSpec();
+ }
+
+ public static com.google.spanner.admin.database.v1.IncrementalBackupSpec getDefaultInstance() {
+ return DEFAULT_INSTANCE;
+ }
+
+ private static final com.google.protobuf.Parser PARSER =
+ new com.google.protobuf.AbstractParser() {
+ @java.lang.Override
+ public IncrementalBackupSpec parsePartialFrom(
+ com.google.protobuf.CodedInputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ Builder builder = newBuilder();
+ try {
+ builder.mergeFrom(input, extensionRegistry);
+ } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ throw e.setUnfinishedMessage(builder.buildPartial());
+ } catch (com.google.protobuf.UninitializedMessageException e) {
+ throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+ } catch (java.io.IOException e) {
+ throw new com.google.protobuf.InvalidProtocolBufferException(e)
+ .setUnfinishedMessage(builder.buildPartial());
+ }
+ return builder.buildPartial();
+ }
+ };
+
+ public static com.google.protobuf.Parser parser() {
+ return PARSER;
+ }
+
+ @java.lang.Override
+ public com.google.protobuf.Parser getParserForType() {
+ return PARSER;
+ }
+
+ @java.lang.Override
+ public com.google.spanner.admin.database.v1.IncrementalBackupSpec getDefaultInstanceForType() {
+ return DEFAULT_INSTANCE;
+ }
+}
diff --git a/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/IncrementalBackupSpecOrBuilder.java b/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/IncrementalBackupSpecOrBuilder.java
new file mode 100644
index 00000000000..fa0ee3f7e71
--- /dev/null
+++ b/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/IncrementalBackupSpecOrBuilder.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2024 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.
+ */
+// Generated by the protocol buffer compiler. DO NOT EDIT!
+// source: google/spanner/admin/database/v1/backup.proto
+
+// Protobuf Java Version: 3.25.3
+package com.google.spanner.admin.database.v1;
+
+public interface IncrementalBackupSpecOrBuilder
+ extends
+ // @@protoc_insertion_point(interface_extends:google.spanner.admin.database.v1.IncrementalBackupSpec)
+ com.google.protobuf.MessageOrBuilder {}
diff --git a/proto-google-cloud-spanner-admin-database-v1/src/main/proto/google/spanner/admin/database/v1/backup.proto b/proto-google-cloud-spanner-admin-database-v1/src/main/proto/google/spanner/admin/database/v1/backup.proto
index f684a4c605e..842ab0ff1e8 100644
--- a/proto-google-cloud-spanner-admin-database-v1/src/main/proto/google/spanner/admin/database/v1/backup.proto
+++ b/proto-google-cloud-spanner-admin-database-v1/src/main/proto/google/spanner/admin/database/v1/backup.proto
@@ -103,6 +103,24 @@ message Backup {
// Output only. Size of the backup in bytes.
int64 size_bytes = 5 [(google.api.field_behavior) = OUTPUT_ONLY];
+ // Output only. The number of bytes that will be freed by deleting this
+ // backup. This value will be zero if, for example, this backup is part of an
+ // incremental backup chain and younger backups in the chain require that we
+ // keep its data. For backups not in an incremental backup chain, this is
+ // always the size of the backup. This value may change if backups on the same
+ // chain get created, deleted or expired.
+ int64 freeable_size_bytes = 15 [(google.api.field_behavior) = OUTPUT_ONLY];
+
+ // Output only. For a backup in an incremental backup chain, this is the
+ // storage space needed to keep the data that has changed since the previous
+ // backup. For all other backups, this is always the size of the backup. This
+ // value may change if backups on the same chain get deleted or expired.
+ //
+ // This field can be used to calculate the total storage space used by a set
+ // of backups. For example, the total space used by all backups of a database
+ // can be computed by summing up this field.
+ int64 exclusive_size_bytes = 16 [(google.api.field_behavior) = OUTPUT_ONLY];
+
// Output only. The current state of the backup.
State state = 6 [(google.api.field_behavior) = OUTPUT_ONLY];
@@ -168,6 +186,23 @@ message Backup {
// single backup schedule URI associated with creating this backup.
repeated string backup_schedules = 14
[(google.api.field_behavior) = OUTPUT_ONLY];
+
+ // Output only. Populated only for backups in an incremental backup chain.
+ // Backups share the same chain id if and only if they belong to the same
+ // incremental backup chain. Use this field to determine which backups are
+ // part of the same incremental backup chain. The ordering of backups in the
+ // chain can be determined by ordering the backup `version_time`.
+ string incremental_backup_chain_id = 17
+ [(google.api.field_behavior) = OUTPUT_ONLY];
+
+ // Output only. Data deleted at a time older than this is guaranteed not to be
+ // retained in order to support this backup. For a backup in an incremental
+ // backup chain, this is the version time of the oldest backup that exists or
+ // ever existed in the chain. For all other backups, this is the version time
+ // of the backup. This field can be used to understand what data is being
+ // retained by the backup system.
+ google.protobuf.Timestamp oldest_version_time = 18
+ [(google.api.field_behavior) = OUTPUT_ONLY];
}
// The request for
@@ -705,3 +740,11 @@ message CopyBackupEncryptionConfig {
// A full backup stores the entire contents of the database at a given
// version time.
message FullBackupSpec {}
+
+// The specification for incremental backup chains.
+// An incremental backup stores the delta of changes between a previous
+// backup and the database contents at a given version time. An
+// incremental backup chain consists of a full backup and zero or more
+// successive incremental backups. The first backup created for an
+// incremental backup chain is always a full backup.
+message IncrementalBackupSpec {}
diff --git a/proto-google-cloud-spanner-admin-database-v1/src/main/proto/google/spanner/admin/database/v1/backup_schedule.proto b/proto-google-cloud-spanner-admin-database-v1/src/main/proto/google/spanner/admin/database/v1/backup_schedule.proto
index 9ef4587f814..c9b5e7e3f4b 100644
--- a/proto-google-cloud-spanner-admin-database-v1/src/main/proto/google/spanner/admin/database/v1/backup_schedule.proto
+++ b/proto-google-cloud-spanner-admin-database-v1/src/main/proto/google/spanner/admin/database/v1/backup_schedule.proto
@@ -83,6 +83,9 @@ message BackupSchedule {
oneof backup_type_spec {
// The schedule creates only full backups.
FullBackupSpec full_backup_spec = 7;
+
+ // The schedule creates incremental backup chains.
+ IncrementalBackupSpec incremental_backup_spec = 8;
}
// Output only. The timestamp at which the schedule was last updated.
diff --git a/proto-google-cloud-spanner-admin-instance-v1/pom.xml b/proto-google-cloud-spanner-admin-instance-v1/pom.xml
index 22bb2eb1c10..507fe2e57a5 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.71.1-SNAPSHOT
+ 6.72.1-SNAPSHOT
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.71.1-SNAPSHOT
+ 6.72.1-SNAPSHOT
diff --git a/proto-google-cloud-spanner-executor-v1/pom.xml b/proto-google-cloud-spanner-executor-v1/pom.xml
index f4e05e244a6..f4dc5b5bf24 100644
--- a/proto-google-cloud-spanner-executor-v1/pom.xml
+++ b/proto-google-cloud-spanner-executor-v1/pom.xml
@@ -4,13 +4,13 @@
4.0.0
com.google.api.grpc
proto-google-cloud-spanner-executor-v1
- 6.71.1-SNAPSHOT
+ 6.72.1-SNAPSHOT
proto-google-cloud-spanner-executor-v1
Proto library for google-cloud-spanner
com.google.cloud
google-cloud-spanner-parent
- 6.71.1-SNAPSHOT
+ 6.72.1-SNAPSHOT
diff --git a/proto-google-cloud-spanner-v1/pom.xml b/proto-google-cloud-spanner-v1/pom.xml
index e554f747927..c0c5da690a9 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.71.1-SNAPSHOT
+ 6.72.1-SNAPSHOT
proto-google-cloud-spanner-v1
PROTO library for proto-google-cloud-spanner-v1
com.google.cloud
google-cloud-spanner-parent
- 6.71.1-SNAPSHOT
+ 6.72.1-SNAPSHOT
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 79d9c665884..56b1c708c8c 100644
--- a/samples/install-without-bom/pom.xml
+++ b/samples/install-without-bom/pom.xml
@@ -23,8 +23,8 @@
1.8
UTF-8
0.31.1
- 2.41.0
- 3.44.0
+ 2.47.0
+ 3.48.0