+ * The ID of the database against which to make the request. + * '(default)' is not allowed; please use empty string '' to refer the default + * database. + *+ * + *
string database_id = 9;
+ *
+ * @return The databaseId.
+ */
+ @java.lang.Override
+ public java.lang.String getDatabaseId() {
+ java.lang.Object ref = databaseId_;
+ if (ref instanceof java.lang.String) {
+ return (java.lang.String) ref;
+ } else {
+ com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ databaseId_ = s;
+ return s;
+ }
+ }
+ /**
+ *
+ *
+ * + * The ID of the database against which to make the request. + * '(default)' is not allowed; please use empty string '' to refer the default + * database. + *+ * + *
string database_id = 9;
+ *
+ * @return The bytes for databaseId.
+ */
+ @java.lang.Override
+ public com.google.protobuf.ByteString getDatabaseIdBytes() {
+ java.lang.Object ref = databaseId_;
+ if (ref instanceof java.lang.String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+ databaseId_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+
public static final int KEYS_FIELD_NUMBER = 1;
private java.util.List+ * The ID of the database against which to make the request. + * '(default)' is not allowed; please use empty string '' to refer the default + * database. + *+ * + *
string database_id = 9;
+ *
+ * @return The databaseId.
+ */
+ public java.lang.String getDatabaseId() {
+ java.lang.Object ref = databaseId_;
+ if (!(ref instanceof java.lang.String)) {
+ com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ databaseId_ = s;
+ return s;
+ } else {
+ return (java.lang.String) ref;
+ }
+ }
+ /**
+ *
+ *
+ * + * The ID of the database against which to make the request. + * '(default)' is not allowed; please use empty string '' to refer the default + * database. + *+ * + *
string database_id = 9;
+ *
+ * @return The bytes for databaseId.
+ */
+ public com.google.protobuf.ByteString getDatabaseIdBytes() {
+ java.lang.Object ref = databaseId_;
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+ databaseId_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+ /**
+ *
+ *
+ * + * The ID of the database against which to make the request. + * '(default)' is not allowed; please use empty string '' to refer the default + * database. + *+ * + *
string database_id = 9;
+ *
+ * @param value The databaseId to set.
+ * @return This builder for chaining.
+ */
+ public Builder setDatabaseId(java.lang.String value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+
+ databaseId_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ *
+ * + * The ID of the database against which to make the request. + * '(default)' is not allowed; please use empty string '' to refer the default + * database. + *+ * + *
string database_id = 9;
+ *
+ * @return This builder for chaining.
+ */
+ public Builder clearDatabaseId() {
+
+ databaseId_ = getDefaultInstance().getDatabaseId();
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ *
+ * + * The ID of the database against which to make the request. + * '(default)' is not allowed; please use empty string '' to refer the default + * database. + *+ * + *
string database_id = 9;
+ *
+ * @param value The bytes for databaseId to set.
+ * @return This builder for chaining.
+ */
+ public Builder setDatabaseIdBytes(com.google.protobuf.ByteString value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ checkByteStringIsUtf8(value);
+
+ databaseId_ = value;
+ onChanged();
+ return this;
+ }
+
private java.util.List+ * The ID of the database against which to make the request. + * '(default)' is not allowed; please use empty string '' to refer the default + * database. + *+ * + *
string database_id = 9;
+ *
+ * @return The databaseId.
+ */
+ java.lang.String getDatabaseId();
+ /**
+ *
+ *
+ * + * The ID of the database against which to make the request. + * '(default)' is not allowed; please use empty string '' to refer the default + * database. + *+ * + *
string database_id = 9;
+ *
+ * @return The bytes for databaseId.
+ */
+ com.google.protobuf.ByteString getDatabaseIdBytes();
+
/**
*
*
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequest.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequest.java
index f77301b9d..55b17ae9e 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequest.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequest.java
@@ -39,6 +39,7 @@ private BeginTransactionRequest(com.google.protobuf.GeneratedMessageV3.Builder
+ * The ID of the database against which to make the request.
+ * '(default)' is not allowed; please use empty string '' to refer the default
+ * database.
+ *
+ *
+ * string database_id = 9;
+ *
+ * @return The databaseId.
+ */
+ @java.lang.Override
+ public java.lang.String getDatabaseId() {
+ java.lang.Object ref = databaseId_;
+ if (ref instanceof java.lang.String) {
+ return (java.lang.String) ref;
+ } else {
+ com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ databaseId_ = s;
+ return s;
+ }
+ }
+ /**
+ *
+ *
+ * + * The ID of the database against which to make the request. + * '(default)' is not allowed; please use empty string '' to refer the default + * database. + *+ * + *
string database_id = 9;
+ *
+ * @return The bytes for databaseId.
+ */
+ @java.lang.Override
+ public com.google.protobuf.ByteString getDatabaseIdBytes() {
+ java.lang.Object ref = databaseId_;
+ if (ref instanceof java.lang.String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+ databaseId_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+
public static final int TRANSACTION_OPTIONS_FIELD_NUMBER = 10;
private com.google.datastore.v1.TransactionOptions transactionOptions_;
/**
@@ -243,6 +304,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(projectId_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 8, projectId_);
}
+ if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(databaseId_)) {
+ com.google.protobuf.GeneratedMessageV3.writeString(output, 9, databaseId_);
+ }
if (transactionOptions_ != null) {
output.writeMessage(10, getTransactionOptions());
}
@@ -258,6 +322,9 @@ public int getSerializedSize() {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(projectId_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, projectId_);
}
+ if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(databaseId_)) {
+ size += com.google.protobuf.GeneratedMessageV3.computeStringSize(9, databaseId_);
+ }
if (transactionOptions_ != null) {
size += com.google.protobuf.CodedOutputStream.computeMessageSize(10, getTransactionOptions());
}
@@ -278,6 +345,7 @@ public boolean equals(final java.lang.Object obj) {
(com.google.datastore.v1.BeginTransactionRequest) obj;
if (!getProjectId().equals(other.getProjectId())) return false;
+ if (!getDatabaseId().equals(other.getDatabaseId())) return false;
if (hasTransactionOptions() != other.hasTransactionOptions()) return false;
if (hasTransactionOptions()) {
if (!getTransactionOptions().equals(other.getTransactionOptions())) return false;
@@ -295,6 +363,8 @@ public int hashCode() {
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + PROJECT_ID_FIELD_NUMBER;
hash = (53 * hash) + getProjectId().hashCode();
+ hash = (37 * hash) + DATABASE_ID_FIELD_NUMBER;
+ hash = (53 * hash) + getDatabaseId().hashCode();
if (hasTransactionOptions()) {
hash = (37 * hash) + TRANSACTION_OPTIONS_FIELD_NUMBER;
hash = (53 * hash) + getTransactionOptions().hashCode();
@@ -446,6 +516,8 @@ public Builder clear() {
super.clear();
projectId_ = "";
+ databaseId_ = "";
+
if (transactionOptionsBuilder_ == null) {
transactionOptions_ = null;
} else {
@@ -480,6 +552,7 @@ public com.google.datastore.v1.BeginTransactionRequest buildPartial() {
com.google.datastore.v1.BeginTransactionRequest result =
new com.google.datastore.v1.BeginTransactionRequest(this);
result.projectId_ = projectId_;
+ result.databaseId_ = databaseId_;
if (transactionOptionsBuilder_ == null) {
result.transactionOptions_ = transactionOptions_;
} else {
@@ -539,6 +612,10 @@ public Builder mergeFrom(com.google.datastore.v1.BeginTransactionRequest other)
projectId_ = other.projectId_;
onChanged();
}
+ if (!other.getDatabaseId().isEmpty()) {
+ databaseId_ = other.databaseId_;
+ onChanged();
+ }
if (other.hasTransactionOptions()) {
mergeTransactionOptions(other.getTransactionOptions());
}
@@ -677,6 +754,122 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
return this;
}
+ private java.lang.Object databaseId_ = "";
+ /**
+ *
+ *
+ * + * The ID of the database against which to make the request. + * '(default)' is not allowed; please use empty string '' to refer the default + * database. + *+ * + *
string database_id = 9;
+ *
+ * @return The databaseId.
+ */
+ public java.lang.String getDatabaseId() {
+ java.lang.Object ref = databaseId_;
+ if (!(ref instanceof java.lang.String)) {
+ com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ databaseId_ = s;
+ return s;
+ } else {
+ return (java.lang.String) ref;
+ }
+ }
+ /**
+ *
+ *
+ * + * The ID of the database against which to make the request. + * '(default)' is not allowed; please use empty string '' to refer the default + * database. + *+ * + *
string database_id = 9;
+ *
+ * @return The bytes for databaseId.
+ */
+ public com.google.protobuf.ByteString getDatabaseIdBytes() {
+ java.lang.Object ref = databaseId_;
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+ databaseId_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+ /**
+ *
+ *
+ * + * The ID of the database against which to make the request. + * '(default)' is not allowed; please use empty string '' to refer the default + * database. + *+ * + *
string database_id = 9;
+ *
+ * @param value The databaseId to set.
+ * @return This builder for chaining.
+ */
+ public Builder setDatabaseId(java.lang.String value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+
+ databaseId_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ *
+ * + * The ID of the database against which to make the request. + * '(default)' is not allowed; please use empty string '' to refer the default + * database. + *+ * + *
string database_id = 9;
+ *
+ * @return This builder for chaining.
+ */
+ public Builder clearDatabaseId() {
+
+ databaseId_ = getDefaultInstance().getDatabaseId();
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ *
+ * + * The ID of the database against which to make the request. + * '(default)' is not allowed; please use empty string '' to refer the default + * database. + *+ * + *
string database_id = 9;
+ *
+ * @param value The bytes for databaseId to set.
+ * @return This builder for chaining.
+ */
+ public Builder setDatabaseIdBytes(com.google.protobuf.ByteString value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ checkByteStringIsUtf8(value);
+
+ databaseId_ = value;
+ onChanged();
+ return this;
+ }
+
private com.google.datastore.v1.TransactionOptions transactionOptions_;
private com.google.protobuf.SingleFieldBuilderV3<
com.google.datastore.v1.TransactionOptions,
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequestOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequestOrBuilder.java
index 31bd75450..bfe6db93d 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequestOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequestOrBuilder.java
@@ -48,6 +48,35 @@ public interface BeginTransactionRequestOrBuilder
*/
com.google.protobuf.ByteString getProjectIdBytes();
+ /**
+ *
+ *
+ * + * The ID of the database against which to make the request. + * '(default)' is not allowed; please use empty string '' to refer the default + * database. + *+ * + *
string database_id = 9;
+ *
+ * @return The databaseId.
+ */
+ java.lang.String getDatabaseId();
+ /**
+ *
+ *
+ * + * The ID of the database against which to make the request. + * '(default)' is not allowed; please use empty string '' to refer the default + * database. + *+ * + *
string database_id = 9;
+ *
+ * @return The bytes for databaseId.
+ */
+ com.google.protobuf.ByteString getDatabaseIdBytes();
+
/**
*
*
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequest.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequest.java
index 1af1bc6c9..a52f58dd8 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequest.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequest.java
@@ -39,6 +39,7 @@ private CommitRequest(com.google.protobuf.GeneratedMessageV3.Builder builder)
private CommitRequest() {
projectId_ = "";
+ databaseId_ = "";
mode_ = 0;
mutations_ = java.util.Collections.emptyList();
}
@@ -103,6 +104,13 @@ private CommitRequest(
projectId_ = s;
break;
}
+ case 74:
+ {
+ java.lang.String s = input.readStringRequireUtf8();
+
+ databaseId_ = s;
+ break;
+ }
default:
{
if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
@@ -396,6 +404,59 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
}
}
+ public static final int DATABASE_ID_FIELD_NUMBER = 9;
+ private volatile java.lang.Object databaseId_;
+ /**
+ *
+ *
+ * + * The ID of the database against which to make the request. + * '(default)' is not allowed; please use empty string '' to refer the default + * database. + *+ * + *
string database_id = 9;
+ *
+ * @return The databaseId.
+ */
+ @java.lang.Override
+ public java.lang.String getDatabaseId() {
+ java.lang.Object ref = databaseId_;
+ if (ref instanceof java.lang.String) {
+ return (java.lang.String) ref;
+ } else {
+ com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ databaseId_ = s;
+ return s;
+ }
+ }
+ /**
+ *
+ *
+ * + * The ID of the database against which to make the request. + * '(default)' is not allowed; please use empty string '' to refer the default + * database. + *+ * + *
string database_id = 9;
+ *
+ * @return The bytes for databaseId.
+ */
+ @java.lang.Override
+ public com.google.protobuf.ByteString getDatabaseIdBytes() {
+ java.lang.Object ref = databaseId_;
+ if (ref instanceof java.lang.String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+ databaseId_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+
public static final int MODE_FIELD_NUMBER = 5;
private int mode_;
/**
@@ -611,6 +672,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(projectId_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 8, projectId_);
}
+ if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(databaseId_)) {
+ com.google.protobuf.GeneratedMessageV3.writeString(output, 9, databaseId_);
+ }
unknownFields.writeTo(output);
}
@@ -634,6 +698,9 @@ public int getSerializedSize() {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(projectId_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, projectId_);
}
+ if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(databaseId_)) {
+ size += com.google.protobuf.GeneratedMessageV3.computeStringSize(9, databaseId_);
+ }
size += unknownFields.getSerializedSize();
memoizedSize = size;
return size;
@@ -650,6 +717,7 @@ public boolean equals(final java.lang.Object obj) {
com.google.datastore.v1.CommitRequest other = (com.google.datastore.v1.CommitRequest) obj;
if (!getProjectId().equals(other.getProjectId())) return false;
+ if (!getDatabaseId().equals(other.getDatabaseId())) return false;
if (mode_ != other.mode_) return false;
if (!getMutationsList().equals(other.getMutationsList())) return false;
if (!getTransactionSelectorCase().equals(other.getTransactionSelectorCase())) return false;
@@ -673,6 +741,8 @@ public int hashCode() {
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + PROJECT_ID_FIELD_NUMBER;
hash = (53 * hash) + getProjectId().hashCode();
+ hash = (37 * hash) + DATABASE_ID_FIELD_NUMBER;
+ hash = (53 * hash) + getDatabaseId().hashCode();
hash = (37 * hash) + MODE_FIELD_NUMBER;
hash = (53 * hash) + mode_;
if (getMutationsCount() > 0) {
@@ -835,6 +905,8 @@ public Builder clear() {
super.clear();
projectId_ = "";
+ databaseId_ = "";
+
mode_ = 0;
if (mutationsBuilder_ == null) {
@@ -874,6 +946,7 @@ public com.google.datastore.v1.CommitRequest buildPartial() {
new com.google.datastore.v1.CommitRequest(this);
int from_bitField0_ = bitField0_;
result.projectId_ = projectId_;
+ result.databaseId_ = databaseId_;
result.mode_ = mode_;
if (transactionSelectorCase_ == 1) {
result.transactionSelector_ = transactionSelector_;
@@ -941,6 +1014,10 @@ public Builder mergeFrom(com.google.datastore.v1.CommitRequest other) {
projectId_ = other.projectId_;
onChanged();
}
+ if (!other.getDatabaseId().isEmpty()) {
+ databaseId_ = other.databaseId_;
+ onChanged();
+ }
if (other.mode_ != 0) {
setModeValue(other.getModeValue());
}
@@ -1133,6 +1210,122 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
return this;
}
+ private java.lang.Object databaseId_ = "";
+ /**
+ *
+ *
+ * + * The ID of the database against which to make the request. + * '(default)' is not allowed; please use empty string '' to refer the default + * database. + *+ * + *
string database_id = 9;
+ *
+ * @return The databaseId.
+ */
+ public java.lang.String getDatabaseId() {
+ java.lang.Object ref = databaseId_;
+ if (!(ref instanceof java.lang.String)) {
+ com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ databaseId_ = s;
+ return s;
+ } else {
+ return (java.lang.String) ref;
+ }
+ }
+ /**
+ *
+ *
+ * + * The ID of the database against which to make the request. + * '(default)' is not allowed; please use empty string '' to refer the default + * database. + *+ * + *
string database_id = 9;
+ *
+ * @return The bytes for databaseId.
+ */
+ public com.google.protobuf.ByteString getDatabaseIdBytes() {
+ java.lang.Object ref = databaseId_;
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+ databaseId_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+ /**
+ *
+ *
+ * + * The ID of the database against which to make the request. + * '(default)' is not allowed; please use empty string '' to refer the default + * database. + *+ * + *
string database_id = 9;
+ *
+ * @param value The databaseId to set.
+ * @return This builder for chaining.
+ */
+ public Builder setDatabaseId(java.lang.String value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+
+ databaseId_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ *
+ * + * The ID of the database against which to make the request. + * '(default)' is not allowed; please use empty string '' to refer the default + * database. + *+ * + *
string database_id = 9;
+ *
+ * @return This builder for chaining.
+ */
+ public Builder clearDatabaseId() {
+
+ databaseId_ = getDefaultInstance().getDatabaseId();
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ *
+ * + * The ID of the database against which to make the request. + * '(default)' is not allowed; please use empty string '' to refer the default + * database. + *+ * + *
string database_id = 9;
+ *
+ * @param value The bytes for databaseId to set.
+ * @return This builder for chaining.
+ */
+ public Builder setDatabaseIdBytes(com.google.protobuf.ByteString value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ checkByteStringIsUtf8(value);
+
+ databaseId_ = value;
+ onChanged();
+ return this;
+ }
+
private int mode_ = 0;
/**
*
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequestOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequestOrBuilder.java
index db235efdd..1b15f3408 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequestOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequestOrBuilder.java
@@ -48,6 +48,35 @@ public interface CommitRequestOrBuilder
*/
com.google.protobuf.ByteString getProjectIdBytes();
+ /**
+ *
+ *
+ * + * The ID of the database against which to make the request. + * '(default)' is not allowed; please use empty string '' to refer the default + * database. + *+ * + *
string database_id = 9;
+ *
+ * @return The databaseId.
+ */
+ java.lang.String getDatabaseId();
+ /**
+ *
+ *
+ * + * The ID of the database against which to make the request. + * '(default)' is not allowed; please use empty string '' to refer the default + * database. + *+ * + *
string database_id = 9;
+ *
+ * @return The bytes for databaseId.
+ */
+ com.google.protobuf.ByteString getDatabaseIdBytes();
+
/**
*
*
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CompositeFilter.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CompositeFilter.java
index 72432f944..c67e8c36c 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CompositeFilter.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CompositeFilter.java
@@ -306,7 +306,8 @@ public com.google.datastore.v1.CompositeFilter.Operator getOp() {
*
*
* The list of filters to combine.
- * Must contain at least one filter.
+ * Requires:
+ * * At least one filter is present.
*
*
* repeated .google.datastore.v1.Filter filters = 2;
@@ -320,7 +321,8 @@ public java.util.List
* The list of filters to combine.
- * Must contain at least one filter.
+ * Requires:
+ * * At least one filter is present.
*
*
* repeated .google.datastore.v1.Filter filters = 2;
@@ -335,7 +337,8 @@ public java.util.List
* The list of filters to combine.
- * Must contain at least one filter.
+ * Requires:
+ * * At least one filter is present.
*
*
* repeated .google.datastore.v1.Filter filters = 2;
@@ -349,7 +352,8 @@ public int getFiltersCount() {
*
*
* The list of filters to combine.
- * Must contain at least one filter.
+ * Requires:
+ * * At least one filter is present.
*
*
* repeated .google.datastore.v1.Filter filters = 2;
@@ -363,7 +367,8 @@ public com.google.datastore.v1.Filter getFilters(int index) {
*
*
* The list of filters to combine.
- * Must contain at least one filter.
+ * Requires:
+ * * At least one filter is present.
*
*
* repeated .google.datastore.v1.Filter filters = 2;
@@ -859,7 +864,8 @@ private void ensureFiltersIsMutable() {
*
*
* The list of filters to combine.
- * Must contain at least one filter.
+ * Requires:
+ * * At least one filter is present.
*
*
* repeated .google.datastore.v1.Filter filters = 2;
@@ -876,7 +882,8 @@ public java.util.List
* The list of filters to combine.
- * Must contain at least one filter.
+ * Requires:
+ * * At least one filter is present.
*
*
* repeated .google.datastore.v1.Filter filters = 2;
@@ -893,7 +900,8 @@ public int getFiltersCount() {
*
*
* The list of filters to combine.
- * Must contain at least one filter.
+ * Requires:
+ * * At least one filter is present.
*
*
* repeated .google.datastore.v1.Filter filters = 2;
@@ -910,7 +918,8 @@ public com.google.datastore.v1.Filter getFilters(int index) {
*
*
* The list of filters to combine.
- * Must contain at least one filter.
+ * Requires:
+ * * At least one filter is present.
*
*
* repeated .google.datastore.v1.Filter filters = 2;
@@ -933,7 +942,8 @@ public Builder setFilters(int index, com.google.datastore.v1.Filter value) {
*
*
* The list of filters to combine.
- * Must contain at least one filter.
+ * Requires:
+ * * At least one filter is present.
*
*
* repeated .google.datastore.v1.Filter filters = 2;
@@ -953,7 +963,8 @@ public Builder setFilters(int index, com.google.datastore.v1.Filter.Builder buil
*
*
* The list of filters to combine.
- * Must contain at least one filter.
+ * Requires:
+ * * At least one filter is present.
*
*
* repeated .google.datastore.v1.Filter filters = 2;
@@ -976,7 +987,8 @@ public Builder addFilters(com.google.datastore.v1.Filter value) {
*
*
* The list of filters to combine.
- * Must contain at least one filter.
+ * Requires:
+ * * At least one filter is present.
*
*
* repeated .google.datastore.v1.Filter filters = 2;
@@ -999,7 +1011,8 @@ public Builder addFilters(int index, com.google.datastore.v1.Filter value) {
*
*
* The list of filters to combine.
- * Must contain at least one filter.
+ * Requires:
+ * * At least one filter is present.
*
*
* repeated .google.datastore.v1.Filter filters = 2;
@@ -1019,7 +1032,8 @@ public Builder addFilters(com.google.datastore.v1.Filter.Builder builderForValue
*
*
* The list of filters to combine.
- * Must contain at least one filter.
+ * Requires:
+ * * At least one filter is present.
*
*
* repeated .google.datastore.v1.Filter filters = 2;
@@ -1039,7 +1053,8 @@ public Builder addFilters(int index, com.google.datastore.v1.Filter.Builder buil
*
*
* The list of filters to combine.
- * Must contain at least one filter.
+ * Requires:
+ * * At least one filter is present.
*
*
* repeated .google.datastore.v1.Filter filters = 2;
@@ -1060,7 +1075,8 @@ public Builder addAllFilters(
*
*
* The list of filters to combine.
- * Must contain at least one filter.
+ * Requires:
+ * * At least one filter is present.
*
*
* repeated .google.datastore.v1.Filter filters = 2;
@@ -1080,7 +1096,8 @@ public Builder clearFilters() {
*
*
* The list of filters to combine.
- * Must contain at least one filter.
+ * Requires:
+ * * At least one filter is present.
*
*
* repeated .google.datastore.v1.Filter filters = 2;
@@ -1100,7 +1117,8 @@ public Builder removeFilters(int index) {
*
*
* The list of filters to combine.
- * Must contain at least one filter.
+ * Requires:
+ * * At least one filter is present.
*
*
* repeated .google.datastore.v1.Filter filters = 2;
@@ -1113,7 +1131,8 @@ public com.google.datastore.v1.Filter.Builder getFiltersBuilder(int index) {
*
*
* The list of filters to combine.
- * Must contain at least one filter.
+ * Requires:
+ * * At least one filter is present.
*
*
* repeated .google.datastore.v1.Filter filters = 2;
@@ -1130,7 +1149,8 @@ public com.google.datastore.v1.FilterOrBuilder getFiltersOrBuilder(int index) {
*
*
* The list of filters to combine.
- * Must contain at least one filter.
+ * Requires:
+ * * At least one filter is present.
*
*
* repeated .google.datastore.v1.Filter filters = 2;
@@ -1148,7 +1168,8 @@ public com.google.datastore.v1.FilterOrBuilder getFiltersOrBuilder(int index) {
*
*
* The list of filters to combine.
- * Must contain at least one filter.
+ * Requires:
+ * * At least one filter is present.
*
*
* repeated .google.datastore.v1.Filter filters = 2;
@@ -1162,7 +1183,8 @@ public com.google.datastore.v1.Filter.Builder addFiltersBuilder() {
*
*
* The list of filters to combine.
- * Must contain at least one filter.
+ * Requires:
+ * * At least one filter is present.
*
*
* repeated .google.datastore.v1.Filter filters = 2;
@@ -1176,7 +1198,8 @@ public com.google.datastore.v1.Filter.Builder addFiltersBuilder(int index) {
*
*
* The list of filters to combine.
- * Must contain at least one filter.
+ * Requires:
+ * * At least one filter is present.
*
*
* repeated .google.datastore.v1.Filter filters = 2;
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CompositeFilterOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CompositeFilterOrBuilder.java
index ad644173e..6dc33de5d 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CompositeFilterOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CompositeFilterOrBuilder.java
@@ -53,7 +53,8 @@ public interface CompositeFilterOrBuilder
*
*
* The list of filters to combine.
- * Must contain at least one filter.
+ * Requires:
+ * * At least one filter is present.
*
*
* repeated .google.datastore.v1.Filter filters = 2;
@@ -64,7 +65,8 @@ public interface CompositeFilterOrBuilder
*
*
* The list of filters to combine.
- * Must contain at least one filter.
+ * Requires:
+ * * At least one filter is present.
*
*
* repeated .google.datastore.v1.Filter filters = 2;
@@ -75,7 +77,8 @@ public interface CompositeFilterOrBuilder
*
*
* The list of filters to combine.
- * Must contain at least one filter.
+ * Requires:
+ * * At least one filter is present.
*
*
* repeated .google.datastore.v1.Filter filters = 2;
@@ -86,7 +89,8 @@ public interface CompositeFilterOrBuilder
*
*
* The list of filters to combine.
- * Must contain at least one filter.
+ * Requires:
+ * * At least one filter is present.
*
*
* repeated .google.datastore.v1.Filter filters = 2;
@@ -97,7 +101,8 @@ public interface CompositeFilterOrBuilder
*
*
* The list of filters to combine.
- * Must contain at least one filter.
+ * Requires:
+ * * At least one filter is present.
*
*
* repeated .google.datastore.v1.Filter filters = 2;
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/DatastoreProto.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/DatastoreProto.java
index 256f06c9a..9c945ae1d 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/DatastoreProto.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/DatastoreProto.java
@@ -122,112 +122,115 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
+ "e/api/field_behavior.proto\032 google/datas"
+ "tore/v1/entity.proto\032\037google/datastore/v"
+ "1/query.proto\032\037google/protobuf/timestamp"
- + ".proto\"\215\001\n\rLookupRequest\022\027\n\nproject_id\030\010"
- + " \001(\tB\003\340A\002\0226\n\014read_options\030\001 \001(\0132 .google"
- + ".datastore.v1.ReadOptions\022+\n\004keys\030\003 \003(\0132"
- + "\030.google.datastore.v1.KeyB\003\340A\002\"\321\001\n\016Looku"
- + "pResponse\0220\n\005found\030\001 \003(\0132!.google.datast"
- + "ore.v1.EntityResult\0222\n\007missing\030\002 \003(\0132!.g"
- + "oogle.datastore.v1.EntityResult\022*\n\010defer"
- + "red\030\003 \003(\0132\030.google.datastore.v1.Key\022-\n\tr"
- + "ead_time\030\007 \001(\0132\032.google.protobuf.Timesta"
- + "mp\"\211\002\n\017RunQueryRequest\022\027\n\nproject_id\030\010 \001"
- + "(\tB\003\340A\002\0226\n\014partition_id\030\002 \001(\0132 .google.d"
- + "atastore.v1.PartitionId\0226\n\014read_options\030"
- + "\001 \001(\0132 .google.datastore.v1.ReadOptions\022"
- + "+\n\005query\030\003 \001(\0132\032.google.datastore.v1.Que"
- + "ryH\000\0222\n\tgql_query\030\007 \001(\0132\035.google.datasto"
- + "re.v1.GqlQueryH\000B\014\n\nquery_type\"s\n\020RunQue"
- + "ryResponse\0224\n\005batch\030\001 \001(\0132%.google.datas"
- + "tore.v1.QueryResultBatch\022)\n\005query\030\002 \001(\0132"
- + "\032.google.datastore.v1.Query\"x\n\027BeginTran"
- + "sactionRequest\022\027\n\nproject_id\030\010 \001(\tB\003\340A\002\022"
- + "D\n\023transaction_options\030\n \001(\0132\'.google.da"
- + "tastore.v1.TransactionOptions\"/\n\030BeginTr"
- + "ansactionResponse\022\023\n\013transaction\030\001 \001(\014\"D"
- + "\n\017RollbackRequest\022\027\n\nproject_id\030\010 \001(\tB\003\340"
- + "A\002\022\030\n\013transaction\030\001 \001(\014B\003\340A\002\"\022\n\020Rollback"
- + "Response\"\210\002\n\rCommitRequest\022\027\n\nproject_id"
- + "\030\010 \001(\tB\003\340A\002\0225\n\004mode\030\005 \001(\0162\'.google.datas"
- + "tore.v1.CommitRequest.Mode\022\025\n\013transactio"
- + "n\030\001 \001(\014H\000\0220\n\tmutations\030\006 \003(\0132\035.google.da"
- + "tastore.v1.Mutation\"F\n\004Mode\022\024\n\020MODE_UNSP"
- + "ECIFIED\020\000\022\021\n\rTRANSACTIONAL\020\001\022\025\n\021NON_TRAN"
- + "SACTIONAL\020\002B\026\n\024transaction_selector\"\227\001\n\016"
- + "CommitResponse\022=\n\020mutation_results\030\003 \003(\013"
- + "2#.google.datastore.v1.MutationResult\022\025\n"
- + "\rindex_updates\030\004 \001(\005\022/\n\013commit_time\030\010 \001("
- + "\0132\032.google.protobuf.Timestamp\"Z\n\022Allocat"
- + "eIdsRequest\022\027\n\nproject_id\030\010 \001(\tB\003\340A\002\022+\n\004"
- + "keys\030\001 \003(\0132\030.google.datastore.v1.KeyB\003\340A"
- + "\002\"=\n\023AllocateIdsResponse\022&\n\004keys\030\001 \003(\0132\030"
- + ".google.datastore.v1.Key\"n\n\021ReserveIdsRe"
- + "quest\022\027\n\nproject_id\030\010 \001(\tB\003\340A\002\022\023\n\013databa"
- + "se_id\030\t \001(\t\022+\n\004keys\030\001 \003(\0132\030.google.datas"
- + "tore.v1.KeyB\003\340A\002\"\024\n\022ReserveIdsResponse\"\272"
- + "\002\n\010Mutation\022-\n\006insert\030\004 \001(\0132\033.google.dat"
- + "astore.v1.EntityH\000\022-\n\006update\030\005 \001(\0132\033.goo"
- + "gle.datastore.v1.EntityH\000\022-\n\006upsert\030\006 \001("
- + "\0132\033.google.datastore.v1.EntityH\000\022*\n\006dele"
- + "te\030\007 \001(\0132\030.google.datastore.v1.KeyH\000\022\026\n\014"
- + "base_version\030\010 \001(\003H\001\0221\n\013update_time\030\013 \001("
- + "\0132\032.google.protobuf.TimestampH\001B\013\n\topera"
- + "tionB\035\n\033conflict_detection_strategy\"\224\001\n\016"
- + "MutationResult\022%\n\003key\030\003 \001(\0132\030.google.dat"
- + "astore.v1.Key\022\017\n\007version\030\004 \001(\003\022/\n\013update"
- + "_time\030\006 \001(\0132\032.google.protobuf.Timestamp\022"
- + "\031\n\021conflict_detected\030\005 \001(\010\"\206\002\n\013ReadOptio"
- + "ns\022L\n\020read_consistency\030\001 \001(\01620.google.da"
- + "tastore.v1.ReadOptions.ReadConsistencyH\000"
- + "\022\025\n\013transaction\030\002 \001(\014H\000\022/\n\tread_time\030\004 \001"
- + "(\0132\032.google.protobuf.TimestampH\000\"M\n\017Read"
- + "Consistency\022 \n\034READ_CONSISTENCY_UNSPECIF"
- + "IED\020\000\022\n\n\006STRONG\020\001\022\014\n\010EVENTUAL\020\002B\022\n\020consi"
- + "stency_type\"\222\002\n\022TransactionOptions\022G\n\nre"
- + "ad_write\030\001 \001(\01321.google.datastore.v1.Tra"
- + "nsactionOptions.ReadWriteH\000\022E\n\tread_only"
- + "\030\002 \001(\01320.google.datastore.v1.Transaction"
- + "Options.ReadOnlyH\000\032)\n\tReadWrite\022\034\n\024previ"
- + "ous_transaction\030\001 \001(\014\0329\n\010ReadOnly\022-\n\trea"
- + "d_time\030\001 \001(\0132\032.google.protobuf.Timestamp"
- + "B\006\n\004mode2\223\n\n\tDatastore\022\235\001\n\006Lookup\022\".goog"
- + "le.datastore.v1.LookupRequest\032#.google.d"
- + "atastore.v1.LookupResponse\"J\202\323\344\223\002%\" /v1/"
- + "projects/{project_id}:lookup:\001*\332A\034projec"
- + "t_id,read_options,keys\022\206\001\n\010RunQuery\022$.go"
- + "ogle.datastore.v1.RunQueryRequest\032%.goog"
- + "le.datastore.v1.RunQueryResponse\"-\202\323\344\223\002\'"
- + "\"\"/v1/projects/{project_id}:runQuery:\001*\022"
- + "\263\001\n\020BeginTransaction\022,.google.datastore."
- + "v1.BeginTransactionRequest\032-.google.data"
- + "store.v1.BeginTransactionResponse\"B\202\323\344\223\002"
- + "/\"*/v1/projects/{project_id}:beginTransa"
- + "ction:\001*\332A\nproject_id\022\302\001\n\006Commit\022\".googl"
- + "e.datastore.v1.CommitRequest\032#.google.da"
- + "tastore.v1.CommitResponse\"o\202\323\344\223\002%\" /v1/p"
- + "rojects/{project_id}:commit:\001*\332A%project"
- + "_id,mode,transaction,mutations\332A\031project"
- + "_id,mode,mutations\022\237\001\n\010Rollback\022$.google"
- + ".datastore.v1.RollbackRequest\032%.google.d"
- + "atastore.v1.RollbackResponse\"F\202\323\344\223\002\'\"\"/v"
- + "1/projects/{project_id}:rollback:\001*\332A\026pr"
- + "oject_id,transaction\022\244\001\n\013AllocateIds\022\'.g"
- + "oogle.datastore.v1.AllocateIdsRequest\032(."
- + "google.datastore.v1.AllocateIdsResponse\""
- + "B\202\323\344\223\002*\"%/v1/projects/{project_id}:alloc"
- + "ateIds:\001*\332A\017project_id,keys\022\240\001\n\nReserveI"
- + "ds\022&.google.datastore.v1.ReserveIdsReque"
- + "st\032\'.google.datastore.v1.ReserveIdsRespo"
- + "nse\"A\202\323\344\223\002)\"$/v1/projects/{project_id}:r"
- + "eserveIds:\001*\332A\017project_id,keys\032v\312A\030datas"
- + "tore.googleapis.com\322AXhttps://www.google"
- + "apis.com/auth/cloud-platform,https://www"
- + ".googleapis.com/auth/datastoreB\300\001\n\027com.g"
- + "oogle.datastore.v1B\016DatastoreProtoP\001Z+ * The ID of the database against which to make the request. + * '(default)' is not allowed; please use empty string '' to refer the default + * database. + *+ * + *
string database_id = 9;
+ *
+ * @return The databaseId.
+ */
+ @java.lang.Override
+ public java.lang.String getDatabaseId() {
+ java.lang.Object ref = databaseId_;
+ if (ref instanceof java.lang.String) {
+ return (java.lang.String) ref;
+ } else {
+ com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ databaseId_ = s;
+ return s;
+ }
+ }
+ /**
+ *
+ *
+ * + * The ID of the database against which to make the request. + * '(default)' is not allowed; please use empty string '' to refer the default + * database. + *+ * + *
string database_id = 9;
+ *
+ * @return The bytes for databaseId.
+ */
+ @java.lang.Override
+ public com.google.protobuf.ByteString getDatabaseIdBytes() {
+ java.lang.Object ref = databaseId_;
+ if (ref instanceof java.lang.String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+ databaseId_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+
public static final int READ_OPTIONS_FIELD_NUMBER = 1;
private com.google.datastore.v1.ReadOptions readOptions_;
/**
@@ -336,6 +397,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(projectId_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 8, projectId_);
}
+ if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(databaseId_)) {
+ com.google.protobuf.GeneratedMessageV3.writeString(output, 9, databaseId_);
+ }
unknownFields.writeTo(output);
}
@@ -354,6 +418,9 @@ public int getSerializedSize() {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(projectId_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, projectId_);
}
+ if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(databaseId_)) {
+ size += com.google.protobuf.GeneratedMessageV3.computeStringSize(9, databaseId_);
+ }
size += unknownFields.getSerializedSize();
memoizedSize = size;
return size;
@@ -370,6 +437,7 @@ public boolean equals(final java.lang.Object obj) {
com.google.datastore.v1.LookupRequest other = (com.google.datastore.v1.LookupRequest) obj;
if (!getProjectId().equals(other.getProjectId())) return false;
+ if (!getDatabaseId().equals(other.getDatabaseId())) return false;
if (hasReadOptions() != other.hasReadOptions()) return false;
if (hasReadOptions()) {
if (!getReadOptions().equals(other.getReadOptions())) return false;
@@ -388,6 +456,8 @@ public int hashCode() {
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + PROJECT_ID_FIELD_NUMBER;
hash = (53 * hash) + getProjectId().hashCode();
+ hash = (37 * hash) + DATABASE_ID_FIELD_NUMBER;
+ hash = (53 * hash) + getDatabaseId().hashCode();
if (hasReadOptions()) {
hash = (37 * hash) + READ_OPTIONS_FIELD_NUMBER;
hash = (53 * hash) + getReadOptions().hashCode();
@@ -544,6 +614,8 @@ public Builder clear() {
super.clear();
projectId_ = "";
+ databaseId_ = "";
+
if (readOptionsBuilder_ == null) {
readOptions_ = null;
} else {
@@ -585,6 +657,7 @@ public com.google.datastore.v1.LookupRequest buildPartial() {
new com.google.datastore.v1.LookupRequest(this);
int from_bitField0_ = bitField0_;
result.projectId_ = projectId_;
+ result.databaseId_ = databaseId_;
if (readOptionsBuilder_ == null) {
result.readOptions_ = readOptions_;
} else {
@@ -652,6 +725,10 @@ public Builder mergeFrom(com.google.datastore.v1.LookupRequest other) {
projectId_ = other.projectId_;
onChanged();
}
+ if (!other.getDatabaseId().isEmpty()) {
+ databaseId_ = other.databaseId_;
+ onChanged();
+ }
if (other.hasReadOptions()) {
mergeReadOptions(other.getReadOptions());
}
@@ -819,6 +896,122 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
return this;
}
+ private java.lang.Object databaseId_ = "";
+ /**
+ *
+ *
+ * + * The ID of the database against which to make the request. + * '(default)' is not allowed; please use empty string '' to refer the default + * database. + *+ * + *
string database_id = 9;
+ *
+ * @return The databaseId.
+ */
+ public java.lang.String getDatabaseId() {
+ java.lang.Object ref = databaseId_;
+ if (!(ref instanceof java.lang.String)) {
+ com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ databaseId_ = s;
+ return s;
+ } else {
+ return (java.lang.String) ref;
+ }
+ }
+ /**
+ *
+ *
+ * + * The ID of the database against which to make the request. + * '(default)' is not allowed; please use empty string '' to refer the default + * database. + *+ * + *
string database_id = 9;
+ *
+ * @return The bytes for databaseId.
+ */
+ public com.google.protobuf.ByteString getDatabaseIdBytes() {
+ java.lang.Object ref = databaseId_;
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+ databaseId_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+ /**
+ *
+ *
+ * + * The ID of the database against which to make the request. + * '(default)' is not allowed; please use empty string '' to refer the default + * database. + *+ * + *
string database_id = 9;
+ *
+ * @param value The databaseId to set.
+ * @return This builder for chaining.
+ */
+ public Builder setDatabaseId(java.lang.String value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+
+ databaseId_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ *
+ * + * The ID of the database against which to make the request. + * '(default)' is not allowed; please use empty string '' to refer the default + * database. + *+ * + *
string database_id = 9;
+ *
+ * @return This builder for chaining.
+ */
+ public Builder clearDatabaseId() {
+
+ databaseId_ = getDefaultInstance().getDatabaseId();
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ *
+ * + * The ID of the database against which to make the request. + * '(default)' is not allowed; please use empty string '' to refer the default + * database. + *+ * + *
string database_id = 9;
+ *
+ * @param value The bytes for databaseId to set.
+ * @return This builder for chaining.
+ */
+ public Builder setDatabaseIdBytes(com.google.protobuf.ByteString value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ checkByteStringIsUtf8(value);
+
+ databaseId_ = value;
+ onChanged();
+ return this;
+ }
+
private com.google.datastore.v1.ReadOptions readOptions_;
private com.google.protobuf.SingleFieldBuilderV3<
com.google.datastore.v1.ReadOptions,
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupRequestOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupRequestOrBuilder.java
index eb369b37e..0720a2256 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupRequestOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupRequestOrBuilder.java
@@ -48,6 +48,35 @@ public interface LookupRequestOrBuilder
*/
com.google.protobuf.ByteString getProjectIdBytes();
+ /**
+ *
+ *
+ * + * The ID of the database against which to make the request. + * '(default)' is not allowed; please use empty string '' to refer the default + * database. + *+ * + *
string database_id = 9;
+ *
+ * @return The databaseId.
+ */
+ java.lang.String getDatabaseId();
+ /**
+ *
+ *
+ * + * The ID of the database against which to make the request. + * '(default)' is not allowed; please use empty string '' to refer the default + * database. + *+ * + *
string database_id = 9;
+ *
+ * @return The bytes for databaseId.
+ */
+ com.google.protobuf.ByteString getDatabaseIdBytes();
+
/**
*
*
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionId.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionId.java
index 7439b03ad..49784b939 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionId.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionId.java
@@ -53,6 +53,7 @@ private PartitionId(com.google.protobuf.GeneratedMessageV3.Builder builder) {
private PartitionId() {
projectId_ = "";
+ databaseId_ = "";
namespaceId_ = "";
}
@@ -92,6 +93,13 @@ private PartitionId(
projectId_ = s;
break;
}
+ case 26:
+ {
+ java.lang.String s = input.readStringRequireUtf8();
+
+ databaseId_ = s;
+ break;
+ }
case 34:
{
java.lang.String s = input.readStringRequireUtf8();
@@ -184,6 +192,57 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
}
}
+ public static final int DATABASE_ID_FIELD_NUMBER = 3;
+ private volatile java.lang.Object databaseId_;
+ /**
+ *
+ *
+ * + * If not empty, the ID of the database to which the entities + * belong. + *+ * + *
string database_id = 3;
+ *
+ * @return The databaseId.
+ */
+ @java.lang.Override
+ public java.lang.String getDatabaseId() {
+ java.lang.Object ref = databaseId_;
+ if (ref instanceof java.lang.String) {
+ return (java.lang.String) ref;
+ } else {
+ com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ databaseId_ = s;
+ return s;
+ }
+ }
+ /**
+ *
+ *
+ * + * If not empty, the ID of the database to which the entities + * belong. + *+ * + *
string database_id = 3;
+ *
+ * @return The bytes for databaseId.
+ */
+ @java.lang.Override
+ public com.google.protobuf.ByteString getDatabaseIdBytes() {
+ java.lang.Object ref = databaseId_;
+ if (ref instanceof java.lang.String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+ databaseId_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+
public static final int NAMESPACE_ID_FIELD_NUMBER = 4;
private volatile java.lang.Object namespaceId_;
/**
@@ -250,6 +309,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(projectId_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 2, projectId_);
}
+ if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(databaseId_)) {
+ com.google.protobuf.GeneratedMessageV3.writeString(output, 3, databaseId_);
+ }
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(namespaceId_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 4, namespaceId_);
}
@@ -265,6 +327,9 @@ public int getSerializedSize() {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(projectId_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, projectId_);
}
+ if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(databaseId_)) {
+ size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, databaseId_);
+ }
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(namespaceId_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, namespaceId_);
}
@@ -284,6 +349,7 @@ public boolean equals(final java.lang.Object obj) {
com.google.datastore.v1.PartitionId other = (com.google.datastore.v1.PartitionId) obj;
if (!getProjectId().equals(other.getProjectId())) return false;
+ if (!getDatabaseId().equals(other.getDatabaseId())) return false;
if (!getNamespaceId().equals(other.getNamespaceId())) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
@@ -298,6 +364,8 @@ public int hashCode() {
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + PROJECT_ID_FIELD_NUMBER;
hash = (53 * hash) + getProjectId().hashCode();
+ hash = (37 * hash) + DATABASE_ID_FIELD_NUMBER;
+ hash = (53 * hash) + getDatabaseId().hashCode();
hash = (37 * hash) + NAMESPACE_ID_FIELD_NUMBER;
hash = (53 * hash) + getNamespaceId().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
@@ -460,6 +528,8 @@ public Builder clear() {
super.clear();
projectId_ = "";
+ databaseId_ = "";
+
namespaceId_ = "";
return this;
@@ -489,6 +559,7 @@ public com.google.datastore.v1.PartitionId build() {
public com.google.datastore.v1.PartitionId buildPartial() {
com.google.datastore.v1.PartitionId result = new com.google.datastore.v1.PartitionId(this);
result.projectId_ = projectId_;
+ result.databaseId_ = databaseId_;
result.namespaceId_ = namespaceId_;
onBuilt();
return result;
@@ -543,6 +614,10 @@ public Builder mergeFrom(com.google.datastore.v1.PartitionId other) {
projectId_ = other.projectId_;
onChanged();
}
+ if (!other.getDatabaseId().isEmpty()) {
+ databaseId_ = other.databaseId_;
+ onChanged();
+ }
if (!other.getNamespaceId().isEmpty()) {
namespaceId_ = other.namespaceId_;
onChanged();
@@ -682,6 +757,117 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
return this;
}
+ private java.lang.Object databaseId_ = "";
+ /**
+ *
+ *
+ * + * If not empty, the ID of the database to which the entities + * belong. + *+ * + *
string database_id = 3;
+ *
+ * @return The databaseId.
+ */
+ public java.lang.String getDatabaseId() {
+ java.lang.Object ref = databaseId_;
+ if (!(ref instanceof java.lang.String)) {
+ com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ databaseId_ = s;
+ return s;
+ } else {
+ return (java.lang.String) ref;
+ }
+ }
+ /**
+ *
+ *
+ * + * If not empty, the ID of the database to which the entities + * belong. + *+ * + *
string database_id = 3;
+ *
+ * @return The bytes for databaseId.
+ */
+ public com.google.protobuf.ByteString getDatabaseIdBytes() {
+ java.lang.Object ref = databaseId_;
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+ databaseId_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+ /**
+ *
+ *
+ * + * If not empty, the ID of the database to which the entities + * belong. + *+ * + *
string database_id = 3;
+ *
+ * @param value The databaseId to set.
+ * @return This builder for chaining.
+ */
+ public Builder setDatabaseId(java.lang.String value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+
+ databaseId_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ *
+ * + * If not empty, the ID of the database to which the entities + * belong. + *+ * + *
string database_id = 3;
+ *
+ * @return This builder for chaining.
+ */
+ public Builder clearDatabaseId() {
+
+ databaseId_ = getDefaultInstance().getDatabaseId();
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ *
+ * + * If not empty, the ID of the database to which the entities + * belong. + *+ * + *
string database_id = 3;
+ *
+ * @param value The bytes for databaseId to set.
+ * @return This builder for chaining.
+ */
+ public Builder setDatabaseIdBytes(com.google.protobuf.ByteString value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ checkByteStringIsUtf8(value);
+
+ databaseId_ = value;
+ onChanged();
+ return this;
+ }
+
private java.lang.Object namespaceId_ = "";
/**
*
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionIdOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionIdOrBuilder.java
index 4d6a0cf43..e86fdaf8e 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionIdOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionIdOrBuilder.java
@@ -48,6 +48,33 @@ public interface PartitionIdOrBuilder
*/
com.google.protobuf.ByteString getProjectIdBytes();
+ /**
+ *
+ *
+ * + * If not empty, the ID of the database to which the entities + * belong. + *+ * + *
string database_id = 3;
+ *
+ * @return The databaseId.
+ */
+ java.lang.String getDatabaseId();
+ /**
+ *
+ *
+ * + * If not empty, the ID of the database to which the entities + * belong. + *+ * + *
string database_id = 3;
+ *
+ * @return The bytes for databaseId.
+ */
+ com.google.protobuf.ByteString getDatabaseIdBytes();
+
/**
*
*
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProto.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProto.java
index d96e6c2d9..53afbf412 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProto.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProto.java
@@ -89,84 +89,85 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
static {
java.lang.String[] descriptorData = {
"\n\037google/datastore/v1/query.proto\022\023googl"
- + "e.datastore.v1\032 google/datastore/v1/enti"
- + "ty.proto\032\037google/protobuf/timestamp.prot"
- + "o\032\036google/protobuf/wrappers.proto\"\340\001\n\014En"
- + "tityResult\022+\n\006entity\030\001 \001(\0132\033.google.data"
- + "store.v1.Entity\022\017\n\007version\030\004 \001(\003\022/\n\013upda"
- + "te_time\030\005 \001(\0132\032.google.protobuf.Timestam"
- + "p\022\016\n\006cursor\030\003 \001(\014\"Q\n\nResultType\022\033\n\027RESUL"
- + "T_TYPE_UNSPECIFIED\020\000\022\010\n\004FULL\020\001\022\016\n\nPROJEC"
- + "TION\020\002\022\014\n\010KEY_ONLY\020\003\"\362\002\n\005Query\0223\n\nprojec"
- + "tion\030\002 \003(\0132\037.google.datastore.v1.Project"
- + "ion\0221\n\004kind\030\003 \003(\0132#.google.datastore.v1."
- + "KindExpression\022+\n\006filter\030\004 \001(\0132\033.google."
- + "datastore.v1.Filter\0221\n\005order\030\005 \003(\0132\".goo"
- + "gle.datastore.v1.PropertyOrder\022;\n\013distin"
- + "ct_on\030\006 \003(\0132&.google.datastore.v1.Proper"
- + "tyReference\022\024\n\014start_cursor\030\007 \001(\014\022\022\n\nend"
- + "_cursor\030\010 \001(\014\022\016\n\006offset\030\n \001(\005\022*\n\005limit\030\014"
- + " \001(\0132\033.google.protobuf.Int32Value\"\036\n\016Kin"
- + "dExpression\022\014\n\004name\030\001 \001(\t\"!\n\021PropertyRef"
- + "erence\022\014\n\004name\030\002 \001(\t\"F\n\nProjection\0228\n\010pr"
- + "operty\030\001 \001(\0132&.google.datastore.v1.Prope"
- + "rtyReference\"\321\001\n\rPropertyOrder\0228\n\010proper"
- + "ty\030\001 \001(\0132&.google.datastore.v1.PropertyR"
- + "eference\022?\n\tdirection\030\002 \001(\0162,.google.dat"
- + "astore.v1.PropertyOrder.Direction\"E\n\tDir"
- + "ection\022\031\n\025DIRECTION_UNSPECIFIED\020\000\022\r\n\tASC"
- + "ENDING\020\001\022\016\n\nDESCENDING\020\002\"\231\001\n\006Filter\022@\n\020c"
- + "omposite_filter\030\001 \001(\0132$.google.datastore"
- + ".v1.CompositeFilterH\000\022>\n\017property_filter"
- + "\030\002 \001(\0132#.google.datastore.v1.PropertyFil"
- + "terH\000B\r\n\013filter_type\"\251\001\n\017CompositeFilter"
- + "\0229\n\002op\030\001 \001(\0162-.google.datastore.v1.Compo"
- + "siteFilter.Operator\022,\n\007filters\030\002 \003(\0132\033.g"
- + "oogle.datastore.v1.Filter\"-\n\010Operator\022\030\n"
- + "\024OPERATOR_UNSPECIFIED\020\000\022\007\n\003AND\020\001\"\352\002\n\016Pro"
- + "pertyFilter\0228\n\010property\030\001 \001(\0132&.google.d"
- + "atastore.v1.PropertyReference\0228\n\002op\030\002 \001("
- + "\0162,.google.datastore.v1.PropertyFilter.O"
- + "perator\022)\n\005value\030\003 \001(\0132\032.google.datastor"
- + "e.v1.Value\"\270\001\n\010Operator\022\030\n\024OPERATOR_UNSP"
- + "ECIFIED\020\000\022\r\n\tLESS_THAN\020\001\022\026\n\022LESS_THAN_OR"
- + "_EQUAL\020\002\022\020\n\014GREATER_THAN\020\003\022\031\n\025GREATER_TH"
- + "AN_OR_EQUAL\020\004\022\t\n\005EQUAL\020\005\022\006\n\002IN\020\006\022\r\n\tNOT_"
- + "EQUAL\020\t\022\020\n\014HAS_ANCESTOR\020\013\022\n\n\006NOT_IN\020\r\"\245\002"
- + "\n\010GqlQuery\022\024\n\014query_string\030\001 \001(\t\022\026\n\016allo"
- + "w_literals\030\002 \001(\010\022H\n\016named_bindings\030\005 \003(\013"
- + "20.google.datastore.v1.GqlQuery.NamedBin"
- + "dingsEntry\022C\n\023positional_bindings\030\004 \003(\0132"
- + "&.google.datastore.v1.GqlQueryParameter\032"
- + "\\\n\022NamedBindingsEntry\022\013\n\003key\030\001 \001(\t\0225\n\005va"
- + "lue\030\002 \001(\0132&.google.datastore.v1.GqlQuery"
- + "Parameter:\0028\001\"d\n\021GqlQueryParameter\022+\n\005va"
- + "lue\030\002 \001(\0132\032.google.datastore.v1.ValueH\000\022"
- + "\020\n\006cursor\030\003 \001(\014H\000B\020\n\016parameter_type\"\215\004\n\020"
- + "QueryResultBatch\022\027\n\017skipped_results\030\006 \001("
- + "\005\022\026\n\016skipped_cursor\030\003 \001(\014\022H\n\022entity_resu"
- + "lt_type\030\001 \001(\0162,.google.datastore.v1.Enti"
- + "tyResult.ResultType\0229\n\016entity_results\030\002 "
- + "\003(\0132!.google.datastore.v1.EntityResult\022\022"
- + "\n\nend_cursor\030\004 \001(\014\022K\n\014more_results\030\005 \001(\016"
- + "25.google.datastore.v1.QueryResultBatch."
- + "MoreResultsType\022\030\n\020snapshot_version\030\007 \001("
- + "\003\022-\n\tread_time\030\010 \001(\0132\032.google.protobuf.T"
- + "imestamp\"\230\001\n\017MoreResultsType\022!\n\035MORE_RES"
- + "ULTS_TYPE_UNSPECIFIED\020\000\022\020\n\014NOT_FINISHED\020"
- + "\001\022\034\n\030MORE_RESULTS_AFTER_LIMIT\020\002\022\035\n\031MORE_"
- + "RESULTS_AFTER_CURSOR\020\004\022\023\n\017NO_MORE_RESULT"
- + "S\020\003B\274\001\n\027com.google.datastore.v1B\nQueryPr"
- + "otoP\001Z
- * If not empty, the ID of the database against which to make the request.
+ * The ID of the database against which to make the request.
+ * '(default)' is not allowed; please use empty string '' to refer the default
+ * database.
*
*
* string database_id = 9;
@@ -213,7 +215,9 @@ public java.lang.String getDatabaseId() {
*
*
*
- * If not empty, the ID of the database against which to make the request.
+ * The ID of the database against which to make the request.
+ * '(default)' is not allowed; please use empty string '' to refer the default
+ * database.
*
*
* string database_id = 9;
@@ -812,7 +816,9 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
*
*
*
- * If not empty, the ID of the database against which to make the request.
+ * The ID of the database against which to make the request.
+ * '(default)' is not allowed; please use empty string '' to refer the default
+ * database.
*
*
* string database_id = 9;
@@ -834,7 +840,9 @@ public java.lang.String getDatabaseId() {
*
*
*
- * If not empty, the ID of the database against which to make the request.
+ * The ID of the database against which to make the request.
+ * '(default)' is not allowed; please use empty string '' to refer the default
+ * database.
*
*
* string database_id = 9;
@@ -856,7 +864,9 @@ public com.google.protobuf.ByteString getDatabaseIdBytes() {
*
*
*
- * If not empty, the ID of the database against which to make the request.
+ * The ID of the database against which to make the request.
+ * '(default)' is not allowed; please use empty string '' to refer the default
+ * database.
*
*
* string database_id = 9;
@@ -877,7 +887,9 @@ public Builder setDatabaseId(java.lang.String value) {
*
*
*
- * If not empty, the ID of the database against which to make the request.
+ * The ID of the database against which to make the request.
+ * '(default)' is not allowed; please use empty string '' to refer the default
+ * database.
*
*
* string database_id = 9;
@@ -894,7 +906,9 @@ public Builder clearDatabaseId() {
*
*
*
- * If not empty, the ID of the database against which to make the request.
+ * The ID of the database against which to make the request.
+ * '(default)' is not allowed; please use empty string '' to refer the default
+ * database.
*
*
* string database_id = 9;
diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsRequestOrBuilder.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsRequestOrBuilder.java
index b410d83d6..f48701f72 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsRequestOrBuilder.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsRequestOrBuilder.java
@@ -52,7 +52,9 @@ public interface ReserveIdsRequestOrBuilder
*
*
*
- * If not empty, the ID of the database against which to make the request.
+ * The ID of the database against which to make the request.
+ * '(default)' is not allowed; please use empty string '' to refer the default
+ * database.
*
*
* string database_id = 9;
@@ -64,7 +66,9 @@ public interface ReserveIdsRequestOrBuilder
*
*
*
- * If not empty, the ID of the database against which to make the request.
+ * The ID of the database against which to make the request.
+ * '(default)' is not allowed; please use empty string '' to refer the default
+ * database.
*
*
* string database_id = 9;
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 75c24d616..f964889bf 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
@@ -39,6 +39,7 @@ private RollbackRequest(com.google.protobuf.GeneratedMessageV3.Builder builde
private RollbackRequest() {
projectId_ = "";
+ databaseId_ = "";
transaction_ = com.google.protobuf.ByteString.EMPTY;
}
@@ -83,6 +84,13 @@ private RollbackRequest(
projectId_ = s;
break;
}
+ case 74:
+ {
+ java.lang.String s = input.readStringRequireUtf8();
+
+ databaseId_ = s;
+ break;
+ }
default:
{
if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
@@ -168,6 +176,59 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
}
}
+ public static final int DATABASE_ID_FIELD_NUMBER = 9;
+ private volatile java.lang.Object databaseId_;
+ /**
+ *
+ *
+ * + * The ID of the database against which to make the request. + * '(default)' is not allowed; please use empty string '' to refer the default + * database. + *+ * + *
string database_id = 9;
+ *
+ * @return The databaseId.
+ */
+ @java.lang.Override
+ public java.lang.String getDatabaseId() {
+ java.lang.Object ref = databaseId_;
+ if (ref instanceof java.lang.String) {
+ return (java.lang.String) ref;
+ } else {
+ com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ databaseId_ = s;
+ return s;
+ }
+ }
+ /**
+ *
+ *
+ * + * The ID of the database against which to make the request. + * '(default)' is not allowed; please use empty string '' to refer the default + * database. + *+ * + *
string database_id = 9;
+ *
+ * @return The bytes for databaseId.
+ */
+ @java.lang.Override
+ public com.google.protobuf.ByteString getDatabaseIdBytes() {
+ java.lang.Object ref = databaseId_;
+ if (ref instanceof java.lang.String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+ databaseId_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+
public static final int TRANSACTION_FIELD_NUMBER = 1;
private com.google.protobuf.ByteString transaction_;
/**
@@ -207,6 +268,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(projectId_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 8, projectId_);
}
+ if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(databaseId_)) {
+ com.google.protobuf.GeneratedMessageV3.writeString(output, 9, databaseId_);
+ }
unknownFields.writeTo(output);
}
@@ -222,6 +286,9 @@ public int getSerializedSize() {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(projectId_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, projectId_);
}
+ if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(databaseId_)) {
+ size += com.google.protobuf.GeneratedMessageV3.computeStringSize(9, databaseId_);
+ }
size += unknownFields.getSerializedSize();
memoizedSize = size;
return size;
@@ -238,6 +305,7 @@ public boolean equals(final java.lang.Object obj) {
com.google.datastore.v1.RollbackRequest other = (com.google.datastore.v1.RollbackRequest) obj;
if (!getProjectId().equals(other.getProjectId())) return false;
+ if (!getDatabaseId().equals(other.getDatabaseId())) return false;
if (!getTransaction().equals(other.getTransaction())) return false;
if (!unknownFields.equals(other.unknownFields)) return false;
return true;
@@ -252,6 +320,8 @@ public int hashCode() {
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + PROJECT_ID_FIELD_NUMBER;
hash = (53 * hash) + getProjectId().hashCode();
+ hash = (37 * hash) + DATABASE_ID_FIELD_NUMBER;
+ hash = (53 * hash) + getDatabaseId().hashCode();
hash = (37 * hash) + TRANSACTION_FIELD_NUMBER;
hash = (53 * hash) + getTransaction().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
@@ -401,6 +471,8 @@ public Builder clear() {
super.clear();
projectId_ = "";
+ databaseId_ = "";
+
transaction_ = com.google.protobuf.ByteString.EMPTY;
return this;
@@ -431,6 +503,7 @@ public com.google.datastore.v1.RollbackRequest buildPartial() {
com.google.datastore.v1.RollbackRequest result =
new com.google.datastore.v1.RollbackRequest(this);
result.projectId_ = projectId_;
+ result.databaseId_ = databaseId_;
result.transaction_ = transaction_;
onBuilt();
return result;
@@ -485,6 +558,10 @@ public Builder mergeFrom(com.google.datastore.v1.RollbackRequest other) {
projectId_ = other.projectId_;
onChanged();
}
+ if (!other.getDatabaseId().isEmpty()) {
+ databaseId_ = other.databaseId_;
+ onChanged();
+ }
if (other.getTransaction() != com.google.protobuf.ByteString.EMPTY) {
setTransaction(other.getTransaction());
}
@@ -623,6 +700,122 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
return this;
}
+ private java.lang.Object databaseId_ = "";
+ /**
+ *
+ *
+ * + * The ID of the database against which to make the request. + * '(default)' is not allowed; please use empty string '' to refer the default + * database. + *+ * + *
string database_id = 9;
+ *
+ * @return The databaseId.
+ */
+ public java.lang.String getDatabaseId() {
+ java.lang.Object ref = databaseId_;
+ if (!(ref instanceof java.lang.String)) {
+ com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ databaseId_ = s;
+ return s;
+ } else {
+ return (java.lang.String) ref;
+ }
+ }
+ /**
+ *
+ *
+ * + * The ID of the database against which to make the request. + * '(default)' is not allowed; please use empty string '' to refer the default + * database. + *+ * + *
string database_id = 9;
+ *
+ * @return The bytes for databaseId.
+ */
+ public com.google.protobuf.ByteString getDatabaseIdBytes() {
+ java.lang.Object ref = databaseId_;
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+ databaseId_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+ /**
+ *
+ *
+ * + * The ID of the database against which to make the request. + * '(default)' is not allowed; please use empty string '' to refer the default + * database. + *+ * + *
string database_id = 9;
+ *
+ * @param value The databaseId to set.
+ * @return This builder for chaining.
+ */
+ public Builder setDatabaseId(java.lang.String value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+
+ databaseId_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ *
+ * + * The ID of the database against which to make the request. + * '(default)' is not allowed; please use empty string '' to refer the default + * database. + *+ * + *
string database_id = 9;
+ *
+ * @return This builder for chaining.
+ */
+ public Builder clearDatabaseId() {
+
+ databaseId_ = getDefaultInstance().getDatabaseId();
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ *
+ * + * The ID of the database against which to make the request. + * '(default)' is not allowed; please use empty string '' to refer the default + * database. + *+ * + *
string database_id = 9;
+ *
+ * @param value The bytes for databaseId to set.
+ * @return This builder for chaining.
+ */
+ public Builder setDatabaseIdBytes(com.google.protobuf.ByteString value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ checkByteStringIsUtf8(value);
+
+ databaseId_ = value;
+ onChanged();
+ return this;
+ }
+
private com.google.protobuf.ByteString transaction_ = com.google.protobuf.ByteString.EMPTY;
/**
*
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 86319d919..7f9bd4385 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
@@ -48,6 +48,35 @@ public interface RollbackRequestOrBuilder
*/
com.google.protobuf.ByteString getProjectIdBytes();
+ /**
+ *
+ *
+ * + * The ID of the database against which to make the request. + * '(default)' is not allowed; please use empty string '' to refer the default + * database. + *+ * + *
string database_id = 9;
+ *
+ * @return The databaseId.
+ */
+ java.lang.String getDatabaseId();
+ /**
+ *
+ *
+ * + * The ID of the database against which to make the request. + * '(default)' is not allowed; please use empty string '' to refer the default + * database. + *+ * + *
string database_id = 9;
+ *
+ * @return The bytes for databaseId.
+ */
+ com.google.protobuf.ByteString getDatabaseIdBytes();
+
/**
*
*
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 6da75072d..51999dba5 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
@@ -39,6 +39,7 @@ private RunQueryRequest(com.google.protobuf.GeneratedMessageV3.Builder builde
private RunQueryRequest() {
projectId_ = "";
+ databaseId_ = "";
}
@java.lang.Override
@@ -139,6 +140,13 @@ private RunQueryRequest(
projectId_ = s;
break;
}
+ case 74:
+ {
+ java.lang.String s = input.readStringRequireUtf8();
+
+ databaseId_ = s;
+ break;
+ }
default:
{
if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
@@ -271,6 +279,59 @@ public com.google.protobuf.ByteString getProjectIdBytes() {
}
}
+ public static final int DATABASE_ID_FIELD_NUMBER = 9;
+ private volatile java.lang.Object databaseId_;
+ /**
+ *
+ *
+ * + * The ID of the database against which to make the request. + * '(default)' is not allowed; please use empty string '' to refer the default + * database. + *+ * + *
string database_id = 9;
+ *
+ * @return The databaseId.
+ */
+ @java.lang.Override
+ public java.lang.String getDatabaseId() {
+ java.lang.Object ref = databaseId_;
+ if (ref instanceof java.lang.String) {
+ return (java.lang.String) ref;
+ } else {
+ com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ databaseId_ = s;
+ return s;
+ }
+ }
+ /**
+ *
+ *
+ * + * The ID of the database against which to make the request. + * '(default)' is not allowed; please use empty string '' to refer the default + * database. + *+ * + *
string database_id = 9;
+ *
+ * @return The bytes for databaseId.
+ */
+ @java.lang.Override
+ public com.google.protobuf.ByteString getDatabaseIdBytes() {
+ java.lang.Object ref = databaseId_;
+ if (ref instanceof java.lang.String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+ databaseId_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+
public static final int PARTITION_ID_FIELD_NUMBER = 2;
private com.google.datastore.v1.PartitionId partitionId_;
/**
@@ -432,7 +493,7 @@ public com.google.datastore.v1.QueryOrBuilder getQueryOrBuilder() {
*
*
*
- * The GQL query to run.
+ * The GQL query to run. This query must be a non-aggregation query.
*
*
* .google.datastore.v1.GqlQuery gql_query = 7;
@@ -447,7 +508,7 @@ public boolean hasGqlQuery() {
*
*
*
- * The GQL query to run.
+ * The GQL query to run. This query must be a non-aggregation query.
*
*
* .google.datastore.v1.GqlQuery gql_query = 7;
@@ -465,7 +526,7 @@ public com.google.datastore.v1.GqlQuery getGqlQuery() {
*
*
*
- * The GQL query to run.
+ * The GQL query to run. This query must be a non-aggregation query.
*
*
* .google.datastore.v1.GqlQuery gql_query = 7;
@@ -507,6 +568,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(projectId_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 8, projectId_);
}
+ if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(databaseId_)) {
+ com.google.protobuf.GeneratedMessageV3.writeString(output, 9, databaseId_);
+ }
unknownFields.writeTo(output);
}
@@ -535,6 +599,9 @@ public int getSerializedSize() {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(projectId_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, projectId_);
}
+ if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(databaseId_)) {
+ size += com.google.protobuf.GeneratedMessageV3.computeStringSize(9, databaseId_);
+ }
size += unknownFields.getSerializedSize();
memoizedSize = size;
return size;
@@ -551,6 +618,7 @@ public boolean equals(final java.lang.Object obj) {
com.google.datastore.v1.RunQueryRequest other = (com.google.datastore.v1.RunQueryRequest) obj;
if (!getProjectId().equals(other.getProjectId())) return false;
+ if (!getDatabaseId().equals(other.getDatabaseId())) return false;
if (hasPartitionId() != other.hasPartitionId()) return false;
if (hasPartitionId()) {
if (!getPartitionId().equals(other.getPartitionId())) return false;
@@ -583,6 +651,8 @@ public int hashCode() {
hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + PROJECT_ID_FIELD_NUMBER;
hash = (53 * hash) + getProjectId().hashCode();
+ hash = (37 * hash) + DATABASE_ID_FIELD_NUMBER;
+ hash = (53 * hash) + getDatabaseId().hashCode();
if (hasPartitionId()) {
hash = (37 * hash) + PARTITION_ID_FIELD_NUMBER;
hash = (53 * hash) + getPartitionId().hashCode();
@@ -750,6 +820,8 @@ public Builder clear() {
super.clear();
projectId_ = "";
+ databaseId_ = "";
+
if (partitionIdBuilder_ == null) {
partitionId_ = null;
} else {
@@ -792,6 +864,7 @@ public com.google.datastore.v1.RunQueryRequest buildPartial() {
com.google.datastore.v1.RunQueryRequest result =
new com.google.datastore.v1.RunQueryRequest(this);
result.projectId_ = projectId_;
+ result.databaseId_ = databaseId_;
if (partitionIdBuilder_ == null) {
result.partitionId_ = partitionId_;
} else {
@@ -870,6 +943,10 @@ public Builder mergeFrom(com.google.datastore.v1.RunQueryRequest other) {
projectId_ = other.projectId_;
onChanged();
}
+ if (!other.getDatabaseId().isEmpty()) {
+ databaseId_ = other.databaseId_;
+ onChanged();
+ }
if (other.hasPartitionId()) {
mergePartitionId(other.getPartitionId());
}
@@ -1041,6 +1118,122 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) {
return this;
}
+ private java.lang.Object databaseId_ = "";
+ /**
+ *
+ *
+ * + * The ID of the database against which to make the request. + * '(default)' is not allowed; please use empty string '' to refer the default + * database. + *+ * + *
string database_id = 9;
+ *
+ * @return The databaseId.
+ */
+ public java.lang.String getDatabaseId() {
+ java.lang.Object ref = databaseId_;
+ if (!(ref instanceof java.lang.String)) {
+ com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ databaseId_ = s;
+ return s;
+ } else {
+ return (java.lang.String) ref;
+ }
+ }
+ /**
+ *
+ *
+ * + * The ID of the database against which to make the request. + * '(default)' is not allowed; please use empty string '' to refer the default + * database. + *+ * + *
string database_id = 9;
+ *
+ * @return The bytes for databaseId.
+ */
+ public com.google.protobuf.ByteString getDatabaseIdBytes() {
+ java.lang.Object ref = databaseId_;
+ if (ref instanceof String) {
+ com.google.protobuf.ByteString b =
+ com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
+ databaseId_ = b;
+ return b;
+ } else {
+ return (com.google.protobuf.ByteString) ref;
+ }
+ }
+ /**
+ *
+ *
+ * + * The ID of the database against which to make the request. + * '(default)' is not allowed; please use empty string '' to refer the default + * database. + *+ * + *
string database_id = 9;
+ *
+ * @param value The databaseId to set.
+ * @return This builder for chaining.
+ */
+ public Builder setDatabaseId(java.lang.String value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+
+ databaseId_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ *
+ * + * The ID of the database against which to make the request. + * '(default)' is not allowed; please use empty string '' to refer the default + * database. + *+ * + *
string database_id = 9;
+ *
+ * @return This builder for chaining.
+ */
+ public Builder clearDatabaseId() {
+
+ databaseId_ = getDefaultInstance().getDatabaseId();
+ onChanged();
+ return this;
+ }
+ /**
+ *
+ *
+ * + * The ID of the database against which to make the request. + * '(default)' is not allowed; please use empty string '' to refer the default + * database. + *+ * + *
string database_id = 9;
+ *
+ * @param value The bytes for databaseId to set.
+ * @return This builder for chaining.
+ */
+ public Builder setDatabaseIdBytes(com.google.protobuf.ByteString value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ checkByteStringIsUtf8(value);
+
+ databaseId_ = value;
+ onChanged();
+ return this;
+ }
+
private com.google.datastore.v1.PartitionId partitionId_;
private com.google.protobuf.SingleFieldBuilderV3<
com.google.datastore.v1.PartitionId,
@@ -1653,7 +1846,7 @@ public com.google.datastore.v1.QueryOrBuilder getQueryOrBuilder() {
*
*
*
- * The GQL query to run.
+ * The GQL query to run. This query must be a non-aggregation query.
*
*
* .google.datastore.v1.GqlQuery gql_query = 7;
@@ -1668,7 +1861,7 @@ public boolean hasGqlQuery() {
*
*
*
- * The GQL query to run.
+ * The GQL query to run. This query must be a non-aggregation query.
*
*
* .google.datastore.v1.GqlQuery gql_query = 7;
@@ -1693,7 +1886,7 @@ public com.google.datastore.v1.GqlQuery getGqlQuery() {
*
*
*
- * The GQL query to run.
+ * The GQL query to run. This query must be a non-aggregation query.
*
*
* .google.datastore.v1.GqlQuery gql_query = 7;
@@ -1715,7 +1908,7 @@ public Builder setGqlQuery(com.google.datastore.v1.GqlQuery value) {
*
*
*
- * The GQL query to run.
+ * The GQL query to run. This query must be a non-aggregation query.
*
*
* .google.datastore.v1.GqlQuery gql_query = 7;
@@ -1734,7 +1927,7 @@ public Builder setGqlQuery(com.google.datastore.v1.GqlQuery.Builder builderForVa
*
*
*
- * The GQL query to run.
+ * The GQL query to run. This query must be a non-aggregation query.
*
*
* .google.datastore.v1.GqlQuery gql_query = 7;
@@ -1766,7 +1959,7 @@ public Builder mergeGqlQuery(com.google.datastore.v1.GqlQuery value) {
*
*
*
- * The GQL query to run.
+ * The GQL query to run. This query must be a non-aggregation query.
*
*
* .google.datastore.v1.GqlQuery gql_query = 7;
@@ -1791,7 +1984,7 @@ public Builder clearGqlQuery() {
*
*
*
- * The GQL query to run.
+ * The GQL query to run. This query must be a non-aggregation query.
*
*
* .google.datastore.v1.GqlQuery gql_query = 7;
@@ -1803,7 +1996,7 @@ public com.google.datastore.v1.GqlQuery.Builder getGqlQueryBuilder() {
*
*
*
- * The GQL query to run.
+ * The GQL query to run. This query must be a non-aggregation query.
*
*
* .google.datastore.v1.GqlQuery gql_query = 7;
@@ -1823,7 +2016,7 @@ public com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder() {
*
*
*
- * The GQL query to run.
+ * The GQL query to run. This query must be a non-aggregation query.
*
*
* .google.datastore.v1.GqlQuery gql_query = 7;
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 3b54516e3..3317e05ca 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
@@ -48,6 +48,35 @@ public interface RunQueryRequestOrBuilder
*/
com.google.protobuf.ByteString getProjectIdBytes();
+ /**
+ *
+ *
+ * + * The ID of the database against which to make the request. + * '(default)' is not allowed; please use empty string '' to refer the default + * database. + *+ * + *
string database_id = 9;
+ *
+ * @return The databaseId.
+ */
+ java.lang.String getDatabaseId();
+ /**
+ *
+ *
+ * + * The ID of the database against which to make the request. + * '(default)' is not allowed; please use empty string '' to refer the default + * database. + *+ * + *
string database_id = 9;
+ *
+ * @return The bytes for databaseId.
+ */
+ com.google.protobuf.ByteString getDatabaseIdBytes();
+
/**
*
*
@@ -166,7 +195,7 @@ public interface RunQueryRequestOrBuilder
*
*
*
- * The GQL query to run.
+ * The GQL query to run. This query must be a non-aggregation query.
*
*
* .google.datastore.v1.GqlQuery gql_query = 7;
@@ -178,7 +207,7 @@ public interface RunQueryRequestOrBuilder
*
*
*
- * The GQL query to run.
+ * The GQL query to run. This query must be a non-aggregation query.
*
*
* .google.datastore.v1.GqlQuery gql_query = 7;
@@ -190,7 +219,7 @@ public interface RunQueryRequestOrBuilder
*
*
*
- * The GQL query to run.
+ * The GQL query to run. This query must be a non-aggregation query.
*
*
* .google.datastore.v1.GqlQuery gql_query = 7;
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 22d930ad0..6d2437499 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
@@ -116,6 +116,12 @@ message LookupRequest {
// Required. The ID of the project against which to make the request.
string project_id = 8 [(google.api.field_behavior) = REQUIRED];
+ // The ID of the database against which to make the request.
+ //
+ // '(default)' is not allowed; please use empty string '' to refer the default
+ // database.
+ string database_id = 9;
+
// The options for this lookup request.
ReadOptions read_options = 1;
@@ -149,6 +155,12 @@ message RunQueryRequest {
// Required. The ID of the project against which to make the request.
string project_id = 8 [(google.api.field_behavior) = REQUIRED];
+ // The ID of the database against which to make the request.
+ //
+ // '(default)' is not allowed; please use empty string '' to refer the default
+ // database.
+ string database_id = 9;
+
// Entities are partitioned into subsets, identified by a partition ID.
// Queries are scoped to a single partition.
// This partition ID is normalized with the standard default context
@@ -163,7 +175,7 @@ message RunQueryRequest {
// The query to run.
Query query = 3;
- // The GQL query to run.
+ // The GQL query to run. This query must be a non-aggregation query.
GqlQuery gql_query = 7;
}
}
@@ -182,6 +194,12 @@ message BeginTransactionRequest {
// Required. The ID of the project against which to make the request.
string project_id = 8 [(google.api.field_behavior) = REQUIRED];
+ // The ID of the database against which to make the request.
+ //
+ // '(default)' is not allowed; please use empty string '' to refer the default
+ // database.
+ string database_id = 9;
+
// Options for a new transaction.
TransactionOptions transaction_options = 10;
}
@@ -197,6 +215,12 @@ message RollbackRequest {
// Required. The ID of the project against which to make the request.
string project_id = 8 [(google.api.field_behavior) = REQUIRED];
+ // The ID of the database against which to make the request.
+ //
+ // '(default)' is not allowed; please use empty string '' to refer the default
+ // database.
+ string database_id = 9;
+
// Required. The transaction identifier, returned by a call to
// [Datastore.BeginTransaction][google.datastore.v1.Datastore.BeginTransaction].
bytes transaction = 1 [(google.api.field_behavior) = REQUIRED];
@@ -227,6 +251,12 @@ message CommitRequest {
// Required. The ID of the project against which to make the request.
string project_id = 8 [(google.api.field_behavior) = REQUIRED];
+ // The ID of the database against which to make the request.
+ //
+ // '(default)' is not allowed; please use empty string '' to refer the default
+ // database.
+ string database_id = 9;
+
// The type of commit to perform. Defaults to `TRANSACTIONAL`.
Mode mode = 5;
@@ -273,6 +303,12 @@ message AllocateIdsRequest {
// Required. The ID of the project against which to make the request.
string project_id = 8 [(google.api.field_behavior) = REQUIRED];
+ // The ID of the database against which to make the request.
+ //
+ // '(default)' is not allowed; please use empty string '' to refer the default
+ // database.
+ string database_id = 9;
+
// Required. A list of keys with incomplete key paths for which to allocate IDs.
// No key may be reserved/read-only.
repeated Key keys = 1 [(google.api.field_behavior) = REQUIRED];
@@ -290,7 +326,10 @@ message ReserveIdsRequest {
// Required. The ID of the project against which to make the request.
string project_id = 8 [(google.api.field_behavior) = REQUIRED];
- // If not empty, the ID of the database against which to make the request.
+ // The ID of the database against which to make the request.
+ //
+ // '(default)' is not allowed; please use empty string '' to refer the default
+ // database.
string database_id = 9;
// Required. A list of keys with complete key paths whose numeric IDs should not be
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 55d7b64fe..010f1b3af 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
@@ -51,6 +51,10 @@ message PartitionId {
// The ID of the project to which the entities belong.
string project_id = 2;
+ // If not empty, the ID of the database to which the entities
+ // belong.
+ string database_id = 3;
+
// If not empty, the ID of the namespace to which the entities belong.
string namespace_id = 4;
}
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 00c020021..cbe44932d 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
@@ -16,6 +16,7 @@ syntax = "proto3";
package google.datastore.v1;
+import "google/api/field_behavior.proto";
import "google/datastore/v1/entity.proto";
import "google/protobuf/timestamp.proto";
import "google/protobuf/wrappers.proto";
@@ -184,7 +185,10 @@ message CompositeFilter {
Operator op = 1;
// The list of filters to combine.
- // Must contain at least one filter.
+ //
+ // Requires:
+ //
+ // * At least one filter is present.
repeated Filter filters = 2;
}