Skip to content
This repository was archived by the owner on Oct 21, 2024. It is now read-only.

Commit d6ef3d2

Browse files
committed
[ARROW-6738][Java] Refine test case
1 parent c008289 commit d6ef3d2

File tree

2 files changed

+19
-7
lines changed

2 files changed

+19
-7
lines changed

java/vector/src/main/java/org/apache/arrow/vector/compare/RangeEqualsVisitor.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,8 @@ protected boolean compareStructVectors(Range range) {
228228
}
229229

230230
for (String name : leftChildNames) {
231-
RangeEqualsVisitor visitor = createInnerVisitor(leftVector.getChild(name), rightVector.getChild(name), null);
231+
RangeEqualsVisitor visitor =
232+
createInnerVisitor(leftVector.getChild(name), rightVector.getChild(name), /*type comparator*/ null);
232233
if (!visitor.rangeEquals(range)) {
233234
return false;
234235
}
@@ -307,7 +308,8 @@ protected boolean compareListVectors(Range range) {
307308
ListVector leftVector = (ListVector) left;
308309
ListVector rightVector = (ListVector) right;
309310

310-
RangeEqualsVisitor innerVisitor = createInnerVisitor(leftVector.getDataVector(), rightVector.getDataVector(), null);
311+
RangeEqualsVisitor innerVisitor =
312+
createInnerVisitor(leftVector.getDataVector(), rightVector.getDataVector(), /*type comparator*/ null);
311313
Range innerRange = new Range();
312314

313315
for (int i = 0; i < range.getLength(); i++) {
@@ -353,7 +355,8 @@ protected boolean compareFixedSizeListVectors(Range range) {
353355
}
354356

355357
int listSize = leftVector.getListSize();
356-
RangeEqualsVisitor innerVisitor = createInnerVisitor(leftVector.getDataVector(), rightVector.getDataVector(), null);
358+
RangeEqualsVisitor innerVisitor =
359+
createInnerVisitor(leftVector.getDataVector(), rightVector.getDataVector(), /*type comparator*/ null);
357360
Range innerRange = new Range(0, 0, listSize);
358361

359362
for (int i = 0; i < range.getLength(); i++) {

java/vector/src/test/java/org/apache/arrow/vector/compare/TestRangeEqualsVisitor.java

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -296,8 +296,8 @@ public void testUnionVectorSubRangeEquals() {
296296
uInt4Holder.isSet = 1;
297297

298298
final NullableIntHolder intHolder = new NullableIntHolder();
299-
uInt4Holder.value = 20;
300-
uInt4Holder.isSet = 1;
299+
intHolder.value = 20;
300+
intHolder.isSet = 1;
301301

302302
vector1.setType(0, Types.MinorType.UINT4);
303303
vector1.setSafe(0, uInt4Holder);
@@ -307,7 +307,11 @@ public void testUnionVectorSubRangeEquals() {
307307

308308
vector1.setType(2, Types.MinorType.INT);
309309
vector1.setSafe(2, intHolder);
310-
vector1.setValueCount(3);
310+
311+
vector1.setType(3, Types.MinorType.INT);
312+
vector1.setSafe(3, intHolder);
313+
314+
vector1.setValueCount(4);
311315

312316
vector2.setType(0, Types.MinorType.UINT4);
313317
vector2.setSafe(0, uInt4Holder);
@@ -317,9 +321,14 @@ public void testUnionVectorSubRangeEquals() {
317321

318322
vector2.setType(2, Types.MinorType.INT);
319323
vector2.setSafe(2, intHolder);
320-
vector2.setValueCount(3);
324+
325+
vector2.setType(3, Types.MinorType.UINT4);
326+
vector2.setSafe(3, uInt4Holder);
327+
328+
vector2.setValueCount(4);
321329

322330
RangeEqualsVisitor visitor = new RangeEqualsVisitor(vector1, vector2);
331+
assertFalse(visitor.rangeEquals(new Range(0, 0, 4)));
323332
assertTrue(visitor.rangeEquals(new Range(1, 1, 2)));
324333
}
325334
}

0 commit comments

Comments
 (0)