You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by pa...@apache.org on 2020/11/25 08:39:23 UTC
[shardingsphere] branch master updated: Add
JDBCExecutionUnitBuilderType to standardize type name (#8336)
This is an automated email from the ASF dual-hosted git repository.
panjuan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new a2734ed Add JDBCExecutionUnitBuilderType to standardize type name (#8336)
a2734ed is described below
commit a2734ed71eb3513077e0c43a7f2f8a46d5f31afa
Author: Liang Zhang <te...@163.com>
AuthorDate: Wed Nov 25 16:38:28 2020 +0800
Add JDBCExecutionUnitBuilderType to standardize type name (#8336)
* For code format
* Add JDBCExecutionUnitBuilderType to standardize type name
* Add JDBCExecutionUnitBuilderType to standardize type name
---
.../infra/executor/sql/context/SQLUnit.java | 4 +--
.../execute/engine/raw/RawSQLRuntimeContext.java | 9 +++----
.../raw/callback/RawSQLExecutorCallback.java | 2 +-
.../driver/jdbc/JDBCExecutionUnitBuilderType.java} | 30 ++++++++--------------
.../PreparedStatementExecutionUnitBuilder.java | 2 +-
.../driver/jdbc/StatementExecutionUnitBuilder.java | 2 +-
.../statement/ShardingSpherePreparedStatement.java | 5 ++--
.../core/statement/ShardingSphereStatement.java | 3 ++-
.../execute/engine/jdbc/JDBCExecuteEngine.java | 2 +-
.../accessor/impl/PreparedStatementAccessor.java | 3 ++-
.../statement/accessor/impl/StatementAccessor.java | 3 ++-
11 files changed, 29 insertions(+), 36 deletions(-)
diff --git a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/context/SQLUnit.java b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/context/SQLUnit.java
index be95696..f7ba893 100644
--- a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/context/SQLUnit.java
+++ b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/context/SQLUnit.java
@@ -38,9 +38,9 @@ public final class SQLUnit {
private final String sql;
private final List<Object> parameters;
-
+
private final List<RouteMapper> tableRouteMappers;
-
+
public SQLUnit(final String sql, final List<Object> parameters) {
this(sql, parameters, Collections.emptyList());
}
diff --git a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/raw/RawSQLRuntimeContext.java b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/raw/RawSQLRuntimeContext.java
index 1d756e1..93fa3e0 100644
--- a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/raw/RawSQLRuntimeContext.java
+++ b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/raw/RawSQLRuntimeContext.java
@@ -30,13 +30,12 @@ import org.apache.shardingsphere.infra.route.context.RawGroup;
@Getter
@ToString
public final class RawSQLRuntimeContext {
-
+
private final String schemaName;
-
+
private final ShardingSphereMetaData metaData;
-
+
private final RawGroup rawGroup;
-
+
private final boolean readOnly;
-
}
diff --git a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/raw/callback/RawSQLExecutorCallback.java b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/raw/callback/RawSQLExecutorCallback.java
index a5aae15..6979441 100644
--- a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/raw/callback/RawSQLExecutorCallback.java
+++ b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/raw/callback/RawSQLExecutorCallback.java
@@ -39,7 +39,7 @@ public final class RawSQLExecutorCallback implements ExecutorCallback<RawSQLExec
}
private final Collection<RawExecutorCallback> rawExecutorCallbacks;
-
+
public RawSQLExecutorCallback() {
rawExecutorCallbacks = ShardingSphereServiceLoader.newServiceInstances(RawExecutorCallback.class);
if (null == rawExecutorCallbacks || rawExecutorCallbacks.isEmpty()) {
diff --git a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/raw/RawSQLRuntimeContext.java b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/prepare/driver/jdbc/JDBCExecutionUnitBuilderType.java
similarity index 59%
copy from shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/raw/RawSQLRuntimeContext.java
copy to shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/prepare/driver/jdbc/JDBCExecutionUnitBuilderType.java
index 1d756e1..37f742d 100644
--- a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/raw/RawSQLRuntimeContext.java
+++ b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/prepare/driver/jdbc/JDBCExecutionUnitBuilderType.java
@@ -15,28 +15,18 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.executor.sql.execute.engine.raw;
+package org.apache.shardingsphere.infra.executor.sql.prepare.driver.jdbc;
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-import lombok.ToString;
-import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
-import org.apache.shardingsphere.infra.route.context.RawGroup;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
/**
- * Raw route context.
+ * JDBC execution unit builder type.
*/
-@RequiredArgsConstructor
-@Getter
-@ToString
-public final class RawSQLRuntimeContext {
-
- private final String schemaName;
-
- private final ShardingSphereMetaData metaData;
-
- private final RawGroup rawGroup;
-
- private final boolean readOnly;
-
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public final class JDBCExecutionUnitBuilderType {
+
+ public static final String STATEMENT = "JDBC.STATEMENT";
+
+ public static final String PREPARED_STATEMENT = "JDBC.PREPARED_STATEMENT";
}
diff --git a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/prepare/driver/jdbc/PreparedStatementExecutionUnitBuilder.java b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/prepare/driver/jdbc/PreparedStatementExecutionUnitBuilder.java
index 9e034bf..85ba6e5 100644
--- a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/prepare/driver/jdbc/PreparedStatementExecutionUnitBuilder.java
+++ b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/prepare/driver/jdbc/PreparedStatementExecutionUnitBuilder.java
@@ -46,6 +46,6 @@ public final class PreparedStatementExecutionUnitBuilder implements JDBCExecutio
@Override
public String getType() {
- return "JDBC_PREPARED_STATEMENT";
+ return JDBCExecutionUnitBuilderType.PREPARED_STATEMENT;
}
}
diff --git a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/prepare/driver/jdbc/StatementExecutionUnitBuilder.java b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/prepare/driver/jdbc/StatementExecutionUnitBuilder.java
index 0f9aec2..e0558f3 100644
--- a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/prepare/driver/jdbc/StatementExecutionUnitBuilder.java
+++ b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/prepare/driver/jdbc/StatementExecutionUnitBuilder.java
@@ -43,6 +43,6 @@ public final class StatementExecutionUnitBuilder implements JDBCExecutionUnitBui
@Override
public String getType() {
- return "JDBC_STATEMENT";
+ return JDBCExecutionUnitBuilderType.STATEMENT;
}
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java
index 88bdfda..9d539f2 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java
@@ -51,6 +51,7 @@ import org.apache.shardingsphere.infra.executor.sql.execute.result.query.QueryRe
import org.apache.shardingsphere.infra.executor.sql.execute.result.query.jdbc.StreamJDBCQueryResult;
import org.apache.shardingsphere.infra.executor.sql.log.SQLLogger;
import org.apache.shardingsphere.infra.executor.sql.prepare.driver.DriverExecutionPrepareEngine;
+import org.apache.shardingsphere.infra.executor.sql.prepare.driver.jdbc.JDBCExecutionUnitBuilderType;
import org.apache.shardingsphere.infra.executor.sql.prepare.driver.jdbc.StatementOption;
import org.apache.shardingsphere.infra.executor.sql.prepare.raw.RawExecutionPrepareEngine;
import org.apache.shardingsphere.infra.merge.MergeEngine;
@@ -214,7 +215,7 @@ public final class ShardingSpherePreparedStatement extends AbstractPreparedState
private Collection<ExecutionGroup<JDBCExecutionUnit>> createExecutionGroups() throws SQLException {
int maxConnectionsSizePerQuery = metaDataContexts.getProps().<Integer>getValue(ConfigurationPropertyKey.MAX_CONNECTIONS_SIZE_PER_QUERY);
DriverExecutionPrepareEngine<JDBCExecutionUnit, Connection> prepareEngine = new DriverExecutionPrepareEngine<>(
- maxConnectionsSizePerQuery, connection, statementOption, metaDataContexts.getDefaultMetaData().getRuleMetaData().getRules(), "JDBC_PREPARED_STATEMENT");
+ maxConnectionsSizePerQuery, connection, statementOption, metaDataContexts.getDefaultMetaData().getRuleMetaData().getRules(), JDBCExecutionUnitBuilderType.PREPARED_STATEMENT);
return prepareEngine.prepare(executionContext.getRouteContext(), executionContext.getExecutionUnits());
}
@@ -359,7 +360,7 @@ public final class ShardingSpherePreparedStatement extends AbstractPreparedState
private void initBatchPreparedStatementExecutor() throws SQLException {
DriverExecutionPrepareEngine<JDBCExecutionUnit, Connection> prepareEngine = new DriverExecutionPrepareEngine<>(
metaDataContexts.getProps().<Integer>getValue(ConfigurationPropertyKey.MAX_CONNECTIONS_SIZE_PER_QUERY),
- connection, statementOption, metaDataContexts.getDefaultMetaData().getRuleMetaData().getRules(), "JDBC_PREPARED_STATEMENT");
+ connection, statementOption, metaDataContexts.getDefaultMetaData().getRuleMetaData().getRules(), JDBCExecutionUnitBuilderType.PREPARED_STATEMENT);
batchPreparedStatementExecutor.init(prepareEngine.prepare(executionContext.getRouteContext(),
new ArrayList<>(batchPreparedStatementExecutor.getBatchExecutionUnits()).stream().map(BatchExecutionUnit::getExecutionUnit).collect(Collectors.toList())));
setBatchParametersForStatements();
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSphereStatement.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSphereStatement.java
index 1f27e71..33c0753 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSphereStatement.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSphereStatement.java
@@ -49,6 +49,7 @@ import org.apache.shardingsphere.infra.executor.sql.execute.result.query.QueryRe
import org.apache.shardingsphere.infra.executor.sql.execute.result.query.jdbc.StreamJDBCQueryResult;
import org.apache.shardingsphere.infra.executor.sql.log.SQLLogger;
import org.apache.shardingsphere.infra.executor.sql.prepare.driver.DriverExecutionPrepareEngine;
+import org.apache.shardingsphere.infra.executor.sql.prepare.driver.jdbc.JDBCExecutionUnitBuilderType;
import org.apache.shardingsphere.infra.executor.sql.prepare.driver.jdbc.StatementOption;
import org.apache.shardingsphere.infra.executor.sql.prepare.raw.RawExecutionPrepareEngine;
import org.apache.shardingsphere.infra.merge.MergeEngine;
@@ -316,7 +317,7 @@ public final class ShardingSphereStatement extends AbstractStatementAdapter {
private Collection<ExecutionGroup<JDBCExecutionUnit>> createExecutionGroups() throws SQLException {
int maxConnectionsSizePerQuery = metaDataContexts.getProps().<Integer>getValue(ConfigurationPropertyKey.MAX_CONNECTIONS_SIZE_PER_QUERY);
DriverExecutionPrepareEngine<JDBCExecutionUnit, Connection> prepareEngine = new DriverExecutionPrepareEngine<>(
- maxConnectionsSizePerQuery, connection, statementOption, metaDataContexts.getDefaultMetaData().getRuleMetaData().getRules(), "JDBC_STATEMENT");
+ maxConnectionsSizePerQuery, connection, statementOption, metaDataContexts.getDefaultMetaData().getRuleMetaData().getRules(), JDBCExecutionUnitBuilderType.STATEMENT);
return prepareEngine.prepare(executionContext.getRouteContext(), executionContext.getExecutionUnits());
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/execute/engine/jdbc/JDBCExecuteEngine.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/execute/engine/jdbc/JDBCExecuteEngine.java
index e2478b1..33d41ad 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/execute/engine/jdbc/JDBCExecuteEngine.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/execute/engine/jdbc/JDBCExecuteEngine.java
@@ -132,7 +132,7 @@ public final class JDBCExecuteEngine implements SQLExecuteEngine {
new ProxyJDBCExecutorCallback(databaseType, executionContext.getSqlStatementContext(), backendConnection, accessor, isExceptionThrown, isReturnGeneratedKeys, true),
new ProxyJDBCExecutorCallback(databaseType, executionContext.getSqlStatementContext(), backendConnection, accessor, isExceptionThrown, isReturnGeneratedKeys, false));
}
-
+
private Collection<ExecutionGroup<JDBCExecutionUnit>> createExecutionGroups(final Collection<ExecutionUnit> executionUnits, final int maxConnectionsSizePerQuery,
final boolean isReturnGeneratedKeys, final RouteContext routeContext) throws SQLException {
Collection<ShardingSphereRule> rules = ProxyContext.getInstance().getMetaData(backendConnection.getSchemaName()).getRuleMetaData().getRules();
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/statement/accessor/impl/PreparedStatementAccessor.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/statement/accessor/impl/PreparedStatementAccessor.java
index 53efe20..1e11471 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/statement/accessor/impl/PreparedStatementAccessor.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/statement/accessor/impl/PreparedStatementAccessor.java
@@ -19,6 +19,7 @@ package org.apache.shardingsphere.proxy.backend.communication.jdbc.statement.acc
import org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.JDBCExecutionUnit;
import org.apache.shardingsphere.infra.executor.sql.prepare.driver.DriverExecutionPrepareEngine;
+import org.apache.shardingsphere.infra.executor.sql.prepare.driver.jdbc.JDBCExecutionUnitBuilderType;
import org.apache.shardingsphere.infra.executor.sql.prepare.driver.jdbc.StatementOption;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
import org.apache.shardingsphere.proxy.backend.communication.jdbc.connection.BackendConnection;
@@ -38,7 +39,7 @@ public final class PreparedStatementAccessor implements JDBCAccessor {
@Override
public DriverExecutionPrepareEngine<JDBCExecutionUnit, Connection> getExecutionPrepareEngine(final BackendConnection backendConnection, final int maxConnectionsSizePerQuery,
final StatementOption option, final Collection<ShardingSphereRule> rules) {
- return new DriverExecutionPrepareEngine<>(maxConnectionsSizePerQuery, backendConnection, option, rules, "JDBC_PREPARED_STATEMENT");
+ return new DriverExecutionPrepareEngine<>(maxConnectionsSizePerQuery, backendConnection, option, rules, JDBCExecutionUnitBuilderType.PREPARED_STATEMENT);
}
@Override
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/statement/accessor/impl/StatementAccessor.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/statement/accessor/impl/StatementAccessor.java
index b4ada34..ffd7a3f 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/statement/accessor/impl/StatementAccessor.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/statement/accessor/impl/StatementAccessor.java
@@ -19,6 +19,7 @@ package org.apache.shardingsphere.proxy.backend.communication.jdbc.statement.acc
import org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.JDBCExecutionUnit;
import org.apache.shardingsphere.infra.executor.sql.prepare.driver.DriverExecutionPrepareEngine;
+import org.apache.shardingsphere.infra.executor.sql.prepare.driver.jdbc.JDBCExecutionUnitBuilderType;
import org.apache.shardingsphere.infra.executor.sql.prepare.driver.jdbc.StatementOption;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
import org.apache.shardingsphere.proxy.backend.communication.jdbc.connection.BackendConnection;
@@ -37,7 +38,7 @@ public final class StatementAccessor implements JDBCAccessor {
@Override
public DriverExecutionPrepareEngine<JDBCExecutionUnit, Connection> getExecutionPrepareEngine(final BackendConnection backendConnection, final int maxConnectionsSizePerQuery,
final StatementOption option, final Collection<ShardingSphereRule> rules) {
- return new DriverExecutionPrepareEngine<>(maxConnectionsSizePerQuery, backendConnection, option, rules, "JDBC_STATEMENT");
+ return new DriverExecutionPrepareEngine<>(maxConnectionsSizePerQuery, backendConnection, option, rules, JDBCExecutionUnitBuilderType.STATEMENT);
}
@Override