Skip to content

[Enhancement](multi-catalogs) Use decimal V3 type in JDBC and Iceberg tables. #18926

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
morningman merged 1 commit into from
Apr 25, 2023
Merged

[Enhancement](multi-catalogs) Use decimal V3 type in JDBC and Iceberg tables. #18926

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions fe/fe-common/src/main/java/org/apache/doris/catalog/ScalarType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ public static ScalarType createType(PrimitiveType type, int len, int precision,
case DECIMAL32:
case DECIMAL64:
case DECIMAL128:
return createDecimalV3Type(precision, scale);
case DECIMALV2:
return createDecimalType(precision, scale);
default:
Expand Down
2 changes: 1 addition & 1 deletion fe/fe-core/src/main/java/org/apache/doris/catalog/external/IcebergExternalTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ private Type icebergPrimitiveTypeToDorisType(org.apache.iceberg.types.Type.Primi
return ScalarType.createCharType(fixed.length());
case DECIMAL:
Types.DecimalType decimal = (Types.DecimalType) primitive;
return ScalarType.createDecimalType(decimal.precision(), decimal.scale());
return ScalarType.createDecimalV3Type(decimal.precision(), decimal.scale());
case DATE:
return ScalarType.createDateV2Type();
case TIMESTAMP:
Expand Down
7 changes: 1 addition & 6 deletions fe/fe-core/src/main/java/org/apache/doris/external/jdbc/JdbcClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
import org.apache.doris.catalog.PrimitiveType;
import org.apache.doris.catalog.ScalarType;
import org.apache.doris.catalog.Type;
import org.apache.doris.common.Config;
import org.apache.doris.common.DdlException;
import org.apache.doris.common.util.Util;

Expand Down Expand Up @@ -880,11 +879,7 @@ public Type trinoTypeToDoris(JdbcFieldSchema fieldSchema) {

private Type createDecimalOrStringType(int precision, int scale) {
if (precision <= ScalarType.MAX_DECIMAL128_PRECISION) {
if (!Config.enable_decimal_conversion && (precision > ScalarType.MAX_DECIMALV2_PRECISION
|| scale > ScalarType.MAX_DECIMALV2_SCALE)) {
return ScalarType.createStringType();
}
return ScalarType.createDecimalType(precision, scale);
return ScalarType.createDecimalV3Type(precision, scale);
}
return ScalarType.createStringType();
}
Expand Down
2 changes: 1 addition & 1 deletion regression-test/data/correctness_p0/table_valued_function/test_hdfs_tvf.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,6 +293,6 @@ s_name TEXT Yes false \N NONE
s_address TEXT Yes false \N NONE
s_nationkey INT Yes false \N NONE
s_phone TEXT Yes false \N NONE
s_acctbal DECIMAL(12, 2) Yes false \N NONE
s_acctbal DECIMALV3(12, 2) Yes false \N NONE
s_comment TEXT Yes false \N NONE