Skip to content

fix(spanner): compare null elements in primitive-array Value.equals #13826

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
fornwall wants to merge 1 commit into
base: main
Choose a base branch
from
+30 −5
Open

fix(spanner): compare null elements in primitive-array Value.equals #13826

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
20 changes: 15 additions & 5 deletions java-spanner/google-cloud-spanner/src/main/java/com/google/cloud/spanner/Value.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2551,6 +2551,16 @@ void valueToString(StringBuilder b) {
b.append(LIST_CLOSE);
}

@Override
boolean valueEquals(Value v) {
// Null elements are stored as the primitive default in the backing array, so the null
// bitmasks must be compared in addition to the backing arrays.
PrimitiveArrayImpl<?> that = (PrimitiveArrayImpl<?>) v;
return Objects.equals(nulls, that.nulls) && arrayEquals(v);
}

abstract boolean arrayEquals(Value v);

@Override
int valueHash() {
return 31 * Objects.hashCode(nulls) + arrayHash();
Expand Down Expand Up @@ -2586,7 +2596,7 @@ public List<Boolean> getBoolArray() {
}

@Override
boolean valueEquals(Value v) {
boolean arrayEquals(Value v) {
BoolArrayImpl that = (BoolArrayImpl) v;
return Arrays.equals(values, that.values);
}
Expand Down Expand Up @@ -2644,7 +2654,7 @@ public <T extends ProtocolMessageEnum> List<T> getProtoEnumArray(
}

@Override
boolean valueEquals(Value v) {
boolean arrayEquals(Value v) {
Int64ArrayImpl that = (Int64ArrayImpl) v;
return Arrays.equals(values, that.values);
}
Expand Down Expand Up @@ -2686,7 +2696,7 @@ public List<Float> getFloat32Array() {
}

@Override
boolean valueEquals(Value v) {
boolean arrayEquals(Value v) {
Float32ArrayImpl that = (Float32ArrayImpl) v;
return Arrays.equals(values, that.values);
}
Expand Down Expand Up @@ -2726,7 +2736,7 @@ public List<Double> getFloat64Array() {
}

@Override
boolean valueEquals(Value v) {
boolean arrayEquals(Value v) {
Float64ArrayImpl that = (Float64ArrayImpl) v;
return Arrays.equals(values, that.values);
}
Expand Down Expand Up @@ -2883,7 +2893,7 @@ public List<Long> getInt64Array() {
}

@Override
boolean valueEquals(Value v) {
boolean arrayEquals(Value v) {
PgOidArrayImpl that = (PgOidArrayImpl) v;
return Arrays.equals(values, that.values);
}
Expand Down
15 changes: 15 additions & 0 deletions java-spanner/google-cloud-spanner/src/test/java/com/google/cloud/spanner/ValueTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2347,6 +2347,8 @@ public void testEqualsHashCode() {
Value.boolArray(new boolean[] {true, false, true, false}, 1, 2),
Value.boolArray(plainIterable(false, true)));
tester.addEqualityGroup(Value.boolArray(Collections.singletonList(false)));
tester.addEqualityGroup(
Value.boolArray(Arrays.asList(null, true)), Value.boolArray(Arrays.asList(null, true)));
tester.addEqualityGroup(Value.boolArray((Iterable<Boolean>) null));

tester.addEqualityGroup(
Expand All @@ -2355,6 +2357,9 @@ public void testEqualsHashCode() {
Value.int64Array(new long[] {0L, 1L, 2L, 3L}, 1, 2),
Value.int64Array(plainIterable(1L, 2L)));
tester.addEqualityGroup(Value.int64Array(Collections.singletonList(3L)));
tester.addEqualityGroup(
Value.int64Array(Arrays.asList(null, 2L)), Value.int64Array(Arrays.asList(null, 2L)));
tester.addEqualityGroup(Value.int64Array(Arrays.asList(0L, 2L)));
tester.addEqualityGroup(Value.int64Array((Iterable<Long>) null));

tester.addEqualityGroup(
Expand All @@ -2363,6 +2368,9 @@ public void testEqualsHashCode() {
Value.float32Array(new float[] {.0f, .1f, .2f, .3f}, 1, 2),
Value.float32Array(plainIterable(.1f, .2f)));
tester.addEqualityGroup(Value.float32Array(Collections.singletonList(.3f)));
tester.addEqualityGroup(
Value.float32Array(Arrays.asList(null, .2f)), Value.float32Array(Arrays.asList(null, .2f)));
tester.addEqualityGroup(Value.float32Array(Arrays.asList(.0f, .2f)));
tester.addEqualityGroup(Value.float32Array((Iterable<Float>) null));

tester.addEqualityGroup(
Expand All @@ -2371,6 +2379,9 @@ public void testEqualsHashCode() {
Value.float64Array(new double[] {.0, .1, .2, .3}, 1, 2),
Value.float64Array(plainIterable(.1, .2)));
tester.addEqualityGroup(Value.float64Array(Collections.singletonList(.3)));
tester.addEqualityGroup(
Value.float64Array(Arrays.asList(null, .2)), Value.float64Array(Arrays.asList(null, .2)));
tester.addEqualityGroup(Value.float64Array(Arrays.asList(.0, .2)));
tester.addEqualityGroup(Value.float64Array((Iterable<Double>) null));

tester.addEqualityGroup(
Expand All @@ -2392,6 +2403,10 @@ public void testEqualsHashCode() {
Value.pgOidArray(plainIterable(1L, 2L)));
tester.addEqualityGroup(Value.pgOidArray(Collections.singletonList(3L)));
tester.addEqualityGroup(Value.pgOidArray(Collections.singletonList(null)));
tester.addEqualityGroup(Value.pgOidArray(Collections.singletonList(0L)));
tester.addEqualityGroup(
Value.pgOidArray(Arrays.asList(null, 2L)), Value.pgOidArray(Arrays.asList(null, 2L)));
tester.addEqualityGroup(Value.pgOidArray(Arrays.asList(0L, 2L)));
tester.addEqualityGroup(Value.pgOidArray((Iterable<Long>) null));

tester.addEqualityGroup(
Expand Down
Loading