This is an automated email from the ASF dual-hosted git repository.
panjuan 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 ad535a1 Rename file name included master slave (#7598)
ad535a1 is described below
commit ad535a1e0e349dd2174157addb2a171e4ce52eb5
Author: Liang Zhang <[email protected]>
AuthorDate: Fri Sep 25 13:07:46 2020 +0800
Rename file name included master slave (#7598)
* Remove useless yaml
* Rename file name included master slave
---
...g-master-only.yaml => config-primary-only.yaml} | 0
.../src/test/resources/yaml/unit/encrypt.yaml | 36 ---------------
.../yaml/unit/encryptWithRegistryCenter.yaml | 54 ----------------------
.../src/test/resources/yaml/unit/masterSlave.yaml | 35 --------------
.../src/test/resources/yaml/unit/noRule.yaml | 42 -----------------
.../test/resources/yaml/unit/shadowEncrypt.yaml | 44 ------------------
.../{dbtbl_0_master.sql => dbtbl_0_primary.sql} | 0
.../{dbtbl_0_slave_0.sql => dbtbl_0_replica_0.sql} | 0
.../{dbtbl_0_slave_1.sql => dbtbl_0_replica_1.sql} | 0
.../{dbtbl_1_master.sql => dbtbl_1_primary.sql} | 0
.../{dbtbl_1_slave_0.sql => dbtbl_1_replica_0.sql} | 0
.../{dbtbl_1_slave_1.sql => dbtbl_1_replica_1.sql} | 0
...aml => config-primary-replica-replication.yaml} | 0
13 files changed, 211 deletions(-)
diff --git
a/examples/shardingsphere-proxy-example/shardingsphere-proxy-hint-example/src/main/resources/conf/config-master-only.yaml
b/examples/shardingsphere-proxy-example/shardingsphere-proxy-hint-example/src/main/resources/conf/config-primary-only.yaml
similarity index 100%
rename from
examples/shardingsphere-proxy-example/shardingsphere-proxy-hint-example/src/main/resources/conf/config-master-only.yaml
rename to
examples/shardingsphere-proxy-example/shardingsphere-proxy-hint-example/src/main/resources/conf/config-primary-only.yaml
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/unit/encrypt.yaml
b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/unit/encrypt.yaml
deleted file mode 100644
index 1f77e39..0000000
---
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/unit/encrypt.yaml
+++ /dev/null
@@ -1,36 +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.
-#
-
-dataSource: !!org.apache.commons.dbcp2.BasicDataSource
- driverClassName: org.h2.Driver
- url:
jdbc:h2:mem:ds_encrypt;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
- username: sa
- password:
-
-rules:
-- !ENCRYPT
- tables:
- t_order:
- columns:
- user_id:
- cipherColumn: user_id
- encryptorName: order_encryptor
- encryptors:
- order_encryptor:
- type: AES
- props:
- aes-key-value: 123456
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/unit/encryptWithRegistryCenter.yaml
b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/unit/encryptWithRegistryCenter.yaml
deleted file mode 100644
index e936f4a..0000000
---
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/unit/encryptWithRegistryCenter.yaml
+++ /dev/null
@@ -1,54 +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.
-#
-
-governance:
- name: test_encrypt_registry_name
- registryCenter:
- type: REG_TEST
- serverLists: localhost:3181
- retryIntervalMilliseconds: 10
- timeToLiveSeconds: 10
- maxRetries: 10
- operationTimeoutMilliseconds: 10
- additionalConfigCenter:
- type: CONFIG_TEST
- serverLists: localhost:3181
- retryIntervalMilliseconds: 10
- timeToLiveSeconds: 10
- maxRetries: 10
- operationTimeoutMilliseconds: 10
- overwrite: true
-
-dataSource: !!org.apache.commons.dbcp2.BasicDataSource
- driverClassName: org.h2.Driver
- url:
jdbc:h2:mem:ds_encrypt;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
- username: sa
- password:
-
-rules:
-- !ENCRYPT
- tables:
- t_order:
- columns:
- user_id:
- cipherColumn: user_id
- encryptorName: order_encryptor
- encryptors:
- order_encryptor:
- type: aes
- props:
- aes-key-value: 123456
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/unit/masterSlave.yaml
b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/unit/masterSlave.yaml
deleted file mode 100644
index 3d3aa6c..0000000
---
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/unit/masterSlave.yaml
+++ /dev/null
@@ -1,35 +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.
-#
-
-dataSources:
- primary_ds: !!org.apache.commons.dbcp2.BasicDataSource
- driverClassName: org.h2.Driver
- url:
jdbc:h2:mem:primary_ds;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
- username: sa
- password:
- replica_ds: !!org.apache.commons.dbcp2.BasicDataSource
- driverClassName: org.h2.Driver
- url:
jdbc:h2:mem:replica_ds;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
- username: sa
- password:
-
-rules:
-- !PRIMARY_REPLICA_REPLICATION
- name: pr_ds
- primaryDataSourceName: primary_ds
- replicaDataSourceNames:
- - replica_ds
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/unit/noRule.yaml
b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/unit/noRule.yaml
deleted file mode 100644
index 59ea856..0000000
---
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/unit/noRule.yaml
+++ /dev/null
@@ -1,42 +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.
-#
-
-governance:
- namespace: test_encrypt_registry_name
- registryCenter:
- type: REG_TEST
- serverLists: localhost:3181
- props:
- retryIntervalMilliseconds: 10
- timeToLiveSeconds: 10
- maxRetries: 10
- operationTimeoutMilliseconds: 10
- additionalConfigCenter:
- type: CONFIG_TEST
- serverLists: localhost:3181
- props:
- retryIntervalMilliseconds: 10
- timeToLiveSeconds: 10
- maxRetries: 10
- operationTimeoutMilliseconds: 10
- overwrite: true
-
-dataSource: !!org.apache.commons.dbcp2.BasicDataSource
- driverClassName: org.h2.Driver
- url:
jdbc:h2:mem:ds_encrypt;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
- username: sa
- password:
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/unit/shadowEncrypt.yaml
b/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/unit/shadowEncrypt.yaml
deleted file mode 100644
index ae198ec..0000000
---
a/shardingsphere-jdbc/shardingsphere-jdbc-governance/src/test/resources/yaml/unit/shadowEncrypt.yaml
+++ /dev/null
@@ -1,44 +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.
-#
-
-dataSource: !!org.apache.commons.dbcp2.BasicDataSource
- driverClassName: org.h2.Driver
- url:
jdbc:h2:mem:ds_encrypt;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
- username: sa
- password:
-
-rules:
-- !ENCRYPT
- tables:
- t_order:
- columns:
- user_id:
- cipherColumn: user_id
- encryptorName: order_encryptor
- encryptors:
- order_encryptor:
- type: AES
- props:
- aes-key-value: 123456
-
-- !SHADOW
- column: shadows
- dataSource: !!org.apache.commons.dbcp2.BasicDataSource
- driverClassName: org.h2.Driver
- url:
jdbc:h2:mem:ds_encrypt;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL
- username: sa
- password:
\ No newline at end of file
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/resources/schema/dbtbl_0_master.sql
b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/resources/schema/dbtbl_0_primary.sql
similarity index 100%
rename from
shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/resources/schema/dbtbl_0_master.sql
rename to
shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/resources/schema/dbtbl_0_primary.sql
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/resources/schema/dbtbl_0_slave_0.sql
b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/resources/schema/dbtbl_0_replica_0.sql
similarity index 100%
rename from
shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/resources/schema/dbtbl_0_slave_0.sql
rename to
shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/resources/schema/dbtbl_0_replica_0.sql
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/resources/schema/dbtbl_0_slave_1.sql
b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/resources/schema/dbtbl_0_replica_1.sql
similarity index 100%
rename from
shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/resources/schema/dbtbl_0_slave_1.sql
rename to
shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/resources/schema/dbtbl_0_replica_1.sql
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/resources/schema/dbtbl_1_master.sql
b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/resources/schema/dbtbl_1_primary.sql
similarity index 100%
rename from
shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/resources/schema/dbtbl_1_master.sql
rename to
shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/resources/schema/dbtbl_1_primary.sql
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/resources/schema/dbtbl_1_slave_0.sql
b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/resources/schema/dbtbl_1_replica_0.sql
similarity index 100%
rename from
shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/resources/schema/dbtbl_1_slave_0.sql
rename to
shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/resources/schema/dbtbl_1_replica_0.sql
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/resources/schema/dbtbl_1_slave_1.sql
b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/resources/schema/dbtbl_1_replica_1.sql
similarity index 100%
rename from
shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/resources/schema/dbtbl_1_slave_1.sql
rename to
shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-governance-spring/shardingsphere-jdbc-governance-spring-namespace/src/test/resources/schema/dbtbl_1_replica_1.sql
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-common/src/test/resources/conf/config-master_slave.yaml
b/shardingsphere-proxy/shardingsphere-proxy-common/src/test/resources/conf/config-primary-replica-replication.yaml
similarity index 100%
rename from
shardingsphere-proxy/shardingsphere-proxy-common/src/test/resources/conf/config-master_slave.yaml
rename to
shardingsphere-proxy/shardingsphere-proxy-common/src/test/resources/conf/config-primary-replica-replication.yaml
