This is an automated email from the ASF dual-hosted git repository.
zhonghongsheng 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 46b19945395 Remove useless config item show-process-list-enabled
(#19728)
46b19945395 is described below
commit 46b19945395f888b031606f96aa62ed3e9f65a6c
Author: Liang Zhang <[email protected]>
AuthorDate: Sun Jul 31 23:07:34 2022 +0800
Remove useless config item show-process-list-enabled (#19728)
---
...3_DistSQL_Cluster_Governance_Capabilities.en.md | 1 -
docs/blog/content/material/proxyIntroduce.cn.md | 1 -
.../shardingsphere-proxy/yaml-config/props.cn.md | 1 -
.../shardingsphere-proxy/yaml-config/props.en.md | 1 -
.../src/main/resources/server/server.yaml | 1 -
.../config/props/ConfigurationPropertyKey.java | 5 ---
.../sql/execute/engine/raw/RawExecutor.java | 2 +-
.../executor/sql/process/ExecuteProcessEngine.java | 9 ++--
.../process/ExecuteProcessStrategyEvaluator.java | 48 ----------------------
.../sql/process/ExecuteProcessEngineTest.java | 12 +-----
.../table/FilterableTableScanExecutor.java | 2 +-
.../driver/executor/DriverJDBCExecutor.java | 6 +--
.../jdbc/executor/ProxyJDBCExecutor.java | 2 +-
.../vertx/executor/ProxyReactiveExecutor.java | 4 +-
.../src/main/resources/conf/server.yaml | 1 -
.../src/test/resources/env/opengauss/server.yaml | 1 -
.../src/test/resources/env/postgresql/server.yaml | 1 -
.../src/test/resources/env/opengauss/server.yaml | 1 -
.../src/test/resources/env/postgresql/server.yaml | 1 -
19 files changed, 13 insertions(+), 87 deletions(-)
diff --git
a/docs/blog/content/material/Mar_23_DistSQL_Cluster_Governance_Capabilities.en.md
b/docs/blog/content/material/Mar_23_DistSQL_Cluster_Governance_Capabilities.en.md
index 4e54f57132e..467029b4200 100644
---
a/docs/blog/content/material/Mar_23_DistSQL_Cluster_Governance_Capabilities.en.md
+++
b/docs/blog/content/material/Mar_23_DistSQL_Cluster_Governance_Capabilities.en.md
@@ -189,7 +189,6 @@ props:
proxy-hint-enabled: false
sql-show: false
check-table-metadata-enabled: false
- show-process-list-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
diff --git a/docs/blog/content/material/proxyIntroduce.cn.md
b/docs/blog/content/material/proxyIntroduce.cn.md
index 7df1a9f2dbf..7b07473fab0 100644
--- a/docs/blog/content/material/proxyIntroduce.cn.md
+++ b/docs/blog/content/material/proxyIntroduce.cn.md
@@ -138,7 +138,6 @@ props: # 公用配置
proxy-hint-enabled: false
sql-show: false
check-table-metadata-enabled: false
- show-process-list-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
diff --git
a/docs/document/content/user-manual/shardingsphere-proxy/yaml-config/props.cn.md
b/docs/document/content/user-manual/shardingsphere-proxy/yaml-config/props.cn.md
index 798ce3547f1..c3564e3cf5d 100644
---
a/docs/document/content/user-manual/shardingsphere-proxy/yaml-config/props.cn.md
+++
b/docs/document/content/user-manual/shardingsphere-proxy/yaml-config/props.cn.md
@@ -26,7 +26,6 @@ Apache ShardingSphere 提供属性配置的方式配置系统级配置。本节
| proxy-backend-executor-suitable (?) | String | 可选选项：OLAP、OLTP。OLTP
选项可能会减少向客户端写入数据包的时间开销，但如果客户端连接数超过 `proxy-frontend-executor-size`，尤其是执行慢 SQL
时，它可能会增加 SQL 执行的延迟甚至阻塞其他客户端的连接。 | OLAP | 是 |
| proxy-frontend-max-connections (?) | int | 允许连接 Proxy 的最大客户端数量，默认值 0
代表不限制。
| 0 | 是 |
| sql-federation-enabled (?) | boolean | 是否开启 federation 查询。
| false | 是 |
-| show-process-list-enabled (?) | boolean | 是否开启 processlist 功能，同时仅在
Cluster 模式生效。功能和 MySQL show processlist 类似。目前只对 DDL 和 DML 语句生效。
| false | 是 |
| proxy-mysql-default-version (?) | String | Proxy 通过配置文件指定 MySQL
的版本号,默认版本：5.7.22。
| 5.7.22 | 否 |
| proxy-default-port (?) | String | Proxy 通过配置文件指定默认端口。
| 3307 | 否 |
| proxy-netty-backlog (?) | int | Proxy 通过配置文件指定默认netty
back_log参数。
| 1024 | 否 |
diff --git
a/docs/document/content/user-manual/shardingsphere-proxy/yaml-config/props.en.md
b/docs/document/content/user-manual/shardingsphere-proxy/yaml-config/props.en.md
index ebb36e79186..2760f64acbf 100644
---
a/docs/document/content/user-manual/shardingsphere-proxy/yaml-config/props.en.md
+++
b/docs/document/content/user-manual/shardingsphere-proxy/yaml-config/props.en.md
@@ -26,7 +26,6 @@ Apache ShardingSphere can configure system-level
configuration through property
| proxy-backend-executor-suitable (?) | String | Options: OLAP and OLTP. The
OLTP option may reduce the time overhead when writing packets to the client，but
if the number of client connections exceeds
`proxy-frontend-executor-size`，especially with slow SQL, it can cause a longer
delay to SQL execution and even block connections to other clients. |
OLAP | True |
| proxy-frontend-max-connections (?) | int | The maximum number of
clients that can be connected to Proxy. The default value of 0 indicates that
there's no limit.
| 0 | True |
| sql-federation-enabled (?) | boolean | Whether to enable the
federation query.
| false | True |
-| show-process-list-enabled (?) | boolean | Whether to enable the
processlist function only in Cluster mode。Its function is similar to that of
MySQL show processlist. Currently, it only applies to DDL and DML statements.
| false | True |
| proxy-mysql-default-version (?) | String | Proxy specifies the MySQL
version through configuration files, and the default verison is 5.7.22.
| 5.7.22 | False |
| proxy-default-port (?) | String | Proxy specifies the default
window through configuration files.
| 3307
| False |
| proxy-netty-backlog (?) | int | Proxy specifies the default
netty back_log parameter through configuration files.
|
1024 | False |
diff --git
a/examples/shardingsphere-proxy-example/shardingsphere-proxy-distsql-example/src/main/resources/server/server.yaml
b/examples/shardingsphere-proxy-example/shardingsphere-proxy-distsql-example/src/main/resources/server/server.yaml
index 1a2a2c5b9f8..f17f613c4b3 100644
---
a/examples/shardingsphere-proxy-example/shardingsphere-proxy-distsql-example/src/main/resources/server/server.yaml
+++
b/examples/shardingsphere-proxy-example/shardingsphere-proxy-distsql-example/src/main/resources/server/server.yaml
@@ -55,7 +55,6 @@ props:
proxy-hint-enabled: true
sql-show: false
check-table-metadata-enabled: false
- show-process-list-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
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/props/ConfigurationPropertyKey.java
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/props/ConfigurationPropertyKey.java
index 52ac2292502..d3f3ecc3964 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/props/ConfigurationPropertyKey.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/props/ConfigurationPropertyKey.java
@@ -72,11 +72,6 @@ public enum ConfigurationPropertyKey implements
TypedPropertyKey {
*/
PROXY_HINT_ENABLED("proxy-hint-enabled", String.valueOf(Boolean.FALSE),
boolean.class, false),
- /**
- * Whether enable show process list.
- */
- SHOW_PROCESS_LIST_ENABLED("show-process-list-enabled",
String.valueOf(Boolean.FALSE), boolean.class, 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.
diff --git
a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/raw/RawExecutor.java
b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/raw/RawExecutor.java
index d52d05dbc39..b8761ed8e40 100644
---
a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/raw/RawExecutor.java
+++
b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/raw/RawExecutor.java
@@ -59,7 +59,7 @@ public final class RawExecutor {
*/
public List<ExecuteResult> execute(final
ExecutionGroupContext<RawSQLExecutionUnit> executionGroupContext, final
LogicSQL logicSQL, final RawSQLExecutorCallback callback) throws SQLException {
try {
- ExecuteProcessEngine.initialize(logicSQL, executionGroupContext,
props, eventBusContext);
+ ExecuteProcessEngine.initialize(logicSQL, executionGroupContext,
eventBusContext);
// TODO Load query header for first query
List<ExecuteResult> results = execute(executionGroupContext,
(RawSQLExecutorCallback) null, callback);
ExecuteProcessEngine.finish(executionGroupContext.getExecutionID(),
eventBusContext);
diff --git
a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/ExecuteProcessEngine.java
b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/ExecuteProcessEngine.java
index f6023059a92..9840eeca7fc 100644
---
a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/ExecuteProcessEngine.java
+++
b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/ExecuteProcessEngine.java
@@ -21,7 +21,6 @@ import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.apache.shardingsphere.infra.binder.LogicSQL;
import org.apache.shardingsphere.infra.binder.statement.SQLStatementContext;
-import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
import org.apache.shardingsphere.infra.eventbus.EventBusContext;
import
org.apache.shardingsphere.infra.executor.kernel.model.ExecutionGroupContext;
import org.apache.shardingsphere.infra.executor.kernel.model.ExecutorDataMap;
@@ -29,6 +28,8 @@ import
org.apache.shardingsphere.infra.executor.sql.execute.engine.SQLExecutionU
import
org.apache.shardingsphere.infra.executor.sql.process.model.ExecuteProcessConstants;
import
org.apache.shardingsphere.infra.executor.sql.process.spi.ExecuteProcessReporter;
import
org.apache.shardingsphere.infra.executor.sql.process.spi.ExecuteProcessReporterFactory;
+import
org.apache.shardingsphere.sql.parser.sql.common.statement.ddl.DDLStatement;
+import
org.apache.shardingsphere.sql.parser.sql.common.statement.dml.DMLStatement;
import java.util.Optional;
@@ -43,14 +44,12 @@ public final class ExecuteProcessEngine {
*
* @param logicSQL logic SQL
* @param executionGroupContext execution group context
- * @param props configuration properties
* @param eventBusContext event bus context
*/
- public static void initialize(final LogicSQL logicSQL,
- final ExecutionGroupContext<? extends
SQLExecutionUnit> executionGroupContext, final ConfigurationProperties props,
final EventBusContext eventBusContext) {
+ public static void initialize(final LogicSQL logicSQL, final
ExecutionGroupContext<? extends SQLExecutionUnit> executionGroupContext, final
EventBusContext eventBusContext) {
SQLStatementContext<?> context = logicSQL.getSqlStatementContext();
Optional<ExecuteProcessReporter> reporter =
ExecuteProcessReporterFactory.getInstance();
- if (reporter.isPresent() &&
ExecuteProcessStrategyEvaluator.evaluate(context, props)) {
+ if (reporter.isPresent() && (context.getSqlStatement() instanceof
DDLStatement || context.getSqlStatement() instanceof DMLStatement)) {
ExecutorDataMap.getValue().put(ExecuteProcessConstants.EXECUTE_ID.name(),
executionGroupContext.getExecutionID());
reporter.get().report(logicSQL, executionGroupContext,
ExecuteProcessConstants.EXECUTE_STATUS_START, eventBusContext);
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/ExecuteProcessStrategyEvaluator.java
b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/ExecuteProcessStrategyEvaluator.java
deleted file mode 100644
index c70f4199e59..00000000000
---
a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/ExecuteProcessStrategyEvaluator.java
+++ /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.
- */
-
-package org.apache.shardingsphere.infra.executor.sql.process;
-
-import lombok.AccessLevel;
-import lombok.NoArgsConstructor;
-import org.apache.shardingsphere.infra.binder.statement.SQLStatementContext;
-import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
-import org.apache.shardingsphere.infra.config.props.ConfigurationPropertyKey;
-import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
-import
org.apache.shardingsphere.sql.parser.sql.common.statement.ddl.DDLStatement;
-import
org.apache.shardingsphere.sql.parser.sql.common.statement.dml.DMLStatement;
-
-/**
- * Process strategy evaluator.
- */
-@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class ExecuteProcessStrategyEvaluator {
-
- /**
- * Evaluate.
- *
- * @param context context
- * @param props configuration properties
- * @return submit or not
- */
- public static boolean evaluate(final SQLStatementContext<?> context, final
ConfigurationProperties props) {
- boolean showProcessListEnabled =
props.getValue(ConfigurationPropertyKey.SHOW_PROCESS_LIST_ENABLED);
- SQLStatement statement = context.getSqlStatement();
- boolean statementEnabled = statement instanceof DDLStatement ||
statement instanceof DMLStatement;
- return showProcessListEnabled && statementEnabled;
- }
-}
diff --git
a/shardingsphere-infra/shardingsphere-infra-executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/process/ExecuteProcessEngineTest.java
b/shardingsphere-infra/shardingsphere-infra-executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/process/ExecuteProcessEngineTest.java
index a49904e09ec..9dea8b83918 100644
---
a/shardingsphere-infra/shardingsphere-infra-executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/process/ExecuteProcessEngineTest.java
+++
b/shardingsphere-infra/shardingsphere-infra-executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/process/ExecuteProcessEngineTest.java
@@ -19,8 +19,6 @@ package org.apache.shardingsphere.infra.executor.sql.process;
import org.apache.shardingsphere.infra.binder.LogicSQL;
import org.apache.shardingsphere.infra.binder.statement.SQLStatementContext;
-import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
-import org.apache.shardingsphere.infra.config.props.ConfigurationPropertyKey;
import org.apache.shardingsphere.infra.eventbus.EventBusContext;
import
org.apache.shardingsphere.infra.executor.kernel.model.ExecutionGroupContext;
import org.apache.shardingsphere.infra.executor.kernel.model.ExecutorDataMap;
@@ -30,6 +28,7 @@ import
org.apache.shardingsphere.infra.executor.sql.process.fixture.ExecuteProce
import
org.apache.shardingsphere.sql.parser.sql.common.statement.ddl.DDLStatement;
import org.junit.Before;
import org.junit.Test;
+
import java.util.UUID;
import static org.hamcrest.CoreMatchers.is;
@@ -47,7 +46,7 @@ public final class ExecuteProcessEngineTest {
@Before
public void setUp() {
executionGroupContext = createMockedExecutionGroups();
- ExecuteProcessEngine.initialize(createLogicSQL(),
executionGroupContext, createConfigurationProperties(), eventBusContext);
+ ExecuteProcessEngine.initialize(createLogicSQL(),
executionGroupContext, eventBusContext);
assertThat(ExecutorDataMap.getValue().get("EXECUTE_ID"),
is(executionGroupContext.getExecutionID()));
assertThat(ExecuteProcessReporterFixture.ACTIONS.get(0), is("Report
the summary of this task."));
}
@@ -74,13 +73,6 @@ public final class ExecuteProcessEngineTest {
return result;
}
- private ConfigurationProperties createConfigurationProperties() {
- ConfigurationProperties result = mock(ConfigurationProperties.class);
-
when(result.getValue(ConfigurationPropertyKey.SQL_SHOW)).thenReturn(Boolean.TRUE);
-
when(result.getValue(ConfigurationPropertyKey.SHOW_PROCESS_LIST_ENABLED)).thenReturn(Boolean.TRUE);
- return result;
- }
-
private ExecutionGroupContext<? extends SQLExecutionUnit>
createMockedExecutionGroups() {
ExecutionGroupContext<? extends SQLExecutionUnit> result =
mock(ExecutionGroupContext.class);
when(result.getExecutionID()).thenReturn(UUID.randomUUID().toString());
diff --git
a/shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-executor/src/main/java/org/apache/shardingsphere/infra/federation/executor/original/table/FilterableTableScanExecutor.java
b/shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-executor/src/main/java/org/apache/shardingsphere/infra/federation/executor/original/table/FilterableTableScanExecutor.java
index f136157e212..b62f6a74d4a 100644
---
a/shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-executor/src/main/java/org/apache/shardingsphere/infra/federation/executor/original/table/FilterableTableScanExecutor.java
+++
b/shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-executor/src/main/java/org/apache/shardingsphere/infra/federation/executor/original/table/FilterableTableScanExecutor.java
@@ -125,7 +125,7 @@ public final class FilterableTableScanExecutor {
try {
ExecutionGroupContext<JDBCExecutionUnit> executionGroupContext =
prepareEngine.prepare(context.getRouteContext(), context.getExecutionUnits());
setParameters(executionGroupContext.getInputGroups());
- ExecuteProcessEngine.initialize(context.getLogicSQL(),
executionGroupContext, executorContext.getProps(), eventBusContext);
+ ExecuteProcessEngine.initialize(context.getLogicSQL(),
executionGroupContext, eventBusContext);
List<QueryResult> queryResults = execute(executionGroupContext,
databaseType);
ExecuteProcessEngine.finish(executionGroupContext.getExecutionID(),
eventBusContext);
MergeEngine mergeEngine = new MergeEngine(database,
executorContext.getProps());
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/executor/DriverJDBCExecutor.java
b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/executor/DriverJDBCExecutor.java
index 249884c93f9..64eae2fa666 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/executor/DriverJDBCExecutor.java
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/executor/DriverJDBCExecutor.java
@@ -80,7 +80,7 @@ public final class DriverJDBCExecutor {
public List<QueryResult> executeQuery(final
ExecutionGroupContext<JDBCExecutionUnit> executionGroupContext,
final LogicSQL logicSQL, final
ExecuteQueryCallback callback) throws SQLException {
try {
- ExecuteProcessEngine.initialize(logicSQL, executionGroupContext,
metaDataContexts.getMetaData().getProps(), eventBusContext);
+ ExecuteProcessEngine.initialize(logicSQL, executionGroupContext,
eventBusContext);
List<QueryResult> result =
jdbcExecutor.execute(executionGroupContext, callback);
ExecuteProcessEngine.finish(executionGroupContext.getExecutionID(),
eventBusContext);
return result;
@@ -102,7 +102,7 @@ public final class DriverJDBCExecutor {
public int executeUpdate(final ExecutionGroupContext<JDBCExecutionUnit>
executionGroupContext,
final LogicSQL logicSQL, final
Collection<RouteUnit> routeUnits, final JDBCExecutorCallback<Integer> callback)
throws SQLException {
try {
- ExecuteProcessEngine.initialize(logicSQL, executionGroupContext,
metaDataContexts.getMetaData().getProps(), eventBusContext);
+ ExecuteProcessEngine.initialize(logicSQL, executionGroupContext,
eventBusContext);
SQLStatementContext<?> sqlStatementContext =
logicSQL.getSqlStatementContext();
List<Integer> results = doExecute(executionGroupContext,
sqlStatementContext, routeUnits, callback);
int result =
isNeedAccumulate(metaDataContexts.getMetaData().getDatabase(databaseName).getRuleMetaData().getRules(),
sqlStatementContext) ? accumulate(results) : results.get(0);
@@ -143,7 +143,7 @@ public final class DriverJDBCExecutor {
public boolean execute(final ExecutionGroupContext<JDBCExecutionUnit>
executionGroupContext, final LogicSQL logicSQL,
final Collection<RouteUnit> routeUnits, final
JDBCExecutorCallback<Boolean> callback) throws SQLException {
try {
- ExecuteProcessEngine.initialize(logicSQL, executionGroupContext,
metaDataContexts.getMetaData().getProps(), eventBusContext);
+ ExecuteProcessEngine.initialize(logicSQL, executionGroupContext,
eventBusContext);
List<Boolean> results = doExecute(executionGroupContext,
logicSQL.getSqlStatementContext(), routeUnits, callback);
boolean result = null != results && !results.isEmpty() && null !=
results.get(0) && results.get(0);
ExecuteProcessEngine.finish(executionGroupContext.getExecutionID(),
eventBusContext);
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/executor/ProxyJDBCExecutor.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/executor/ProxyJDBCExecutor.java
index 42b74afd7aa..b182abd1634 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/executor/ProxyJDBCExecutor.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/executor/ProxyJDBCExecutor.java
@@ -69,7 +69,7 @@ public final class ProxyJDBCExecutor {
ShardingSphereDatabase database =
metaDataContexts.getMetaData().getDatabase(connectionSession.getDatabaseName());
DatabaseType protocolType = database.getProtocolType();
DatabaseType databaseType =
database.getResource().getDatabaseType();
- ExecuteProcessEngine.initialize(logicSQL, executionGroupContext,
metaDataContexts.getMetaData().getProps(), eventBusContext);
+ ExecuteProcessEngine.initialize(logicSQL, executionGroupContext,
eventBusContext);
SQLStatementContext<?> context = logicSQL.getSqlStatementContext();
List<ExecuteResult> result =
jdbcExecutor.execute(executionGroupContext,
ProxyJDBCExecutorCallbackFactory.newInstance(type,
protocolType, databaseType, context.getSqlStatement(),
databaseCommunicationEngine, isReturnGeneratedKeys, isExceptionThrown,
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/vertx/executor/ProxyReactiveExecutor.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/vertx/executor/ProxyReactiveExecutor.java
index c0083250621..be68f445efb 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/vertx/executor/ProxyReactiveExecutor.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/vertx/executor/ProxyReactiveExecutor.java
@@ -28,7 +28,6 @@ import
org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.vertx.
import
org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.vertx.VertxExecutorCallback;
import
org.apache.shardingsphere.infra.executor.sql.execute.result.ExecuteResult;
import
org.apache.shardingsphere.infra.executor.sql.process.ExecuteProcessEngine;
-import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import java.sql.SQLException;
@@ -52,9 +51,8 @@ public final class ProxyReactiveExecutor {
* @throws SQLException SQL exception
*/
public Future<List<ExecuteResult>> execute(final LogicSQL logicSQL, final
ExecutionGroupContext<VertxExecutionUnit> executionGroupContext) throws
SQLException {
- MetaDataContexts metaDataContexts =
ProxyContext.getInstance().getContextManager().getMetaDataContexts();
EventBusContext eventBusContext =
ProxyContext.getInstance().getContextManager().getInstanceContext().getEventBusContext();
- ExecuteProcessEngine.initialize(logicSQL, executionGroupContext,
metaDataContexts.getMetaData().getProps(), eventBusContext);
+ ExecuteProcessEngine.initialize(logicSQL, executionGroupContext,
eventBusContext);
List<Future<ExecuteResult>> futures =
vertxExecutor.execute(executionGroupContext, new VertxExecutorCallback());
return CompositeFuture.all(new
ArrayList<>(futures)).compose(compositeFuture -> {
ExecuteProcessEngine.finish(executionGroupContext.getExecutionID(),
eventBusContext);
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/resources/conf/server.yaml
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/resources/conf/server.yaml
index 3caeb9764cf..51be3eb9fdd 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/resources/conf/server.yaml
+++
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/resources/conf/server.yaml
@@ -60,7 +60,6 @@
# proxy-hint-enabled: false
# sql-show: false
# check-table-metadata-enabled: false
-# show-process-list-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
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/resources/env/opengauss/server.yaml
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/resources/env/opengauss/server.yaml
index f6c14ddae32..066dd9f4bb9 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/resources/env/opengauss/server.yaml
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/resources/env/opengauss/server.yaml
@@ -43,7 +43,6 @@ props:
proxy-hint-enabled: false
sql-show: true
check-table-metadata-enabled: false
- show-process-list-enabled: false
proxy-backend-query-fetch-size: -1
proxy-backend-executor-suitable: OLAP
proxy-frontend-max-connections: 0 # Less than or equal to 0 means no
limitation.
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/resources/env/postgresql/server.yaml
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/resources/env/postgresql/server.yaml
index c394d4007e0..7d6926a0f67 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/resources/env/postgresql/server.yaml
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-scaling/src/test/resources/env/postgresql/server.yaml
@@ -43,7 +43,6 @@ props:
proxy-hint-enabled: false
sql-show: true
check-table-metadata-enabled: false
- show-process-list-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
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/resources/env/opengauss/server.yaml
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/resources/env/opengauss/server.yaml
index f3f80b4b4c3..2c96a38ded8 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/resources/env/opengauss/server.yaml
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/resources/env/opengauss/server.yaml
@@ -43,7 +43,6 @@ props:
proxy-hint-enabled: false
sql-show: true
check-table-metadata-enabled: false
- show-process-list-enabled: false
proxy-backend-query-fetch-size: -1
proxy-backend-executor-suitable: OLAP
proxy-frontend-max-connections: 0 # Less than or equal to 0 means no
limitation.
diff --git
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/resources/env/postgresql/server.yaml
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/resources/env/postgresql/server.yaml
index 31bb91b093e..ce064aa7ef1 100644
---
a/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/resources/env/postgresql/server.yaml
+++
b/shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-transaction/src/test/resources/env/postgresql/server.yaml
@@ -43,7 +43,6 @@ props:
proxy-hint-enabled: false
sql-show: true
check-table-metadata-enabled: false
- show-process-list-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
