This is an automated email from the ASF dual-hosted git repository.
chengzhang 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 7c9225912bd Modify sqlFederationEnable to true when scenario contains
sharding (#26727)
7c9225912bd is described below
commit 7c9225912bd6e8cb7e21c61cbe7488befbe144a2
Author: Zhengqiang Duan <[email protected]>
AuthorDate: Sat Jul 1 19:32:01 2023 +0800
Modify sqlFederationEnable to true when scenario contains sharding (#26727)
---
.../rewrite/token/generator/EncryptAlterTableTokenGenerator.java | 4 ++--
.../config/ProxyClusterContainerConfigurationFactory.java | 4 ++--
.../config/ProxyStandaloneContainerConfigurationFactory.java | 4 ++--
.../src/test/resources/env/common/cluster/proxy/conf/server.yaml | 6 ------
.../test/resources/env/common/standalone/proxy/conf/server.yaml | 6 ------
.../proxy/conf => scenario/db/proxy/mode/cluster}/server.yaml | 2 +-
.../proxy/mode}/standalone/server.yaml | 9 +++++++++
.../proxy/mode/cluster}/server.yaml | 2 +-
.../proxy/mode}/standalone/server.yaml | 9 +++++++++
.../proxy/mode/cluster}/server.yaml | 2 +-
.../proxy/mode}/standalone/server.yaml | 9 +++++++++
.../conf => scenario/empty_rules/proxy/mode/cluster}/server.yaml | 2 +-
.../proxy/mode}/standalone/server.yaml | 9 +++++++++
.../env/scenario/encrypt_and_readwrite_splitting/rules.yaml | 6 ------
.../sharding_and_encrypt/{ => proxy/mode}/cluster/server.yaml | 0
.../sharding_and_encrypt/{ => proxy/mode}/standalone/server.yaml | 0
.../proxy/conf => scenario/tbl/proxy/mode/cluster}/server.yaml | 2 +-
.../proxy/mode}/standalone/server.yaml | 9 +++++++++
18 files changed, 56 insertions(+), 29 deletions(-)
diff --git
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptAlterTableTokenGenerator.java
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptAlterTableTokenGenerator.java
index cc20b84ce05..d91bdd7b3f9 100644
---
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptAlterTableTokenGenerator.java
+++
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptAlterTableTokenGenerator.java
@@ -221,9 +221,9 @@ public final class EncryptAlterTableTokenGenerator
implements CollectionSQLToken
result.add(new
EncryptAlterTableToken(segment.getColumnDefinition().getColumnName().getStopIndex()
+ 1, segment.getColumnDefinition().getColumnName().getStopIndex(),
encryptColumn.getCipher().getName(), null));
previousEncryptColumn.getAssistedQuery().map(optional -> new
EncryptAlterTableToken(segment.getStopIndex() + 1,
segment.getColumnDefinition().getColumnName().getStopIndex(),
-
encryptColumn.getAssistedQuery().map(AssistedQueryColumnItem::getName).orElse(""),
", CHANGE COLUMN " + optional.getName())).ifPresent(result::add);
+
encryptColumn.getAssistedQuery().map(AssistedQueryColumnItem::getName).orElse(""),
", CHANGE COLUMN " + optional.getName())).ifPresent(result::add);
previousEncryptColumn.getLikeQuery().map(optional -> new
EncryptAlterTableToken(segment.getStopIndex() + 1,
segment.getColumnDefinition().getColumnName().getStopIndex(),
-
encryptColumn.getLikeQuery().map(LikeQueryColumnItem::getName).orElse(""), ",
CHANGE COLUMN " + optional.getName())).ifPresent(result::add);
+
encryptColumn.getLikeQuery().map(LikeQueryColumnItem::getName).orElse(""), ",
CHANGE COLUMN " + optional.getName())).ifPresent(result::add);
return result;
}
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/container/config/ProxyClusterContainerConfigurationFactory.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/container/config/ProxyClusterContainerConfigurationFactory.java
index f326d3a1d8a..ad59523437e 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/container/config/ProxyClusterContainerConfigurationFactory.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/container/config/ProxyClusterContainerConfigurationFactory.java
@@ -49,13 +49,13 @@ public final class
ProxyClusterContainerConfigurationFactory {
Map<String, String> result = new HashMap<>(3, 1F);
result.put("/env/common/cluster/proxy/conf/logback.xml",
ProxyContainerConstants.CONFIG_PATH_IN_CONTAINER + "logback.xml");
result.put("/env/scenario/" + scenario + "/proxy/conf/" +
databaseType.getType().toLowerCase(),
ProxyContainerConstants.CONFIG_PATH_IN_CONTAINER);
- result.put(serverYamlExists(scenario) ? "/env/scenario/" + scenario +
"/cluster/server.yaml"
+ result.put(serverYamlExists(scenario) ? "/env/scenario/" + scenario +
"/proxy/mode/cluster/server.yaml"
: "/env/common/cluster/proxy/conf/server.yaml",
ProxyContainerConstants.CONFIG_PATH_IN_CONTAINER + "server.yaml");
return result;
}
private static boolean serverYamlExists(final String scenario) {
- URL url =
Thread.currentThread().getContextClassLoader().getResource("env/scenario/" +
scenario + "/cluster/server.yaml");
+ URL url =
Thread.currentThread().getContextClassLoader().getResource("env/scenario/" +
scenario + "/proxy/mode/cluster/server.yaml");
return null != url;
}
}
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/container/config/ProxyStandaloneContainerConfigurationFactory.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/container/config/ProxyStandaloneContainerConfigurationFactory.java
index 452044bba65..3d481ae3c9e 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/container/config/ProxyStandaloneContainerConfigurationFactory.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/container/config/ProxyStandaloneContainerConfigurationFactory.java
@@ -49,13 +49,13 @@ public final class
ProxyStandaloneContainerConfigurationFactory {
Map<String, String> result = new HashMap<>(3, 1F);
result.put("/env/common/standalone/proxy/conf/logback.xml",
ProxyContainerConstants.CONFIG_PATH_IN_CONTAINER + "logback.xml");
result.put("/env/scenario/" + scenario + "/proxy/conf/" +
databaseType.getType().toLowerCase(),
ProxyContainerConstants.CONFIG_PATH_IN_CONTAINER);
- result.put(serverYamlExists(scenario) ? "/env/scenario/" + scenario +
"/standalone/server.yaml"
+ result.put(serverYamlExists(scenario) ? "/env/scenario/" + scenario +
"/proxy/mode/standalone/server.yaml"
: "/env/common/standalone/proxy/conf/server.yaml",
ProxyContainerConstants.CONFIG_PATH_IN_CONTAINER + "server.yaml");
return result;
}
private static boolean serverYamlExists(final String scenario) {
- URL url =
Thread.currentThread().getContextClassLoader().getResource("env/scenario/" +
scenario + "/standalone/server.yaml");
+ URL url =
Thread.currentThread().getContextClassLoader().getResource("env/scenario/" +
scenario + "/proxy/mode/standalone/server.yaml");
return null != url;
}
}
diff --git
a/test/e2e/sql/src/test/resources/env/common/cluster/proxy/conf/server.yaml
b/test/e2e/sql/src/test/resources/env/common/cluster/proxy/conf/server.yaml
index ce6d9ef96c9..ed22f88ac78 100644
--- a/test/e2e/sql/src/test/resources/env/common/cluster/proxy/conf/server.yaml
+++ b/test/e2e/sql/src/test/resources/env/common/cluster/proxy/conf/server.yaml
@@ -43,12 +43,6 @@ sqlParser:
initialCapacity: 128
maximumSize: 1024
-sqlFederation:
- sqlFederationEnabled: true
- executionPlanCache:
- initialCapacity: 2000
- maximumSize: 65535
-
props:
max-connections-size-per-query: 1
kernel-executor-size: 16 # Infinite by default.
diff --git
a/test/e2e/sql/src/test/resources/env/common/standalone/proxy/conf/server.yaml
b/test/e2e/sql/src/test/resources/env/common/standalone/proxy/conf/server.yaml
index 3b97188335c..b5480bf36ed 100644
---
a/test/e2e/sql/src/test/resources/env/common/standalone/proxy/conf/server.yaml
+++
b/test/e2e/sql/src/test/resources/env/common/standalone/proxy/conf/server.yaml
@@ -43,12 +43,6 @@ sqlParser:
initialCapacity: 128
maximumSize: 1024
-sqlFederation:
- sqlFederationEnabled: true
- executionPlanCache:
- initialCapacity: 2000
- maximumSize: 65535
-
props:
max-connections-size-per-query: 1
kernel-executor-size: 16 # Infinite by default.
diff --git
a/test/e2e/sql/src/test/resources/env/common/cluster/proxy/conf/server.yaml
b/test/e2e/sql/src/test/resources/env/scenario/db/proxy/mode/cluster/server.yaml
similarity index 99%
copy from
test/e2e/sql/src/test/resources/env/common/cluster/proxy/conf/server.yaml
copy to
test/e2e/sql/src/test/resources/env/scenario/db/proxy/mode/cluster/server.yaml
index ce6d9ef96c9..9a5fd67d4cf 100644
--- a/test/e2e/sql/src/test/resources/env/common/cluster/proxy/conf/server.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/db/proxy/mode/cluster/server.yaml
@@ -42,7 +42,7 @@ sqlParser:
parseTreeCache:
initialCapacity: 128
maximumSize: 1024
-
+
sqlFederation:
sqlFederationEnabled: true
executionPlanCache:
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/sharding_and_encrypt/standalone/server.yaml
b/test/e2e/sql/src/test/resources/env/scenario/db/proxy/mode/standalone/server.yaml
similarity index 87%
copy from
test/e2e/sql/src/test/resources/env/scenario/sharding_and_encrypt/standalone/server.yaml
copy to
test/e2e/sql/src/test/resources/env/scenario/db/proxy/mode/standalone/server.yaml
index 68ee1192a18..703d0cb49f2 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/sharding_and_encrypt/standalone/server.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/db/proxy/mode/standalone/server.yaml
@@ -22,6 +22,15 @@ authority:
privilege:
type: ALL_PERMITTED
+sqlParser:
+ sqlCommentParseEnabled: true
+ sqlStatementCache:
+ initialCapacity: 2000
+ maximumSize: 65535
+ parseTreeCache:
+ initialCapacity: 128
+ maximumSize: 1024
+
sqlFederation:
sqlFederationEnabled: true
executionPlanCache:
diff --git
a/test/e2e/sql/src/test/resources/env/common/cluster/proxy/conf/server.yaml
b/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/proxy/mode/cluster/server.yaml
similarity index 99%
copy from
test/e2e/sql/src/test/resources/env/common/cluster/proxy/conf/server.yaml
copy to
test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/proxy/mode/cluster/server.yaml
index ce6d9ef96c9..9a5fd67d4cf 100644
--- a/test/e2e/sql/src/test/resources/env/common/cluster/proxy/conf/server.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/proxy/mode/cluster/server.yaml
@@ -42,7 +42,7 @@ sqlParser:
parseTreeCache:
initialCapacity: 128
maximumSize: 1024
-
+
sqlFederation:
sqlFederationEnabled: true
executionPlanCache:
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/sharding_and_encrypt/standalone/server.yaml
b/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/proxy/mode/standalone/server.yaml
similarity index 87%
copy from
test/e2e/sql/src/test/resources/env/scenario/sharding_and_encrypt/standalone/server.yaml
copy to
test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/proxy/mode/standalone/server.yaml
index 68ee1192a18..703d0cb49f2 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/sharding_and_encrypt/standalone/server.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/proxy/mode/standalone/server.yaml
@@ -22,6 +22,15 @@ authority:
privilege:
type: ALL_PERMITTED
+sqlParser:
+ sqlCommentParseEnabled: true
+ sqlStatementCache:
+ initialCapacity: 2000
+ maximumSize: 65535
+ parseTreeCache:
+ initialCapacity: 128
+ maximumSize: 1024
+
sqlFederation:
sqlFederationEnabled: true
executionPlanCache:
diff --git
a/test/e2e/sql/src/test/resources/env/common/cluster/proxy/conf/server.yaml
b/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/proxy/mode/cluster/server.yaml
similarity index 99%
copy from
test/e2e/sql/src/test/resources/env/common/cluster/proxy/conf/server.yaml
copy to
test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/proxy/mode/cluster/server.yaml
index ce6d9ef96c9..9a5fd67d4cf 100644
--- a/test/e2e/sql/src/test/resources/env/common/cluster/proxy/conf/server.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/proxy/mode/cluster/server.yaml
@@ -42,7 +42,7 @@ sqlParser:
parseTreeCache:
initialCapacity: 128
maximumSize: 1024
-
+
sqlFederation:
sqlFederationEnabled: true
executionPlanCache:
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/sharding_and_encrypt/standalone/server.yaml
b/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/proxy/mode/standalone/server.yaml
similarity index 87%
copy from
test/e2e/sql/src/test/resources/env/scenario/sharding_and_encrypt/standalone/server.yaml
copy to
test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/proxy/mode/standalone/server.yaml
index 68ee1192a18..703d0cb49f2 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/sharding_and_encrypt/standalone/server.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/proxy/mode/standalone/server.yaml
@@ -22,6 +22,15 @@ authority:
privilege:
type: ALL_PERMITTED
+sqlParser:
+ sqlCommentParseEnabled: true
+ sqlStatementCache:
+ initialCapacity: 2000
+ maximumSize: 65535
+ parseTreeCache:
+ initialCapacity: 128
+ maximumSize: 1024
+
sqlFederation:
sqlFederationEnabled: true
executionPlanCache:
diff --git
a/test/e2e/sql/src/test/resources/env/common/cluster/proxy/conf/server.yaml
b/test/e2e/sql/src/test/resources/env/scenario/empty_rules/proxy/mode/cluster/server.yaml
similarity index 99%
copy from
test/e2e/sql/src/test/resources/env/common/cluster/proxy/conf/server.yaml
copy to
test/e2e/sql/src/test/resources/env/scenario/empty_rules/proxy/mode/cluster/server.yaml
index ce6d9ef96c9..9a5fd67d4cf 100644
--- a/test/e2e/sql/src/test/resources/env/common/cluster/proxy/conf/server.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/empty_rules/proxy/mode/cluster/server.yaml
@@ -42,7 +42,7 @@ sqlParser:
parseTreeCache:
initialCapacity: 128
maximumSize: 1024
-
+
sqlFederation:
sqlFederationEnabled: true
executionPlanCache:
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/sharding_and_encrypt/standalone/server.yaml
b/test/e2e/sql/src/test/resources/env/scenario/empty_rules/proxy/mode/standalone/server.yaml
similarity index 87%
copy from
test/e2e/sql/src/test/resources/env/scenario/sharding_and_encrypt/standalone/server.yaml
copy to
test/e2e/sql/src/test/resources/env/scenario/empty_rules/proxy/mode/standalone/server.yaml
index 68ee1192a18..703d0cb49f2 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/sharding_and_encrypt/standalone/server.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/empty_rules/proxy/mode/standalone/server.yaml
@@ -22,6 +22,15 @@ authority:
privilege:
type: ALL_PERMITTED
+sqlParser:
+ sqlCommentParseEnabled: true
+ sqlStatementCache:
+ initialCapacity: 2000
+ maximumSize: 65535
+ parseTreeCache:
+ initialCapacity: 128
+ maximumSize: 1024
+
sqlFederation:
sqlFederationEnabled: true
executionPlanCache:
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/encrypt_and_readwrite_splitting/rules.yaml
b/test/e2e/sql/src/test/resources/env/scenario/encrypt_and_readwrite_splitting/rules.yaml
index 849fbc66e04..cb3cd085e7f 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/encrypt_and_readwrite_splitting/rules.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/encrypt_and_readwrite_splitting/rules.yaml
@@ -75,12 +75,6 @@ rules:
cipher:
name: telephone_cipher
encryptorName: aes_encryptor
-
-sqlFederation:
- sqlFederationEnabled: true
- executionPlanCache:
- initialCapacity: 2000
- maximumSize: 65535
props:
sql-show: true
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/sharding_and_encrypt/cluster/server.yaml
b/test/e2e/sql/src/test/resources/env/scenario/sharding_and_encrypt/proxy/mode/cluster/server.yaml
similarity index 100%
rename from
test/e2e/sql/src/test/resources/env/scenario/sharding_and_encrypt/cluster/server.yaml
rename to
test/e2e/sql/src/test/resources/env/scenario/sharding_and_encrypt/proxy/mode/cluster/server.yaml
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/sharding_and_encrypt/standalone/server.yaml
b/test/e2e/sql/src/test/resources/env/scenario/sharding_and_encrypt/proxy/mode/standalone/server.yaml
similarity index 100%
copy from
test/e2e/sql/src/test/resources/env/scenario/sharding_and_encrypt/standalone/server.yaml
copy to
test/e2e/sql/src/test/resources/env/scenario/sharding_and_encrypt/proxy/mode/standalone/server.yaml
diff --git
a/test/e2e/sql/src/test/resources/env/common/cluster/proxy/conf/server.yaml
b/test/e2e/sql/src/test/resources/env/scenario/tbl/proxy/mode/cluster/server.yaml
similarity index 99%
copy from
test/e2e/sql/src/test/resources/env/common/cluster/proxy/conf/server.yaml
copy to
test/e2e/sql/src/test/resources/env/scenario/tbl/proxy/mode/cluster/server.yaml
index ce6d9ef96c9..9a5fd67d4cf 100644
--- a/test/e2e/sql/src/test/resources/env/common/cluster/proxy/conf/server.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/tbl/proxy/mode/cluster/server.yaml
@@ -42,7 +42,7 @@ sqlParser:
parseTreeCache:
initialCapacity: 128
maximumSize: 1024
-
+
sqlFederation:
sqlFederationEnabled: true
executionPlanCache:
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/sharding_and_encrypt/standalone/server.yaml
b/test/e2e/sql/src/test/resources/env/scenario/tbl/proxy/mode/standalone/server.yaml
similarity index 87%
rename from
test/e2e/sql/src/test/resources/env/scenario/sharding_and_encrypt/standalone/server.yaml
rename to
test/e2e/sql/src/test/resources/env/scenario/tbl/proxy/mode/standalone/server.yaml
index 68ee1192a18..703d0cb49f2 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/sharding_and_encrypt/standalone/server.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/tbl/proxy/mode/standalone/server.yaml
@@ -22,6 +22,15 @@ authority:
privilege:
type: ALL_PERMITTED
+sqlParser:
+ sqlCommentParseEnabled: true
+ sqlStatementCache:
+ initialCapacity: 2000
+ maximumSize: 65535
+ parseTreeCache:
+ initialCapacity: 128
+ maximumSize: 1024
+
sqlFederation:
sqlFederationEnabled: true
executionPlanCache:
