refactor Dictionary#equals

Author: tianchen92

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

@@ -672,9 +672,10 @@ public boolean equals(int index, ValueVector to, int toIndex) {
       ValueVector leftVector = getVector(index);
       ValueVector rightVector = that.getVector(toIndex);
 
-      if (leftVector.getClass() != rightVector.getClass()) {
-        return false;
+      if (leftVector == null) {
+        return rightVector == null;
+      } else {
+        return leftVector.equals(index, rightVector, toIndex);
       }
-      return leftVector.equals(index, rightVector, toIndex);
     }
 }

java/vector/src/main/java/org/apache/arrow/vector/dictionary/Dictionary.java

@@ -22,7 +22,6 @@
 import org.apache.arrow.vector.FieldVector;
 import org.apache.arrow.vector.types.pojo.ArrowType;
 import org.apache.arrow.vector.types.pojo.DictionaryEncoding;
-import org.apache.arrow.vector.util.Validator;
 
 /**
  * A dictionary (integer to Value mapping) that is used to facilitate
@@ -64,21 +63,11 @@ public boolean equals(Object o) {
       return false;
     }
     Dictionary that = (Dictionary) o;
-    return Objects.equals(encoding, that.encoding) && compareFieldVector(dictionary, that.dictionary);
+    return Objects.equals(encoding, that.encoding) && dictionary.equals(that.dictionary);
   }
 
   @Override
   public int hashCode() {
     return Objects.hash(encoding, dictionary);
   }
-
-  //TODO after vector api support compare two vectors, this should be cleaned up
-  private boolean compareFieldVector(FieldVector vector1, FieldVector vector2) {
-    try {
-      Validator.compareFieldVectors(vector1, vector2);
-    } catch (IllegalArgumentException e) {
-      return false;
-    }
-    return true;
-  }
 }

java/vector/src/test/java/org/apache/arrow/vector/TestDictionaryVector.java

@@ -398,8 +398,8 @@ public void testEncodeUnion() {
   @Test
   public void testIntEquals() {
     //test Int
-    try (final IntVector vector1 = new IntVector("", allocator);
-        final IntVector vector2 = new IntVector("", allocator)) {
+    try (final IntVector vector1 = new IntVector("v1", allocator);
+        final IntVector vector2 = new IntVector("v2", allocator)) {
 
       Dictionary dict1 = new Dictionary(vector1, new DictionaryEncoding(1L, false, null));
       Dictionary dict2 = new Dictionary(vector2, new DictionaryEncoding(1L, false, null));
@@ -426,8 +426,8 @@ public void testIntEquals() {
 
   @Test
   public void testVarcharEquals() {
-    try (final VarCharVector vector1 = new VarCharVector("", allocator);
-        final VarCharVector vector2 = new VarCharVector("", allocator)) {
+    try (final VarCharVector vector1 = new VarCharVector("v1", allocator);
+        final VarCharVector vector2 = new VarCharVector("v2", allocator)) {
 
       Dictionary dict1 = new Dictionary(vector1, new DictionaryEncoding(1L, false, null));
       Dictionary dict2 = new Dictionary(vector2, new DictionaryEncoding(1L, false, null));
@@ -455,8 +455,8 @@ public void testVarcharEquals() {
 
   @Test
   public void testVarBinaryEquals() {
-    try (final VarBinaryVector vector1 = new VarBinaryVector("", allocator);
-        final VarBinaryVector vector2 = new VarBinaryVector("", allocator)) {
+    try (final VarBinaryVector vector1 = new VarBinaryVector("v1", allocator);
+        final VarBinaryVector vector2 = new VarBinaryVector("v2", allocator)) {
 
       Dictionary dict1 = new Dictionary(vector1, new DictionaryEncoding(1L, false, null));
       Dictionary dict2 = new Dictionary(vector2, new DictionaryEncoding(1L, false, null));
@@ -484,8 +484,8 @@ public void testVarBinaryEquals() {
 
   @Test
   public void testListEquals() {
-    try (final ListVector vector1 = ListVector.empty("", allocator);
-        final ListVector vector2 = ListVector.empty("", allocator);) {
+    try (final ListVector vector1 = ListVector.empty("v1", allocator);
+        final ListVector vector2 = ListVector.empty("v2", allocator);) {
 
       Dictionary dict1 = new Dictionary(vector1, new DictionaryEncoding(1L, false, null));
       Dictionary dict2 = new Dictionary(vector2, new DictionaryEncoding(1L, false, null));
@@ -514,8 +514,8 @@ public void testListEquals() {
 
   @Test
   public void testStructEquals() {
-    try (final StructVector vector1 = StructVector.empty("", allocator);
-        final StructVector vector2 = StructVector.empty("", allocator);) {
+    try (final StructVector vector1 = StructVector.empty("v1", allocator);
+        final StructVector vector2 = StructVector.empty("v2", allocator);) {
       vector1.addOrGet("f0", FieldType.nullable(new ArrowType.Int(32, true)), IntVector.class);
       vector1.addOrGet("f1", FieldType.nullable(new ArrowType.Int(64, true)), BigIntVector.class);
       vector2.addOrGet("f0", FieldType.nullable(new ArrowType.Int(32, true)), IntVector.class);
@@ -544,8 +544,8 @@ public void testStructEquals() {
 
   @Test
   public void testUnionEquals() {
-    try (final UnionVector vector1 = new UnionVector("", allocator, null);
-        final UnionVector vector2 = new UnionVector("", allocator, null);) {
+    try (final UnionVector vector1 = new UnionVector("v1", allocator, null);
+        final UnionVector vector2 = new UnionVector("v2", allocator, null);) {
 
       final NullableUInt4Holder uInt4Holder = new NullableUInt4Holder();
       uInt4Holder.value = 10;