From c472fd4bb745a86f3ab4b3f5de6f6be55c2e53c3 Mon Sep 17 00:00:00 2001 From: Igor Bernstein Date: Tue, 27 Oct 2026 17:51:25 -0400 Subject: [PATCH] fix(bigtable): include reversed in Query equals, hashCode, and toString --- .../google/cloud/bigtable/data/v2/models/Query.java | 10 ++++++++-- .../cloud/bigtable/data/v2/models/QueryTest.java | 6 ++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/java-bigtable/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/Query.java b/java-bigtable/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/Query.java index ae5de38e5b08..d37712c682c2 100644 --- a/java-bigtable/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/Query.java +++ b/java-bigtable/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/models/Query.java @@ -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 @@ -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(); } } diff --git a/java-bigtable/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/models/QueryTest.java b/java-bigtable/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/models/QueryTest.java index 4a2bb337b6b2..1ed9ce1c59dd 100644 --- a/java-bigtable/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/models/QueryTest.java +++ b/java-bigtable/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/models/QueryTest.java @@ -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 = @@ -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)); }