Fix rebase issues

Author: jhrotko

vector/src/main/java/org/apache/arrow/vector/holders/NullableUuidHolder.java

@@ -16,9 +16,9 @@
  */
 package org.apache.arrow.vector.holders;
 
+import org.apache.arrow.memory.ArrowBuf;
 import org.apache.arrow.vector.extension.UuidType;
 import org.apache.arrow.vector.types.pojo.ArrowType;
-import org.apache.arrow.memory.ArrowBuf;
 
 /**
  * Value holder for nullable UUID values.
@@ -34,6 +34,7 @@
 public class NullableUuidHolder extends ExtensionHolder {
   /** Buffer containing 16-byte UUID data. */
   public ArrowBuf buffer;
+
   /** Offset in the buffer where the UUID data starts. */
   public int start = 0;
 

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

@@ -37,7 +37,7 @@
 import org.apache.arrow.vector.complex.reader.FieldReader;
 import org.apache.arrow.vector.complex.writer.BaseWriter.ExtensionWriter;
 import org.apache.arrow.vector.extension.UuidType;
-import org.apache.arrow.vector.holders.UuidHolder;
+import org.apache.arrow.vector.holders.NullableUuidHolder;
 import org.apache.arrow.vector.types.Types.MinorType;
 import org.apache.arrow.vector.types.pojo.ArrowType;
 import org.apache.arrow.vector.types.pojo.Field;
@@ -1071,14 +1071,14 @@ public void testCopyValueSafeForExtensionType() throws Exception {
       assertTrue(reader.isSet(), "first list shouldn't be null");
       reader.next();
       FieldReader uuidReader = reader.reader();
-      UuidHolder holder = new UuidHolder();
+      NullableUuidHolder holder = new NullableUuidHolder();
       uuidReader.read(holder);
-      UUID actualUuid = UuidUtility.uuidFromArrowBuf(holder.buffer, 0);
+      UUID actualUuid = UuidUtility.uuidFromArrowBuf(holder.buffer, holder.start);
       assertEquals(u1, actualUuid);
       reader.next();
       uuidReader = reader.reader();
       uuidReader.read(holder);
-      actualUuid = UuidUtility.uuidFromArrowBuf(holder.buffer, 0);
+      actualUuid = UuidUtility.uuidFromArrowBuf(holder.buffer, holder.start);
       assertEquals(u2, actualUuid);
 
       // Verify second list
@@ -1087,12 +1087,12 @@ public void testCopyValueSafeForExtensionType() throws Exception {
       reader.next();
       uuidReader = reader.reader();
       uuidReader.read(holder);
-      actualUuid = UuidUtility.uuidFromArrowBuf(holder.buffer, 0);
+      actualUuid = UuidUtility.uuidFromArrowBuf(holder.buffer, holder.start);
       assertEquals(u3, actualUuid);
       reader.next();
       uuidReader = reader.reader();
       uuidReader.read(holder);
-      actualUuid = UuidUtility.uuidFromArrowBuf(holder.buffer, 0);
+      actualUuid = UuidUtility.uuidFromArrowBuf(holder.buffer, holder.start);
       assertEquals(u4, actualUuid);
       reader.next();
       uuidReader = reader.reader();

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

@@ -1350,14 +1350,14 @@ public void testCopyValueSafeForExtensionType() throws Exception {
       assertTrue(reader.isSet(), "first list shouldn't be null");
       reader.next();
       FieldReader uuidReader = reader.reader();
-      UuidHolder holder = new UuidHolder();
+      NullableUuidHolder holder = new NullableUuidHolder();
       uuidReader.read(holder);
-      UUID actualUuid = UuidUtility.uuidFromArrowBuf(holder.buffer, 0);
+      UUID actualUuid = UuidUtility.uuidFromArrowBuf(holder.buffer, holder.start);
       assertEquals(u1, actualUuid);
       reader.next();
       uuidReader = reader.reader();
       uuidReader.read(holder);
-      actualUuid = UuidUtility.uuidFromArrowBuf(holder.buffer, 0);
+      actualUuid = UuidUtility.uuidFromArrowBuf(holder.buffer, holder.start);
       assertEquals(u2, actualUuid);
 
       // Verify second list
@@ -1366,12 +1366,12 @@ public void testCopyValueSafeForExtensionType() throws Exception {
       reader.next();
       uuidReader = reader.reader();
       uuidReader.read(holder);
-      actualUuid = UuidUtility.uuidFromArrowBuf(holder.buffer, 0);
+      actualUuid = UuidUtility.uuidFromArrowBuf(holder.buffer, holder.start);
       assertEquals(u3, actualUuid);
       reader.next();
       uuidReader = reader.reader();
       uuidReader.read(holder);
-      actualUuid = UuidUtility.uuidFromArrowBuf(holder.buffer, 0);
+      actualUuid = UuidUtility.uuidFromArrowBuf(holder.buffer, holder.start);
       assertEquals(u4, actualUuid);
       reader.next();
       uuidReader = reader.reader();

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

@@ -1626,9 +1626,9 @@ public void testMapWithUuidKeyAndListUuidValue() throws Exception {
       // Read first entry
       mapReader.next();
       FieldReader keyReader = mapReader.key();
-      UuidHolder keyHolder = new UuidHolder();
+      NullableUuidHolder keyHolder = new NullableUuidHolder();
       keyReader.read(keyHolder);
-      UUID actualKey = UuidUtility.uuidFromArrowBuf(keyHolder.buffer, 0);
+      UUID actualKey = UuidUtility.uuidFromArrowBuf(keyHolder.buffer, keyHolder.start);
       assertEquals(key1, actualKey);
 
       FieldReader valueReader = mapReader.value();
@@ -1648,7 +1648,7 @@ public void testMapWithUuidKeyAndListUuidValue() throws Exception {
       mapReader.next();
       keyReader = mapReader.key();
       keyReader.read(keyHolder);
-      actualKey = UuidUtility.uuidFromArrowBuf(keyHolder.buffer, 0);
+      actualKey = UuidUtility.uuidFromArrowBuf(keyHolder.buffer, keyHolder.start);
       assertEquals(key2, actualKey);
 
       valueReader = mapReader.value();

vector/src/test/java/org/apache/arrow/vector/complex/writer/TestComplexWriter.java

@@ -88,6 +88,7 @@
 import org.apache.arrow.vector.holders.NullableTimeStampNanoTZHolder;
 import org.apache.arrow.vector.holders.NullableUuidHolder;
 import org.apache.arrow.vector.holders.TimeStampMilliTZHolder;
+import org.apache.arrow.vector.holders.UuidHolder;
 import org.apache.arrow.vector.types.TimeUnit;
 import org.apache.arrow.vector.types.Types.MinorType;
 import org.apache.arrow.vector.types.pojo.ArrowType;
@@ -1168,7 +1169,7 @@ public void simpleUnion() throws Exception {
       } else if (i % 5 == 4) {
         NullableUuidHolder holder = new NullableUuidHolder();
         unionReader.read(holder);
-        assertEquals(UuidUtility.uuidFromArrowBuf(holder.buffer, 0), uuid);
+        assertEquals(UuidUtility.uuidFromArrowBuf(holder.buffer, holder.start), uuid);
       } else {
         assertEquals((float) i, unionReader.readFloat(), 1e-12);
       }