diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DropRowRangeRequest.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DropRowRangeRequest.java
index aa40a6689e..1dd43e9898 100644
--- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DropRowRangeRequest.java
+++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DropRowRangeRequest.java
@@ -229,6 +229,22 @@ public com.google.protobuf.ByteString getNameBytes() {
}
public static final int ROW_KEY_PREFIX_FIELD_NUMBER = 2;
+ /**
+ *
+ *
+ *
+ * Delete all rows that start with this row key prefix. Prefix cannot be
+ * zero length.
+ *
+ *
+ * bytes row_key_prefix = 2;
+ *
+ * @return Whether the rowKeyPrefix field is set.
+ */
+ @java.lang.Override
+ public boolean hasRowKeyPrefix() {
+ return targetCase_ == 2;
+ }
/**
*
*
@@ -250,6 +266,21 @@ public com.google.protobuf.ByteString getRowKeyPrefix() {
}
public static final int DELETE_ALL_DATA_FROM_TABLE_FIELD_NUMBER = 3;
+ /**
+ *
+ *
+ *
+ * Delete all rows in the table. Setting this to false is a no-op.
+ *
+ *
+ * bool delete_all_data_from_table = 3;
+ *
+ * @return Whether the deleteAllDataFromTable field is set.
+ */
+ @java.lang.Override
+ public boolean hasDeleteAllDataFromTable() {
+ return targetCase_ == 3;
+ }
/**
*
*
@@ -791,6 +822,21 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
return this;
}
+ /**
+ *
+ *
+ *
+ * Delete all rows that start with this row key prefix. Prefix cannot be
+ * zero length.
+ *
+ *
+ * bytes row_key_prefix = 2;
+ *
+ * @return Whether the rowKeyPrefix field is set.
+ */
+ public boolean hasRowKeyPrefix() {
+ return targetCase_ == 2;
+ }
/**
*
*
@@ -852,6 +898,20 @@ public Builder clearRowKeyPrefix() {
return this;
}
+ /**
+ *
+ *
+ *
+ * Delete all rows in the table. Setting this to false is a no-op.
+ *
+ *
+ * bool delete_all_data_from_table = 3;
+ *
+ * @return Whether the deleteAllDataFromTable field is set.
+ */
+ public boolean hasDeleteAllDataFromTable() {
+ return targetCase_ == 3;
+ }
/**
*
*
diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DropRowRangeRequestOrBuilder.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DropRowRangeRequestOrBuilder.java
index bd1828b824..0c75eed434 100644
--- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DropRowRangeRequestOrBuilder.java
+++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DropRowRangeRequestOrBuilder.java
@@ -56,6 +56,19 @@ public interface DropRowRangeRequestOrBuilder
*/
com.google.protobuf.ByteString getNameBytes();
+ /**
+ *
+ *
+ *
+ * Delete all rows that start with this row key prefix. Prefix cannot be
+ * zero length.
+ *
+ *
+ * bytes row_key_prefix = 2;
+ *
+ * @return Whether the rowKeyPrefix field is set.
+ */
+ boolean hasRowKeyPrefix();
/**
*
*
@@ -70,6 +83,18 @@ public interface DropRowRangeRequestOrBuilder
*/
com.google.protobuf.ByteString getRowKeyPrefix();
+ /**
+ *
+ *
+ *
+ * Delete all rows in the table. Setting this to false is a no-op.
+ *
+ *
+ * bool delete_all_data_from_table = 3;
+ *
+ * @return Whether the deleteAllDataFromTable field is set.
+ */
+ boolean hasDeleteAllDataFromTable();
/**
*
*
diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GcRule.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GcRule.java
index ab49ee6aee..6251235141 100644
--- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GcRule.java
+++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GcRule.java
@@ -2186,6 +2186,21 @@ public RuleCase getRuleCase() {
}
public static final int MAX_NUM_VERSIONS_FIELD_NUMBER = 1;
+ /**
+ *
+ *
+ *
+ * Delete all cells in a column except the most recent N.
+ *
+ *
+ * int32 max_num_versions = 1;
+ *
+ * @return Whether the maxNumVersions field is set.
+ */
+ @java.lang.Override
+ public boolean hasMaxNumVersions() {
+ return ruleCase_ == 1;
+ }
/**
*
*
@@ -2797,6 +2812,20 @@ public Builder clearRule() {
return this;
}
+ /**
+ *
+ *
+ *
+ * Delete all cells in a column except the most recent N.
+ *
+ *
+ * int32 max_num_versions = 1;
+ *
+ * @return Whether the maxNumVersions field is set.
+ */
+ public boolean hasMaxNumVersions() {
+ return ruleCase_ == 1;
+ }
/**
*
*
diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GcRuleOrBuilder.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GcRuleOrBuilder.java
index 2c36b7fde2..2377b77320 100644
--- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GcRuleOrBuilder.java
+++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GcRuleOrBuilder.java
@@ -23,6 +23,18 @@ public interface GcRuleOrBuilder
// @@protoc_insertion_point(interface_extends:google.bigtable.admin.v2.GcRule)
com.google.protobuf.MessageOrBuilder {
+ /**
+ *
+ *
+ *
+ * Delete all cells in a column except the most recent N.
+ *
+ *
+ * int32 max_num_versions = 1;
+ *
+ * @return Whether the maxNumVersions field is set.
+ */
+ boolean hasMaxNumVersions();
/**
*
*
diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ModifyColumnFamiliesRequest.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ModifyColumnFamiliesRequest.java
index 3559bf67d0..7210f68aca 100644
--- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ModifyColumnFamiliesRequest.java
+++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ModifyColumnFamiliesRequest.java
@@ -238,6 +238,19 @@ public interface ModificationOrBuilder
*/
com.google.bigtable.admin.v2.ColumnFamilyOrBuilder getUpdateOrBuilder();
+ /**
+ *
+ *
+ *
+ * Drop (delete) the column family with the given ID, or fail if no such
+ * family exists.
+ *
+ *
+ * bool drop = 4;
+ *
+ * @return Whether the drop field is set.
+ */
+ boolean hasDrop();
/**
*
*
@@ -594,6 +607,22 @@ public com.google.bigtable.admin.v2.ColumnFamilyOrBuilder getUpdateOrBuilder() {
}
public static final int DROP_FIELD_NUMBER = 4;
+ /**
+ *
+ *
+ *
+ * Drop (delete) the column family with the given ID, or fail if no such
+ * family exists.
+ *
+ *
+ * bool drop = 4;
+ *
+ * @return Whether the drop field is set.
+ */
+ @java.lang.Override
+ public boolean hasDrop() {
+ return modCase_ == 4;
+ }
/**
*
*
@@ -1597,6 +1626,21 @@ public com.google.bigtable.admin.v2.ColumnFamilyOrBuilder getUpdateOrBuilder() {
return updateBuilder_;
}
+ /**
+ *
+ *
+ *
+ * Drop (delete) the column family with the given ID, or fail if no such
+ * family exists.
+ *
+ *
+ * bool drop = 4;
+ *
+ * @return Whether the drop field is set.
+ */
+ public boolean hasDrop() {
+ return modCase_ == 4;
+ }
/**
*
*
diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/RestoreTableRequest.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/RestoreTableRequest.java
index 4013878d53..6025af320c 100644
--- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/RestoreTableRequest.java
+++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/RestoreTableRequest.java
@@ -284,6 +284,21 @@ public com.google.protobuf.ByteString getTableIdBytes() {
}
public static final int BACKUP_FIELD_NUMBER = 3;
+ /**
+ *
+ *
+ *
+ * Name of the backup from which to restore. Values are of the form
+ * `projects/<project>/instances/<instance>/clusters/<cluster>/backups/<backup>`.
+ *
+ *
+ * string backup = 3 [(.google.api.resource_reference) = { ... }
+ *
+ * @return Whether the backup field is set.
+ */
+ public boolean hasBackup() {
+ return sourceCase_ == 3;
+ }
/**
*
*
@@ -977,6 +992,22 @@ public Builder setTableIdBytes(com.google.protobuf.ByteString value) {
return this;
}
+ /**
+ *
+ *
+ *
+ * Name of the backup from which to restore. Values are of the form
+ * `projects/<project>/instances/<instance>/clusters/<cluster>/backups/<backup>`.
+ *
+ *
+ * string backup = 3 [(.google.api.resource_reference) = { ... }
+ *
+ * @return Whether the backup field is set.
+ */
+ @java.lang.Override
+ public boolean hasBackup() {
+ return sourceCase_ == 3;
+ }
/**
*
*
diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/RestoreTableRequestOrBuilder.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/RestoreTableRequestOrBuilder.java
index 16130d7f0c..38df514193 100644
--- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/RestoreTableRequestOrBuilder.java
+++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/RestoreTableRequestOrBuilder.java
@@ -87,6 +87,19 @@ public interface RestoreTableRequestOrBuilder
*/
com.google.protobuf.ByteString getTableIdBytes();
+ /**
+ *
+ *
+ *
+ * Name of the backup from which to restore. Values are of the form
+ * `projects/<project>/instances/<instance>/clusters/<cluster>/backups/<backup>`.
+ *
+ *
+ * string backup = 3 [(.google.api.resource_reference) = { ... }
+ *
+ * @return Whether the backup field is set.
+ */
+ boolean hasBackup();
/**
*
*
diff --git a/proto-google-cloud-bigtable-v2/clirr-ignored-differences.xml b/proto-google-cloud-bigtable-v2/clirr-ignored-differences.xml
new file mode 100644
index 0000000000..0259e4ee6e
--- /dev/null
+++ b/proto-google-cloud-bigtable-v2/clirr-ignored-differences.xml
@@ -0,0 +1,9 @@
+
+
+
+
+ 7012
+ com/google/bigtable/v2/*OrBuilder
+ * has*(*)
+
+
\ No newline at end of file
diff --git a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ColumnRange.java b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ColumnRange.java
index 61235ba695..66a55fe241 100644
--- a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ColumnRange.java
+++ b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ColumnRange.java
@@ -282,6 +282,21 @@ public com.google.protobuf.ByteString getFamilyNameBytes() {
}
public static final int START_QUALIFIER_CLOSED_FIELD_NUMBER = 2;
+ /**
+ *
+ *
+ *
+ * Used when giving an inclusive lower bound for the range.
+ *
+ *
+ * bytes start_qualifier_closed = 2;
+ *
+ * @return Whether the startQualifierClosed field is set.
+ */
+ @java.lang.Override
+ public boolean hasStartQualifierClosed() {
+ return startQualifierCase_ == 2;
+ }
/**
*
*
@@ -302,6 +317,21 @@ public com.google.protobuf.ByteString getStartQualifierClosed() {
}
public static final int START_QUALIFIER_OPEN_FIELD_NUMBER = 3;
+ /**
+ *
+ *
+ *
+ * Used when giving an exclusive lower bound for the range.
+ *
+ *
+ * bytes start_qualifier_open = 3;
+ *
+ * @return Whether the startQualifierOpen field is set.
+ */
+ @java.lang.Override
+ public boolean hasStartQualifierOpen() {
+ return startQualifierCase_ == 3;
+ }
/**
*
*
@@ -322,6 +352,21 @@ public com.google.protobuf.ByteString getStartQualifierOpen() {
}
public static final int END_QUALIFIER_CLOSED_FIELD_NUMBER = 4;
+ /**
+ *
+ *
+ *
+ * Used when giving an inclusive upper bound for the range.
+ *
+ *
+ * bytes end_qualifier_closed = 4;
+ *
+ * @return Whether the endQualifierClosed field is set.
+ */
+ @java.lang.Override
+ public boolean hasEndQualifierClosed() {
+ return endQualifierCase_ == 4;
+ }
/**
*
*
@@ -342,6 +387,21 @@ public com.google.protobuf.ByteString getEndQualifierClosed() {
}
public static final int END_QUALIFIER_OPEN_FIELD_NUMBER = 5;
+ /**
+ *
+ *
+ *
+ * Used when giving an exclusive upper bound for the range.
+ *
+ *
+ * bytes end_qualifier_open = 5;
+ *
+ * @return Whether the endQualifierOpen field is set.
+ */
+ @java.lang.Override
+ public boolean hasEndQualifierOpen() {
+ return endQualifierCase_ == 5;
+ }
/**
*
*
@@ -939,6 +999,20 @@ public Builder setFamilyNameBytes(com.google.protobuf.ByteString value) {
return this;
}
+ /**
+ *
+ *
+ *
+ * Used when giving an inclusive lower bound for the range.
+ *
+ *
+ * bytes start_qualifier_closed = 2;
+ *
+ * @return Whether the startQualifierClosed field is set.
+ */
+ public boolean hasStartQualifierClosed() {
+ return startQualifierCase_ == 2;
+ }
/**
*
*
@@ -997,6 +1071,20 @@ public Builder clearStartQualifierClosed() {
return this;
}
+ /**
+ *
+ *
+ *
+ * Used when giving an exclusive lower bound for the range.
+ *
+ *
+ * bytes start_qualifier_open = 3;
+ *
+ * @return Whether the startQualifierOpen field is set.
+ */
+ public boolean hasStartQualifierOpen() {
+ return startQualifierCase_ == 3;
+ }
/**
*
*
@@ -1055,6 +1143,20 @@ public Builder clearStartQualifierOpen() {
return this;
}
+ /**
+ *
+ *
+ *
+ * Used when giving an inclusive upper bound for the range.
+ *
+ *
+ * bytes end_qualifier_closed = 4;
+ *
+ * @return Whether the endQualifierClosed field is set.
+ */
+ public boolean hasEndQualifierClosed() {
+ return endQualifierCase_ == 4;
+ }
/**
*
*
@@ -1113,6 +1215,20 @@ public Builder clearEndQualifierClosed() {
return this;
}
+ /**
+ *
+ *
+ *
+ * Used when giving an exclusive upper bound for the range.
+ *
+ *
+ * bytes end_qualifier_open = 5;
+ *
+ * @return Whether the endQualifierOpen field is set.
+ */
+ public boolean hasEndQualifierOpen() {
+ return endQualifierCase_ == 5;
+ }
/**
*
*
diff --git a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ColumnRangeOrBuilder.java b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ColumnRangeOrBuilder.java
index 744de7b550..e94bae3d49 100644
--- a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ColumnRangeOrBuilder.java
+++ b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ColumnRangeOrBuilder.java
@@ -48,6 +48,18 @@ public interface ColumnRangeOrBuilder
*/
com.google.protobuf.ByteString getFamilyNameBytes();
+ /**
+ *
+ *
+ *
+ * Used when giving an inclusive lower bound for the range.
+ *
+ *
+ * bytes start_qualifier_closed = 2;
+ *
+ * @return Whether the startQualifierClosed field is set.
+ */
+ boolean hasStartQualifierClosed();
/**
*
*
@@ -61,6 +73,18 @@ public interface ColumnRangeOrBuilder
*/
com.google.protobuf.ByteString getStartQualifierClosed();
+ /**
+ *
+ *
+ *
+ * Used when giving an exclusive lower bound for the range.
+ *
+ *
+ * bytes start_qualifier_open = 3;
+ *
+ * @return Whether the startQualifierOpen field is set.
+ */
+ boolean hasStartQualifierOpen();
/**
*
*
@@ -74,6 +98,18 @@ public interface ColumnRangeOrBuilder
*/
com.google.protobuf.ByteString getStartQualifierOpen();
+ /**
+ *
+ *
+ *
+ * Used when giving an inclusive upper bound for the range.
+ *
+ *
+ * bytes end_qualifier_closed = 4;
+ *
+ * @return Whether the endQualifierClosed field is set.
+ */
+ boolean hasEndQualifierClosed();
/**
*
*
@@ -87,6 +123,18 @@ public interface ColumnRangeOrBuilder
*/
com.google.protobuf.ByteString getEndQualifierClosed();
+ /**
+ *
+ *
+ *
+ * Used when giving an exclusive upper bound for the range.
+ *
+ *
+ * bytes end_qualifier_open = 5;
+ *
+ * @return Whether the endQualifierOpen field is set.
+ */
+ boolean hasEndQualifierOpen();
/**
*
*
diff --git a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadModifyWriteRule.java b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadModifyWriteRule.java
index dd2e600d62..347eda1b58 100644
--- a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadModifyWriteRule.java
+++ b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadModifyWriteRule.java
@@ -249,6 +249,23 @@ public com.google.protobuf.ByteString getColumnQualifier() {
}
public static final int APPEND_VALUE_FIELD_NUMBER = 3;
+ /**
+ *
+ *
+ *
+ * Rule specifying that `append_value` be appended to the existing value.
+ * If the targeted cell is unset, it will be treated as containing the
+ * empty string.
+ *
+ *
+ * bytes append_value = 3;
+ *
+ * @return Whether the appendValue field is set.
+ */
+ @java.lang.Override
+ public boolean hasAppendValue() {
+ return ruleCase_ == 3;
+ }
/**
*
*
@@ -271,6 +288,24 @@ public com.google.protobuf.ByteString getAppendValue() {
}
public static final int INCREMENT_AMOUNT_FIELD_NUMBER = 4;
+ /**
+ *
+ *
+ *
+ * Rule specifying that `increment_amount` be added to the existing value.
+ * If the targeted cell is unset, it will be treated as containing a zero.
+ * Otherwise, the targeted cell must contain an 8-byte value (interpreted
+ * as a 64-bit big-endian signed integer), or the entire request will fail.
+ *
+ *
+ * int64 increment_amount = 4;
+ *
+ * @return Whether the incrementAmount field is set.
+ */
+ @java.lang.Override
+ public boolean hasIncrementAmount() {
+ return ruleCase_ == 4;
+ }
/**
*
*
@@ -875,6 +910,22 @@ public Builder clearColumnQualifier() {
return this;
}
+ /**
+ *
+ *
+ *
+ * Rule specifying that `append_value` be appended to the existing value.
+ * If the targeted cell is unset, it will be treated as containing the
+ * empty string.
+ *
+ *
+ * bytes append_value = 3;
+ *
+ * @return Whether the appendValue field is set.
+ */
+ public boolean hasAppendValue() {
+ return ruleCase_ == 3;
+ }
/**
*
*
@@ -939,6 +990,23 @@ public Builder clearAppendValue() {
return this;
}
+ /**
+ *
+ *
+ *
+ * Rule specifying that `increment_amount` be added to the existing value.
+ * If the targeted cell is unset, it will be treated as containing a zero.
+ * Otherwise, the targeted cell must contain an 8-byte value (interpreted
+ * as a 64-bit big-endian signed integer), or the entire request will fail.
+ *
+ *
+ * int64 increment_amount = 4;
+ *
+ * @return Whether the incrementAmount field is set.
+ */
+ public boolean hasIncrementAmount() {
+ return ruleCase_ == 4;
+ }
/**
*
*
diff --git a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadModifyWriteRuleOrBuilder.java b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadModifyWriteRuleOrBuilder.java
index 2bbe3caa99..c406c4fe3d 100644
--- a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadModifyWriteRuleOrBuilder.java
+++ b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadModifyWriteRuleOrBuilder.java
@@ -65,6 +65,20 @@ public interface ReadModifyWriteRuleOrBuilder
*/
com.google.protobuf.ByteString getColumnQualifier();
+ /**
+ *
+ *
+ *
+ * Rule specifying that `append_value` be appended to the existing value.
+ * If the targeted cell is unset, it will be treated as containing the
+ * empty string.
+ *
+ *
+ * bytes append_value = 3;
+ *
+ * @return Whether the appendValue field is set.
+ */
+ boolean hasAppendValue();
/**
*
*
@@ -80,6 +94,21 @@ public interface ReadModifyWriteRuleOrBuilder
*/
com.google.protobuf.ByteString getAppendValue();
+ /**
+ *
+ *
+ *
+ * Rule specifying that `increment_amount` be added to the existing value.
+ * If the targeted cell is unset, it will be treated as containing a zero.
+ * Otherwise, the targeted cell must contain an 8-byte value (interpreted
+ * as a 64-bit big-endian signed integer), or the entire request will fail.
+ *
+ *
+ * int64 increment_amount = 4;
+ *
+ * @return Whether the incrementAmount field is set.
+ */
+ boolean hasIncrementAmount();
/**
*
*
diff --git a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadRowsResponse.java b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadRowsResponse.java
index 9da480b382..d4c707ac0b 100644
--- a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadRowsResponse.java
+++ b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadRowsResponse.java
@@ -357,6 +357,19 @@ public interface CellChunkOrBuilder
*/
int getValueSize();
+ /**
+ *
+ *
+ *
+ * Indicates that the client should drop all previous chunks for
+ * `row_key`, as it will be re-read from the beginning.
+ *
+ *
+ * bool reset_row = 8;
+ *
+ * @return Whether the resetRow field is set.
+ */
+ boolean hasResetRow();
/**
*
*
@@ -371,6 +384,19 @@ public interface CellChunkOrBuilder
*/
boolean getResetRow();
+ /**
+ *
+ *
+ *
+ * Indicates that the client can safely process all previous chunks for
+ * `row_key`, as its data has been fully read.
+ *
+ *
+ * bool commit_row = 9;
+ *
+ * @return Whether the commitRow field is set.
+ */
+ boolean hasCommitRow();
/**
*
*
@@ -879,6 +905,22 @@ public int getValueSize() {
}
public static final int RESET_ROW_FIELD_NUMBER = 8;
+ /**
+ *
+ *
+ *
+ * Indicates that the client should drop all previous chunks for
+ * `row_key`, as it will be re-read from the beginning.
+ *
+ *
+ * bool reset_row = 8;
+ *
+ * @return Whether the resetRow field is set.
+ */
+ @java.lang.Override
+ public boolean hasResetRow() {
+ return rowStatusCase_ == 8;
+ }
/**
*
*
@@ -900,6 +942,22 @@ public boolean getResetRow() {
}
public static final int COMMIT_ROW_FIELD_NUMBER = 9;
+ /**
+ *
+ *
+ *
+ * Indicates that the client can safely process all previous chunks for
+ * `row_key`, as its data has been fully read.
+ *
+ *
+ * bool commit_row = 9;
+ *
+ * @return Whether the commitRow field is set.
+ */
+ @java.lang.Override
+ public boolean hasCommitRow() {
+ return rowStatusCase_ == 9;
+ }
/**
*
*
@@ -2359,6 +2417,21 @@ public Builder clearValueSize() {
return this;
}
+ /**
+ *
+ *
+ *
+ * Indicates that the client should drop all previous chunks for
+ * `row_key`, as it will be re-read from the beginning.
+ *
+ *
+ * bool reset_row = 8;
+ *
+ * @return Whether the resetRow field is set.
+ */
+ public boolean hasResetRow() {
+ return rowStatusCase_ == 8;
+ }
/**
*
*
@@ -2417,6 +2490,21 @@ public Builder clearResetRow() {
return this;
}
+ /**
+ *
+ *
+ *
+ * Indicates that the client can safely process all previous chunks for
+ * `row_key`, as its data has been fully read.
+ *
+ *
+ * bool commit_row = 9;
+ *
+ * @return Whether the commitRow field is set.
+ */
+ public boolean hasCommitRow() {
+ return rowStatusCase_ == 9;
+ }
/**
*
*
diff --git a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/RowFilter.java b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/RowFilter.java
index 0308b42362..d66bc4ee94 100644
--- a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/RowFilter.java
+++ b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/RowFilter.java
@@ -4659,6 +4659,74 @@ public com.google.bigtable.v2.RowFilter.ConditionOrBuilder getConditionOrBuilder
}
public static final int SINK_FIELD_NUMBER = 16;
+ /**
+ *
+ *
+ *
+ * ADVANCED USE ONLY.
+ * Hook for introspection into the RowFilter. Outputs all cells directly to
+ * the output of the read rather than to any parent filter. Consider the
+ * following example:
+ * Chain(
+ * FamilyRegex("A"),
+ * Interleave(
+ * All(),
+ * Chain(Label("foo"), Sink())
+ * ),
+ * QualifierRegex("B")
+ * )
+ * A,A,1,w
+ * A,B,2,x
+ * B,B,4,z
+ * |
+ * FamilyRegex("A")
+ * |
+ * A,A,1,w
+ * A,B,2,x
+ * |
+ * +------------+-------------+
+ * | |
+ * All() Label(foo)
+ * | |
+ * A,A,1,w A,A,1,w,labels:[foo]
+ * A,B,2,x A,B,2,x,labels:[foo]
+ * | |
+ * | Sink() --------------+
+ * | | |
+ * +------------+ x------+ A,A,1,w,labels:[foo]
+ * | A,B,2,x,labels:[foo]
+ * A,A,1,w |
+ * A,B,2,x |
+ * | |
+ * QualifierRegex("B") |
+ * | |
+ * A,B,2,x |
+ * | |
+ * +--------------------------------+
+ * |
+ * A,A,1,w,labels:[foo]
+ * A,B,2,x,labels:[foo] // could be switched
+ * A,B,2,x // could be switched
+ * Despite being excluded by the qualifier filter, a copy of every cell
+ * that reaches the sink is present in the final result.
+ * As with an [Interleave][google.bigtable.v2.RowFilter.Interleave],
+ * duplicate cells are possible, and appear in an unspecified mutual order.
+ * In this case we have a duplicate with column "A:B" and timestamp 2,
+ * because one copy passed through the all filter while the other was
+ * passed through the label and sink. Note that one copy has label "foo",
+ * while the other does not.
+ * Cannot be used within the `predicate_filter`, `true_filter`, or
+ * `false_filter` of a [Condition][google.bigtable.v2.RowFilter.Condition].
+ *
+ *
+ * bool sink = 16;
+ *
+ * @return Whether the sink field is set.
+ */
+ @java.lang.Override
+ public boolean hasSink() {
+ return filterCase_ == 16;
+ }
/**
*
*
@@ -4732,6 +4800,22 @@ public boolean getSink() {
}
public static final int PASS_ALL_FILTER_FIELD_NUMBER = 17;
+ /**
+ *
+ *
+ *
+ * Matches all cells, regardless of input. Functionally equivalent to
+ * leaving `filter` unset, but included for completeness.
+ *
+ *
+ * bool pass_all_filter = 17;
+ *
+ * @return Whether the passAllFilter field is set.
+ */
+ @java.lang.Override
+ public boolean hasPassAllFilter() {
+ return filterCase_ == 17;
+ }
/**
*
*
@@ -4753,6 +4837,22 @@ public boolean getPassAllFilter() {
}
public static final int BLOCK_ALL_FILTER_FIELD_NUMBER = 18;
+ /**
+ *
+ *
+ *
+ * Does not match any cells, regardless of input. Useful for temporarily
+ * disabling just part of a filter.
+ *
+ *
+ * bool block_all_filter = 18;
+ *
+ * @return Whether the blockAllFilter field is set.
+ */
+ @java.lang.Override
+ public boolean hasBlockAllFilter() {
+ return filterCase_ == 18;
+ }
/**
*
*
@@ -4774,6 +4874,27 @@ public boolean getBlockAllFilter() {
}
public static final int ROW_KEY_REGEX_FILTER_FIELD_NUMBER = 4;
+ /**
+ *
+ *
+ *
+ * Matches only cells from rows whose keys satisfy the given RE2 regex. In
+ * other words, passes through the entire row when the key matches, and
+ * otherwise produces an empty row.
+ * Note that, since row keys can contain arbitrary bytes, the `\C` escape
+ * sequence must be used if a true wildcard is desired. The `.` character
+ * will not match the new line character `\n`, which may be present in a
+ * binary key.
+ *
+ *
+ * bytes row_key_regex_filter = 4;
+ *
+ * @return Whether the rowKeyRegexFilter field is set.
+ */
+ @java.lang.Override
+ public boolean hasRowKeyRegexFilter() {
+ return filterCase_ == 4;
+ }
/**
*
*
@@ -4800,6 +4921,22 @@ public com.google.protobuf.ByteString getRowKeyRegexFilter() {
}
public static final int ROW_SAMPLE_FILTER_FIELD_NUMBER = 14;
+ /**
+ *
+ *
+ *
+ * Matches all cells from a row with probability p, and matches no cells
+ * from the row with probability 1-p.
+ *
+ *
+ * double row_sample_filter = 14;
+ *
+ * @return Whether the rowSampleFilter field is set.
+ */
+ @java.lang.Override
+ public boolean hasRowSampleFilter() {
+ return filterCase_ == 14;
+ }
/**
*
*
@@ -4821,6 +4958,25 @@ public double getRowSampleFilter() {
}
public static final int FAMILY_NAME_REGEX_FILTER_FIELD_NUMBER = 5;
+ /**
+ *
+ *
+ *
+ * Matches only cells from columns whose families satisfy the given RE2
+ * regex. For technical reasons, the regex must not contain the `:`
+ * character, even if it is not being used as a literal.
+ * Note that, since column families cannot contain the new line character
+ * `\n`, it is sufficient to use `.` as a full wildcard when matching
+ * column family names.
+ *
+ *
+ * string family_name_regex_filter = 5;
+ *
+ * @return Whether the familyNameRegexFilter field is set.
+ */
+ public boolean hasFamilyNameRegexFilter() {
+ return filterCase_ == 5;
+ }
/**
*
*
@@ -4887,6 +5043,26 @@ public com.google.protobuf.ByteString getFamilyNameRegexFilterBytes() {
}
public static final int COLUMN_QUALIFIER_REGEX_FILTER_FIELD_NUMBER = 6;
+ /**
+ *
+ *
+ *
+ * Matches only cells from columns whose qualifiers satisfy the given RE2
+ * regex.
+ * Note that, since column qualifiers can contain arbitrary bytes, the `\C`
+ * escape sequence must be used if a true wildcard is desired. The `.`
+ * character will not match the new line character `\n`, which may be
+ * present in a binary qualifier.
+ *
+ *
+ * bytes column_qualifier_regex_filter = 6;
+ *
+ * @return Whether the columnQualifierRegexFilter field is set.
+ */
+ @java.lang.Override
+ public boolean hasColumnQualifierRegexFilter() {
+ return filterCase_ == 6;
+ }
/**
*
*
@@ -5014,6 +5190,25 @@ public com.google.bigtable.v2.TimestampRangeOrBuilder getTimestampRangeFilterOrB
}
public static final int VALUE_REGEX_FILTER_FIELD_NUMBER = 9;
+ /**
+ *
+ *
+ *
+ * Matches only cells with values that satisfy the given regular expression.
+ * Note that, since cell values can contain arbitrary bytes, the `\C` escape
+ * sequence must be used if a true wildcard is desired. The `.` character
+ * will not match the new line character `\n`, which may be present in a
+ * binary value.
+ *
+ *
+ * bytes value_regex_filter = 9;
+ *
+ * @return Whether the valueRegexFilter field is set.
+ */
+ @java.lang.Override
+ public boolean hasValueRegexFilter() {
+ return filterCase_ == 9;
+ }
/**
*
*
@@ -5089,6 +5284,23 @@ public com.google.bigtable.v2.ValueRangeOrBuilder getValueRangeFilterOrBuilder()
}
public static final int CELLS_PER_ROW_OFFSET_FILTER_FIELD_NUMBER = 10;
+ /**
+ *
+ *
+ *
+ * Skips the first N cells of each row, matching all subsequent cells.
+ * If duplicate cells are present, as is possible when using an Interleave,
+ * each copy of the cell is counted separately.
+ *
+ *
+ * int32 cells_per_row_offset_filter = 10;
+ *
+ * @return Whether the cellsPerRowOffsetFilter field is set.
+ */
+ @java.lang.Override
+ public boolean hasCellsPerRowOffsetFilter() {
+ return filterCase_ == 10;
+ }
/**
*
*
@@ -5111,6 +5323,23 @@ public int getCellsPerRowOffsetFilter() {
}
public static final int CELLS_PER_ROW_LIMIT_FILTER_FIELD_NUMBER = 11;
+ /**
+ *
+ *
+ *
+ * Matches only the first N cells of each row.
+ * If duplicate cells are present, as is possible when using an Interleave,
+ * each copy of the cell is counted separately.
+ *
+ *
+ * int32 cells_per_row_limit_filter = 11;
+ *
+ * @return Whether the cellsPerRowLimitFilter field is set.
+ */
+ @java.lang.Override
+ public boolean hasCellsPerRowLimitFilter() {
+ return filterCase_ == 11;
+ }
/**
*
*
@@ -5133,6 +5362,26 @@ public int getCellsPerRowLimitFilter() {
}
public static final int CELLS_PER_COLUMN_LIMIT_FILTER_FIELD_NUMBER = 12;
+ /**
+ *
+ *
+ *
+ * Matches only the most recent N cells within each column. For example,
+ * if N=2, this filter would match column `foo:bar` at timestamps 10 and 9,
+ * skip all earlier cells in `foo:bar`, and then begin matching again in
+ * column `foo:bar2`.
+ * If duplicate cells are present, as is possible when using an Interleave,
+ * each copy of the cell is counted separately.
+ *
+ *
+ * int32 cells_per_column_limit_filter = 12;
+ *
+ * @return Whether the cellsPerColumnLimitFilter field is set.
+ */
+ @java.lang.Override
+ public boolean hasCellsPerColumnLimitFilter() {
+ return filterCase_ == 12;
+ }
/**
*
*
@@ -5158,6 +5407,21 @@ public int getCellsPerColumnLimitFilter() {
}
public static final int STRIP_VALUE_TRANSFORMER_FIELD_NUMBER = 13;
+ /**
+ *
+ *
+ *
+ * Replaces each cell's value with the empty string.
+ *
+ *
+ * bool strip_value_transformer = 13;
+ *
+ * @return Whether the stripValueTransformer field is set.
+ */
+ @java.lang.Override
+ public boolean hasStripValueTransformer() {
+ return filterCase_ == 13;
+ }
/**
*
*
@@ -5178,6 +5442,30 @@ public boolean getStripValueTransformer() {
}
public static final int APPLY_LABEL_TRANSFORMER_FIELD_NUMBER = 19;
+ /**
+ *
+ *
+ *
+ * Applies the given label to all cells in the output row. This allows
+ * the client to determine which results were produced from which part of
+ * the filter.
+ * Values must be at most 15 characters in length, and match the RE2
+ * pattern `[a-z0-9\\-]+`
+ * Due to a technical limitation, it is not currently possible to apply
+ * multiple labels to a cell. As a result, a Chain may have no more than
+ * one sub-filter which contains a `apply_label_transformer`. It is okay for
+ * an Interleave to contain multiple `apply_label_transformers`, as they
+ * will be applied to separate copies of the input. This may be relaxed in
+ * the future.
+ *
+ *
+ * string apply_label_transformer = 19;
+ *
+ * @return Whether the applyLabelTransformer field is set.
+ */
+ public boolean hasApplyLabelTransformer() {
+ return filterCase_ == 19;
+ }
/**
*
*
@@ -6728,6 +7016,73 @@ public com.google.bigtable.v2.RowFilter.ConditionOrBuilder getConditionOrBuilder
return conditionBuilder_;
}
+ /**
+ *
+ *
+ *
+ * ADVANCED USE ONLY.
+ * Hook for introspection into the RowFilter. Outputs all cells directly to
+ * the output of the read rather than to any parent filter. Consider the
+ * following example:
+ * Chain(
+ * FamilyRegex("A"),
+ * Interleave(
+ * All(),
+ * Chain(Label("foo"), Sink())
+ * ),
+ * QualifierRegex("B")
+ * )
+ * A,A,1,w
+ * A,B,2,x
+ * B,B,4,z
+ * |
+ * FamilyRegex("A")
+ * |
+ * A,A,1,w
+ * A,B,2,x
+ * |
+ * +------------+-------------+
+ * | |
+ * All() Label(foo)
+ * | |
+ * A,A,1,w A,A,1,w,labels:[foo]
+ * A,B,2,x A,B,2,x,labels:[foo]
+ * | |
+ * | Sink() --------------+
+ * | | |
+ * +------------+ x------+ A,A,1,w,labels:[foo]
+ * | A,B,2,x,labels:[foo]
+ * A,A,1,w |
+ * A,B,2,x |
+ * | |
+ * QualifierRegex("B") |
+ * | |
+ * A,B,2,x |
+ * | |
+ * +--------------------------------+
+ * |
+ * A,A,1,w,labels:[foo]
+ * A,B,2,x,labels:[foo] // could be switched
+ * A,B,2,x // could be switched
+ * Despite being excluded by the qualifier filter, a copy of every cell
+ * that reaches the sink is present in the final result.
+ * As with an [Interleave][google.bigtable.v2.RowFilter.Interleave],
+ * duplicate cells are possible, and appear in an unspecified mutual order.
+ * In this case we have a duplicate with column "A:B" and timestamp 2,
+ * because one copy passed through the all filter while the other was
+ * passed through the label and sink. Note that one copy has label "foo",
+ * while the other does not.
+ * Cannot be used within the `predicate_filter`, `true_filter`, or
+ * `false_filter` of a [Condition][google.bigtable.v2.RowFilter.Condition].
+ *
+ *
+ * bool sink = 16;
+ *
+ * @return Whether the sink field is set.
+ */
+ public boolean hasSink() {
+ return filterCase_ == 16;
+ }
/**
*
*
@@ -6942,6 +7297,21 @@ public Builder clearSink() {
return this;
}
+ /**
+ *
+ *
+ *
+ * Matches all cells, regardless of input. Functionally equivalent to
+ * leaving `filter` unset, but included for completeness.
+ *
+ *
+ * bool pass_all_filter = 17;
+ *
+ * @return Whether the passAllFilter field is set.
+ */
+ public boolean hasPassAllFilter() {
+ return filterCase_ == 17;
+ }
/**
*
*
@@ -7000,6 +7370,21 @@ public Builder clearPassAllFilter() {
return this;
}
+ /**
+ *
+ *
+ *
+ * Does not match any cells, regardless of input. Useful for temporarily
+ * disabling just part of a filter.
+ *
+ *
+ * bool block_all_filter = 18;
+ *
+ * @return Whether the blockAllFilter field is set.
+ */
+ public boolean hasBlockAllFilter() {
+ return filterCase_ == 18;
+ }
/**
*
*
@@ -7058,6 +7443,26 @@ public Builder clearBlockAllFilter() {
return this;
}
+ /**
+ *
+ *
+ *
+ * Matches only cells from rows whose keys satisfy the given RE2 regex. In
+ * other words, passes through the entire row when the key matches, and
+ * otherwise produces an empty row.
+ * Note that, since row keys can contain arbitrary bytes, the `\C` escape
+ * sequence must be used if a true wildcard is desired. The `.` character
+ * will not match the new line character `\n`, which may be present in a
+ * binary key.
+ *
+ *
+ * bytes row_key_regex_filter = 4;
+ *
+ * @return Whether the rowKeyRegexFilter field is set.
+ */
+ public boolean hasRowKeyRegexFilter() {
+ return filterCase_ == 4;
+ }
/**
*
*
@@ -7134,6 +7539,21 @@ public Builder clearRowKeyRegexFilter() {
return this;
}
+ /**
+ *
+ *
+ *
+ * Matches all cells from a row with probability p, and matches no cells
+ * from the row with probability 1-p.
+ *
+ *
+ * double row_sample_filter = 14;
+ *
+ * @return Whether the rowSampleFilter field is set.
+ */
+ public boolean hasRowSampleFilter() {
+ return filterCase_ == 14;
+ }
/**
*
*
@@ -7192,6 +7612,26 @@ public Builder clearRowSampleFilter() {
return this;
}
+ /**
+ *
+ *
+ *
+ * Matches only cells from columns whose families satisfy the given RE2
+ * regex. For technical reasons, the regex must not contain the `:`
+ * character, even if it is not being used as a literal.
+ * Note that, since column families cannot contain the new line character
+ * `\n`, it is sufficient to use `.` as a full wildcard when matching
+ * column family names.
+ *
+ *
+ * string family_name_regex_filter = 5;
+ *
+ * @return Whether the familyNameRegexFilter field is set.
+ */
+ @java.lang.Override
+ public boolean hasFamilyNameRegexFilter() {
+ return filterCase_ == 5;
+ }
/**
*
*
@@ -7336,6 +7776,25 @@ public Builder setFamilyNameRegexFilterBytes(com.google.protobuf.ByteString valu
return this;
}
+ /**
+ *
+ *
+ *
+ * Matches only cells from columns whose qualifiers satisfy the given RE2
+ * regex.
+ * Note that, since column qualifiers can contain arbitrary bytes, the `\C`
+ * escape sequence must be used if a true wildcard is desired. The `.`
+ * character will not match the new line character `\n`, which may be
+ * present in a binary qualifier.
+ *
+ *
+ * bytes column_qualifier_regex_filter = 6;
+ *
+ * @return Whether the columnQualifierRegexFilter field is set.
+ */
+ public boolean hasColumnQualifierRegexFilter() {
+ return filterCase_ == 6;
+ }
/**
*
*
@@ -7823,6 +8282,24 @@ public com.google.bigtable.v2.TimestampRangeOrBuilder getTimestampRangeFilterOrB
return timestampRangeFilterBuilder_;
}
+ /**
+ *
+ *
+ *
+ * Matches only cells with values that satisfy the given regular expression.
+ * Note that, since cell values can contain arbitrary bytes, the `\C` escape
+ * sequence must be used if a true wildcard is desired. The `.` character
+ * will not match the new line character `\n`, which may be present in a
+ * binary value.
+ *
+ *
+ * bytes value_regex_filter = 9;
+ *
+ * @return Whether the valueRegexFilter field is set.
+ */
+ public boolean hasValueRegexFilter() {
+ return filterCase_ == 9;
+ }
/**
*
*
@@ -8099,6 +8576,22 @@ public com.google.bigtable.v2.ValueRangeOrBuilder getValueRangeFilterOrBuilder()
return valueRangeFilterBuilder_;
}
+ /**
+ *
+ *
+ *
+ * Skips the first N cells of each row, matching all subsequent cells.
+ * If duplicate cells are present, as is possible when using an Interleave,
+ * each copy of the cell is counted separately.
+ *
+ *
+ * int32 cells_per_row_offset_filter = 10;
+ *
+ * @return Whether the cellsPerRowOffsetFilter field is set.
+ */
+ public boolean hasCellsPerRowOffsetFilter() {
+ return filterCase_ == 10;
+ }
/**
*
*
@@ -8160,6 +8653,22 @@ public Builder clearCellsPerRowOffsetFilter() {
return this;
}
+ /**
+ *
+ *
+ *
+ * Matches only the first N cells of each row.
+ * If duplicate cells are present, as is possible when using an Interleave,
+ * each copy of the cell is counted separately.
+ *
+ *
+ * int32 cells_per_row_limit_filter = 11;
+ *
+ * @return Whether the cellsPerRowLimitFilter field is set.
+ */
+ public boolean hasCellsPerRowLimitFilter() {
+ return filterCase_ == 11;
+ }
/**
*
*
@@ -8221,6 +8730,25 @@ public Builder clearCellsPerRowLimitFilter() {
return this;
}
+ /**
+ *
+ *
+ *
+ * Matches only the most recent N cells within each column. For example,
+ * if N=2, this filter would match column `foo:bar` at timestamps 10 and 9,
+ * skip all earlier cells in `foo:bar`, and then begin matching again in
+ * column `foo:bar2`.
+ * If duplicate cells are present, as is possible when using an Interleave,
+ * each copy of the cell is counted separately.
+ *
+ *
+ * int32 cells_per_column_limit_filter = 12;
+ *
+ * @return Whether the cellsPerColumnLimitFilter field is set.
+ */
+ public boolean hasCellsPerColumnLimitFilter() {
+ return filterCase_ == 12;
+ }
/**
*
*
@@ -8291,6 +8819,20 @@ public Builder clearCellsPerColumnLimitFilter() {
return this;
}
+ /**
+ *
+ *
+ *
+ * Replaces each cell's value with the empty string.
+ *
+ *
+ * bool strip_value_transformer = 13;
+ *
+ * @return Whether the stripValueTransformer field is set.
+ */
+ public boolean hasStripValueTransformer() {
+ return filterCase_ == 13;
+ }
/**
*
*
@@ -8346,6 +8888,31 @@ public Builder clearStripValueTransformer() {
return this;
}
+ /**
+ *
+ *
+ *
+ * Applies the given label to all cells in the output row. This allows
+ * the client to determine which results were produced from which part of
+ * the filter.
+ * Values must be at most 15 characters in length, and match the RE2
+ * pattern `[a-z0-9\\-]+`
+ * Due to a technical limitation, it is not currently possible to apply
+ * multiple labels to a cell. As a result, a Chain may have no more than
+ * one sub-filter which contains a `apply_label_transformer`. It is okay for
+ * an Interleave to contain multiple `apply_label_transformers`, as they
+ * will be applied to separate copies of the input. This may be relaxed in
+ * the future.
+ *
+ *
+ * string apply_label_transformer = 19;
+ *
+ * @return Whether the applyLabelTransformer field is set.
+ */
+ @java.lang.Override
+ public boolean hasApplyLabelTransformer() {
+ return filterCase_ == 19;
+ }
/**
*
*
diff --git a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/RowFilterOrBuilder.java b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/RowFilterOrBuilder.java
index 3fdcc29561..2f3f4f8402 100644
--- a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/RowFilterOrBuilder.java
+++ b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/RowFilterOrBuilder.java
@@ -137,6 +137,71 @@ public interface RowFilterOrBuilder
*/
com.google.bigtable.v2.RowFilter.ConditionOrBuilder getConditionOrBuilder();
+ /**
+ *
+ *
+ *
+ * ADVANCED USE ONLY.
+ * Hook for introspection into the RowFilter. Outputs all cells directly to
+ * the output of the read rather than to any parent filter. Consider the
+ * following example:
+ * Chain(
+ * FamilyRegex("A"),
+ * Interleave(
+ * All(),
+ * Chain(Label("foo"), Sink())
+ * ),
+ * QualifierRegex("B")
+ * )
+ * A,A,1,w
+ * A,B,2,x
+ * B,B,4,z
+ * |
+ * FamilyRegex("A")
+ * |
+ * A,A,1,w
+ * A,B,2,x
+ * |
+ * +------------+-------------+
+ * | |
+ * All() Label(foo)
+ * | |
+ * A,A,1,w A,A,1,w,labels:[foo]
+ * A,B,2,x A,B,2,x,labels:[foo]
+ * | |
+ * | Sink() --------------+
+ * | | |
+ * +------------+ x------+ A,A,1,w,labels:[foo]
+ * | A,B,2,x,labels:[foo]
+ * A,A,1,w |
+ * A,B,2,x |
+ * | |
+ * QualifierRegex("B") |
+ * | |
+ * A,B,2,x |
+ * | |
+ * +--------------------------------+
+ * |
+ * A,A,1,w,labels:[foo]
+ * A,B,2,x,labels:[foo] // could be switched
+ * A,B,2,x // could be switched
+ * Despite being excluded by the qualifier filter, a copy of every cell
+ * that reaches the sink is present in the final result.
+ * As with an [Interleave][google.bigtable.v2.RowFilter.Interleave],
+ * duplicate cells are possible, and appear in an unspecified mutual order.
+ * In this case we have a duplicate with column "A:B" and timestamp 2,
+ * because one copy passed through the all filter while the other was
+ * passed through the label and sink. Note that one copy has label "foo",
+ * while the other does not.
+ * Cannot be used within the `predicate_filter`, `true_filter`, or
+ * `false_filter` of a [Condition][google.bigtable.v2.RowFilter.Condition].
+ *
+ *
+ * bool sink = 16;
+ *
+ * @return Whether the sink field is set.
+ */
+ boolean hasSink();
/**
*
*
@@ -203,6 +268,19 @@ public interface RowFilterOrBuilder
*/
boolean getSink();
+ /**
+ *
+ *
+ *
+ * Matches all cells, regardless of input. Functionally equivalent to
+ * leaving `filter` unset, but included for completeness.
+ *
+ *
+ * bool pass_all_filter = 17;
+ *
+ * @return Whether the passAllFilter field is set.
+ */
+ boolean hasPassAllFilter();
/**
*
*
@@ -217,6 +295,19 @@ public interface RowFilterOrBuilder
*/
boolean getPassAllFilter();
+ /**
+ *
+ *
+ *
+ * Does not match any cells, regardless of input. Useful for temporarily
+ * disabling just part of a filter.
+ *
+ *
+ * bool block_all_filter = 18;
+ *
+ * @return Whether the blockAllFilter field is set.
+ */
+ boolean hasBlockAllFilter();
/**
*
*
@@ -231,6 +322,24 @@ public interface RowFilterOrBuilder
*/
boolean getBlockAllFilter();
+ /**
+ *
+ *
+ *
+ * Matches only cells from rows whose keys satisfy the given RE2 regex. In
+ * other words, passes through the entire row when the key matches, and
+ * otherwise produces an empty row.
+ * Note that, since row keys can contain arbitrary bytes, the `\C` escape
+ * sequence must be used if a true wildcard is desired. The `.` character
+ * will not match the new line character `\n`, which may be present in a
+ * binary key.
+ *
+ *
+ * bytes row_key_regex_filter = 4;
+ *
+ * @return Whether the rowKeyRegexFilter field is set.
+ */
+ boolean hasRowKeyRegexFilter();
/**
*
*
@@ -250,6 +359,19 @@ public interface RowFilterOrBuilder
*/
com.google.protobuf.ByteString getRowKeyRegexFilter();
+ /**
+ *
+ *
+ *
+ * Matches all cells from a row with probability p, and matches no cells
+ * from the row with probability 1-p.
+ *
+ *
+ * double row_sample_filter = 14;
+ *
+ * @return Whether the rowSampleFilter field is set.
+ */
+ boolean hasRowSampleFilter();
/**
*
*
@@ -264,6 +386,23 @@ public interface RowFilterOrBuilder
*/
double getRowSampleFilter();
+ /**
+ *
+ *
+ *
+ * Matches only cells from columns whose families satisfy the given RE2
+ * regex. For technical reasons, the regex must not contain the `:`
+ * character, even if it is not being used as a literal.
+ * Note that, since column families cannot contain the new line character
+ * `\n`, it is sufficient to use `.` as a full wildcard when matching
+ * column family names.
+ *
+ *
+ * string family_name_regex_filter = 5;
+ *
+ * @return Whether the familyNameRegexFilter field is set.
+ */
+ boolean hasFamilyNameRegexFilter();
/**
*
*
@@ -299,6 +438,23 @@ public interface RowFilterOrBuilder
*/
com.google.protobuf.ByteString getFamilyNameRegexFilterBytes();
+ /**
+ *
+ *
+ *
+ * Matches only cells from columns whose qualifiers satisfy the given RE2
+ * regex.
+ * Note that, since column qualifiers can contain arbitrary bytes, the `\C`
+ * escape sequence must be used if a true wildcard is desired. The `.`
+ * character will not match the new line character `\n`, which may be
+ * present in a binary qualifier.
+ *
+ *
+ * bytes column_qualifier_regex_filter = 6;
+ *
+ * @return Whether the columnQualifierRegexFilter field is set.
+ */
+ boolean hasColumnQualifierRegexFilter();
/**
*
*
@@ -387,6 +543,22 @@ public interface RowFilterOrBuilder
*/
com.google.bigtable.v2.TimestampRangeOrBuilder getTimestampRangeFilterOrBuilder();
+ /**
+ *
+ *
+ *
+ * Matches only cells with values that satisfy the given regular expression.
+ * Note that, since cell values can contain arbitrary bytes, the `\C` escape
+ * sequence must be used if a true wildcard is desired. The `.` character
+ * will not match the new line character `\n`, which may be present in a
+ * binary value.
+ *
+ *
+ * bytes value_regex_filter = 9;
+ *
+ * @return Whether the valueRegexFilter field is set.
+ */
+ boolean hasValueRegexFilter();
/**
*
*
@@ -439,6 +611,20 @@ public interface RowFilterOrBuilder
*/
com.google.bigtable.v2.ValueRangeOrBuilder getValueRangeFilterOrBuilder();
+ /**
+ *
+ *
+ *
+ * Skips the first N cells of each row, matching all subsequent cells.
+ * If duplicate cells are present, as is possible when using an Interleave,
+ * each copy of the cell is counted separately.
+ *
+ *
+ * int32 cells_per_row_offset_filter = 10;
+ *
+ * @return Whether the cellsPerRowOffsetFilter field is set.
+ */
+ boolean hasCellsPerRowOffsetFilter();
/**
*
*
@@ -454,6 +640,20 @@ public interface RowFilterOrBuilder
*/
int getCellsPerRowOffsetFilter();
+ /**
+ *
+ *
+ *
+ * Matches only the first N cells of each row.
+ * If duplicate cells are present, as is possible when using an Interleave,
+ * each copy of the cell is counted separately.
+ *
+ *
+ * int32 cells_per_row_limit_filter = 11;
+ *
+ * @return Whether the cellsPerRowLimitFilter field is set.
+ */
+ boolean hasCellsPerRowLimitFilter();
/**
*
*
@@ -469,6 +669,23 @@ public interface RowFilterOrBuilder
*/
int getCellsPerRowLimitFilter();
+ /**
+ *
+ *
+ *
+ * Matches only the most recent N cells within each column. For example,
+ * if N=2, this filter would match column `foo:bar` at timestamps 10 and 9,
+ * skip all earlier cells in `foo:bar`, and then begin matching again in
+ * column `foo:bar2`.
+ * If duplicate cells are present, as is possible when using an Interleave,
+ * each copy of the cell is counted separately.
+ *
+ *
+ * int32 cells_per_column_limit_filter = 12;
+ *
+ * @return Whether the cellsPerColumnLimitFilter field is set.
+ */
+ boolean hasCellsPerColumnLimitFilter();
/**
*
*
@@ -487,6 +704,18 @@ public interface RowFilterOrBuilder
*/
int getCellsPerColumnLimitFilter();
+ /**
+ *
+ *
+ *
+ * Replaces each cell's value with the empty string.
+ *
+ *
+ * bool strip_value_transformer = 13;
+ *
+ * @return Whether the stripValueTransformer field is set.
+ */
+ boolean hasStripValueTransformer();
/**
*
*
@@ -500,6 +729,28 @@ public interface RowFilterOrBuilder
*/
boolean getStripValueTransformer();
+ /**
+ *
+ *
+ *
+ * Applies the given label to all cells in the output row. This allows
+ * the client to determine which results were produced from which part of
+ * the filter.
+ * Values must be at most 15 characters in length, and match the RE2
+ * pattern `[a-z0-9\\-]+`
+ * Due to a technical limitation, it is not currently possible to apply
+ * multiple labels to a cell. As a result, a Chain may have no more than
+ * one sub-filter which contains a `apply_label_transformer`. It is okay for
+ * an Interleave to contain multiple `apply_label_transformers`, as they
+ * will be applied to separate copies of the input. This may be relaxed in
+ * the future.
+ *
+ *
+ * string apply_label_transformer = 19;
+ *
+ * @return Whether the applyLabelTransformer field is set.
+ */
+ boolean hasApplyLabelTransformer();
/**
*
*
diff --git a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/RowRange.java b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/RowRange.java
index 20d4680cdc..8e79c867b9 100644
--- a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/RowRange.java
+++ b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/RowRange.java
@@ -219,6 +219,21 @@ public EndKeyCase getEndKeyCase() {
}
public static final int START_KEY_CLOSED_FIELD_NUMBER = 1;
+ /**
+ *
+ *
+ *
+ * Used when giving an inclusive lower bound for the range.
+ *
+ *
+ * bytes start_key_closed = 1;
+ *
+ * @return Whether the startKeyClosed field is set.
+ */
+ @java.lang.Override
+ public boolean hasStartKeyClosed() {
+ return startKeyCase_ == 1;
+ }
/**
*
*
@@ -239,6 +254,21 @@ public com.google.protobuf.ByteString getStartKeyClosed() {
}
public static final int START_KEY_OPEN_FIELD_NUMBER = 2;
+ /**
+ *
+ *
+ *
+ * Used when giving an exclusive lower bound for the range.
+ *
+ *
+ * bytes start_key_open = 2;
+ *
+ * @return Whether the startKeyOpen field is set.
+ */
+ @java.lang.Override
+ public boolean hasStartKeyOpen() {
+ return startKeyCase_ == 2;
+ }
/**
*
*
@@ -259,6 +289,21 @@ public com.google.protobuf.ByteString getStartKeyOpen() {
}
public static final int END_KEY_OPEN_FIELD_NUMBER = 3;
+ /**
+ *
+ *
+ *
+ * Used when giving an exclusive upper bound for the range.
+ *
+ *
+ * bytes end_key_open = 3;
+ *
+ * @return Whether the endKeyOpen field is set.
+ */
+ @java.lang.Override
+ public boolean hasEndKeyOpen() {
+ return endKeyCase_ == 3;
+ }
/**
*
*
@@ -279,6 +324,21 @@ public com.google.protobuf.ByteString getEndKeyOpen() {
}
public static final int END_KEY_CLOSED_FIELD_NUMBER = 4;
+ /**
+ *
+ *
+ *
+ * Used when giving an inclusive upper bound for the range.
+ *
+ *
+ * bytes end_key_closed = 4;
+ *
+ * @return Whether the endKeyClosed field is set.
+ */
+ @java.lang.Override
+ public boolean hasEndKeyClosed() {
+ return endKeyCase_ == 4;
+ }
/**
*
*
@@ -750,6 +810,20 @@ public Builder clearEndKey() {
return this;
}
+ /**
+ *
+ *
+ *
+ * Used when giving an inclusive lower bound for the range.
+ *
+ *
+ * bytes start_key_closed = 1;
+ *
+ * @return Whether the startKeyClosed field is set.
+ */
+ public boolean hasStartKeyClosed() {
+ return startKeyCase_ == 1;
+ }
/**
*
*
@@ -808,6 +882,20 @@ public Builder clearStartKeyClosed() {
return this;
}
+ /**
+ *
+ *
+ *
+ * Used when giving an exclusive lower bound for the range.
+ *
+ *
+ * bytes start_key_open = 2;
+ *
+ * @return Whether the startKeyOpen field is set.
+ */
+ public boolean hasStartKeyOpen() {
+ return startKeyCase_ == 2;
+ }
/**
*
*
@@ -866,6 +954,20 @@ public Builder clearStartKeyOpen() {
return this;
}
+ /**
+ *
+ *
+ *
+ * Used when giving an exclusive upper bound for the range.
+ *
+ *
+ * bytes end_key_open = 3;
+ *
+ * @return Whether the endKeyOpen field is set.
+ */
+ public boolean hasEndKeyOpen() {
+ return endKeyCase_ == 3;
+ }
/**
*
*
@@ -924,6 +1026,20 @@ public Builder clearEndKeyOpen() {
return this;
}
+ /**
+ *
+ *
+ *
+ * Used when giving an inclusive upper bound for the range.
+ *
+ *
+ * bytes end_key_closed = 4;
+ *
+ * @return Whether the endKeyClosed field is set.
+ */
+ public boolean hasEndKeyClosed() {
+ return endKeyCase_ == 4;
+ }
/**
*
*
diff --git a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/RowRangeOrBuilder.java b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/RowRangeOrBuilder.java
index c7fd2cf99a..9f5960e966 100644
--- a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/RowRangeOrBuilder.java
+++ b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/RowRangeOrBuilder.java
@@ -23,6 +23,18 @@ public interface RowRangeOrBuilder
// @@protoc_insertion_point(interface_extends:google.bigtable.v2.RowRange)
com.google.protobuf.MessageOrBuilder {
+ /**
+ *
+ *
+ *
+ * Used when giving an inclusive lower bound for the range.
+ *
+ *
+ * bytes start_key_closed = 1;
+ *
+ * @return Whether the startKeyClosed field is set.
+ */
+ boolean hasStartKeyClosed();
/**
*
*
@@ -36,6 +48,18 @@ public interface RowRangeOrBuilder
*/
com.google.protobuf.ByteString getStartKeyClosed();
+ /**
+ *
+ *
+ *
+ * Used when giving an exclusive lower bound for the range.
+ *
+ *
+ * bytes start_key_open = 2;
+ *
+ * @return Whether the startKeyOpen field is set.
+ */
+ boolean hasStartKeyOpen();
/**
*
*
@@ -49,6 +73,18 @@ public interface RowRangeOrBuilder
*/
com.google.protobuf.ByteString getStartKeyOpen();
+ /**
+ *
+ *
+ *
+ * Used when giving an exclusive upper bound for the range.
+ *
+ *
+ * bytes end_key_open = 3;
+ *
+ * @return Whether the endKeyOpen field is set.
+ */
+ boolean hasEndKeyOpen();
/**
*
*
@@ -62,6 +98,18 @@ public interface RowRangeOrBuilder
*/
com.google.protobuf.ByteString getEndKeyOpen();
+ /**
+ *
+ *
+ *
+ * Used when giving an inclusive upper bound for the range.
+ *
+ *
+ * bytes end_key_closed = 4;
+ *
+ * @return Whether the endKeyClosed field is set.
+ */
+ boolean hasEndKeyClosed();
/**
*
*
diff --git a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ValueRange.java b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ValueRange.java
index 748d1342d3..738708f614 100644
--- a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ValueRange.java
+++ b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ValueRange.java
@@ -221,6 +221,21 @@ public EndValueCase getEndValueCase() {
}
public static final int START_VALUE_CLOSED_FIELD_NUMBER = 1;
+ /**
+ *
+ *
+ *
+ * Used when giving an inclusive lower bound for the range.
+ *
+ *
+ * bytes start_value_closed = 1;
+ *
+ * @return Whether the startValueClosed field is set.
+ */
+ @java.lang.Override
+ public boolean hasStartValueClosed() {
+ return startValueCase_ == 1;
+ }
/**
*
*
@@ -241,6 +256,21 @@ public com.google.protobuf.ByteString getStartValueClosed() {
}
public static final int START_VALUE_OPEN_FIELD_NUMBER = 2;
+ /**
+ *
+ *
+ *
+ * Used when giving an exclusive lower bound for the range.
+ *
+ *
+ * bytes start_value_open = 2;
+ *
+ * @return Whether the startValueOpen field is set.
+ */
+ @java.lang.Override
+ public boolean hasStartValueOpen() {
+ return startValueCase_ == 2;
+ }
/**
*
*
@@ -261,6 +291,21 @@ public com.google.protobuf.ByteString getStartValueOpen() {
}
public static final int END_VALUE_CLOSED_FIELD_NUMBER = 3;
+ /**
+ *
+ *
+ *
+ * Used when giving an inclusive upper bound for the range.
+ *
+ *
+ * bytes end_value_closed = 3;
+ *
+ * @return Whether the endValueClosed field is set.
+ */
+ @java.lang.Override
+ public boolean hasEndValueClosed() {
+ return endValueCase_ == 3;
+ }
/**
*
*
@@ -281,6 +326,21 @@ public com.google.protobuf.ByteString getEndValueClosed() {
}
public static final int END_VALUE_OPEN_FIELD_NUMBER = 4;
+ /**
+ *
+ *
+ *
+ * Used when giving an exclusive upper bound for the range.
+ *
+ *
+ * bytes end_value_open = 4;
+ *
+ * @return Whether the endValueOpen field is set.
+ */
+ @java.lang.Override
+ public boolean hasEndValueOpen() {
+ return endValueCase_ == 4;
+ }
/**
*
*
@@ -753,6 +813,20 @@ public Builder clearEndValue() {
return this;
}
+ /**
+ *
+ *
+ *
+ * Used when giving an inclusive lower bound for the range.
+ *
+ *
+ * bytes start_value_closed = 1;
+ *
+ * @return Whether the startValueClosed field is set.
+ */
+ public boolean hasStartValueClosed() {
+ return startValueCase_ == 1;
+ }
/**
*
*
@@ -811,6 +885,20 @@ public Builder clearStartValueClosed() {
return this;
}
+ /**
+ *
+ *
+ *
+ * Used when giving an exclusive lower bound for the range.
+ *
+ *
+ * bytes start_value_open = 2;
+ *
+ * @return Whether the startValueOpen field is set.
+ */
+ public boolean hasStartValueOpen() {
+ return startValueCase_ == 2;
+ }
/**
*
*
@@ -869,6 +957,20 @@ public Builder clearStartValueOpen() {
return this;
}
+ /**
+ *
+ *
+ *
+ * Used when giving an inclusive upper bound for the range.
+ *
+ *
+ * bytes end_value_closed = 3;
+ *
+ * @return Whether the endValueClosed field is set.
+ */
+ public boolean hasEndValueClosed() {
+ return endValueCase_ == 3;
+ }
/**
*
*
@@ -927,6 +1029,20 @@ public Builder clearEndValueClosed() {
return this;
}
+ /**
+ *
+ *
+ *
+ * Used when giving an exclusive upper bound for the range.
+ *
+ *
+ * bytes end_value_open = 4;
+ *
+ * @return Whether the endValueOpen field is set.
+ */
+ public boolean hasEndValueOpen() {
+ return endValueCase_ == 4;
+ }
/**
*
*
diff --git a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ValueRangeOrBuilder.java b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ValueRangeOrBuilder.java
index f3b39c83dd..dbd31d63bd 100644
--- a/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ValueRangeOrBuilder.java
+++ b/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ValueRangeOrBuilder.java
@@ -23,6 +23,18 @@ public interface ValueRangeOrBuilder
// @@protoc_insertion_point(interface_extends:google.bigtable.v2.ValueRange)
com.google.protobuf.MessageOrBuilder {
+ /**
+ *
+ *
+ *
+ * Used when giving an inclusive lower bound for the range.
+ *
+ *
+ * bytes start_value_closed = 1;
+ *
+ * @return Whether the startValueClosed field is set.
+ */
+ boolean hasStartValueClosed();
/**
*
*
@@ -36,6 +48,18 @@ public interface ValueRangeOrBuilder
*/
com.google.protobuf.ByteString getStartValueClosed();
+ /**
+ *
+ *
+ *
+ * Used when giving an exclusive lower bound for the range.
+ *
+ *
+ * bytes start_value_open = 2;
+ *
+ * @return Whether the startValueOpen field is set.
+ */
+ boolean hasStartValueOpen();
/**
*
*
@@ -49,6 +73,18 @@ public interface ValueRangeOrBuilder
*/
com.google.protobuf.ByteString getStartValueOpen();
+ /**
+ *
+ *
+ *
+ * Used when giving an inclusive upper bound for the range.
+ *
+ *
+ * bytes end_value_closed = 3;
+ *
+ * @return Whether the endValueClosed field is set.
+ */
+ boolean hasEndValueClosed();
/**
*
*
@@ -62,6 +98,18 @@ public interface ValueRangeOrBuilder
*/
com.google.protobuf.ByteString getEndValueClosed();
+ /**
+ *
+ *
+ *
+ * Used when giving an exclusive upper bound for the range.
+ *
+ *
+ * bytes end_value_open = 4;
+ *
+ * @return Whether the endValueOpen field is set.
+ */
+ boolean hasEndValueOpen();
/**
*
*
diff --git a/synth.metadata b/synth.metadata
index ee651c1635..774154bb0d 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,15 +4,15 @@
"git": {
"name": ".",
"remote": "https://github.com/googleapis/java-bigtable.git",
- "sha": "60d17dc1d0a0a568a8bdd3bcc1e7491c17142af3"
+ "sha": "71a8fd7fe55bd40ad32963ffdfc06999be2ff7fc"
}
},
{
"git": {
"name": "googleapis",
"remote": "https://github.com/googleapis/googleapis.git",
- "sha": "eabec5a21219401bad79e1cc7d900c1658aee5fd",
- "internalRef": "359130387"
+ "sha": "f6dd7e47620566925a4b3f1ce029e74e1b2f2516",
+ "internalRef": "359781040"
}
},
{