This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 0ae493b1127 Refactor RAL it remove duplicate assertion file (#23813)
0ae493b1127 is described below
commit 0ae493b11276d4eb0ba77c46719744f4cbbb493d
Author: zhaojinchao <[email protected]>
AuthorDate: Mon Jan 30 13:28:11 2023 +0800
Refactor RAL it remove duplicate assertion file (#23813)
---
.../select_sharding_table_statistics.xml | 0
.../set_dist_variable_sql_show_equal_true.xml | 0
.../{cluster => }/show_authority_rule.xml | 0
...how_dist_variable_where_name_equal_sql_show.xml | 0
.../{cluster => }/show_dist_variables.xml | 0
.../{cluster => }/show_sql_parse_rule.xml | 0
.../show_status_from_readwrite_splitting_rules.xml | 0
.../{cluster => }/show_transaction_rule.xml | 0
.../set_dist_variable_sql_show_equal_true.xml | 24 ------------
.../empty_rules/standalone/show_authority_rule.xml | 25 -------------
...how_dist_variable_where_name_equal_sql_show.xml | 24 ------------
.../empty_rules/standalone/show_dist_variables.xml | 43 ----------------------
.../empty_rules/standalone/show_sql_parse_rule.xml | 25 -------------
.../show_status_from_readwrite_splitting_rules.xml | 25 -------------
.../standalone/show_transaction_rule.xml | 25 -------------
15 files changed, 191 deletions(-)
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 f0c99e88994..00000000000
---
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 @@
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<dataset>
- <metadata>
- <column name="variable_name" />
- <column name="variable_value" />
- </metadata>
- <row values="sql_show| true" />
-</dataset>
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 74a51fd0d53..00000000000
---
a/test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/standalone/show_authority_rule.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<dataset>
- <metadata>
- <column name="users" />
- <column name="provider" />
- <column name="props" />
- </metadata>
- <row values="proxy@%| ALL_PERMITTED| " />
-</dataset>
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 a3b5bb60c66..00000000000
---
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 @@
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<dataset>
- <metadata>
- <column name="variable_name" />
- <column name="variable_value" />
- </metadata>
- <row values="sql_show| false" />
-</dataset>
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 a3e755790e2..00000000000
---
a/test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/standalone/show_dist_variables.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<dataset>
- <metadata>
- <column name="variable_name" />
- <column name="variable_value" />
- </metadata>
- <row values="sql_show| false" />
- <row values="sql_simple| false" />
- <row values="kernel_executor_size| 16" />
- <row values="max_connections_size_per_query| 1" />
- <row values="check_table_meta_data_enabled| false" />
- <row values="sql_federation_type| ADVANCED" />
- <row values="proxy_frontend_database_protocol_type| " />
- <row values="proxy_frontend_flush_threshold| 128" />
- <row values="proxy_hint_enabled| true" />
- <row values="proxy_backend_query_fetch_size| -1" />
- <row values="proxy_frontend_executor_size| 0" />
- <row values="proxy_backend_executor_suitable| OLAP" />
- <row values="proxy_frontend_max_connections| 0" />
- <row values="proxy_mysql_default_version| 5.7.22" />
- <row values="proxy_default_port| 3307" />
- <row values="proxy_netty_backlog| 1024" />
- <row values="proxy_instance_type| Proxy" />
- <row values="agent_plugins_enabled| true" />
- <row values="cached_connections| 0" />
- <row values="transaction_type| LOCAL" />
-</dataset>
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 1b46cfbd75b..00000000000
---
a/test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/standalone/show_sql_parse_rule.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<dataset>
- <metadata>
- <column name="sql_comment_parse_enable" />
- <column name="parse_tree_cache" />
- <column name="sql_statement_cache" />
- </metadata>
- <row values="true| initialCapacity: 128, maximumSize: 1024|
initialCapacity: 2000, maximumSize: 65535" />
-</dataset>
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 64f30c12082..00000000000
---
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 @@
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<dataset>
- <metadata>
- <column name="storage_unit" />
- <column name="status" />
- <column name="delay_time(ms)" />
- </metadata>
- <row values="read_ds_0| enabled| 0" />
-</dataset>
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 84837266438..00000000000
---
a/test/e2e/suite/src/test/resources/cases/ral/dataset/empty_rules/standalone/show_transaction_rule.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<dataset>
- <metadata>
- <column name="default_type" />
- <column name="provider_type" />
- <column name="props" />
- </metadata>
- <row values="LOCAL| | " />
-</dataset>
