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

yiguolei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git


The following commit(s) were added to refs/heads/master by this push:
     new fd3c42d8cf2 [fix](test) order by clause in test_map (#27390)
fd3c42d8cf2 is described below

commit fd3c42d8cf2d676c858e11977adbd17d0a32b29c
Author: Jerry Hu <mrh...@gmail.com>
AuthorDate: Wed Nov 22 16:43:31 2023 +0800

    [fix](test) order by clause in test_map (#27390)
---
 .../data/datatype_p0/complex_types/test_map.out    | 26 +++++++++++-----------
 .../data/nereids_p0/datatype/test_map.out          | 26 +++++++++++-----------
 .../datatype_p0/complex_types/test_map.groovy      | 17 +++++++-------
 .../suites/nereids_p0/datatype/test_map.groovy     | 17 +++++++-------
 4 files changed, 44 insertions(+), 42 deletions(-)

diff --git a/regression-test/data/datatype_p0/complex_types/test_map.out 
b/regression-test/data/datatype_p0/complex_types/test_map.out
index 00a74e74af0..4ac971fb3a1 100644
--- a/regression-test/data/datatype_p0/complex_types/test_map.out
+++ b/regression-test/data/datatype_p0/complex_types/test_map.out
@@ -1,16 +1,16 @@
 -- This file is automatically generated. You should know what you did if you 
want to edit this
 -- !sql --
-1      {"key1":"value1"}       1       1
-1      {"key1_1":"value1_1"}   1       1
-1      {"key1":"value1"}       2       1
-1      {"key1_1":"value1_1"}   2       1
-2      {"key2":"value2", "key22":"value22"}    3       2
-2      {"key2_1":"value2_1", "key22_1":"value22_1"}    3       2
-2      {"key2_2":"value2_2", "key22_2":"value22_2"}    3       2
-2      {"key2":"value2", "key22":"value22"}    4       2
-2      {"key2_1":"value2_1", "key22_1":"value22_1"}    4       2
-2      {"key2_2":"value2_2", "key22_2":"value22_2"}    4       2
-3      {"key3":"value3", "key33":"value33", "key3333":"value333"}      5       
3
-3      {"key3":"value3", "key33":"value33", "key3333":"value333"}      6       
3
-4      {"key4":"value4", "key44":"value44", "key444":"value444", 
"key4444":"value4444"}        \N      \N
+1      1       {"key1":"value1"}       1       1
+1      1       {"key1":"value1"}       2       1
+2      1       {"key1_1":"value1_1"}   1       1
+2      1       {"key1_1":"value1_1"}   2       1
+3      2       {"key2":"value2", "key22":"value22"}    3       2
+3      2       {"key2":"value2", "key22":"value22"}    4       2
+4      2       {"key2_1":"value2_1", "key22_1":"value22_1"}    3       2
+4      2       {"key2_1":"value2_1", "key22_1":"value22_1"}    4       2
+5      2       {"key2_2":"value2_2", "key22_2":"value22_2"}    3       2
+5      2       {"key2_2":"value2_2", "key22_2":"value22_2"}    4       2
+6      3       {"key3":"value3", "key33":"value33", "key3333":"value333"}      
5       3
+6      3       {"key3":"value3", "key33":"value33", "key3333":"value333"}      
6       3
+7      4       {"key4":"value4", "key44":"value44", "key444":"value444", 
"key4444":"value4444"}        \N      \N
 
diff --git a/regression-test/data/nereids_p0/datatype/test_map.out 
b/regression-test/data/nereids_p0/datatype/test_map.out
index 00a74e74af0..4ac971fb3a1 100644
--- a/regression-test/data/nereids_p0/datatype/test_map.out
+++ b/regression-test/data/nereids_p0/datatype/test_map.out
@@ -1,16 +1,16 @@
 -- This file is automatically generated. You should know what you did if you 
want to edit this
 -- !sql --
-1      {"key1":"value1"}       1       1
-1      {"key1_1":"value1_1"}   1       1
-1      {"key1":"value1"}       2       1
-1      {"key1_1":"value1_1"}   2       1
-2      {"key2":"value2", "key22":"value22"}    3       2
-2      {"key2_1":"value2_1", "key22_1":"value22_1"}    3       2
-2      {"key2_2":"value2_2", "key22_2":"value22_2"}    3       2
-2      {"key2":"value2", "key22":"value22"}    4       2
-2      {"key2_1":"value2_1", "key22_1":"value22_1"}    4       2
-2      {"key2_2":"value2_2", "key22_2":"value22_2"}    4       2
-3      {"key3":"value3", "key33":"value33", "key3333":"value333"}      5       
3
-3      {"key3":"value3", "key33":"value33", "key3333":"value333"}      6       
3
-4      {"key4":"value4", "key44":"value44", "key444":"value444", 
"key4444":"value4444"}        \N      \N
+1      1       {"key1":"value1"}       1       1
+1      1       {"key1":"value1"}       2       1
+2      1       {"key1_1":"value1_1"}   1       1
+2      1       {"key1_1":"value1_1"}   2       1
+3      2       {"key2":"value2", "key22":"value22"}    3       2
+3      2       {"key2":"value2", "key22":"value22"}    4       2
+4      2       {"key2_1":"value2_1", "key22_1":"value22_1"}    3       2
+4      2       {"key2_1":"value2_1", "key22_1":"value22_1"}    4       2
+5      2       {"key2_2":"value2_2", "key22_2":"value22_2"}    3       2
+5      2       {"key2_2":"value2_2", "key22_2":"value22_2"}    4       2
+6      3       {"key3":"value3", "key33":"value33", "key3333":"value333"}      
5       3
+6      3       {"key3":"value3", "key33":"value33", "key3333":"value333"}      
6       3
+7      4       {"key4":"value4", "key44":"value44", "key444":"value444", 
"key4444":"value4444"}        \N      \N
 
diff --git a/regression-test/suites/datatype_p0/complex_types/test_map.groovy 
b/regression-test/suites/datatype_p0/complex_types/test_map.groovy
index 6a3d28c5ed0..3c146e832e7 100644
--- a/regression-test/suites/datatype_p0/complex_types/test_map.groovy
+++ b/regression-test/suites/datatype_p0/complex_types/test_map.groovy
@@ -20,18 +20,19 @@ suite("test_map") {
     sql "DROP TABLE IF EXISTS `test_map_table`"
     sql """
         create table `test_map_table` (
+            `id` int,
             `k1` int,
             `value` map<text, text>
         ) distributed by hash(`k1`) buckets 1 properties("replication_num" = 
"1");
     """
 
-    sql 'insert into `test_map_table` values (1, {"key1": "value1"});'
-    sql 'insert into `test_map_table` values (1, {"key1_1": "value1_1"});'
-    sql 'insert into `test_map_table` values (2, {"key2": "value2", "key22": 
"value22"});'
-    sql 'insert into `test_map_table` values (2, {"key2_1": "value2_1", 
"key22_1": "value22_1"});'
-    sql 'insert into `test_map_table` values (2, {"key2_2": "value2_2", 
"key22_2": "value22_2"});'
-    sql 'insert into `test_map_table` values (3, {"key3": "value3", "key33": 
"value33", "key3333": "value333"});'
-    sql 'insert into `test_map_table` values (4, {"key4": "value4", "key44": 
"value44", "key444": "value444", "key4444": "value4444"});'
+    sql 'insert into `test_map_table` values (1, 1, {"key1": "value1"});'
+    sql 'insert into `test_map_table` values (2, 1, {"key1_1": "value1_1"});'
+    sql 'insert into `test_map_table` values (3, 2, {"key2": "value2", 
"key22": "value22"});'
+    sql 'insert into `test_map_table` values (4, 2, {"key2_1": "value2_1", 
"key22_1": "value22_1"});'
+    sql 'insert into `test_map_table` values (5, 2, {"key2_2": "value2_2", 
"key22_2": "value22_2"});'
+    sql 'insert into `test_map_table` values (6, 3, {"key3": "value3", 
"key33": "value33", "key3333": "value333"});'
+    sql 'insert into `test_map_table` values (7, 4, {"key4": "value4", 
"key44": "value44", "key444": "value444", "key4444": "value4444"});'
 
     sql "DROP TABLE IF EXISTS `test_map_table_right`"
     sql """
@@ -49,6 +50,6 @@ suite("test_map") {
     sql 'insert into `test_map_table_right` values(6, 3);'
 
     qt_sql """
-        select * from test_map_table left join test_map_table_right on 
test_map_table.k1 = test_map_table_right.value order by 1,3;
+        select * from test_map_table left join test_map_table_right on 
test_map_table.k1 = test_map_table_right.value order by 1,2,4,5;
     """
 }
diff --git a/regression-test/suites/nereids_p0/datatype/test_map.groovy 
b/regression-test/suites/nereids_p0/datatype/test_map.groovy
index 54f41e421f3..f486342c379 100644
--- a/regression-test/suites/nereids_p0/datatype/test_map.groovy
+++ b/regression-test/suites/nereids_p0/datatype/test_map.groovy
@@ -22,18 +22,19 @@ suite("test_map") {
     sql "DROP TABLE IF EXISTS `test_map_table`"
     sql """
         create table `test_map_table` (
+            `id` int,
             `k1` int,
             `value` map<text, text>
         ) distributed by hash(`k1`) buckets 1 properties("replication_num" = 
"1");
     """
 
-    sql 'insert into `test_map_table` values (1, {"key1": "value1"});'
-    sql 'insert into `test_map_table` values (1, {"key1_1": "value1_1"});'
-    sql 'insert into `test_map_table` values (2, {"key2": "value2", "key22": 
"value22"});'
-    sql 'insert into `test_map_table` values (2, {"key2_1": "value2_1", 
"key22_1": "value22_1"});'
-    sql 'insert into `test_map_table` values (2, {"key2_2": "value2_2", 
"key22_2": "value22_2"});'
-    sql 'insert into `test_map_table` values (3, {"key3": "value3", "key33": 
"value33", "key3333": "value333"});'
-    sql 'insert into `test_map_table` values (4, {"key4": "value4", "key44": 
"value44", "key444": "value444", "key4444": "value4444"});'
+    sql 'insert into `test_map_table` values (1, 1, {"key1": "value1"});'
+    sql 'insert into `test_map_table` values (2, 1, {"key1_1": "value1_1"});'
+    sql 'insert into `test_map_table` values (3, 2, {"key2": "value2", 
"key22": "value22"});'
+    sql 'insert into `test_map_table` values (4, 2, {"key2_1": "value2_1", 
"key22_1": "value22_1"});'
+    sql 'insert into `test_map_table` values (5, 2, {"key2_2": "value2_2", 
"key22_2": "value22_2"});'
+    sql 'insert into `test_map_table` values (6, 3, {"key3": "value3", 
"key33": "value33", "key3333": "value333"});'
+    sql 'insert into `test_map_table` values (7, 4, {"key4": "value4", 
"key44": "value44", "key444": "value444", "key4444": "value4444"});'
 
     sql "DROP TABLE IF EXISTS `test_map_table_right`"
     sql """
@@ -51,6 +52,6 @@ suite("test_map") {
     sql 'insert into `test_map_table_right` values(6, 3);'
 
     qt_sql """
-        select * from test_map_table left join test_map_table_right on 
test_map_table.k1 = test_map_table_right.value order by 1,3;
+        select * from test_map_table left join test_map_table_right on 
test_map_table.k1 = test_map_table_right.value order by 1,2,4,5;
     """
 }


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

Reply via email to