You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2022/01/07 07:09:44 UTC
[shardingsphere] branch master updated: Enable PG Proxy IT scenario dbtbl_with_readwrite_splitting_and_encrypt (#14594)
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 b0fd143 Enable PG Proxy IT scenario dbtbl_with_readwrite_splitting_and_encrypt (#14594)
b0fd143 is described below
commit b0fd143bd575b30702713051edde3072b87e6b01
Author: 吴伟杰 <wu...@apache.org>
AuthorDate: Fri Jan 7 15:08:56 2022 +0800
Enable PG Proxy IT scenario dbtbl_with_readwrite_splitting_and_encrypt (#14594)
---
.github/workflows/it.yml | 3 --
.../postgresql/show_resources.xml | 47 ++++++++++++++++++++++
.../{mysql => }/show_algorithms.xml | 0
.../{mysql => }/show_binging_rules.xml | 0
.../{mysql => }/show_broadcast_rules.xml | 0
.../{mysql => }/show_encrypt_rule.xml | 0
.../{mysql => }/show_encrypt_rules.xml | 0
.../{mysql => }/show_readwrite_splitting_rules.xml | 0
.../{mysql => }/show_rules.xml | 0
.../{mysql => }/show_table_rule.xml | 0
.../dataset.xml | 2 +-
11 files changed, 48 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/it.yml b/.github/workflows/it.yml
index af42425..5c7648f 100644
--- a/.github/workflows/it.yml
+++ b/.github/workflows/it.yml
@@ -46,9 +46,6 @@ jobs:
scenario: tbl
- adapter: proxy
database: PostgreSQL
- scenario: dbtbl_with_readwrite_splitting_and_encrypt
- - adapter: proxy
- database: PostgreSQL
scenario: empty_rules
steps:
- name: Cache Maven Repos
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/postgresql/show_resources.xml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/postgresql/show_resources.xml
new file mode 100644
index 0000000..c869a36
--- /dev/null
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/postgresql/show_resources.xml
@@ -0,0 +1,47 @@
+<!--
+ ~ 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="name" />
+ <column name="type" />
+ <column name="host" />
+ <column name="port" />
+ <column name="db" />
+ <column name="attribute" />
+ </metadata>
+ <row values="encrypt_write_ds_0| PostgreSQL| postgresql.dbtbl_with_readwrite_splitting_and_encrypt.host| 5432| encrypt_write_ds_0| {"connectionTimeoutMilliseconds":30000,"idleTimeoutMilliseconds":60000,"maxLifetimeMilliseconds":1800000,"maxPoolSize":2,"minPoolSize":2,"readOnly":false}" />
+ <row values="encrypt_write_ds_1| PostgreSQL| postgresql.dbtbl_with_readwrite_splitting_and_encrypt.host| 5432| encrypt_write_ds_1| {"connectionTimeoutMilliseconds":30000,"idleTimeoutMilliseconds":60000,"maxLifetimeMilliseconds":1800000,"maxPoolSize":2,"minPoolSize":2,"readOnly":false}" />
+ <row values="encrypt_write_ds_2| PostgreSQL| postgresql.dbtbl_with_readwrite_splitting_and_encrypt.host| 5432| encrypt_write_ds_2| {"connectionTimeoutMilliseconds":30000,"idleTimeoutMilliseconds":60000,"maxLifetimeMilliseconds":1800000,"maxPoolSize":2,"minPoolSize":2,"readOnly":false}" />
+ <row values="encrypt_write_ds_3| PostgreSQL| postgresql.dbtbl_with_readwrite_splitting_and_encrypt.host| 5432| encrypt_write_ds_3| {"connectionTimeoutMilliseconds":30000,"idleTimeoutMilliseconds":60000,"maxLifetimeMilliseconds":1800000,"maxPoolSize":2,"minPoolSize":2,"readOnly":false}" />
+ <row values="encrypt_write_ds_4| PostgreSQL| postgresql.dbtbl_with_readwrite_splitting_and_encrypt.host| 5432| encrypt_write_ds_4| {"connectionTimeoutMilliseconds":30000,"idleTimeoutMilliseconds":60000,"maxLifetimeMilliseconds":1800000,"maxPoolSize":2,"minPoolSize":2,"readOnly":false}" />
+ <row values="encrypt_write_ds_5| PostgreSQL| postgresql.dbtbl_with_readwrite_splitting_and_encrypt.host| 5432| encrypt_write_ds_5| {"connectionTimeoutMilliseconds":30000,"idleTimeoutMilliseconds":60000,"maxLifetimeMilliseconds":1800000,"maxPoolSize":2,"minPoolSize":2,"readOnly":false}" />
+ <row values="encrypt_write_ds_6| PostgreSQL| postgresql.dbtbl_with_readwrite_splitting_and_encrypt.host| 5432| encrypt_write_ds_6| {"connectionTimeoutMilliseconds":30000,"idleTimeoutMilliseconds":60000,"maxLifetimeMilliseconds":1800000,"maxPoolSize":2,"minPoolSize":2,"readOnly":false}" />
+ <row values="encrypt_write_ds_7| PostgreSQL| postgresql.dbtbl_with_readwrite_splitting_and_encrypt.host| 5432| encrypt_write_ds_7| {"connectionTimeoutMilliseconds":30000,"idleTimeoutMilliseconds":60000,"maxLifetimeMilliseconds":1800000,"maxPoolSize":2,"minPoolSize":2,"readOnly":false}" />
+ <row values="encrypt_write_ds_8| PostgreSQL| postgresql.dbtbl_with_readwrite_splitting_and_encrypt.host| 5432| encrypt_write_ds_8| {"connectionTimeoutMilliseconds":30000,"idleTimeoutMilliseconds":60000,"maxLifetimeMilliseconds":1800000,"maxPoolSize":2,"minPoolSize":2,"readOnly":false}" />
+ <row values="encrypt_write_ds_9| PostgreSQL| postgresql.dbtbl_with_readwrite_splitting_and_encrypt.host| 5432| encrypt_write_ds_9| {"connectionTimeoutMilliseconds":30000,"idleTimeoutMilliseconds":60000,"maxLifetimeMilliseconds":1800000,"maxPoolSize":2,"minPoolSize":2,"readOnly":false}" />
+ <row values="encrypt_read_ds_0| PostgreSQL| postgresql.dbtbl_with_readwrite_splitting_and_encrypt.host| 5432| encrypt_read_ds_0| {"connectionTimeoutMilliseconds":30000,"idleTimeoutMilliseconds":60000,"maxLifetimeMilliseconds":1800000,"maxPoolSize":2,"minPoolSize":2,"readOnly":false}" />
+ <row values="encrypt_read_ds_1| PostgreSQL| postgresql.dbtbl_with_readwrite_splitting_and_encrypt.host| 5432| encrypt_read_ds_1| {"connectionTimeoutMilliseconds":30000,"idleTimeoutMilliseconds":60000,"maxLifetimeMilliseconds":1800000,"maxPoolSize":2,"minPoolSize":2,"readOnly":false}" />
+ <row values="encrypt_read_ds_2| PostgreSQL| postgresql.dbtbl_with_readwrite_splitting_and_encrypt.host| 5432| encrypt_read_ds_2| {"connectionTimeoutMilliseconds":30000,"idleTimeoutMilliseconds":60000,"maxLifetimeMilliseconds":1800000,"maxPoolSize":2,"minPoolSize":2,"readOnly":false}" />
+ <row values="encrypt_read_ds_3| PostgreSQL| postgresql.dbtbl_with_readwrite_splitting_and_encrypt.host| 5432| encrypt_read_ds_3| {"connectionTimeoutMilliseconds":30000,"idleTimeoutMilliseconds":60000,"maxLifetimeMilliseconds":1800000,"maxPoolSize":2,"minPoolSize":2,"readOnly":false}" />
+ <row values="encrypt_read_ds_4| PostgreSQL| postgresql.dbtbl_with_readwrite_splitting_and_encrypt.host| 5432| encrypt_read_ds_4| {"connectionTimeoutMilliseconds":30000,"idleTimeoutMilliseconds":60000,"maxLifetimeMilliseconds":1800000,"maxPoolSize":2,"minPoolSize":2,"readOnly":false}" />
+ <row values="encrypt_read_ds_5| PostgreSQL| postgresql.dbtbl_with_readwrite_splitting_and_encrypt.host| 5432| encrypt_read_ds_5| {"connectionTimeoutMilliseconds":30000,"idleTimeoutMilliseconds":60000,"maxLifetimeMilliseconds":1800000,"maxPoolSize":2,"minPoolSize":2,"readOnly":false}" />
+ <row values="encrypt_read_ds_6| PostgreSQL| postgresql.dbtbl_with_readwrite_splitting_and_encrypt.host| 5432| encrypt_read_ds_6| {"connectionTimeoutMilliseconds":30000,"idleTimeoutMilliseconds":60000,"maxLifetimeMilliseconds":1800000,"maxPoolSize":2,"minPoolSize":2,"readOnly":false}" />
+ <row values="encrypt_read_ds_7| PostgreSQL| postgresql.dbtbl_with_readwrite_splitting_and_encrypt.host| 5432| encrypt_read_ds_7| {"connectionTimeoutMilliseconds":30000,"idleTimeoutMilliseconds":60000,"maxLifetimeMilliseconds":1800000,"maxPoolSize":2,"minPoolSize":2,"readOnly":false}" />
+ <row values="encrypt_read_ds_8| PostgreSQL| postgresql.dbtbl_with_readwrite_splitting_and_encrypt.host| 5432| encrypt_read_ds_8| {"connectionTimeoutMilliseconds":30000,"idleTimeoutMilliseconds":60000,"maxLifetimeMilliseconds":1800000,"maxPoolSize":2,"minPoolSize":2,"readOnly":false}" />
+ <row values="encrypt_read_ds_9| PostgreSQL| postgresql.dbtbl_with_readwrite_splitting_and_encrypt.host| 5432| encrypt_read_ds_9| {"connectionTimeoutMilliseconds":30000,"idleTimeoutMilliseconds":60000,"maxLifetimeMilliseconds":1800000,"maxPoolSize":2,"minPoolSize":2,"readOnly":false}" />
+</dataset>
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/mysql/show_algorithms.xml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_algorithms.xml
similarity index 100%
rename from shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/mysql/show_algorithms.xml
rename to shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_algorithms.xml
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/mysql/show_binging_rules.xml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_binging_rules.xml
similarity index 100%
rename from shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/mysql/show_binging_rules.xml
rename to shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_binging_rules.xml
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/mysql/show_broadcast_rules.xml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_broadcast_rules.xml
similarity index 100%
rename from shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/mysql/show_broadcast_rules.xml
rename to shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_broadcast_rules.xml
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/mysql/show_encrypt_rule.xml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_encrypt_rule.xml
similarity index 100%
rename from shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/mysql/show_encrypt_rule.xml
rename to shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_encrypt_rule.xml
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/mysql/show_encrypt_rules.xml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_encrypt_rules.xml
similarity index 100%
rename from shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/mysql/show_encrypt_rules.xml
rename to shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_encrypt_rules.xml
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/mysql/show_readwrite_splitting_rules.xml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_readwrite_splitting_rules.xml
similarity index 100%
rename from shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/mysql/show_readwrite_splitting_rules.xml
rename to shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_readwrite_splitting_rules.xml
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/mysql/show_rules.xml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_rules.xml
similarity index 100%
rename from shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/mysql/show_rules.xml
rename to shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_rules.xml
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/mysql/show_table_rule.xml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_table_rule.xml
similarity index 100%
rename from shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/mysql/show_table_rule.xml
rename to shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/cases/rql/dataset/dbtbl_with_readwrite_splitting_and_encrypt/show_table_rule.xml
diff --git a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/dbtbl_with_readwrite_splitting_and_encrypt/dataset.xml b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/dbtbl_with_readwrite_splitting_and_encrypt/dataset.xml
index a123e3e..fe65426 100644
--- a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/dbtbl_with_readwrite_splitting_and_encrypt/dataset.xml
+++ b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/resources/env/dbtbl_with_readwrite_splitting_and_encrypt/dataset.xml
@@ -306,7 +306,7 @@
<row data-node="encrypt_write_ds_1.t_user_encrypt_federate" values="2, plain password3, uqObdVp9XTGZ4Mnw0LolHg==, Phoebe" />
<row data-node="encrypt_write_ds_1.t_user_encrypt_federate" values="3, plain password4, uqObdVp9XTGZ4Mnw0LolHg==, Ross" />
<row data-node="encrypt_write_ds_1.t_user_encrypt_federate" values="4, plain password5, uqObdVp9XTGZ4Mnw0LolHg==, Chandler" />
- <row data-node="encrypt_read_ds_1.t_user_encrypt_federate" values="5, plain password6, uqObdVp9XTGZ4Mnw0LolHg==, Joey" />
+ <row data-node="encrypt_write_ds_1.t_user_encrypt_federate" values="5, plain password6, uqObdVp9XTGZ4Mnw0LolHg==, Joey" />
<row data-node="encrypt_read_ds_0.t_single_table" values="1, 0, init_read" />
<row data-node="encrypt_read_ds_0.t_single_table" values="2, 11, init_read" />
<row data-node="encrypt_read_ds_0.t_single_table" values="3, 22, init_read" />