From 4e348361ecfcf7f1f14d084cb99e540ecf04a91e Mon Sep 17 00:00:00 2001 From: zhaojinchao Date: Sun, 29 Jan 2023 23:47:39 +0800 Subject: [PATCH] Refactor RAL it remove duplicate assertion file --- .../select_sharding_table_statistics.xml | 0 .../set_dist_variable_sql_show_equal_true.xml | 0 .../{cluster => }/show_authority_rule.xml | 0 ...ist_variable_where_name_equal_sql_show.xml | 0 .../{cluster => }/show_dist_variables.xml | 0 .../{cluster => }/show_sql_parse_rule.xml | 0 ..._status_from_readwrite_splitting_rules.xml | 0 .../{cluster => }/show_transaction_rule.xml | 0 .../set_dist_variable_sql_show_equal_true.xml | 24 ----------- .../standalone/show_authority_rule.xml | 25 ----------- ...ist_variable_where_name_equal_sql_show.xml | 24 ----------- .../standalone/show_dist_variables.xml | 43 ------------------- .../standalone/show_sql_parse_rule.xml | 25 ----------- ..._status_from_readwrite_splitting_rules.xml | 25 ----------- .../standalone/show_transaction_rule.xml | 25 ----------- 15 files changed, 191 deletions(-) rename test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/{standalone => }/select_sharding_table_statistics.xml (100%) rename test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/{cluster => }/set_dist_variable_sql_show_equal_true.xml (100%) rename test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/{cluster => }/show_authority_rule.xml (100%) rename test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/{cluster => }/show_dist_variable_where_name_equal_sql_show.xml (100%) rename test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/{cluster => }/show_dist_variables.xml (100%) rename test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/{cluster => }/show_sql_parse_rule.xml (100%) rename test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/{cluster => }/show_status_from_readwrite_splitting_rules.xml (100%) rename test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/{cluster => }/show_transaction_rule.xml (100%) delete mode 100644 test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/standalone/set_dist_variable_sql_show_equal_true.xml delete mode 100644 test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/standalone/show_authority_rule.xml delete mode 100644 test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/standalone/show_dist_variable_where_name_equal_sql_show.xml delete mode 100644 test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/standalone/show_dist_variables.xml delete mode 100644 test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/standalone/show_sql_parse_rule.xml delete mode 100644 test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/standalone/show_status_from_readwrite_splitting_rules.xml delete mode 100644 test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/standalone/show_transaction_rule.xml diff --git a/test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/standalone/select_sharding_table_statistics.xml b/test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/select_sharding_table_statistics.xml similarity index 100% rename from test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/standalone/select_sharding_table_statistics.xml rename to test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/select_sharding_table_statistics.xml diff --git a/test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/cluster/set_dist_variable_sql_show_equal_true.xml b/test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/set_dist_variable_sql_show_equal_true.xml similarity index 100% rename from test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/cluster/set_dist_variable_sql_show_equal_true.xml rename to test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/set_dist_variable_sql_show_equal_true.xml diff --git a/test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/cluster/show_authority_rule.xml b/test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/show_authority_rule.xml similarity index 100% rename from test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/cluster/show_authority_rule.xml rename to test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/show_authority_rule.xml diff --git a/test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/cluster/show_dist_variable_where_name_equal_sql_show.xml b/test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/show_dist_variable_where_name_equal_sql_show.xml similarity index 100% rename from test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/cluster/show_dist_variable_where_name_equal_sql_show.xml rename to test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/show_dist_variable_where_name_equal_sql_show.xml diff --git a/test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/cluster/show_dist_variables.xml b/test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/show_dist_variables.xml similarity index 100% rename from test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/cluster/show_dist_variables.xml rename to test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/show_dist_variables.xml diff --git a/test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/cluster/show_sql_parse_rule.xml b/test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/show_sql_parse_rule.xml similarity index 100% rename from test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/cluster/show_sql_parse_rule.xml rename to test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/show_sql_parse_rule.xml diff --git a/test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/cluster/show_status_from_readwrite_splitting_rules.xml b/test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/show_status_from_readwrite_splitting_rules.xml similarity index 100% rename from test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/cluster/show_status_from_readwrite_splitting_rules.xml rename to test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/show_status_from_readwrite_splitting_rules.xml diff --git a/test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/cluster/show_transaction_rule.xml b/test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/show_transaction_rule.xml similarity index 100% rename from test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/cluster/show_transaction_rule.xml rename to test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/show_transaction_rule.xml diff --git a/test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/standalone/set_dist_variable_sql_show_equal_true.xml b/test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/standalone/set_dist_variable_sql_show_equal_true.xml deleted file mode 100644 index f0c99e889940c..0000000000000 --- a/test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/standalone/set_dist_variable_sql_show_equal_true.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - diff --git a/test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/standalone/show_authority_rule.xml b/test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/standalone/show_authority_rule.xml deleted file mode 100644 index 74a51fd0d532c..0000000000000 --- a/test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/standalone/show_authority_rule.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - diff --git a/test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/standalone/show_dist_variable_where_name_equal_sql_show.xml b/test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/standalone/show_dist_variable_where_name_equal_sql_show.xml deleted file mode 100644 index a3b5bb60c665f..0000000000000 --- a/test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/standalone/show_dist_variable_where_name_equal_sql_show.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - diff --git a/test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/standalone/show_dist_variables.xml b/test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/standalone/show_dist_variables.xml deleted file mode 100644 index a3e755790e263..0000000000000 --- a/test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/standalone/show_dist_variables.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/standalone/show_sql_parse_rule.xml b/test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/standalone/show_sql_parse_rule.xml deleted file mode 100644 index 1b46cfbd75b27..0000000000000 --- a/test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/standalone/show_sql_parse_rule.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - diff --git a/test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/standalone/show_status_from_readwrite_splitting_rules.xml b/test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/standalone/show_status_from_readwrite_splitting_rules.xml deleted file mode 100644 index 64f30c12082fb..0000000000000 --- a/test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/standalone/show_status_from_readwrite_splitting_rules.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - diff --git a/test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/standalone/show_transaction_rule.xml b/test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/standalone/show_transaction_rule.xml deleted file mode 100644 index 8483726643895..0000000000000 --- a/test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/standalone/show_transaction_rule.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - -