responseObserver) {
io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(
getListIndexesMethod(), responseObserver);
}
+ }
+
+ /**
+ * Base class for the server implementation of the service DatastoreAdmin.
+ *
+ *
+ * Google Cloud Datastore Admin API
+ * The Datastore Admin API provides several admin services for Cloud Datastore.
+ * -----------------------------------------------------------------------------
+ * ## Concepts
+ * Project, namespace, kind, and entity as defined in the Google Cloud Datastore
+ * API.
+ * Operation: An Operation represents work being performed in the background.
+ * EntityFilter: Allows specifying a subset of entities in a project. This is
+ * specified as a combination of kinds and namespaces (either or both of which
+ * may be all).
+ * -----------------------------------------------------------------------------
+ * ## Services
+ * # Export/Import
+ * The Export/Import service provides the ability to copy all or a subset of
+ * entities to/from Google Cloud Storage.
+ * Exported data may be imported into Cloud Datastore for any Google Cloud
+ * Platform project. It is not restricted to the export source project. It is
+ * possible to export from one project and then import into another.
+ * Exported data can also be loaded into Google BigQuery for analysis.
+ * Exports and imports are performed asynchronously. An Operation resource is
+ * created for each export/import. The state (including any errors encountered)
+ * of the export/import may be queried via the Operation resource.
+ * # Index
+ * The index service manages Cloud Datastore composite indexes.
+ * Index creation and deletion are performed asynchronously.
+ * An Operation resource is created for each such asynchronous operation.
+ * The state of the operation (including any errors encountered)
+ * may be queried via the Operation resource.
+ * # Operation
+ * The Operations collection provides a record of actions performed for the
+ * specified project (including any operations in progress). Operations are not
+ * created directly but through calls on other collections or resources.
+ * An operation that is not yet done may be cancelled. The request to cancel is
+ * asynchronous and the operation may continue to run for some time after the
+ * request to cancel is made.
+ * An operation that is done may be deleted so that it is no longer listed as
+ * part of the Operation collection.
+ * ListOperations returns all pending operations, but not completed operations.
+ * Operations are created by service DatastoreAdmin,
+ * but are accessed via service google.longrunning.Operations.
+ *
+ */
+ public abstract static class DatastoreAdminImplBase
+ implements io.grpc.BindableService, AsyncService {
@java.lang.Override
public final io.grpc.ServerServiceDefinition bindService() {
- return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
- .addMethod(
- getExportEntitiesMethod(),
- io.grpc.stub.ServerCalls.asyncUnaryCall(
- new MethodHandlers<
- com.google.datastore.admin.v1.ExportEntitiesRequest,
- com.google.longrunning.Operation>(this, METHODID_EXPORT_ENTITIES)))
- .addMethod(
- getImportEntitiesMethod(),
- io.grpc.stub.ServerCalls.asyncUnaryCall(
- new MethodHandlers<
- com.google.datastore.admin.v1.ImportEntitiesRequest,
- com.google.longrunning.Operation>(this, METHODID_IMPORT_ENTITIES)))
- .addMethod(
- getCreateIndexMethod(),
- io.grpc.stub.ServerCalls.asyncUnaryCall(
- new MethodHandlers<
- com.google.datastore.admin.v1.CreateIndexRequest,
- com.google.longrunning.Operation>(this, METHODID_CREATE_INDEX)))
- .addMethod(
- getDeleteIndexMethod(),
- io.grpc.stub.ServerCalls.asyncUnaryCall(
- new MethodHandlers<
- com.google.datastore.admin.v1.DeleteIndexRequest,
- com.google.longrunning.Operation>(this, METHODID_DELETE_INDEX)))
- .addMethod(
- getGetIndexMethod(),
- io.grpc.stub.ServerCalls.asyncUnaryCall(
- new MethodHandlers<
- com.google.datastore.admin.v1.GetIndexRequest,
- com.google.datastore.admin.v1.Index>(this, METHODID_GET_INDEX)))
- .addMethod(
- getListIndexesMethod(),
- io.grpc.stub.ServerCalls.asyncUnaryCall(
- new MethodHandlers<
- com.google.datastore.admin.v1.ListIndexesRequest,
- com.google.datastore.admin.v1.ListIndexesResponse>(
- this, METHODID_LIST_INDEXES)))
- .build();
+ return DatastoreAdminGrpc.bindService(this);
}
}
/**
- *
+ * A stub to allow clients to do asynchronous rpc calls to service DatastoreAdmin.
*
*
* Google Cloud Datastore Admin API
@@ -769,7 +781,7 @@ public void listIndexes(
}
/**
- *
+ * A stub to allow clients to do synchronous rpc calls to service DatastoreAdmin.
*
*
* Google Cloud Datastore Admin API
@@ -938,7 +950,7 @@ public com.google.datastore.admin.v1.ListIndexesResponse listIndexes(
}
/**
- *
+ * A stub to allow clients to do ListenableFuture-style rpc calls to service DatastoreAdmin.
*
*
* Google Cloud Datastore Admin API
@@ -1119,10 +1131,10 @@ private static final class MethodHandlers
io.grpc.stub.ServerCalls.ServerStreamingMethod,
io.grpc.stub.ServerCalls.ClientStreamingMethod,
io.grpc.stub.ServerCalls.BidiStreamingMethod {
- private final DatastoreAdminImplBase serviceImpl;
+ private final AsyncService serviceImpl;
private final int methodId;
- MethodHandlers(DatastoreAdminImplBase serviceImpl, int methodId) {
+ MethodHandlers(AsyncService serviceImpl, int methodId) {
this.serviceImpl = serviceImpl;
this.methodId = methodId;
}
@@ -1178,6 +1190,48 @@ public io.grpc.stub.StreamObserver invoke(
}
}
+ public static final io.grpc.ServerServiceDefinition bindService(AsyncService service) {
+ return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
+ .addMethod(
+ getExportEntitiesMethod(),
+ io.grpc.stub.ServerCalls.asyncUnaryCall(
+ new MethodHandlers<
+ com.google.datastore.admin.v1.ExportEntitiesRequest,
+ com.google.longrunning.Operation>(service, METHODID_EXPORT_ENTITIES)))
+ .addMethod(
+ getImportEntitiesMethod(),
+ io.grpc.stub.ServerCalls.asyncUnaryCall(
+ new MethodHandlers<
+ com.google.datastore.admin.v1.ImportEntitiesRequest,
+ com.google.longrunning.Operation>(service, METHODID_IMPORT_ENTITIES)))
+ .addMethod(
+ getCreateIndexMethod(),
+ io.grpc.stub.ServerCalls.asyncUnaryCall(
+ new MethodHandlers<
+ com.google.datastore.admin.v1.CreateIndexRequest,
+ com.google.longrunning.Operation>(service, METHODID_CREATE_INDEX)))
+ .addMethod(
+ getDeleteIndexMethod(),
+ io.grpc.stub.ServerCalls.asyncUnaryCall(
+ new MethodHandlers<
+ com.google.datastore.admin.v1.DeleteIndexRequest,
+ com.google.longrunning.Operation>(service, METHODID_DELETE_INDEX)))
+ .addMethod(
+ getGetIndexMethod(),
+ io.grpc.stub.ServerCalls.asyncUnaryCall(
+ new MethodHandlers<
+ com.google.datastore.admin.v1.GetIndexRequest,
+ com.google.datastore.admin.v1.Index>(service, METHODID_GET_INDEX)))
+ .addMethod(
+ getListIndexesMethod(),
+ io.grpc.stub.ServerCalls.asyncUnaryCall(
+ new MethodHandlers<
+ com.google.datastore.admin.v1.ListIndexesRequest,
+ com.google.datastore.admin.v1.ListIndexesResponse>(
+ service, METHODID_LIST_INDEXES)))
+ .build();
+ }
+
private abstract static class DatastoreAdminBaseDescriptorSupplier
implements io.grpc.protobuf.ProtoFileDescriptorSupplier,
io.grpc.protobuf.ProtoServiceDescriptorSupplier {
diff --git a/pom.xml b/pom.xml
index 061acf53a..eabf1c94a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
com.google.cloud
google-cloud-datastore-parent
pom
- 2.14.1
+ 2.14.2
Google Cloud Datastore Parent
https://github.com/googleapis/java-datastore
@@ -151,7 +151,7 @@
com.google.cloud
google-cloud-shared-dependencies
- 3.5.0
+ 3.6.0
pom
import
@@ -159,27 +159,27 @@
com.google.api.grpc
proto-google-cloud-datastore-admin-v1
- 2.14.1
+ 2.14.2
com.google.api.grpc
grpc-google-cloud-datastore-admin-v1
- 2.14.1
+ 2.14.2
com.google.cloud
google-cloud-datastore
- 2.14.1
+ 2.14.2
com.google.api.grpc
proto-google-cloud-datastore-v1
- 0.105.1
+ 0.105.2
com.google.cloud.datastore
datastore-v1-proto-client
- 2.14.1
+ 2.14.2
com.google.api.grpc
diff --git a/proto-google-cloud-datastore-admin-v1/pom.xml b/proto-google-cloud-datastore-admin-v1/pom.xml
index c53f5bbf8..5a13251a4 100644
--- a/proto-google-cloud-datastore-admin-v1/pom.xml
+++ b/proto-google-cloud-datastore-admin-v1/pom.xml
@@ -4,13 +4,13 @@
4.0.0
com.google.api.grpc
proto-google-cloud-datastore-admin-v1
- 2.14.1
+ 2.14.2
proto-google-cloud-datastore-admin-v1
Proto library for google-cloud-datastore
com.google.cloud
google-cloud-datastore-parent
- 2.14.1
+ 2.14.2
diff --git a/proto-google-cloud-datastore-v1/pom.xml b/proto-google-cloud-datastore-v1/pom.xml
index f313978ec..33adffc1f 100644
--- a/proto-google-cloud-datastore-v1/pom.xml
+++ b/proto-google-cloud-datastore-v1/pom.xml
@@ -4,13 +4,13 @@
4.0.0
com.google.api.grpc
proto-google-cloud-datastore-v1
- 0.105.1
+ 0.105.2
proto-google-cloud-datastore-v1
PROTO library for proto-google-cloud-datastore-v1
com.google.cloud
google-cloud-datastore-parent
- 2.14.1
+ 2.14.2
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationQuery.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationQuery.java
index 91aa55f7d..5311d1a45 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationQuery.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AggregationQuery.java
@@ -121,7 +121,7 @@ public interface AggregationOrBuilder
* COUNT_UP_TO(1) AS count_up_to_1,
* COUNT_UP_TO(2),
* COUNT_UP_TO(3) AS count_up_to_3,
- * COUNT_UP_TO(4)
+ * COUNT(*)
* OVER (
* ...
* );
@@ -132,7 +132,7 @@ public interface AggregationOrBuilder
* COUNT_UP_TO(1) AS count_up_to_1,
* COUNT_UP_TO(2) AS property_1,
* COUNT_UP_TO(3) AS count_up_to_3,
- * COUNT_UP_TO(4) AS property_2
+ * COUNT(*) AS property_2
* OVER (
* ...
* );
@@ -161,7 +161,7 @@ public interface AggregationOrBuilder
* COUNT_UP_TO(1) AS count_up_to_1,
* COUNT_UP_TO(2),
* COUNT_UP_TO(3) AS count_up_to_3,
- * COUNT_UP_TO(4)
+ * COUNT(*)
* OVER (
* ...
* );
@@ -172,7 +172,7 @@ public interface AggregationOrBuilder
* COUNT_UP_TO(1) AS count_up_to_1,
* COUNT_UP_TO(2) AS property_1,
* COUNT_UP_TO(3) AS count_up_to_3,
- * COUNT_UP_TO(4) AS property_2
+ * COUNT(*) AS property_2
* OVER (
* ...
* );
@@ -195,7 +195,7 @@ public interface AggregationOrBuilder
*
*
*
- * Defines a aggregation that produces a single result.
+ * Defines an aggregation that produces a single result.
*
*
* Protobuf type {@code google.datastore.v1.AggregationQuery.Aggregation}
@@ -252,7 +252,7 @@ public interface CountOrBuilder
* Optional. Optional constraint on the maximum number of entities to
* count.
* This provides a way to set an upper bound on the number of entities
- * to scan, limiting latency and cost.
+ * to scan, limiting latency, and cost.
* Unspecified is interpreted as no bound.
* If a zero value is provided, a count result of zero should always be
* expected.
@@ -277,7 +277,7 @@ public interface CountOrBuilder
* Optional. Optional constraint on the maximum number of entities to
* count.
* This provides a way to set an upper bound on the number of entities
- * to scan, limiting latency and cost.
+ * to scan, limiting latency, and cost.
* Unspecified is interpreted as no bound.
* If a zero value is provided, a count result of zero should always be
* expected.
@@ -302,7 +302,7 @@ public interface CountOrBuilder
* Optional. Optional constraint on the maximum number of entities to
* count.
* This provides a way to set an upper bound on the number of entities
- * to scan, limiting latency and cost.
+ * to scan, limiting latency, and cost.
* Unspecified is interpreted as no bound.
* If a zero value is provided, a count result of zero should always be
* expected.
@@ -377,7 +377,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
* Optional. Optional constraint on the maximum number of entities to
* count.
* This provides a way to set an upper bound on the number of entities
- * to scan, limiting latency and cost.
+ * to scan, limiting latency, and cost.
* Unspecified is interpreted as no bound.
* If a zero value is provided, a count result of zero should always be
* expected.
@@ -405,7 +405,7 @@ public boolean hasUpTo() {
* Optional. Optional constraint on the maximum number of entities to
* count.
* This provides a way to set an upper bound on the number of entities
- * to scan, limiting latency and cost.
+ * to scan, limiting latency, and cost.
* Unspecified is interpreted as no bound.
* If a zero value is provided, a count result of zero should always be
* expected.
@@ -433,7 +433,7 @@ public com.google.protobuf.Int64Value getUpTo() {
* Optional. Optional constraint on the maximum number of entities to
* count.
* This provides a way to set an upper bound on the number of entities
- * to scan, limiting latency and cost.
+ * to scan, limiting latency, and cost.
* Unspecified is interpreted as no bound.
* If a zero value is provided, a count result of zero should always be
* expected.
@@ -825,7 +825,7 @@ public Builder mergeFrom(
* Optional. Optional constraint on the maximum number of entities to
* count.
* This provides a way to set an upper bound on the number of entities
- * to scan, limiting latency and cost.
+ * to scan, limiting latency, and cost.
* Unspecified is interpreted as no bound.
* If a zero value is provided, a count result of zero should always be
* expected.
@@ -852,7 +852,7 @@ public boolean hasUpTo() {
* Optional. Optional constraint on the maximum number of entities to
* count.
* This provides a way to set an upper bound on the number of entities
- * to scan, limiting latency and cost.
+ * to scan, limiting latency, and cost.
* Unspecified is interpreted as no bound.
* If a zero value is provided, a count result of zero should always be
* expected.
@@ -883,7 +883,7 @@ public com.google.protobuf.Int64Value getUpTo() {
* Optional. Optional constraint on the maximum number of entities to
* count.
* This provides a way to set an upper bound on the number of entities
- * to scan, limiting latency and cost.
+ * to scan, limiting latency, and cost.
* Unspecified is interpreted as no bound.
* If a zero value is provided, a count result of zero should always be
* expected.
@@ -918,7 +918,7 @@ public Builder setUpTo(com.google.protobuf.Int64Value value) {
* Optional. Optional constraint on the maximum number of entities to
* count.
* This provides a way to set an upper bound on the number of entities
- * to scan, limiting latency and cost.
+ * to scan, limiting latency, and cost.
* Unspecified is interpreted as no bound.
* If a zero value is provided, a count result of zero should always be
* expected.
@@ -950,7 +950,7 @@ public Builder setUpTo(com.google.protobuf.Int64Value.Builder builderForValue) {
* Optional. Optional constraint on the maximum number of entities to
* count.
* This provides a way to set an upper bound on the number of entities
- * to scan, limiting latency and cost.
+ * to scan, limiting latency, and cost.
* Unspecified is interpreted as no bound.
* If a zero value is provided, a count result of zero should always be
* expected.
@@ -988,7 +988,7 @@ public Builder mergeUpTo(com.google.protobuf.Int64Value value) {
* Optional. Optional constraint on the maximum number of entities to
* count.
* This provides a way to set an upper bound on the number of entities
- * to scan, limiting latency and cost.
+ * to scan, limiting latency, and cost.
* Unspecified is interpreted as no bound.
* If a zero value is provided, a count result of zero should always be
* expected.
@@ -1020,7 +1020,7 @@ public Builder clearUpTo() {
* Optional. Optional constraint on the maximum number of entities to
* count.
* This provides a way to set an upper bound on the number of entities
- * to scan, limiting latency and cost.
+ * to scan, limiting latency, and cost.
* Unspecified is interpreted as no bound.
* If a zero value is provided, a count result of zero should always be
* expected.
@@ -1047,7 +1047,7 @@ public com.google.protobuf.Int64Value.Builder getUpToBuilder() {
* Optional. Optional constraint on the maximum number of entities to
* count.
* This provides a way to set an upper bound on the number of entities
- * to scan, limiting latency and cost.
+ * to scan, limiting latency, and cost.
* Unspecified is interpreted as no bound.
* If a zero value is provided, a count result of zero should always be
* expected.
@@ -1076,7 +1076,7 @@ public com.google.protobuf.Int64ValueOrBuilder getUpToOrBuilder() {
* Optional. Optional constraint on the maximum number of entities to
* count.
* This provides a way to set an upper bound on the number of entities
- * to scan, limiting latency and cost.
+ * to scan, limiting latency, and cost.
* Unspecified is interpreted as no bound.
* If a zero value is provided, a count result of zero should always be
* expected.
@@ -1287,7 +1287,7 @@ public com.google.datastore.v1.AggregationQuery.Aggregation.CountOrBuilder getCo
* COUNT_UP_TO(1) AS count_up_to_1,
* COUNT_UP_TO(2),
* COUNT_UP_TO(3) AS count_up_to_3,
- * COUNT_UP_TO(4)
+ * COUNT(*)
* OVER (
* ...
* );
@@ -1298,7 +1298,7 @@ public com.google.datastore.v1.AggregationQuery.Aggregation.CountOrBuilder getCo
* COUNT_UP_TO(1) AS count_up_to_1,
* COUNT_UP_TO(2) AS property_1,
* COUNT_UP_TO(3) AS count_up_to_3,
- * COUNT_UP_TO(4) AS property_2
+ * COUNT(*) AS property_2
* OVER (
* ...
* );
@@ -1338,7 +1338,7 @@ public java.lang.String getAlias() {
* COUNT_UP_TO(1) AS count_up_to_1,
* COUNT_UP_TO(2),
* COUNT_UP_TO(3) AS count_up_to_3,
- * COUNT_UP_TO(4)
+ * COUNT(*)
* OVER (
* ...
* );
@@ -1349,7 +1349,7 @@ public java.lang.String getAlias() {
* COUNT_UP_TO(1) AS count_up_to_1,
* COUNT_UP_TO(2) AS property_1,
* COUNT_UP_TO(3) AS count_up_to_3,
- * COUNT_UP_TO(4) AS property_2
+ * COUNT(*) AS property_2
* OVER (
* ...
* );
@@ -1567,7 +1567,7 @@ protected Builder newBuilderForType(
*
*
*
- * Defines a aggregation that produces a single result.
+ * Defines an aggregation that produces a single result.
*
*
* Protobuf type {@code google.datastore.v1.AggregationQuery.Aggregation}
@@ -2021,7 +2021,7 @@ public com.google.datastore.v1.AggregationQuery.Aggregation.Count.Builder getCou
* COUNT_UP_TO(1) AS count_up_to_1,
* COUNT_UP_TO(2),
* COUNT_UP_TO(3) AS count_up_to_3,
- * COUNT_UP_TO(4)
+ * COUNT(*)
* OVER (
* ...
* );
@@ -2032,7 +2032,7 @@ public com.google.datastore.v1.AggregationQuery.Aggregation.Count.Builder getCou
* COUNT_UP_TO(1) AS count_up_to_1,
* COUNT_UP_TO(2) AS property_1,
* COUNT_UP_TO(3) AS count_up_to_3,
- * COUNT_UP_TO(4) AS property_2
+ * COUNT(*) AS property_2
* OVER (
* ...
* );
@@ -2071,7 +2071,7 @@ public java.lang.String getAlias() {
* COUNT_UP_TO(1) AS count_up_to_1,
* COUNT_UP_TO(2),
* COUNT_UP_TO(3) AS count_up_to_3,
- * COUNT_UP_TO(4)
+ * COUNT(*)
* OVER (
* ...
* );
@@ -2082,7 +2082,7 @@ public java.lang.String getAlias() {
* COUNT_UP_TO(1) AS count_up_to_1,
* COUNT_UP_TO(2) AS property_1,
* COUNT_UP_TO(3) AS count_up_to_3,
- * COUNT_UP_TO(4) AS property_2
+ * COUNT(*) AS property_2
* OVER (
* ...
* );
@@ -2121,7 +2121,7 @@ public com.google.protobuf.ByteString getAliasBytes() {
* COUNT_UP_TO(1) AS count_up_to_1,
* COUNT_UP_TO(2),
* COUNT_UP_TO(3) AS count_up_to_3,
- * COUNT_UP_TO(4)
+ * COUNT(*)
* OVER (
* ...
* );
@@ -2132,7 +2132,7 @@ public com.google.protobuf.ByteString getAliasBytes() {
* COUNT_UP_TO(1) AS count_up_to_1,
* COUNT_UP_TO(2) AS property_1,
* COUNT_UP_TO(3) AS count_up_to_3,
- * COUNT_UP_TO(4) AS property_2
+ * COUNT(*) AS property_2
* OVER (
* ...
* );
@@ -2170,7 +2170,7 @@ public Builder setAlias(java.lang.String value) {
* COUNT_UP_TO(1) AS count_up_to_1,
* COUNT_UP_TO(2),
* COUNT_UP_TO(3) AS count_up_to_3,
- * COUNT_UP_TO(4)
+ * COUNT(*)
* OVER (
* ...
* );
@@ -2181,7 +2181,7 @@ public Builder setAlias(java.lang.String value) {
* COUNT_UP_TO(1) AS count_up_to_1,
* COUNT_UP_TO(2) AS property_1,
* COUNT_UP_TO(3) AS count_up_to_3,
- * COUNT_UP_TO(4) AS property_2
+ * COUNT(*) AS property_2
* OVER (
* ...
* );
@@ -2215,7 +2215,7 @@ public Builder clearAlias() {
* COUNT_UP_TO(1) AS count_up_to_1,
* COUNT_UP_TO(2),
* COUNT_UP_TO(3) AS count_up_to_3,
- * COUNT_UP_TO(4)
+ * COUNT(*)
* OVER (
* ...
* );
@@ -2226,7 +2226,7 @@ public Builder clearAlias() {
* COUNT_UP_TO(1) AS count_up_to_1,
* COUNT_UP_TO(2) AS property_1,
* COUNT_UP_TO(3) AS count_up_to_3,
- * COUNT_UP_TO(4) AS property_2
+ * COUNT(*) AS property_2
* OVER (
* ...
* );
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java
index 39432e877..d6f7c3c6a 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java
@@ -173,8 +173,8 @@ public int getPropertiesCount() {
* The map's keys are property names.
* A property name matching regex `__.*__` is reserved.
* A reserved property name is forbidden in certain documented contexts.
- * The name must not contain more than 500 characters.
- * The name cannot be `""`.
+ * The map keys, represented as UTF-8, must not exceed 1,500 bytes and cannot
+ * be empty.
*
*
* map<string, .google.datastore.v1.Value> properties = 3;
@@ -200,8 +200,8 @@ public java.util.Map getPropert
* The map's keys are property names.
* A property name matching regex `__.*__` is reserved.
* A reserved property name is forbidden in certain documented contexts.
- * The name must not contain more than 500 characters.
- * The name cannot be `""`.
+ * The map keys, represented as UTF-8, must not exceed 1,500 bytes and cannot
+ * be empty.
*
*
* map<string, .google.datastore.v1.Value> properties = 3;
@@ -218,8 +218,8 @@ public java.util.Map getPropert
* The map's keys are property names.
* A property name matching regex `__.*__` is reserved.
* A reserved property name is forbidden in certain documented contexts.
- * The name must not contain more than 500 characters.
- * The name cannot be `""`.
+ * The map keys, represented as UTF-8, must not exceed 1,500 bytes and cannot
+ * be empty.
*
*
* map<string, .google.datastore.v1.Value> properties = 3;
@@ -244,8 +244,8 @@ public java.util.Map getPropert
* The map's keys are property names.
* A property name matching regex `__.*__` is reserved.
* A reserved property name is forbidden in certain documented contexts.
- * The name must not contain more than 500 characters.
- * The name cannot be `""`.
+ * The map keys, represented as UTF-8, must not exceed 1,500 bytes and cannot
+ * be empty.
*
*
* map<string, .google.datastore.v1.Value> properties = 3;
@@ -918,8 +918,8 @@ public int getPropertiesCount() {
* The map's keys are property names.
* A property name matching regex `__.*__` is reserved.
* A reserved property name is forbidden in certain documented contexts.
- * The name must not contain more than 500 characters.
- * The name cannot be `""`.
+ * The map keys, represented as UTF-8, must not exceed 1,500 bytes and cannot
+ * be empty.
*
*
* map<string, .google.datastore.v1.Value> properties = 3;
@@ -945,8 +945,8 @@ public java.util.Map getPropert
* The map's keys are property names.
* A property name matching regex `__.*__` is reserved.
* A reserved property name is forbidden in certain documented contexts.
- * The name must not contain more than 500 characters.
- * The name cannot be `""`.
+ * The map keys, represented as UTF-8, must not exceed 1,500 bytes and cannot
+ * be empty.
*
*
* map<string, .google.datastore.v1.Value> properties = 3;
@@ -963,8 +963,8 @@ public java.util.Map getPropert
* The map's keys are property names.
* A property name matching regex `__.*__` is reserved.
* A reserved property name is forbidden in certain documented contexts.
- * The name must not contain more than 500 characters.
- * The name cannot be `""`.
+ * The map keys, represented as UTF-8, must not exceed 1,500 bytes and cannot
+ * be empty.
*
*
* map<string, .google.datastore.v1.Value> properties = 3;
@@ -989,8 +989,8 @@ public java.util.Map getPropert
* The map's keys are property names.
* A property name matching regex `__.*__` is reserved.
* A reserved property name is forbidden in certain documented contexts.
- * The name must not contain more than 500 characters.
- * The name cannot be `""`.
+ * The map keys, represented as UTF-8, must not exceed 1,500 bytes and cannot
+ * be empty.
*
*
* map<string, .google.datastore.v1.Value> properties = 3;
@@ -1021,8 +1021,8 @@ public Builder clearProperties() {
* The map's keys are property names.
* A property name matching regex `__.*__` is reserved.
* A reserved property name is forbidden in certain documented contexts.
- * The name must not contain more than 500 characters.
- * The name cannot be `""`.
+ * The map keys, represented as UTF-8, must not exceed 1,500 bytes and cannot
+ * be empty.
*
*
* map<string, .google.datastore.v1.Value> properties = 3;
@@ -1048,8 +1048,8 @@ public java.util.Map getMutable
* The map's keys are property names.
* A property name matching regex `__.*__` is reserved.
* A reserved property name is forbidden in certain documented contexts.
- * The name must not contain more than 500 characters.
- * The name cannot be `""`.
+ * The map keys, represented as UTF-8, must not exceed 1,500 bytes and cannot
+ * be empty.
*
*
* map<string, .google.datastore.v1.Value> properties = 3;
@@ -1073,8 +1073,8 @@ public Builder putProperties(java.lang.String key, com.google.datastore.v1.Value
* The map's keys are property names.
* A property name matching regex `__.*__` is reserved.
* A reserved property name is forbidden in certain documented contexts.
- * The name must not contain more than 500 characters.
- * The name cannot be `""`.
+ * The map keys, represented as UTF-8, must not exceed 1,500 bytes and cannot
+ * be empty.
*
*
* map<string, .google.datastore.v1.Value> properties = 3;
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityOrBuilder.java
index 19f935612..d36510825 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityOrBuilder.java
@@ -78,8 +78,8 @@ public interface EntityOrBuilder
* The map's keys are property names.
* A property name matching regex `__.*__` is reserved.
* A reserved property name is forbidden in certain documented contexts.
- * The name must not contain more than 500 characters.
- * The name cannot be `""`.
+ * The map keys, represented as UTF-8, must not exceed 1,500 bytes and cannot
+ * be empty.
*
*
* map<string, .google.datastore.v1.Value> properties = 3;
@@ -93,8 +93,8 @@ public interface EntityOrBuilder
* The map's keys are property names.
* A property name matching regex `__.*__` is reserved.
* A reserved property name is forbidden in certain documented contexts.
- * The name must not contain more than 500 characters.
- * The name cannot be `""`.
+ * The map keys, represented as UTF-8, must not exceed 1,500 bytes and cannot
+ * be empty.
*
*
* map<string, .google.datastore.v1.Value> properties = 3;
@@ -111,8 +111,8 @@ public interface EntityOrBuilder
* The map's keys are property names.
* A property name matching regex `__.*__` is reserved.
* A reserved property name is forbidden in certain documented contexts.
- * The name must not contain more than 500 characters.
- * The name cannot be `""`.
+ * The map keys, represented as UTF-8, must not exceed 1,500 bytes and cannot
+ * be empty.
*
*
* map<string, .google.datastore.v1.Value> properties = 3;
@@ -126,8 +126,8 @@ public interface EntityOrBuilder
* The map's keys are property names.
* A property name matching regex `__.*__` is reserved.
* A reserved property name is forbidden in certain documented contexts.
- * The name must not contain more than 500 characters.
- * The name cannot be `""`.
+ * The map keys, represented as UTF-8, must not exceed 1,500 bytes and cannot
+ * be empty.
*
*
* map<string, .google.datastore.v1.Value> properties = 3;
@@ -145,8 +145,8 @@ com.google.datastore.v1.Value getPropertiesOrDefault(
* The map's keys are property names.
* A property name matching regex `__.*__` is reserved.
* A reserved property name is forbidden in certain documented contexts.
- * The name must not contain more than 500 characters.
- * The name cannot be `""`.
+ * The map keys, represented as UTF-8, must not exceed 1,500 bytes and cannot
+ * be empty.
*
*
* map<string, .google.datastore.v1.Value> properties = 3;
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Query.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Query.java
index 475a26177..2b23df9f8 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Query.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Query.java
@@ -345,6 +345,9 @@ public com.google.datastore.v1.PropertyOrderOrBuilder getOrderOrBuilder(int inde
* The properties to make distinct. The query results will contain the first
* result for each distinct combination of values for the given properties
* (if empty, all results are returned).
+ * Requires:
+ * * If `order` is specified, the set of distinct on properties must appear
+ * before the non-distinct on properties in `order`.
*
*
* repeated .google.datastore.v1.PropertyReference distinct_on = 6;
@@ -360,6 +363,9 @@ public java.util.List getDistinctOnLi
* The properties to make distinct. The query results will contain the first
* result for each distinct combination of values for the given properties
* (if empty, all results are returned).
+ * Requires:
+ * * If `order` is specified, the set of distinct on properties must appear
+ * before the non-distinct on properties in `order`.
*
*
* repeated .google.datastore.v1.PropertyReference distinct_on = 6;
@@ -376,6 +382,9 @@ public java.util.List getDistinctOnLi
* The properties to make distinct. The query results will contain the first
* result for each distinct combination of values for the given properties
* (if empty, all results are returned).
+ * Requires:
+ * * If `order` is specified, the set of distinct on properties must appear
+ * before the non-distinct on properties in `order`.
*
*
* repeated .google.datastore.v1.PropertyReference distinct_on = 6;
@@ -391,6 +400,9 @@ public int getDistinctOnCount() {
* The properties to make distinct. The query results will contain the first
* result for each distinct combination of values for the given properties
* (if empty, all results are returned).
+ * Requires:
+ * * If `order` is specified, the set of distinct on properties must appear
+ * before the non-distinct on properties in `order`.
*
*
* repeated .google.datastore.v1.PropertyReference distinct_on = 6;
@@ -406,6 +418,9 @@ public com.google.datastore.v1.PropertyReference getDistinctOn(int index) {
* The properties to make distinct. The query results will contain the first
* result for each distinct combination of values for the given properties
* (if empty, all results are returned).
+ * Requires:
+ * * If `order` is specified, the set of distinct on properties must appear
+ * before the non-distinct on properties in `order`.
*
*
* repeated .google.datastore.v1.PropertyReference distinct_on = 6;
@@ -2509,6 +2524,9 @@ private void ensureDistinctOnIsMutable() {
* The properties to make distinct. The query results will contain the first
* result for each distinct combination of values for the given properties
* (if empty, all results are returned).
+ * Requires:
+ * * If `order` is specified, the set of distinct on properties must appear
+ * before the non-distinct on properties in `order`.
*
*
* repeated .google.datastore.v1.PropertyReference distinct_on = 6;
@@ -2527,6 +2545,9 @@ public java.util.List getDistinctOnLi
* The properties to make distinct. The query results will contain the first
* result for each distinct combination of values for the given properties
* (if empty, all results are returned).
+ * Requires:
+ * * If `order` is specified, the set of distinct on properties must appear
+ * before the non-distinct on properties in `order`.
*
*
* repeated .google.datastore.v1.PropertyReference distinct_on = 6;
@@ -2545,6 +2566,9 @@ public int getDistinctOnCount() {
* The properties to make distinct. The query results will contain the first
* result for each distinct combination of values for the given properties
* (if empty, all results are returned).
+ * Requires:
+ * * If `order` is specified, the set of distinct on properties must appear
+ * before the non-distinct on properties in `order`.
*
*
* repeated .google.datastore.v1.PropertyReference distinct_on = 6;
@@ -2563,6 +2587,9 @@ public com.google.datastore.v1.PropertyReference getDistinctOn(int index) {
* The properties to make distinct. The query results will contain the first
* result for each distinct combination of values for the given properties
* (if empty, all results are returned).
+ * Requires:
+ * * If `order` is specified, the set of distinct on properties must appear
+ * before the non-distinct on properties in `order`.
*
*
* repeated .google.datastore.v1.PropertyReference distinct_on = 6;
@@ -2587,6 +2614,9 @@ public Builder setDistinctOn(int index, com.google.datastore.v1.PropertyReferenc
* The properties to make distinct. The query results will contain the first
* result for each distinct combination of values for the given properties
* (if empty, all results are returned).
+ * Requires:
+ * * If `order` is specified, the set of distinct on properties must appear
+ * before the non-distinct on properties in `order`.
*
*
* repeated .google.datastore.v1.PropertyReference distinct_on = 6;
@@ -2609,6 +2639,9 @@ public Builder setDistinctOn(
* The properties to make distinct. The query results will contain the first
* result for each distinct combination of values for the given properties
* (if empty, all results are returned).
+ * Requires:
+ * * If `order` is specified, the set of distinct on properties must appear
+ * before the non-distinct on properties in `order`.
*
*
* repeated .google.datastore.v1.PropertyReference distinct_on = 6;
@@ -2633,6 +2666,9 @@ public Builder addDistinctOn(com.google.datastore.v1.PropertyReference value) {
* The properties to make distinct. The query results will contain the first
* result for each distinct combination of values for the given properties
* (if empty, all results are returned).
+ * Requires:
+ * * If `order` is specified, the set of distinct on properties must appear
+ * before the non-distinct on properties in `order`.
*
*
* repeated .google.datastore.v1.PropertyReference distinct_on = 6;
@@ -2657,6 +2693,9 @@ public Builder addDistinctOn(int index, com.google.datastore.v1.PropertyReferenc
* The properties to make distinct. The query results will contain the first
* result for each distinct combination of values for the given properties
* (if empty, all results are returned).
+ * Requires:
+ * * If `order` is specified, the set of distinct on properties must appear
+ * before the non-distinct on properties in `order`.
*
*
* repeated .google.datastore.v1.PropertyReference distinct_on = 6;
@@ -2679,6 +2718,9 @@ public Builder addDistinctOn(
* The properties to make distinct. The query results will contain the first
* result for each distinct combination of values for the given properties
* (if empty, all results are returned).
+ * Requires:
+ * * If `order` is specified, the set of distinct on properties must appear
+ * before the non-distinct on properties in `order`.
*
*
* repeated .google.datastore.v1.PropertyReference distinct_on = 6;
@@ -2701,6 +2743,9 @@ public Builder addDistinctOn(
* The properties to make distinct. The query results will contain the first
* result for each distinct combination of values for the given properties
* (if empty, all results are returned).
+ * Requires:
+ * * If `order` is specified, the set of distinct on properties must appear
+ * before the non-distinct on properties in `order`.
*
*
* repeated .google.datastore.v1.PropertyReference distinct_on = 6;
@@ -2723,6 +2768,9 @@ public Builder addAllDistinctOn(
* The properties to make distinct. The query results will contain the first
* result for each distinct combination of values for the given properties
* (if empty, all results are returned).
+ * Requires:
+ * * If `order` is specified, the set of distinct on properties must appear
+ * before the non-distinct on properties in `order`.
*
*
* repeated .google.datastore.v1.PropertyReference distinct_on = 6;
@@ -2744,6 +2792,9 @@ public Builder clearDistinctOn() {
* The properties to make distinct. The query results will contain the first
* result for each distinct combination of values for the given properties
* (if empty, all results are returned).
+ * Requires:
+ * * If `order` is specified, the set of distinct on properties must appear
+ * before the non-distinct on properties in `order`.
*
*
* repeated .google.datastore.v1.PropertyReference distinct_on = 6;
@@ -2765,6 +2816,9 @@ public Builder removeDistinctOn(int index) {
* The properties to make distinct. The query results will contain the first
* result for each distinct combination of values for the given properties
* (if empty, all results are returned).
+ * Requires:
+ * * If `order` is specified, the set of distinct on properties must appear
+ * before the non-distinct on properties in `order`.
*
*
* repeated .google.datastore.v1.PropertyReference distinct_on = 6;
@@ -2779,6 +2833,9 @@ public com.google.datastore.v1.PropertyReference.Builder getDistinctOnBuilder(in
* The properties to make distinct. The query results will contain the first
* result for each distinct combination of values for the given properties
* (if empty, all results are returned).
+ * Requires:
+ * * If `order` is specified, the set of distinct on properties must appear
+ * before the non-distinct on properties in `order`.
*
*
* repeated .google.datastore.v1.PropertyReference distinct_on = 6;
@@ -2797,6 +2854,9 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getDistinctOnOrBuilder
* The properties to make distinct. The query results will contain the first
* result for each distinct combination of values for the given properties
* (if empty, all results are returned).
+ * Requires:
+ * * If `order` is specified, the set of distinct on properties must appear
+ * before the non-distinct on properties in `order`.
*
*
* repeated .google.datastore.v1.PropertyReference distinct_on = 6;
@@ -2816,6 +2876,9 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getDistinctOnOrBuilder
* The properties to make distinct. The query results will contain the first
* result for each distinct combination of values for the given properties
* (if empty, all results are returned).
+ * Requires:
+ * * If `order` is specified, the set of distinct on properties must appear
+ * before the non-distinct on properties in `order`.
*
*
* repeated .google.datastore.v1.PropertyReference distinct_on = 6;
@@ -2831,6 +2894,9 @@ public com.google.datastore.v1.PropertyReference.Builder addDistinctOnBuilder()
* The properties to make distinct. The query results will contain the first
* result for each distinct combination of values for the given properties
* (if empty, all results are returned).
+ * Requires:
+ * * If `order` is specified, the set of distinct on properties must appear
+ * before the non-distinct on properties in `order`.
*
*
* repeated .google.datastore.v1.PropertyReference distinct_on = 6;
@@ -2846,6 +2912,9 @@ public com.google.datastore.v1.PropertyReference.Builder addDistinctOnBuilder(in
* The properties to make distinct. The query results will contain the first
* result for each distinct combination of values for the given properties
* (if empty, all results are returned).
+ * Requires:
+ * * If `order` is specified, the set of distinct on properties must appear
+ * before the non-distinct on properties in `order`.
*
*
* repeated .google.datastore.v1.PropertyReference distinct_on = 6;
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryOrBuilder.java
index f06b1b616..1b2009699 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryOrBuilder.java
@@ -224,6 +224,9 @@ public interface QueryOrBuilder
* The properties to make distinct. The query results will contain the first
* result for each distinct combination of values for the given properties
* (if empty, all results are returned).
+ * Requires:
+ * * If `order` is specified, the set of distinct on properties must appear
+ * before the non-distinct on properties in `order`.
*
*
* repeated .google.datastore.v1.PropertyReference distinct_on = 6;
@@ -236,6 +239,9 @@ public interface QueryOrBuilder
* The properties to make distinct. The query results will contain the first
* result for each distinct combination of values for the given properties
* (if empty, all results are returned).
+ * Requires:
+ * * If `order` is specified, the set of distinct on properties must appear
+ * before the non-distinct on properties in `order`.
*
*
* repeated .google.datastore.v1.PropertyReference distinct_on = 6;
@@ -248,6 +254,9 @@ public interface QueryOrBuilder
* The properties to make distinct. The query results will contain the first
* result for each distinct combination of values for the given properties
* (if empty, all results are returned).
+ * Requires:
+ * * If `order` is specified, the set of distinct on properties must appear
+ * before the non-distinct on properties in `order`.
*
*
* repeated .google.datastore.v1.PropertyReference distinct_on = 6;
@@ -260,6 +269,9 @@ public interface QueryOrBuilder
* The properties to make distinct. The query results will contain the first
* result for each distinct combination of values for the given properties
* (if empty, all results are returned).
+ * Requires:
+ * * If `order` is specified, the set of distinct on properties must appear
+ * before the non-distinct on properties in `order`.
*
*
* repeated .google.datastore.v1.PropertyReference distinct_on = 6;
@@ -273,6 +285,9 @@ public interface QueryOrBuilder
* The properties to make distinct. The query results will contain the first
* result for each distinct combination of values for the given properties
* (if empty, all results are returned).
+ * Requires:
+ * * If `order` is specified, the set of distinct on properties must appear
+ * before the non-distinct on properties in `order`.
*
*
* repeated .google.datastore.v1.PropertyReference distinct_on = 6;
diff --git a/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/aggregation_result.proto b/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/aggregation_result.proto
index bbb5989e5..91c521716 100644
--- a/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/aggregation_result.proto
+++ b/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/aggregation_result.proto
@@ -1,4 +1,4 @@
-// Copyright 2022 Google LLC
+// 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.
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 2f9c71427..4822048b6 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
@@ -1,4 +1,4 @@
-// Copyright 2022 Google LLC
+// 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.
diff --git a/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/entity.proto b/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/entity.proto
index ddf22e032..2d22853f5 100644
--- a/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/entity.proto
+++ b/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/entity.proto
@@ -1,4 +1,4 @@
-// Copyright 2022 Google LLC
+// 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.
@@ -213,7 +213,7 @@ message Entity {
// The map's keys are property names.
// A property name matching regex `__.*__` is reserved.
// A reserved property name is forbidden in certain documented contexts.
- // The name must not contain more than 500 characters.
- // The name cannot be `""`.
+ // The map keys, represented as UTF-8, must not exceed 1,500 bytes and cannot
+ // be empty.
map properties = 3;
}
diff --git a/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/query.proto b/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/query.proto
index 169af8801..812bfbf05 100644
--- a/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/query.proto
+++ b/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/query.proto
@@ -1,4 +1,4 @@
-// Copyright 2022 Google LLC
+// 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.
@@ -99,6 +99,11 @@ message Query {
// The properties to make distinct. The query results will contain the first
// result for each distinct combination of values for the given properties
// (if empty, all results are returned).
+ //
+ // Requires:
+ //
+ // * If `order` is specified, the set of distinct on properties must appear
+ // before the non-distinct on properties in `order`.
repeated PropertyReference distinct_on = 6;
// A starting point for the query results. Query cursors are
@@ -127,7 +132,7 @@ message Query {
// Datastore query for running an aggregation over a
// [Query][google.datastore.v1.Query].
message AggregationQuery {
- // Defines a aggregation that produces a single result.
+ // Defines an aggregation that produces a single result.
message Aggregation {
// Count of entities that match the query.
//
@@ -138,7 +143,7 @@ message AggregationQuery {
// count.
//
// This provides a way to set an upper bound on the number of entities
- // to scan, limiting latency and cost.
+ // to scan, limiting latency, and cost.
//
// Unspecified is interpreted as no bound.
//
@@ -175,7 +180,7 @@ message AggregationQuery {
// COUNT_UP_TO(1) AS count_up_to_1,
// COUNT_UP_TO(2),
// COUNT_UP_TO(3) AS count_up_to_3,
- // COUNT_UP_TO(4)
+ // COUNT(*)
// OVER (
// ...
// );
@@ -188,7 +193,7 @@ message AggregationQuery {
// COUNT_UP_TO(1) AS count_up_to_1,
// COUNT_UP_TO(2) AS property_1,
// COUNT_UP_TO(3) AS count_up_to_3,
- // COUNT_UP_TO(4) AS property_2
+ // COUNT(*) AS property_2
// OVER (
// ...
// );
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
index 55263138e..a6e7d8d9d 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.14.0
+ 2.14.1
diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml
index 057a2e472..f8dd32fe8 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.10.0
+ 26.11.0
pom
import
diff --git a/samples/pom.xml b/samples/pom.xml
index 7d846eb1b..a24801164 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -39,7 +39,7 @@
org.apache.maven.plugins
maven-deploy-plugin
- 3.1.0
+ 3.1.1
true
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 023a84abe..71b11d7ec 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
com.google.cloud
google-cloud-datastore
- 2.14.0
+ 2.14.1
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index 1929a106a..637698e64 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
com.google.cloud
libraries-bom
- 26.10.0
+ 26.11.0
pom
import
diff --git a/samples/snippets/src/main/java/com/example/datastore/filters/OrFilterQuery.java b/samples/snippets/src/main/java/com/example/datastore/filters/OrFilterQuery.java
new file mode 100644
index 000000000..1fa1d40de
--- /dev/null
+++ b/samples/snippets/src/main/java/com/example/datastore/filters/OrFilterQuery.java
@@ -0,0 +1,62 @@
+/*
+ * 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.
+ */
+
+package com.example.datastore.filters;
+
+// sample-metadata:
+// title: Create a union between two filters
+// description: Create a union between two filters (logical OR operator)
+
+// [START datastore_query_filter_or]
+import com.google.cloud.datastore.Datastore;
+import com.google.cloud.datastore.DatastoreOptions;
+import com.google.cloud.datastore.Entity;
+import com.google.cloud.datastore.Query;
+import com.google.cloud.datastore.QueryResults;
+import com.google.cloud.datastore.StructuredQuery.CompositeFilter;
+import com.google.cloud.datastore.StructuredQuery.Filter;
+import com.google.cloud.datastore.StructuredQuery.PropertyFilter;
+
+public class OrFilterQuery {
+ public static void invoke() throws Exception {
+
+ // Instantiates a client
+ Datastore datastore = DatastoreOptions.getDefaultInstance().getService();
+ String propertyName = "description";
+
+ // Create the two filters
+ Filter orFilter =
+ CompositeFilter.or(
+ PropertyFilter.eq(propertyName, "Feed cats"),
+ PropertyFilter.eq(propertyName, "Buy milk"));
+
+ // Build the query
+ Query query = Query.newEntityQueryBuilder().setKind("Task").setFilter(orFilter).build();
+
+ // Get the results back from Datastore
+ QueryResults results = datastore.run(query);
+
+ if (!results.hasNext()) {
+ throw new Exception("query yielded no results");
+ }
+
+ while (results.hasNext()) {
+ Entity entity = results.next();
+ System.out.printf("Entity: %s%n", entity);
+ }
+ }
+}
+// [END datastore_query_filter_or]
diff --git a/samples/snippets/src/test/java/com/example/datastore/OrFilterQuerySampleIT.java b/samples/snippets/src/test/java/com/example/datastore/OrFilterQuerySampleIT.java
new file mode 100644
index 000000000..7e6cc8fa8
--- /dev/null
+++ b/samples/snippets/src/test/java/com/example/datastore/OrFilterQuerySampleIT.java
@@ -0,0 +1,70 @@
+/*
+ * 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.
+ */
+
+package com.example.datastore;
+
+import com.example.datastore.filters.OrFilterQuery;
+import com.google.cloud.datastore.Datastore;
+import com.google.cloud.datastore.DatastoreOptions;
+import com.google.cloud.datastore.Entity;
+import com.google.cloud.datastore.Key;
+import com.rule.SystemsOutRule;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+@RunWith(JUnit4.class)
+@SuppressWarnings("checkstyle:abbreviationaswordinname")
+public class OrFilterQuerySampleIT {
+
+ private final Datastore datastore = DatastoreOptions.getDefaultInstance().getService();
+ private final String fieldName = "description";
+
+ private Key taskKey1;
+ private Key taskKey2;
+
+ @Rule public final SystemsOutRule systemsOutRule = new SystemsOutRule();
+
+ @Before
+ public void setUp() {
+ taskKey1 = datastore.newKeyFactory().setKind("Task").newKey("sampleTask");
+ Entity task1 = Entity.newBuilder(taskKey1).set(fieldName, "Buy milk").build();
+
+ taskKey2 = datastore.newKeyFactory().setKind("Task").newKey("sampleTask2");
+ Entity task2 = Entity.newBuilder(taskKey2).set(fieldName, "Feed cats").build();
+
+ datastore.put(task1);
+ datastore.put(task2);
+ }
+
+ @After
+ public void tearDown() {
+ datastore.delete(taskKey1);
+ datastore.delete(taskKey2);
+ }
+
+ @Test
+ public void testOrFilterQuery() throws Exception {
+ // Act
+ OrFilterQuery.invoke();
+
+ // Assert
+ systemsOutRule.assertContains("Entity");
+ }
+}
diff --git a/versions.txt b/versions.txt
index 1cb3f4435..3f355a15f 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
# Format:
# module:released-version:current-version
-google-cloud-datastore:2.14.1:2.14.1
-google-cloud-datastore-bom:2.14.1:2.14.1
-proto-google-cloud-datastore-v1:0.105.1:0.105.1
-datastore-v1-proto-client:2.14.1:2.14.1
-proto-google-cloud-datastore-admin-v1:2.14.1:2.14.1
-grpc-google-cloud-datastore-admin-v1:2.14.1:2.14.1
+google-cloud-datastore:2.14.2:2.14.2
+google-cloud-datastore-bom:2.14.2:2.14.2
+proto-google-cloud-datastore-v1:0.105.2:0.105.2
+datastore-v1-proto-client:2.14.2:2.14.2
+proto-google-cloud-datastore-admin-v1:2.14.2:2.14.2
+grpc-google-cloud-datastore-admin-v1:2.14.2:2.14.2