Skip to content

Commit c008289

Browse files
committed
[ARROW-6738][Java] Resolve test failure after rebasing
1 parent c515393 commit c008289

File tree

2 files changed

+7
-14
lines changed

2 files changed

+7
-14
lines changed

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,10 @@ public Boolean visit(BaseFixedWidthVector left, Range range) {
109109
}
110110

111111
@Override
112-
protected ApproxEqualsVisitor createInnerVisitor(ValueVector left, ValueVector right) {
113-
return new ApproxEqualsVisitor(left, right, floatDiffFunction.clone(), doubleDiffFunction.clone());
112+
protected ApproxEqualsVisitor createInnerVisitor(
113+
ValueVector left, ValueVector right,
114+
BiFunction<ValueVector, ValueVector, Boolean> typeComparator) {
115+
return new ApproxEqualsVisitor(left, right, floatDiffFunction.clone(), doubleDiffFunction.clone(), typeComparator);
114116
}
115117

116118
private boolean float4ApproxEquals(Range range) {

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

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -185,15 +185,6 @@ public Boolean visit(NullVector left, Range range) {
185185
return true;
186186
}
187187

188-
/**
189-
* Creates a visitor to visit child vectors.
190-
* It is used for complex vector types.
191-
* @return the visitor for child vectors.
192-
*/
193-
protected RangeEqualsVisitor createInnerVisitor(ValueVector leftInner, ValueVector rightInner) {
194-
return this.createInnerVisitor(leftInner, rightInner, this.typeComparator);
195-
}
196-
197188
protected RangeEqualsVisitor createInnerVisitor(
198189
ValueVector leftInner, ValueVector rightInner,
199190
BiFunction<ValueVector, ValueVector, Boolean> typeComparator) {
@@ -237,7 +228,7 @@ protected boolean compareStructVectors(Range range) {
237228
}
238229

239230
for (String name : leftChildNames) {
240-
RangeEqualsVisitor visitor = createInnerVisitor(leftVector.getChild(name), rightVector.getChild(name));
231+
RangeEqualsVisitor visitor = createInnerVisitor(leftVector.getChild(name), rightVector.getChild(name), null);
241232
if (!visitor.rangeEquals(range)) {
242233
return false;
243234
}
@@ -316,7 +307,7 @@ protected boolean compareListVectors(Range range) {
316307
ListVector leftVector = (ListVector) left;
317308
ListVector rightVector = (ListVector) right;
318309

319-
RangeEqualsVisitor innerVisitor = createInnerVisitor(leftVector.getDataVector(), rightVector.getDataVector());
310+
RangeEqualsVisitor innerVisitor = createInnerVisitor(leftVector.getDataVector(), rightVector.getDataVector(), null);
320311
Range innerRange = new Range();
321312

322313
for (int i = 0; i < range.getLength(); i++) {
@@ -362,7 +353,7 @@ protected boolean compareFixedSizeListVectors(Range range) {
362353
}
363354

364355
int listSize = leftVector.getListSize();
365-
RangeEqualsVisitor innerVisitor = createInnerVisitor(leftVector.getDataVector(), rightVector.getDataVector());
356+
RangeEqualsVisitor innerVisitor = createInnerVisitor(leftVector.getDataVector(), rightVector.getDataVector(), null);
366357
Range innerRange = new Range(0, 0, listSize);
367358

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

0 commit comments

Comments
 (0)