ARROW-304: NullableMapReaderImpl.isSet() always returns true

Author: julienledem

java/vector/src/main/java/org/apache/arrow/vector/complex/impl/NullableMapReaderImpl.java

@@ -42,4 +42,9 @@ public void copyAsField(String name, MapWriter writer){
     NullableMapWriter impl = (NullableMapWriter) writer.map(name);
     impl.container.copyFromSafe(idx(), impl.idx(), nullableMapVector);
   }
+
+  @Override
+  public boolean isSet(){
+    return !nullableMapVector.getAccessor().isNull(idx());
+  }
 }

java/vector/src/main/java/org/apache/arrow/vector/complex/impl/UnionListReader.java

@@ -41,7 +41,7 @@ public UnionListReader(ListVector vector) {
 
   @Override
   public boolean isSet() {
-    return true;
+    return !vector.getAccessor().isNull(idx());
   }
 
   private int currentOffset;

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

@@ -17,6 +17,14 @@
  */
 package org.apache.arrow.vector.complex.writer;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.List;
+
 import org.apache.arrow.memory.BufferAllocator;
 import org.apache.arrow.memory.RootAllocator;
 import org.apache.arrow.vector.complex.ListVector;
@@ -91,11 +99,14 @@ public void nullableMap() {
     MapReader rootReader = new SingleMapReaderImpl(parent).reader("root");
     for (int i = 0; i < COUNT; i++) {
       rootReader.setPosition(i);
+      FieldReader map = rootReader.reader("map");
       if (i % 2 == 0) {
-        Assert.assertNotNull(rootReader.reader("map").readObject());
-        Assert.assertEquals(i, rootReader.reader("map").reader("nested").readLong().longValue());
+        assertTrue("index is set: " + i, map.isSet());
+        assertNotNull("index is set: " + i, map.readObject());
+        assertEquals(i, map.reader("nested").readLong().longValue());
       } else {
-        Assert.assertNull(rootReader.reader("map").readObject());
+        assertFalse("index is not set: " + i, map.isSet());
+        assertNull("index is not set: " + i, map.readObject());
       }
     }
 
@@ -121,11 +132,39 @@ public void listScalarType() {
       listReader.setPosition(i);
       for (int j = 0; j < i % 7; j++) {
         listReader.next();
-        Assert.assertEquals(j, listReader.reader().readInteger().intValue());
+        assertEquals(j, listReader.reader().readInteger().intValue());
       }
     }
   }
 
+  @Test
+  public void listScalarTypeNullable() {
+    ListVector listVector = new ListVector("list", allocator, null);
+    listVector.allocateNew();
+    UnionListWriter listWriter = new UnionListWriter(listVector);
+    for (int i = 0; i < COUNT; i++) {
+      if (i % 2 == 0) {
+        listWriter.setPosition(i);
+        listWriter.startList();
+        for (int j = 0; j < i % 7; j++) {
+          listWriter.writeInt(j);
+        }
+        listWriter.endList();
+      }
+    }
+    listWriter.setValueCount(COUNT);
+    UnionListReader listReader = new UnionListReader(listVector);
+    for (int i = 0; i < COUNT; i++) {
+      listReader.setPosition(i);
+      if (i % 2 == 0) {
+        assertTrue("index is set: " + i, listReader.isSet());
+        assertEquals("correct length at: " + i, i % 7, ((List<?>)listReader.readObject()).size());
+      } else {
+        assertFalse("index is not set: " + i, listReader.isSet());
+        assertNull("index is not set: " + i, listReader.readObject());
+      }
+    }
+  }
 
   @Test
   public void listMapType() {