Skip to content

fix(bigtable): include reversed in Query equals, hashCode, and toString #14799

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

Open
igorbernstein2 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(bigtable): include reversed in Query equals, hashCode, and toString #14799

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
10 changes: 8 additions & 2 deletions ...e/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 @@ -491,13 +491,18 @@ public boolean equals(Object o) {
return Objects.equal(targetId, query.targetId)
&& Objects.equal(builder.getRows(), query.builder.getRows())
&& Objects.equal(builder.getFilter(), query.builder.getFilter())
&& Objects.equal(builder.getRowsLimit(), query.builder.getRowsLimit());
&& Objects.equal(builder.getRowsLimit(), query.builder.getRowsLimit())
&& Objects.equal(builder.getReversed(), query.builder.getReversed());
}

@Override
public int hashCode() {
return Objects.hashCode(
targetId, builder.getRows(), builder.getFilter(), builder.getRowsLimit());
targetId,
builder.getRows(),
builder.getFilter(),
builder.getRowsLimit(),
builder.getReversed());
}

@Override
Expand All @@ -510,6 +515,7 @@ public String toString() {
.add("ranges", request.getRows().getRowRangesList())
.add("filter", request.getFilter())
.add("limit", request.getRowsLimit())
.add("reversed", request.getReversed())
.toString();
}
}
6 changes: 6 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 @@ -554,6 +554,10 @@ public void testEquality() {
assertThat(Query.create(TABLE_ID).filter(FILTERS.family().regex("test")))
.isNotEqualTo(Query.create(TABLE_ID).filter(FILTERS.family().exactMatch("test-one")));
assertThat(Query.create(TABLE_ID).limit(4)).isNotEqualTo(Query.create(TABLE_ID).limit(5));
assertThat(Query.create(TABLE_ID).reversed(true))
.isNotEqualTo(Query.create(TABLE_ID).reversed(false));
assertThat(Query.create(TABLE_ID).reversed(true).hashCode())
.isNotEqualTo(Query.create(TABLE_ID).reversed(false).hashCode());

// AuthorizedView query test.
request =
Expand Down Expand Up @@ -582,6 +586,8 @@ public void testEquality() {
Query.create(AUTHORIZED_VIEW_ID).filter(FILTERS.family().exactMatch("test-one")));
assertThat(Query.create(AUTHORIZED_VIEW_ID).limit(4))
.isNotEqualTo(Query.create(AUTHORIZED_VIEW_ID).limit(5));
assertThat(Query.create(AUTHORIZED_VIEW_ID).reversed(true))
.isNotEqualTo(Query.create(AUTHORIZED_VIEW_ID).reversed(false));

assertThat(Query.create(AUTHORIZED_VIEW_ID)).isNotEqualTo(Query.create(TABLE_ID));
}
Expand Down
Loading