GH-110: Flight SQL JDBC related StringView components implementation

Author: ViggoC

flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/BinaryViewAvaticaParameterConverter.java

@@ -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;
@@ -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

flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/converter/impl/Utf8ViewAvaticaParameterConverter.java

@@ -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;
 
@@ -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

flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/utils/AvaticaParameterBinder.java

@@ -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;
@@ -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;
@@ -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
@@ -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

flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/utils/SqlTypes.java

@@ -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;

flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/ConvertUtilsTest.java

@@ -61,7 +61,7 @@ public void testShouldConvertArrowFieldsToColumnMetaDataList() {
                 "col1",
                 new FieldType(
                     true,
-                    ArrowType.Utf8.INSTANCE,
+                    ArrowType.Utf8View.INSTANCE,
                     null,
                     new FlightSqlColumnMetadata.Builder()
                         .catalogName("catalog1")
@@ -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 =
@@ -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));

flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/SqlTypesTest.java

@@ -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)));
@@ -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)));