You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by mo...@apache.org on 2023/08/20 01:48:41 UTC

[doris] branch branch-1.2-lts updated: [branch1.2](test) fix some regression test case

This is an automated email from the ASF dual-hosted git repository.

morningman pushed a commit to branch branch-1.2-lts
in repository https://gitbox.apache.org/repos/asf/doris.git


The following commit(s) were added to refs/heads/branch-1.2-lts by this push:
     new d96f23eefe [branch1.2](test) fix some regression test case
d96f23eefe is described below

commit d96f23eefe1a515e1e8afa6675da53ef544644ac
Author: morningman <mo...@163.com>
AuthorDate: Sun Aug 20 09:48:27 2023 +0800

    [branch1.2](test) fix some regression test case
---
 .../test_create_table_with_bloom_filter.out        | 20 ++---
 .../data/index_p0/test_bitmap_index.out            |  6 +-
 regression-test/data/query_p0/union/test_union.out | 90 +++++++++++-----------
 .../test_dynamic_partition_with_alter.groovy       | 56 --------------
 .../datetime_functions/test_date_function.groovy   |  2 +-
 .../suites/query_p0/union/test_union.groovy        |  2 +-
 6 files changed, 60 insertions(+), 116 deletions(-)

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 ece2c993db..7ffd5eb1f5 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	DECIMALV3(20,6)	No	true	\N	BLOOM_FILTER
-decimal_most_key	DECIMALV3(27,9)	No	true	\N	BLOOM_FILTER
-decimal32_key	DECIMALV3(5,1)	No	true	\N	BLOOM_FILTER
-decimal64_key	DECIMALV3(14,1)	No	true	\N	BLOOM_FILTER
-decimal128_key	DECIMALV3(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	DECIMALV3(20,6)	No	false	\N	SUM
-decimal_most_value	DECIMALV3(27,9)	No	false	\N	SUM
-decimal32_value	DECIMALV3(5,1)	No	false	\N	SUM
-decimal64_value	DECIMALV3(14,1)	No	false	\N	SUM
-decimal128_value	DECIMALV3(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/index_p0/test_bitmap_index.out b/regression-test/data/index_p0/test_bitmap_index.out
index db40247254..10f25b0af9 100644
--- a/regression-test/data/index_p0/test_bitmap_index.out
+++ b/regression-test/data/index_p0/test_bitmap_index.out
@@ -9,7 +9,7 @@ k6	VARCHAR(1)	Yes	false	\N	NONE
 k7	DATE	Yes	false	\N	NONE
 k8	DATETIME	Yes	false	\N	NONE
 k9	LARGEINT	Yes	false	\N	NONE
-k10	DECIMALV3(9,0)	Yes	false	\N	NONE
+k10	DECIMAL(9,0)	Yes	false	\N	NONE
 k11	BOOLEAN	Yes	false	\N	NONE
 k12	DATE	Yes	false	\N	NONE
 k13	DATETIME	Yes	false	\N	NONE
@@ -46,7 +46,7 @@ k6	VARCHAR(1)	Yes	true	\N
 k7	DATE	Yes	true	\N	
 k8	DATETIME	Yes	true	\N	
 k9	LARGEINT	Yes	true	\N	
-k10	DECIMALV3(9,0)	Yes	true	\N	
+k10	DECIMAL(9,0)	Yes	true	\N	
 k11	BOOLEAN	Yes	true	\N	
 k12	DATE	Yes	true	\N	
 k13	DATETIME	Yes	true	\N	
@@ -84,7 +84,7 @@ k6	VARCHAR(1)	Yes	true	\N
 k7	DATE	Yes	true	\N	
 k8	DATETIME	Yes	true	\N	
 k9	LARGEINT	Yes	true	\N	
-k10	DECIMALV3(9,0)	Yes	true	\N	
+k10	DECIMAL(9,0)	Yes	true	\N	
 k11	BOOLEAN	Yes	true	\N	
 k12	DATE	Yes	false	\N	REPLACE
 k13	DATETIME	Yes	false	\N	REPLACE
diff --git a/regression-test/data/query_p0/union/test_union.out b/regression-test/data/query_p0/union/test_union.out
index 4d398f2f2a..c2f79e1c24 100644
--- a/regression-test/data/query_p0/union/test_union.out
+++ b/regression-test/data/query_p0/union/test_union.out
@@ -137,22 +137,22 @@ false	3	1989	1002	11011905	24453.325	false	2012-03-14	2000-01-01T00:00	yunlj8@nk
 16
 
 -- !union19 --
-1	123.123000000	true	wangjuoo4
-10	10.000000000	hello	world
-20	20.000000000	wangjuoo4	beautiful
+1	123.123	true	wangjuoo4
+10	10.0	hello	world
+20	20.0	wangjuoo4	beautiful
 255	3.141592654	false	 
-255	987456.123000000	true	wangjuoo5
-1985	0E-9	true	du3lnvl
-1986	20.268000000	false	wangynnsf
-1989	-987.001000000	true	yunlj8@nk
-1989	0.100000000	true	wangjuoo4
-1989	78945.000000000	false	yunlj8@nk
-1991	-123456.540000000	false	wangynnsf
-1991	0E-9	true	wangjuoo4
-1991	2.060000000	false	yanvjldjlll
+255	987456.123	true	wangjuoo5
+1985	-0.0	true	du3lnvl
+1986	20.268	false	wangynnsf
+1989	-987.001	true	yunlj8@nk
+1989	0.1	true	wangjuoo4
+1989	78945.0	false	yunlj8@nk
+1991	-123456.54	false	wangynnsf
+1991	0.0	true	wangjuoo4
+1991	2.06	false	yanvjldjlll
 1992	3.141592653	true	
-32767	-564.898000000	false	lifsno
-32767	0.100000000	true	yanavnd
+32767	-564.898	false	lifsno
+32767	0.1	true	yanavnd
 
 -- !union20 --
 1	1989	1001	11011902	123.123
@@ -194,39 +194,39 @@ false	3	1989	1002	11011905	24453.325	false	2012-03-14	2000-01-01T00:00	yunlj8@nk
 5	true	du3lnvl	-0.0	-365.0	2015-01-01
 
 -- !union24 --
-1	2	3	4	3.140	hello	world	0E-9	1.100000000	1989-03-21	1989-03-21T13:00
-1	1989	1001	11011902	123.123	true	wangjuoo4	0.100000000	6.333000192	1989-03-21	1989-03-21T13:00
-1	1989	1001	11011902	123.123	true	wangjuoo4	0.100000000	6.333000192	1989-03-21	1989-03-21T13:00
-2	1986	1001	11011903	1243.500	false	wangynnsf	20.268000000	789.249982464	1901-12-31	1989-03-21T13:00
-2	1986	1001	11011903	1243.500	false	wangynnsf	20.268000000	789.249982464	1901-12-31	1989-03-21T13:00
-3	1989	1002	11011905	24453.325	false	yunlj8@nk	78945.000000000	3654.000050176	2012-03-14	2000-01-01T00:00
-3	1989	1002	11011905	24453.325	false	yunlj8@nk	78945.000000000	3654.000050176	2012-03-14	2000-01-01T00:00
-4	1991	3021	-11011907	243243.325	false	yanvjldjlll	2.060000000	-0.001000000	3124-10-10	2015-03-13T10:30
-5	1985	5014	-11011903	243.325	true	du3lnvl	0E-9	-364.999999488	2015-01-01	2015-03-13T12:36:38
-6	32767	3021	123456	604587.000	true	yanavnd	0.100000000	80698.996162560	2014-11-11	2015-03-13T12:36:38
-7	-32767	1002	7210457	3.141	false	jiw3n4	0E-9	6057.999990784	1988-03-21	1901-01-01T00:00
-8	255	2147483647	11011920	-0.123	true	wangjuoo5	987456.123000000	12.140000256	1989-03-21	9999-11-11T12:12
-10	1991	5014	9223372036854775807	-258.369	false	wangynnsf	-123456.540000000	0.235000000	2015-04-02	2013-04-02T15:16:52
-11	1989	25699	-9223372036854775807	0.666	true	yunlj8@nk	-987.001000000	4.336000000	2015-04-02	1989-03-21T13:11
-13	-32767	2147483647	-9223372036854775807	100.001	false	wenlsfnl	123.456000000	3.141592832	2015-04-02	2015-04-02T00:00
-14	255	103	11011902	0.000	false	 	3.141592654	2.036000000	2015-04-02	2015-04-02T00:00
-15	1992	3021	11011920	0.000	true		3.141592653	20.455999488	9999-12-12	2015-04-02T00:00
+1	2	3	4	3.140	hello	world	0.0	1.1	1989-03-21	1989-03-21T13:00
+1	1989	1001	11011902	123.123	true	wangjuoo4	0.1	6.333000183105469	1989-03-21	1989-03-21T13:00
+1	1989	1001	11011902	123.123	true	wangjuoo4	0.1	6.333000183105469	1989-03-21	1989-03-21T13:00
+2	1986	1001	11011903	1243.500	false	wangynnsf	20.268	789.25	1901-12-31	1989-03-21T13:00
+2	1986	1001	11011903	1243.500	false	wangynnsf	20.268	789.25	1901-12-31	1989-03-21T13:00
+3	1989	1002	11011905	24453.325	false	yunlj8@nk	78945.0	3654.0	2012-03-14	2000-01-01T00:00
+3	1989	1002	11011905	24453.325	false	yunlj8@nk	78945.0	3654.0	2012-03-14	2000-01-01T00:00
+4	1991	3021	-11011907	243243.325	false	yanvjldjlll	2.06	-0.0010000000474974513	3124-10-10	2015-03-13T10:30
+5	1985	5014	-11011903	243.325	true	du3lnvl	-0.0	-365.0	2015-01-01	2015-03-13T12:36:38
+6	32767	3021	123456	604587.000	true	yanavnd	0.1	80699.0	2014-11-11	2015-03-13T12:36:38
+7	-32767	1002	7210457	3.141	false	jiw3n4	0.0	6058.0	1988-03-21	1901-01-01T00:00
+8	255	2147483647	11011920	-0.123	true	wangjuoo5	987456.123	12.140000343322754	1989-03-21	9999-11-11T12:12
+10	1991	5014	9223372036854775807	-258.369	false	wangynnsf	-123456.54	0.23499999940395355	2015-04-02	2013-04-02T15:16:52
+11	1989	25699	-9223372036854775807	0.666	true	yunlj8@nk	-987.001	4.335999965667725	2015-04-02	1989-03-21T13:11
+13	-32767	2147483647	-9223372036854775807	100.001	false	wenlsfnl	123.456	3.1415927410125732	2015-04-02	2015-04-02T00:00
+14	255	103	11011902	0.000	false	 	3.141592654	2.0360000133514404	2015-04-02	2015-04-02T00:00
+15	1992	3021	11011920	0.000	true		3.141592653	20.45599937438965	9999-12-12	2015-04-02T00:00
 
 -- !union25 --
-1	2	3	4	3.140	hello	world	0E-9	1.100000000	1989-03-21	1989-03-21T13:00
-1	1989	1001	11011902	123.123	true	wangjuoo4	0.100000000	6.333000192	1989-03-21	1989-03-21T13:00
-2	1986	1001	11011903	1243.500	false	wangynnsf	20.268000000	789.249982464	1901-12-31	1989-03-21T13:00
-3	1989	1002	11011905	24453.325	false	yunlj8@nk	78945.000000000	3654.000050176	2012-03-14	2000-01-01T00:00
-4	1991	3021	-11011907	243243.325	false	yanvjldjlll	2.060000000	-0.001000000	3124-10-10	2015-03-13T10:30
-5	1985	5014	-11011903	243.325	true	du3lnvl	0E-9	-364.999999488	2015-01-01	2015-03-13T12:36:38
-6	32767	3021	123456	604587.000	true	yanavnd	0.100000000	80698.996162560	2014-11-11	2015-03-13T12:36:38
-7	-32767	1002	7210457	3.141	false	jiw3n4	0E-9	6057.999990784	1988-03-21	1901-01-01T00:00
-8	255	2147483647	11011920	-0.123	true	wangjuoo5	987456.123000000	12.140000256	1989-03-21	9999-11-11T12:12
-10	1991	5014	9223372036854775807	-258.369	false	wangynnsf	-123456.540000000	0.235000000	2015-04-02	2013-04-02T15:16:52
-11	1989	25699	-9223372036854775807	0.666	true	yunlj8@nk	-987.001000000	4.336000000	2015-04-02	1989-03-21T13:11
-13	-32767	2147483647	-9223372036854775807	100.001	false	wenlsfnl	123.456000000	3.141592832	2015-04-02	2015-04-02T00:00
-14	255	103	11011902	0.000	false	 	3.141592654	2.036000000	2015-04-02	2015-04-02T00:00
-15	1992	3021	11011920	0.000	true		3.141592653	20.455999488	9999-12-12	2015-04-02T00:00
+1	2	3	4	3.140	hello	world	0.0	1.1	1989-03-21	1989-03-21T13:00
+1	1989	1001	11011902	123.123	true	wangjuoo4	0.1	6.333000183105469	1989-03-21	1989-03-21T13:00
+2	1986	1001	11011903	1243.500	false	wangynnsf	20.268	789.25	1901-12-31	1989-03-21T13:00
+3	1989	1002	11011905	24453.325	false	yunlj8@nk	78945.0	3654.0	2012-03-14	2000-01-01T00:00
+4	1991	3021	-11011907	243243.325	false	yanvjldjlll	2.06	-0.0010000000474974513	3124-10-10	2015-03-13T10:30
+5	1985	5014	-11011903	243.325	true	du3lnvl	-0.0	-365.0	2015-01-01	2015-03-13T12:36:38
+6	32767	3021	123456	604587.000	true	yanavnd	0.1	80699.0	2014-11-11	2015-03-13T12:36:38
+7	-32767	1002	7210457	3.141	false	jiw3n4	0.0	6058.0	1988-03-21	1901-01-01T00:00
+8	255	2147483647	11011920	-0.123	true	wangjuoo5	987456.123	12.140000343322754	1989-03-21	9999-11-11T12:12
+10	1991	5014	9223372036854775807	-258.369	false	wangynnsf	-123456.54	0.23499999940395355	2015-04-02	2013-04-02T15:16:52
+11	1989	25699	-9223372036854775807	0.666	true	yunlj8@nk	-987.001	4.335999965667725	2015-04-02	1989-03-21T13:11
+13	-32767	2147483647	-9223372036854775807	100.001	false	wenlsfnl	123.456	3.1415927410125732	2015-04-02	2015-04-02T00:00
+14	255	103	11011902	0.000	false	 	3.141592654	2.0360000133514404	2015-04-02	2015-04-02T00:00
+15	1992	3021	11011920	0.000	true		3.141592653	20.45599937438965	9999-12-12	2015-04-02T00:00
 
 -- !union26 --
 0.0001	1E-7
diff --git a/regression-test/suites/partition_p0/dynamic_partition/test_dynamic_partition_with_alter.groovy b/regression-test/suites/partition_p0/dynamic_partition/test_dynamic_partition_with_alter.groovy
deleted file mode 100644
index 671ce92fd3..0000000000
--- a/regression-test/suites/partition_p0/dynamic_partition/test_dynamic_partition_with_alter.groovy
+++ /dev/null
@@ -1,56 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-suite("test_dynamic_partition_with_alter") {
-    def tbl = "test_dynamic_partition_with_alter"
-    sql "drop table if exists ${tbl}"
-    sql """
-        CREATE TABLE IF NOT EXISTS ${tbl}
-        ( k1 date NOT NULL, k2 varchar(20) NOT NULL, k3 int sum NOT NULL )
-        AGGREGATE KEY(k1,k2)
-        PARTITION BY RANGE(k1) ( )
-        DISTRIBUTED BY HASH(k1) BUCKETS 1
-        PROPERTIES (
-            "dynamic_partition.enable"="true",
-            "dynamic_partition.end"="3",
-            "dynamic_partition.buckets"="1",
-            "dynamic_partition.start"="-3",
-            "dynamic_partition.prefix"="p",
-            "dynamic_partition.time_unit"="DAY",
-            "dynamic_partition.create_history_partition"="true",
-            "dynamic_partition.replication_allocation" = "tag.location.default: 1")
-        """
-    def result = sql "show partitions from ${tbl}"
-    assertEquals(7, result.size())
-
-    // modify distributed column comment, then try to add too more dynamic partition
-    sql """ alter table ${tbl} modify column k1 comment 'new_comment_for_k1' """
-    sql """ ADMIN SET FRONTEND CONFIG ('dynamic_partition_check_interval_seconds' = '1') """
-    sql """ alter table ${tbl} set('dynamic_partition.end'='5') """
-    result = sql "show partitions from ${tbl}"
-    for (def retry = 0; retry < 15; retry++) {
-        if (result.size() == 9) {
-            break;
-        }
-        logger.info("wait dynamic partition scheduler, sleep 1s")
-        sleep(1000);
-        result = sql "show partitions from ${tbl}"
-    }
-    assertEquals(9, result.size())
-
-    sql "drop table ${tbl}"
-}
diff --git a/regression-test/suites/query_p0/sql_functions/datetime_functions/test_date_function.groovy b/regression-test/suites/query_p0/sql_functions/datetime_functions/test_date_function.groovy
index 8359900214..0811f2ff4a 100644
--- a/regression-test/suites/query_p0/sql_functions/datetime_functions/test_date_function.groovy
+++ b/regression-test/suites/query_p0/sql_functions/datetime_functions/test_date_function.groovy
@@ -650,7 +650,7 @@ suite("test_date_function") {
     sql """ DROP TABLE IF EXISTS ${tableName}; """
     test {
         sql"""select current_timestamp(7);"""
-        check{result, exception, startTime, endTime ->
+        check{ result2, exception, startTime, endTime ->
             assertTrue(exception != null)
             logger.info(exception.message)
         }
diff --git a/regression-test/suites/query_p0/union/test_union.groovy b/regression-test/suites/query_p0/union/test_union.groovy
index 676d18653a..06e26d39ad 100644
--- a/regression-test/suites/query_p0/union/test_union.groovy
+++ b/regression-test/suites/query_p0/union/test_union.groovy
@@ -247,7 +247,7 @@ suite("test_union") {
     check2_doris(res7, res8)
     // 不同类型不同个数
     test {
-        sql """select k1, k2 from ${tbName2} union selectk11, k10, k9  from ${tbName1} order by k1, k2"""
+        sql """select k1, k2 from ${tbName2} union select k11, k10, k9  from ${tbName1} order by k1, k2"""
         check {result, exception, startTime, endTime ->
             assertTrue(exception != null)
             logger.info(exception.message)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org