getParserForType() {
- return PARSER;
- }
-
- @java.lang.Override
- public com.google.datastore.v1.ResultSetStats getDefaultInstanceForType() {
- return DEFAULT_INSTANCE;
- }
-}
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ResultSetStatsOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ResultSetStatsOrBuilder.java
deleted file mode 100644
index 16a951419..000000000
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ResultSetStatsOrBuilder.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright 2023 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/datastore/v1/query_profile.proto
-
-package com.google.datastore.v1;
-
-public interface ResultSetStatsOrBuilder
- extends
- // @@protoc_insertion_point(interface_extends:google.datastore.v1.ResultSetStats)
- com.google.protobuf.MessageOrBuilder {
-
- /**
- *
- *
- *
- * Plan for the query.
- *
- *
- * .google.datastore.v1.QueryPlan query_plan = 1;
- *
- * @return Whether the queryPlan field is set.
- */
- boolean hasQueryPlan();
- /**
- *
- *
- *
- * Plan for the query.
- *
- *
- * .google.datastore.v1.QueryPlan query_plan = 1;
- *
- * @return The queryPlan.
- */
- com.google.datastore.v1.QueryPlan getQueryPlan();
- /**
- *
- *
- *
- * Plan for the query.
- *
- *
- * .google.datastore.v1.QueryPlan query_plan = 1;
- */
- com.google.datastore.v1.QueryPlanOrBuilder getQueryPlanOrBuilder();
-
- /**
- *
- *
- *
- * Aggregated statistics from the execution of the query.
- *
- * This will only be present when the request specifies `PROFILE` mode.
- * For example, a query will return the statistics including:
- *
- * {
- * "results_returned": "20",
- * "documents_scanned": "20",
- * "indexes_entries_scanned": "10050",
- * "total_execution_time": "100.7 msecs"
- * }
- *
- *
- * .google.protobuf.Struct query_stats = 2;
- *
- * @return Whether the queryStats field is set.
- */
- boolean hasQueryStats();
- /**
- *
- *
- *
- * Aggregated statistics from the execution of the query.
- *
- * This will only be present when the request specifies `PROFILE` mode.
- * For example, a query will return the statistics including:
- *
- * {
- * "results_returned": "20",
- * "documents_scanned": "20",
- * "indexes_entries_scanned": "10050",
- * "total_execution_time": "100.7 msecs"
- * }
- *
- *
- * .google.protobuf.Struct query_stats = 2;
- *
- * @return The queryStats.
- */
- com.google.protobuf.Struct getQueryStats();
- /**
- *
- *
- *
- * Aggregated statistics from the execution of the query.
- *
- * This will only be present when the request specifies `PROFILE` mode.
- * For example, a query will return the statistics including:
- *
- * {
- * "results_returned": "20",
- * "documents_scanned": "20",
- * "indexes_entries_scanned": "10050",
- * "total_execution_time": "100.7 msecs"
- * }
- *
- *
- * .google.protobuf.Struct query_stats = 2;
- */
- com.google.protobuf.StructOrBuilder getQueryStatsOrBuilder();
-}
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequest.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequest.java
index dad648429..47212e814 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequest.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequest.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2023 Google LLC
+ * 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.
@@ -16,6 +16,7 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/datastore/v1/datastore.proto
+// Protobuf Java Version: 3.25.2
package com.google.datastore.v1;
/**
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequestOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequestOrBuilder.java
index 874cda7b7..05aa91ca4 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequestOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequestOrBuilder.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2023 Google LLC
+ * 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.
@@ -16,6 +16,7 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/datastore/v1/datastore.proto
+// Protobuf Java Version: 3.25.2
package com.google.datastore.v1;
public interface RollbackRequestOrBuilder
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponse.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponse.java
index 840b1bde3..211b04249 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponse.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponse.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2023 Google LLC
+ * 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.
@@ -16,6 +16,7 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/datastore/v1/datastore.proto
+// Protobuf Java Version: 3.25.2
package com.google.datastore.v1;
/**
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponseOrBuilder.java
index f9dd7e00d..ae9797927 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponseOrBuilder.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2023 Google LLC
+ * 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.
@@ -16,6 +16,7 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/datastore/v1/datastore.proto
+// Protobuf Java Version: 3.25.2
package com.google.datastore.v1;
public interface RollbackResponseOrBuilder
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryRequest.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryRequest.java
index 12e9bf63c..6b9cd07b5 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryRequest.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryRequest.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2023 Google LLC
+ * 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.
@@ -16,6 +16,7 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/datastore/v1/datastore.proto
+// Protobuf Java Version: 3.25.2
package com.google.datastore.v1;
/**
@@ -41,7 +42,6 @@ private RunAggregationQueryRequest(com.google.protobuf.GeneratedMessageV3.Builde
private RunAggregationQueryRequest() {
projectId_ = "";
databaseId_ = "";
- mode_ = 0;
}
@java.lang.Override
@@ -65,6 +65,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
com.google.datastore.v1.RunAggregationQueryRequest.Builder.class);
}
+ private int bitField0_;
private int queryTypeCase_ = 0;
@SuppressWarnings("serial")
@@ -240,7 +241,7 @@ public com.google.protobuf.ByteString getDatabaseIdBytes() {
*/
@java.lang.Override
public boolean hasPartitionId() {
- return partitionId_ != null;
+ return ((bitField0_ & 0x00000001) != 0);
}
/**
*
@@ -296,7 +297,7 @@ public com.google.datastore.v1.PartitionIdOrBuilder getPartitionIdOrBuilder() {
*/
@java.lang.Override
public boolean hasReadOptions() {
- return readOptions_ != null;
+ return ((bitField0_ & 0x00000002) != 0);
}
/**
*
@@ -433,46 +434,6 @@ public com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder() {
return com.google.datastore.v1.GqlQuery.getDefaultInstance();
}
- public static final int MODE_FIELD_NUMBER = 10;
- private int mode_ = 0;
- /**
- *
- *
- *
- * Optional. The mode in which the query request is processed. This field is
- * optional, and when not provided, it defaults to `NORMAL` mode where no
- * additional statistics will be returned with the query results.
- *
- *
- * .google.datastore.v1.QueryMode mode = 10 [(.google.api.field_behavior) = OPTIONAL];
- *
- *
- * @return The enum numeric value on the wire for mode.
- */
- @java.lang.Override
- public int getModeValue() {
- return mode_;
- }
- /**
- *
- *
- *
- * Optional. The mode in which the query request is processed. This field is
- * optional, and when not provided, it defaults to `NORMAL` mode where no
- * additional statistics will be returned with the query results.
- *
- *
- * .google.datastore.v1.QueryMode mode = 10 [(.google.api.field_behavior) = OPTIONAL];
- *
- *
- * @return The mode.
- */
- @java.lang.Override
- public com.google.datastore.v1.QueryMode getMode() {
- com.google.datastore.v1.QueryMode result = com.google.datastore.v1.QueryMode.forNumber(mode_);
- return result == null ? com.google.datastore.v1.QueryMode.UNRECOGNIZED : result;
- }
-
private byte memoizedIsInitialized = -1;
@java.lang.Override
@@ -487,10 +448,10 @@ public final boolean isInitialized() {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
- if (readOptions_ != null) {
+ if (((bitField0_ & 0x00000002) != 0)) {
output.writeMessage(1, getReadOptions());
}
- if (partitionId_ != null) {
+ if (((bitField0_ & 0x00000001) != 0)) {
output.writeMessage(2, getPartitionId());
}
if (queryTypeCase_ == 3) {
@@ -505,9 +466,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(databaseId_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 9, databaseId_);
}
- if (mode_ != com.google.datastore.v1.QueryMode.NORMAL.getNumber()) {
- output.writeEnum(10, mode_);
- }
getUnknownFields().writeTo(output);
}
@@ -517,10 +475,10 @@ public int getSerializedSize() {
if (size != -1) return size;
size = 0;
- if (readOptions_ != null) {
+ if (((bitField0_ & 0x00000002) != 0)) {
size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getReadOptions());
}
- if (partitionId_ != null) {
+ if (((bitField0_ & 0x00000001) != 0)) {
size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getPartitionId());
}
if (queryTypeCase_ == 3) {
@@ -539,9 +497,6 @@ public int getSerializedSize() {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(databaseId_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(9, databaseId_);
}
- if (mode_ != com.google.datastore.v1.QueryMode.NORMAL.getNumber()) {
- size += com.google.protobuf.CodedOutputStream.computeEnumSize(10, mode_);
- }
size += getUnknownFields().getSerializedSize();
memoizedSize = size;
return size;
@@ -568,7 +523,6 @@ public boolean equals(final java.lang.Object obj) {
if (hasReadOptions()) {
if (!getReadOptions().equals(other.getReadOptions())) return false;
}
- if (mode_ != other.mode_) return false;
if (!getQueryTypeCase().equals(other.getQueryTypeCase())) return false;
switch (queryTypeCase_) {
case 3:
@@ -603,8 +557,6 @@ public int hashCode() {
hash = (37 * hash) + READ_OPTIONS_FIELD_NUMBER;
hash = (53 * hash) + getReadOptions().hashCode();
}
- hash = (37 * hash) + MODE_FIELD_NUMBER;
- hash = (53 * hash) + mode_;
switch (queryTypeCase_) {
case 3:
hash = (37 * hash) + AGGREGATION_QUERY_FIELD_NUMBER;
@@ -747,10 +699,20 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
}
// Construct using com.google.datastore.v1.RunAggregationQueryRequest.newBuilder()
- private Builder() {}
+ private Builder() {
+ maybeForceBuilderInitialization();
+ }
private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
super(parent);
+ maybeForceBuilderInitialization();
+ }
+
+ private void maybeForceBuilderInitialization() {
+ if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+ getPartitionIdFieldBuilder();
+ getReadOptionsFieldBuilder();
+ }
}
@java.lang.Override
@@ -775,7 +737,6 @@ public Builder clear() {
if (gqlQueryBuilder_ != null) {
gqlQueryBuilder_.clear();
}
- mode_ = 0;
queryTypeCase_ = 0;
queryType_ = null;
return this;
@@ -821,17 +782,18 @@ private void buildPartial0(com.google.datastore.v1.RunAggregationQueryRequest re
if (((from_bitField0_ & 0x00000002) != 0)) {
result.databaseId_ = databaseId_;
}
+ int to_bitField0_ = 0;
if (((from_bitField0_ & 0x00000004) != 0)) {
result.partitionId_ =
partitionIdBuilder_ == null ? partitionId_ : partitionIdBuilder_.build();
+ to_bitField0_ |= 0x00000001;
}
if (((from_bitField0_ & 0x00000008) != 0)) {
result.readOptions_ =
readOptionsBuilder_ == null ? readOptions_ : readOptionsBuilder_.build();
+ to_bitField0_ |= 0x00000002;
}
- if (((from_bitField0_ & 0x00000040) != 0)) {
- result.mode_ = mode_;
- }
+ result.bitField0_ |= to_bitField0_;
}
private void buildPartialOneofs(com.google.datastore.v1.RunAggregationQueryRequest result) {
@@ -907,9 +869,6 @@ public Builder mergeFrom(com.google.datastore.v1.RunAggregationQueryRequest othe
if (other.hasReadOptions()) {
mergeReadOptions(other.getReadOptions());
}
- if (other.mode_ != 0) {
- setModeValue(other.getModeValue());
- }
switch (other.getQueryTypeCase()) {
case AGGREGATION_QUERY:
{
@@ -989,12 +948,6 @@ public Builder mergeFrom(
bitField0_ |= 0x00000002;
break;
} // case 74
- case 80:
- {
- mode_ = input.readEnum();
- bitField0_ |= 0x00000040;
- break;
- } // case 80
default:
{
if (!super.parseUnknownField(input, extensionRegistry, tag)) {
@@ -1372,8 +1325,10 @@ public Builder mergePartitionId(com.google.datastore.v1.PartitionId value) {
} else {
partitionIdBuilder_.mergeFrom(value);
}
- bitField0_ |= 0x00000004;
- onChanged();
+ if (partitionId_ != null) {
+ bitField0_ |= 0x00000004;
+ onChanged();
+ }
return this;
}
/**
@@ -1567,8 +1522,10 @@ public Builder mergeReadOptions(com.google.datastore.v1.ReadOptions value) {
} else {
readOptionsBuilder_.mergeFrom(value);
}
- bitField0_ |= 0x00000008;
- onChanged();
+ if (readOptions_ != null) {
+ bitField0_ |= 0x00000008;
+ onChanged();
+ }
return this;
}
/**
@@ -2063,110 +2020,6 @@ public com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder() {
return gqlQueryBuilder_;
}
- private int mode_ = 0;
- /**
- *
- *
- *
- * Optional. The mode in which the query request is processed. This field is
- * optional, and when not provided, it defaults to `NORMAL` mode where no
- * additional statistics will be returned with the query results.
- *
- *
- * .google.datastore.v1.QueryMode mode = 10 [(.google.api.field_behavior) = OPTIONAL];
- *
- *
- * @return The enum numeric value on the wire for mode.
- */
- @java.lang.Override
- public int getModeValue() {
- return mode_;
- }
- /**
- *
- *
- *
- * Optional. The mode in which the query request is processed. This field is
- * optional, and when not provided, it defaults to `NORMAL` mode where no
- * additional statistics will be returned with the query results.
- *
- *
- * .google.datastore.v1.QueryMode mode = 10 [(.google.api.field_behavior) = OPTIONAL];
- *
- *
- * @param value The enum numeric value on the wire for mode to set.
- * @return This builder for chaining.
- */
- public Builder setModeValue(int value) {
- mode_ = value;
- bitField0_ |= 0x00000040;
- onChanged();
- return this;
- }
- /**
- *
- *
- *
- * Optional. The mode in which the query request is processed. This field is
- * optional, and when not provided, it defaults to `NORMAL` mode where no
- * additional statistics will be returned with the query results.
- *
- *
- * .google.datastore.v1.QueryMode mode = 10 [(.google.api.field_behavior) = OPTIONAL];
- *
- *
- * @return The mode.
- */
- @java.lang.Override
- public com.google.datastore.v1.QueryMode getMode() {
- com.google.datastore.v1.QueryMode result = com.google.datastore.v1.QueryMode.forNumber(mode_);
- return result == null ? com.google.datastore.v1.QueryMode.UNRECOGNIZED : result;
- }
- /**
- *
- *
- *
- * Optional. The mode in which the query request is processed. This field is
- * optional, and when not provided, it defaults to `NORMAL` mode where no
- * additional statistics will be returned with the query results.
- *
- *
- * .google.datastore.v1.QueryMode mode = 10 [(.google.api.field_behavior) = OPTIONAL];
- *
- *
- * @param value The mode to set.
- * @return This builder for chaining.
- */
- public Builder setMode(com.google.datastore.v1.QueryMode value) {
- if (value == null) {
- throw new NullPointerException();
- }
- bitField0_ |= 0x00000040;
- mode_ = value.getNumber();
- onChanged();
- return this;
- }
- /**
- *
- *
- *
- * Optional. The mode in which the query request is processed. This field is
- * optional, and when not provided, it defaults to `NORMAL` mode where no
- * additional statistics will be returned with the query results.
- *
- *
- * .google.datastore.v1.QueryMode mode = 10 [(.google.api.field_behavior) = OPTIONAL];
- *
- *
- * @return This builder for chaining.
- */
- public Builder clearMode() {
- bitField0_ = (bitField0_ & ~0x00000040);
- mode_ = 0;
- onChanged();
- return this;
- }
-
@java.lang.Override
public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
return super.setUnknownFields(unknownFields);
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryRequestOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryRequestOrBuilder.java
index 6d86f2903..0982b2b2b 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryRequestOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryRequestOrBuilder.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2023 Google LLC
+ * 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.
@@ -16,6 +16,7 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/datastore/v1/datastore.proto
+// Protobuf Java Version: 3.25.2
package com.google.datastore.v1;
public interface RunAggregationQueryRequestOrBuilder
@@ -228,36 +229,5 @@ public interface RunAggregationQueryRequestOrBuilder
*/
com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder();
- /**
- *
- *
- *
- * Optional. The mode in which the query request is processed. This field is
- * optional, and when not provided, it defaults to `NORMAL` mode where no
- * additional statistics will be returned with the query results.
- *
- *
- * .google.datastore.v1.QueryMode mode = 10 [(.google.api.field_behavior) = OPTIONAL];
- *
- *
- * @return The enum numeric value on the wire for mode.
- */
- int getModeValue();
- /**
- *
- *
- *
- * Optional. The mode in which the query request is processed. This field is
- * optional, and when not provided, it defaults to `NORMAL` mode where no
- * additional statistics will be returned with the query results.
- *
- *
- * .google.datastore.v1.QueryMode mode = 10 [(.google.api.field_behavior) = OPTIONAL];
- *
- *
- * @return The mode.
- */
- com.google.datastore.v1.QueryMode getMode();
-
com.google.datastore.v1.RunAggregationQueryRequest.QueryTypeCase getQueryTypeCase();
}
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryResponse.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryResponse.java
index 328afcfdf..f33cfc1af 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryResponse.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryResponse.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2023 Google LLC
+ * 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.
@@ -16,6 +16,7 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/datastore/v1/datastore.proto
+// Protobuf Java Version: 3.25.2
package com.google.datastore.v1;
/**
@@ -63,6 +64,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
com.google.datastore.v1.RunAggregationQueryResponse.Builder.class);
}
+ private int bitField0_;
public static final int BATCH_FIELD_NUMBER = 1;
private com.google.datastore.v1.AggregationResultBatch batch_;
/**
@@ -78,7 +80,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
*/
@java.lang.Override
public boolean hasBatch() {
- return batch_ != null;
+ return ((bitField0_ & 0x00000001) != 0);
}
/**
*
@@ -128,7 +130,7 @@ public com.google.datastore.v1.AggregationResultBatchOrBuilder getBatchOrBuilder
*/
@java.lang.Override
public boolean hasQuery() {
- return query_ != null;
+ return ((bitField0_ & 0x00000002) != 0);
}
/**
*
@@ -183,61 +185,6 @@ public com.google.protobuf.ByteString getTransaction() {
return transaction_;
}
- public static final int STATS_FIELD_NUMBER = 6;
- private com.google.datastore.v1.ResultSetStats stats_;
- /**
- *
- *
- *
- * Query plan and execution statistics. Note that the returned stats are
- * subject to change as Firestore evolves.
- *
- * This is only present when the request specifies a mode other than `NORMAL`.
- *
- *
- * .google.datastore.v1.ResultSetStats stats = 6;
- *
- * @return Whether the stats field is set.
- */
- @java.lang.Override
- public boolean hasStats() {
- return stats_ != null;
- }
- /**
- *
- *
- *
- * Query plan and execution statistics. Note that the returned stats are
- * subject to change as Firestore evolves.
- *
- * This is only present when the request specifies a mode other than `NORMAL`.
- *
- *
- * .google.datastore.v1.ResultSetStats stats = 6;
- *
- * @return The stats.
- */
- @java.lang.Override
- public com.google.datastore.v1.ResultSetStats getStats() {
- return stats_ == null ? com.google.datastore.v1.ResultSetStats.getDefaultInstance() : stats_;
- }
- /**
- *
- *
- *
- * Query plan and execution statistics. Note that the returned stats are
- * subject to change as Firestore evolves.
- *
- * This is only present when the request specifies a mode other than `NORMAL`.
- *
- *
- * .google.datastore.v1.ResultSetStats stats = 6;
- */
- @java.lang.Override
- public com.google.datastore.v1.ResultSetStatsOrBuilder getStatsOrBuilder() {
- return stats_ == null ? com.google.datastore.v1.ResultSetStats.getDefaultInstance() : stats_;
- }
-
private byte memoizedIsInitialized = -1;
@java.lang.Override
@@ -252,18 +199,15 @@ public final boolean isInitialized() {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
- if (batch_ != null) {
+ if (((bitField0_ & 0x00000001) != 0)) {
output.writeMessage(1, getBatch());
}
- if (query_ != null) {
+ if (((bitField0_ & 0x00000002) != 0)) {
output.writeMessage(2, getQuery());
}
if (!transaction_.isEmpty()) {
output.writeBytes(5, transaction_);
}
- if (stats_ != null) {
- output.writeMessage(6, getStats());
- }
getUnknownFields().writeTo(output);
}
@@ -273,18 +217,15 @@ public int getSerializedSize() {
if (size != -1) return size;
size = 0;
- if (batch_ != null) {
+ if (((bitField0_ & 0x00000001) != 0)) {
size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getBatch());
}
- if (query_ != null) {
+ if (((bitField0_ & 0x00000002) != 0)) {
size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getQuery());
}
if (!transaction_.isEmpty()) {
size += com.google.protobuf.CodedOutputStream.computeBytesSize(5, transaction_);
}
- if (stats_ != null) {
- size += com.google.protobuf.CodedOutputStream.computeMessageSize(6, getStats());
- }
size += getUnknownFields().getSerializedSize();
memoizedSize = size;
return size;
@@ -310,10 +251,6 @@ public boolean equals(final java.lang.Object obj) {
if (!getQuery().equals(other.getQuery())) return false;
}
if (!getTransaction().equals(other.getTransaction())) return false;
- if (hasStats() != other.hasStats()) return false;
- if (hasStats()) {
- if (!getStats().equals(other.getStats())) return false;
- }
if (!getUnknownFields().equals(other.getUnknownFields())) return false;
return true;
}
@@ -335,10 +272,6 @@ public int hashCode() {
}
hash = (37 * hash) + TRANSACTION_FIELD_NUMBER;
hash = (53 * hash) + getTransaction().hashCode();
- if (hasStats()) {
- hash = (37 * hash) + STATS_FIELD_NUMBER;
- hash = (53 * hash) + getStats().hashCode();
- }
hash = (29 * hash) + getUnknownFields().hashCode();
memoizedHashCode = hash;
return hash;
@@ -469,10 +402,20 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
}
// Construct using com.google.datastore.v1.RunAggregationQueryResponse.newBuilder()
- private Builder() {}
+ private Builder() {
+ maybeForceBuilderInitialization();
+ }
private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
super(parent);
+ maybeForceBuilderInitialization();
+ }
+
+ private void maybeForceBuilderInitialization() {
+ if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+ getBatchFieldBuilder();
+ getQueryFieldBuilder();
+ }
}
@java.lang.Override
@@ -490,11 +433,6 @@ public Builder clear() {
queryBuilder_ = null;
}
transaction_ = com.google.protobuf.ByteString.EMPTY;
- stats_ = null;
- if (statsBuilder_ != null) {
- statsBuilder_.dispose();
- statsBuilder_ = null;
- }
return this;
}
@@ -531,18 +469,19 @@ public com.google.datastore.v1.RunAggregationQueryResponse buildPartial() {
private void buildPartial0(com.google.datastore.v1.RunAggregationQueryResponse result) {
int from_bitField0_ = bitField0_;
+ int to_bitField0_ = 0;
if (((from_bitField0_ & 0x00000001) != 0)) {
result.batch_ = batchBuilder_ == null ? batch_ : batchBuilder_.build();
+ to_bitField0_ |= 0x00000001;
}
if (((from_bitField0_ & 0x00000002) != 0)) {
result.query_ = queryBuilder_ == null ? query_ : queryBuilder_.build();
+ to_bitField0_ |= 0x00000002;
}
if (((from_bitField0_ & 0x00000004) != 0)) {
result.transaction_ = transaction_;
}
- if (((from_bitField0_ & 0x00000008) != 0)) {
- result.stats_ = statsBuilder_ == null ? stats_ : statsBuilder_.build();
- }
+ result.bitField0_ |= to_bitField0_;
}
@java.lang.Override
@@ -600,9 +539,6 @@ public Builder mergeFrom(com.google.datastore.v1.RunAggregationQueryResponse oth
if (other.getTransaction() != com.google.protobuf.ByteString.EMPTY) {
setTransaction(other.getTransaction());
}
- if (other.hasStats()) {
- mergeStats(other.getStats());
- }
this.mergeUnknownFields(other.getUnknownFields());
onChanged();
return this;
@@ -647,12 +583,6 @@ public Builder mergeFrom(
bitField0_ |= 0x00000004;
break;
} // case 42
- case 50:
- {
- input.readMessage(getStatsFieldBuilder().getBuilder(), extensionRegistry);
- bitField0_ |= 0x00000008;
- break;
- } // case 50
default:
{
if (!super.parseUnknownField(input, extensionRegistry, tag)) {
@@ -775,8 +705,10 @@ public Builder mergeBatch(com.google.datastore.v1.AggregationResultBatch value)
} else {
batchBuilder_.mergeFrom(value);
}
- bitField0_ |= 0x00000001;
- onChanged();
+ if (batch_ != null) {
+ bitField0_ |= 0x00000001;
+ onChanged();
+ }
return this;
}
/**
@@ -958,8 +890,10 @@ public Builder mergeQuery(com.google.datastore.v1.AggregationQuery value) {
} else {
queryBuilder_.mergeFrom(value);
}
- bitField0_ |= 0x00000002;
- onChanged();
+ if (query_ != null) {
+ bitField0_ |= 0x00000002;
+ onChanged();
+ }
return this;
}
/**
@@ -1112,216 +1046,6 @@ public Builder clearTransaction() {
return this;
}
- private com.google.datastore.v1.ResultSetStats stats_;
- private com.google.protobuf.SingleFieldBuilderV3<
- com.google.datastore.v1.ResultSetStats,
- com.google.datastore.v1.ResultSetStats.Builder,
- com.google.datastore.v1.ResultSetStatsOrBuilder>
- statsBuilder_;
- /**
- *
- *
- *
- * Query plan and execution statistics. Note that the returned stats are
- * subject to change as Firestore evolves.
- *
- * This is only present when the request specifies a mode other than `NORMAL`.
- *
- *
- * .google.datastore.v1.ResultSetStats stats = 6;
- *
- * @return Whether the stats field is set.
- */
- public boolean hasStats() {
- return ((bitField0_ & 0x00000008) != 0);
- }
- /**
- *
- *
- *
- * Query plan and execution statistics. Note that the returned stats are
- * subject to change as Firestore evolves.
- *
- * This is only present when the request specifies a mode other than `NORMAL`.
- *
- *
- * .google.datastore.v1.ResultSetStats stats = 6;
- *
- * @return The stats.
- */
- public com.google.datastore.v1.ResultSetStats getStats() {
- if (statsBuilder_ == null) {
- return stats_ == null
- ? com.google.datastore.v1.ResultSetStats.getDefaultInstance()
- : stats_;
- } else {
- return statsBuilder_.getMessage();
- }
- }
- /**
- *
- *
- *
- * Query plan and execution statistics. Note that the returned stats are
- * subject to change as Firestore evolves.
- *
- * This is only present when the request specifies a mode other than `NORMAL`.
- *
- *
- * .google.datastore.v1.ResultSetStats stats = 6;
- */
- public Builder setStats(com.google.datastore.v1.ResultSetStats value) {
- if (statsBuilder_ == null) {
- if (value == null) {
- throw new NullPointerException();
- }
- stats_ = value;
- } else {
- statsBuilder_.setMessage(value);
- }
- bitField0_ |= 0x00000008;
- onChanged();
- return this;
- }
- /**
- *
- *
- *
- * Query plan and execution statistics. Note that the returned stats are
- * subject to change as Firestore evolves.
- *
- * This is only present when the request specifies a mode other than `NORMAL`.
- *
- *
- * .google.datastore.v1.ResultSetStats stats = 6;
- */
- public Builder setStats(com.google.datastore.v1.ResultSetStats.Builder builderForValue) {
- if (statsBuilder_ == null) {
- stats_ = builderForValue.build();
- } else {
- statsBuilder_.setMessage(builderForValue.build());
- }
- bitField0_ |= 0x00000008;
- onChanged();
- return this;
- }
- /**
- *
- *
- *
- * Query plan and execution statistics. Note that the returned stats are
- * subject to change as Firestore evolves.
- *
- * This is only present when the request specifies a mode other than `NORMAL`.
- *
- *
- * .google.datastore.v1.ResultSetStats stats = 6;
- */
- public Builder mergeStats(com.google.datastore.v1.ResultSetStats value) {
- if (statsBuilder_ == null) {
- if (((bitField0_ & 0x00000008) != 0)
- && stats_ != null
- && stats_ != com.google.datastore.v1.ResultSetStats.getDefaultInstance()) {
- getStatsBuilder().mergeFrom(value);
- } else {
- stats_ = value;
- }
- } else {
- statsBuilder_.mergeFrom(value);
- }
- bitField0_ |= 0x00000008;
- onChanged();
- return this;
- }
- /**
- *
- *
- *
- * Query plan and execution statistics. Note that the returned stats are
- * subject to change as Firestore evolves.
- *
- * This is only present when the request specifies a mode other than `NORMAL`.
- *
- *
- * .google.datastore.v1.ResultSetStats stats = 6;
- */
- public Builder clearStats() {
- bitField0_ = (bitField0_ & ~0x00000008);
- stats_ = null;
- if (statsBuilder_ != null) {
- statsBuilder_.dispose();
- statsBuilder_ = null;
- }
- onChanged();
- return this;
- }
- /**
- *
- *
- *
- * Query plan and execution statistics. Note that the returned stats are
- * subject to change as Firestore evolves.
- *
- * This is only present when the request specifies a mode other than `NORMAL`.
- *
- *
- * .google.datastore.v1.ResultSetStats stats = 6;
- */
- public com.google.datastore.v1.ResultSetStats.Builder getStatsBuilder() {
- bitField0_ |= 0x00000008;
- onChanged();
- return getStatsFieldBuilder().getBuilder();
- }
- /**
- *
- *
- *
- * Query plan and execution statistics. Note that the returned stats are
- * subject to change as Firestore evolves.
- *
- * This is only present when the request specifies a mode other than `NORMAL`.
- *
- *
- * .google.datastore.v1.ResultSetStats stats = 6;
- */
- public com.google.datastore.v1.ResultSetStatsOrBuilder getStatsOrBuilder() {
- if (statsBuilder_ != null) {
- return statsBuilder_.getMessageOrBuilder();
- } else {
- return stats_ == null
- ? com.google.datastore.v1.ResultSetStats.getDefaultInstance()
- : stats_;
- }
- }
- /**
- *
- *
- *
- * Query plan and execution statistics. Note that the returned stats are
- * subject to change as Firestore evolves.
- *
- * This is only present when the request specifies a mode other than `NORMAL`.
- *
- *
- * .google.datastore.v1.ResultSetStats stats = 6;
- */
- private com.google.protobuf.SingleFieldBuilderV3<
- com.google.datastore.v1.ResultSetStats,
- com.google.datastore.v1.ResultSetStats.Builder,
- com.google.datastore.v1.ResultSetStatsOrBuilder>
- getStatsFieldBuilder() {
- if (statsBuilder_ == null) {
- statsBuilder_ =
- new com.google.protobuf.SingleFieldBuilderV3<
- com.google.datastore.v1.ResultSetStats,
- com.google.datastore.v1.ResultSetStats.Builder,
- com.google.datastore.v1.ResultSetStatsOrBuilder>(
- getStats(), getParentForChildren(), isClean());
- stats_ = null;
- }
- return statsBuilder_;
- }
-
@java.lang.Override
public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
return super.setUnknownFields(unknownFields);
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryResponseOrBuilder.java
index 6caa14766..fc035ea99 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunAggregationQueryResponseOrBuilder.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2023 Google LLC
+ * 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.
@@ -16,6 +16,7 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/datastore/v1/datastore.proto
+// Protobuf Java Version: 3.25.2
package com.google.datastore.v1;
public interface RunAggregationQueryResponseOrBuilder
@@ -111,48 +112,4 @@ public interface RunAggregationQueryResponseOrBuilder
* @return The transaction.
*/
com.google.protobuf.ByteString getTransaction();
-
- /**
- *
- *
- *
- * Query plan and execution statistics. Note that the returned stats are
- * subject to change as Firestore evolves.
- *
- * This is only present when the request specifies a mode other than `NORMAL`.
- *
- *
- * .google.datastore.v1.ResultSetStats stats = 6;
- *
- * @return Whether the stats field is set.
- */
- boolean hasStats();
- /**
- *
- *
- *
- * Query plan and execution statistics. Note that the returned stats are
- * subject to change as Firestore evolves.
- *
- * This is only present when the request specifies a mode other than `NORMAL`.
- *
- *
- * .google.datastore.v1.ResultSetStats stats = 6;
- *
- * @return The stats.
- */
- com.google.datastore.v1.ResultSetStats getStats();
- /**
- *
- *
- *
- * Query plan and execution statistics. Note that the returned stats are
- * subject to change as Firestore evolves.
- *
- * This is only present when the request specifies a mode other than `NORMAL`.
- *
- *
- * .google.datastore.v1.ResultSetStats stats = 6;
- */
- com.google.datastore.v1.ResultSetStatsOrBuilder getStatsOrBuilder();
}
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequest.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequest.java
index 62666648c..e6a745896 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequest.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequest.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2023 Google LLC
+ * 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.
@@ -16,6 +16,7 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/datastore/v1/datastore.proto
+// Protobuf Java Version: 3.25.2
package com.google.datastore.v1;
/**
@@ -40,7 +41,6 @@ private RunQueryRequest(com.google.protobuf.GeneratedMessageV3.Builder builde
private RunQueryRequest() {
projectId_ = "";
databaseId_ = "";
- mode_ = 0;
}
@java.lang.Override
@@ -64,6 +64,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
com.google.datastore.v1.RunQueryRequest.Builder.class);
}
+ private int bitField0_;
private int queryTypeCase_ = 0;
@SuppressWarnings("serial")
@@ -239,7 +240,7 @@ public com.google.protobuf.ByteString getDatabaseIdBytes() {
*/
@java.lang.Override
public boolean hasPartitionId() {
- return partitionId_ != null;
+ return ((bitField0_ & 0x00000001) != 0);
}
/**
*
@@ -295,7 +296,7 @@ public com.google.datastore.v1.PartitionIdOrBuilder getPartitionIdOrBuilder() {
*/
@java.lang.Override
public boolean hasReadOptions() {
- return readOptions_ != null;
+ return ((bitField0_ & 0x00000002) != 0);
}
/**
*
@@ -432,46 +433,6 @@ public com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder() {
return com.google.datastore.v1.GqlQuery.getDefaultInstance();
}
- public static final int MODE_FIELD_NUMBER = 11;
- private int mode_ = 0;
- /**
- *
- *
- *
- * Optional. The mode in which the query request is processed. This field is
- * optional, and when not provided, it defaults to `NORMAL` mode where no
- * additional statistics will be returned with the query results.
- *
- *
- * .google.datastore.v1.QueryMode mode = 11 [(.google.api.field_behavior) = OPTIONAL];
- *
- *
- * @return The enum numeric value on the wire for mode.
- */
- @java.lang.Override
- public int getModeValue() {
- return mode_;
- }
- /**
- *
- *
- *
- * Optional. The mode in which the query request is processed. This field is
- * optional, and when not provided, it defaults to `NORMAL` mode where no
- * additional statistics will be returned with the query results.
- *
- *
- * .google.datastore.v1.QueryMode mode = 11 [(.google.api.field_behavior) = OPTIONAL];
- *
- *
- * @return The mode.
- */
- @java.lang.Override
- public com.google.datastore.v1.QueryMode getMode() {
- com.google.datastore.v1.QueryMode result = com.google.datastore.v1.QueryMode.forNumber(mode_);
- return result == null ? com.google.datastore.v1.QueryMode.UNRECOGNIZED : result;
- }
-
private byte memoizedIsInitialized = -1;
@java.lang.Override
@@ -486,10 +447,10 @@ public final boolean isInitialized() {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
- if (readOptions_ != null) {
+ if (((bitField0_ & 0x00000002) != 0)) {
output.writeMessage(1, getReadOptions());
}
- if (partitionId_ != null) {
+ if (((bitField0_ & 0x00000001) != 0)) {
output.writeMessage(2, getPartitionId());
}
if (queryTypeCase_ == 3) {
@@ -504,9 +465,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(databaseId_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 9, databaseId_);
}
- if (mode_ != com.google.datastore.v1.QueryMode.NORMAL.getNumber()) {
- output.writeEnum(11, mode_);
- }
getUnknownFields().writeTo(output);
}
@@ -516,10 +474,10 @@ public int getSerializedSize() {
if (size != -1) return size;
size = 0;
- if (readOptions_ != null) {
+ if (((bitField0_ & 0x00000002) != 0)) {
size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getReadOptions());
}
- if (partitionId_ != null) {
+ if (((bitField0_ & 0x00000001) != 0)) {
size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getPartitionId());
}
if (queryTypeCase_ == 3) {
@@ -538,9 +496,6 @@ public int getSerializedSize() {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(databaseId_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(9, databaseId_);
}
- if (mode_ != com.google.datastore.v1.QueryMode.NORMAL.getNumber()) {
- size += com.google.protobuf.CodedOutputStream.computeEnumSize(11, mode_);
- }
size += getUnknownFields().getSerializedSize();
memoizedSize = size;
return size;
@@ -566,7 +521,6 @@ public boolean equals(final java.lang.Object obj) {
if (hasReadOptions()) {
if (!getReadOptions().equals(other.getReadOptions())) return false;
}
- if (mode_ != other.mode_) return false;
if (!getQueryTypeCase().equals(other.getQueryTypeCase())) return false;
switch (queryTypeCase_) {
case 3:
@@ -601,8 +555,6 @@ public int hashCode() {
hash = (37 * hash) + READ_OPTIONS_FIELD_NUMBER;
hash = (53 * hash) + getReadOptions().hashCode();
}
- hash = (37 * hash) + MODE_FIELD_NUMBER;
- hash = (53 * hash) + mode_;
switch (queryTypeCase_) {
case 3:
hash = (37 * hash) + QUERY_FIELD_NUMBER;
@@ -744,10 +696,20 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
}
// Construct using com.google.datastore.v1.RunQueryRequest.newBuilder()
- private Builder() {}
+ private Builder() {
+ maybeForceBuilderInitialization();
+ }
private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
super(parent);
+ maybeForceBuilderInitialization();
+ }
+
+ private void maybeForceBuilderInitialization() {
+ if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+ getPartitionIdFieldBuilder();
+ getReadOptionsFieldBuilder();
+ }
}
@java.lang.Override
@@ -772,7 +734,6 @@ public Builder clear() {
if (gqlQueryBuilder_ != null) {
gqlQueryBuilder_.clear();
}
- mode_ = 0;
queryTypeCase_ = 0;
queryType_ = null;
return this;
@@ -818,17 +779,18 @@ private void buildPartial0(com.google.datastore.v1.RunQueryRequest result) {
if (((from_bitField0_ & 0x00000002) != 0)) {
result.databaseId_ = databaseId_;
}
+ int to_bitField0_ = 0;
if (((from_bitField0_ & 0x00000004) != 0)) {
result.partitionId_ =
partitionIdBuilder_ == null ? partitionId_ : partitionIdBuilder_.build();
+ to_bitField0_ |= 0x00000001;
}
if (((from_bitField0_ & 0x00000008) != 0)) {
result.readOptions_ =
readOptionsBuilder_ == null ? readOptions_ : readOptionsBuilder_.build();
+ to_bitField0_ |= 0x00000002;
}
- if (((from_bitField0_ & 0x00000040) != 0)) {
- result.mode_ = mode_;
- }
+ result.bitField0_ |= to_bitField0_;
}
private void buildPartialOneofs(com.google.datastore.v1.RunQueryRequest result) {
@@ -903,9 +865,6 @@ public Builder mergeFrom(com.google.datastore.v1.RunQueryRequest other) {
if (other.hasReadOptions()) {
mergeReadOptions(other.getReadOptions());
}
- if (other.mode_ != 0) {
- setModeValue(other.getModeValue());
- }
switch (other.getQueryTypeCase()) {
case QUERY:
{
@@ -984,12 +943,6 @@ public Builder mergeFrom(
bitField0_ |= 0x00000002;
break;
} // case 74
- case 88:
- {
- mode_ = input.readEnum();
- bitField0_ |= 0x00000040;
- break;
- } // case 88
default:
{
if (!super.parseUnknownField(input, extensionRegistry, tag)) {
@@ -1367,8 +1320,10 @@ public Builder mergePartitionId(com.google.datastore.v1.PartitionId value) {
} else {
partitionIdBuilder_.mergeFrom(value);
}
- bitField0_ |= 0x00000004;
- onChanged();
+ if (partitionId_ != null) {
+ bitField0_ |= 0x00000004;
+ onChanged();
+ }
return this;
}
/**
@@ -1562,8 +1517,10 @@ public Builder mergeReadOptions(com.google.datastore.v1.ReadOptions value) {
} else {
readOptionsBuilder_.mergeFrom(value);
}
- bitField0_ |= 0x00000008;
- onChanged();
+ if (readOptions_ != null) {
+ bitField0_ |= 0x00000008;
+ onChanged();
+ }
return this;
}
/**
@@ -2054,110 +2011,6 @@ public com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder() {
return gqlQueryBuilder_;
}
- private int mode_ = 0;
- /**
- *
- *
- *
- * Optional. The mode in which the query request is processed. This field is
- * optional, and when not provided, it defaults to `NORMAL` mode where no
- * additional statistics will be returned with the query results.
- *
- *
- * .google.datastore.v1.QueryMode mode = 11 [(.google.api.field_behavior) = OPTIONAL];
- *
- *
- * @return The enum numeric value on the wire for mode.
- */
- @java.lang.Override
- public int getModeValue() {
- return mode_;
- }
- /**
- *
- *
- *
- * Optional. The mode in which the query request is processed. This field is
- * optional, and when not provided, it defaults to `NORMAL` mode where no
- * additional statistics will be returned with the query results.
- *
- *
- * .google.datastore.v1.QueryMode mode = 11 [(.google.api.field_behavior) = OPTIONAL];
- *
- *
- * @param value The enum numeric value on the wire for mode to set.
- * @return This builder for chaining.
- */
- public Builder setModeValue(int value) {
- mode_ = value;
- bitField0_ |= 0x00000040;
- onChanged();
- return this;
- }
- /**
- *
- *
- *
- * Optional. The mode in which the query request is processed. This field is
- * optional, and when not provided, it defaults to `NORMAL` mode where no
- * additional statistics will be returned with the query results.
- *
- *
- * .google.datastore.v1.QueryMode mode = 11 [(.google.api.field_behavior) = OPTIONAL];
- *
- *
- * @return The mode.
- */
- @java.lang.Override
- public com.google.datastore.v1.QueryMode getMode() {
- com.google.datastore.v1.QueryMode result = com.google.datastore.v1.QueryMode.forNumber(mode_);
- return result == null ? com.google.datastore.v1.QueryMode.UNRECOGNIZED : result;
- }
- /**
- *
- *
- *
- * Optional. The mode in which the query request is processed. This field is
- * optional, and when not provided, it defaults to `NORMAL` mode where no
- * additional statistics will be returned with the query results.
- *
- *
- * .google.datastore.v1.QueryMode mode = 11 [(.google.api.field_behavior) = OPTIONAL];
- *
- *
- * @param value The mode to set.
- * @return This builder for chaining.
- */
- public Builder setMode(com.google.datastore.v1.QueryMode value) {
- if (value == null) {
- throw new NullPointerException();
- }
- bitField0_ |= 0x00000040;
- mode_ = value.getNumber();
- onChanged();
- return this;
- }
- /**
- *
- *
- *
- * Optional. The mode in which the query request is processed. This field is
- * optional, and when not provided, it defaults to `NORMAL` mode where no
- * additional statistics will be returned with the query results.
- *
- *
- * .google.datastore.v1.QueryMode mode = 11 [(.google.api.field_behavior) = OPTIONAL];
- *
- *
- * @return This builder for chaining.
- */
- public Builder clearMode() {
- bitField0_ = (bitField0_ & ~0x00000040);
- mode_ = 0;
- onChanged();
- return this;
- }
-
@java.lang.Override
public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
return super.setUnknownFields(unknownFields);
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequestOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequestOrBuilder.java
index 0f2184076..b11ecd648 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequestOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequestOrBuilder.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2023 Google LLC
+ * 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.
@@ -16,6 +16,7 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/datastore/v1/datastore.proto
+// Protobuf Java Version: 3.25.2
package com.google.datastore.v1;
public interface RunQueryRequestOrBuilder
@@ -228,36 +229,5 @@ public interface RunQueryRequestOrBuilder
*/
com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder();
- /**
- *
- *
- *
- * Optional. The mode in which the query request is processed. This field is
- * optional, and when not provided, it defaults to `NORMAL` mode where no
- * additional statistics will be returned with the query results.
- *
- *
- * .google.datastore.v1.QueryMode mode = 11 [(.google.api.field_behavior) = OPTIONAL];
- *
- *
- * @return The enum numeric value on the wire for mode.
- */
- int getModeValue();
- /**
- *
- *
- *
- * Optional. The mode in which the query request is processed. This field is
- * optional, and when not provided, it defaults to `NORMAL` mode where no
- * additional statistics will be returned with the query results.
- *
- *
- * .google.datastore.v1.QueryMode mode = 11 [(.google.api.field_behavior) = OPTIONAL];
- *
- *
- * @return The mode.
- */
- com.google.datastore.v1.QueryMode getMode();
-
com.google.datastore.v1.RunQueryRequest.QueryTypeCase getQueryTypeCase();
}
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryResponse.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryResponse.java
index a9f585048..f4852c6a8 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryResponse.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryResponse.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2023 Google LLC
+ * 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.
@@ -16,6 +16,7 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/datastore/v1/datastore.proto
+// Protobuf Java Version: 3.25.2
package com.google.datastore.v1;
/**
@@ -63,6 +64,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
com.google.datastore.v1.RunQueryResponse.Builder.class);
}
+ private int bitField0_;
public static final int BATCH_FIELD_NUMBER = 1;
private com.google.datastore.v1.QueryResultBatch batch_;
/**
@@ -78,7 +80,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
*/
@java.lang.Override
public boolean hasBatch() {
- return batch_ != null;
+ return ((bitField0_ & 0x00000001) != 0);
}
/**
*
@@ -124,7 +126,7 @@ public com.google.datastore.v1.QueryResultBatchOrBuilder getBatchOrBuilder() {
*/
@java.lang.Override
public boolean hasQuery() {
- return query_ != null;
+ return ((bitField0_ & 0x00000002) != 0);
}
/**
*
@@ -179,61 +181,6 @@ public com.google.protobuf.ByteString getTransaction() {
return transaction_;
}
- public static final int STATS_FIELD_NUMBER = 6;
- private com.google.datastore.v1.ResultSetStats stats_;
- /**
- *
- *
- *
- * Query plan and execution statistics. Note that the returned stats are
- * subject to change as Firestore evolves.
- *
- * This is only present when the request specifies a mode other than `NORMAL`.
- *
- *
- * .google.datastore.v1.ResultSetStats stats = 6;
- *
- * @return Whether the stats field is set.
- */
- @java.lang.Override
- public boolean hasStats() {
- return stats_ != null;
- }
- /**
- *
- *
- *
- * Query plan and execution statistics. Note that the returned stats are
- * subject to change as Firestore evolves.
- *
- * This is only present when the request specifies a mode other than `NORMAL`.
- *
- *
- * .google.datastore.v1.ResultSetStats stats = 6;
- *
- * @return The stats.
- */
- @java.lang.Override
- public com.google.datastore.v1.ResultSetStats getStats() {
- return stats_ == null ? com.google.datastore.v1.ResultSetStats.getDefaultInstance() : stats_;
- }
- /**
- *
- *
- *
- * Query plan and execution statistics. Note that the returned stats are
- * subject to change as Firestore evolves.
- *
- * This is only present when the request specifies a mode other than `NORMAL`.
- *
- *
- * .google.datastore.v1.ResultSetStats stats = 6;
- */
- @java.lang.Override
- public com.google.datastore.v1.ResultSetStatsOrBuilder getStatsOrBuilder() {
- return stats_ == null ? com.google.datastore.v1.ResultSetStats.getDefaultInstance() : stats_;
- }
-
private byte memoizedIsInitialized = -1;
@java.lang.Override
@@ -248,18 +195,15 @@ public final boolean isInitialized() {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
- if (batch_ != null) {
+ if (((bitField0_ & 0x00000001) != 0)) {
output.writeMessage(1, getBatch());
}
- if (query_ != null) {
+ if (((bitField0_ & 0x00000002) != 0)) {
output.writeMessage(2, getQuery());
}
if (!transaction_.isEmpty()) {
output.writeBytes(5, transaction_);
}
- if (stats_ != null) {
- output.writeMessage(6, getStats());
- }
getUnknownFields().writeTo(output);
}
@@ -269,18 +213,15 @@ public int getSerializedSize() {
if (size != -1) return size;
size = 0;
- if (batch_ != null) {
+ if (((bitField0_ & 0x00000001) != 0)) {
size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getBatch());
}
- if (query_ != null) {
+ if (((bitField0_ & 0x00000002) != 0)) {
size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getQuery());
}
if (!transaction_.isEmpty()) {
size += com.google.protobuf.CodedOutputStream.computeBytesSize(5, transaction_);
}
- if (stats_ != null) {
- size += com.google.protobuf.CodedOutputStream.computeMessageSize(6, getStats());
- }
size += getUnknownFields().getSerializedSize();
memoizedSize = size;
return size;
@@ -305,10 +246,6 @@ public boolean equals(final java.lang.Object obj) {
if (!getQuery().equals(other.getQuery())) return false;
}
if (!getTransaction().equals(other.getTransaction())) return false;
- if (hasStats() != other.hasStats()) return false;
- if (hasStats()) {
- if (!getStats().equals(other.getStats())) return false;
- }
if (!getUnknownFields().equals(other.getUnknownFields())) return false;
return true;
}
@@ -330,10 +267,6 @@ public int hashCode() {
}
hash = (37 * hash) + TRANSACTION_FIELD_NUMBER;
hash = (53 * hash) + getTransaction().hashCode();
- if (hasStats()) {
- hash = (37 * hash) + STATS_FIELD_NUMBER;
- hash = (53 * hash) + getStats().hashCode();
- }
hash = (29 * hash) + getUnknownFields().hashCode();
memoizedHashCode = hash;
return hash;
@@ -464,10 +397,20 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
}
// Construct using com.google.datastore.v1.RunQueryResponse.newBuilder()
- private Builder() {}
+ private Builder() {
+ maybeForceBuilderInitialization();
+ }
private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
super(parent);
+ maybeForceBuilderInitialization();
+ }
+
+ private void maybeForceBuilderInitialization() {
+ if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+ getBatchFieldBuilder();
+ getQueryFieldBuilder();
+ }
}
@java.lang.Override
@@ -485,11 +428,6 @@ public Builder clear() {
queryBuilder_ = null;
}
transaction_ = com.google.protobuf.ByteString.EMPTY;
- stats_ = null;
- if (statsBuilder_ != null) {
- statsBuilder_.dispose();
- statsBuilder_ = null;
- }
return this;
}
@@ -526,18 +464,19 @@ public com.google.datastore.v1.RunQueryResponse buildPartial() {
private void buildPartial0(com.google.datastore.v1.RunQueryResponse result) {
int from_bitField0_ = bitField0_;
+ int to_bitField0_ = 0;
if (((from_bitField0_ & 0x00000001) != 0)) {
result.batch_ = batchBuilder_ == null ? batch_ : batchBuilder_.build();
+ to_bitField0_ |= 0x00000001;
}
if (((from_bitField0_ & 0x00000002) != 0)) {
result.query_ = queryBuilder_ == null ? query_ : queryBuilder_.build();
+ to_bitField0_ |= 0x00000002;
}
if (((from_bitField0_ & 0x00000004) != 0)) {
result.transaction_ = transaction_;
}
- if (((from_bitField0_ & 0x00000008) != 0)) {
- result.stats_ = statsBuilder_ == null ? stats_ : statsBuilder_.build();
- }
+ result.bitField0_ |= to_bitField0_;
}
@java.lang.Override
@@ -594,9 +533,6 @@ public Builder mergeFrom(com.google.datastore.v1.RunQueryResponse other) {
if (other.getTransaction() != com.google.protobuf.ByteString.EMPTY) {
setTransaction(other.getTransaction());
}
- if (other.hasStats()) {
- mergeStats(other.getStats());
- }
this.mergeUnknownFields(other.getUnknownFields());
onChanged();
return this;
@@ -641,12 +577,6 @@ public Builder mergeFrom(
bitField0_ |= 0x00000004;
break;
} // case 42
- case 50:
- {
- input.readMessage(getStatsFieldBuilder().getBuilder(), extensionRegistry);
- bitField0_ |= 0x00000008;
- break;
- } // case 50
default:
{
if (!super.parseUnknownField(input, extensionRegistry, tag)) {
@@ -768,8 +698,10 @@ public Builder mergeBatch(com.google.datastore.v1.QueryResultBatch value) {
} else {
batchBuilder_.mergeFrom(value);
}
- bitField0_ |= 0x00000001;
- onChanged();
+ if (batch_ != null) {
+ bitField0_ |= 0x00000001;
+ onChanged();
+ }
return this;
}
/**
@@ -949,8 +881,10 @@ public Builder mergeQuery(com.google.datastore.v1.Query value) {
} else {
queryBuilder_.mergeFrom(value);
}
- bitField0_ |= 0x00000002;
- onChanged();
+ if (query_ != null) {
+ bitField0_ |= 0x00000002;
+ onChanged();
+ }
return this;
}
/**
@@ -1101,216 +1035,6 @@ public Builder clearTransaction() {
return this;
}
- private com.google.datastore.v1.ResultSetStats stats_;
- private com.google.protobuf.SingleFieldBuilderV3<
- com.google.datastore.v1.ResultSetStats,
- com.google.datastore.v1.ResultSetStats.Builder,
- com.google.datastore.v1.ResultSetStatsOrBuilder>
- statsBuilder_;
- /**
- *
- *
- *
- * Query plan and execution statistics. Note that the returned stats are
- * subject to change as Firestore evolves.
- *
- * This is only present when the request specifies a mode other than `NORMAL`.
- *
- *
- * .google.datastore.v1.ResultSetStats stats = 6;
- *
- * @return Whether the stats field is set.
- */
- public boolean hasStats() {
- return ((bitField0_ & 0x00000008) != 0);
- }
- /**
- *
- *
- *
- * Query plan and execution statistics. Note that the returned stats are
- * subject to change as Firestore evolves.
- *
- * This is only present when the request specifies a mode other than `NORMAL`.
- *
- *
- * .google.datastore.v1.ResultSetStats stats = 6;
- *
- * @return The stats.
- */
- public com.google.datastore.v1.ResultSetStats getStats() {
- if (statsBuilder_ == null) {
- return stats_ == null
- ? com.google.datastore.v1.ResultSetStats.getDefaultInstance()
- : stats_;
- } else {
- return statsBuilder_.getMessage();
- }
- }
- /**
- *
- *
- *
- * Query plan and execution statistics. Note that the returned stats are
- * subject to change as Firestore evolves.
- *
- * This is only present when the request specifies a mode other than `NORMAL`.
- *
- *
- * .google.datastore.v1.ResultSetStats stats = 6;
- */
- public Builder setStats(com.google.datastore.v1.ResultSetStats value) {
- if (statsBuilder_ == null) {
- if (value == null) {
- throw new NullPointerException();
- }
- stats_ = value;
- } else {
- statsBuilder_.setMessage(value);
- }
- bitField0_ |= 0x00000008;
- onChanged();
- return this;
- }
- /**
- *
- *
- *
- * Query plan and execution statistics. Note that the returned stats are
- * subject to change as Firestore evolves.
- *
- * This is only present when the request specifies a mode other than `NORMAL`.
- *
- *
- * .google.datastore.v1.ResultSetStats stats = 6;
- */
- public Builder setStats(com.google.datastore.v1.ResultSetStats.Builder builderForValue) {
- if (statsBuilder_ == null) {
- stats_ = builderForValue.build();
- } else {
- statsBuilder_.setMessage(builderForValue.build());
- }
- bitField0_ |= 0x00000008;
- onChanged();
- return this;
- }
- /**
- *
- *
- *
- * Query plan and execution statistics. Note that the returned stats are
- * subject to change as Firestore evolves.
- *
- * This is only present when the request specifies a mode other than `NORMAL`.
- *
- *
- * .google.datastore.v1.ResultSetStats stats = 6;
- */
- public Builder mergeStats(com.google.datastore.v1.ResultSetStats value) {
- if (statsBuilder_ == null) {
- if (((bitField0_ & 0x00000008) != 0)
- && stats_ != null
- && stats_ != com.google.datastore.v1.ResultSetStats.getDefaultInstance()) {
- getStatsBuilder().mergeFrom(value);
- } else {
- stats_ = value;
- }
- } else {
- statsBuilder_.mergeFrom(value);
- }
- bitField0_ |= 0x00000008;
- onChanged();
- return this;
- }
- /**
- *
- *
- *
- * Query plan and execution statistics. Note that the returned stats are
- * subject to change as Firestore evolves.
- *
- * This is only present when the request specifies a mode other than `NORMAL`.
- *
- *
- * .google.datastore.v1.ResultSetStats stats = 6;
- */
- public Builder clearStats() {
- bitField0_ = (bitField0_ & ~0x00000008);
- stats_ = null;
- if (statsBuilder_ != null) {
- statsBuilder_.dispose();
- statsBuilder_ = null;
- }
- onChanged();
- return this;
- }
- /**
- *
- *
- *
- * Query plan and execution statistics. Note that the returned stats are
- * subject to change as Firestore evolves.
- *
- * This is only present when the request specifies a mode other than `NORMAL`.
- *
- *
- * .google.datastore.v1.ResultSetStats stats = 6;
- */
- public com.google.datastore.v1.ResultSetStats.Builder getStatsBuilder() {
- bitField0_ |= 0x00000008;
- onChanged();
- return getStatsFieldBuilder().getBuilder();
- }
- /**
- *
- *
- *
- * Query plan and execution statistics. Note that the returned stats are
- * subject to change as Firestore evolves.
- *
- * This is only present when the request specifies a mode other than `NORMAL`.
- *
- *
- * .google.datastore.v1.ResultSetStats stats = 6;
- */
- public com.google.datastore.v1.ResultSetStatsOrBuilder getStatsOrBuilder() {
- if (statsBuilder_ != null) {
- return statsBuilder_.getMessageOrBuilder();
- } else {
- return stats_ == null
- ? com.google.datastore.v1.ResultSetStats.getDefaultInstance()
- : stats_;
- }
- }
- /**
- *
- *
- *
- * Query plan and execution statistics. Note that the returned stats are
- * subject to change as Firestore evolves.
- *
- * This is only present when the request specifies a mode other than `NORMAL`.
- *
- *
- * .google.datastore.v1.ResultSetStats stats = 6;
- */
- private com.google.protobuf.SingleFieldBuilderV3<
- com.google.datastore.v1.ResultSetStats,
- com.google.datastore.v1.ResultSetStats.Builder,
- com.google.datastore.v1.ResultSetStatsOrBuilder>
- getStatsFieldBuilder() {
- if (statsBuilder_ == null) {
- statsBuilder_ =
- new com.google.protobuf.SingleFieldBuilderV3<
- com.google.datastore.v1.ResultSetStats,
- com.google.datastore.v1.ResultSetStats.Builder,
- com.google.datastore.v1.ResultSetStatsOrBuilder>(
- getStats(), getParentForChildren(), isClean());
- stats_ = null;
- }
- return statsBuilder_;
- }
-
@java.lang.Override
public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
return super.setUnknownFields(unknownFields);
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryResponseOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryResponseOrBuilder.java
index bbd48b7b5..53de7bf14 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryResponseOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryResponseOrBuilder.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2023 Google LLC
+ * 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.
@@ -16,6 +16,7 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/datastore/v1/datastore.proto
+// Protobuf Java Version: 3.25.2
package com.google.datastore.v1;
public interface RunQueryResponseOrBuilder
@@ -111,48 +112,4 @@ public interface RunQueryResponseOrBuilder
* @return The transaction.
*/
com.google.protobuf.ByteString getTransaction();
-
- /**
- *
- *
- *
- * Query plan and execution statistics. Note that the returned stats are
- * subject to change as Firestore evolves.
- *
- * This is only present when the request specifies a mode other than `NORMAL`.
- *
- *
- * .google.datastore.v1.ResultSetStats stats = 6;
- *
- * @return Whether the stats field is set.
- */
- boolean hasStats();
- /**
- *
- *
- *
- * Query plan and execution statistics. Note that the returned stats are
- * subject to change as Firestore evolves.
- *
- * This is only present when the request specifies a mode other than `NORMAL`.
- *
- *
- * .google.datastore.v1.ResultSetStats stats = 6;
- *
- * @return The stats.
- */
- com.google.datastore.v1.ResultSetStats getStats();
- /**
- *
- *
- *
- * Query plan and execution statistics. Note that the returned stats are
- * subject to change as Firestore evolves.
- *
- * This is only present when the request specifies a mode other than `NORMAL`.
- *
- *
- * .google.datastore.v1.ResultSetStats stats = 6;
- */
- com.google.datastore.v1.ResultSetStatsOrBuilder getStatsOrBuilder();
}
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/TransactionOptions.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/TransactionOptions.java
index 3f8f3209f..1eb755ea8 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/TransactionOptions.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/TransactionOptions.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2023 Google LLC
+ * 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.
@@ -16,6 +16,7 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/datastore/v1/datastore.proto
+// Protobuf Java Version: 3.25.2
package com.google.datastore.v1;
/**
@@ -706,6 +707,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
com.google.datastore.v1.TransactionOptions.ReadOnly.Builder.class);
}
+ private int bitField0_;
public static final int READ_TIME_FIELD_NUMBER = 1;
private com.google.protobuf.Timestamp readTime_;
/**
@@ -725,7 +727,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
*/
@java.lang.Override
public boolean hasReadTime() {
- return readTime_ != null;
+ return ((bitField0_ & 0x00000001) != 0);
}
/**
*
@@ -778,7 +780,7 @@ public final boolean isInitialized() {
@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
- if (readTime_ != null) {
+ if (((bitField0_ & 0x00000001) != 0)) {
output.writeMessage(1, getReadTime());
}
getUnknownFields().writeTo(output);
@@ -790,7 +792,7 @@ public int getSerializedSize() {
if (size != -1) return size;
size = 0;
- if (readTime_ != null) {
+ if (((bitField0_ & 0x00000001) != 0)) {
size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getReadTime());
}
size += getUnknownFields().getSerializedSize();
@@ -960,10 +962,19 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
}
// Construct using com.google.datastore.v1.TransactionOptions.ReadOnly.newBuilder()
- private Builder() {}
+ private Builder() {
+ maybeForceBuilderInitialization();
+ }
private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
super(parent);
+ maybeForceBuilderInitialization();
+ }
+
+ private void maybeForceBuilderInitialization() {
+ if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
+ getReadTimeFieldBuilder();
+ }
}
@java.lang.Override
@@ -1011,9 +1022,12 @@ public com.google.datastore.v1.TransactionOptions.ReadOnly buildPartial() {
private void buildPartial0(com.google.datastore.v1.TransactionOptions.ReadOnly result) {
int from_bitField0_ = bitField0_;
+ int to_bitField0_ = 0;
if (((from_bitField0_ & 0x00000001) != 0)) {
result.readTime_ = readTimeBuilder_ == null ? readTime_ : readTimeBuilder_.build();
+ to_bitField0_ |= 0x00000001;
}
+ result.bitField0_ |= to_bitField0_;
}
@java.lang.Override
@@ -1238,8 +1252,10 @@ public Builder mergeReadTime(com.google.protobuf.Timestamp value) {
} else {
readTimeBuilder_.mergeFrom(value);
}
- bitField0_ |= 0x00000001;
- onChanged();
+ if (readTime_ != null) {
+ bitField0_ |= 0x00000001;
+ onChanged();
+ }
return this;
}
/**
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/TransactionOptionsOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/TransactionOptionsOrBuilder.java
index 5ebbe3a91..c2f961502 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/TransactionOptionsOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/TransactionOptionsOrBuilder.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2023 Google LLC
+ * 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.
@@ -16,6 +16,7 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/datastore/v1/datastore.proto
+// Protobuf Java Version: 3.25.2
package com.google.datastore.v1;
public interface TransactionOptionsOrBuilder
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Value.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Value.java
index 4b7e04978..5ecb2df76 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Value.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Value.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2023 Google LLC
+ * 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.
@@ -16,6 +16,7 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/datastore/v1/entity.proto
+// Protobuf Java Version: 3.25.2
package com.google.datastore.v1;
/**
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ValueOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ValueOrBuilder.java
index d9102d3d3..1b472f4fc 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ValueOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ValueOrBuilder.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2023 Google LLC
+ * 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.
@@ -16,6 +16,7 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/datastore/v1/entity.proto
+// Protobuf Java Version: 3.25.2
package com.google.datastore.v1;
public interface ValueOrBuilder
diff --git a/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/datastore.proto b/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/datastore.proto
index 476d48f02..533988d77 100644
--- a/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/datastore.proto
+++ b/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/datastore.proto
@@ -23,7 +23,6 @@ import "google/api/routing.proto";
import "google/datastore/v1/aggregation_result.proto";
import "google/datastore/v1/entity.proto";
import "google/datastore/v1/query.proto";
-import "google/datastore/v1/query_profile.proto";
import "google/protobuf/timestamp.proto";
option csharp_namespace = "Google.Cloud.Datastore.V1";
@@ -233,11 +232,6 @@ message RunQueryRequest {
// The GQL query to run. This query must be a non-aggregation query.
GqlQuery gql_query = 7;
}
-
- // Optional. The mode in which the query request is processed. This field is
- // optional, and when not provided, it defaults to `NORMAL` mode where no
- // additional statistics will be returned with the query results.
- QueryMode mode = 11 [(google.api.field_behavior) = OPTIONAL];
}
// The response for
@@ -257,12 +251,6 @@ message RunQueryResponse {
// was set in
// [RunQueryRequest.read_options][google.datastore.v1.RunQueryRequest.read_options].
bytes transaction = 5;
-
- // Query plan and execution statistics. Note that the returned stats are
- // subject to change as Firestore evolves.
- //
- // This is only present when the request specifies a mode other than `NORMAL`.
- ResultSetStats stats = 6;
}
// The request for
@@ -294,11 +282,6 @@ message RunAggregationQueryRequest {
// The GQL query to run. This query must be an aggregation query.
GqlQuery gql_query = 7;
}
-
- // Optional. The mode in which the query request is processed. This field is
- // optional, and when not provided, it defaults to `NORMAL` mode where no
- // additional statistics will be returned with the query results.
- QueryMode mode = 10 [(google.api.field_behavior) = OPTIONAL];
}
// The response for
@@ -318,12 +301,6 @@ message RunAggregationQueryResponse {
// was set in
// [RunAggregationQueryRequest.read_options][google.datastore.v1.RunAggregationQueryRequest.read_options].
bytes transaction = 5;
-
- // Query plan and execution statistics. Note that the returned stats are
- // subject to change as Firestore evolves.
- //
- // This is only present when the request specifies a mode other than `NORMAL`.
- ResultSetStats stats = 6;
}
// The request for
diff --git a/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/query_profile.proto b/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/query_profile.proto
deleted file mode 100644
index 05c1cf95e..000000000
--- a/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/query_profile.proto
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright 2023 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.
-
-syntax = "proto3";
-
-package google.datastore.v1;
-
-import "google/protobuf/struct.proto";
-
-option csharp_namespace = "Google.Cloud.Datastore.V1";
-option go_package = "google.golang.org/genproto/googleapis/datastore/v1;datastore";
-option java_multiple_files = true;
-option java_outer_classname = "QueryProfileProto";
-option java_package = "com.google.datastore.v1";
-option php_namespace = "Google\\Cloud\\Datastore\\V1";
-option ruby_package = "Google::Cloud::Datastore::V1";
-
-// Specification of the Datastore Query Profile fields.
-
-// The mode in which the query request must be processed.
-enum QueryMode {
- // The default mode. Only the query results are returned.
- NORMAL = 0;
-
- // This mode returns only the query plan, without any results or execution
- // statistics information.
- PLAN = 1;
-
- // This mode returns both the query plan and the execution statistics along
- // with the results.
- PROFILE = 2;
-}
-
-// Plan for the query.
-message QueryPlan {
- // Planning phase information for the query. It will include:
- //
- // {
- // "indexes_used": [
- // {"query_scope": "Collection", "properties": "(foo ASC, __name__ ASC)"},
- // {"query_scope": "Collection", "properties": "(bar ASC, __name__ ASC)"}
- // ]
- // }
- google.protobuf.Struct plan_info = 1;
-}
-
-// Planning and execution statistics for the query.
-message ResultSetStats {
- // Plan for the query.
- QueryPlan query_plan = 1;
-
- // Aggregated statistics from the execution of the query.
- //
- // This will only be present when the request specifies `PROFILE` mode.
- // For example, a query will return the statistics including:
- //
- // {
- // "results_returned": "20",
- // "documents_scanned": "20",
- // "indexes_entries_scanned": "10050",
- // "total_execution_time": "100.7 msecs"
- // }
- google.protobuf.Struct query_stats = 2;
-}
diff --git a/renovate.json b/renovate.json
index d85059fc5..f974ba2a9 100644
--- a/renovate.json
+++ b/renovate.json
@@ -14,6 +14,17 @@
".kokoro/requirements.txt",
".github/workflows/**"
],
+ "customManagers": [
+ {
+ "customType": "regex",
+ "fileMatch": [
+ "^.kokoro/presubmit/graalvm-native.*.cfg$"
+ ],
+ "matchStrings": ["value: \"gcr.io/cloud-devrel-public-resources/graalvm.*:(?.*?)\""],
+ "depNameTemplate": "com.google.cloud:sdk-platform-java-config",
+ "datasourceTemplate": "maven"
+ }
+ ],
"packageRules": [
{
"packagePatterns": [
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 2fcc3ac9a..dc958c9ac 100644
--- a/samples/install-without-bom/pom.xml
+++ b/samples/install-without-bom/pom.xml
@@ -29,7 +29,7 @@
com.google.cloud
google-cloud-datastore
- 2.18.1
+ 2.18.2
diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml
index 88ba1a662..0bb18a3c2 100644
--- a/samples/native-image-sample/pom.xml
+++ b/samples/native-image-sample/pom.xml
@@ -28,7 +28,7 @@
com.google.cloud
libraries-bom
- 26.30.0
+ 26.31.0
pom
import
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 8e828bc15..d58bf7bca 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
com.google.cloud
google-cloud-datastore
- 2.18.2
+ 2.18.3
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 766cad1cb..4771bf6c8 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
com.google.cloud
libraries-bom
- 26.30.0
+ 26.31.0
pom
import
diff --git a/versions.txt b/versions.txt
index 87f04f401..3b8b0e608 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
# Format:
# module:released-version:current-version
-google-cloud-datastore:2.18.2:2.18.2
-google-cloud-datastore-bom:2.18.2:2.18.2
-proto-google-cloud-datastore-v1:0.109.2:0.109.2
-datastore-v1-proto-client:2.18.2:2.18.2
-proto-google-cloud-datastore-admin-v1:2.18.2:2.18.2
-grpc-google-cloud-datastore-admin-v1:2.18.2:2.18.2
+google-cloud-datastore:2.18.3:2.18.3
+google-cloud-datastore-bom:2.18.3:2.18.3
+proto-google-cloud-datastore-v1:0.109.3:0.109.3
+datastore-v1-proto-client:2.18.3:2.18.3
+proto-google-cloud-datastore-admin-v1:2.18.3:2.18.3
+grpc-google-cloud-datastore-admin-v1:2.18.3:2.18.3