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 779d47e2584 Merge global.yaml for SQL E2E (#36438)
779d47e2584 is described below
commit 779d47e258496753465eabc074af983e133dda33
Author: Liang Zhang <[email protected]>
AuthorDate: Mon Sep 1 01:14:57 2025 +0800
Merge global.yaml for SQL E2E (#36438)
* Merge global.yaml for SQL E2E
* Merge global.yaml for SQL E2E
* Merge global.yaml for SQL E2E
---
.../test/e2e/env/runtime/E2ETestEnvironment.java | 3 +-
.../SQLE2EProxyContainerConfigurationFactory.java | 22 ++++++----
.../cluster/proxy/conf/zookeeper/global.yaml | 7 ++--
.../standalone/proxy/conf/{ => memory}/global.yaml | 0
.../db/proxy/mode/cluster/zookeeper/global.yaml | 48 ----------------------
.../scenario/db/proxy/mode/standalone/global.yaml | 39 ------------------
.../proxy/mode/standalone/{ => memory}/global.yaml | 0
.../proxy/mode/cluster/zookeeper/global.yaml | 47 ---------------------
.../proxy/mode/standalone/global.yaml | 39 ------------------
.../proxy/mode/cluster/zookeeper/global.yaml | 47 ---------------------
.../proxy/mode/standalone/global.yaml | 39 ------------------
.../proxy/mode/cluster/zookeeper/global.yaml | 47 ---------------------
.../distsql_rdl/proxy/mode/standalone/global.yaml | 47 ---------------------
.../proxy/mode/cluster/zookeeper/global.yaml | 48 ----------------------
.../empty_rules/proxy/mode/standalone/global.yaml | 39 ------------------
.../proxy/mode/standalone/global.yaml | 39 ------------------
.../mode/standalone/mysql/{ => memory}/global.yaml | 0
.../standalone/opengauss/{ => memory}/global.yaml | 0
.../standalone/postgresql/{ => memory}/global.yaml | 0
.../proxy/mode/standalone/global.yaml | 31 --------------
.../scenario/tbl/proxy/mode/cluster/global.yaml | 48 ----------------------
.../scenario/tbl/proxy/mode/standalone/global.yaml | 39 ------------------
22 files changed, 20 insertions(+), 609 deletions(-)
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/E2ETestEnvironment.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/E2ETestEnvironment.java
index 96f49fa3e47..7f61d856717 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/E2ETestEnvironment.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/E2ETestEnvironment.java
@@ -18,7 +18,6 @@
package org.apache.shardingsphere.test.e2e.env.runtime;
import com.google.common.base.Splitter;
-import com.google.common.base.Strings;
import lombok.Getter;
import
org.apache.shardingsphere.test.e2e.env.runtime.cluster.ClusterEnvironment;
import
org.apache.shardingsphere.test.e2e.env.runtime.scenario.path.ScenarioCommonPath;
@@ -69,7 +68,7 @@ public final class E2ETestEnvironment {
nativeStoragePort = props.getProperty("it.native.storage.port");
nativeStorageUsername =
props.getProperty("it.native.storage.username");
nativeStoragePassword =
props.getProperty("it.native.storage.password");
- governanceCenter =
Strings.isNullOrEmpty(props.getProperty("it.env.governance.center")) ?
"ZooKeeper" : props.getProperty("it.env.governance.center");
+ governanceCenter = props.getProperty("it.env.governance.center");
}
@SuppressWarnings("AccessOfSystemProperties")
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/container/config/SQLE2EProxyContainerConfigurationFactory.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/container/config/SQLE2EProxyContainerConfigurationFactory.java
index 9459102079d..3fefeebc9d6 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/container/config/SQLE2EProxyContainerConfigurationFactory.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/env/container/config/SQLE2EProxyContainerConfigurationFactory.java
@@ -17,6 +17,7 @@
package org.apache.shardingsphere.test.e2e.env.container.config;
+import com.google.common.base.Strings;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
@@ -57,19 +58,25 @@ public final class SQLE2EProxyContainerConfigurationFactory
{
}
private static String getGlobalYamlPath(final String scenario, final
String modeType, final DatabaseType databaseType) {
- String governanceCenterType = "cluster".equals(modeType) ?
E2ETestEnvironment.getInstance().getGovernanceCenter().toLowerCase() : "";
+ String governanceCenterType = getGovernanceCenterType(modeType);
if (isGovernanceCenterGlobalYamlExists(scenario, modeType,
governanceCenterType)) {
return
String.format("/env/scenario/%s/proxy/mode/%s/%s/global.yaml", scenario,
modeType, governanceCenterType);
}
- if (isDialectScenarioGlobalYamlExists(scenario, modeType,
databaseType)) {
+ if (isDialectScenarioGlobalYamlExists(scenario, modeType,
governanceCenterType, databaseType)) {
return
String.format("/env/scenario/%s/proxy/mode/%s/%s/global.yaml", scenario,
modeType, databaseType.getType().toLowerCase());
}
if (isScenarioGlobalYamlExists(scenario, modeType)) {
return String.format("/env/scenario/%s/proxy/mode/%s/global.yaml",
scenario, modeType);
}
- return "cluster".equals(modeType)
- ? String.format("/env/common/%s/proxy/conf/%s/global.yaml",
modeType, governanceCenterType)
- : String.format("/env/common/%s/proxy/conf/global.yaml",
modeType);
+ return String.format("/env/common/%s/proxy/conf/%s/global.yaml",
modeType, governanceCenterType);
+ }
+
+ private static String getGovernanceCenterType(final String modeType) {
+ String governanceCenter =
E2ETestEnvironment.getInstance().getGovernanceCenter();
+ if (Strings.isNullOrEmpty(governanceCenter)) {
+ return "cluster".equals(modeType) ? "zookeeper" : "memory";
+ }
+ return governanceCenter.toLowerCase();
}
private static boolean isGovernanceCenterGlobalYamlExists(final String
scenario, final String modeType, final String governanceCenterType) {
@@ -77,8 +84,9 @@ public final class SQLE2EProxyContainerConfigurationFactory {
return null != url;
}
- private static boolean isDialectScenarioGlobalYamlExists(final String
scenario, final String modeType, final DatabaseType databaseType) {
- URL url =
Thread.currentThread().getContextClassLoader().getResource(String.format("env/scenario/%s/proxy/mode/%s/%s/global.yaml",
scenario, modeType, databaseType.getType().toLowerCase()));
+ private static boolean isDialectScenarioGlobalYamlExists(final String
scenario, final String modeType, final String governanceCenterType, final
DatabaseType databaseType) {
+ URL url = Thread.currentThread().getContextClassLoader().getResource(
+
String.format("env/scenario/%s/proxy/mode/%s/%s/%s/global.yaml", scenario,
modeType, governanceCenterType, databaseType.getType().toLowerCase()));
return null != url;
}
diff --git
a/test/e2e/sql/src/test/resources/env/common/cluster/proxy/conf/zookeeper/global.yaml
b/test/e2e/sql/src/test/resources/env/common/cluster/proxy/conf/zookeeper/global.yaml
index 50fe8af5f38..7b75ea33182 100644
---
a/test/e2e/sql/src/test/resources/env/common/cluster/proxy/conf/zookeeper/global.yaml
+++
b/test/e2e/sql/src/test/resources/env/common/cluster/proxy/conf/zookeeper/global.yaml
@@ -30,7 +30,7 @@ authority:
admin: true
privilege:
type: ALL_PERMITTED
-
+
sqlParser:
sqlStatementCache:
initialCapacity: 2000
@@ -41,7 +41,8 @@ sqlParser:
props:
max-connections-size-per-query: 1
- kernel-executor-size: 16 # Infinite by default.
- proxy-frontend-flush-threshold: 128 # The default value is 128.
+ kernel-executor-size: 16
+ proxy-frontend-flush-threshold: 128
sql-show: false
proxy-frontend-ssl-enabled: true
+ proxy-meta-data-collector-enabled: true
diff --git
a/test/e2e/sql/src/test/resources/env/common/standalone/proxy/conf/global.yaml
b/test/e2e/sql/src/test/resources/env/common/standalone/proxy/conf/memory/global.yaml
similarity index 100%
rename from
test/e2e/sql/src/test/resources/env/common/standalone/proxy/conf/global.yaml
rename to
test/e2e/sql/src/test/resources/env/common/standalone/proxy/conf/memory/global.yaml
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/db/proxy/mode/cluster/zookeeper/global.yaml
b/test/e2e/sql/src/test/resources/env/scenario/db/proxy/mode/cluster/zookeeper/global.yaml
deleted file mode 100644
index 091f4f05e38..00000000000
---
a/test/e2e/sql/src/test/resources/env/scenario/db/proxy/mode/cluster/zookeeper/global.yaml
+++ /dev/null
@@ -1,48 +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.
-#
-
-mode:
- type: Cluster
- repository:
- type: ZooKeeper
- props:
- namespace: it_db
- server-lists: zk.host:2181
-
-authority:
- users:
- - user: proxy
- password: Proxy@123
- admin: true
- privilege:
- type: ALL_PERMITTED
-
-sqlParser:
- sqlStatementCache:
- initialCapacity: 2000
- maximumSize: 65535
- parseTreeCache:
- initialCapacity: 128
- maximumSize: 1024
-
-props:
- max-connections-size-per-query: 1
- kernel-executor-size: 16 # Infinite by default.
- proxy-frontend-flush-threshold: 128 # The default value is 128.
- sql-show: false
- proxy-frontend-ssl-enabled: true
- proxy-meta-data-collector-enabled: true
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/db/proxy/mode/standalone/global.yaml
b/test/e2e/sql/src/test/resources/env/scenario/db/proxy/mode/standalone/global.yaml
deleted file mode 100644
index 35dbce0ae4b..00000000000
---
a/test/e2e/sql/src/test/resources/env/scenario/db/proxy/mode/standalone/global.yaml
+++ /dev/null
@@ -1,39 +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.
-#
-
-authority:
- users:
- - user: proxy
- password: Proxy@123
- admin: true
- privilege:
- type: ALL_PERMITTED
-
-sqlParser:
- sqlStatementCache:
- initialCapacity: 2000
- maximumSize: 65535
- parseTreeCache:
- initialCapacity: 128
- maximumSize: 1024
-
-props:
- max-connections-size-per-query: 1
- kernel-executor-size: 16 # Infinite by default.
- proxy-frontend-flush-threshold: 128 # The default value is 128.
- sql-show: false
- proxy-frontend-ssl-enabled: true
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/db_tbl_sql_federation/proxy/mode/standalone/global.yaml
b/test/e2e/sql/src/test/resources/env/scenario/db_tbl_sql_federation/proxy/mode/standalone/memory/global.yaml
similarity index 100%
rename from
test/e2e/sql/src/test/resources/env/scenario/db_tbl_sql_federation/proxy/mode/standalone/global.yaml
rename to
test/e2e/sql/src/test/resources/env/scenario/db_tbl_sql_federation/proxy/mode/standalone/memory/global.yaml
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/proxy/mode/cluster/zookeeper/global.yaml
b/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/proxy/mode/cluster/zookeeper/global.yaml
deleted file mode 100644
index 50fe8af5f38..00000000000
---
a/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/proxy/mode/cluster/zookeeper/global.yaml
+++ /dev/null
@@ -1,47 +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.
-#
-
-mode:
- type: Cluster
- repository:
- type: ZooKeeper
- props:
- namespace: it_db
- server-lists: zk.host:2181
-
-authority:
- users:
- - user: proxy
- password: Proxy@123
- admin: true
- privilege:
- type: ALL_PERMITTED
-
-sqlParser:
- sqlStatementCache:
- initialCapacity: 2000
- maximumSize: 65535
- parseTreeCache:
- initialCapacity: 128
- maximumSize: 1024
-
-props:
- max-connections-size-per-query: 1
- kernel-executor-size: 16 # Infinite by default.
- proxy-frontend-flush-threshold: 128 # The default value is 128.
- sql-show: false
- proxy-frontend-ssl-enabled: true
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/proxy/mode/standalone/global.yaml
b/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/proxy/mode/standalone/global.yaml
deleted file mode 100644
index 35dbce0ae4b..00000000000
---
a/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting/proxy/mode/standalone/global.yaml
+++ /dev/null
@@ -1,39 +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.
-#
-
-authority:
- users:
- - user: proxy
- password: Proxy@123
- admin: true
- privilege:
- type: ALL_PERMITTED
-
-sqlParser:
- sqlStatementCache:
- initialCapacity: 2000
- maximumSize: 65535
- parseTreeCache:
- initialCapacity: 128
- maximumSize: 1024
-
-props:
- max-connections-size-per-query: 1
- kernel-executor-size: 16 # Infinite by default.
- proxy-frontend-flush-threshold: 128 # The default value is 128.
- sql-show: false
- proxy-frontend-ssl-enabled: true
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/proxy/mode/cluster/zookeeper/global.yaml
b/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/proxy/mode/cluster/zookeeper/global.yaml
deleted file mode 100644
index 50fe8af5f38..00000000000
---
a/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/proxy/mode/cluster/zookeeper/global.yaml
+++ /dev/null
@@ -1,47 +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.
-#
-
-mode:
- type: Cluster
- repository:
- type: ZooKeeper
- props:
- namespace: it_db
- server-lists: zk.host:2181
-
-authority:
- users:
- - user: proxy
- password: Proxy@123
- admin: true
- privilege:
- type: ALL_PERMITTED
-
-sqlParser:
- sqlStatementCache:
- initialCapacity: 2000
- maximumSize: 65535
- parseTreeCache:
- initialCapacity: 128
- maximumSize: 1024
-
-props:
- max-connections-size-per-query: 1
- kernel-executor-size: 16 # Infinite by default.
- proxy-frontend-flush-threshold: 128 # The default value is 128.
- sql-show: false
- proxy-frontend-ssl-enabled: true
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/proxy/mode/standalone/global.yaml
b/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/proxy/mode/standalone/global.yaml
deleted file mode 100644
index 35dbce0ae4b..00000000000
---
a/test/e2e/sql/src/test/resources/env/scenario/dbtbl_with_readwrite_splitting_and_encrypt/proxy/mode/standalone/global.yaml
+++ /dev/null
@@ -1,39 +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.
-#
-
-authority:
- users:
- - user: proxy
- password: Proxy@123
- admin: true
- privilege:
- type: ALL_PERMITTED
-
-sqlParser:
- sqlStatementCache:
- initialCapacity: 2000
- maximumSize: 65535
- parseTreeCache:
- initialCapacity: 128
- maximumSize: 1024
-
-props:
- max-connections-size-per-query: 1
- kernel-executor-size: 16 # Infinite by default.
- proxy-frontend-flush-threshold: 128 # The default value is 128.
- sql-show: false
- proxy-frontend-ssl-enabled: true
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/distsql_rdl/proxy/mode/cluster/zookeeper/global.yaml
b/test/e2e/sql/src/test/resources/env/scenario/distsql_rdl/proxy/mode/cluster/zookeeper/global.yaml
deleted file mode 100644
index 7d1ed8d2d54..00000000000
---
a/test/e2e/sql/src/test/resources/env/scenario/distsql_rdl/proxy/mode/cluster/zookeeper/global.yaml
+++ /dev/null
@@ -1,47 +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.
-#
-
-mode:
- type: Cluster
- repository:
- type: ZooKeeper
- props:
- namespace: it_db
- server-lists: zk.host:2181
-
-authority:
- users:
- - user: proxy
- password: Proxy@123
- admin: true
- privilege:
- type: ALL_PERMITTED
-
-sqlParser:
- sqlStatementCache:
- initialCapacity: 2000
- maximumSize: 65535
- parseTreeCache:
- initialCapacity: 128
- maximumSize: 1024
-
-props:
- max-connections-size-per-query: 1
- kernel-executor-size: 16 # Infinite by default.
- proxy-frontend-flush-threshold: 128 # The default value is 128.
- sql-show: false
- proxy-frontend-ssl-enabled: true
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/distsql_rdl/proxy/mode/standalone/global.yaml
b/test/e2e/sql/src/test/resources/env/scenario/distsql_rdl/proxy/mode/standalone/global.yaml
deleted file mode 100644
index ef44de1a954..00000000000
---
a/test/e2e/sql/src/test/resources/env/scenario/distsql_rdl/proxy/mode/standalone/global.yaml
+++ /dev/null
@@ -1,47 +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.
-#
-
-#mode:
-# type: Cluster
-# repository:
-# type: ZooKeeper
-# props:
-# namespace: it_db
-# server-lists: zk.host:2181
-
-authority:
- users:
- - user: proxy
- password: Proxy@123
- admin: true
- privilege:
- type: ALL_PERMITTED
-
-sqlParser:
- sqlStatementCache:
- initialCapacity: 2000
- maximumSize: 65535
- parseTreeCache:
- initialCapacity: 128
- maximumSize: 1024
-
-props:
- max-connections-size-per-query: 1
- kernel-executor-size: 16 # Infinite by default.
- proxy-frontend-flush-threshold: 128 # The default value is 128.
- sql-show: false
- proxy-frontend-ssl-enabled: true
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/empty_rules/proxy/mode/cluster/zookeeper/global.yaml
b/test/e2e/sql/src/test/resources/env/scenario/empty_rules/proxy/mode/cluster/zookeeper/global.yaml
deleted file mode 100644
index 091f4f05e38..00000000000
---
a/test/e2e/sql/src/test/resources/env/scenario/empty_rules/proxy/mode/cluster/zookeeper/global.yaml
+++ /dev/null
@@ -1,48 +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.
-#
-
-mode:
- type: Cluster
- repository:
- type: ZooKeeper
- props:
- namespace: it_db
- server-lists: zk.host:2181
-
-authority:
- users:
- - user: proxy
- password: Proxy@123
- admin: true
- privilege:
- type: ALL_PERMITTED
-
-sqlParser:
- sqlStatementCache:
- initialCapacity: 2000
- maximumSize: 65535
- parseTreeCache:
- initialCapacity: 128
- maximumSize: 1024
-
-props:
- max-connections-size-per-query: 1
- kernel-executor-size: 16 # Infinite by default.
- proxy-frontend-flush-threshold: 128 # The default value is 128.
- sql-show: false
- proxy-frontend-ssl-enabled: true
- proxy-meta-data-collector-enabled: true
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/empty_rules/proxy/mode/standalone/global.yaml
b/test/e2e/sql/src/test/resources/env/scenario/empty_rules/proxy/mode/standalone/global.yaml
deleted file mode 100644
index 35dbce0ae4b..00000000000
---
a/test/e2e/sql/src/test/resources/env/scenario/empty_rules/proxy/mode/standalone/global.yaml
+++ /dev/null
@@ -1,39 +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.
-#
-
-authority:
- users:
- - user: proxy
- password: Proxy@123
- admin: true
- privilege:
- type: ALL_PERMITTED
-
-sqlParser:
- sqlStatementCache:
- initialCapacity: 2000
- maximumSize: 65535
- parseTreeCache:
- initialCapacity: 128
- maximumSize: 1024
-
-props:
- max-connections-size-per-query: 1
- kernel-executor-size: 16 # Infinite by default.
- proxy-frontend-flush-threshold: 128 # The default value is 128.
- sql-show: false
- proxy-frontend-ssl-enabled: true
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/empty_storage_units/proxy/mode/standalone/global.yaml
b/test/e2e/sql/src/test/resources/env/scenario/empty_storage_units/proxy/mode/standalone/global.yaml
deleted file mode 100644
index 35dbce0ae4b..00000000000
---
a/test/e2e/sql/src/test/resources/env/scenario/empty_storage_units/proxy/mode/standalone/global.yaml
+++ /dev/null
@@ -1,39 +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.
-#
-
-authority:
- users:
- - user: proxy
- password: Proxy@123
- admin: true
- privilege:
- type: ALL_PERMITTED
-
-sqlParser:
- sqlStatementCache:
- initialCapacity: 2000
- maximumSize: 65535
- parseTreeCache:
- initialCapacity: 128
- maximumSize: 1024
-
-props:
- max-connections-size-per-query: 1
- kernel-executor-size: 16 # Infinite by default.
- proxy-frontend-flush-threshold: 128 # The default value is 128.
- sql-show: false
- proxy-frontend-ssl-enabled: true
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/empty_storage_units/proxy/mode/standalone/mysql/global.yaml
b/test/e2e/sql/src/test/resources/env/scenario/empty_storage_units/proxy/mode/standalone/mysql/memory/global.yaml
similarity index 100%
rename from
test/e2e/sql/src/test/resources/env/scenario/empty_storage_units/proxy/mode/standalone/mysql/global.yaml
rename to
test/e2e/sql/src/test/resources/env/scenario/empty_storage_units/proxy/mode/standalone/mysql/memory/global.yaml
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/empty_storage_units/proxy/mode/standalone/opengauss/global.yaml
b/test/e2e/sql/src/test/resources/env/scenario/empty_storage_units/proxy/mode/standalone/opengauss/memory/global.yaml
similarity index 100%
rename from
test/e2e/sql/src/test/resources/env/scenario/empty_storage_units/proxy/mode/standalone/opengauss/global.yaml
rename to
test/e2e/sql/src/test/resources/env/scenario/empty_storage_units/proxy/mode/standalone/opengauss/memory/global.yaml
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/empty_storage_units/proxy/mode/standalone/postgresql/global.yaml
b/test/e2e/sql/src/test/resources/env/scenario/empty_storage_units/proxy/mode/standalone/postgresql/memory/global.yaml
similarity index 100%
rename from
test/e2e/sql/src/test/resources/env/scenario/empty_storage_units/proxy/mode/standalone/postgresql/global.yaml
rename to
test/e2e/sql/src/test/resources/env/scenario/empty_storage_units/proxy/mode/standalone/postgresql/memory/global.yaml
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/sharding_and_encrypt/proxy/mode/standalone/global.yaml
b/test/e2e/sql/src/test/resources/env/scenario/sharding_and_encrypt/proxy/mode/standalone/global.yaml
deleted file mode 100644
index 7bff27a9adc..00000000000
---
a/test/e2e/sql/src/test/resources/env/scenario/sharding_and_encrypt/proxy/mode/standalone/global.yaml
+++ /dev/null
@@ -1,31 +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.
-#
-
-authority:
- users:
- - user: proxy
- password: Proxy@123
- admin: true
- privilege:
- type: ALL_PERMITTED
-
-props:
- max-connections-size-per-query: 1
- kernel-executor-size: 16 # Infinite by default.
- proxy-frontend-flush-threshold: 128 # The default value is 128.
- sql-show: false
- proxy-frontend-ssl-enabled: true
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/tbl/proxy/mode/cluster/global.yaml
b/test/e2e/sql/src/test/resources/env/scenario/tbl/proxy/mode/cluster/global.yaml
deleted file mode 100644
index 091f4f05e38..00000000000
---
a/test/e2e/sql/src/test/resources/env/scenario/tbl/proxy/mode/cluster/global.yaml
+++ /dev/null
@@ -1,48 +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.
-#
-
-mode:
- type: Cluster
- repository:
- type: ZooKeeper
- props:
- namespace: it_db
- server-lists: zk.host:2181
-
-authority:
- users:
- - user: proxy
- password: Proxy@123
- admin: true
- privilege:
- type: ALL_PERMITTED
-
-sqlParser:
- sqlStatementCache:
- initialCapacity: 2000
- maximumSize: 65535
- parseTreeCache:
- initialCapacity: 128
- maximumSize: 1024
-
-props:
- max-connections-size-per-query: 1
- kernel-executor-size: 16 # Infinite by default.
- proxy-frontend-flush-threshold: 128 # The default value is 128.
- sql-show: false
- proxy-frontend-ssl-enabled: true
- proxy-meta-data-collector-enabled: true
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/tbl/proxy/mode/standalone/global.yaml
b/test/e2e/sql/src/test/resources/env/scenario/tbl/proxy/mode/standalone/global.yaml
deleted file mode 100644
index 35dbce0ae4b..00000000000
---
a/test/e2e/sql/src/test/resources/env/scenario/tbl/proxy/mode/standalone/global.yaml
+++ /dev/null
@@ -1,39 +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.
-#
-
-authority:
- users:
- - user: proxy
- password: Proxy@123
- admin: true
- privilege:
- type: ALL_PERMITTED
-
-sqlParser:
- sqlStatementCache:
- initialCapacity: 2000
- maximumSize: 65535
- parseTreeCache:
- initialCapacity: 128
- maximumSize: 1024
-
-props:
- max-connections-size-per-query: 1
- kernel-executor-size: 16 # Infinite by default.
- proxy-frontend-flush-threshold: 128 # The default value is 128.
- sql-show: false
- proxy-frontend-ssl-enabled: true
