This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new ff15b5e4a5c Remove tbl scenario non-standard table structure (#30297)
ff15b5e4a5c is described below
commit ff15b5e4a5cf17120cae4ec30885abefd07a855d
Author: niu niu <[email protected]>
AuthorDate: Mon Feb 26 19:19:15 2024 +0800
Remove tbl scenario non-standard table structure (#30297)
* Remove tbl scenario non-standard table structure
* Change order by column
* Change db expected data
* Fix ci
---
.../cases/dql/dataset/db/select_sys_data_for_og.xml | 2 --
.../cases/dql/dataset/db/select_sys_data_for_pg.xml | 2 --
.../cases/dql/dataset/tbl/select_sys_data_for_og.xml | 2 --
.../cases/dql/dataset/tbl/select_sys_data_for_pg.xml | 2 --
.../cases/dql/dql-integration-select-expression.xml | 10 ----------
.../dql/dql-integration-select-system-schema-opengauss.xml | 4 ++++
.../dql-integration-select-system-schema-postgresql.xml | 6 +++++-
.../src/test/resources/cases/rql/rql-integration-count.xml | 4 ++--
.../src/test/resources/cases/rql/rql-integration-show.xml | 8 ++++----
.../resources/env/scenario/tbl/data/actual/dataset.xml | 14 --------------
.../tbl/data/actual/init-sql/h2/01-actual-init.sql | 6 ------
.../tbl/data/actual/init-sql/mysql/01-actual-init.sql | 4 ----
.../tbl/data/actual/init-sql/opengauss/01-actual-init.sql | 6 ------
.../tbl/data/actual/init-sql/postgresql/01-actual-init.sql | 6 ------
.../resources/env/scenario/tbl/data/expected/dataset.xml | 14 --------------
.../tbl/data/expected/init-sql/h2/01-expected-init.sql | 4 ----
.../tbl/data/expected/init-sql/mysql/01-expected-init.sql | 2 --
.../data/expected/init-sql/opengauss/01-expected-init.sql | 4 ----
.../data/expected/init-sql/postgresql/01-expected-init.sql | 4 ----
19 files changed, 15 insertions(+), 89 deletions(-)
diff --git
a/test/e2e/sql/src/test/resources/cases/dql/dataset/db/select_sys_data_for_og.xml
b/test/e2e/sql/src/test/resources/cases/dql/dataset/db/select_sys_data_for_og.xml
index 8e92673f015..00a73359c03 100644
---
a/test/e2e/sql/src/test/resources/cases/dql/dataset/db/select_sys_data_for_og.xml
+++
b/test/e2e/sql/src/test/resources/cases/dql/dataset/db/select_sys_data_for_og.xml
@@ -23,7 +23,6 @@
<column name="Owner" />
<column name="Storage" assertion="false" />
</metadata>
- <row values="public | t_broadcast_table | table | mock user |" />
<row values="public | t_country | table | mock user |" />
<row values="public | t_merchant | table | mock user |" />
<row values="public | t_order | table | mock user |" />
@@ -31,6 +30,5 @@
<row values="public | t_product | table | mock user |" />
<row values="public | t_product_category | table | mock user |" />
<row values="public | t_product_detail | table | mock user |" />
- <row values="public | t_single_table | table | mock user |" />
<row values="public | t_user | table | mock user |" />
</dataset>
diff --git
a/test/e2e/sql/src/test/resources/cases/dql/dataset/db/select_sys_data_for_pg.xml
b/test/e2e/sql/src/test/resources/cases/dql/dataset/db/select_sys_data_for_pg.xml
index b3b27350c09..912b384eacb 100644
---
a/test/e2e/sql/src/test/resources/cases/dql/dataset/db/select_sys_data_for_pg.xml
+++
b/test/e2e/sql/src/test/resources/cases/dql/dataset/db/select_sys_data_for_pg.xml
@@ -22,7 +22,6 @@
<column name="Type" />
<column name="Owner" />
</metadata>
- <row values="public | t_broadcast_table | table | mock user" />
<row values="public | t_country | table | mock user" />
<row values="public | t_merchant | table | mock user" />
<row values="public | t_order | table | mock user" />
@@ -30,6 +29,5 @@
<row values="public | t_product | table | mock user" />
<row values="public | t_product_category | table | mock user" />
<row values="public | t_product_detail | table | mock user" />
- <row values="public | t_single_table | table | mock user" />
<row values="public | t_user | table | mock user" />
</dataset>
diff --git
a/test/e2e/sql/src/test/resources/cases/dql/dataset/tbl/select_sys_data_for_og.xml
b/test/e2e/sql/src/test/resources/cases/dql/dataset/tbl/select_sys_data_for_og.xml
index 51e08789d32..8f1e6caef67 100644
---
a/test/e2e/sql/src/test/resources/cases/dql/dataset/tbl/select_sys_data_for_og.xml
+++
b/test/e2e/sql/src/test/resources/cases/dql/dataset/tbl/select_sys_data_for_og.xml
@@ -23,9 +23,7 @@
<column name="Owner" />
<column name="Storage" assertion="false" />
</metadata>
- <row values="public | t_broadcast_table | table | mock user" />
<row values="public | t_order | table | mock user" />
<row values="public | t_order_item | table | mock user" />
<row values="public | t_product | table | mock user" />
- <row values="public | t_single_table | table | mock user" />
</dataset>
diff --git
a/test/e2e/sql/src/test/resources/cases/dql/dataset/tbl/select_sys_data_for_pg.xml
b/test/e2e/sql/src/test/resources/cases/dql/dataset/tbl/select_sys_data_for_pg.xml
index 3e53b102b1c..c6989302085 100644
---
a/test/e2e/sql/src/test/resources/cases/dql/dataset/tbl/select_sys_data_for_pg.xml
+++
b/test/e2e/sql/src/test/resources/cases/dql/dataset/tbl/select_sys_data_for_pg.xml
@@ -22,9 +22,7 @@
<column name="Type" />
<column name="Owner" />
</metadata>
- <row values="public | t_broadcast_table | table | mock user" />
<row values="public | t_order | table | mock user" />
<row values="public | t_order_item | table | mock user" />
<row values="public | t_product | table | mock user" />
- <row values="public | t_single_table | table | mock user" />
</dataset>
diff --git
a/test/e2e/sql/src/test/resources/cases/dql/dql-integration-select-expression.xml
b/test/e2e/sql/src/test/resources/cases/dql/dql-integration-select-expression.xml
index 6f0c42e2488..2e6f57ddc46 100644
---
a/test/e2e/sql/src/test/resources/cases/dql/dql-integration-select-expression.xml
+++
b/test/e2e/sql/src/test/resources/cases/dql/dql-integration-select-expression.xml
@@ -110,16 +110,6 @@
<test-case sql="SELECT * FROM t_order_item_join_view WHERE order_id > ?"
db-types="MySQL,PostgreSQL,openGauss" scenario-types="db_tbl_sql_federation">
<assertion parameters="1000:int"
expected-data-source-name="read_dataset" />
</test-case>
-
- <!-- TODO add db scenario when use standard table -->
- <test-case sql="SELECT n.nspname as "Schema", c.relname as
"Name", CASE c.relkind WHEN 'r' THEN 'table' WHEN 'v' THEN 'view'
WHEN 'm' THEN 'materialized view' WHEN 'i' THEN 'index' WHEN 'S' THEN
'sequence' WHEN 's' THEN 'special' WHEN 'f' THEN 'foreign table' WHEN 'p' THEN
'partitioned table' WHEN 'I' THEN 'partitioned index' END as "Type",
pg_catalog.pg_get_userbyid(c.relowner) as "Owner" FROM
pg_catalog.pg_class c LEFT JOIN pg_catalog.pg_name [...]
- <assertion expected-data-file="select_sys_data_for_pg.xml" />
- </test-case>
-
- <!-- TODO add db scenario when use standard table -->
- <test-case sql="SELECT n.nspname as "Schema", c.relname as
"Name", CASE c.relkind WHEN 'r' THEN 'table' WHEN 'v' THEN 'view'
WHEN 'i' THEN 'index' WHEN 'I' THEN 'global partition index' WHEN 'S' THEN
'sequence' WHEN 'L' THEN 'large sequence' WHEN 'f' THEN 'foreign table' WHEN
'm' THEN 'materialized view' WHEN 'e' THEN 'stream' WHEN 'o' THEN 'contview'
END as "Type", pg_catalog.pg_get_userbyid(c.relowner) as
"Owner", c.reloptions as "Stora [...]
- <assertion expected-data-file="select_sys_data_for_og.xml" />
- </test-case>
<!-- // TODO Until test cases support enabling for specific database
version. -->
<!-- <test-case sql="VALUES ROW(1,1)" db-types="MySQL"
scenario-types="db,tbl,dbtbl_with_readwrite_splitting,readwrite_splitting">-->
diff --git
a/test/e2e/sql/src/test/resources/cases/dql/dql-integration-select-system-schema-opengauss.xml
b/test/e2e/sql/src/test/resources/cases/dql/dql-integration-select-system-schema-opengauss.xml
index 6d6193d35f2..86940a58e7e 100644
---
a/test/e2e/sql/src/test/resources/cases/dql/dql-integration-select-system-schema-opengauss.xml
+++
b/test/e2e/sql/src/test/resources/cases/dql/dql-integration-select-system-schema-opengauss.xml
@@ -821,4 +821,8 @@
<test-case sql="SELECT * FROM pg_catalog.sys_dummy limit 1"
db-types="openGauss" scenario-types="tbl" adapters="proxy">
<assertion expected-data-source-name="read_dataset" />
</test-case>
+
+ <test-case sql="SELECT n.nspname as "Schema", c.relname as
"Name", CASE c.relkind WHEN 'r' THEN 'table' WHEN 'v' THEN 'view'
WHEN 'i' THEN 'index' WHEN 'I' THEN 'global partition index' WHEN 'S' THEN
'sequence' WHEN 'L' THEN 'large sequence' WHEN 'f' THEN 'foreign table' WHEN
'm' THEN 'materialized view' WHEN 'e' THEN 'stream' WHEN 'o' THEN 'contview'
END as "Type", pg_catalog.pg_get_userbyid(c.relowner) as
"Owner", c.reloptions as "Stora [...]
+ <assertion expected-data-file="select_sys_data_for_og.xml" />
+ </test-case>
</integration-test-cases>
diff --git
a/test/e2e/sql/src/test/resources/cases/dql/dql-integration-select-system-schema-postgresql.xml
b/test/e2e/sql/src/test/resources/cases/dql/dql-integration-select-system-schema-postgresql.xml
index 184b78a486d..b92d2061a88 100644
---
a/test/e2e/sql/src/test/resources/cases/dql/dql-integration-select-system-schema-postgresql.xml
+++
b/test/e2e/sql/src/test/resources/cases/dql/dql-integration-select-system-schema-postgresql.xml
@@ -305,7 +305,7 @@
<assertion expected-data-source-name="read_dataset" />
</test-case>
- <test-case sql="SELECT * FROM pg_catalog.pg_stat_all_tables where relname
!= 'pg_range' limit 1" db-types="PostgreSQL" scenario-types="tbl"
adapters="proxy">
+ <test-case sql="SELECT * FROM pg_catalog.pg_stat_all_tables where relname
!= 'pg_range' order by relname limit 1" db-types="PostgreSQL"
scenario-types="tbl" adapters="proxy">
<assertion expected-data-source-name="read_dataset" />
</test-case>
@@ -421,4 +421,8 @@
<test-case sql="SELECT * FROM pg_catalog.pg_views limit 1"
db-types="PostgreSQL" scenario-types="tbl" adapters="proxy">
<assertion expected-data-source-name="read_dataset" />
</test-case>
+
+ <test-case sql="SELECT n.nspname as "Schema", c.relname as
"Name", CASE c.relkind WHEN 'r' THEN 'table' WHEN 'v' THEN 'view'
WHEN 'm' THEN 'materialized view' WHEN 'i' THEN 'index' WHEN 'S' THEN
'sequence' WHEN 's' THEN 'special' WHEN 'f' THEN 'foreign table' WHEN 'p' THEN
'partitioned table' WHEN 'I' THEN 'partitioned index' END as "Type",
pg_catalog.pg_get_userbyid(c.relowner) as "Owner" FROM
pg_catalog.pg_class c LEFT JOIN pg_catalog.pg_name [...]
+ <assertion expected-data-file="select_sys_data_for_pg.xml" />
+ </test-case>
</integration-test-cases>
diff --git
a/test/e2e/sql/src/test/resources/cases/rql/rql-integration-count.xml
b/test/e2e/sql/src/test/resources/cases/rql/rql-integration-count.xml
index b0f758e78ea..d8baa44685b 100644
--- a/test/e2e/sql/src/test/resources/cases/rql/rql-integration-count.xml
+++ b/test/e2e/sql/src/test/resources/cases/rql/rql-integration-count.xml
@@ -17,8 +17,8 @@
-->
<integration-test-cases>
- <!-- TODO add db scenario when use standard table -->
- <test-case sql="COUNT SINGLE TABLE"
scenario-types="tbl,encrypt,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt,sharding_and_encrypt,encrypt_and_readwrite_splitting">
+ <!-- TODO add db,tbl scenario when use standard table -->
+ <test-case sql="COUNT SINGLE TABLE"
scenario-types="encrypt,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt,sharding_and_encrypt,encrypt_and_readwrite_splitting">
<assertion expected-data-file="count_single_table.xml" />
</test-case>
diff --git a/test/e2e/sql/src/test/resources/cases/rql/rql-integration-show.xml
b/test/e2e/sql/src/test/resources/cases/rql/rql-integration-show.xml
index 5e0b44cdf6d..0feb71fa6bd 100644
--- a/test/e2e/sql/src/test/resources/cases/rql/rql-integration-show.xml
+++ b/test/e2e/sql/src/test/resources/cases/rql/rql-integration-show.xml
@@ -95,13 +95,13 @@
<assertion expected-data-file="show_single_table_rules.xml" />
</test-case>
- <!-- TODO add db scenario when use standard table -->
- <test-case sql="SHOW SINGLE TABLE t_single_table"
scenario-types="tbl,encrypt,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt,sharding_and_encrypt,encrypt_and_readwrite_splitting">
+ <!-- TODO add db,tbl scenario when use standard table -->
+ <test-case sql="SHOW SINGLE TABLE t_single_table"
scenario-types="encrypt,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt,sharding_and_encrypt,encrypt_and_readwrite_splitting">
<assertion expected-data-file="show_single_table.xml" />
</test-case>
- <!-- TODO add db scenario when use standard table -->
- <test-case sql="SHOW SINGLE TABLES"
scenario-types="tbl,encrypt,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt,sharding_and_encrypt,encrypt_and_readwrite_splitting">
+ <!-- TODO add db,tbl scenario when use standard table -->
+ <test-case sql="SHOW SINGLE TABLES"
scenario-types="encrypt,dbtbl_with_readwrite_splitting,dbtbl_with_readwrite_splitting_and_encrypt,sharding_and_encrypt,encrypt_and_readwrite_splitting">
<assertion expected-data-file="show_single_tables.xml" />
</test-case>
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/tbl/data/actual/dataset.xml
b/test/e2e/sql/src/test/resources/env/scenario/tbl/data/actual/dataset.xml
index 2bce93d372d..400b0df9687 100644
--- a/test/e2e/sql/src/test/resources/env/scenario/tbl/data/actual/dataset.xml
+++ b/test/e2e/sql/src/test/resources/env/scenario/tbl/data/actual/dataset.xml
@@ -32,15 +32,6 @@
<column name="quantity" type="numeric" />
<column name="creation_date" type="datetime" />
</metadata>
- <metadata data-nodes="tbl.t_single_table">
- <column name="single_id" type="numeric" />
- <column name="id" type="numeric" />
- <column name="status" type="varchar" />
- </metadata>
- <metadata data-nodes="tbl.t_broadcast_table">
- <column name="id" type="numeric" />
- <column name="status" type="varchar" />
- </metadata>
<metadata data-nodes="tbl.t_product_${0..9}">
<column name="product_id" type="numeric" />
<column name="product_name" type="varchar" />
@@ -109,11 +100,6 @@
<row data-node="tbl.t_order_item_8" values="110801, 1108, 11, 8, 1,
2017-08-08" />
<row data-node="tbl.t_order_item_9" values="110900, 1109, 11, 9, 1,
2017-08-08" />
<row data-node="tbl.t_order_item_9" values="110901, 1109, 11, 10, 1,
2017-08-08" />
- <row data-node="tbl.t_single_table" values="1, 1000, init" />
- <row data-node="tbl.t_single_table" values="2, 1001, init" />
- <row data-node="tbl.t_single_table" values="3, 1002, init" />
- <row data-node="tbl.t_single_table" values="4, 1003, init" />
- <row data-node="tbl.t_broadcast_table" values="1, init" />
<row data-node="tbl.t_product_1" values="1, qq coins, 2, 200, off sale,
2017-08-08" />
<row data-node="tbl.t_product_2" values="2, haier washing machine, 4,
3121, on sale, 2017-08-08" />
<row data-node="tbl.t_product_3" values="3, huawei mobile phones, 6, 6666,
on sale, 2017-08-08" />
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/tbl/data/actual/init-sql/h2/01-actual-init.sql
b/test/e2e/sql/src/test/resources/env/scenario/tbl/data/actual/init-sql/h2/01-actual-init.sql
index 84096f9d0f2..d6e0a5005b0 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/tbl/data/actual/init-sql/h2/01-actual-init.sql
+++
b/test/e2e/sql/src/test/resources/env/scenario/tbl/data/actual/init-sql/h2/01-actual-init.sql
@@ -35,8 +35,6 @@ DROP TABLE IF EXISTS t_order_8;
DROP TABLE IF EXISTS t_order_item_8;
DROP TABLE IF EXISTS t_order_9;
DROP TABLE IF EXISTS t_order_item_9;
-DROP TABLE IF EXISTS t_broadcast_table;
-DROP TABLE IF EXISTS t_single_table;
CREATE TABLE t_order_0(order_id BIGINT PRIMARY KEY, user_id INT NOT NULL,
status VARCHAR(50) NOT NULL, merchant_id INT NOT NULL, remark VARCHAR(50) NOT
NULL, creation_date DATE NOT NULL);
CREATE TABLE t_order_item_0(item_id BIGINT PRIMARY KEY, order_id BIGINT NOT
NULL, user_id INT NOT NULL, product_id INT NOT NULL, quantity INT NOT NULL,
creation_date DATE NOT NULL);
@@ -77,7 +75,3 @@ CREATE INDEX order_index_t_order_8 ON t_order_8 (order_id);
CREATE TABLE t_order_9(order_id BIGINT PRIMARY KEY, user_id INT NOT NULL,
status VARCHAR(50) NOT NULL, merchant_id INT NOT NULL, remark VARCHAR(50) NOT
NULL, creation_date DATE NOT NULL);
CREATE TABLE t_order_item_9(item_id BIGINT PRIMARY KEY, order_id BIGINT NOT
NULL, user_id INT NOT NULL, product_id INT NOT NULL, quantity INT NOT NULL,
creation_date DATE NOT NULL);
CREATE INDEX order_index_t_order_9 ON t_order_9 (order_id);
-
-CREATE TABLE t_broadcast_table (id INT NOT NULL, status VARCHAR(45) NULL,
PRIMARY KEY (id));
-
-CREATE TABLE t_single_table (single_id INT NOT NULL, id INT NOT NULL, status
VARCHAR(45) NULL, PRIMARY KEY (single_id));
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/tbl/data/actual/init-sql/mysql/01-actual-init.sql
b/test/e2e/sql/src/test/resources/env/scenario/tbl/data/actual/init-sql/mysql/01-actual-init.sql
index ffc1d360ba5..c0d50be3903 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/tbl/data/actual/init-sql/mysql/01-actual-init.sql
+++
b/test/e2e/sql/src/test/resources/env/scenario/tbl/data/actual/init-sql/mysql/01-actual-init.sql
@@ -62,10 +62,6 @@ CREATE TABLE tbl.t_order_9(order_id BIGINT PRIMARY KEY,
user_id INT NOT NULL, st
CREATE TABLE tbl.t_order_item_9(item_id BIGINT PRIMARY KEY, order_id BIGINT
NOT NULL, user_id INT NOT NULL, product_id INT NOT NULL, quantity INT NOT NULL,
creation_date DATE NOT NULL);
CREATE INDEX order_index_t_order_9 ON tbl.t_order_9 (order_id);
-CREATE TABLE tbl.t_broadcast_table (id INT NOT NULL, status VARCHAR(45) NULL,
PRIMARY KEY (id));
-
-CREATE TABLE tbl.t_single_table (single_id INT NOT NULL AUTO_INCREMENT, id INT
NOT NULL, status VARCHAR(45) NULL, PRIMARY KEY (single_id));
-
CREATE TABLE tbl.t_product_0 (product_id INT PRIMARY KEY, product_name
VARCHAR(50) NOT NULL, category_id INT NOT NULL, price DECIMAL NOT NULL, status
VARCHAR(50) NOT NULL, creation_date DATE NOT NULL);
CREATE TABLE tbl.t_product_1 (product_id INT PRIMARY KEY, product_name
VARCHAR(50) NOT NULL, category_id INT NOT NULL, price DECIMAL NOT NULL, status
VARCHAR(50) NOT NULL, creation_date DATE NOT NULL);
CREATE TABLE tbl.t_product_2 (product_id INT PRIMARY KEY, product_name
VARCHAR(50) NOT NULL, category_id INT NOT NULL, price DECIMAL NOT NULL, status
VARCHAR(50) NOT NULL, creation_date DATE NOT NULL);
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/tbl/data/actual/init-sql/opengauss/01-actual-init.sql
b/test/e2e/sql/src/test/resources/env/scenario/tbl/data/actual/init-sql/opengauss/01-actual-init.sql
index 090f48381dd..e39ea90dad5 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/tbl/data/actual/init-sql/opengauss/01-actual-init.sql
+++
b/test/e2e/sql/src/test/resources/env/scenario/tbl/data/actual/init-sql/opengauss/01-actual-init.sql
@@ -41,8 +41,6 @@ DROP TABLE IF EXISTS t_order_8;
DROP TABLE IF EXISTS t_order_item_8;
DROP TABLE IF EXISTS t_order_9;
DROP TABLE IF EXISTS t_order_item_9;
-DROP TABLE IF EXISTS t_broadcast_table;
-DROP TABLE IF EXISTS t_single_table;
CREATE TABLE t_order_0(order_id BIGINT PRIMARY KEY, user_id INT NOT NULL,
status VARCHAR(50) NOT NULL, merchant_id INT NOT NULL, remark VARCHAR(50) NOT
NULL, creation_date DATE NOT NULL);
CREATE TABLE t_order_item_0(item_id BIGINT PRIMARY KEY, order_id BIGINT NOT
NULL, user_id INT NOT NULL, product_id INT NOT NULL, quantity INT NOT NULL,
creation_date DATE NOT NULL);
@@ -84,10 +82,6 @@ CREATE TABLE t_order_9(order_id BIGINT PRIMARY KEY, user_id
INT NOT NULL, status
CREATE TABLE t_order_item_9(item_id BIGINT PRIMARY KEY, order_id BIGINT NOT
NULL, user_id INT NOT NULL, product_id INT NOT NULL, quantity INT NOT NULL,
creation_date DATE NOT NULL);
CREATE INDEX order_index_t_order_9 ON t_order_9 (order_id);
-CREATE TABLE t_broadcast_table (id INT NOT NULL, status VARCHAR(45) NULL,
PRIMARY KEY (id));
-
-CREATE TABLE t_single_table (single_id INT NOT NULL, id INT NOT NULL, status
VARCHAR(45) NULL, PRIMARY KEY (single_id));
-
CREATE TABLE t_product_0 (product_id INT PRIMARY KEY, product_name VARCHAR(50)
NOT NULL, category_id INT NOT NULL, price DECIMAL NOT NULL, status VARCHAR(50)
NOT NULL, creation_date DATE NOT NULL);
CREATE TABLE t_product_1 (product_id INT PRIMARY KEY, product_name VARCHAR(50)
NOT NULL, category_id INT NOT NULL, price DECIMAL NOT NULL, status VARCHAR(50)
NOT NULL, creation_date DATE NOT NULL);
CREATE TABLE t_product_2 (product_id INT PRIMARY KEY, product_name VARCHAR(50)
NOT NULL, category_id INT NOT NULL, price DECIMAL NOT NULL, status VARCHAR(50)
NOT NULL, creation_date DATE NOT NULL);
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/tbl/data/actual/init-sql/postgresql/01-actual-init.sql
b/test/e2e/sql/src/test/resources/env/scenario/tbl/data/actual/init-sql/postgresql/01-actual-init.sql
index 090f48381dd..e39ea90dad5 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/tbl/data/actual/init-sql/postgresql/01-actual-init.sql
+++
b/test/e2e/sql/src/test/resources/env/scenario/tbl/data/actual/init-sql/postgresql/01-actual-init.sql
@@ -41,8 +41,6 @@ DROP TABLE IF EXISTS t_order_8;
DROP TABLE IF EXISTS t_order_item_8;
DROP TABLE IF EXISTS t_order_9;
DROP TABLE IF EXISTS t_order_item_9;
-DROP TABLE IF EXISTS t_broadcast_table;
-DROP TABLE IF EXISTS t_single_table;
CREATE TABLE t_order_0(order_id BIGINT PRIMARY KEY, user_id INT NOT NULL,
status VARCHAR(50) NOT NULL, merchant_id INT NOT NULL, remark VARCHAR(50) NOT
NULL, creation_date DATE NOT NULL);
CREATE TABLE t_order_item_0(item_id BIGINT PRIMARY KEY, order_id BIGINT NOT
NULL, user_id INT NOT NULL, product_id INT NOT NULL, quantity INT NOT NULL,
creation_date DATE NOT NULL);
@@ -84,10 +82,6 @@ CREATE TABLE t_order_9(order_id BIGINT PRIMARY KEY, user_id
INT NOT NULL, status
CREATE TABLE t_order_item_9(item_id BIGINT PRIMARY KEY, order_id BIGINT NOT
NULL, user_id INT NOT NULL, product_id INT NOT NULL, quantity INT NOT NULL,
creation_date DATE NOT NULL);
CREATE INDEX order_index_t_order_9 ON t_order_9 (order_id);
-CREATE TABLE t_broadcast_table (id INT NOT NULL, status VARCHAR(45) NULL,
PRIMARY KEY (id));
-
-CREATE TABLE t_single_table (single_id INT NOT NULL, id INT NOT NULL, status
VARCHAR(45) NULL, PRIMARY KEY (single_id));
-
CREATE TABLE t_product_0 (product_id INT PRIMARY KEY, product_name VARCHAR(50)
NOT NULL, category_id INT NOT NULL, price DECIMAL NOT NULL, status VARCHAR(50)
NOT NULL, creation_date DATE NOT NULL);
CREATE TABLE t_product_1 (product_id INT PRIMARY KEY, product_name VARCHAR(50)
NOT NULL, category_id INT NOT NULL, price DECIMAL NOT NULL, status VARCHAR(50)
NOT NULL, creation_date DATE NOT NULL);
CREATE TABLE t_product_2 (product_id INT PRIMARY KEY, product_name VARCHAR(50)
NOT NULL, category_id INT NOT NULL, price DECIMAL NOT NULL, status VARCHAR(50)
NOT NULL, creation_date DATE NOT NULL);
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/tbl/data/expected/dataset.xml
b/test/e2e/sql/src/test/resources/env/scenario/tbl/data/expected/dataset.xml
index e8188d99ffa..edc1a1e4cb0 100644
--- a/test/e2e/sql/src/test/resources/env/scenario/tbl/data/expected/dataset.xml
+++ b/test/e2e/sql/src/test/resources/env/scenario/tbl/data/expected/dataset.xml
@@ -32,15 +32,6 @@
<column name="quantity" type="numeric" />
<column name="creation_date" type="datetime" />
</metadata>
- <metadata data-nodes="expected_dataset.t_single_table">
- <column name="single_id" type="numeric" />
- <column name="id" type="numeric" />
- <column name="status" type="varchar" />
- </metadata>
- <metadata data-nodes="expected_dataset.t_broadcast_table">
- <column name="id" type="numeric" />
- <column name="status" type="varchar" />
- </metadata>
<metadata data-nodes="expected_dataset.t_product">
<column name="product_id" type="numeric" />
<column name="product_name" type="varchar" />
@@ -109,11 +100,6 @@
<row data-node="expected_dataset.t_order_item" values="110801, 1108, 11,
8, 1, 2017-08-08" />
<row data-node="expected_dataset.t_order_item" values="110900, 1109, 11,
9, 1, 2017-08-08" />
<row data-node="expected_dataset.t_order_item" values="110901, 1109, 11,
10, 1, 2017-08-08" />
- <row data-node="expected_dataset.t_single_table" values="1, 1000, init" />
- <row data-node="expected_dataset.t_single_table" values="2, 1001, init" />
- <row data-node="expected_dataset.t_single_table" values="3, 1002, init" />
- <row data-node="expected_dataset.t_single_table" values="4, 1003, init" />
- <row data-node="expected_dataset.t_broadcast_table" values="1, init" />
<row data-node="expected_dataset.t_product" values="1, qq coins, 2, 200,
off sale, 2017-08-08" />
<row data-node="expected_dataset.t_product" values="2, haier washing
machine, 4, 3121, on sale, 2017-08-08" />
<row data-node="expected_dataset.t_product" values="3, huawei mobile
phones, 6, 6666, on sale, 2017-08-08" />
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/tbl/data/expected/init-sql/h2/01-expected-init.sql
b/test/e2e/sql/src/test/resources/env/scenario/tbl/data/expected/init-sql/h2/01-expected-init.sql
index 63e55564513..58772a06083 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/tbl/data/expected/init-sql/h2/01-expected-init.sql
+++
b/test/e2e/sql/src/test/resources/env/scenario/tbl/data/expected/init-sql/h2/01-expected-init.sql
@@ -17,12 +17,8 @@
DROP TABLE IF EXISTS t_order;
DROP TABLE IF EXISTS t_order_item;
-DROP TABLE IF EXISTS t_single_table;
-DROP TABLE IF EXISTS t_broadcast_table;
CREATE TABLE t_order(order_id BIGINT PRIMARY KEY, user_id INT NOT NULL, status
VARCHAR(50) NOT NULL, merchant_id INT NOT NULL, remark VARCHAR(50) NOT NULL,
creation_date DATE NOT NULL);
CREATE TABLE t_order_item(item_id BIGINT PRIMARY KEY, order_id BIGINT NOT
NULL, user_id INT NOT NULL, product_id INT NOT NULL, quantity INT NOT NULL,
creation_date DATE NOT NULL);
-CREATE TABLE t_single_table (single_id INT NOT NULL, id INT NOT NULL, status
VARCHAR(45) NULL, PRIMARY KEY (single_id));
-CREATE TABLE t_broadcast_table (id INT NOT NULL, status VARCHAR(45) NULL,
PRIMARY KEY (id));
CREATE INDEX order_index_t_order ON t_order (order_id);
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/tbl/data/expected/init-sql/mysql/01-expected-init.sql
b/test/e2e/sql/src/test/resources/env/scenario/tbl/data/expected/init-sql/mysql/01-expected-init.sql
index 562a00092a9..574bf938361 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/tbl/data/expected/init-sql/mysql/01-expected-init.sql
+++
b/test/e2e/sql/src/test/resources/env/scenario/tbl/data/expected/init-sql/mysql/01-expected-init.sql
@@ -23,8 +23,6 @@ CREATE DATABASE expected_dataset;
CREATE TABLE expected_dataset.t_order(order_id BIGINT PRIMARY KEY, user_id INT
NOT NULL, status VARCHAR(50) NOT NULL, merchant_id INT NOT NULL, remark
VARCHAR(50) NOT NULL, creation_date DATE NOT NULL);
CREATE TABLE expected_dataset.t_order_item(item_id BIGINT PRIMARY KEY,
order_id BIGINT NOT NULL, user_id INT NOT NULL, product_id INT NOT NULL,
quantity INT NOT NULL, creation_date DATE NOT NULL);
-CREATE TABLE expected_dataset.t_single_table (single_id INT NOT NULL
AUTO_INCREMENT, id INT NOT NULL, status VARCHAR(45) NULL, PRIMARY KEY
(single_id));
-CREATE TABLE expected_dataset.t_broadcast_table (id INT NOT NULL, status
VARCHAR(45) NULL, PRIMARY KEY (id));
CREATE TABLE expected_dataset.t_product (product_id INT PRIMARY KEY,
product_name VARCHAR(50) NOT NULL, category_id INT NOT NULL, price DECIMAL NOT
NULL, status VARCHAR(50) NOT NULL, creation_date DATE NOT NULL);
CREATE INDEX order_index_t_order ON expected_dataset.t_order (order_id);
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/tbl/data/expected/init-sql/opengauss/01-expected-init.sql
b/test/e2e/sql/src/test/resources/env/scenario/tbl/data/expected/init-sql/opengauss/01-expected-init.sql
index c25243a92d4..49fb8c1ca4f 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/tbl/data/expected/init-sql/opengauss/01-expected-init.sql
+++
b/test/e2e/sql/src/test/resources/env/scenario/tbl/data/expected/init-sql/opengauss/01-expected-init.sql
@@ -24,13 +24,9 @@ GRANT ALL PRIVILEGES ON DATABASE expected_dataset TO
test_user;
DROP TABLE IF EXISTS t_order;
DROP TABLE IF EXISTS t_order_item;
-DROP TABLE IF EXISTS t_single_table;
-DROP TABLE IF EXISTS t_broadcast_table;
CREATE TABLE t_order(order_id BIGINT PRIMARY KEY, user_id INT NOT NULL, status
VARCHAR(50) NOT NULL, merchant_id INT NOT NULL, remark VARCHAR(50) NOT NULL,
creation_date DATE NOT NULL);
CREATE TABLE t_order_item(item_id BIGINT PRIMARY KEY, order_id BIGINT NOT
NULL, user_id INT NOT NULL, product_id INT NOT NULL, quantity INT NOT NULL,
creation_date DATE NOT NULL);
-CREATE TABLE t_single_table (single_id INT NOT NULL, id INT NOT NULL, status
VARCHAR(45) NULL, PRIMARY KEY (single_id));
-CREATE TABLE t_broadcast_table (id INT NOT NULL, status VARCHAR(45) NULL,
PRIMARY KEY (id));
CREATE TABLE t_product (product_id INT PRIMARY KEY, product_name VARCHAR(50)
NOT NULL, category_id INT NOT NULL, price DECIMAL NOT NULL, status VARCHAR(50)
NOT NULL, creation_date DATE NOT NULL);
CREATE INDEX order_index_t_order ON t_order (order_id);
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/tbl/data/expected/init-sql/postgresql/01-expected-init.sql
b/test/e2e/sql/src/test/resources/env/scenario/tbl/data/expected/init-sql/postgresql/01-expected-init.sql
index c25243a92d4..49fb8c1ca4f 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/tbl/data/expected/init-sql/postgresql/01-expected-init.sql
+++
b/test/e2e/sql/src/test/resources/env/scenario/tbl/data/expected/init-sql/postgresql/01-expected-init.sql
@@ -24,13 +24,9 @@ GRANT ALL PRIVILEGES ON DATABASE expected_dataset TO
test_user;
DROP TABLE IF EXISTS t_order;
DROP TABLE IF EXISTS t_order_item;
-DROP TABLE IF EXISTS t_single_table;
-DROP TABLE IF EXISTS t_broadcast_table;
CREATE TABLE t_order(order_id BIGINT PRIMARY KEY, user_id INT NOT NULL, status
VARCHAR(50) NOT NULL, merchant_id INT NOT NULL, remark VARCHAR(50) NOT NULL,
creation_date DATE NOT NULL);
CREATE TABLE t_order_item(item_id BIGINT PRIMARY KEY, order_id BIGINT NOT
NULL, user_id INT NOT NULL, product_id INT NOT NULL, quantity INT NOT NULL,
creation_date DATE NOT NULL);
-CREATE TABLE t_single_table (single_id INT NOT NULL, id INT NOT NULL, status
VARCHAR(45) NULL, PRIMARY KEY (single_id));
-CREATE TABLE t_broadcast_table (id INT NOT NULL, status VARCHAR(45) NULL,
PRIMARY KEY (id));
CREATE TABLE t_product (product_id INT PRIMARY KEY, product_name VARCHAR(50)
NOT NULL, category_id INT NOT NULL, price DECIMAL NOT NULL, status VARCHAR(50)
NOT NULL, creation_date DATE NOT NULL);
CREATE INDEX order_index_t_order ON t_order (order_id);
