Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@
import org.apache.arrow.vector.ValueVector;
import org.apache.arrow.vector.VarBinaryVector;
import org.apache.arrow.vector.VarCharVector;
import org.apache.arrow.vector.ViewVarBinaryVector;
import org.apache.arrow.vector.ViewVarCharVector;
import org.apache.arrow.vector.complex.DenseUnionVector;
import org.apache.arrow.vector.complex.FixedSizeListVector;
import org.apache.arrow.vector.complex.LargeListVector;
Expand Down Expand Up @@ -130,6 +132,9 @@ public static ArrowFlightJdbcAccessor createAccessor(
} else if (vector instanceof VarBinaryVector) {
return new ArrowFlightJdbcBinaryVectorAccessor(
(VarBinaryVector) vector, getCurrentRow, setCursorWasNull);
} else if (vector instanceof ViewVarBinaryVector) {
return new ArrowFlightJdbcBinaryVectorAccessor(
(ViewVarBinaryVector) vector, getCurrentRow, setCursorWasNull);
} else if (vector instanceof LargeVarBinaryVector) {
return new ArrowFlightJdbcBinaryVectorAccessor(
(LargeVarBinaryVector) vector, getCurrentRow, setCursorWasNull);
Expand Down Expand Up @@ -163,6 +168,9 @@ public static ArrowFlightJdbcAccessor createAccessor(
} else if (vector instanceof LargeVarCharVector) {
return new ArrowFlightJdbcVarCharVectorAccessor(
(LargeVarCharVector) vector, getCurrentRow, setCursorWasNull);
} else if (vector instanceof ViewVarCharVector) {
return new ArrowFlightJdbcVarCharVectorAccessor(
(ViewVarCharVector) vector, getCurrentRow, setCursorWasNull);
} else if (vector instanceof DurationVector) {
return new ArrowFlightJdbcDurationVectorAccessor(
(DurationVector) vector, getCurrentRow, setCursorWasNull);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import org.apache.arrow.vector.FixedSizeBinaryVector;
import org.apache.arrow.vector.LargeVarBinaryVector;
import org.apache.arrow.vector.VarBinaryVector;
import org.apache.arrow.vector.ViewVarBinaryVector;

/**
* Accessor for the Arrow types: {@link FixedSizeBinaryVector}, {@link VarBinaryVector} and {@link
Expand Down Expand Up @@ -61,6 +62,13 @@ public ArrowFlightJdbcBinaryVectorAccessor(
this(vector::get, currentRowSupplier, setCursorWasNull);
}

public ArrowFlightJdbcBinaryVectorAccessor(
ViewVarBinaryVector vector,
IntSupplier currentRowSupplier,
ArrowFlightJdbcAccessorFactory.WasNullConsumer setCursorWasNull) {
this(vector::get, currentRowSupplier, setCursorWasNull);
}

private ArrowFlightJdbcBinaryVectorAccessor(
ByteArrayGetter getter,
IntSupplier currentRowSupplier,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import org.apache.arrow.driver.jdbc.utils.DateTimeUtils;
import org.apache.arrow.vector.LargeVarCharVector;
import org.apache.arrow.vector.VarCharVector;
import org.apache.arrow.vector.ViewVarCharVector;
import org.apache.arrow.vector.util.Text;

/** Accessor for the Arrow types: {@link VarCharVector} and {@link LargeVarCharVector}. */
Expand Down Expand Up @@ -62,6 +63,13 @@ public ArrowFlightJdbcVarCharVectorAccessor(
this(vector::get, currentRowSupplier, setCursorWasNull);
}

public ArrowFlightJdbcVarCharVectorAccessor(
ViewVarCharVector vector,
IntSupplier currentRowSupplier,
ArrowFlightJdbcAccessorFactory.WasNullConsumer setCursorWasNull) {
this(vector::get, currentRowSupplier, setCursorWasNull);
}

ArrowFlightJdbcVarCharVectorAccessor(
Getter getter,
IntSupplier currentRowSupplier,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package org.apache.arrow.driver.jdbc.converter.impl;

import org.apache.arrow.vector.FieldVector;
import org.apache.arrow.vector.ViewVarBinaryVector;
import org.apache.arrow.vector.types.pojo.ArrowType;
import org.apache.arrow.vector.types.pojo.Field;
import org.apache.calcite.avatica.AvaticaParameter;
Expand All @@ -29,7 +30,12 @@ public BinaryViewAvaticaParameterConverter(ArrowType.BinaryView type) {}

@Override
public boolean bindParameter(FieldVector vector, TypedValue typedValue, int index) {
throw new UnsupportedOperationException("Not implemented");
byte[] value = (byte[]) typedValue.toJdbc(null);
if (vector instanceof ViewVarBinaryVector) {
((ViewVarBinaryVector) vector).setSafe(index, value);
return true;
}
return false;
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,10 @@
package org.apache.arrow.driver.jdbc.converter.impl;

import org.apache.arrow.vector.FieldVector;
import org.apache.arrow.vector.ViewVarCharVector;
import org.apache.arrow.vector.types.pojo.ArrowType;
import org.apache.arrow.vector.types.pojo.Field;
import org.apache.arrow.vector.util.Text;
import org.apache.calcite.avatica.AvaticaParameter;
import org.apache.calcite.avatica.remote.TypedValue;

Expand All @@ -29,7 +31,12 @@ public Utf8ViewAvaticaParameterConverter(ArrowType.Utf8View type) {}

@Override
public boolean bindParameter(FieldVector vector, TypedValue typedValue, int index) {
throw new UnsupportedOperationException("Utf8View not supported");
String value = (String) typedValue.toLocal();
if (vector instanceof ViewVarCharVector) {
((ViewVarCharVector) vector).setSafe(index, new Text(value));
return true;
}
return false;
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import java.util.List;
import org.apache.arrow.driver.jdbc.client.ArrowFlightSqlClientHandler.PreparedStatement;
import org.apache.arrow.driver.jdbc.converter.impl.BinaryAvaticaParameterConverter;
import org.apache.arrow.driver.jdbc.converter.impl.BinaryViewAvaticaParameterConverter;
import org.apache.arrow.driver.jdbc.converter.impl.BoolAvaticaParameterConverter;
import org.apache.arrow.driver.jdbc.converter.impl.DateAvaticaParameterConverter;
import org.apache.arrow.driver.jdbc.converter.impl.DecimalAvaticaParameterConverter;
Expand All @@ -39,6 +40,7 @@
import org.apache.arrow.driver.jdbc.converter.impl.TimestampAvaticaParameterConverter;
import org.apache.arrow.driver.jdbc.converter.impl.UnionAvaticaParameterConverter;
import org.apache.arrow.driver.jdbc.converter.impl.Utf8AvaticaParameterConverter;
import org.apache.arrow.driver.jdbc.converter.impl.Utf8ViewAvaticaParameterConverter;
import org.apache.arrow.memory.BufferAllocator;
import org.apache.arrow.vector.FieldVector;
import org.apache.arrow.vector.VectorSchemaRoot;
Expand Down Expand Up @@ -208,7 +210,7 @@ public Boolean visit(ArrowType.Utf8 type) {

@Override
public Boolean visit(ArrowType.Utf8View type) {
throw new UnsupportedOperationException("Utf8View is unsupported");
return new Utf8ViewAvaticaParameterConverter(type).bindParameter(vector, typedValue, index);
}

@Override
Expand All @@ -223,7 +225,7 @@ public Boolean visit(ArrowType.Binary type) {

@Override
public Boolean visit(ArrowType.BinaryView type) {
throw new UnsupportedOperationException("BinaryView is unsupported");
return new BinaryViewAvaticaParameterConverter(type).bindParameter(vector, typedValue, index);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,12 +107,14 @@ public static int getSqlTypeIdFromArrowType(ArrowType arrowType) {
}
break;
case Binary:
case BinaryView:
return Types.VARBINARY;
case FixedSizeBinary:
return Types.BINARY;
case LargeBinary:
return Types.LONGVARBINARY;
case Utf8:
case Utf8View:
return Types.VARCHAR;
case LargeUtf8:
return Types.LONGVARCHAR;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@
import org.apache.arrow.vector.LargeVarCharVector;
import org.apache.arrow.vector.ValueVector;
import org.apache.arrow.vector.VarCharVector;
import org.apache.arrow.vector.ViewVarBinaryVector;
import org.apache.arrow.vector.ViewVarCharVector;
import org.apache.arrow.vector.complex.DenseUnionVector;
import org.apache.arrow.vector.complex.MapVector;
import org.apache.arrow.vector.complex.StructVector;
Expand Down Expand Up @@ -239,6 +241,18 @@ public void createAccessorForFixedSizeBinaryVector() {
}
}

@Test
public void createAccessorForViewVarBinaryVector() {
try (ValueVector valueVector =
new ViewVarBinaryVector("", rootAllocatorTestExtension.getRootAllocator())) {
ArrowFlightJdbcAccessor accessor =
ArrowFlightJdbcAccessorFactory.createAccessor(
valueVector, GET_CURRENT_ROW, (boolean wasNull) -> {});

assertTrue(accessor instanceof ArrowFlightJdbcBinaryVectorAccessor);
}
}

@Test
public void createAccessorForTimeStampVector() {
try (ValueVector valueVector = rootAllocatorTestExtension.createTimeStampMilliVector()) {
Expand Down Expand Up @@ -340,6 +354,18 @@ public void createAccessorForLargeVarCharVector() {
}
}

@Test
public void createAccessorForViewVarCharVector() {
try (ValueVector valueVector =
new ViewVarCharVector("", rootAllocatorTestExtension.getRootAllocator())) {
ArrowFlightJdbcAccessor accessor =
ArrowFlightJdbcAccessorFactory.createAccessor(
valueVector, GET_CURRENT_ROW, (boolean wasNull) -> {});

assertTrue(accessor instanceof ArrowFlightJdbcVarCharVectorAccessor);
}
}

@Test
public void createAccessorForDurationVector() {
try (ValueVector valueVector =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.Mockito.when;

Expand All @@ -46,6 +48,8 @@
import org.apache.arrow.vector.DateMilliVector;
import org.apache.arrow.vector.TimeMilliVector;
import org.apache.arrow.vector.TimeStampVector;
import org.apache.arrow.vector.VarCharVector;
import org.apache.arrow.vector.ViewVarCharVector;
import org.apache.arrow.vector.util.Text;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
Expand Down Expand Up @@ -695,4 +699,26 @@ public void testShouldGetObjectClassReturnString() {
final Class<?> clazz = accessor.getObjectClass();
assertThat(clazz, equalTo(String.class));
}

@Test
public void testViewVarcharVector() throws Exception {
try (VarCharVector varCharVector =
new VarCharVector("", rootAllocatorTestExtension.getRootAllocator());
ViewVarCharVector viewVarCharVector =
new ViewVarCharVector("", rootAllocatorTestExtension.getRootAllocator())) {
varCharVector.allocateNew(1);
viewVarCharVector.allocateNew(1);

ArrowFlightJdbcVarCharVectorAccessor varCharVectorAccessor =
new ArrowFlightJdbcVarCharVectorAccessor(varCharVector, () -> 0, (boolean wasNull) -> {});
ArrowFlightJdbcVarCharVectorAccessor viewVarcharVectorAccessor =
new ArrowFlightJdbcVarCharVectorAccessor(
viewVarCharVector, () -> 0, (boolean wasNull) -> {});
assertNull(viewVarcharVectorAccessor.getString());

varCharVector.set(0, new Text("looooong_string"));
viewVarCharVector.set(0, new Text("looooong_string"));
assertEquals(varCharVectorAccessor.getString(), viewVarcharVectorAccessor.getString());
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,19 @@ public void testShouldConvertArrowFieldsToColumnMetaDataList() {
.tableName("table1")
.build()
.getMetadataMap()),
null),
new Field(
"col2",
new FieldType(
true,
ArrowType.Utf8View.INSTANCE,
null,
new FlightSqlColumnMetadata.Builder()
.catalogName("catalog1")
.schemaName("schema1")
.tableName("table1")
.build()
.getMetadataMap()),
null));

final List<ColumnMetaData> expectedColumnMetaData =
Expand All @@ -78,6 +91,25 @@ public void testShouldConvertArrowFieldsToColumnMetaDataList() {
.setCatalogName("catalog1")
.setSchemaName("schema1")
.setTableName("table1")
.setColumnName("col1")
.setType(
Common.AvaticaType.newBuilder()
.setId(SqlTypes.getSqlTypeIdFromArrowType(ArrowType.Utf8.INSTANCE))
.setName(SqlTypes.getSqlTypeNameFromArrowType(ArrowType.Utf8.INSTANCE))
.build())
.build()),
ColumnMetaData.fromProto(
Common.ColumnMetaData.newBuilder()
.setCatalogName("catalog1")
.setSchemaName("schema1")
.setTableName("table1")
.setColumnName("col2")
.setType(
Common.AvaticaType.newBuilder()
.setId(SqlTypes.getSqlTypeIdFromArrowType(ArrowType.Utf8View.INSTANCE))
.setName(
SqlTypes.getSqlTypeNameFromArrowType(ArrowType.Utf8View.INSTANCE))
.build())
.build()));

final List<ColumnMetaData> actualColumnMetaData =
Expand All @@ -95,6 +127,8 @@ private void assertColumnMetaData(
assertThat(expectedColumnMetaData.catalogName, equalTo(actualColumnMetaData.catalogName));
assertThat(expectedColumnMetaData.schemaName, equalTo(actualColumnMetaData.schemaName));
assertThat(expectedColumnMetaData.tableName, equalTo(actualColumnMetaData.tableName));
assertThat(expectedColumnMetaData.columnName, equalTo(actualColumnMetaData.columnName));
assertThat(expectedColumnMetaData.type, equalTo(actualColumnMetaData.type));
assertThat(expectedColumnMetaData.readOnly, equalTo(actualColumnMetaData.readOnly));
assertThat(expectedColumnMetaData.autoIncrement, equalTo(actualColumnMetaData.autoIncrement));
assertThat(expectedColumnMetaData.precision, equalTo(actualColumnMetaData.precision));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,11 @@ public void testGetSqlTypeIdFromArrowType() {

assertEquals(Types.BINARY, getSqlTypeIdFromArrowType(new ArrowType.FixedSizeBinary(1024)));
assertEquals(Types.VARBINARY, getSqlTypeIdFromArrowType(new ArrowType.Binary()));
assertEquals(Types.VARBINARY, getSqlTypeIdFromArrowType(new ArrowType.BinaryView()));
assertEquals(Types.LONGVARBINARY, getSqlTypeIdFromArrowType(new ArrowType.LargeBinary()));

assertEquals(Types.VARCHAR, getSqlTypeIdFromArrowType(new ArrowType.Utf8()));
assertEquals(Types.VARCHAR, getSqlTypeIdFromArrowType(new ArrowType.Utf8View()));
assertEquals(Types.LONGVARCHAR, getSqlTypeIdFromArrowType(new ArrowType.LargeUtf8()));

assertEquals(Types.DATE, getSqlTypeIdFromArrowType(new ArrowType.Date(DateUnit.MILLISECOND)));
Expand Down Expand Up @@ -94,9 +96,11 @@ public void testGetSqlTypeNameFromArrowType() {

assertEquals("BINARY", getSqlTypeNameFromArrowType(new ArrowType.FixedSizeBinary(1024)));
assertEquals("VARBINARY", getSqlTypeNameFromArrowType(new ArrowType.Binary()));
assertEquals("VARBINARY", getSqlTypeNameFromArrowType(new ArrowType.BinaryView()));
assertEquals("LONGVARBINARY", getSqlTypeNameFromArrowType(new ArrowType.LargeBinary()));

assertEquals("VARCHAR", getSqlTypeNameFromArrowType(new ArrowType.Utf8()));
assertEquals("VARCHAR", getSqlTypeNameFromArrowType(new ArrowType.Utf8View()));
assertEquals("LONGVARCHAR", getSqlTypeNameFromArrowType(new ArrowType.LargeUtf8()));

assertEquals("DATE", getSqlTypeNameFromArrowType(new ArrowType.Date(DateUnit.MILLISECOND)));
Expand Down