Skip to content

Commit 4ca596c

Browse files
committed
Merge pull request #1476 from dhermes/bigtable-update-generated
Updating Bigtable generated files.
2 parents 09c3c98 + 3252643 commit 4ca596c

8 files changed

+357
-72
lines changed

gcloud/bigtable/_generated/_bigtable_cluster_data.proto

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,6 @@ message Cluster {
6262
// projects/<project>/zones/<zone>/clusters/[a-z][-a-z0-9]*
6363
string name = 1;
6464

65-
// If this cluster has been deleted, the time at which its backup will
66-
// be irrevocably destroyed. Omitted otherwise.
67-
// This cannot be set directly, only through DeleteCluster.
68-
google.protobuf.Timestamp delete_time = 2;
69-
7065
// The operation currently running on the cluster, if any.
7166
// This cannot be set directly, only through CreateCluster, UpdateCluster,
7267
// or UndeleteCluster. Calls to these methods will be rejected if
@@ -91,4 +86,8 @@ enum StorageType {
9186

9287
// Data will be stored in SSD, providing low and consistent latencies.
9388
STORAGE_SSD = 1;
89+
90+
// Data will be stored in HDD, providing high and less predictable
91+
// latencies.
92+
STORAGE_HDD = 2;
9493
}

gcloud/bigtable/_generated/_bigtable_data.proto

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,15 @@ message RowRange {
8989
bytes end_key = 3;
9090
}
9191

92+
// Specifies a non-contiguous set of rows.
93+
message RowSet {
94+
// Single rows included in the set.
95+
repeated bytes row_keys = 1;
96+
97+
// Contiguous row ranges included in the set.
98+
repeated RowRange row_ranges = 2;
99+
}
100+
92101
// Specifies a contiguous range of columns within a single column family.
93102
// The range spans from <column_family>:<start_qualifier> to
94103
// <column_family>:<end_qualifier>, where both bounds can be either inclusive or
@@ -374,15 +383,21 @@ message RowFilter {
374383
ValueRange value_range_filter = 15;
375384

376385
// Skips the first N cells of each row, matching all subsequent cells.
386+
// If duplicate cells are present, as is possible when using an Interleave,
387+
// each copy of the cell is counted separately.
377388
int32 cells_per_row_offset_filter = 10;
378389

379390
// Matches only the first N cells of each row.
391+
// If duplicate cells are present, as is possible when using an Interleave,
392+
// each copy of the cell is counted separately.
380393
int32 cells_per_row_limit_filter = 11;
381394

382395
// Matches only the most recent N cells within each column. For example,
383396
// if N=2, this filter would match column "foo:bar" at timestamps 10 and 9,
384397
// skip all earlier cells in "foo:bar", and then begin matching again in
385398
// column "foo:bar2".
399+
// If duplicate cells are present, as is possible when using an Interleave,
400+
// each copy of the cell is counted separately.
386401
int32 cells_per_column_limit_filter = 12;
387402

388403
// Replaces each cell's value with the empty string.

gcloud/bigtable/_generated/_bigtable_service.proto

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,13 @@ service BigtableService {
5151
option (google.api.http) = { post: "/v1/{table_name=projects/*/zones/*/clusters/*/tables/*}/rows/{row_key}:mutate" body: "*" };
5252
}
5353

54+
// Mutates multiple rows in a batch. Each individual row is mutated
55+
// atomically as in MutateRow, but the entire batch is not executed
56+
// atomically.
57+
rpc MutateRows(MutateRowsRequest) returns (MutateRowsResponse) {
58+
option (google.api.http) = { post: "/v1/{table_name=projects/*/zones/*/clusters/*/tables/*}:mutateRows" body: "*" };
59+
}
60+
5461
// Mutates a row atomically based on the output of a predicate Reader filter.
5562
rpc CheckAndMutateRow(CheckAndMutateRowRequest) returns (CheckAndMutateRowResponse) {
5663
option (google.api.http) = { post: "/v1/{table_name=projects/*/zones/*/clusters/*/tables/*}/rows/{row_key}:checkAndMutate" body: "*" };

gcloud/bigtable/_generated/_bigtable_service_messages.proto

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ syntax = "proto3";
1717
package google.bigtable.v1;
1818

1919
import "google/bigtable/v1/bigtable_data.proto";
20+
import "google/rpc/status.proto";
2021

2122
option java_multiple_files = true;
2223
option java_outer_classname = "BigtableServiceMessagesProto";
@@ -35,6 +36,11 @@ message ReadRowsRequest {
3536

3637
// A range of rows from which to read.
3738
RowRange row_range = 3;
39+
40+
// A set of rows from which to read. Entries need not be in order, and will
41+
// be deduplicated before reading.
42+
// The total serialized size of the set must not exceed 1MB.
43+
RowSet row_set = 8;
3844
}
3945

4046
// The filter to apply to the contents of the specified row(s). If unset,
@@ -124,6 +130,37 @@ message MutateRowRequest {
124130
repeated Mutation mutations = 3;
125131
}
126132

133+
// Request message for BigtableService.MutateRows.
134+
message MutateRowsRequest {
135+
message Entry {
136+
// The key of the row to which the `mutations` should be applied.
137+
bytes row_key = 1;
138+
139+
// Changes to be atomically applied to the specified row. Mutations are
140+
// applied in order, meaning that earlier mutations can be masked by
141+
// later ones.
142+
// At least one mutation must be specified.
143+
repeated Mutation mutations = 2;
144+
}
145+
146+
// The unique name of the table to which the mutations should be applied.
147+
string table_name = 1;
148+
149+
// The row keys/mutations to be applied in bulk.
150+
// Each entry is applied as an atomic mutation, but the entries may be
151+
// applied in arbitrary order (even between entries for the same row).
152+
// At least one entry must be specified, and in total the entries may
153+
// contain at most 100000 mutations.
154+
repeated Entry entries = 2;
155+
}
156+
157+
// Response message for BigtableService.MutateRows.
158+
message MutateRowsResponse {
159+
// The results for each Entry from the request, presented in the order
160+
// in which the entries were originally given.
161+
repeated google.rpc.Status statuses = 1;
162+
}
163+
127164
// Request message for BigtableService.CheckAndMutateRowRequest
128165
message CheckAndMutateRowRequest {
129166
// The unique name of the table to which the conditional mutation should be

gcloud/bigtable/_generated/bigtable_cluster_data_pb2.py

Lines changed: 13 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)