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 bee7c4038d7 Remove useless comments on test yaml (#36439)
bee7c4038d7 is described below
commit bee7c4038d7a11fea8175be20d014e7676be95e9
Author: Liang Zhang <[email protected]>
AuthorDate: Mon Sep 1 01:33:32 2025 +0800
Remove useless comments on test yaml (#36439)
* Merge global.yaml for SQL E2E
* Remove useless comments on test yaml
---
.../src/test/resources/env/mariadb/global.yaml | 4 +--
.../src/test/resources/env/mysql/global.yaml | 6 ++--
.../src/test/resources/env/opengauss/global.yaml | 6 ++--
.../src/test/resources/env/postgresql/global.yaml | 6 ++--
.../cluster/proxy/zookeeper/conf/global.yaml | 4 +--
.../env/common/standalone/proxy/conf/global.yaml | 4 +--
.../src/test/resources/env/mysql/global.yaml | 4 +--
.../src/test/resources/env/opengauss/global.yaml | 6 ++--
.../src/test/resources/env/postgresql/global.yaml | 8 ++---
.../standalone/proxy/conf/memory/global.yaml | 4 +--
.../proxy/mode/cluster/zookeeper/global.yaml | 4 +--
.../proxy/mode/standalone/memory/global.yaml | 4 +--
.../proxy/mode/cluster/mysql/zookeeper/global.yaml | 4 +--
.../mode/cluster/opengauss/zookeeper/global.yaml | 4 +--
.../mode/cluster/postgresql/zookeeper/global.yaml | 4 +--
.../proxy/mode/standalone/mysql/memory/global.yaml | 4 +--
.../mode/standalone/opengauss/memory/global.yaml | 4 +--
.../mode/standalone/postgresql/memory/global.yaml | 4 +--
.../proxy/mode/cluster/zookeeper/global.yaml | 39 ----------------------
19 files changed, 42 insertions(+), 81 deletions(-)
diff --git
a/test/e2e/operation/pipeline/src/test/resources/env/mariadb/global.yaml
b/test/e2e/operation/pipeline/src/test/resources/env/mariadb/global.yaml
index f19a7368012..7358e44cf06 100644
--- a/test/e2e/operation/pipeline/src/test/resources/env/mariadb/global.yaml
+++ b/test/e2e/operation/pipeline/src/test/resources/env/mariadb/global.yaml
@@ -40,6 +40,6 @@ sqlFederation:
props:
system-schema-metadata-assembly-enabled: false
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
diff --git
a/test/e2e/operation/pipeline/src/test/resources/env/mysql/global.yaml
b/test/e2e/operation/pipeline/src/test/resources/env/mysql/global.yaml
index b2e671c94c1..784afc11ab0 100644
--- a/test/e2e/operation/pipeline/src/test/resources/env/mysql/global.yaml
+++ b/test/e2e/operation/pipeline/src/test/resources/env/mysql/global.yaml
@@ -40,9 +40,9 @@ sqlFederation:
props:
system-schema-metadata-assembly-enabled: false
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
- cdc-server-port: 33071 # CDC server port
+ cdc-server-port: 33071
proxy-frontend-ssl-enabled: true
proxy-frontend-database-protocol-type: MySQL
diff --git
a/test/e2e/operation/pipeline/src/test/resources/env/opengauss/global.yaml
b/test/e2e/operation/pipeline/src/test/resources/env/opengauss/global.yaml
index 0d5a4605861..288e1edb1b9 100644
--- a/test/e2e/operation/pipeline/src/test/resources/env/opengauss/global.yaml
+++ b/test/e2e/operation/pipeline/src/test/resources/env/opengauss/global.yaml
@@ -34,9 +34,9 @@ authority:
props:
system-schema-metadata-assembly-enabled: false
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
- cdc-server-port: 33071 # CDC server port
+ cdc-server-port: 33071
proxy-frontend-ssl-enabled: true
proxy-frontend-database-protocol-type: openGauss
diff --git
a/test/e2e/operation/pipeline/src/test/resources/env/postgresql/global.yaml
b/test/e2e/operation/pipeline/src/test/resources/env/postgresql/global.yaml
index 1ed54bd3e4b..e8d31bac4e3 100644
--- a/test/e2e/operation/pipeline/src/test/resources/env/postgresql/global.yaml
+++ b/test/e2e/operation/pipeline/src/test/resources/env/postgresql/global.yaml
@@ -34,9 +34,9 @@ authority:
props:
system-schema-metadata-assembly-enabled: false
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
- cdc-server-port: 33071 # CDC server port
+ cdc-server-port: 33071
proxy-frontend-ssl-enabled: true
proxy-frontend-database-protocol-type: PostgreSQL
diff --git
a/test/e2e/operation/showprocesslist/src/test/resources/env/common/cluster/proxy/zookeeper/conf/global.yaml
b/test/e2e/operation/showprocesslist/src/test/resources/env/common/cluster/proxy/zookeeper/conf/global.yaml
index 0ae467f7fb3..ce91f5b6fcb 100644
---
a/test/e2e/operation/showprocesslist/src/test/resources/env/common/cluster/proxy/zookeeper/conf/global.yaml
+++
b/test/e2e/operation/showprocesslist/src/test/resources/env/common/cluster/proxy/zookeeper/conf/global.yaml
@@ -39,7 +39,7 @@ sqlFederation:
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
diff --git
a/test/e2e/operation/showprocesslist/src/test/resources/env/common/standalone/proxy/conf/global.yaml
b/test/e2e/operation/showprocesslist/src/test/resources/env/common/standalone/proxy/conf/global.yaml
index 841607a55b3..c2da3ae964a 100644
---
a/test/e2e/operation/showprocesslist/src/test/resources/env/common/standalone/proxy/conf/global.yaml
+++
b/test/e2e/operation/showprocesslist/src/test/resources/env/common/standalone/proxy/conf/global.yaml
@@ -31,7 +31,7 @@ sqlFederation:
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
diff --git
a/test/e2e/operation/transaction/src/test/resources/env/mysql/global.yaml
b/test/e2e/operation/transaction/src/test/resources/env/mysql/global.yaml
index 0875622ebdd..c81faaa2f57 100644
--- a/test/e2e/operation/transaction/src/test/resources/env/mysql/global.yaml
+++ b/test/e2e/operation/transaction/src/test/resources/env/mysql/global.yaml
@@ -39,7 +39,7 @@ sqlFederation:
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: true
proxy-frontend-ssl-enabled: true
diff --git
a/test/e2e/operation/transaction/src/test/resources/env/opengauss/global.yaml
b/test/e2e/operation/transaction/src/test/resources/env/opengauss/global.yaml
index 1375ab63f68..7aaa19495fb 100644
---
a/test/e2e/operation/transaction/src/test/resources/env/opengauss/global.yaml
+++
b/test/e2e/operation/transaction/src/test/resources/env/opengauss/global.yaml
@@ -39,11 +39,11 @@ sqlFederation:
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: true
check-table-metadata-enabled: false
proxy-backend-query-fetch-size: -1
- proxy-frontend-max-connections: 0 # Less than or equal to 0 means no
limitation.
+ proxy-frontend-max-connections: 0
proxy-frontend-database-protocol-type: openGauss
proxy-frontend-ssl-enabled: true
diff --git
a/test/e2e/operation/transaction/src/test/resources/env/postgresql/global.yaml
b/test/e2e/operation/transaction/src/test/resources/env/postgresql/global.yaml
index b1459c46041..42f04084ffc 100644
---
a/test/e2e/operation/transaction/src/test/resources/env/postgresql/global.yaml
+++
b/test/e2e/operation/transaction/src/test/resources/env/postgresql/global.yaml
@@ -39,14 +39,14 @@ sqlFederation:
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: true
check-table-metadata-enabled: false
# Proxy backend query fetch size. A larger value may increase the memory
usage of ShardingSphere Proxy.
# The default value is -1, which means set the minimum value for different
JDBC drivers.
proxy-backend-query-fetch-size: -1
- proxy-frontend-executor-size: 0 # Proxy frontend executor size. The default
value is 0, which means let Netty decide.
- proxy-frontend-max-connections: 0 # Less than or equal to 0 means no
limitation.
+ proxy-frontend-executor-size: 0
+ proxy-frontend-max-connections: 0
proxy-frontend-database-protocol-type: PostgreSQL
proxy-frontend-ssl-enabled: true
diff --git
a/test/e2e/sql/src/test/resources/env/common/standalone/proxy/conf/memory/global.yaml
b/test/e2e/sql/src/test/resources/env/common/standalone/proxy/conf/memory/global.yaml
index 35dbce0ae4b..28d5dacdc1c 100644
---
a/test/e2e/sql/src/test/resources/env/common/standalone/proxy/conf/memory/global.yaml
+++
b/test/e2e/sql/src/test/resources/env/common/standalone/proxy/conf/memory/global.yaml
@@ -33,7 +33,7 @@ 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
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/db_tbl_sql_federation/proxy/mode/cluster/zookeeper/global.yaml
b/test/e2e/sql/src/test/resources/env/scenario/db_tbl_sql_federation/proxy/mode/cluster/zookeeper/global.yaml
index c92d768c255..a563032b8ec 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/db_tbl_sql_federation/proxy/mode/cluster/zookeeper/global.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/db_tbl_sql_federation/proxy/mode/cluster/zookeeper/global.yaml
@@ -48,7 +48,7 @@ sqlFederation:
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
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/db_tbl_sql_federation/proxy/mode/standalone/memory/global.yaml
b/test/e2e/sql/src/test/resources/env/scenario/db_tbl_sql_federation/proxy/mode/standalone/memory/global.yaml
index 49d026ce30b..8898997f25e 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/db_tbl_sql_federation/proxy/mode/standalone/memory/global.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/db_tbl_sql_federation/proxy/mode/standalone/memory/global.yaml
@@ -40,7 +40,7 @@ sqlFederation:
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
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/empty_storage_units/proxy/mode/cluster/mysql/zookeeper/global.yaml
b/test/e2e/sql/src/test/resources/env/scenario/empty_storage_units/proxy/mode/cluster/mysql/zookeeper/global.yaml
index fc5e09d0984..1cb425abd91 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/empty_storage_units/proxy/mode/cluster/mysql/zookeeper/global.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/empty_storage_units/proxy/mode/cluster/mysql/zookeeper/global.yaml
@@ -41,8 +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/scenario/empty_storage_units/proxy/mode/cluster/opengauss/zookeeper/global.yaml
b/test/e2e/sql/src/test/resources/env/scenario/empty_storage_units/proxy/mode/cluster/opengauss/zookeeper/global.yaml
index 2deb40d88dd..e5ddbec8271 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/empty_storage_units/proxy/mode/cluster/opengauss/zookeeper/global.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/empty_storage_units/proxy/mode/cluster/opengauss/zookeeper/global.yaml
@@ -41,8 +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/scenario/empty_storage_units/proxy/mode/cluster/postgresql/zookeeper/global.yaml
b/test/e2e/sql/src/test/resources/env/scenario/empty_storage_units/proxy/mode/cluster/postgresql/zookeeper/global.yaml
index 375f27c90ee..6e3e483bcb1 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/empty_storage_units/proxy/mode/cluster/postgresql/zookeeper/global.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/empty_storage_units/proxy/mode/cluster/postgresql/zookeeper/global.yaml
@@ -41,8 +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/scenario/empty_storage_units/proxy/mode/standalone/mysql/memory/global.yaml
b/test/e2e/sql/src/test/resources/env/scenario/empty_storage_units/proxy/mode/standalone/mysql/memory/global.yaml
index e9df1024e1b..1bb9840b89c 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/empty_storage_units/proxy/mode/standalone/mysql/memory/global.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/empty_storage_units/proxy/mode/standalone/mysql/memory/global.yaml
@@ -33,8 +33,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-frontend-database-protocol-type: MySQL
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/empty_storage_units/proxy/mode/standalone/opengauss/memory/global.yaml
b/test/e2e/sql/src/test/resources/env/scenario/empty_storage_units/proxy/mode/standalone/opengauss/memory/global.yaml
index ba68ac9e47b..dc222d69efb 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/empty_storage_units/proxy/mode/standalone/opengauss/memory/global.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/empty_storage_units/proxy/mode/standalone/opengauss/memory/global.yaml
@@ -33,8 +33,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-frontend-database-protocol-type: openGauss
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/empty_storage_units/proxy/mode/standalone/postgresql/memory/global.yaml
b/test/e2e/sql/src/test/resources/env/scenario/empty_storage_units/proxy/mode/standalone/postgresql/memory/global.yaml
index a754927c012..02ba310ede9 100644
---
a/test/e2e/sql/src/test/resources/env/scenario/empty_storage_units/proxy/mode/standalone/postgresql/memory/global.yaml
+++
b/test/e2e/sql/src/test/resources/env/scenario/empty_storage_units/proxy/mode/standalone/postgresql/memory/global.yaml
@@ -33,8 +33,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-frontend-database-protocol-type: PostgreSQL
diff --git
a/test/e2e/sql/src/test/resources/env/scenario/sharding_and_encrypt/proxy/mode/cluster/zookeeper/global.yaml
b/test/e2e/sql/src/test/resources/env/scenario/sharding_and_encrypt/proxy/mode/cluster/zookeeper/global.yaml
deleted file mode 100644
index 2397448d3cf..00000000000
---
a/test/e2e/sql/src/test/resources/env/scenario/sharding_and_encrypt/proxy/mode/cluster/zookeeper/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.
-#
-
-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
-
-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
