This is an automated email from the ASF dual-hosted git repository. kxiao pushed a commit to branch branch-2.0 in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.0 by this push: new ce88df4a9bc [chore](desc) remove blank between precision and scale of decimal type (#40608) ce88df4a9bc is described below commit ce88df4a9bca0c99e1eaa1a25b5227163f93e56b Author: morrySnow <101034200+morrys...@users.noreply.github.com> AuthorDate: Wed Sep 11 09:29:05 2024 +0800 [chore](desc) remove blank between precision and scale of decimal type (#40608) --- .../doris/common/proc/IndexSchemaProcNode.java | 2 +- .../test_create_table_with_bloom_filter.out | 20 ++++++++++---------- .../datatype_p0/decimalv3/test_show_decimalv3.out | 2 +- .../jdbc/test_doris_jdbc_catalog.out | 4 ++-- .../jdbc/test_mysql_jdbc_catalog.out | 4 ++-- .../jdbc/test_oracle_jdbc_catalog.out | 6 +++--- .../external_table_p0/jdbc/test_pg_jdbc_catalog.out | 2 +- .../jdbc/test_sqlserver_jdbc_catalog.out | 8 ++++---- .../test_decimal_bitmap_index_multi_page.out | 2 +- 9 files changed, 25 insertions(+), 25 deletions(-) diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/proc/IndexSchemaProcNode.java b/fe/fe-core/src/main/java/org/apache/doris/common/proc/IndexSchemaProcNode.java index 2166ab90eb1..44b026b1142 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/common/proc/IndexSchemaProcNode.java +++ b/fe/fe-core/src/main/java/org/apache/doris/common/proc/IndexSchemaProcNode.java @@ -95,7 +95,7 @@ public class IndexSchemaProcNode implements ProcNodeInterface { 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(")"); } rowList.set(1, typeStr.toString()); diff --git a/regression-test/data/bloom_filter_p0/test_create_table_with_bloom_filter.out b/regression-test/data/bloom_filter_p0/test_create_table_with_bloom_filter.out index 20d5b03aff9..612337ab30b 100644 --- a/regression-test/data/bloom_filter_p0/test_create_table_with_bloom_filter.out +++ b/regression-test/data/bloom_filter_p0/test_create_table_with_bloom_filter.out @@ -11,11 +11,11 @@ char_50_key char(50) No true \N BLOOM_FILTER character_key varchar(500) No true \N BLOOM_FILTER char_key char(1) No true \N BLOOM_FILTER character_most_key varchar(65533) No true \N BLOOM_FILTER -decimal_key decimal(20, 6) No true \N BLOOM_FILTER -decimal_most_key decimal(27, 9) No true \N BLOOM_FILTER -decimal32_key decimal(5, 1) No true \N BLOOM_FILTER -decimal64_key decimal(14, 1) No true \N BLOOM_FILTER -decimal128_key decimal(38, 1) No true \N BLOOM_FILTER +decimal_key decimal(20,6) No true \N BLOOM_FILTER +decimal_most_key decimal(27,9) No true \N BLOOM_FILTER +decimal32_key decimal(5,1) No true \N BLOOM_FILTER +decimal64_key decimal(14,1) No true \N BLOOM_FILTER +decimal128_key decimal(38,1) No true \N BLOOM_FILTER date_key date No true \N BLOOM_FILTER datetime_key datetime No true \N BLOOM_FILTER datev2_key date No true \N BLOOM_FILTER @@ -30,11 +30,11 @@ char_50_value char(50) No false \N REPLACE character_value varchar(500) No false \N REPLACE char_value char(1) No false \N REPLACE character_most_value varchar(65533) No false \N REPLACE -decimal_value decimal(20, 6) No false \N SUM -decimal_most_value decimal(27, 9) No false \N SUM -decimal32_value decimal(5, 1) No false \N SUM -decimal64_value decimal(14, 1) No false \N SUM -decimal128_value decimal(38, 1) No false \N SUM +decimal_value decimal(20,6) No false \N SUM +decimal_most_value decimal(27,9) No false \N SUM +decimal32_value decimal(5,1) No false \N SUM +decimal64_value decimal(14,1) No false \N SUM +decimal128_value decimal(38,1) No false \N SUM date_value_max date No false \N MAX date_value_replace date No false \N REPLACE date_value_min date No false \N MIN diff --git a/regression-test/data/datatype_p0/decimalv3/test_show_decimalv3.out b/regression-test/data/datatype_p0/decimalv3/test_show_decimalv3.out index f0b0bbd3206..51c4db7556d 100644 --- a/regression-test/data/datatype_p0/decimalv3/test_show_decimalv3.out +++ b/regression-test/data/datatype_p0/decimalv3/test_show_decimalv3.out @@ -1,7 +1,7 @@ -- This file is automatically generated. You should know what you did if you want to edit this -- !select1 -- id int No true \N -dd decimal(15, 6) Yes false \N NONE +dd decimal(15,6) Yes false \N NONE -- !select2 -- showdb UNIQUE_KEYS id int int No true \N true diff --git a/regression-test/data/external_table_p0/jdbc/test_doris_jdbc_catalog.out b/regression-test/data/external_table_p0/jdbc/test_doris_jdbc_catalog.out index 0fafd18e6de..e1891f24f41 100644 --- a/regression-test/data/external_table_p0/jdbc/test_doris_jdbc_catalog.out +++ b/regression-test/data/external_table_p0/jdbc/test_doris_jdbc_catalog.out @@ -80,8 +80,8 @@ bigint_col bigint Yes false \N NONE largeint_col largeint Yes false \N NONE float_col float Yes false \N NONE double_col double Yes false \N NONE -decimal_col decimal(10, 5) Yes false \N NONE -decimal_col2 decimal(30, 10) Yes false \N NONE +decimal_col decimal(10,5) Yes false \N NONE +decimal_col2 decimal(30,10) Yes false \N NONE date_col date Yes false \N NONE datetime_col datetime(3) Yes false \N NONE char_col text Yes false \N NONE diff --git a/regression-test/data/external_table_p0/jdbc/test_mysql_jdbc_catalog.out b/regression-test/data/external_table_p0/jdbc/test_mysql_jdbc_catalog.out index 4da75c92e6f..db9006e57c3 100644 --- a/regression-test/data/external_table_p0/jdbc/test_mysql_jdbc_catalog.out +++ b/regression-test/data/external_table_p0/jdbc/test_mysql_jdbc_catalog.out @@ -346,8 +346,8 @@ boolean tinyint Yes false \N NONE char text Yes false \N NONE date date Yes false \N NONE datetime datetime Yes false \N NONE -decimal decimal(12, 4) Yes false \N NONE -decimal_u decimal(19, 5) Yes false \N NONE +decimal decimal(12,4) Yes false \N NONE +decimal_u decimal(19,5) Yes false \N NONE double double Yes false \N NONE double_u double Yes false \N NONE enum text Yes false \N NONE diff --git a/regression-test/data/external_table_p0/jdbc/test_oracle_jdbc_catalog.out b/regression-test/data/external_table_p0/jdbc/test_oracle_jdbc_catalog.out index 4adc3483644..dddea819a54 100644 --- a/regression-test/data/external_table_p0/jdbc/test_oracle_jdbc_catalog.out +++ b/regression-test/data/external_table_p0/jdbc/test_oracle_jdbc_catalog.out @@ -187,14 +187,14 @@ N2 largeint Yes false \N NONE N3 decimal Yes false \N NONE N4 largeint Yes false \N NONE N5 largeint Yes false \N NONE -N6 decimal(5, 2) Yes false \N NONE +N6 decimal(5,2) Yes false \N NONE N7 double Yes false \N NONE N8 double Yes false \N NONE N9 double Yes false \N NONE NAME text Yes false \N NONE -NUM1 decimal(5, 2) Yes false \N NONE +NUM1 decimal(5,2) Yes false \N NONE NUM2 int Yes false \N NONE -NUM4 decimal(7, 7) Yes false \N NONE +NUM4 decimal(7,7) Yes false \N NONE REMARK text Yes false \N NONE SMALLINT_VALUE1 smallint Yes false \N NONE SMALLINT_VALUE2 int Yes false \N NONE diff --git a/regression-test/data/external_table_p0/jdbc/test_pg_jdbc_catalog.out b/regression-test/data/external_table_p0/jdbc/test_pg_jdbc_catalog.out index 2d717cf3453..a905bae7218 100644 --- a/regression-test/data/external_table_p0/jdbc/test_pg_jdbc_catalog.out +++ b/regression-test/data/external_table_p0/jdbc/test_pg_jdbc_catalog.out @@ -2243,7 +2243,7 @@ char_value text Yes false \N NONE cidr_value text Yes false \N NONE circle_value text Yes false \N NONE date_value date Yes false \N NONE -decimal_value decimal(10, 3) Yes false \N NONE +decimal_value decimal(10,3) Yes false \N NONE id int No true \N inet_value text Yes false \N NONE int_value int Yes false \N NONE diff --git a/regression-test/data/external_table_p0/jdbc/test_sqlserver_jdbc_catalog.out b/regression-test/data/external_table_p0/jdbc/test_sqlserver_jdbc_catalog.out index d55491bebb8..3d4cd2f4a85 100644 --- a/regression-test/data/external_table_p0/jdbc/test_sqlserver_jdbc_catalog.out +++ b/regression-test/data/external_table_p0/jdbc/test_sqlserver_jdbc_catalog.out @@ -83,8 +83,8 @@ float_value double Yes false \N NONE floatn_value float Yes false \N NONE decimal_value decimal Yes false \N NONE numeric_value decimal Yes false \N NONE -decimal_value2 decimal(38, 10) Yes false \N NONE -numeric_value2 decimal(38, 10) Yes false \N NONE +decimal_value2 decimal(38,10) Yes false \N NONE +numeric_value2 decimal(38,10) Yes false \N NONE char_value text Yes false \N NONE varchar_value text Yes false \N NONE varcharmax_value text Yes false \N NONE @@ -99,8 +99,8 @@ smalldatetime_value datetime Yes false \N NONE datetimeoffset_value text Yes false \N NONE text_value text Yes false \N NONE ntext_value text Yes false \N NONE -money_value decimal(19, 4) Yes false \N NONE -smallmoney_value decimal(10, 4) Yes false \N NONE +money_value decimal(19,4) Yes false \N NONE +smallmoney_value decimal(10,4) Yes false \N NONE bit_value boolean Yes false \N NONE -- !query_ctas -- diff --git a/regression-test/data/index_p0/test_decimal_bitmap_index_multi_page.out b/regression-test/data/index_p0/test_decimal_bitmap_index_multi_page.out index 785a3f2c580..4a01d21fc2e 100644 --- a/regression-test/data/index_p0/test_decimal_bitmap_index_multi_page.out +++ b/regression-test/data/index_p0/test_decimal_bitmap_index_multi_page.out @@ -1,6 +1,6 @@ -- This file is automatically generated. You should know what you did if you want to edit this -- !sql -- -a decimal(12, 6) No true \N +a decimal(12,6) No true \N -- !sql -- 0.000001 --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org For additional commands, e-mail: commits-h...@doris.apache.org