Skip to content

Commit

Permalink
Add support for java-client String[] and Instant[]
Browse files Browse the repository at this point in the history
  • Loading branch information
@devinrsmith
devinrsmith committed May 17, 2024
1 parent f9bf938 commit faa4ab0
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 26 deletions.
7 changes: 5 additions & 2 deletions java-client/flight-examples/src/main/java/io/deephaven/client/examples/AddToBlinkTable.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,11 +100,14 @@ protected void execute(FlightSession flight) throws Exception {
new double[] {},
new double[] {42.42, 43.43});

// addAndPublish(flight, "StringArray", Type.stringType().arrayType(), null, new String[] {}, new String[] { null, "", "Hello World" });
addAndPublish(flight, "StringArray", Type.stringType().arrayType(),
null,
new String[] {},
new String[] {null, "", "Hello World"});
addAndPublish(flight, "InstantArray", Type.instantType().arrayType(),
null,
new Instant[] {},
new Instant[] { null, Instant.now() });
new Instant[] {null, Instant.now()});
}

public static void main(String[] args) {
Expand Down
3 changes: 2 additions & 1 deletion java-client/flight/src/main/java/io/deephaven/client/impl/FieldAdapter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,8 @@ public Field visit(GenericVectorType<?, ?> genericVectorType) {

// ----------------------------------------------------------

final class NativeArrayVisitor implements Type.Visitor<Field>, PrimitiveType.Visitor<Field>, GenericType.Visitor<Field> {
final class NativeArrayVisitor
implements Type.Visitor<Field>, PrimitiveType.Visitor<Field>, GenericType.Visitor<Field> {
@Override
public Field visit(PrimitiveType<?> primitiveType) {
return primitiveType.walk((PrimitiveType.Visitor<Field>) this);
Expand Down
53 changes: 30 additions & 23 deletions java-client/flight/src/main/java/io/deephaven/client/impl/FieldVectorAdapter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
import io.deephaven.qst.type.ShortType;
import io.deephaven.qst.type.StringType;
import io.deephaven.qst.type.Type;
import org.apache.arrow.memory.ArrowBuf;
import org.apache.arrow.memory.BufferAllocator;
import org.apache.arrow.vector.BigIntVector;
import org.apache.arrow.vector.BitVector;
Expand All @@ -61,6 +62,7 @@
import org.apache.arrow.vector.complex.impl.UnionListWriter;
import org.apache.arrow.vector.types.pojo.Field;

import java.nio.charset.StandardCharsets;
import java.time.Instant;
import java.util.Collection;
import java.util.Objects;
Expand Down Expand Up @@ -235,7 +237,8 @@ public FieldVector visit(StringType stringType) {

@Override
public FieldVector visit(InstantType instantType) {
return visitInstantArrayElements(generic.cast(instantType.arrayType()).values());
return visitInstantArrayElements(
generic.cast(instantType.arrayType()).values());
}

@Override
Expand Down Expand Up @@ -335,70 +338,70 @@ public FieldVector visit(DoubleArray doubleArray) {
return vector;
}

FieldVector visitBooleanElements(Collection<Boolean> elements) {
private FieldVector visitBooleanElements(Collection<Boolean> elements) {
Field field = FieldAdapter.booleanField(name);
BitVector vector = new BitVector(field, allocator);
VectorHelper.fill(vector, elements);
return vector;
}

FieldVector visitByteElements(Collection<Byte> elements) {
private FieldVector visitByteElements(Collection<Byte> elements) {
Field field = FieldAdapter.byteField(name);
TinyIntVector vector = new TinyIntVector(field, allocator);
VectorHelper.fill(vector, elements);
return vector;
}

FieldVector visitCharacterElements(Collection<Character> elements) {
private FieldVector visitCharacterElements(Collection<Character> elements) {
Field field = FieldAdapter.charField(name);
UInt2Vector vector = new UInt2Vector(field, allocator);
VectorHelper.fill(vector, elements);
return vector;
}

FieldVector visitShortElements(Collection<Short> elements) {
private FieldVector visitShortElements(Collection<Short> elements) {
Field field = FieldAdapter.shortField(name);
SmallIntVector vector = new SmallIntVector(field, allocator);
VectorHelper.fill(vector, elements);
return vector;
}

FieldVector visitIntegerElements(Collection<Integer> elements) {
private FieldVector visitIntegerElements(Collection<Integer> elements) {
Field field = FieldAdapter.intField(name);
IntVector vector = new IntVector(field, allocator);
VectorHelper.fill(vector, elements);
return vector;
}

FieldVector visitLongElements(Collection<Long> elements) {
private FieldVector visitLongElements(Collection<Long> elements) {
Field field = FieldAdapter.longField(name);
BigIntVector vector = new BigIntVector(field, allocator);
VectorHelper.fill(vector, elements);
return vector;
}

FieldVector visitFloatElements(Collection<Float> elements) {
private FieldVector visitFloatElements(Collection<Float> elements) {
Field field = FieldAdapter.floatField(name);
Float4Vector vector = new Float4Vector(field, allocator);
VectorHelper.fill(vector, elements);
return vector;
}

FieldVector visitDoubleElements(Collection<Double> elements) {
private FieldVector visitDoubleElements(Collection<Double> elements) {
Field field = FieldAdapter.doubleField(name);
Float8Vector vector = new Float8Vector(field, allocator);
VectorHelper.fill(vector, elements);
return vector;
}

FieldVector visitStringElements(Collection<String> elements) {
private FieldVector visitStringElements(Collection<String> elements) {
Field field = FieldAdapter.stringField(name);
VarCharVector vector = new VarCharVector(field, allocator);
VectorHelper.fill(vector, elements);
return vector;
}

FieldVector visitInstantElements(Collection<Instant> elements) {
private FieldVector visitInstantElements(Collection<Instant> elements) {
Field field = FieldAdapter.instantField(name);
TimeStampNanoTZVector vector = new TimeStampNanoTZVector(field, allocator);
VectorHelper.fill(vector, elements);
Expand All @@ -411,7 +414,7 @@ FieldVector visitInstantElements(Collection<Instant> elements) {
// manually advance the position after writeNull because it doesn't automatically advanced the position like endList
// does.

FieldVector visitBooleanArrayElements(Collection<boolean[]> elements) {
private FieldVector visitBooleanArrayElements(Collection<boolean[]> elements) {
final Field field = FieldAdapter.of(ColumnHeader.of(name, Type.booleanType().arrayType()));
final ListVector vector = new ListVector(field.getName(), allocator, field.getFieldType(), null);
final UnionListWriter writer = new UnionListWriter(vector);
Expand All @@ -431,7 +434,7 @@ FieldVector visitBooleanArrayElements(Collection<boolean[]> elements) {
return vector;
}

FieldVector visitByteArrayElements(Collection<byte[]> elements) {
private FieldVector visitByteArrayElements(Collection<byte[]> elements) {
// Note: byte[] is the only array type that doesn't follow the LIST conventions that the other array types have
// Might want to re-examine this in the future.
Field field = FieldAdapter.byteVectorField(name);
Expand All @@ -440,7 +443,7 @@ FieldVector visitByteArrayElements(Collection<byte[]> elements) {
return vector;
}

FieldVector visitCharArrayElements(Collection<char[]> elements) {
private FieldVector visitCharArrayElements(Collection<char[]> elements) {
final Field field = FieldAdapter.of(ColumnHeader.of(name, Type.charType().arrayType()));
final ListVector vector = new ListVector(field.getName(), allocator, field.getFieldType(), null);
vector.allocateNew();
Expand All @@ -461,7 +464,7 @@ FieldVector visitCharArrayElements(Collection<char[]> elements) {
return vector;
}

FieldVector visitShortArrayElements(Collection<short[]> elements) {
private FieldVector visitShortArrayElements(Collection<short[]> elements) {
final Field field = FieldAdapter.of(ColumnHeader.of(name, Type.shortType().arrayType()));
final ListVector vector = new ListVector(field.getName(), allocator, field.getFieldType(), null);
vector.allocateNew();
Expand All @@ -482,7 +485,7 @@ FieldVector visitShortArrayElements(Collection<short[]> elements) {
return vector;
}

FieldVector visitIntArrayElements(Collection<int[]> elements) {
private FieldVector visitIntArrayElements(Collection<int[]> elements) {
final Field field = FieldAdapter.of(ColumnHeader.of(name, Type.intType().arrayType()));
final ListVector vector = new ListVector(field.getName(), allocator, field.getFieldType(), null);
vector.allocateNew();
Expand All @@ -503,7 +506,7 @@ FieldVector visitIntArrayElements(Collection<int[]> elements) {
return vector;
}

FieldVector visitLongArrayElements(Collection<long[]> elements) {
private FieldVector visitLongArrayElements(Collection<long[]> elements) {
final Field field = FieldAdapter.of(ColumnHeader.of(name, Type.longType().arrayType()));
final ListVector vector = new ListVector(field.getName(), allocator, field.getFieldType(), null);
vector.allocateNew();
Expand All @@ -524,7 +527,7 @@ FieldVector visitLongArrayElements(Collection<long[]> elements) {
return vector;
}

FieldVector visitFloatArrayElements(Collection<float[]> elements) {
private FieldVector visitFloatArrayElements(Collection<float[]> elements) {
final Field field = FieldAdapter.of(ColumnHeader.of(name, Type.floatType().arrayType()));
final ListVector vector = new ListVector(field.getName(), allocator, field.getFieldType(), null);
vector.allocateNew();
Expand All @@ -545,7 +548,7 @@ FieldVector visitFloatArrayElements(Collection<float[]> elements) {
return vector;
}

FieldVector visitDoubleArrayElements(Collection<double[]> elements) {
private FieldVector visitDoubleArrayElements(Collection<double[]> elements) {
final Field field = FieldAdapter.of(ColumnHeader.of(name, Type.doubleType().arrayType()));
final ListVector vector = new ListVector(field.getName(), allocator, field.getFieldType(), null);
vector.allocateNew();
Expand All @@ -566,7 +569,7 @@ FieldVector visitDoubleArrayElements(Collection<double[]> elements) {
return vector;
}

FieldVector visitStringArrayElements(Collection<String[]> elements) {
private FieldVector visitStringArrayElements(Collection<String[]> elements) {
final Field field = FieldAdapter.of(ColumnHeader.of(name, Type.stringType().arrayType()));
final ListVector vector = new ListVector(field.getName(), allocator, field.getFieldType(), null);
vector.allocateNew();
Expand All @@ -581,7 +584,11 @@ FieldVector visitStringArrayElements(Collection<String[]> elements) {
if (x == null) {
writer.writeNull();
} else {
writer.writeVarChar(0, 0, null);
final byte[] bytes = x.getBytes(StandardCharsets.UTF_8);
try (final ArrowBuf buffer = allocator.buffer(bytes.length)) {
buffer.writeBytes(bytes);
writer.writeVarChar(0, bytes.length, buffer);
}
}
}
writer.endList();
Expand All @@ -591,7 +598,7 @@ FieldVector visitStringArrayElements(Collection<String[]> elements) {
return vector;
}

FieldVector visitInstantArrayElements(Collection<Instant[]> elements) {
private FieldVector visitInstantArrayElements(Collection<Instant[]> elements) {
final Field field = FieldAdapter.of(ColumnHeader.of(name, Type.instantType().arrayType()));
final ListVector vector = new ListVector(field.getName(), allocator, field.getFieldType(), null);
vector.allocateNew();
Expand All @@ -609,7 +616,7 @@ FieldVector visitInstantArrayElements(Collection<Instant[]> elements) {
final long epochSecond = x.getEpochSecond();
final int nano = x.getNano();
final long epochNano = Math.addExact(Math.multiplyExact(epochSecond, 1_000_000_000L), nano);
writer.writeTimeStampNanoTZ(epochNano); // todo: TZ?
writer.writeTimeStampNanoTZ(epochNano);
}
}
writer.endList();
Expand Down

0 comments on commit faa4ab0

Please sign in to comment.