Skip to content

GH-110: Flight SQL JDBC related StringView components implementation #905

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

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

GH-110: Flight SQL JDBC related StringView components implementation #905

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
8 changes: 7 additions & 1 deletion ...java/org/apache/arrow/driver/jdbc/converter/impl/BinaryViewAvaticaParameterConverter.java
View file
Open in desktop
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
9 changes: 8 additions & 1 deletion ...n/java/org/apache/arrow/driver/jdbc/converter/impl/Utf8ViewAvaticaParameterConverter.java
View file
Open in desktop
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
6 changes: 4 additions & 2 deletions ...ql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/utils/AvaticaParameterBinder.java
View file
Open in desktop
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
2 changes: 2 additions & 0 deletions flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/utils/SqlTypes.java
View file
Open in desktop
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
11 changes: 10 additions & 1 deletion ...ight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/ConvertUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public void testShouldConvertArrowFieldsToColumnMetaDataList() {
"col1",
new FieldType(
true,
ArrowType.Utf8.INSTANCE,
ArrowType.Utf8View.INSTANCE,
null,
new FlightSqlColumnMetadata.Builder()
.catalogName("catalog1")
Expand All @@ -78,6 +78,13 @@ public void testShouldConvertArrowFieldsToColumnMetaDataList() {
.setCatalogName("catalog1")
.setSchemaName("schema1")
.setTableName("table1")
.setColumnName("col1")
.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 +102,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
4 changes: 4 additions & 0 deletions ...t/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/SqlTypesTest.java
View file
Open in desktop
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
Loading