simplified convertion from arrow types to sql types

Author: xborder

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

@@ -72,6 +72,7 @@ public static List<ColumnMetaData> convertArrowFieldsToColumnMetaDataList(
         .map(
             index -> {
               final Field field = fields.get(index);
+              final ArrowType fieldType = field.getType();
 
               final Common.ColumnMetaData.Builder builder =
                   Common.ColumnMetaData.newBuilder()
@@ -83,8 +84,8 @@ public static List<ColumnMetaData> convertArrowFieldsToColumnMetaDataList(
 
               builder.setType(
                   Common.AvaticaType.newBuilder()
-                      .setId(SqlTypes.getSqlTypeIdFromField(field))
-                      .setName(SqlTypes.getSqlTypeNameFromField(field))
+                      .setId(SqlTypes.getSqlTypeIdFromArrowType(fieldType))
+                      .setName(SqlTypes.getSqlTypeNameFromArrowType(fieldType))
                       .build());
 
               return ColumnMetaData.fromProto(builder.build());

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

@@ -114,6 +114,9 @@ public static int getSqlTypeIdFromArrowType(ArrowType arrowType) {
       case Binary:
         return Types.VARBINARY;
       case FixedSizeBinary:
+        if (arrowType instanceof UuidType) {
+          return Types.OTHER;
+        }
         return Types.BINARY;
       case LargeBinary:
         return Types.LONGVARBINARY;
@@ -167,44 +170,4 @@ public static int getSqlTypeIdFromArrowType(ArrowType arrowType) {
 
     throw new IllegalArgumentException("Unsupported ArrowType " + arrowType);
   }
-
-  /**
-   * Convert given {@link Field} to its corresponding SQL type ID, handling extension types.
-   *
-   * @param field field to convert from
-   * @return corresponding SQL type ID.
-   * @see java.sql.Types
-   */
-  public static int getSqlTypeIdFromField(Field field) {
-    ArrowType arrowType = field.getType();
-    if (arrowType instanceof UuidType) {
-      return Types.OTHER;
-    }
-    return getSqlTypeIdFromArrowType(arrowType);
-  }
-
-  /**
-   * Convert given {@link Field} to its corresponding SQL type name, handling extension types.
-   *
-   * @param field field to convert from
-   * @return corresponding SQL type name.
-   * @see java.sql.Types
-   */
-  public static String getSqlTypeNameFromField(Field field) {
-    ArrowType arrowType = field.getType();
-    if (arrowType instanceof UuidType) {
-      return UUID_TYPE_NAME;
-    }
-    return getSqlTypeNameFromArrowType(arrowType);
-  }
-
-  /**
-   * Check if the given field represents a UUID type.
-   *
-   * @param field field to check
-   * @return true if the field is a UUID extension type
-   */
-  public static boolean isUuidField(Field field) {
-    return field.getType() instanceof UuidType;
-  }
 }

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

@@ -17,10 +17,7 @@
 package org.apache.arrow.driver.jdbc.utils;
 
 import static org.apache.arrow.driver.jdbc.utils.SqlTypes.getSqlTypeIdFromArrowType;
-import static org.apache.arrow.driver.jdbc.utils.SqlTypes.getSqlTypeIdFromField;
 import static org.apache.arrow.driver.jdbc.utils.SqlTypes.getSqlTypeNameFromArrowType;
-import static org.apache.arrow.driver.jdbc.utils.SqlTypes.getSqlTypeNameFromField;
-import static org.apache.arrow.driver.jdbc.utils.SqlTypes.isUuidField;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -149,13 +146,13 @@ public void testGetSqlTypeNameFromArrowType() {
   @Test
   public void testGetSqlTypeIdFromFieldForUuid() {
     Field uuidField = new Field("uuid_col", new FieldType(true, UuidType.INSTANCE, null), null);
-    assertEquals(Types.OTHER, getSqlTypeIdFromField(uuidField));
+    assertEquals(Types.OTHER, getSqlTypeIdFromArrowType(uuidField.getType()));
   }
 
   @Test
   public void testGetSqlTypeNameFromFieldForUuid() {
     Field uuidField = new Field("uuid_col", new FieldType(true, UuidType.INSTANCE, null), null);
-    assertEquals("uuid", getSqlTypeNameFromField(uuidField));
+    assertEquals("OTHER", getSqlTypeNameFromArrowType(uuidField.getType()));
   }
 
   @Test
@@ -177,12 +174,16 @@ public void testIsUuidFieldReturnsFalseForNonUuid() {
   @Test
   public void testGetSqlTypeIdFromFieldForNonUuid() {
     Field intField = new Field("int_col", FieldType.nullable(new ArrowType.Int(32, true)), null);
-    assertEquals(Types.INTEGER, getSqlTypeIdFromField(intField));
+    assertEquals(Types.INTEGER, getSqlTypeIdFromArrowType(intField.getType()));
   }
 
   @Test
   public void testGetSqlTypeNameFromFieldForNonUuid() {
     Field intField = new Field("int_col", FieldType.nullable(new ArrowType.Int(32, true)), null);
-    assertEquals("INTEGER", getSqlTypeNameFromField(intField));
+    assertEquals("INTEGER", getSqlTypeNameFromArrowType(intField.getType()));
+  }
+
+  static boolean isUuidField(Field field) {
+    return field.getType() instanceof UuidType;
   }
 }