Skip to content

Commit 7e20f79

Browse files
committed
remove CompareUtility
1 parent a5d22fd commit 7e20f79

File tree

10 files changed

+131
-293
lines changed

10 files changed

+131
-293
lines changed

java/vector/src/main/codegen/templates/UnionVector.java

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import io.netty.buffer.ArrowBuf;
1919
import org.apache.arrow.memory.BufferAllocator;
2020
import org.apache.arrow.memory.ReferenceManager;
21+
import org.apache.arrow.util.Preconditions;
2122
import org.apache.arrow.vector.ValueVector;
2223
import org.apache.arrow.vector.types.UnionMode;
2324
import org.apache.arrow.vector.compare.RangeEqualsVisitor;
@@ -37,7 +38,6 @@
3738
import java.util.ArrayList;
3839
import java.util.Collections;
3940
import java.util.Iterator;
40-
import org.apache.arrow.vector.compare.CompareUtility;
4141
import org.apache.arrow.vector.compare.RangeEqualsVisitor;
4242
import org.apache.arrow.vector.complex.impl.ComplexCopier;
4343
import org.apache.arrow.vector.util.CallBack;
@@ -668,20 +668,13 @@ public boolean equals(int index, ValueVector to, int toIndex) {
668668
if (to == null) {
669669
return false;
670670
}
671-
if (!this.getField().getType().equals(to.getField().getType())) {
672-
return false;
673-
}
674-
CompareUtility.checkIndices(this, index, to, toIndex);
671+
Preconditions.checkArgument(index >= 0 && index < valueCount,
672+
"index %s out of range[0, %s]:", index, valueCount - 1);
673+
Preconditions.checkArgument(toIndex >= 0 && toIndex < to.getValueCount(),
674+
"index %s out of range[0, %s]:", index, to.getValueCount() - 1);
675675

676-
UnionVector that = (UnionVector) to;
677-
ValueVector leftVector = getVector(index);
678-
ValueVector rightVector = that.getVector(toIndex);
679-
680-
if (leftVector == null) {
681-
return rightVector == null;
682-
} else {
683-
return leftVector.equals(index, rightVector, toIndex);
684-
}
676+
RangeEqualsVisitor visitor = new RangeEqualsVisitor(to, index, toIndex, 1);
677+
return this.accept(visitor);
685678
}
686679

687680
@Override

java/vector/src/main/java/org/apache/arrow/vector/BaseFixedWidthVector.java

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import org.apache.arrow.memory.util.ArrowBufPointer;
2727
import org.apache.arrow.memory.util.ByteFunctionHelpers;
2828
import org.apache.arrow.util.Preconditions;
29-
import org.apache.arrow.vector.compare.CompareUtility;
3029
import org.apache.arrow.vector.compare.RangeEqualsVisitor;
3130
import org.apache.arrow.vector.ipc.message.ArrowFieldNode;
3231
import org.apache.arrow.vector.types.pojo.Field;
@@ -877,15 +876,13 @@ public boolean equals(int index, ValueVector to, int toIndex) {
877876
return false;
878877
}
879878

880-
if (!this.getField().getType().equals(to.getField().getType())) {
881-
return false;
882-
}
883-
884-
CompareUtility.checkIndices(this, index, to, toIndex);
885-
886-
BaseFixedWidthVector that = (BaseFixedWidthVector) to;
879+
Preconditions.checkArgument(index >= 0 && index < valueCount,
880+
"index %s out of range[0, %s]:", index, valueCount - 1);
881+
Preconditions.checkArgument(toIndex >= 0 && toIndex < to.getValueCount(),
882+
"index %s out of range[0, %s]:", index, to.getValueCount() - 1);
887883

888-
return CompareUtility.compare(this, index, that, toIndex);
884+
RangeEqualsVisitor visitor = new RangeEqualsVisitor(to, index, toIndex, 1);
885+
return this.accept(visitor);
889886
}
890887

891888
@Override

java/vector/src/main/java/org/apache/arrow/vector/BaseVariableWidthVector.java

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import org.apache.arrow.memory.util.ArrowBufPointer;
2929
import org.apache.arrow.memory.util.ByteFunctionHelpers;
3030
import org.apache.arrow.util.Preconditions;
31-
import org.apache.arrow.vector.compare.CompareUtility;
3231
import org.apache.arrow.vector.compare.RangeEqualsVisitor;
3332
import org.apache.arrow.vector.ipc.message.ArrowFieldNode;
3433
import org.apache.arrow.vector.types.pojo.Field;
@@ -1371,15 +1370,13 @@ public boolean equals(int index, ValueVector to, int toIndex) {
13711370
if (to == null) {
13721371
return false;
13731372
}
1374-
if (!this.getField().getType().equals(to.getField().getType())) {
1375-
return false;
1376-
}
1377-
1378-
CompareUtility.checkIndices(this, index, to, toIndex);
1379-
1380-
BaseVariableWidthVector that = (BaseVariableWidthVector) to;
1373+
Preconditions.checkArgument(index >= 0 && index < valueCount,
1374+
"index %s out of range[0, %s]:", index, valueCount - 1);
1375+
Preconditions.checkArgument(toIndex >= 0 && toIndex < to.getValueCount(),
1376+
"index %s out of range[0, %s]:", index, to.getValueCount() - 1);
13811377

1382-
return CompareUtility.compare(this, index, that, toIndex);
1378+
RangeEqualsVisitor visitor = new RangeEqualsVisitor(to, index, toIndex, 1);
1379+
return this.accept(visitor);
13831380
}
13841381

13851382
@Override

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

Lines changed: 0 additions & 227 deletions
This file was deleted.

0 commit comments

Comments
 (0)