Skip to content

Commit

Permalink
feat: Adding new fields for Serverless analytics (#2315)
Browse files Browse the repository at this point in the history 
* feat: Adding new fields for Serverless analytics

PiperOrigin-RevId: 513499163

Source-Link: googleapis/googleapis@c3ffffa

Source-Link: googleapis/googleapis-gen@3e262dc
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiM2UyNjJkYzg2YTllNzNlYTBiNmNmZDdkMTlhYzc2ODVhYzM0YTBlNSJ9

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

---------

Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
  • Loading branch information
@gcf-owl-bot
gcf-owl-bot[bot] and gcf-owl-bot[bot] committed Mar 3, 2023
1 parent af904eb commit ce9cd74
Show file tree
Hide file tree
Showing 9 changed files with 429 additions and 150 deletions.
6 changes: 6 additions & 0 deletions google-cloud-spanner/src/main/java/com/google/cloud/spanner/v1/SpannerClient.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -940,6 +940,7 @@ public final UnaryCallable<DeleteSessionRequest, Empty> deleteSessionCallable()
* .setSeqno(109325920)
* .setQueryOptions(ExecuteSqlRequest.QueryOptions.newBuilder().build())
* .setRequestOptions(RequestOptions.newBuilder().build())
* .setDataBoostEnabled(true)
* .build();
* ResultSet response = spannerClient.executeSql(request);
* }
Expand Down Expand Up @@ -987,6 +988,7 @@ public final ResultSet executeSql(ExecuteSqlRequest request) {
* .setSeqno(109325920)
* .setQueryOptions(ExecuteSqlRequest.QueryOptions.newBuilder().build())
* .setRequestOptions(RequestOptions.newBuilder().build())
* .setDataBoostEnabled(true)
* .build();
* ApiFuture<ResultSet> future = spannerClient.executeSqlCallable().futureCall(request);
* // Do something.
Expand Down Expand Up @@ -1027,6 +1029,7 @@ public final UnaryCallable<ExecuteSqlRequest, ResultSet> executeSqlCallable() {
* .setSeqno(109325920)
* .setQueryOptions(ExecuteSqlRequest.QueryOptions.newBuilder().build())
* .setRequestOptions(RequestOptions.newBuilder().build())
* .setDataBoostEnabled(true)
* .build();
* ServerStream<PartialResultSet> stream =
* spannerClient.executeStreamingSqlCallable().call(request);
Expand Down Expand Up @@ -1162,6 +1165,7 @@ public final ExecuteBatchDmlResponse executeBatchDml(ExecuteBatchDmlRequest requ
* .setResumeToken(ByteString.EMPTY)
* .setPartitionToken(ByteString.EMPTY)
* .setRequestOptions(RequestOptions.newBuilder().build())
* .setDataBoostEnabled(true)
* .build();
* ResultSet response = spannerClient.read(request);
* }
Expand Down Expand Up @@ -1210,6 +1214,7 @@ public final ResultSet read(ReadRequest request) {
* .setResumeToken(ByteString.EMPTY)
* .setPartitionToken(ByteString.EMPTY)
* .setRequestOptions(RequestOptions.newBuilder().build())
* .setDataBoostEnabled(true)
* .build();
* ApiFuture<ResultSet> future = spannerClient.readCallable().futureCall(request);
* // Do something.
Expand Down Expand Up @@ -1250,6 +1255,7 @@ public final UnaryCallable<ReadRequest, ResultSet> readCallable() {
* .setResumeToken(ByteString.EMPTY)
* .setPartitionToken(ByteString.EMPTY)
* .setRequestOptions(RequestOptions.newBuilder().build())
* .setDataBoostEnabled(true)
* .build();
* ServerStream<PartialResultSet> stream = spannerClient.streamingReadCallable().call(request);
* for (PartialResultSet response : stream) {
Expand Down
4 changes: 4 additions & 0 deletions ...le-cloud-spanner/src/test/java/com/google/cloud/spanner/v1/SpannerClientHttpJsonTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -598,6 +598,7 @@ public void executeSqlTest() throws Exception {
.setSeqno(109325920)
.setQueryOptions(ExecuteSqlRequest.QueryOptions.newBuilder().build())
.setRequestOptions(RequestOptions.newBuilder().build())
.setDataBoostEnabled(true)
.build();

ResultSet actualResponse = client.executeSql(request);
Expand Down Expand Up @@ -639,6 +640,7 @@ public void executeSqlExceptionTest() throws Exception {
.setSeqno(109325920)
.setQueryOptions(ExecuteSqlRequest.QueryOptions.newBuilder().build())
.setRequestOptions(RequestOptions.newBuilder().build())
.setDataBoostEnabled(true)
.build();
client.executeSql(request);
Assert.fail("No exception raised");
Expand Down Expand Up @@ -742,6 +744,7 @@ public void readTest() throws Exception {
.setResumeToken(ByteString.EMPTY)
.setPartitionToken(ByteString.EMPTY)
.setRequestOptions(RequestOptions.newBuilder().build())
.setDataBoostEnabled(true)
.build();

ResultSet actualResponse = client.read(request);
Expand Down Expand Up @@ -783,6 +786,7 @@ public void readExceptionTest() throws Exception {
.setResumeToken(ByteString.EMPTY)
.setPartitionToken(ByteString.EMPTY)
.setRequestOptions(RequestOptions.newBuilder().build())
.setDataBoostEnabled(true)
.build();
client.read(request);
Assert.fail("No exception raised");
Expand Down
10 changes: 10 additions & 0 deletions google-cloud-spanner/src/test/java/com/google/cloud/spanner/v1/SpannerClientTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -554,6 +554,7 @@ public void executeSqlTest() throws Exception {
.setSeqno(109325920)
.setQueryOptions(ExecuteSqlRequest.QueryOptions.newBuilder().build())
.setRequestOptions(RequestOptions.newBuilder().build())
.setDataBoostEnabled(true)
.build();

ResultSet actualResponse = client.executeSql(request);
Expand All @@ -574,6 +575,7 @@ public void executeSqlTest() throws Exception {
Assert.assertEquals(request.getSeqno(), actualRequest.getSeqno());
Assert.assertEquals(request.getQueryOptions(), actualRequest.getQueryOptions());
Assert.assertEquals(request.getRequestOptions(), actualRequest.getRequestOptions());
Assert.assertEquals(request.getDataBoostEnabled(), actualRequest.getDataBoostEnabled());
Assert.assertTrue(
channelProvider.isHeaderSent(
ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
Expand All @@ -599,6 +601,7 @@ public void executeSqlExceptionTest() throws Exception {
.setSeqno(109325920)
.setQueryOptions(ExecuteSqlRequest.QueryOptions.newBuilder().build())
.setRequestOptions(RequestOptions.newBuilder().build())
.setDataBoostEnabled(true)
.build();
client.executeSql(request);
Assert.fail("No exception raised");
Expand Down Expand Up @@ -631,6 +634,7 @@ public void executeStreamingSqlTest() throws Exception {
.setSeqno(109325920)
.setQueryOptions(ExecuteSqlRequest.QueryOptions.newBuilder().build())
.setRequestOptions(RequestOptions.newBuilder().build())
.setDataBoostEnabled(true)
.build();

MockStreamObserver<PartialResultSet> responseObserver = new MockStreamObserver<>();
Expand Down Expand Up @@ -661,6 +665,7 @@ public void executeStreamingSqlExceptionTest() throws Exception {
.setSeqno(109325920)
.setQueryOptions(ExecuteSqlRequest.QueryOptions.newBuilder().build())
.setRequestOptions(RequestOptions.newBuilder().build())
.setDataBoostEnabled(true)
.build();

MockStreamObserver<PartialResultSet> responseObserver = new MockStreamObserver<>();
Expand Down Expand Up @@ -761,6 +766,7 @@ public void readTest() throws Exception {
.setResumeToken(ByteString.EMPTY)
.setPartitionToken(ByteString.EMPTY)
.setRequestOptions(RequestOptions.newBuilder().build())
.setDataBoostEnabled(true)
.build();

ResultSet actualResponse = client.read(request);
Expand All @@ -780,6 +786,7 @@ public void readTest() throws Exception {
Assert.assertEquals(request.getResumeToken(), actualRequest.getResumeToken());
Assert.assertEquals(request.getPartitionToken(), actualRequest.getPartitionToken());
Assert.assertEquals(request.getRequestOptions(), actualRequest.getRequestOptions());
Assert.assertEquals(request.getDataBoostEnabled(), actualRequest.getDataBoostEnabled());
Assert.assertTrue(
channelProvider.isHeaderSent(
ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
Expand All @@ -805,6 +812,7 @@ public void readExceptionTest() throws Exception {
.setResumeToken(ByteString.EMPTY)
.setPartitionToken(ByteString.EMPTY)
.setRequestOptions(RequestOptions.newBuilder().build())
.setDataBoostEnabled(true)
.build();
client.read(request);
Assert.fail("No exception raised");
Expand Down Expand Up @@ -837,6 +845,7 @@ public void streamingReadTest() throws Exception {
.setResumeToken(ByteString.EMPTY)
.setPartitionToken(ByteString.EMPTY)
.setRequestOptions(RequestOptions.newBuilder().build())
.setDataBoostEnabled(true)
.build();

MockStreamObserver<PartialResultSet> responseObserver = new MockStreamObserver<>();
Expand Down Expand Up @@ -867,6 +876,7 @@ public void streamingReadExceptionTest() throws Exception {
.setResumeToken(ByteString.EMPTY)
.setPartitionToken(ByteString.EMPTY)
.setRequestOptions(RequestOptions.newBuilder().build())
.setDataBoostEnabled(true)
.build();

MockStreamObserver<PartialResultSet> responseObserver = new MockStreamObserver<>();
Expand Down
105 changes: 105 additions & 0 deletions proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ExecuteSqlRequest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1972,6 +1972,27 @@ public com.google.spanner.v1.RequestOptionsOrBuilder getRequestOptionsOrBuilder(
: requestOptions_;
}

public static final int DATA_BOOST_ENABLED_FIELD_NUMBER = 15;
private boolean dataBoostEnabled_ = false;
/**
*
*
* <pre>
* If this is for a partitioned read and this field is set to `true`, the
* request will be executed via Spanner independent compute resources.
* If the field is set to `true` but the request does not set
* `partition_token`, the API will return an `INVALID_ARGUMENT` error.
* </pre>
*
* <code>bool data_boost_enabled = 15;</code>
*
* @return The dataBoostEnabled.
*/
@java.lang.Override
public boolean getDataBoostEnabled() {
return dataBoostEnabled_;
}

private byte memoizedIsInitialized = -1;

@java.lang.Override
Expand Down Expand Up @@ -2018,6 +2039,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
if (requestOptions_ != null) {
output.writeMessage(11, getRequestOptions());
}
if (dataBoostEnabled_ != false) {
output.writeBool(15, dataBoostEnabled_);
}
getUnknownFields().writeTo(output);
}

Expand Down Expand Up @@ -2067,6 +2091,9 @@ public int getSerializedSize() {
if (requestOptions_ != null) {
size += com.google.protobuf.CodedOutputStream.computeMessageSize(11, getRequestOptions());
}
if (dataBoostEnabled_ != false) {
size += com.google.protobuf.CodedOutputStream.computeBoolSize(15, dataBoostEnabled_);
}
size += getUnknownFields().getSerializedSize();
memoizedSize = size;
return size;
Expand Down Expand Up @@ -2105,6 +2132,7 @@ public boolean equals(final java.lang.Object obj) {
if (hasRequestOptions()) {
if (!getRequestOptions().equals(other.getRequestOptions())) return false;
}
if (getDataBoostEnabled() != other.getDataBoostEnabled()) return false;
if (!getUnknownFields().equals(other.getUnknownFields())) return false;
return true;
}
Expand Down Expand Up @@ -2148,6 +2176,8 @@ public int hashCode() {
hash = (37 * hash) + REQUEST_OPTIONS_FIELD_NUMBER;
hash = (53 * hash) + getRequestOptions().hashCode();
}
hash = (37 * hash) + DATA_BOOST_ENABLED_FIELD_NUMBER;
hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getDataBoostEnabled());
hash = (29 * hash) + getUnknownFields().hashCode();
memoizedHashCode = hash;
return hash;
Expand Down Expand Up @@ -2335,6 +2365,7 @@ public Builder clear() {
requestOptionsBuilder_.dispose();
requestOptionsBuilder_ = null;
}
dataBoostEnabled_ = false;
return this;
}

Expand Down Expand Up @@ -2408,6 +2439,9 @@ private void buildPartial0(com.google.spanner.v1.ExecuteSqlRequest result) {
result.requestOptions_ =
requestOptionsBuilder_ == null ? requestOptions_ : requestOptionsBuilder_.build();
}
if (((from_bitField0_ & 0x00000800) != 0)) {
result.dataBoostEnabled_ = dataBoostEnabled_;
}
}

@java.lang.Override
Expand Down Expand Up @@ -2491,6 +2525,9 @@ public Builder mergeFrom(com.google.spanner.v1.ExecuteSqlRequest other) {
if (other.hasRequestOptions()) {
mergeRequestOptions(other.getRequestOptions());
}
if (other.getDataBoostEnabled() != false) {
setDataBoostEnabled(other.getDataBoostEnabled());
}
this.mergeUnknownFields(other.getUnknownFields());
onChanged();
return this;
Expand Down Expand Up @@ -2590,6 +2627,12 @@ public Builder mergeFrom(
bitField0_ |= 0x00000400;
break;
} // case 90
case 120:
{
dataBoostEnabled_ = input.readBool();
bitField0_ |= 0x00000800;
break;
} // case 120
default:
{
if (!super.parseUnknownField(input, extensionRegistry, tag)) {
Expand Down Expand Up @@ -4210,6 +4253,68 @@ public com.google.spanner.v1.RequestOptionsOrBuilder getRequestOptionsOrBuilder(
return requestOptionsBuilder_;
}

private boolean dataBoostEnabled_;
/**
*
*
* <pre>
* If this is for a partitioned read and this field is set to `true`, the
* request will be executed via Spanner independent compute resources.
* If the field is set to `true` but the request does not set
* `partition_token`, the API will return an `INVALID_ARGUMENT` error.
* </pre>
*
* <code>bool data_boost_enabled = 15;</code>
*
* @return The dataBoostEnabled.
*/
@java.lang.Override
public boolean getDataBoostEnabled() {
return dataBoostEnabled_;
}
/**
*
*
* <pre>
* If this is for a partitioned read and this field is set to `true`, the
* request will be executed via Spanner independent compute resources.
* If the field is set to `true` but the request does not set
* `partition_token`, the API will return an `INVALID_ARGUMENT` error.
* </pre>
*
* <code>bool data_boost_enabled = 15;</code>
*
* @param value The dataBoostEnabled to set.
* @return This builder for chaining.
*/
public Builder setDataBoostEnabled(boolean value) {

dataBoostEnabled_ = value;
bitField0_ |= 0x00000800;
onChanged();
return this;
}
/**
*
*
* <pre>
* If this is for a partitioned read and this field is set to `true`, the
* request will be executed via Spanner independent compute resources.
* If the field is set to `true` but the request does not set
* `partition_token`, the API will return an `INVALID_ARGUMENT` error.
* </pre>
*
* <code>bool data_boost_enabled = 15;</code>
*
* @return This builder for chaining.
*/
public Builder clearDataBoostEnabled() {
bitField0_ = (bitField0_ & ~0x00000800);
dataBoostEnabled_ = false;
onChanged();
return this;
}

@java.lang.Override
public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
return super.setUnknownFields(unknownFields);
Expand Down
16 changes: 16 additions & 0 deletions ...ogle-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ExecuteSqlRequestOrBuilder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -429,4 +429,20 @@ com.google.spanner.v1.Type getParamTypesOrDefault(
* <code>.google.spanner.v1.RequestOptions request_options = 11;</code>
*/
com.google.spanner.v1.RequestOptionsOrBuilder getRequestOptionsOrBuilder();

/**
*
*
* <pre>
* If this is for a partitioned read and this field is set to `true`, the
* request will be executed via Spanner independent compute resources.
* If the field is set to `true` but the request does not set
* `partition_token`, the API will return an `INVALID_ARGUMENT` error.
* </pre>
*
* <code>bool data_boost_enabled = 15;</code>
*
* @return The dataBoostEnabled.
*/
boolean getDataBoostEnabled();
}

0 comments on commit ce9cd74

Please sign in to comment.