From 40f3e9bb77aba3a8bc378379e46c92cfcc20387c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 11 Jan 2025 22:12:20 +0800 Subject: [PATCH] branch-2.1: [regression-test](fix) fix 'desc table' to follower assertion failure #46788 (#46819) Cherry-picked from #46788 Co-authored-by: shuke --- .../create_nestedtypes_with_schemachange.out | 24 +++++++++---------- ...reate_nestedtypes_with_schemachange.groovy | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/regression-test/data/datatype_p0/nested_types/ddl/create_nestedtypes_with_schemachange.out b/regression-test/data/datatype_p0/nested_types/ddl/create_nestedtypes_with_schemachange.out index 5b811095fc..efcecd7595 100644 --- a/regression-test/data/datatype_p0/nested_types/ddl/create_nestedtypes_with_schemachange.out +++ b/regression-test/data/datatype_p0/nested_types/ddl/create_nestedtypes_with_schemachange.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 -- col0 bigint No true \N col_array array Yes false \N NONE col2 int No false \N NONE @@ -7,7 +7,7 @@ col3 array Yes false \N NONE col4 map Yes false \N NONE col5 struct Yes false \N NONE --- !sql -- +-- !master_sql -- col0 bigint No true \N col_map map Yes false \N NONE col2 int No false \N NONE @@ -15,7 +15,7 @@ col3 array Yes false \N NONE col4 map Yes false \N NONE col5 struct Yes false \N NONE --- !sql -- +-- !master_sql -- col0 bigint No true \N col_struct struct Yes false \N NONE col2 int No false \N NONE @@ -23,21 +23,21 @@ col3 array Yes false \N NONE col4 map Yes false \N NONE col5 struct Yes false \N NONE --- !sql -- +-- !master_sql -- col0 bigint No true \N col2 int No false \N NONE col3 array Yes false \N NONE col4 map Yes false \N NONE col5 struct Yes false \N NONE --- !sql -- +-- !master_sql -- col0 bigint No true \N col2 int No false \N NONE col3 array Yes false \N NONE col4 map Yes false \N NONE col5 struct Yes false \N NONE --- !sql -- +-- !master_sql -- col0 bigint No true \N col2 int No false \N NONE col3 array Yes false \N NONE @@ -47,7 +47,7 @@ col5 struct Yes false \N NONE -- !sql_before -- 1 2 [1, 2] {1:2} {"f1":1} {"a":[1,2,3]} --- !sql -- +-- !master_sql -- col0 bigint No true \N col2 int No false \N NONE col3 array Yes false \N NONE @@ -61,7 +61,7 @@ col6 variant Yes false \N NONE -- !sql_before -- 1 2 [1, 2] {1:2} {"f1":1} {"a":[1,2,3]} --- !sql -- +-- !master_sql -- col0 bigint No true \N col2 int No false \N NONE col3 array Yes false \N NONE @@ -75,7 +75,7 @@ col6 variant No false \N NONE -- !sql_before -- 1 2 [1, 2] {1:2} {"f1":1} {"a":[1,2,3]} --- !sql -- +-- !master_sql -- col0 bigint No true \N col2 int No false \N NONE col3 array Yes false \N NONE @@ -89,7 +89,7 @@ col6 variant Yes false \N NONE -- !sql_before -- 1 2 [1, 2] {1:2} {"f1":1} {"a":[1,2,3]} --- !sql -- +-- !master_sql -- col0 bigint No true \N col2 int No false \N NONE col3 array No false \N NONE @@ -103,7 +103,7 @@ col6 variant No false \N NONE -- !sql_before -- 1 2 [1, 2] {1:2} {"f1":1} {"a":[1,2,3]} --- !sql -- +-- !master_sql -- col0 bigint No true \N col2 int No false \N NONE col3 array Yes false \N NONE @@ -117,7 +117,7 @@ col6 variant Yes false \N NONE -- !sql_before -- 1 2 [1, 2] {1:2} {"f1":1} {"a":[1,2,3]} --- !sql -- +-- !master_sql -- col0 bigint No true \N col2 int No false \N NONE col3 array No false \N NONE diff --git a/regression-test/suites/datatype_p0/nested_types/ddl/create_nestedtypes_with_schemachange.groovy b/regression-test/suites/datatype_p0/nested_types/ddl/create_nestedtypes_with_schemachange.groovy index 62b9ab3bb5..26db35cbbe 100644 --- a/regression-test/suites/datatype_p0/nested_types/ddl/create_nestedtypes_with_schemachange.groovy +++ b/regression-test/suites/datatype_p0/nested_types/ddl/create_nestedtypes_with_schemachange.groovy @@ -45,7 +45,7 @@ suite("create_nestedtypes_with_schemachange", "p0") { } } // desc table - qt_sql "DESC $testTablex" + qt_master_sql "DESC $testTablex" } // array @@ -102,7 +102,7 @@ suite("create_nestedtypes_with_schemachange", "p0") { } } // desc table - qt_sql "DESC $testTablex" + qt_master_sql "DESC $testTablex" qt_sql_after "select * from $testTablex" }