[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
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
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 |
|---|---|---|
|
|
@@ -19,13 +19,14 @@ | |
|
|
||
| import org.apache.seatunnel.api.table.catalog.Column; | ||
| import org.apache.seatunnel.api.table.catalog.PhysicalColumn; | ||
| import org.apache.seatunnel.api.table.converter.BasicTypeDefine; | ||
| import org.apache.seatunnel.api.table.type.BasicType; | ||
| import org.apache.seatunnel.api.table.type.LocalTimeType; | ||
| import org.apache.seatunnel.api.table.type.PrimitiveByteArrayType; | ||
| import org.apache.seatunnel.api.table.type.SeaTunnelDataType; | ||
| 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.schema.TableSchema; | ||
| import org.apache.paimon.types.ArrayType; | ||
|
|
@@ -80,11 +81,20 @@ public static SeaTunnelRowType convert(RowType rowType) { | |
| /** | ||
| * Convert Paimon row type {@link DataType} to SeaTunnel row type {@link SeaTunnelDataType} | ||
| * | ||
| * @param typeDefine Paimon data type | ||
| * @return SeaTunnel data type {@link SeaTunnelDataType} | ||
| */ | ||
| public static Column convert(BasicTypeDefine<DataType> typeDefine) { | ||
|
|
||
| PhysicalColumn.PhysicalColumnBuilder physicalColumnBuilder = | ||
| PhysicalColumn.builder() | ||
| .name(typeDefine.getName()) | ||
| .sourceType(typeDefine.getColumnType()) | ||
| .nullable(typeDefine.isNullable()) | ||
| .defaultValue(typeDefine.getDefaultValue()) | ||
| .comment(typeDefine.getComment()); | ||
|
|
||
| DataType dataType = typeDefine.getNativeType(); | ||
| SeaTunnelDataType<?> seaTunnelDataType; | ||
| PaimonToSeaTunnelTypeVisitor paimonToSeaTunnelTypeVisitor = | ||
| PaimonToSeaTunnelTypeVisitor.INSTANCE; | ||
|
|
@@ -164,12 +174,8 @@ public static Column convert(DataType dataType) { | |
| seaTunnelDataType = paimonToSeaTunnelTypeVisitor.visit((RowType) dataType); | ||
| break; | ||
| default: | ||
| throw CommonError.unsupportedDataType( | ||
| PaimonConfig.CONNECTOR_IDENTITY, dataType.asSQLString()); | ||
| } | ||
| return physicalColumnBuilder.dataType(seaTunnelDataType).build(); | ||
| } | ||
|
|
@@ -209,7 +215,7 @@ public static RowType reconvert(SeaTunnelRowType seaTunnelRowType, TableSchema t | |
| * @param column SeaTunnel data type {@link Column} | ||
| * @return Paimon data type {@link DataType} | ||
| */ | ||
| public static BasicTypeDefine<DataType> reconvert(Column column) { | ||
| return SeaTunnelTypeToPaimonVisitor.INSTANCE.visit(column); | ||
| } | ||
|
|
||
|
|
@@ -234,18 +240,53 @@ private static class SeaTunnelTypeToPaimonVisitor { | |
|
|
||
| private SeaTunnelTypeToPaimonVisitor() {} | ||
|
|
||
| public BasicTypeDefine<DataType> visit(Column column) { | ||
| BasicTypeDefine.BasicTypeDefineBuilder<DataType> builder = | ||
| BasicTypeDefine.<DataType>builder() | ||
| .name(column.getName()) | ||
| .nullable(column.isNullable()) | ||
| .comment(column.getComment()) | ||
| .defaultValue(column.getDefaultValue()); | ||
| SeaTunnelDataType<?> dataType = column.getDataType(); | ||
| Integer scale = column.getScale(); | ||
| switch (dataType.getSqlType()) { | ||
| case TIMESTAMP: | ||
| int timestampScale = | ||
| Objects.isNull(scale) ? TimestampType.DEFAULT_PRECISION : scale; | ||
| TimestampType timestampType = DataTypes.TIMESTAMP(timestampScale); | ||
| builder.nativeType(timestampType); | ||
| builder.dataType(timestampType.getTypeRoot().name()); | ||
| builder.columnType(timestampType.toString()); | ||
| builder.scale(timestampScale); | ||
| builder.length(column.getColumnLength()); | ||
| return builder.build(); | ||
| case TIME: | ||
| int timeScale = Objects.isNull(scale) ? TimeType.DEFAULT_PRECISION : scale; | ||
| TimeType timeType = DataTypes.TIME(timeScale); | ||
| builder.nativeType(timeType); | ||
| builder.columnType(timeType.toString()); | ||
| builder.dataType(timeType.getTypeRoot().name()); | ||
| builder.scale(timeScale); | ||
| builder.length(column.getColumnLength()); | ||
| return builder.build(); | ||
| case DECIMAL: | ||
| int precision = | ||
|
There was a problem hiding this comment. In some cases, the There was a problem hiding this comment.
done. |
||
| ((org.apache.seatunnel.api.table.type.DecimalType) dataType) | ||
| .getPrecision(); | ||
| DecimalType decimalType = DataTypes.DECIMAL(precision, scale); | ||
| builder.nativeType(decimalType); | ||
| builder.columnType(decimalType.toString()); | ||
| builder.dataType(decimalType.getTypeRoot().name()); | ||
| builder.scale(scale); | ||
| builder.precision((long) precision); | ||
| builder.length(column.getColumnLength()); | ||
| return builder.build(); | ||
| default: | ||
| builder.nativeType(visit(dataType)); | ||
| builder.columnType(dataType.toString()); | ||
| builder.length(column.getColumnLength()); | ||
| builder.dataType(dataType.getSqlType().name()); | ||
| return builder.build(); | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -301,9 +342,8 @@ public DataType visit(SeaTunnelDataType<?> dataType) { | |
| Arrays.stream(fieldTypes).map(this::visit).toArray(DataType[]::new); | ||
| return DataTypes.ROW(dataTypes); | ||
| default: | ||
| throw CommonError.unsupportedDataType( | ||
| PaimonConfig.CONNECTOR_IDENTITY, dataType.getSqlType().toString()); | ||
| } | ||
| } | ||
| } | ||
|
|
@@ -417,12 +457,9 @@ public SeaTunnelDataType<?> visit(ArrayType arrayType) { | |
| case DOUBLE: | ||
| return org.apache.seatunnel.api.table.type.ArrayType.DOUBLE_ARRAY_TYPE; | ||
| default: | ||
| throw CommonError.unsupportedArrayGenericType( | ||
| PaimonConfig.CONNECTOR_IDENTITY, | ||
| seaTunnelArrayType.getSqlType().toString()); | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -445,9 +482,8 @@ public SeaTunnelDataType<?> visit(RowType rowType) { | |
|
|
||
| @Override | ||
| protected SeaTunnelDataType defaultMethod(DataType dataType) { | ||
|
There was a problem hiding this comment. @Hisoka-X This There was a problem hiding this comment. Please put fieldname as There was a problem hiding this comment.
done. |
||
| throw CommonError.unsupportedDataType( | ||
| PaimonConfig.CONNECTOR_IDENTITY, dataType.getTypeRoot().name()); | ||
| } | ||
| } | ||
| } | ||
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.