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

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


The following commit(s) were added to refs/heads/branch-2.1 by this push:
     new 842196ace3b branch-2.1: [regression-test](fix) schema change case bug 
#46782 (#46811)
842196ace3b is described below

commit 842196ace3b56213f8adc7f4b51bb72158e4215a
Author: github-actions[bot] 
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Sun Jan 12 08:58:14 2025 +0800

    branch-2.1: [regression-test](fix) schema change case bug #46782 (#46811)
    
    Cherry-picked from #46782
    
    Co-authored-by: shuke <sh...@selectdb.com>
---
 .../modify_col_type_agg/schema_change_modify_mv_column_type_agg.out     | 2 +-
 .../modify_col_type_dup/schema_change_modify_mv_column_type.out         | 2 +-
 .../modify_col_type_dup2/schema_change_modify_mv_column_type2.out       | 2 +-
 .../modify_col_type_agg/schema_change_modify_mv_column_type_agg.groovy  | 2 +-
 .../modify_col_type_dup/schema_change_modify_mv_column_type.groovy      | 2 +-
 .../modify_col_type_dup2/schema_change_modify_mv_column_type2.groovy    | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git 
a/regression-test/data/schema_change_p0/modify_col_type_agg/schema_change_modify_mv_column_type_agg.out
 
b/regression-test/data/schema_change_p0/modify_col_type_agg/schema_change_modify_mv_column_type_agg.out
index c86341a5686..b1feac9a13a 100644
--- 
a/regression-test/data/schema_change_p0/modify_col_type_agg/schema_change_modify_mv_column_type_agg.out
+++ 
b/regression-test/data/schema_change_p0/modify_col_type_agg/schema_change_modify_mv_column_type_agg.out
@@ -28,7 +28,7 @@ mv_tbl_scalar_types_agg_1     AGG_KEYS        mv_k2   bigint  
bigint  Yes     true    \N              true    `k2`
 
 -- !sql --
 
--- !sql --
+-- !master_sql --
 tbl_scalar_types_agg   AGG_KEYS        k1      bigint  bigint  Yes     true    
\N              true            
                k2      bigint  bigint  Yes     true    \N              true    
        
                c_bool  boolean boolean Yes     false   \N      REPLACE true    
        
diff --git 
a/regression-test/data/schema_change_p0/modify_col_type_dup/schema_change_modify_mv_column_type.out
 
b/regression-test/data/schema_change_p0/modify_col_type_dup/schema_change_modify_mv_column_type.out
index e7d4c675477..3503eca2085 100644
--- 
a/regression-test/data/schema_change_p0/modify_col_type_dup/schema_change_modify_mv_column_type.out
+++ 
b/regression-test/data/schema_change_p0/modify_col_type_dup/schema_change_modify_mv_column_type.out
@@ -62,7 +62,7 @@ mv_tbl_scalar_types_dup_1     DUP_KEYS        mv_c_tinyint    
tinyint tinyint Yes     true    \N              tru
 -2106969609    true    10      29572   16738   1736115820      -957295886      
-13319.206      -1.333603562816737E9    91224478600376111.942   
69457425159617037.453   2022-09-06      2022-05-08T19:52:36     2022-04-05      
2022-08-17T19:23:31     222.79.139.99   walter...@voomm.net     Oxford Alley 77
 -2102307005    true    10      -23674  24613   -1810828490     -47095409       
-14686.167      2.072108685694799E9     39847820962230526.125   
584354832299375.156     2022-03-27      2022-02-11T13:46:06     2022-12-25      
2022-11-28T09:37:49     213.146.33.250  juliasimm...@zazio.info Eagle Crest 
Terrace 84
 
--- !sql --
+-- !master_sql --
 tbl_scalar_types_dup   DUP_KEYS        k1      bigint  bigint  Yes     true    
\N              true            
                c_bool  boolean boolean Yes     false   \N      NONE    true    
        
                c_tinyint       tinyint tinyint Yes     false   \N      NONE    
true            
diff --git 
a/regression-test/data/schema_change_p0/modify_col_type_dup2/schema_change_modify_mv_column_type2.out
 
b/regression-test/data/schema_change_p0/modify_col_type_dup2/schema_change_modify_mv_column_type2.out
index 287d1366a4b..55bca92b741 100644
--- 
a/regression-test/data/schema_change_p0/modify_col_type_dup2/schema_change_modify_mv_column_type2.out
+++ 
b/regression-test/data/schema_change_p0/modify_col_type_dup2/schema_change_modify_mv_column_type2.out
@@ -1,5 +1,5 @@
 -- This file is automatically generated. You should know what you did if you 
want to edit this
--- !sql --
+-- !master_sql --
 tbl_scalar_types_dup   DUP_KEYS        k1      bigint  bigint  Yes     true    
\N              true            
                c_bool  boolean boolean Yes     false   \N      NONE    true    
        
                c_tinyint       tinyint tinyint Yes     false   \N      NONE    
true            
diff --git 
a/regression-test/suites/schema_change_p0/modify_col_type_agg/schema_change_modify_mv_column_type_agg.groovy
 
b/regression-test/suites/schema_change_p0/modify_col_type_agg/schema_change_modify_mv_column_type_agg.groovy
index c1613c69625..dd5cc5c47ee 100644
--- 
a/regression-test/suites/schema_change_p0/modify_col_type_agg/schema_change_modify_mv_column_type_agg.groovy
+++ 
b/regression-test/suites/schema_change_p0/modify_col_type_agg/schema_change_modify_mv_column_type_agg.groovy
@@ -92,6 +92,6 @@ suite("schema_change_modify_mv_column_type_agg") {
             }
         }
     }
-    qt_sql """ desc ${testTable} all """
+    qt_master_sql """ desc ${testTable} all """
     sql "INSERT INTO ${testTable} SELECT * from ${testTable}"
 }
diff --git 
a/regression-test/suites/schema_change_p0/modify_col_type_dup/schema_change_modify_mv_column_type.groovy
 
b/regression-test/suites/schema_change_p0/modify_col_type_dup/schema_change_modify_mv_column_type.groovy
index 3ea57fefff5..92c3870c563 100644
--- 
a/regression-test/suites/schema_change_p0/modify_col_type_dup/schema_change_modify_mv_column_type.groovy
+++ 
b/regression-test/suites/schema_change_p0/modify_col_type_dup/schema_change_modify_mv_column_type.groovy
@@ -95,6 +95,6 @@ suite("schema_change_modify_mv_column_type") {
     }
     // sync materialized view rewrite will fail when schema change, tmp 
disable, enable when fixed
     sql """set enable_dml_materialized_view_rewrite = false;"""
-    qt_sql """ desc ${testTable} all """
+    qt_master_sql """ desc ${testTable} all """
     sql "INSERT INTO ${testTable} SELECT * from ${testTable}"
 }
diff --git 
a/regression-test/suites/schema_change_p0/modify_col_type_dup2/schema_change_modify_mv_column_type2.groovy
 
b/regression-test/suites/schema_change_p0/modify_col_type_dup2/schema_change_modify_mv_column_type2.groovy
index 0874ff2f4ec..1494f253f88 100644
--- 
a/regression-test/suites/schema_change_p0/modify_col_type_dup2/schema_change_modify_mv_column_type2.groovy
+++ 
b/regression-test/suites/schema_change_p0/modify_col_type_dup2/schema_change_modify_mv_column_type2.groovy
@@ -69,7 +69,7 @@ suite("schema_change_modify_mv_column_type2") {
         }
     }
     createMV ("""CREATE MATERIALIZED VIEW mv_${testTable}_2 AS SELECT k1, 
sum(c_int), max(c_int), min(c_int) FROM ${testTable} GROUP BY k1""")
-    qt_sql """ desc ${testTable} all """
+    qt_master_sql """ desc ${testTable} all """
     sql "set topn_opt_limit_threshold = 100"
     qt_sql "SELECT * from ${testTable} order by 1, 2, 3 limit 10"
     qt_sql "SELECT * from ${testTable} where c_tinyint = 10 order by 1, 2, 3 
limit 10 "


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

Reply via email to