Skip to content

Commit

Permalink
[fix](desc) all type in desc table all should return lowercase result
Browse files Browse the repository at this point in the history
  • Loading branch information
@morrySnow
morrySnow committed Sep 9, 2024
1 parent d7aa336 commit 0344e47
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 16 deletions.
8 changes: 4 additions & 4 deletions fe/fe-core/src/main/java/org/apache/doris/analysis/DescribeStmt.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -238,22 +238,22 @@ public void analyze(Analyzer analyzer) throws UserException {
"");

if (column.getOriginType().isDatetimeV2()) {
StringBuilder typeStr = new StringBuilder("DATETIME");
StringBuilder typeStr = new StringBuilder("datetime");
if (((ScalarType) column.getOriginType()).getScalarScale() > 0) {
typeStr.append("(").append(((ScalarType) column.getOriginType()).getScalarScale())
.append(")");
}
row.set(3, typeStr.toString());
} else if (column.getOriginType().isDateV2()) {
row.set(3, "DATE");
row.set(3, "date");
} else if (column.getOriginType().isDecimalV3()) {
StringBuilder typeStr = new StringBuilder("DECIMAL");
StringBuilder typeStr = new StringBuilder("decimal");
ScalarType sType = (ScalarType) column.getOriginType();
int scale = sType.getScalarScale();
int precision = sType.getScalarPrecision();
// not default
if (scale > 0 && precision != 9) {
typeStr.append("(").append(precision).append(", ").append(scale)
typeStr.append("(").append(precision).append(",").append(scale)
.append(")");
}
row.set(3, typeStr.toString());
Expand Down
24 changes: 12 additions & 12 deletions regression-test/data/schema_change_p0/schema_change_modify_mv_column_type.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@ tbl_scalar_types_dup DUP_KEYS k1 bigint bigint Yes true \N true
c_largeint largeint largeint Yes false \N NONE true
c_float float float Yes false \N NONE true
c_double double double Yes false \N NONE true
c_decimal decimal(20, 3) decimalv3(20, 3) Yes false \N NONE true
c_decimalv3 decimal(20, 3) decimalv3(20, 3) Yes false \N NONE true
c_decimal decimal(20,3) decimalv3(20,3) Yes false \N NONE true
c_decimalv3 decimal(20,3) decimalv3(20,3) Yes false \N NONE true
c_date date datev2 Yes false \N NONE true
c_datetime datetime datetimev2(0) Yes false \N NONE true
c_datev2 date datev2 Yes false \N NONE true
c_datetimev2 datetime datetimev2(0) Yes false \N NONE true
c_char char(15) char(15) Yes false \N NONE true
c_varchar varchar(100) varchar(100) Yes false \N NONE true
c_string text text Yes false \N NONE true

mv_tbl_scalar_types_dup_1 DUP_KEYS mv_c_tinyint tinyint tinyint Yes true \N true `c_tinyint`
mv_c_bool boolean boolean Yes true \N true `c_bool`
mv_k1 bigint bigint Yes true \N true `k1`
Expand All @@ -28,13 +28,13 @@ mv_tbl_scalar_types_dup_1 DUP_KEYS mv_c_tinyint tinyint tinyint Yes true \N tru
mv_c_largeint largeint largeint Yes false \N NONE true `c_largeint`
mv_c_float float float Yes false \N NONE true `c_float`
mv_c_double double double Yes false \N NONE true `c_double`
mv_c_decimal decimal(20, 3) decimalv3(20, 3) Yes false \N NONE true `c_decimal`
mv_c_decimalv3 decimal(20, 3) decimalv3(20, 3) Yes false \N NONE true `c_decimalv3`
mv_c_decimal decimal(20,3) decimalv3(20,3) Yes false \N NONE true `c_decimal`
mv_c_decimalv3 decimal(20,3) decimalv3(20,3) Yes false \N NONE true `c_decimalv3`
mv_c_date date datev2 Yes false \N NONE true `c_date`
mv_c_datetime datetime datetimev2(0) Yes false \N NONE true `c_datetime`
mv_c_datev2 date datev2 Yes false \N NONE true `c_datev2`
mv_c_datetimev2 datetime datetimev2(0) Yes false \N NONE true `c_datetimev2`
mv_c_char character character Yes false \N NONE true `c_char`
mv_c_char character(255) character(255) Yes false \N NONE true `c_char`
mv_c_varchar varchar(65533) varchar(65533) Yes false \N NONE true `c_varchar`
mv_c_string text text Yes false \N NONE true `c_string`

Expand Down Expand Up @@ -72,16 +72,16 @@ tbl_scalar_types_dup DUP_KEYS k1 bigint bigint Yes true \N true
c_largeint largeint largeint Yes false \N NONE true
c_float float float Yes false \N NONE true
c_double double double Yes false \N NONE true
c_decimal decimal(20, 3) decimalv3(20, 3) Yes false \N NONE true
c_decimalv3 decimal(20, 3) decimalv3(20, 3) Yes false \N NONE true
c_decimal decimal(20,3) decimalv3(20,3) Yes false \N NONE true
c_decimalv3 decimal(20,3) decimalv3(20,3) Yes false \N NONE true
c_date date datev2 Yes false \N NONE true
c_datetime datetime datetimev2(0) Yes false \N NONE true
c_datev2 date datev2 Yes false \N NONE true
c_datetimev2 datetime datetimev2(0) Yes false \N NONE true
c_char char(15) char(15) Yes false \N NONE true
c_varchar varchar(100) varchar(100) Yes false \N NONE true
c_string text text Yes false \N NONE true

mv_tbl_scalar_types_dup_1 DUP_KEYS mv_c_tinyint tinyint tinyint Yes true \N true `c_tinyint`
mv_c_bool boolean boolean Yes true \N true `c_bool`
mv_k1 bigint bigint Yes true \N true `k1`
Expand All @@ -91,13 +91,13 @@ mv_tbl_scalar_types_dup_1 DUP_KEYS mv_c_tinyint tinyint tinyint Yes true \N tru
mv_c_largeint largeint largeint Yes false \N NONE true `c_largeint`
mv_c_float float float Yes false \N NONE true `c_float`
mv_c_double double double Yes false \N NONE true `c_double`
mv_c_decimal decimal(20, 3) decimalv3(20, 3) Yes false \N NONE true `c_decimal`
mv_c_decimalv3 decimal(20, 3) decimalv3(20, 3) Yes false \N NONE true `c_decimalv3`
mv_c_decimal decimal(20,3) decimalv3(20,3) Yes false \N NONE true `c_decimal`
mv_c_decimalv3 decimal(20,3) decimalv3(20,3) Yes false \N NONE true `c_decimalv3`
mv_c_date date datev2 Yes false \N NONE true `c_date`
mv_c_datetime datetime datetimev2(0) Yes false \N NONE true `c_datetime`
mv_c_datev2 date datev2 Yes false \N NONE true `c_datev2`
mv_c_datetimev2 datetime datetimev2(0) Yes false \N NONE true `c_datetimev2`
mv_c_char character character Yes false \N NONE true `c_char`
mv_c_char character(255) character(255) Yes false \N NONE true `c_char`
mv_c_varchar varchar(65533) varchar(65533) Yes false \N NONE true `c_varchar`
mv_c_string text text Yes false \N NONE true `c_string`

0 comments on commit 0344e47

Please sign in to comment.