Revert "Revert "[Test](regression) CCR syncer thrift interface regres…

…sion test (#20935)" (#20990)" (#21022) This reverts commit 2a29480.
apache · Jun 21, 2023 · 4d84cd8 · 4d84cd8
1 parent b65b821
commit 4d84cd8
Show file tree

Hide file tree

Showing 36 changed files with 2,272 additions and 138 deletions.
diff --git a/.gitignore b/.gitignore
@@ -60,6 +60,7 @@ regression-test/realdata/*
 regression-test/cacheData/*
 regression-test/conf/regression-conf-custom.groovy
 regression-test/framework/bin/*
+regression-test/framework/src/main/groovy/org/apache/doris/thrift
 regression-test/certificate.p12
 
 samples/doris-demo/remote-udf-python-demo/*_pb2.py

diff --git a/regression-test/conf/regression-conf.groovy b/regression-test/conf/regression-conf.groovy
@@ -25,9 +25,15 @@ defaultDb = "regression_test"
 // at each time we connect.
 // add allowLoadLocalInfile so that the jdbc can execute mysql load data from client.
 jdbcUrl = "jdbc:mysql://127.0.0.1:9030/?useLocalSessionState=true&allowLoadLocalInfile=true"
+targetJdbcUrl = "jdbc:mysql://127.0.0.1:9030/?useLocalSessionState=true&allowLoadLocalInfile=true"
 jdbcUser = "root"
 jdbcPassword = ""
 
+feSourceThriftAddress = "127.0.0.1:9020"
+feTargetThriftAddress = "127.0.0.1:9020"
+feSyncerUser = "root"
+feSyncerPassword = ""
+
 feHttpAddress = "127.0.0.1:8030"
 feHttpUser = "root"
 feHttpPassword = ""

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
@@ -4,14 +4,14 @@ 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"enable_single_replica_compaction" = "false"\n);
+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"enable_single_replica_compaction" = "false"\n);
+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

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
@@ -11,7 +11,7 @@ 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"enable_single_replica_compaction" = "false"\n);
+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
@@ -25,7 +25,7 @@ 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"enable_single_replica_compaction" = "false",\n"enable_duplicate_without_keys_by_default" = "true"\n);
+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
@@ -40,7 +40,7 @@ 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"enable_single_replica_compaction" = "false",\n"enable_duplicate_without_keys_by_default" = "true"\n);
+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
@@ -50,5 +50,5 @@ 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"enable_single_replica_compaction" = "false",\n"enable_duplicate_without_keys_by_default" = "true"\n);
+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,12 +1,12 @@
 -- 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"enable_single_replica_compaction" = "false"\n);
+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"enable_single_replica_compaction" = "false"\n);
+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
@@ -1,4 +1,4 @@
 -- This file is automatically generated. You should know what you did if you want to edit this
 -- !select --
-test_ctl1	CREATE TABLE `test_ctl1` (\n  `test_varchar` varchar(150) NULL,\n  `test_datetime` datetime NULL,\n  `test_default_timestamp` datetime NULL DEFAULT CURRENT_TIMESTAMP\n) ENGINE=OLAP\nUNIQUE KEY(`test_varchar`)\nCOMMENT 'OLAP'\nDISTRIBUTED BY HASH(`test_varchar`) BUCKETS 3\nPROPERTIES (\n"replication_allocation" = "tag.location.default: 1",\n"storage_format" = "V2",\n"light_schema_change" = "true",\n"disable_auto_compaction" = "false",\n"enable_single_replica_compaction" = "false"\n);
+test_ctl1	CREATE TABLE `test_ctl1` (\n  `test_varchar` varchar(150) NULL,\n  `test_datetime` datetime NULL,\n  `test_default_timestamp` datetime NULL DEFAULT CURRENT_TIMESTAMP\n) ENGINE=OLAP\nUNIQUE KEY(`test_varchar`)\nCOMMENT 'OLAP'\nDISTRIBUTED BY HASH(`test_varchar`) BUCKETS 3\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);