Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
julienledem wants to merge 3 commits into from
Closed

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
af5d613
ARROW-304: NullableMapReaderImpl.isSet() always returns true
julienledem Sep 27, 2016
5a33785
review feedback
julienledem Sep 27, 2016
c06e048
review feedback
julienledem Sep 27, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions java/vector/src/main/java/org/apache/arrow/vector/complex/impl/NullableMapReaderImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}
}
2 changes: 1 addition & 1 deletion java/vector/src/main/java/org/apache/arrow/vector/complex/impl/UnionListReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public UnionListReader(ListVector vector) {

@Override
public boolean isSet() {
return true;
return !vector.getAccessor().isNull(idx());
}

private int currentOffset;
Expand Down
57 changes: 49 additions & 8 deletions java/vector/src/test/java/org/apache/arrow/vector/complex/writer/TestComplexWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -77,28 +85,33 @@ public void nullableMap() {
MapVector parent = new MapVector("parent", allocator, null);
ComplexWriter writer = new ComplexWriterImpl("root", parent);
MapWriter rootWriter = writer.rootAsMap();
MapWriter mapWriter = rootWriter.map("map");
BigIntWriter nested = mapWriter.bigInt("nested");
for (int i = 0; i < COUNT; i++) {
rootWriter.setPosition(i);
rootWriter.start();
Copy link
Contributor

@adeneche adeneche Sep 27, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

don't we need to call setPosition() on rootWriter ?

Copy link
Member Author

@julienledem julienledem Sep 27, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

adding

if (i % 2 == 0) {
MapWriter mapWriter = rootWriter.map("map");
mapWriter.setPosition(i);
mapWriter.start();
nested.writeBigInt(i);
mapWriter.bigInt("nested").writeBigInt(i);
mapWriter.end();
}
rootWriter.end();
}
writer.setValueCount(COUNT);
MapReader rootReader = new SingleMapReaderImpl(parent).reader("root");
for (int i = 0; i < COUNT; i++) {
rootReader.setPosition(i);
assertTrue("index is set: " + i, rootReader.isSet());
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());
Copy link
Contributor

@adeneche adeneche Sep 27, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you add an assertion to ensure rootReader.isSet()

Copy link
Member Author

@julienledem julienledem Sep 27, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

will do.

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());
Copy link
Contributor

@adeneche adeneche Sep 27, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you also add an assertion to ensure !rootReader.isSet()

Copy link
Member Author

@julienledem julienledem Sep 27, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

unlike rootReader.reader("map") rootReader is always set. Adding the check

assertNull("index is not set: " + i, map.readObject());
}
}

parent.close();
}

Expand All @@ -121,11 +134,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() {
Expand Down