Skip to content

GH-558: ComplexCopier supports for Duration columns. #560

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

GH-558: ComplexCopier supports for Duration columns. #560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions vector/src/main/codegen/templates/ComplexCopier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,8 @@ private static FieldWriter getStructWriterForReader(FieldReader reader, StructWr
return (FieldWriter) writer.map(name);
case LISTVIEW:
return (FieldWriter) writer.listView(name);
case DURATION:
return (FieldWriter) writer.duration(name);
default:
throw new UnsupportedOperationException(reader.getMinorType().toString());
}
Expand All @@ -186,6 +188,8 @@ private static FieldWriter getListWriterForReader(FieldReader reader, ListWriter
return (FieldWriter) writer.list();
case LISTVIEW:
return (FieldWriter) writer.listView();
case DURATION:
return (FieldWriter) writer.duration();
default:
throw new UnsupportedOperationException(reader.getMinorType().toString());
}
Expand All @@ -211,6 +215,8 @@ private static FieldWriter getMapWriterForReader(FieldReader reader, MapWriter w
return (FieldWriter) writer.listView();
case MAP:
return (FieldWriter) writer.map(false);
case DURATION:
return (FieldWriter) writer.duration();
default:
throw new UnsupportedOperationException(reader.getMinorType().toString());
}
Expand Down
139 changes: 139 additions & 0 deletions vector/src/test/java/org/apache/arrow/vector/complex/impl/TestComplexCopier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
import org.apache.arrow.vector.complex.writer.BaseWriter.StructWriter;
import org.apache.arrow.vector.complex.writer.FieldWriter;
import org.apache.arrow.vector.holders.DecimalHolder;
import org.apache.arrow.vector.holders.DurationHolder;
import org.apache.arrow.vector.types.TimeUnit;
import org.apache.arrow.vector.types.Types;
import org.apache.arrow.vector.types.pojo.ArrowType;
import org.apache.arrow.vector.types.pojo.FieldType;
Expand Down Expand Up @@ -845,4 +847,141 @@ public void testCopyMapVectorWithMapValue() {
assertTrue(VectorEqualsVisitor.vectorEquals(from, to));
}
}

@Test
public void testCopyDurationVector() {
try (ListVector from = ListVector.empty("v", allocator);
ListVector to = ListVector.empty("v", allocator)) {

UnionListWriter listWriter = from.getWriter();
listWriter.allocate();

DurationHolder durationHolder = new DurationHolder();
for (int i = 0; i < COUNT; i++) {
listWriter.setPosition(i);
listWriter.startList();
durationHolder.value = 123456789L;
durationHolder.unit = TimeUnit.MILLISECOND;
listWriter.duration().write(durationHolder);
listWriter.endList();
}
from.setValueCount(COUNT);

FieldReader in = from.getReader();
FieldWriter out = to.getWriter();
for (int i = 0; i < COUNT; i++) {
in.setPosition(i);
out.setPosition(i);
ComplexCopier.copy(in, out);
}

to.setValueCount(COUNT);

assertTrue(VectorEqualsVisitor.vectorEquals(from, to));
}
}

@Test
public void testCopyListVectorWithDuration() {
try (ListVector from = ListVector.empty("v", allocator);
ListVector to = ListVector.empty("v", allocator)) {

UnionListWriter listWriter = from.getWriter();
listWriter.allocate();

DurationHolder durationHolder = new DurationHolder();
for (int i = 0; i < COUNT; i++) {
listWriter.setPosition(i);
listWriter.startList();
durationHolder.value = 123456789L;
durationHolder.unit = TimeUnit.MILLISECOND;
listWriter.duration().write(durationHolder);
listWriter.endList();
}
from.setValueCount(COUNT);

// Copy values
FieldReader in = from.getReader();
FieldWriter out = to.getWriter();
for (int i = 0; i < COUNT; i++) {
in.setPosition(i);
out.setPosition(i);
ComplexCopier.copy(in, out);
}

to.setValueCount(COUNT);

assertTrue(VectorEqualsVisitor.vectorEquals(from, to));
}
}

@Test
public void testCopyMapVectorWithDurationValue() {
try (MapVector from = MapVector.empty("v", allocator, false);
MapVector to = MapVector.empty("v", allocator, false)) {

UnionMapWriter mapWriter = from.getWriter();
mapWriter.allocate();

DurationHolder durationHolder = new DurationHolder();
for (int i = 0; i < COUNT; i++) {
mapWriter.setPosition(i);
mapWriter.startMap();
mapWriter.startEntry();
mapWriter.key().integer().writeInt(i);
durationHolder.value = 123456789L;
durationHolder.unit = TimeUnit.MILLISECOND;
mapWriter.value().duration().write(durationHolder);
mapWriter.endEntry();
mapWriter.endMap();
}
from.setValueCount(COUNT);

FieldReader in = from.getReader();
FieldWriter out = to.getWriter();
for (int i = 0; i < COUNT; i++) {
in.setPosition(i);
out.setPosition(i);
ComplexCopier.copy(in, out);
}

to.setValueCount(COUNT);

assertTrue(VectorEqualsVisitor.vectorEquals(from, to));
}
}

@Test
public void testCopyStructVectorWithDurationValue() {
try (StructVector from = StructVector.empty("v", allocator);
StructVector to = StructVector.empty("v", allocator)) {

from.allocateNew();

NullableStructWriter structWriter = from.getWriter();
DurationHolder durationHolder = new DurationHolder();

for (int i = 0; i < COUNT; i++) {
structWriter.setPosition(i);
structWriter.start();
durationHolder.value = 123456789L;
durationHolder.unit = TimeUnit.MILLISECOND;
structWriter.duration("durationField").write(durationHolder);
structWriter.end();
}

from.setValueCount(COUNT);

FieldReader in = from.getReader();
FieldWriter out = to.getWriter();
for (int i = 0; i < COUNT; i++) {
in.setPosition(i);
out.setPosition(i);
ComplexCopier.copy(in, out);
}
to.setValueCount(COUNT);

assertTrue(VectorEqualsVisitor.vectorEquals(from, to));
}
}
}
Loading