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 ce5b355fc47 Rename DriverExecutor.getResultSet() (#31528)
ce5b355fc47 is described below
commit ce5b355fc4710d9ddceb4126af8b1e3610dd1732
Author: Liang Zhang <[email protected]>
AuthorDate: Sun Jun 2 19:30:49 2024 +0800
Rename DriverExecutor.getResultSet() (#31528)
* Refactor ShardingSphereStatement
* Rename DriverExecutor.getResultSet()
---
.../driver/executor/DriverExecutor.java | 6 +--
.../statement/ShardingSpherePreparedStatement.java | 2 +-
.../core/statement/ShardingSphereStatement.java | 46 +++++++++++-----------
3 files changed, 27 insertions(+), 27 deletions(-)
diff --git
a/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/DriverExecutor.java
b/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/DriverExecutor.java
index 7d14befa9b1..1686c79b264 100644
---
a/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/DriverExecutor.java
+++
b/jdbc/src/main/java/org/apache/shardingsphere/driver/executor/DriverExecutor.java
@@ -448,11 +448,11 @@ public final class DriverExecutor implements
AutoCloseable {
}
/**
- * Get advanced result set.
+ * Get result set.
*
- * @return advanced result set
+ * @return result set
*/
- public Optional<ResultSet> getAdvancedResultSet() {
+ public Optional<ResultSet> getResultSet() {
switch (executeType) {
case TRAFFIC:
return Optional.of(trafficExecutor.getResultSet());
diff --git
a/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java
b/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java
index e8d6cc46457..f45c8e8f58e 100644
---
a/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java
+++
b/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java
@@ -310,7 +310,7 @@ public final class ShardingSpherePreparedStatement extends
AbstractPreparedState
if (null != currentResultSet) {
return currentResultSet;
}
- Optional<ResultSet> advancedResultSet =
executor.getAdvancedResultSet();
+ Optional<ResultSet> advancedResultSet = executor.getResultSet();
if (advancedResultSet.isPresent()) {
return advancedResultSet.get();
}
diff --git
a/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSphereStatement.java
b/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSphereStatement.java
index daa74f8e11d..f06e68ff51c 100644
---
a/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSphereStatement.java
+++
b/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSphereStatement.java
@@ -137,12 +137,6 @@ public final class ShardingSphereStatement extends
AbstractStatementAdapter {
}
}
- private DriverExecutionPrepareEngine<JDBCExecutionUnit, Connection>
createDriverExecutionPrepareEngine(final ShardingSphereDatabase database) {
- int maxConnectionsSizePerQuery =
metaData.getProps().<Integer>getValue(ConfigurationPropertyKey.MAX_CONNECTIONS_SIZE_PER_QUERY);
- return new DriverExecutionPrepareEngine<>(JDBCDriverType.STATEMENT,
maxConnectionsSizePerQuery, connection.getDatabaseConnectionManager(),
statementManager, statementOption,
- database.getRuleMetaData().getRules(),
database.getResourceMetaData().getStorageUnits());
- }
-
@Override
public int executeUpdate(final String sql) throws SQLException {
try {
@@ -272,6 +266,16 @@ public final class ShardingSphereStatement extends
AbstractStatementAdapter {
return result;
}
+ private QueryContext createQueryContext(final String originSQL) throws
SQLException {
+ ShardingSpherePreconditions.checkNotEmpty(originSQL, () -> new
EmptySQLException().toSQLException());
+ SQLParserRule sqlParserRule =
metaData.getGlobalRuleMetaData().getSingleRule(SQLParserRule.class);
+ String sql = SQLHintUtils.removeHint(originSQL);
+ HintValueContext hintValueContext =
SQLHintUtils.extractHint(originSQL);
+ SQLStatement sqlStatement =
sqlParserRule.getSQLParserEngine(metaData.getDatabase(databaseName).getProtocolType()).parse(sql,
false);
+ SQLStatementContext sqlStatementContext = new SQLBindEngine(metaData,
databaseName, hintValueContext).bind(sqlStatement, Collections.emptyList());
+ return new QueryContext(sqlStatementContext, sql,
Collections.emptyList(), hintValueContext);
+ }
+
private void prepareExecute(final QueryContext queryContext) throws
SQLException {
handleAutoCommit(queryContext.getSqlStatementContext().getSqlStatement());
databaseName =
queryContext.getDatabaseNameFromSQLStatement().orElse(connection.getDatabaseName());
@@ -294,6 +298,18 @@ public final class ShardingSphereStatement extends
AbstractStatementAdapter {
executor.clear();
}
+ private DriverExecutionPrepareEngine<JDBCExecutionUnit, Connection>
createDriverExecutionPrepareEngine(final ShardingSphereDatabase database) {
+ int maxConnectionsSizePerQuery =
metaData.getProps().<Integer>getValue(ConfigurationPropertyKey.MAX_CONNECTIONS_SIZE_PER_QUERY);
+ return new DriverExecutionPrepareEngine<>(JDBCDriverType.STATEMENT,
maxConnectionsSizePerQuery, connection.getDatabaseConnectionManager(),
statementManager, statementOption,
+ database.getRuleMetaData().getRules(),
database.getResourceMetaData().getStorageUnits());
+ }
+
+ private void replay(final List<Statement> statements) throws SQLException {
+ for (Statement each : statements) {
+ getMethodInvocationRecorder().replay(each);
+ }
+ }
+
@Override
public void addBatch(final String sql) throws SQLException {
batchStatementExecutor.addBatch(sql);
@@ -309,28 +325,12 @@ public final class ShardingSphereStatement extends
AbstractStatementAdapter {
return batchStatementExecutor.executeBatch();
}
- private QueryContext createQueryContext(final String originSQL) throws
SQLException {
- ShardingSpherePreconditions.checkNotEmpty(originSQL, () -> new
EmptySQLException().toSQLException());
- SQLParserRule sqlParserRule =
metaData.getGlobalRuleMetaData().getSingleRule(SQLParserRule.class);
- String sql = SQLHintUtils.removeHint(originSQL);
- HintValueContext hintValueContext =
SQLHintUtils.extractHint(originSQL);
- SQLStatement sqlStatement =
sqlParserRule.getSQLParserEngine(metaData.getDatabase(databaseName).getProtocolType()).parse(sql,
false);
- SQLStatementContext sqlStatementContext = new SQLBindEngine(metaData,
databaseName, hintValueContext).bind(sqlStatement, Collections.emptyList());
- return new QueryContext(sqlStatementContext, sql,
Collections.emptyList(), hintValueContext);
- }
-
- private void replay(final List<Statement> statements) throws SQLException {
- for (Statement each : statements) {
- getMethodInvocationRecorder().replay(each);
- }
- }
-
@Override
public ResultSet getResultSet() throws SQLException {
if (null != currentResultSet) {
return currentResultSet;
}
- Optional<ResultSet> advancedResultSet =
executor.getAdvancedResultSet();
+ Optional<ResultSet> advancedResultSet = executor.getResultSet();
if (advancedResultSet.isPresent()) {
return advancedResultSet.get();
}
