[Test](regression) Temporarily disable quickTest for SHOW CREATE TABL…

…E to adapt to enable_feature_binlog=true (#21247)
apache · Jul 5, 2023 · 0469c02 · 0469c02
1 parent 122f5f6
commit 0469c02
Show file tree

Hide file tree

Showing 22 changed files with 62 additions and 414 deletions.
diff --git a/be/src/clucene b/be/src/clucene
diff --git a/regression-test/data/data_model_p0/duplicate/storage/test_dup_table_auto_inc_col.out b/regression-test/data/data_model_p0/duplicate/storage/test_dup_table_auto_inc_col.out
@@ -3,16 +3,10 @@
 id	BIGINT	No	true	\N	AUTO_INCREMENT
 value	INT	No	false	\N	NONE
 
--- !sql --
-test_dup_tab_auto_inc_col1	CREATE TABLE `test_dup_tab_auto_inc_col1` (\n  `id` bigint(20) NOT NULL AUTO_INCREMENT,\n  `value` int(11) NOT NULL\n) ENGINE=OLAP\nDUPLICATE KEY(`id`)\nCOMMENT 'OLAP'\nDISTRIBUTED BY HASH(`id`) BUCKETS 1\nPROPERTIES (\n"replication_allocation" = "tag.location.default: 1",\n"storage_format" = "V2",\n"light_schema_change" = "true",\n"disable_auto_compaction" = "false",\n"binlog.enable" = "false",\n"binlog.ttl_seconds" = "9223372036854775807",\n"binlog.max_bytes" = "9223372036854775807",\n"binlog.max_history_nums" = "9223372036854775807",\n"enable_single_replica_compaction" = "false"\n);
-
 -- !desc --
 id	INT	No	true	\N	
 value	BIGINT	No	false	\N	NONE,AUTO_INCREMENT
 
--- !sql --
-test_dup_tab_auto_inc_col2	CREATE TABLE `test_dup_tab_auto_inc_col2` (\n  `id` int(11) NOT NULL,\n  `value` bigint(20) NOT NULL AUTO_INCREMENT\n) ENGINE=OLAP\nDUPLICATE KEY(`id`)\nCOMMENT 'OLAP'\nDISTRIBUTED BY HASH(`id`) BUCKETS 1\nPROPERTIES (\n"replication_allocation" = "tag.location.default: 1",\n"storage_format" = "V2",\n"light_schema_change" = "true",\n"disable_auto_compaction" = "false",\n"binlog.enable" = "false",\n"binlog.ttl_seconds" = "9223372036854775807",\n"binlog.max_bytes" = "9223372036854775807",\n"binlog.max_history_nums" = "9223372036854775807",\n"enable_single_replica_compaction" = "false"\n);
-
 -- !sql --
 1
 1

diff --git a/regression-test/data/data_model_p0/duplicate/test_duplicate_table_without_keys.out b/regression-test/data/data_model_p0/duplicate/test_duplicate_table_without_keys.out
@@ -10,9 +10,6 @@ k2	INT	Yes	true	\N
 k3	INT	Yes	true	\N	
 int_value	INT	Yes	false	\N	NONE
 
--- !show_dup_table --
-test_default_data_model	CREATE TABLE `test_default_data_model` (\n  `k1` int(11) NULL,\n  `k2` int(11) NULL,\n  `k3` int(11) NULL,\n  `int_value` int(11) NULL\n) ENGINE=OLAP\nDUPLICATE KEY(`k1`, `k2`, `k3`)\nCOMMENT 'OLAP'\nDISTRIBUTED BY HASH(`k1`) BUCKETS 5\nPROPERTIES (\n"replication_allocation" = "tag.location.default: 1",\n"storage_format" = "V2",\n"light_schema_change" = "true",\n"disable_auto_compaction" = "false",\n"binlog.enable" = "false",\n"binlog.ttl_seconds" = "9223372036854775807",\n"binlog.max_bytes" = "9223372036854775807",\n"binlog.max_history_nums" = "9223372036854775807",\n"enable_single_replica_compaction" = "false"\n);
-
 -- !select_dup_table --
 0	1	2	3
 0	1	2	4
@@ -24,9 +21,6 @@ k2	INT	Yes	false	\N	NONE
 k3	INT	Yes	false	\N	NONE
 int_value	INT	Yes	false	\N	NONE
 
--- !show_dup_table --
-test_default_data_model_no_keys	CREATE TABLE `test_default_data_model_no_keys` (\n  `k1` int(11) NULL,\n  `k2` int(11) NULL,\n  `k3` int(11) NULL,\n  `int_value` int(11) NULL\n) ENGINE=OLAP\nCOMMENT 'OLAP'\nDISTRIBUTED BY HASH(`k1`) BUCKETS 5\nPROPERTIES (\n"replication_allocation" = "tag.location.default: 1",\n"storage_format" = "V2",\n"light_schema_change" = "true",\n"disable_auto_compaction" = "false",\n"binlog.enable" = "false",\n"binlog.ttl_seconds" = "9223372036854775807",\n"binlog.max_bytes" = "9223372036854775807",\n"binlog.max_history_nums" = "9223372036854775807",\n"enable_single_replica_compaction" = "false",\n"enable_duplicate_without_keys_by_default" = "true"\n);
-
 -- !select_dup_table --
 0	1	2	0	3
 0	1	2	0	4
@@ -39,16 +33,10 @@ k3	INT	Yes	false	\N	NONE
 new_col1	INT	Yes	false	0	NONE
 int_value	INT	Yes	false	\N	NONE
 
--- !show_dup_table --
-test_default_data_model_no_keys	CREATE TABLE `test_default_data_model_no_keys` (\n  `k1` int(11) NULL,\n  `k2` int(11) NULL,\n  `k3` int(11) NULL,\n  `new_col1` int(11) NULL DEFAULT "0",\n  `int_value` int(11) NULL\n) ENGINE=OLAP\nCOMMENT 'OLAP'\nDISTRIBUTED BY HASH(`k1`) BUCKETS 5\nPROPERTIES (\n"replication_allocation" = "tag.location.default: 1",\n"storage_format" = "V2",\n"light_schema_change" = "true",\n"disable_auto_compaction" = "false",\n"binlog.enable" = "false",\n"binlog.ttl_seconds" = "9223372036854775807",\n"binlog.max_bytes" = "9223372036854775807",\n"binlog.max_history_nums" = "9223372036854775807",\n"enable_single_replica_compaction" = "false",\n"enable_duplicate_without_keys_by_default" = "true"\n);
-
 -- !desc_dup_table --
 k1	INT	Yes	false	\N	NONE
 k2	INT	Yes	false	\N	NONE
 k3	INT	Yes	false	\N	NONE
 new_col1	INT	Yes	false	0	NONE
 int_value	INT	Yes	false	\N	NONE
 
--- !show_dup_table --
-test_default_data_model_no_keys_like	CREATE TABLE `test_default_data_model_no_keys_like` (\n  `k1` int(11) NULL,\n  `k2` int(11) NULL,\n  `k3` int(11) NULL,\n  `new_col1` int(11) NULL DEFAULT "0",\n  `int_value` int(11) NULL\n) ENGINE=OLAP\nCOMMENT 'OLAP'\nDISTRIBUTED BY HASH(`k1`) BUCKETS 5\nPROPERTIES (\n"replication_allocation" = "tag.location.default: 1",\n"storage_format" = "V2",\n"light_schema_change" = "true",\n"disable_auto_compaction" = "false",\n"binlog.enable" = "false",\n"binlog.ttl_seconds" = "9223372036854775807",\n"binlog.max_bytes" = "9223372036854775807",\n"binlog.max_history_nums" = "9223372036854775807",\n"enable_single_replica_compaction" = "false",\n"enable_duplicate_without_keys_by_default" = "true"\n);
-
diff --git a/regression-test/data/ddl_p0/test_ctas.out b/regression-test/data/ddl_p0/test_ctas.out
@@ -1,13 +1,7 @@
 -- This file is automatically generated. You should know what you did if you want to edit this
--- !select --
-test_ctas1	CREATE TABLE `test_ctas1` (\n  `test_varchar` varchar(65533) NULL,\n  `test_text` text NULL,\n  `test_datetime` datetime NULL,\n  `test_default_timestamp` datetime NULL DEFAULT CURRENT_TIMESTAMP\n) ENGINE=OLAP\nDUPLICATE KEY(`test_varchar`)\nCOMMENT 'OLAP'\nDISTRIBUTED BY HASH(`test_varchar`) BUCKETS 10\nPROPERTIES (\n"replication_allocation" = "tag.location.default: 1",\n"storage_format" = "V2",\n"light_schema_change" = "true",\n"disable_auto_compaction" = "false",\n"binlog.enable" = "false",\n"binlog.ttl_seconds" = "9223372036854775807",\n"binlog.max_bytes" = "9223372036854775807",\n"binlog.max_history_nums" = "9223372036854775807",\n"enable_single_replica_compaction" = "false"\n);
-
 -- !select --
 2
 
--- !select --
-test_ctas2	CREATE TABLE `test_ctas2` (\n  `test_varchar` varchar(65533) NULL,\n  `test_text` text NULL,\n  `test_datetime` datetime NULL,\n  `test_default_timestamp` datetime NULL DEFAULT CURRENT_TIMESTAMP\n) ENGINE=OLAP\nDUPLICATE KEY(`test_varchar`)\nCOMMENT 'OLAP'\nDISTRIBUTED BY HASH(`test_varchar`) BUCKETS 10\nPROPERTIES (\n"replication_allocation" = "tag.location.default: 1",\n"storage_format" = "V2",\n"light_schema_change" = "true",\n"disable_auto_compaction" = "false",\n"binlog.enable" = "false",\n"binlog.ttl_seconds" = "9223372036854775807",\n"binlog.max_bytes" = "9223372036854775807",\n"binlog.max_history_nums" = "9223372036854775807",\n"enable_single_replica_compaction" = "false"\n);
-
 -- !select --
 2
 

diff --git a/regression-test/data/ddl_p0/test_ctl.out b/regression-test/data/ddl_p0/test_ctl.out
+6 −8		src/contribs-lib/CLucene/analysis/LanguageBasedAnalyzer.cpp
+0 −3		src/contribs-lib/CLucene/analysis/LanguageBasedAnalyzer.h
+1 −1		src/contribs-lib/CLucene/analysis/jieba/ChineseTokenizer.cpp
+1 −1		src/contribs-lib/CLucene/analysis/jieba/ChineseTokenizer.h
+2 −20		src/contribs-lib/CLucene/analysis/jieba/FullSegment.hpp
+2 −2		src/contribs-lib/CLucene/analysis/jieba/Jieba.hpp
+2 −18		src/contribs-lib/CLucene/analysis/jieba/MixSegment.hpp
+0 −9		src/contribs-lib/CLucene/analysis/jieba/Unicode.hpp
+3 −6		src/core/CLucene/analysis/standard/StandardTokenizer.cpp