xborder commented on code in PR #2481:
URL: https://github.com/apache/arrow-adbc/pull/2481#discussion_r1927323834
##########
go/adbc/driver/internal/shared_utils.go:
##########
@@ -247,9 +219,117 @@ func (g *GetObjects) Init(mem memory.Allocator, getObj
GetObjDBSchemasFn, getTbl
g.columnUsageTableBuilder =
g.constraintColumnUsageItems.FieldBuilder(2).(*array.StringBuilder)
g.columnUsageColumnBuilder =
g.constraintColumnUsageItems.FieldBuilder(3).(*array.StringBuilder)
+ g.metadataBuilders = MetadataToBuilders{}
+ g.metadataBuilders[REMARKS] = g.tableColumnsItems.FieldBuilder(2)
+ g.metadataBuilders[XDBC_DATA_TYPE] = g.tableColumnsItems.FieldBuilder(3)
+ g.metadataBuilders[XDBC_TYPE_NAME] = g.tableColumnsItems.FieldBuilder(4)
+ g.metadataBuilders[XDBC_COLUMN_SIZE] =
g.tableColumnsItems.FieldBuilder(5)
+ g.metadataBuilders[XDBC_DECIMAL_DIGITS] =
g.tableColumnsItems.FieldBuilder(6)
+ g.metadataBuilders[XDBC_NUM_PREC_RADIX] =
g.tableColumnsItems.FieldBuilder(7)
+ g.metadataBuilders[XDBC_NULLABLE] = g.tableColumnsItems.FieldBuilder(8)
+ g.metadataBuilders[XDBC_COLUMN_DEF] =
g.tableColumnsItems.FieldBuilder(9)
+ g.metadataBuilders[XDBC_SQL_DATA_TYPE] =
g.tableColumnsItems.FieldBuilder(10)
+ g.metadataBuilders[XDBC_DATETIME_SUB] =
g.tableColumnsItems.FieldBuilder(11)
+ g.metadataBuilders[XDBC_CHAR_OCTET_LENGTH] =
g.tableColumnsItems.FieldBuilder(12)
+ g.metadataBuilders[XDBC_IS_NULLABLE] =
g.tableColumnsItems.FieldBuilder(13)
+ g.metadataBuilders[XDBC_SCOPE_CATALOG] =
g.tableColumnsItems.FieldBuilder(14)
+ g.metadataBuilders[XDBC_SCOPE_SCHEMA] =
g.tableColumnsItems.FieldBuilder(15)
+ g.metadataBuilders[XDBC_SCOPE_TABLE] =
g.tableColumnsItems.FieldBuilder(16)
+ g.metadataBuilders[XDBC_IS_AUTOINCREMENT] =
g.tableColumnsItems.FieldBuilder(17)
+ g.metadataBuilders[XDBC_IS_AUTOGENERATEDCOLUMN] =
g.tableColumnsItems.FieldBuilder(18)
+
+ g.metadataHandlers = g.initMetadataHandlers(overrideMetadataHandlers)
+
return nil
}
+func parseColumnMetadata(key string, column arrow.Field, builder
array.Builder) {
+ if column.HasMetadata() {
+ if value, ok := column.Metadata.GetValue(key); ok {
+ var parsedInt int64
+ var parsedBool bool
+ var err error
+ switch b := builder.(type) {
+ case *array.Int16Builder:
+ parsedInt, err = strconv.ParseInt(value, 10, 16)
+ if err != nil {
+ b.AppendNull()
+ } else {
+ b.Append(int16(parsedInt))
+ }
+ case *array.Int32Builder:
+ parsedInt, err = strconv.ParseInt(value, 10, 32)
+ if err != nil {
+ b.AppendNull()
+ } else {
+ b.Append(int32(parsedInt))
+ }
+ case *array.Int64Builder:
+ parsedInt, err = strconv.ParseInt(value, 10, 64)
+ if err != nil {
+ b.AppendNull()
+ } else {
+ b.Append(parsedInt)
+ }
+ case *array.BooleanBuilder:
+ parsedBool, err = strconv.ParseBool(value)
+ if err != nil {
+ b.AppendNull()
+ } else {
+ b.Append(parsedBool)
+ }
+ case *array.StringBuilder:
+ b.Append(value)
+ default:
+ b.AppendNull()
+ }
+ } else {
+ builder.AppendNull()
+ }
+ } else {
+ builder.AppendNull()
+ }
+}
+
+func (g *GetObjects) initMetadataHandlers(overrides MetadataToHandlers)
MetadataToHandlers {
+
+ createHandler := func(key string) MetadataHandlers {
+ return func(column arrow.Field, builder array.Builder) {
+ parseColumnMetadata(key, column, builder)
+ }
+ }
+
+ metadataHandlers := make(MetadataToHandlers)
+
+ checkOverrideOrDefault := func(key string) {
+ if overrides[key] != nil {
+ metadataHandlers[key] = overrides[key]
+ } else {
+ metadataHandlers[key] = createHandler(key)
+ }
+ }
+
+ checkOverrideOrDefault(REMARKS)
+ checkOverrideOrDefault(XDBC_DATA_TYPE)
+ checkOverrideOrDefault(XDBC_TYPE_NAME)
+ checkOverrideOrDefault(XDBC_COLUMN_SIZE)
+ checkOverrideOrDefault(XDBC_DECIMAL_DIGITS)
+ checkOverrideOrDefault(XDBC_NUM_PREC_RADIX)
+ checkOverrideOrDefault(XDBC_NULLABLE)
+ checkOverrideOrDefault(XDBC_COLUMN_DEF)
+ checkOverrideOrDefault(XDBC_SQL_DATA_TYPE)
+ checkOverrideOrDefault(XDBC_DATETIME_SUB)
+ checkOverrideOrDefault(XDBC_CHAR_OCTET_LENGTH)
+ checkOverrideOrDefault(XDBC_IS_NULLABLE)
+ checkOverrideOrDefault(XDBC_SCOPE_CATALOG)
+ checkOverrideOrDefault(XDBC_SCOPE_SCHEMA)
+ checkOverrideOrDefault(XDBC_SCOPE_TABLE)
+ checkOverrideOrDefault(XDBC_IS_AUTOINCREMENT)
+ checkOverrideOrDefault(XDBC_IS_AUTOGENERATEDCOLUMN)
+
+ return metadataHandlers
Review Comment:
Removed the mappers and tried another approach using a interface.
Drivers can create a struct embedding `DefaultXdbcMetadataBuilder` and
override how to fetch and set the `XDBC_` fields that make sense.
Is this more aligned with what you were suggesting?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
