[Fix][Connector-V2] Field information lost during Paimon DataType and SeaTunnel Column conversion #6767
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -27,6 +27,7 @@ | |
| import org.apache.seatunnel.api.table.catalog.exception.DatabaseNotExistException; | ||
| import org.apache.seatunnel.api.table.catalog.exception.TableAlreadyExistException; | ||
| import org.apache.seatunnel.api.table.catalog.exception.TableNotExistException; | ||
| import org.apache.seatunnel.api.table.converter.BasicTypeDefine; | ||
| import org.apache.seatunnel.connectors.seatunnel.paimon.config.PaimonSinkConfig; | ||
| import org.apache.seatunnel.connectors.seatunnel.paimon.utils.SchemaUtil; | ||
|
|
||
|
|
@@ -35,6 +36,7 @@ | |
| import org.apache.paimon.table.FileStoreTable; | ||
| import org.apache.paimon.table.Table; | ||
| import org.apache.paimon.types.DataField; | ||
| import org.apache.paimon.types.DataType; | ||
|
|
||
| import lombok.extern.slf4j.Slf4j; | ||
|
|
||
|
|
@@ -46,9 +48,9 @@ | |
| public class PaimonCatalog implements Catalog, PaimonTable { | ||
| private static final String DEFAULT_DATABASE = "default"; | ||
|
|
||
| private final String catalogName; | ||
| private final PaimonSinkConfig paimonSinkConfig; | ||
| private final PaimonCatalogLoader paimonCatalogLoader; | ||
| private org.apache.paimon.catalog.Catalog catalog; | ||
|
|
||
| public PaimonCatalog(String catalogName, PaimonSinkConfig paimonSinkConfig) { | ||
|
|
@@ -181,7 +183,12 @@ private CatalogTable toCatalogTable( | |
| TableSchema.Builder builder = TableSchema.builder(); | ||
| dataFields.forEach( | ||
| dataField -> { | ||
| BasicTypeDefine.BasicTypeDefineBuilder<DataType> typeDefineBuilder = | ||
| BasicTypeDefine.<DataType>builder() | ||
| .name(dataField.name()) | ||
| .comment(dataField.description()) | ||
| .nativeType(dataField.type()); | ||
| Column column = SchemaUtil.toSeaTunnelType(typeDefineBuilder.build()); | ||
| builder.column(column); | ||
| }); | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -44,6 +44,8 @@ | |
| @Getter | ||
| public class PaimonConfig implements Serializable { | ||
|
|
||
| public static final String CONNECTOR_IDENTITY = "Paimon"; | ||
|
|
||
| public static final Option<String> WAREHOUSE = | ||
| Options.key("warehouse") | ||
| .stringType() | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,8 +18,9 @@ | |
| package org.apache.seatunnel.connectors.seatunnel.paimon.data; | ||
|
|
||
| import org.apache.seatunnel.api.table.catalog.Column; | ||
| import org.apache.seatunnel.api.table.converter.BasicTypeDefine; | ||
| import org.apache.seatunnel.api.table.converter.TypeConverter; | ||
| import org.apache.seatunnel.connectors.seatunnel.paimon.config.PaimonConfig; | ||
| import org.apache.seatunnel.connectors.seatunnel.paimon.utils.RowTypeConverter; | ||
|
|
||
| import org.apache.paimon.types.DataType; | ||
|
|
@@ -29,21 +30,21 @@ | |
|
|
||
| @Slf4j | ||
| @AutoService(TypeConverter.class) | ||
| public class PaimonTypeMapper implements TypeConverter<BasicTypeDefine<DataType>> { | ||
| public static final PaimonTypeMapper INSTANCE = new PaimonTypeMapper(); | ||
|
|
||
| @Override | ||
| public String identifier() { | ||
| return PaimonConfig.CONNECTOR_IDENTITY; | ||
| } | ||
|
|
||
| @Override | ||
| public Column convert(BasicTypeDefine<DataType> typeDefine) { | ||
| return RowTypeConverter.convert(typeDefine); | ||
| } | ||
|
|
||
| @Override | ||
| public BasicTypeDefine<DataType> reconvert(Column column) { | ||
| return RowTypeConverter.reconvert(column); | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -23,8 +23,8 @@ | |
| import org.apache.seatunnel.api.table.type.SeaTunnelDataType; | ||
| import org.apache.seatunnel.api.table.type.SeaTunnelRow; | ||
| import org.apache.seatunnel.api.table.type.SeaTunnelRowType; | ||
| import org.apache.seatunnel.common.exception.CommonError; | ||
| import org.apache.seatunnel.connectors.seatunnel.paimon.config.PaimonConfig; | ||
|
|
||
| import org.apache.paimon.data.BinaryArray; | ||
| import org.apache.paimon.data.BinaryArrayWriter; | ||
|
|
@@ -68,7 +68,8 @@ private RowConverter() {} | |
| * @param dataType Data type of the array | ||
| * @return SeaTunnel array object | ||
| */ | ||
| public static Object convertArrayType( | ||
| String fieldName, InternalArray array, SeaTunnelDataType<?> dataType) { | ||
| switch (dataType.getSqlType()) { | ||
| case STRING: | ||
| String[] strings = new String[array.size()]; | ||
|
|
@@ -119,10 +120,10 @@ public static Object convert(InternalArray array, SeaTunnelDataType<?> dataType) | |
| } | ||
| return doubles; | ||
| default: | ||
| throw CommonError.unsupportedArrayGenericType( | ||
| PaimonConfig.CONNECTOR_IDENTITY, | ||
| dataType.getSqlType().toString(), | ||
| fieldName); | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -133,7 +134,8 @@ public static Object convert(InternalArray array, SeaTunnelDataType<?> dataType) | |
| * @param dataType SeaTunnel array data type | ||
| * @return Paimon array object {@link BinaryArray} | ||
| */ | ||
| public static BinaryArray reconvert( | ||
| String fieldName, Object array, SeaTunnelDataType<?> dataType) { | ||
| int length = ((Object[]) array).length; | ||
| BinaryArray binaryArray = new BinaryArray(); | ||
| BinaryArrayWriter binaryArrayWriter; | ||
|
|
@@ -220,10 +222,10 @@ public static BinaryArray reconvert(Object array, SeaTunnelDataType<?> dataType) | |
| } | ||
| break; | ||
| default: | ||
| throw CommonError.unsupportedArrayGenericType( | ||
| PaimonConfig.CONNECTOR_IDENTITY, | ||
| dataType.getSqlType().toString(), | ||
| fieldName); | ||
| } | ||
| binaryArrayWriter.complete(); | ||
| return binaryArray; | ||
|
|
@@ -245,6 +247,7 @@ public static SeaTunnelRow convert(InternalRow rowData, SeaTunnelRowType seaTunn | |
| continue; | ||
| } | ||
| SeaTunnelDataType<?> fieldType = seaTunnelRowType.getFieldType(i); | ||
| String fieldName = seaTunnelRowType.getFieldName(i); | ||
| switch (fieldType.getSqlType()) { | ||
| case TINYINT: | ||
| objects[i] = rowData.getByte(i); | ||
|
|
@@ -265,12 +268,11 @@ public static SeaTunnelRow convert(InternalRow rowData, SeaTunnelRowType seaTunn | |
| objects[i] = rowData.getDouble(i); | ||
| break; | ||
| case DECIMAL: | ||
| Decimal decimal = | ||
| rowData.getDecimal( | ||
| i, | ||
| ((DecimalType) fieldType).getPrecision(), | ||
| ((DecimalType) fieldType).getScale()); | ||
| objects[i] = decimal.toBigDecimal(); | ||
| break; | ||
| case STRING: | ||
|
|
@@ -293,19 +295,21 @@ public static SeaTunnelRow convert(InternalRow rowData, SeaTunnelRowType seaTunn | |
| objects[i] = timestamp.toLocalDateTime(); | ||
| break; | ||
| case ARRAY: | ||
| InternalArray paimonArray = rowData.getArray(i); | ||
| ArrayType<?, ?> seatunnelArray = (ArrayType<?, ?>) fieldType; | ||
| objects[i] = | ||
| convertArrayType( | ||
| fieldName, paimonArray, seatunnelArray.getElementType()); | ||
| break; | ||
| case MAP: | ||
| MapType<?, ?> mapType = (MapType<?, ?>) fieldType; | ||
| InternalMap map = rowData.getMap(i); | ||
| InternalArray keyArray = map.keyArray(); | ||
| InternalArray valueArray = map.valueArray(); | ||
| SeaTunnelDataType<?> keyType = mapType.getKeyType(); | ||
| SeaTunnelDataType<?> valueType = mapType.getValueType(); | ||
| Object[] key = (Object[]) convertArrayType(fieldName, keyArray, keyType); | ||
| Object[] value = (Object[]) convertArrayType(fieldName, valueArray, valueType); | ||
| Map<Object, Object> mapData = new HashMap<>(); | ||
| for (int j = 0; j < key.length; j++) { | ||
| mapData.put(key[j], value[j]); | ||
|
|
@@ -319,9 +323,10 @@ public static SeaTunnelRow convert(InternalRow rowData, SeaTunnelRowType seaTunn | |
| objects[i] = convert(row, (SeaTunnelRowType) rowType); | ||
| break; | ||
| default: | ||
| throw CommonError.unsupportedDataType( | ||
| PaimonConfig.CONNECTOR_IDENTITY, | ||
| fieldType.getSqlType().toString(), | ||
| fieldName); | ||
| } | ||
| } | ||
| return new SeaTunnelRow(objects); | ||
|
|
@@ -343,6 +348,12 @@ public static InternalRow reconvert( | |
| // Convert SeaTunnel RowKind to Paimon RowKind | ||
| org.apache.paimon.types.RowKind rowKind = | ||
| RowKindConverter.convertSeaTunnelRowKind2PaimonRowKind(seaTunnelRow.getRowKind()); | ||
| if (rowKind == null) { | ||
| throw CommonError.unsupportedRowKind( | ||
| PaimonConfig.CONNECTOR_IDENTITY, | ||
| seaTunnelRow.getRowKind().shortString(), | ||
| seaTunnelRow.getTableId()); | ||
| } | ||
| binaryRow.setRowKind(rowKind); | ||
| SeaTunnelDataType<?>[] fieldTypes = seaTunnelRowType.getFieldTypes(); | ||
| for (int i = 0; i < fieldTypes.length; i++) { | ||
|
|
@@ -351,6 +362,7 @@ public static InternalRow reconvert( | |
| binaryWriter.setNullAt(i); | ||
| continue; | ||
| } | ||
| String fieldName = seaTunnelRowType.getFieldName(i); | ||
| switch (fieldTypes[i].getSqlType()) { | ||
| case TINYINT: | ||
| binaryWriter.writeByte(i, (Byte) seaTunnelRow.getField(i)); | ||
|
|
@@ -396,7 +408,6 @@ public static InternalRow reconvert( | |
| .setValue(binaryWriter, i, DateTimeUtils.toInternal(date)); | ||
| break; | ||
| case TIMESTAMP: | ||
| DataField dataField = SchemaUtil.getDataField(fields, fieldName); | ||
| int precision = ((TimestampType) dataField.type()).getPrecision(); | ||
| LocalDateTime datetime = (LocalDateTime) seaTunnelRow.getField(i); | ||
|
|
@@ -407,26 +418,31 @@ public static InternalRow reconvert( | |
| MapType<?, ?> mapType = (MapType<?, ?>) seaTunnelRowType.getFieldType(i); | ||
| SeaTunnelDataType<?> keyType = mapType.getKeyType(); | ||
| SeaTunnelDataType<?> valueType = mapType.getValueType(); | ||
| DataType paimonKeyType = RowTypeConverter.reconvert(fieldName, keyType); | ||
| DataType paimonValueType = RowTypeConverter.reconvert(fieldName, valueType); | ||
| Map<?, ?> field = (Map<?, ?>) seaTunnelRow.getField(i); | ||
| Object[] keys = field.keySet().toArray(new Object[0]); | ||
| Object[] values = field.values().toArray(new Object[0]); | ||
| binaryWriter.writeMap( | ||
| i, | ||
| BinaryMap.valueOf( | ||
| reconvert(fieldName, keys, keyType), | ||
| reconvert(fieldName, values, valueType)), | ||
| new InternalMapSerializer(paimonKeyType, paimonValueType)); | ||
| break; | ||
| case ARRAY: | ||
| ArrayType<?, ?> arrayType = (ArrayType<?, ?>) seaTunnelRowType.getFieldType(i); | ||
| BinaryArray paimonArray = | ||
| reconvert( | ||
| fieldName, | ||
| seaTunnelRow.getField(i), | ||
| arrayType.getElementType()); | ||
| binaryWriter.writeArray( | ||
| i, | ||
| paimonArray, | ||
| new InternalArraySerializer( | ||
| RowTypeConverter.reconvert( | ||
| fieldName, arrayType.getElementType()))); | ||
| break; | ||
| case ROW: | ||
| SeaTunnelDataType<?> rowType = seaTunnelRowType.getFieldType(i); | ||
|
|
@@ -438,9 +454,10 @@ public static InternalRow reconvert( | |
| binaryWriter.writeRow(i, paimonRow, new InternalRowSerializer(paimonRowType)); | ||
| break; | ||
| default: | ||
| throw CommonError.unsupportedDataType( | ||
| PaimonConfig.CONNECTOR_IDENTITY, | ||
| seaTunnelRowType.getFieldType(i).getSqlType().toString(), | ||
| fieldName); | ||
| } | ||
| } | ||
| return binaryRow; | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please reuse
public static SeaTunnelRuntimeException unsupportedDataType( String identifier, String dataType, String field). Because we should make sure user know which field can not supported.