Skip to content

Allow Bigtable Query to be copied #5551

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
rculbertson wants to merge 1 commit into from
Closed

Allow Bigtable Query to be copied #5551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions ...s/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/Query.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,19 +43,25 @@ public final class Query implements Serializable {
private static final long serialVersionUID = -316972783499434755L;

private final String tableId;
private transient ReadRowsRequest.Builder builder = ReadRowsRequest.newBuilder();
private transient ReadRowsRequest.Builder builder;

/**
* Constructs a new Query object for the specified table id. The table id will be combined with
* the instance name specified in the {@link
* com.google.cloud.bigtable.data.v2.BigtableDataSettings}.
*/
public static Query create(String tableId) {
return new Query(tableId);
return new Query(tableId, ReadRowsRequest.newBuilder());
}

private Query(String tableId) {
/** Constructs a new Query object copying the state of the specified Query. */
public static Query create(Query query) {
return new Query(query.tableId, query.builder);
}

private Query(String tableId, ReadRowsRequest.Builder builder) {
this.tableId = tableId;
this.builder = ReadRowsRequest.newBuilder(builder.buildPartial());
}

private void readObject(ObjectInputStream input) throws IOException, ClassNotFoundException {
Expand Down Expand Up @@ -229,7 +235,7 @@ public List<Query> shard(SortedSet<ByteString> splitPoints) {
List<Query> shards = Lists.newArrayListWithCapacity(shardedRowSets.size());

for (RowSet rowSet : shardedRowSets) {
Query queryShard = new Query(tableId);
Query queryShard = Query.create(tableId);
queryShard.builder.mergeFrom(this.builder.build());
queryShard.builder.setRows(rowSet);
shards.add(queryShard);
Expand Down Expand Up @@ -268,7 +274,7 @@ public ReadRowsRequest toProto(RequestContext requestContext) {
public static Query fromProto(@Nonnull ReadRowsRequest request) {
Preconditions.checkArgument(request != null, "ReadRowsRequest must not be null");

Query query = new Query(NameUtil.extractTableIdFromTableName(request.getTableName()));
Query query = Query.create(NameUtil.extractTableIdFromTableName(request.getTableName()));
query.builder = request.toBuilder();

return query;
Expand Down
7 changes: 7 additions & 0 deletions ...ogle-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/models/QueryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,13 @@ public void requestContextTest() {
assertThat(proto).isEqualTo(expectedProtoBuilder().build());
}

@Test
public void copyTest() {
Query original = Query.create(TABLE_ID).limit(1).range("a", "z");
Query copy = Query.create(original);
assertThat(copy).isEqualTo(original);
}

@Test
public void rowKeysTest() {
Query query =
Expand Down