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 2022/11/12 04:29:46 UTC
[shardingsphere] branch master updated: Rename variable from parameters to params (#22097)
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 aadf92a17cd Rename variable from parameters to params (#22097)
aadf92a17cd is described below
commit aadf92a17cd685532bba3a3167abd59eee941613
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sat Nov 12 12:29:40 2022 +0800
Rename variable from parameters to params (#22097)
---
.../extended/bind/PostgreSQLComBindPacketTest.java | 16 +----
.../rewrite/condition/EncryptCondition.java | 4 +-
.../condition/impl/EncryptEqualCondition.java | 6 +-
.../rewrite/condition/impl/EncryptInCondition.java | 4 +-
.../condition/impl/EncryptLikeCondition.java | 6 +-
.../EncryptAssignmentParameterRewriter.java | 20 +++---
...OnDuplicateKeyUpdateValueParameterRewriter.java | 16 ++---
.../EncryptInsertValueParameterRewriter.java | 34 ++++-----
.../EncryptPredicateParameterRewriter.java | 4 +-
.../token/generator/EncryptGeneratorBaseTest.java | 23 +++---
.../shadow/route/engine/util/ShadowExtractor.java | 20 +++---
.../route/engine/util/ShadowExtractorTest.java | 6 +-
.../sharding/spi/ShardingAuditAlgorithm.java | 4 +-
.../fixture/ShardingAuditAlgorithmFixture.java | 2 +-
...MLShardingConditionsShardingAuditAlgorithm.java | 4 +-
.../checker/audit/ShardingAuditChecker.java | 4 +-
...ngGeneratedKeyInsertValueParameterRewriter.java | 2 +-
.../impl/ShardingPaginationParameterRewriter.java | 2 +-
.../GeneratedKeyInsertValuesTokenGenerator.java | 8 +--
.../condition/engine/ShardingConditionEngine.java | 4 +-
.../impl/InsertClauseShardingConditionEngine.java | 28 ++++----
.../impl/WhereClauseShardingConditionEngine.java | 12 ++--
.../engine/condition/generator/ConditionValue.java | 14 ++--
.../generator/ConditionValueGenerator.java | 4 +-
.../generator/ConditionValueGeneratorFactory.java | 10 +--
.../ConditionValueBetweenOperatorGenerator.java | 6 +-
.../ConditionValueCompareOperatorGenerator.java | 4 +-
.../impl/ConditionValueInOperatorGenerator.java | 4 +-
.../validator/ShardingStatementValidator.java | 8 +--
.../impl/ShardingAlterIndexStatementValidator.java | 4 +-
.../impl/ShardingAlterTableStatementValidator.java | 4 +-
.../impl/ShardingAlterViewStatementValidator.java | 4 +-
.../ShardingCreateFunctionStatementValidator.java | 4 +-
.../ShardingCreateIndexStatementValidator.java | 4 +-
.../ShardingCreateProcedureStatementValidator.java | 4 +-
.../ShardingCreateTableStatementValidator.java | 4 +-
.../impl/ShardingCreateViewStatementValidator.java | 4 +-
.../impl/ShardingDropIndexStatementValidator.java | 4 +-
.../impl/ShardingDropTableStatementValidator.java | 4 +-
.../impl/ShardingPrepareStatementValidator.java | 4 +-
.../ShardingRenameTableStatementValidator.java | 4 +-
.../dml/ShardingDMLStatementValidator.java | 12 ++--
.../dml/impl/ShardingCopyStatementValidator.java | 4 +-
.../dml/impl/ShardingDeleteStatementValidator.java | 4 +-
.../dml/impl/ShardingInsertStatementValidator.java | 6 +-
.../dml/impl/ShardingUpdateStatementValidator.java | 6 +-
.../sharding/checker/ShardingAuditCheckerTest.java | 28 +++-----
.../ShardingSQLRewriteContextDecoratorTest.java | 11 +--
...neratedKeyInsertValueParameterRewriterTest.java | 31 ++++----
.../GeneratedKeyAssignmentTokenGeneratorTest.java | 38 +++++-----
.../engine/type/standard/AbstractSQLRouteTest.java | 6 +-
.../route/engine/type/standard/SQLRouteTest.java | 26 ++-----
.../engine/type/standard/SubqueryRouteTest.java | 84 +++++-----------------
.../dml/ShardingInsertStatementValidatorTest.java | 22 +++---
.../checker/ShardingRouteCacheableChecker.java | 24 +++----
.../cache/route/CachedShardingSQLRouter.java | 8 +--
.../checker/ShardingRouteCacheableCheckerTest.java | 6 +-
.../shardingsphere/infra/binder/QueryContext.java | 4 +-
.../infra/binder/SQLStatementContextFactory.java | 18 ++---
.../infra/binder/aware/ParameterAware.java | 4 +-
.../keygen/engine/GeneratedKeyContextEngine.java | 14 ++--
.../segment/insert/values/InsertSelectContext.java | 10 +--
.../segment/insert/values/InsertValueContext.java | 14 ++--
.../insert/values/OnDuplicateUpdateContext.java | 10 +--
.../select/pagination/PaginationContext.java | 10 +--
.../engine/LimitPaginationContextEngine.java | 6 +-
.../pagination/engine/PaginationContextEngine.java | 12 ++--
.../engine/RowNumberPaginationContextEngine.java | 12 ++--
.../engine/TopPaginationContextEngine.java | 6 +-
.../statement/ddl/CursorStatementContext.java | 4 +-
.../statement/dml/InsertStatementContext.java | 40 +++++------
.../statement/dml/SelectStatementContext.java | 14 ++--
.../insert/values/InsertValueContextTest.java | 24 +++----
.../values/OnDuplicateUpdateContextTest.java | 18 ++---
.../engine/TopPaginationContextEngineTest.java | 6 +-
.../statement/impl/InsertStatementContextTest.java | 4 +-
.../infra/executor/check/SQLCheckEngine.java | 7 +-
.../infra/executor/check/SQLChecker.java | 4 +-
.../infra/executor/sql/context/SQLUnit.java | 4 +-
.../executor/sql/hook/SPISQLExecutionHook.java | 4 +-
.../infra/executor/sql/hook/SQLExecutionHook.java | 4 +-
.../executor/check/fixture/SQLCheckerFixture.java | 2 +-
.../sql/context/ExecutionContextBuilderTest.java | 6 +-
.../sql/hook/fixture/SQLExecutionHookFixture.java | 2 +-
.../infra/rewrite/SQLRewriteEntry.java | 10 +--
.../infra/rewrite/context/SQLRewriteContext.java | 6 +-
.../rewrite/engine/RouteSQLRewriteEngine.java | 8 +--
.../builder/impl/GroupedParameterBuilder.java | 8 +--
.../builder/impl/StandardParameterBuilder.java | 37 +++++-----
.../parameter/rewriter/ParameterRewriter.java | 4 +-
.../sql/token/generator/SQLTokenGenerators.java | 10 +--
.../sql/token/generator/aware/ParametersAware.java | 4 +-
.../adapter/AbstractPreparedStatementAdapter.java | 8 +--
.../statement/ShardingSpherePreparedStatement.java | 12 ++--
.../authority/checker/AuthorityChecker.java | 2 +-
.../ddlgenerator/AbstractPostgresDDLAdapter.java | 6 +-
.../PostgresColumnPropertiesAppender.java | 18 ++---
.../PostgresConstraintsPropertiesAppender.java | 74 +++++++++----------
.../PostgresTablePropertiesLoader.java | 20 +++---
.../advanced/AdvancedSQLFederationExecutor.java | 14 ++--
.../executor/FilterableTableScanExecutor.java | 19 +++--
.../executor/TranslatableTableScanExecutor.java | 19 +++--
.../original/OriginalSQLFederationExecutor.java | 4 +-
.../impl/AggregationProjectionConverter.java | 8 +--
.../traffic/executor/TrafficExecutor.java | 8 +--
.../seata/at/TransactionalSQLExecutionHook.java | 2 +-
.../execute/MySQLComStmtExecuteExecutor.java | 8 +--
.../command/query/extended/JDBCPortal.java | 6 +-
.../PostgreSQLBatchedStatementsExecutor.java | 14 ++--
.../ReactiveMySQLComStmtExecuteExecutor.java | 10 +--
.../impl/MySQLDMLStatementSQLVisitor.java | 12 ++--
.../impl/PostgreSQLDMLStatementSQLVisitor.java | 6 +-
.../fixture/ITShardingAuditAlgorithmFixture.java | 2 +-
.../jaxb/distsql/loader/DistSQLCasesLoader.java | 8 +--
.../jaxb/sql/loader/SQLCasesLoader.java | 22 +++---
.../parser/parameterized/loader/CasesLoader.java | 4 +-
.../SQLRewriteEngineTestParametersBuilder.java | 14 ++--
.../EncryptSQLRewriterParameterizedTest.java | 4 +-
.../scenario/MixSQLRewriterParameterizedTest.java | 5 +-
.../ShardingSQLRewriterParameterizedTest.java | 5 +-
120 files changed, 616 insertions(+), 711 deletions(-)
diff --git a/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/PostgreSQLComBindPacketTest.java b/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/PostgreSQLComBindPacketTest.java
index 160fcc957c7..0a4a8dcdf15 100644
--- a/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/PostgreSQLComBindPacketTest.java
+++ b/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/PostgreSQLComBindPacketTest.java
@@ -18,20 +18,16 @@
package org.apache.shardingsphere.db.protocol.postgresql.packet.command.query.extended.bind;
import io.netty.buffer.Unpooled;
-import org.apache.shardingsphere.db.protocol.postgresql.constant.PostgreSQLValueFormat;
-import org.apache.shardingsphere.db.protocol.postgresql.packet.command.PostgreSQLCommandPacketType;
import org.apache.shardingsphere.db.protocol.postgresql.packet.command.query.extended.PostgreSQLColumnType;
import org.apache.shardingsphere.db.protocol.postgresql.payload.PostgreSQLPacketPayload;
import org.junit.Test;
import java.nio.charset.StandardCharsets;
import java.util.Collections;
-import java.util.List;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.mock;
public final class PostgreSQLComBindPacketTest {
@@ -47,15 +43,7 @@ public final class PostgreSQLComBindPacketTest {
PostgreSQLComBindPacket actual = new PostgreSQLComBindPacket(new PostgreSQLPacketPayload(Unpooled.wrappedBuffer(BIND_MESSAGE_BYTES), StandardCharsets.UTF_8));
assertThat(actual.getPortal(), is(""));
assertThat(actual.getStatementId(), is("S_1"));
- List<Object> actualParameters = actual.readParameters(Collections.singletonList(PostgreSQLColumnType.POSTGRESQL_TYPE_INT4));
- assertThat(actualParameters, is(Collections.singletonList(10)));
- List<PostgreSQLValueFormat> actualResultFormats = actual.readResultFormats();
- assertTrue(actualResultFormats.isEmpty());
- }
-
- @Test
- public void getMessageType() {
- PostgreSQLComBindPacket bindPacket = new PostgreSQLComBindPacket(mock(PostgreSQLPacketPayload.class));
- assertThat(bindPacket.getIdentifier(), is(PostgreSQLCommandPacketType.BIND_COMMAND));
+ assertThat(actual.readParameters(Collections.singletonList(PostgreSQLColumnType.POSTGRESQL_TYPE_INT4)), is(Collections.singletonList(10)));
+ assertTrue(actual.readResultFormats().isEmpty());
}
}
diff --git a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/condition/EncryptCondition.java b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/condition/EncryptCondition.java
index 6b8ddc9242d..f69f79ecf98 100644
--- a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/condition/EncryptCondition.java
+++ b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/condition/EncryptCondition.java
@@ -70,8 +70,8 @@ public interface EncryptCondition {
/**
* Get values.
*
- * @param parameters SQL parameters
+ * @param params SQL parameters
* @return values
*/
- List<Object> getValues(List<Object> parameters);
+ List<Object> getValues(List<Object> params);
}
diff --git a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/condition/impl/EncryptEqualCondition.java b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/condition/impl/EncryptEqualCondition.java
index 64217678d19..b7fbf6af63b 100644
--- a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/condition/impl/EncryptEqualCondition.java
+++ b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/condition/impl/EncryptEqualCondition.java
@@ -70,13 +70,13 @@ public final class EncryptEqualCondition implements EncryptCondition {
/**
* Get values.
*
- * @param parameters SQL parameters
+ * @param params SQL parameters
* @return values
*/
- public List<Object> getValues(final List<Object> parameters) {
+ public List<Object> getValues(final List<Object> params) {
List<Object> result = new ArrayList<>(positionValueMap.values());
for (Entry<Integer, Integer> entry : positionIndexMap.entrySet()) {
- Object parameter = parameters.get(entry.getValue());
+ Object parameter = params.get(entry.getValue());
if (entry.getKey() < result.size()) {
result.add(entry.getKey(), parameter);
} else {
diff --git a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/condition/impl/EncryptInCondition.java b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/condition/impl/EncryptInCondition.java
index 49191ed4b7b..43323eb987d 100644
--- a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/condition/impl/EncryptInCondition.java
+++ b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/condition/impl/EncryptInCondition.java
@@ -72,10 +72,10 @@ public final class EncryptInCondition implements EncryptCondition {
}
@Override
- public List<Object> getValues(final List<Object> parameters) {
+ public List<Object> getValues(final List<Object> params) {
List<Object> result = new ArrayList<>(positionValueMap.values());
for (Entry<Integer, Integer> entry : positionIndexMap.entrySet()) {
- Object parameter = parameters.get(entry.getValue());
+ Object parameter = params.get(entry.getValue());
if (entry.getKey() < result.size()) {
result.add(entry.getKey(), parameter);
} else {
diff --git a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/condition/impl/EncryptLikeCondition.java b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/condition/impl/EncryptLikeCondition.java
index 010c534d1a8..b1d5ddc9370 100644
--- a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/condition/impl/EncryptLikeCondition.java
+++ b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/condition/impl/EncryptLikeCondition.java
@@ -70,14 +70,14 @@ public final class EncryptLikeCondition implements EncryptCondition {
/**
* Get values.
*
- * @param parameters SQL parameters
+ * @param params SQL parameters
* @return values
*/
@Override
- public List<Object> getValues(final List<Object> parameters) {
+ public List<Object> getValues(final List<Object> params) {
List<Object> result = new ArrayList<>(positionValueMap.values());
for (Entry<Integer, Integer> entry : positionIndexMap.entrySet()) {
- Object parameter = parameters.get(entry.getValue());
+ Object parameter = params.get(entry.getValue());
if (entry.getKey() < result.size()) {
result.add(entry.getKey(), parameter);
} else {
diff --git a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/rewriter/EncryptAssignmentParameterRewriter.java b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/rewriter/EncryptAssignmentParameterRewriter.java
index 46748047238..ae4b7b7e4a9 100644
--- a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/rewriter/EncryptAssignmentParameterRewriter.java
+++ b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/rewriter/EncryptAssignmentParameterRewriter.java
@@ -67,7 +67,7 @@ public final class EncryptAssignmentParameterRewriter implements ParameterRewrit
}
@Override
- public void rewrite(final ParameterBuilder parameterBuilder, final SQLStatementContext<?> sqlStatementContext, final List<Object> parameters) {
+ public void rewrite(final ParameterBuilder parameterBuilder, final SQLStatementContext<?> sqlStatementContext, final List<Object> params) {
String tableName = ((TableAvailable) sqlStatementContext).getAllTables().iterator().next().getTableName().getIdentifier().getValue();
String schemaName = sqlStatementContext.getTablesContext().getSchemaName().orElseGet(() -> DatabaseTypeEngine.getDefaultSchemaName(sqlStatementContext.getDatabaseType(), databaseName));
for (AssignmentSegment each : getSetAssignmentSegment(sqlStatementContext.getSqlStatement()).getAssignments()) {
@@ -75,7 +75,7 @@ public final class EncryptAssignmentParameterRewriter implements ParameterRewrit
StandardParameterBuilder standardParameterBuilder = parameterBuilder instanceof StandardParameterBuilder
? (StandardParameterBuilder) parameterBuilder
: ((GroupedParameterBuilder) parameterBuilder).getParameterBuilders().get(0);
- encryptParameters(standardParameterBuilder, schemaName, tableName, each, parameters);
+ encryptParameters(standardParameterBuilder, schemaName, tableName, each, params);
}
}
}
@@ -90,26 +90,26 @@ public final class EncryptAssignmentParameterRewriter implements ParameterRewrit
}
private void encryptParameters(final StandardParameterBuilder parameterBuilder, final String schemaName,
- final String tableName, final AssignmentSegment assignmentSegment, final List<Object> parameters) {
+ final String tableName, final AssignmentSegment assignmentSegment, final List<Object> params) {
String columnName = assignmentSegment.getColumns().get(0).getIdentifier().getValue();
int parameterMarkerIndex = ((ParameterMarkerExpressionSegment) assignmentSegment.getValue()).getParameterMarkerIndex();
- Object originalValue = parameters.get(parameterMarkerIndex);
+ Object originalValue = params.get(parameterMarkerIndex);
Object cipherValue = encryptRule.getEncryptValues(databaseName, schemaName, tableName, columnName, Collections.singletonList(originalValue)).iterator().next();
parameterBuilder.addReplacedParameters(parameterMarkerIndex, cipherValue);
- Collection<Object> addedParameters = new LinkedList<>();
+ Collection<Object> addedParams = new LinkedList<>();
if (encryptRule.findAssistedQueryColumn(tableName, columnName).isPresent()) {
Object assistedQueryValue = encryptRule.getEncryptAssistedQueryValues(databaseName, schemaName, tableName, columnName, Collections.singletonList(originalValue)).iterator().next();
- addedParameters.add(assistedQueryValue);
+ addedParams.add(assistedQueryValue);
}
if (encryptRule.findFuzzyQueryColumn(tableName, columnName).isPresent()) {
Object fuzzyValue = encryptRule.getEncryptFuzzyQueryValues(databaseName, schemaName, tableName, columnName, Collections.singletonList(originalValue)).iterator().next();
- addedParameters.add(fuzzyValue);
+ addedParams.add(fuzzyValue);
}
if (encryptRule.findPlainColumn(tableName, columnName).isPresent()) {
- addedParameters.add(originalValue);
+ addedParams.add(originalValue);
}
- if (!addedParameters.isEmpty()) {
- parameterBuilder.addAddedParameters(parameterMarkerIndex, addedParameters);
+ if (!addedParams.isEmpty()) {
+ parameterBuilder.addAddedParameters(parameterMarkerIndex, addedParams);
}
}
}
diff --git a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/rewriter/EncryptInsertOnDuplicateKeyUpdateValueParameterRewriter.java b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/rewriter/EncryptInsertOnDuplicateKeyUpdateValueParameterRewriter.java
index 64653a0173a..f19716aff28 100644
--- a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/rewriter/EncryptInsertOnDuplicateKeyUpdateValueParameterRewriter.java
+++ b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/rewriter/EncryptInsertOnDuplicateKeyUpdateValueParameterRewriter.java
@@ -58,9 +58,9 @@ public final class EncryptInsertOnDuplicateKeyUpdateValueParameterRewriter imple
@SuppressWarnings({"rawtypes", "unchecked"})
@Override
- public void rewrite(final ParameterBuilder parameterBuilder, final InsertStatementContext insertStatementContext, final List<Object> parameters) {
+ public void rewrite(final ParameterBuilder paramBuilder, final InsertStatementContext insertStatementContext, final List<Object> params) {
String tableName = insertStatementContext.getSqlStatement().getTable().getTableName().getIdentifier().getValue();
- GroupedParameterBuilder groupedParameterBuilder = (GroupedParameterBuilder) parameterBuilder;
+ GroupedParameterBuilder groupedParameterBuilder = (GroupedParameterBuilder) paramBuilder;
OnDuplicateUpdateContext onDuplicateKeyUpdateValueContext = insertStatementContext.getOnDuplicateKeyUpdateValueContext();
String schemaName = insertStatementContext.getTablesContext().getSchemaName().orElseGet(() -> DatabaseTypeEngine.getDefaultSchemaName(insertStatementContext.getDatabaseType(), databaseName));
for (int index = 0; index < onDuplicateKeyUpdateValueContext.getValueExpressions().size(); index++) {
@@ -75,27 +75,27 @@ public final class EncryptInsertOnDuplicateKeyUpdateValueParameterRewriter imple
}
Object cipherColumnValue = encryptor.get().encrypt(plainColumnValue, encryptContext);
groupedParameterBuilder.getGenericParameterBuilder().addReplacedParameters(columnIndex, cipherColumnValue);
- Collection<Object> addedParameters = new LinkedList<>();
+ Collection<Object> addedParams = new LinkedList<>();
Optional<EncryptAlgorithm> assistedQueryEncryptor = encryptRule.findAssistedQueryEncryptor(tableName, encryptLogicColumnName);
if (assistedQueryEncryptor.isPresent()) {
Optional<String> assistedColumnName = encryptRule.findAssistedQueryColumn(tableName, encryptLogicColumnName);
Preconditions.checkArgument(assistedColumnName.isPresent(), "Can not find assisted query Column Name");
- addedParameters.add(assistedQueryEncryptor.get().encrypt(plainColumnValue, encryptContext));
+ addedParams.add(assistedQueryEncryptor.get().encrypt(plainColumnValue, encryptContext));
}
Optional<EncryptAlgorithm> fuzzyQueryEncryptor = encryptRule.findFuzzyQueryEncryptor(tableName, encryptLogicColumnName);
if (fuzzyQueryEncryptor.isPresent()) {
Optional<String> fuzzyColumnName = encryptRule.findFuzzyQueryColumn(tableName, encryptLogicColumnName);
Preconditions.checkArgument(fuzzyColumnName.isPresent(), "Can not find assisted query Column Name");
- addedParameters.add(fuzzyQueryEncryptor.get().encrypt(plainColumnValue, encryptContext));
+ addedParams.add(fuzzyQueryEncryptor.get().encrypt(plainColumnValue, encryptContext));
}
if (encryptRule.findPlainColumn(tableName, encryptLogicColumnName).isPresent()) {
- addedParameters.add(plainColumnValue);
+ addedParams.add(plainColumnValue);
}
- if (!addedParameters.isEmpty()) {
+ if (!addedParams.isEmpty()) {
if (!groupedParameterBuilder.getGenericParameterBuilder().getAddedIndexAndParameters().containsKey(columnIndex)) {
groupedParameterBuilder.getGenericParameterBuilder().getAddedIndexAndParameters().put(columnIndex, new LinkedList<>());
}
- groupedParameterBuilder.getGenericParameterBuilder().getAddedIndexAndParameters().get(columnIndex).addAll(addedParameters);
+ groupedParameterBuilder.getGenericParameterBuilder().getAddedIndexAndParameters().get(columnIndex).addAll(addedParams);
}
});
}
diff --git a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/rewriter/EncryptInsertValueParameterRewriter.java b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/rewriter/EncryptInsertValueParameterRewriter.java
index 93abb7ef31f..0fa26ec69b2 100644
--- a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/rewriter/EncryptInsertValueParameterRewriter.java
+++ b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/rewriter/EncryptInsertValueParameterRewriter.java
@@ -60,7 +60,7 @@ public final class EncryptInsertValueParameterRewriter implements ParameterRewri
}
@Override
- public void rewrite(final ParameterBuilder parameterBuilder, final InsertStatementContext insertStatementContext, final List<Object> parameters) {
+ public void rewrite(final ParameterBuilder parameterBuilder, final InsertStatementContext insertStatementContext, final List<Object> params) {
String tableName = insertStatementContext.getSqlStatement().getTable().getTableName().getIdentifier().getValue();
Iterator<String> descendingColumnNames = insertStatementContext.getDescendingColumnNames();
String schemaName = insertStatementContext.getTablesContext().getSchemaName().orElseGet(() -> DatabaseTypeEngine.getDefaultSchemaName(insertStatementContext.getDatabaseType(), databaseName));
@@ -74,15 +74,15 @@ public final class EncryptInsertValueParameterRewriter implements ParameterRewri
}
}
- private void encryptInsertValues(final GroupedParameterBuilder parameterBuilder, final InsertStatementContext insertStatementContext,
+ private void encryptInsertValues(final GroupedParameterBuilder paramBuilder, final InsertStatementContext insertStatementContext,
final EncryptAlgorithm<?, ?> encryptAlgorithm, final EncryptAlgorithm<?, ?> assistEncryptAlgorithm,
final EncryptAlgorithm<?, ?> fuzzyEncryptAlgorithm, final EncryptContext encryptContext) {
- int columnIndex = getColumnIndex(parameterBuilder, insertStatementContext, encryptContext.getColumnName());
+ int columnIndex = getColumnIndex(paramBuilder, insertStatementContext, encryptContext.getColumnName());
int count = 0;
for (List<Object> each : insertStatementContext.getGroupedParameters()) {
int parameterIndex = insertStatementContext.getInsertValueContexts().get(count).getParameterIndex(columnIndex);
if (!each.isEmpty()) {
- StandardParameterBuilder standardParameterBuilder = parameterBuilder.getParameterBuilders().get(count);
+ StandardParameterBuilder standardParameterBuilder = paramBuilder.getParameterBuilders().get(count);
ExpressionSegment expressionSegment = insertStatementContext.getInsertValueContexts().get(count).getValueExpressions().get(columnIndex);
if (expressionSegment instanceof ParameterMarkerExpressionSegment) {
Object literalValue = insertStatementContext.getInsertValueContexts().get(count).getLiteralValue(columnIndex)
@@ -94,11 +94,11 @@ public final class EncryptInsertValueParameterRewriter implements ParameterRewri
}
}
- private int getColumnIndex(final GroupedParameterBuilder parameterBuilder, final InsertStatementContext insertStatementContext, final String encryptLogicColumnName) {
+ private int getColumnIndex(final GroupedParameterBuilder paramBuilder, final InsertStatementContext insertStatementContext, final String encryptLogicColumnName) {
List<String> columnNames;
- if (parameterBuilder.getDerivedColumnName().isPresent()) {
+ if (paramBuilder.getDerivedColumnName().isPresent()) {
columnNames = new ArrayList<>(insertStatementContext.getColumnNames());
- columnNames.remove(parameterBuilder.getDerivedColumnName().get());
+ columnNames.remove(paramBuilder.getDerivedColumnName().get());
} else {
columnNames = insertStatementContext.getColumnNames();
}
@@ -107,28 +107,28 @@ public final class EncryptInsertValueParameterRewriter implements ParameterRewri
@SuppressWarnings({"rawtypes", "unchecked"})
private void encryptInsertValue(final EncryptAlgorithm encryptAlgorithm, final EncryptAlgorithm assistEncryptor, final EncryptAlgorithm fuzzyEncryptor,
- final int parameterIndex, final Object originalValue, final StandardParameterBuilder parameterBuilder,
+ final int paramIndex, final Object originalValue, final StandardParameterBuilder paramBuilder,
final EncryptContext encryptContext) {
- parameterBuilder.addReplacedParameters(parameterIndex, encryptAlgorithm.encrypt(originalValue, encryptContext));
- Collection<Object> addedParameters = new LinkedList<>();
+ paramBuilder.addReplacedParameters(paramIndex, encryptAlgorithm.encrypt(originalValue, encryptContext));
+ Collection<Object> addedParams = new LinkedList<>();
if (null != assistEncryptor) {
Optional<String> assistedColumnName = encryptRule.findAssistedQueryColumn(encryptContext.getTableName(), encryptContext.getColumnName());
Preconditions.checkArgument(assistedColumnName.isPresent(), "Can not find assisted query Column Name");
- addedParameters.add(assistEncryptor.encrypt(originalValue, encryptContext));
+ addedParams.add(assistEncryptor.encrypt(originalValue, encryptContext));
}
if (null != fuzzyEncryptor) {
Optional<String> fuzzyColumnName = encryptRule.findFuzzyQueryColumn(encryptContext.getTableName(), encryptContext.getColumnName());
Preconditions.checkArgument(fuzzyColumnName.isPresent(), "Can not find fuzzy query Column Name");
- addedParameters.add(fuzzyEncryptor.encrypt(originalValue, encryptContext));
+ addedParams.add(fuzzyEncryptor.encrypt(originalValue, encryptContext));
}
if (encryptRule.findPlainColumn(encryptContext.getTableName(), encryptContext.getColumnName()).isPresent()) {
- addedParameters.add(originalValue);
+ addedParams.add(originalValue);
}
- if (!addedParameters.isEmpty()) {
- if (!parameterBuilder.getAddedIndexAndParameters().containsKey(parameterIndex)) {
- parameterBuilder.getAddedIndexAndParameters().put(parameterIndex, new LinkedList<>());
+ if (!addedParams.isEmpty()) {
+ if (!paramBuilder.getAddedIndexAndParameters().containsKey(paramIndex)) {
+ paramBuilder.getAddedIndexAndParameters().put(paramIndex, new LinkedList<>());
}
- parameterBuilder.getAddedIndexAndParameters().get(parameterIndex).addAll(addedParameters);
+ paramBuilder.getAddedIndexAndParameters().get(paramIndex).addAll(addedParams);
}
}
}
diff --git a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/rewriter/EncryptPredicateParameterRewriter.java b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/rewriter/EncryptPredicateParameterRewriter.java
index 2df8644ce53..0396f02f64e 100644
--- a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/rewriter/EncryptPredicateParameterRewriter.java
+++ b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/rewriter/EncryptPredicateParameterRewriter.java
@@ -54,12 +54,12 @@ public final class EncryptPredicateParameterRewriter implements ParameterRewrite
}
@Override
- public void rewrite(final ParameterBuilder parameterBuilder, final SQLStatementContext<?> sqlStatementContext, final List<Object> parameters) {
+ public void rewrite(final ParameterBuilder parameterBuilder, final SQLStatementContext<?> sqlStatementContext, final List<Object> params) {
String schemaName = sqlStatementContext.getTablesContext().getSchemaName().orElseGet(() -> DatabaseTypeEngine.getDefaultSchemaName(sqlStatementContext.getDatabaseType(), databaseName));
for (EncryptCondition each : encryptConditions) {
boolean queryWithCipherColumn = encryptRule.isQueryWithCipherColumn(each.getTableName(), each.getColumnName());
if (queryWithCipherColumn) {
- encryptParameters(parameterBuilder, each.getPositionIndexMap(), getEncryptedValues(schemaName, each, each.getValues(parameters)));
+ encryptParameters(parameterBuilder, each.getPositionIndexMap(), getEncryptedValues(schemaName, each, each.getValues(params)));
}
}
}
diff --git a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptGeneratorBaseTest.java b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptGeneratorBaseTest.java
index 29d45bdf91b..5917e05869f 100644
--- a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptGeneratorBaseTest.java
+++ b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/EncryptGeneratorBaseTest.java
@@ -17,15 +17,6 @@
package org.apache.shardingsphere.encrypt.rewrite.token.generator;
-import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Properties;
import org.apache.shardingsphere.encrypt.api.config.EncryptRuleConfiguration;
import org.apache.shardingsphere.encrypt.api.config.rule.EncryptColumnRuleConfiguration;
import org.apache.shardingsphere.encrypt.api.config.rule.EncryptTableRuleConfiguration;
@@ -56,6 +47,16 @@ import org.apache.shardingsphere.sql.parser.sql.common.value.identifier.Identifi
import org.apache.shardingsphere.sql.parser.sql.dialect.statement.mysql.dml.MySQLInsertStatement;
import org.apache.shardingsphere.sql.parser.sql.dialect.statement.mysql.dml.MySQLUpdateStatement;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Properties;
+
+import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
public abstract class EncryptGeneratorBaseTest {
private static final String TABLE_NAME = "t_user";
@@ -67,13 +68,13 @@ public abstract class EncryptGeneratorBaseTest {
Collections.singletonMap("test_encryptor", new AlgorithmConfiguration("CORE.QUERY_ASSISTED.FIXTURE", new Properties()))));
}
- protected static InsertStatementContext createInsertStatementContext(final List<Object> parameters) {
+ protected static InsertStatementContext createInsertStatementContext(final List<Object> params) {
InsertStatement insertStatement = createInsertStatement();
ShardingSphereDatabase database = mock(ShardingSphereDatabase.class, RETURNS_DEEP_STUBS);
ShardingSphereSchema schema = mock(ShardingSphereSchema.class);
when(database.getSchema(DefaultDatabase.LOGIC_NAME)).thenReturn(schema);
when(schema.getAllColumnNames("tbl")).thenReturn(Arrays.asList("id", "name", "status", "pwd"));
- return new InsertStatementContext(Collections.singletonMap(DefaultDatabase.LOGIC_NAME, database), parameters, insertStatement, DefaultDatabase.LOGIC_NAME);
+ return new InsertStatementContext(Collections.singletonMap(DefaultDatabase.LOGIC_NAME, database), params, insertStatement, DefaultDatabase.LOGIC_NAME);
}
protected static InsertStatement createInsertStatement() {
diff --git a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/route/engine/util/ShadowExtractor.java b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/route/engine/util/ShadowExtractor.java
index b7187927cee..b777c73c4dc 100644
--- a/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/route/engine/util/ShadowExtractor.java
+++ b/features/shadow/core/src/main/java/org/apache/shardingsphere/shadow/route/engine/util/ShadowExtractor.java
@@ -55,38 +55,38 @@ public final class ShadowExtractor {
* Get values in expression segment.
*
* @param expression expression segment
- * @param parameters parameters
+ * @param params parameters
* @return values
*/
- public static Optional<Collection<Comparable<?>>> extractValues(final ExpressionSegment expression, final List<Object> parameters) {
+ public static Optional<Collection<Comparable<?>>> extractValues(final ExpressionSegment expression, final List<Object> params) {
Collection<Comparable<?>> result = new LinkedList<>();
if (expression instanceof BinaryOperationExpression) {
- extractValues(((BinaryOperationExpression) expression).getRight(), parameters).ifPresent(result::addAll);
+ extractValues(((BinaryOperationExpression) expression).getRight(), params).ifPresent(result::addAll);
}
if (expression instanceof InExpression) {
- extractValues(((InExpression) expression).getRight(), parameters).ifPresent(result::addAll);
+ extractValues(((InExpression) expression).getRight(), params).ifPresent(result::addAll);
}
if (expression instanceof ListExpression) {
- ((ListExpression) expression).getItems().forEach(each -> extractValueInSimpleExpressionSegment(each, parameters).ifPresent(result::add));
+ ((ListExpression) expression).getItems().forEach(each -> extractValueInSimpleExpressionSegment(each, params).ifPresent(result::add));
}
if (expression instanceof SimpleExpressionSegment) {
- extractValueInSimpleExpressionSegment(expression, parameters).ifPresent(result::add);
+ extractValueInSimpleExpressionSegment(expression, params).ifPresent(result::add);
}
return result.isEmpty() ? Optional.empty() : Optional.of(result);
}
- private static Optional<Comparable<?>> extractValueInSimpleExpressionSegment(final ExpressionSegment expression, final List<Object> parameters) {
+ private static Optional<Comparable<?>> extractValueInSimpleExpressionSegment(final ExpressionSegment expression, final List<Object> params) {
if (expression instanceof LiteralExpressionSegment) {
return extractValueInLiteralExpressionSegment((LiteralExpressionSegment) expression);
}
if (expression instanceof ParameterMarkerExpressionSegment) {
- return extractValueInParameterMarkerExpressionSegment((ParameterMarkerExpressionSegment) expression, parameters);
+ return extractValueInParameterMarkerExpressionSegment((ParameterMarkerExpressionSegment) expression, params);
}
return Optional.empty();
}
- private static Optional<Comparable<?>> extractValueInParameterMarkerExpressionSegment(final ParameterMarkerExpressionSegment expression, final List<Object> parameters) {
- return castToComparable(parameters.get(expression.getParameterMarkerIndex()));
+ private static Optional<Comparable<?>> extractValueInParameterMarkerExpressionSegment(final ParameterMarkerExpressionSegment expression, final List<Object> params) {
+ return castToComparable(params.get(expression.getParameterMarkerIndex()));
}
private static Optional<Comparable<?>> extractValueInLiteralExpressionSegment(final LiteralExpressionSegment expression) {
diff --git a/features/shadow/core/src/test/java/org/apache/shardingsphere/shadow/route/engine/util/ShadowExtractorTest.java b/features/shadow/core/src/test/java/org/apache/shardingsphere/shadow/route/engine/util/ShadowExtractorTest.java
index 4d80b5b5f79..165b9887a0a 100644
--- a/features/shadow/core/src/test/java/org/apache/shardingsphere/shadow/route/engine/util/ShadowExtractorTest.java
+++ b/features/shadow/core/src/test/java/org/apache/shardingsphere/shadow/route/engine/util/ShadowExtractorTest.java
@@ -33,8 +33,8 @@ public final class ShadowExtractorTest {
@Test
public void assertExtractValuesSimpleExpressionSegment() {
SimpleExpressionSegment simpleExpressionSegment = new LiteralExpressionSegment(1, 2, "expected");
- List<Object> parameters = new LinkedList<>();
- assertTrue(ShadowExtractor.extractValues(simpleExpressionSegment, parameters).isPresent());
- assertThat(ShadowExtractor.extractValues(simpleExpressionSegment, parameters).get().iterator().next(), is("expected"));
+ List<Object> params = new LinkedList<>();
+ assertTrue(ShadowExtractor.extractValues(simpleExpressionSegment, params).isPresent());
+ assertThat(ShadowExtractor.extractValues(simpleExpressionSegment, params).get().iterator().next(), is("expected"));
}
}
diff --git a/features/sharding/api/src/main/java/org/apache/shardingsphere/sharding/spi/ShardingAuditAlgorithm.java b/features/sharding/api/src/main/java/org/apache/shardingsphere/sharding/spi/ShardingAuditAlgorithm.java
index 4a995eb2a06..eba2e17e6dc 100644
--- a/features/sharding/api/src/main/java/org/apache/shardingsphere/sharding/spi/ShardingAuditAlgorithm.java
+++ b/features/sharding/api/src/main/java/org/apache/shardingsphere/sharding/spi/ShardingAuditAlgorithm.java
@@ -34,10 +34,10 @@ public interface ShardingAuditAlgorithm extends ShardingSphereAlgorithm {
* Sharding audit algorithm SQL check.
*
* @param sqlStatementContext SQL statement context
- * @param parameters SQL parameters
+ * @param params SQL parameters
* @param grantee grantee
* @param database database
* @return SQL check result
*/
- SQLCheckResult check(SQLStatementContext<?> sqlStatementContext, List<Object> parameters, Grantee grantee, ShardingSphereDatabase database);
+ SQLCheckResult check(SQLStatementContext<?> sqlStatementContext, List<Object> params, Grantee grantee, ShardingSphereDatabase database);
}
diff --git a/features/sharding/api/src/test/java/org/apache/shardingsphere/sharding/fixture/ShardingAuditAlgorithmFixture.java b/features/sharding/api/src/test/java/org/apache/shardingsphere/sharding/fixture/ShardingAuditAlgorithmFixture.java
index a8cb37416d1..a58902bd707 100644
--- a/features/sharding/api/src/test/java/org/apache/shardingsphere/sharding/fixture/ShardingAuditAlgorithmFixture.java
+++ b/features/sharding/api/src/test/java/org/apache/shardingsphere/sharding/fixture/ShardingAuditAlgorithmFixture.java
@@ -38,7 +38,7 @@ public final class ShardingAuditAlgorithmFixture implements ShardingAuditAlgorit
}
@Override
- public SQLCheckResult check(final SQLStatementContext<?> sqlStatementContext, final List<Object> parameters, final Grantee grantee, final ShardingSphereDatabase database) {
+ public SQLCheckResult check(final SQLStatementContext<?> sqlStatementContext, final List<Object> params, final Grantee grantee, final ShardingSphereDatabase database) {
return new SQLCheckResult(true, "");
}
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/algorithm/audit/DMLShardingConditionsShardingAuditAlgorithm.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/algorithm/audit/DMLShardingConditionsShardingAuditAlgorithm.java
index b83816afa14..b5ed76796af 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/algorithm/audit/DMLShardingConditionsShardingAuditAlgorithm.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/algorithm/audit/DMLShardingConditionsShardingAuditAlgorithm.java
@@ -46,7 +46,7 @@ public final class DMLShardingConditionsShardingAuditAlgorithm implements Shardi
@SuppressWarnings({"rawtypes", "unchecked"})
@Override
- public SQLCheckResult check(final SQLStatementContext<?> sqlStatementContext, final List<Object> parameters, final Grantee grantee, final ShardingSphereDatabase database) {
+ public SQLCheckResult check(final SQLStatementContext<?> sqlStatementContext, final List<Object> params, final Grantee grantee, final ShardingSphereDatabase database) {
if (sqlStatementContext.getSqlStatement() instanceof DMLStatement) {
ShardingRule rule = database.getRuleMetaData().getSingleRule(ShardingRule.class);
if (rule.isAllBroadcastTables(sqlStatementContext.getTablesContext().getTableNames())
@@ -54,7 +54,7 @@ public final class DMLShardingConditionsShardingAuditAlgorithm implements Shardi
return new SQLCheckResult(true, "");
}
ShardingConditionEngine shardingConditionEngine = ShardingConditionEngineFactory.createShardingConditionEngine(sqlStatementContext, database, rule);
- if (shardingConditionEngine.createShardingConditions(sqlStatementContext, parameters).isEmpty()) {
+ if (shardingConditionEngine.createShardingConditions(sqlStatementContext, params).isEmpty()) {
return new SQLCheckResult(false, "Not allow DML operation without sharding conditions");
}
}
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/checker/audit/ShardingAuditChecker.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/checker/audit/ShardingAuditChecker.java
index b815984db8a..4b109fa6857 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/checker/audit/ShardingAuditChecker.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/checker/audit/ShardingAuditChecker.java
@@ -45,7 +45,7 @@ public final class ShardingAuditChecker implements SQLChecker<ShardingRule> {
}
@Override
- public SQLCheckResult check(final SQLStatementContext<?> sqlStatementContext, final List<Object> parameters, final Grantee grantee,
+ public SQLCheckResult check(final SQLStatementContext<?> sqlStatementContext, final List<Object> params, final Grantee grantee,
final String currentDatabase, final Map<String, ShardingSphereDatabase> databases, final ShardingRule rule) {
Collection<ShardingAuditStrategyConfiguration> auditStrategies = getShardingAuditStrategies(sqlStatementContext, rule);
if (auditStrategies.isEmpty()) {
@@ -59,7 +59,7 @@ public final class ShardingAuditChecker implements SQLChecker<ShardingRule> {
if (auditStrategy.isAllowHintDisable() && disableAuditNames.contains(auditorName.toLowerCase())) {
continue;
}
- SQLCheckResult result = rule.getAuditors().get(auditorName).check(sqlStatementContext, parameters, grantee, databases.get(currentDatabase.toLowerCase()));
+ SQLCheckResult result = rule.getAuditors().get(auditorName).check(sqlStatementContext, params, grantee, databases.get(currentDatabase.toLowerCase()));
if (!result.isPassed()) {
return result;
}
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/parameter/impl/ShardingGeneratedKeyInsertValueParameterRewriter.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/parameter/impl/ShardingGeneratedKeyInsertValueParameterRewriter.java
index 4a308b4cd06..307db9d524b 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/parameter/impl/ShardingGeneratedKeyInsertValueParameterRewriter.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/parameter/impl/ShardingGeneratedKeyInsertValueParameterRewriter.java
@@ -45,7 +45,7 @@ public final class ShardingGeneratedKeyInsertValueParameterRewriter implements P
}
@Override
- public void rewrite(final ParameterBuilder parameterBuilder, final InsertStatementContext insertStatementContext, final List<Object> parameters) {
+ public void rewrite(final ParameterBuilder parameterBuilder, final InsertStatementContext insertStatementContext, final List<Object> params) {
Preconditions.checkState(insertStatementContext.getGeneratedKeyContext().isPresent());
((GroupedParameterBuilder) parameterBuilder).setDerivedColumnName(insertStatementContext.getGeneratedKeyContext().get().getColumnName());
Iterator<Comparable<?>> generatedValues = insertStatementContext.getGeneratedKeyContext().get().getGeneratedValues().iterator();
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/parameter/impl/ShardingPaginationParameterRewriter.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/parameter/impl/ShardingPaginationParameterRewriter.java
index d349465a342..5e24ce453fb 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/parameter/impl/ShardingPaginationParameterRewriter.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/parameter/impl/ShardingPaginationParameterRewriter.java
@@ -44,7 +44,7 @@ public final class ShardingPaginationParameterRewriter implements ParameterRewri
}
@Override
- public void rewrite(final ParameterBuilder parameterBuilder, final SelectStatementContext selectStatementContext, final List<Object> parameters) {
+ public void rewrite(final ParameterBuilder parameterBuilder, final SelectStatementContext selectStatementContext, final List<Object> params) {
PaginationContext pagination = selectStatementContext.getPaginationContext();
pagination.getOffsetParameterIndex().ifPresent(optional -> rewriteOffset(pagination, optional, (StandardParameterBuilder) parameterBuilder));
pagination.getRowCountParameterIndex()
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/keygen/GeneratedKeyInsertValuesTokenGenerator.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/keygen/GeneratedKeyInsertValuesTokenGenerator.java
index dfc6d06065b..87d7c4110ab 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/keygen/GeneratedKeyInsertValuesTokenGenerator.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/keygen/GeneratedKeyInsertValuesTokenGenerator.java
@@ -56,10 +56,10 @@ public final class GeneratedKeyInsertValuesTokenGenerator extends BaseGeneratedK
Preconditions.checkState(generatedKey.isPresent());
Iterator<Comparable<?>> generatedValues = generatedKey.get().getGeneratedValues().iterator();
int count = 0;
- List<List<Object>> parameters = insertStatementContext.getGroupedParameters();
+ List<List<Object>> params = insertStatementContext.getGroupedParameters();
for (InsertValueContext each : insertStatementContext.getInsertValueContexts()) {
InsertValue insertValueToken = result.get().getInsertValues().get(count);
- DerivedSimpleExpressionSegment expressionSegment = isToAddDerivedLiteralExpression(parameters, count)
+ DerivedSimpleExpressionSegment expressionSegment = isToAddDerivedLiteralExpression(params, count)
? new DerivedLiteralExpressionSegment(generatedValues.next())
: new DerivedParameterMarkerExpressionSegment(each.getParameterCount());
insertValueToken.getValues().add(expressionSegment);
@@ -77,7 +77,7 @@ public final class GeneratedKeyInsertValuesTokenGenerator extends BaseGeneratedK
return Optional.empty();
}
- private boolean isToAddDerivedLiteralExpression(final List<List<Object>> parameters, final int insertValueCount) {
- return parameters.get(insertValueCount).isEmpty();
+ private boolean isToAddDerivedLiteralExpression(final List<List<Object>> params, final int insertValueCount) {
+ return params.get(insertValueCount).isEmpty();
}
}
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/engine/ShardingConditionEngine.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/engine/ShardingConditionEngine.java
index b581fedb22f..c0f100b2b9b 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/engine/ShardingConditionEngine.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/engine/ShardingConditionEngine.java
@@ -31,8 +31,8 @@ public interface ShardingConditionEngine<T extends SQLStatementContext<?>> {
* Create sharding conditions.
*
* @param sqlStatementContext SQL statement context
- * @param parameters SQL parameters
+ * @param params SQL parameters
* @return sharding conditions
*/
- List<ShardingCondition> createShardingConditions(T sqlStatementContext, List<Object> parameters);
+ List<ShardingCondition> createShardingConditions(T sqlStatementContext, List<Object> params);
}
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/engine/impl/InsertClauseShardingConditionEngine.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/engine/impl/InsertClauseShardingConditionEngine.java
index 0e1ffa49233..201677fbe8a 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/engine/impl/InsertClauseShardingConditionEngine.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/engine/impl/InsertClauseShardingConditionEngine.java
@@ -60,22 +60,22 @@ public final class InsertClauseShardingConditionEngine implements ShardingCondit
private final ShardingSphereDatabase database;
@Override
- public List<ShardingCondition> createShardingConditions(final InsertStatementContext sqlStatementContext, final List<Object> parameters) {
+ public List<ShardingCondition> createShardingConditions(final InsertStatementContext sqlStatementContext, final List<Object> params) {
List<ShardingCondition> result = null == sqlStatementContext.getInsertSelectContext()
- ? createShardingConditionsWithInsertValues(sqlStatementContext, parameters)
- : createShardingConditionsWithInsertSelect(sqlStatementContext, parameters);
+ ? createShardingConditionsWithInsertValues(sqlStatementContext, params)
+ : createShardingConditionsWithInsertSelect(sqlStatementContext, params);
appendGeneratedKeyConditions(sqlStatementContext, result);
return result;
}
- private List<ShardingCondition> createShardingConditionsWithInsertValues(final InsertStatementContext sqlStatementContext, final List<Object> parameters) {
+ private List<ShardingCondition> createShardingConditionsWithInsertValues(final InsertStatementContext sqlStatementContext, final List<Object> params) {
String tableName = sqlStatementContext.getSqlStatement().getTable().getTableName().getIdentifier().getValue();
Collection<String> columnNames = getColumnNames(sqlStatementContext);
List<InsertValueContext> insertValueContexts = sqlStatementContext.getInsertValueContexts();
List<ShardingCondition> result = new ArrayList<>(insertValueContexts.size());
int rowNumber = 0;
for (InsertValueContext each : insertValueContexts) {
- result.add(createShardingCondition(tableName, columnNames.iterator(), each, parameters, ++rowNumber));
+ result.add(createShardingCondition(tableName, columnNames.iterator(), each, params, ++rowNumber));
}
return result;
}
@@ -91,7 +91,7 @@ public final class InsertClauseShardingConditionEngine implements ShardingCondit
}
private ShardingCondition createShardingCondition(final String tableName, final Iterator<String> columnNames,
- final InsertValueContext insertValueContext, final List<Object> parameters, final int rowNumber) {
+ final InsertValueContext insertValueContext, final List<Object> params, final int rowNumber) {
ShardingCondition result = new ShardingCondition();
DatetimeService datetimeService = null;
for (ExpressionSegment each : insertValueContext.getValueExpressions()) {
@@ -106,7 +106,7 @@ public final class InsertClauseShardingConditionEngine implements ShardingCondit
List<Integer> parameterMarkerIndexes = each instanceof ParameterMarkerExpressionSegment
? Collections.singletonList(((ParameterMarkerExpressionSegment) each).getParameterMarkerIndex())
: Collections.emptyList();
- result.getValues().add(new ListShardingConditionValue<>(shardingColumn.get(), tableName, Collections.singletonList(getShardingValue((SimpleExpressionSegment) each, parameters)),
+ result.getValues().add(new ListShardingConditionValue<>(shardingColumn.get(), tableName, Collections.singletonList(getShardingValue((SimpleExpressionSegment) each, params)),
parameterMarkerIndexes));
} else if (each instanceof CommonExpressionSegment) {
generateShardingCondition((CommonExpressionSegment) each, result, shardingColumn.get(), tableName);
@@ -122,27 +122,27 @@ public final class InsertClauseShardingConditionEngine implements ShardingCondit
return result;
}
- private void generateShardingCondition(final CommonExpressionSegment expressionSegment, final ShardingCondition result, final String shardingColumn, final String tableName) {
+ private void generateShardingCondition(final CommonExpressionSegment expressionSegment, final ShardingCondition condition, final String shardingColumn, final String tableName) {
try {
Integer value = Integer.valueOf(expressionSegment.getText());
- result.getValues().add(new ListShardingConditionValue<>(shardingColumn, tableName, Collections.singletonList(value)));
+ condition.getValues().add(new ListShardingConditionValue<>(shardingColumn, tableName, Collections.singletonList(value)));
} catch (NumberFormatException ex) {
- result.getValues().add(new ListShardingConditionValue<>(shardingColumn, tableName, Collections.singletonList(expressionSegment.getText())));
+ condition.getValues().add(new ListShardingConditionValue<>(shardingColumn, tableName, Collections.singletonList(expressionSegment.getText())));
}
}
@SuppressWarnings("rawtypes")
- private Comparable<?> getShardingValue(final SimpleExpressionSegment expressionSegment, final List<Object> parameters) {
+ private Comparable<?> getShardingValue(final SimpleExpressionSegment expressionSegment, final List<Object> params) {
Object result = expressionSegment instanceof ParameterMarkerExpressionSegment
- ? parameters.get(((ParameterMarkerExpressionSegment) expressionSegment).getParameterMarkerIndex())
+ ? params.get(((ParameterMarkerExpressionSegment) expressionSegment).getParameterMarkerIndex())
: ((LiteralExpressionSegment) expressionSegment).getLiterals();
Preconditions.checkArgument(result instanceof Comparable, "Sharding value must implements Comparable");
return (Comparable) result;
}
- private List<ShardingCondition> createShardingConditionsWithInsertSelect(final InsertStatementContext sqlStatementContext, final List<Object> parameters) {
+ private List<ShardingCondition> createShardingConditionsWithInsertSelect(final InsertStatementContext sqlStatementContext, final List<Object> params) {
SelectStatementContext selectStatementContext = sqlStatementContext.getInsertSelectContext().getSelectStatementContext();
- return new LinkedList<>(new WhereClauseShardingConditionEngine(shardingRule, database).createShardingConditions(selectStatementContext, parameters));
+ return new LinkedList<>(new WhereClauseShardingConditionEngine(shardingRule, database).createShardingConditions(selectStatementContext, params));
}
private void appendGeneratedKeyConditions(final InsertStatementContext sqlStatementContext, final List<ShardingCondition> shardingConditions) {
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/engine/impl/WhereClauseShardingConditionEngine.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/engine/impl/WhereClauseShardingConditionEngine.java
index bc8803f45ce..3374dbd6f03 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/engine/impl/WhereClauseShardingConditionEngine.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/engine/impl/WhereClauseShardingConditionEngine.java
@@ -66,7 +66,7 @@ public final class WhereClauseShardingConditionEngine implements ShardingConditi
private final ShardingSphereDatabase database;
@Override
- public List<ShardingCondition> createShardingConditions(final SQLStatementContext<?> sqlStatementContext, final List<Object> parameters) {
+ public List<ShardingCondition> createShardingConditions(final SQLStatementContext<?> sqlStatementContext, final List<Object> params) {
if (!(sqlStatementContext instanceof WhereAvailable)) {
return Collections.emptyList();
}
@@ -77,16 +77,16 @@ public final class WhereClauseShardingConditionEngine implements ShardingConditi
Map<String, String> columnExpressionTableNames = sqlStatementContext.getTablesContext().findTableNamesByColumnSegment(columnSegments, schema);
List<ShardingCondition> result = new ArrayList<>();
for (WhereSegment each : ((WhereAvailable) sqlStatementContext).getWhereSegments()) {
- result.addAll(createShardingConditions(each.getExpr(), parameters, columnExpressionTableNames));
+ result.addAll(createShardingConditions(each.getExpr(), params, columnExpressionTableNames));
}
return result;
}
- private Collection<ShardingCondition> createShardingConditions(final ExpressionSegment expression, final List<Object> parameters, final Map<String, String> columnExpressionTableNames) {
+ private Collection<ShardingCondition> createShardingConditions(final ExpressionSegment expression, final List<Object> params, final Map<String, String> columnExpressionTableNames) {
Collection<AndPredicate> andPredicates = ExpressionExtractUtil.getAndPredicates(expression);
Collection<ShardingCondition> result = new LinkedList<>();
for (AndPredicate each : andPredicates) {
- Map<Column, Collection<ShardingConditionValue>> shardingConditionValues = createShardingConditionValueMap(each.getPredicates(), parameters, columnExpressionTableNames);
+ Map<Column, Collection<ShardingConditionValue>> shardingConditionValues = createShardingConditionValueMap(each.getPredicates(), params, columnExpressionTableNames);
if (shardingConditionValues.isEmpty()) {
return Collections.emptyList();
}
@@ -99,7 +99,7 @@ public final class WhereClauseShardingConditionEngine implements ShardingConditi
}
private Map<Column, Collection<ShardingConditionValue>> createShardingConditionValueMap(final Collection<ExpressionSegment> predicates,
- final List<Object> parameters, final Map<String, String> columnTableNames) {
+ final List<Object> params, final Map<String, String> columnTableNames) {
Map<Column, Collection<ShardingConditionValue>> result = new HashMap<>(predicates.size(), 1);
for (ExpressionSegment each : predicates) {
for (ColumnSegment columnSegment : ColumnExtractor.extract(each)) {
@@ -109,7 +109,7 @@ public final class WhereClauseShardingConditionEngine implements ShardingConditi
continue;
}
Column column = new Column(shardingColumn.get(), tableName.get());
- Optional<ShardingConditionValue> shardingConditionValue = ConditionValueGeneratorFactory.generate(each, column, parameters);
+ Optional<ShardingConditionValue> shardingConditionValue = ConditionValueGeneratorFactory.generate(each, column, params);
if (!shardingConditionValue.isPresent()) {
continue;
}
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/generator/ConditionValue.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/generator/ConditionValue.java
index b3a7ff5f3f6..bd7f97e4823 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/generator/ConditionValue.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/generator/ConditionValue.java
@@ -34,14 +34,14 @@ public final class ConditionValue {
private final int parameterMarkerIndex;
- public ConditionValue(final ExpressionSegment expressionSegment, final List<Object> parameters) {
- value = getValue(expressionSegment, parameters);
+ public ConditionValue(final ExpressionSegment expressionSegment, final List<Object> params) {
+ value = getValue(expressionSegment, params);
parameterMarkerIndex = expressionSegment instanceof ParameterMarkerExpressionSegment ? ((ParameterMarkerExpressionSegment) expressionSegment).getParameterMarkerIndex() : -1;
}
- private Comparable<?> getValue(final ExpressionSegment expressionSegment, final List<Object> parameters) {
+ private Comparable<?> getValue(final ExpressionSegment expressionSegment, final List<Object> params) {
if (expressionSegment instanceof ParameterMarkerExpressionSegment) {
- return getValue((ParameterMarkerExpressionSegment) expressionSegment, parameters);
+ return getValue((ParameterMarkerExpressionSegment) expressionSegment, params);
}
if (expressionSegment instanceof LiteralExpressionSegment) {
return getValue((LiteralExpressionSegment) expressionSegment);
@@ -49,10 +49,10 @@ public final class ConditionValue {
return null;
}
- private Comparable<?> getValue(final ParameterMarkerExpressionSegment expressionSegment, final List<Object> parameters) {
+ private Comparable<?> getValue(final ParameterMarkerExpressionSegment expressionSegment, final List<Object> params) {
int parameterMarkerIndex = expressionSegment.getParameterMarkerIndex();
- if (parameterMarkerIndex < parameters.size()) {
- Object result = parameters.get(parameterMarkerIndex);
+ if (parameterMarkerIndex < params.size()) {
+ Object result = params.get(parameterMarkerIndex);
Preconditions.checkArgument(result instanceof Comparable, "Sharding value must implements Comparable.");
return (Comparable<?>) result;
}
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/generator/ConditionValueGenerator.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/generator/ConditionValueGenerator.java
index 5756fde6dc9..4053c78896a 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/generator/ConditionValueGenerator.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/generator/ConditionValueGenerator.java
@@ -36,8 +36,8 @@ public interface ConditionValueGenerator<T extends ExpressionSegment> {
*
* @param predicateRightValue predicate right value
* @param column column
- * @param parameters SQL parameters
+ * @param params SQL parameters
* @return route value
*/
- Optional<ShardingConditionValue> generate(T predicateRightValue, Column column, List<Object> parameters);
+ Optional<ShardingConditionValue> generate(T predicateRightValue, Column column, List<Object> params);
}
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/generator/ConditionValueGeneratorFactory.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/generator/ConditionValueGeneratorFactory.java
index 00ef5baea0e..0503fcbd32b 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/generator/ConditionValueGeneratorFactory.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/generator/ConditionValueGeneratorFactory.java
@@ -49,18 +49,18 @@ public final class ConditionValueGeneratorFactory {
*
* @param predicate predicate right value
* @param column column
- * @param parameters SQL parameters
+ * @param params SQL parameters
* @return route value
*/
- public static Optional<ShardingConditionValue> generate(final ExpressionSegment predicate, final Column column, final List<Object> parameters) {
+ public static Optional<ShardingConditionValue> generate(final ExpressionSegment predicate, final Column column, final List<Object> params) {
if (predicate instanceof BinaryOperationExpression) {
- return COMPARE_OPERATOR_GENERATOR.generate((BinaryOperationExpression) predicate, column, parameters);
+ return COMPARE_OPERATOR_GENERATOR.generate((BinaryOperationExpression) predicate, column, params);
}
if (predicate instanceof InExpression) {
- return IN_OPERATOR_GENERATOR.generate((InExpression) predicate, column, parameters);
+ return IN_OPERATOR_GENERATOR.generate((InExpression) predicate, column, params);
}
if (predicate instanceof BetweenExpression) {
- return BETWEEN_OPERATOR_GENERATOR.generate((BetweenExpression) predicate, column, parameters);
+ return BETWEEN_OPERATOR_GENERATOR.generate((BetweenExpression) predicate, column, params);
}
return Optional.empty();
}
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/generator/impl/ConditionValueBetweenOperatorGenerator.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/generator/impl/ConditionValueBetweenOperatorGenerator.java
index 2a6ad693497..aacae251ab7 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/generator/impl/ConditionValueBetweenOperatorGenerator.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/generator/impl/ConditionValueBetweenOperatorGenerator.java
@@ -39,9 +39,9 @@ import java.util.Optional;
public final class ConditionValueBetweenOperatorGenerator implements ConditionValueGenerator<BetweenExpression> {
@Override
- public Optional<ShardingConditionValue> generate(final BetweenExpression predicate, final Column column, final List<Object> parameters) {
- ConditionValue betweenConditionValue = new ConditionValue(predicate.getBetweenExpr(), parameters);
- ConditionValue andConditionValue = new ConditionValue(predicate.getAndExpr(), parameters);
+ public Optional<ShardingConditionValue> generate(final BetweenExpression predicate, final Column column, final List<Object> params) {
+ ConditionValue betweenConditionValue = new ConditionValue(predicate.getBetweenExpr(), params);
+ ConditionValue andConditionValue = new ConditionValue(predicate.getAndExpr(), params);
Optional<Comparable<?>> betweenValue = betweenConditionValue.getValue();
Optional<Comparable<?>> andValue = andConditionValue.getValue();
List<Integer> parameterMarkerIndexes = new ArrayList<>(2);
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/generator/impl/ConditionValueCompareOperatorGenerator.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/generator/impl/ConditionValueCompareOperatorGenerator.java
index 2182df4e2ed..bf0eb940878 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/generator/impl/ConditionValueCompareOperatorGenerator.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/generator/impl/ConditionValueCompareOperatorGenerator.java
@@ -56,13 +56,13 @@ public final class ConditionValueCompareOperatorGenerator implements ConditionVa
private static final Collection<String> OPERATORS = new HashSet<>(Arrays.asList(EQUAL, GREATER_THAN, LESS_THAN, AT_LEAST, AT_MOST));
@Override
- public Optional<ShardingConditionValue> generate(final BinaryOperationExpression predicate, final Column column, final List<Object> parameters) {
+ public Optional<ShardingConditionValue> generate(final BinaryOperationExpression predicate, final Column column, final List<Object> params) {
String operator = predicate.getOperator();
if (!isSupportedOperator(operator)) {
return Optional.empty();
}
ExpressionSegment valueExpression = predicate.getLeft() instanceof ColumnSegment ? predicate.getRight() : predicate.getLeft();
- ConditionValue conditionValue = new ConditionValue(valueExpression, parameters);
+ ConditionValue conditionValue = new ConditionValue(valueExpression, params);
Optional<Comparable<?>> value = conditionValue.getValue();
if (value.isPresent()) {
return generate(value.get(), column, operator, conditionValue.getParameterMarkerIndex().orElse(-1));
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/generator/impl/ConditionValueInOperatorGenerator.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/generator/impl/ConditionValueInOperatorGenerator.java
index ed4cbc06616..fd33e54601e 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/generator/impl/ConditionValueInOperatorGenerator.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/generator/impl/ConditionValueInOperatorGenerator.java
@@ -39,12 +39,12 @@ import java.util.Optional;
public final class ConditionValueInOperatorGenerator implements ConditionValueGenerator<InExpression> {
@Override
- public Optional<ShardingConditionValue> generate(final InExpression predicate, final Column column, final List<Object> parameters) {
+ public Optional<ShardingConditionValue> generate(final InExpression predicate, final Column column, final List<Object> params) {
List<Comparable<?>> shardingConditionValues = new LinkedList<>();
List<Integer> parameterMarkerIndexes = new ArrayList<>(predicate.getExpressionList().size());
DatetimeService datetimeService = DatetimeServiceFactory.getInstance();
for (ExpressionSegment each : predicate.getExpressionList()) {
- ConditionValue conditionValue = new ConditionValue(each, parameters);
+ ConditionValue conditionValue = new ConditionValue(each, params);
Optional<Comparable<?>> value = conditionValue.getValue();
if (value.isPresent()) {
shardingConditionValues.add(value.get());
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/ShardingStatementValidator.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/ShardingStatementValidator.java
index 29ccab5ea1c..2b6f5afb9cc 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/ShardingStatementValidator.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/ShardingStatementValidator.java
@@ -38,22 +38,22 @@ public interface ShardingStatementValidator<T extends SQLStatement> {
*
* @param shardingRule sharding rule
* @param sqlStatementContext SQL statement context
- * @param parameters SQL parameters
+ * @param params SQL parameters
* @param database database
* @param props props
*/
- void preValidate(ShardingRule shardingRule, SQLStatementContext<T> sqlStatementContext, List<Object> parameters, ShardingSphereDatabase database, ConfigurationProperties props);
+ void preValidate(ShardingRule shardingRule, SQLStatementContext<T> sqlStatementContext, List<Object> params, ShardingSphereDatabase database, ConfigurationProperties props);
/**
* Validate whether sharding operation is supported after route.
*
* @param shardingRule sharding rule
* @param sqlStatementContext SQL statement context
- * @param parameters SQL parameters
+ * @param params SQL parameters
* @param database database
* @param props props
* @param routeContext route context
*/
void postValidate(ShardingRule shardingRule,
- SQLStatementContext<T> sqlStatementContext, List<Object> parameters, ShardingSphereDatabase database, ConfigurationProperties props, RouteContext routeContext);
+ SQLStatementContext<T> sqlStatementContext, List<Object> params, ShardingSphereDatabase database, ConfigurationProperties props, RouteContext routeContext);
}
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/impl/ShardingAlterIndexStatementValidator.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/impl/ShardingAlterIndexStatementValidator.java
index c701e35793f..5693ba3e255 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/impl/ShardingAlterIndexStatementValidator.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/impl/ShardingAlterIndexStatementValidator.java
@@ -41,7 +41,7 @@ public final class ShardingAlterIndexStatementValidator extends ShardingDDLState
@Override
public void preValidate(final ShardingRule shardingRule, final SQLStatementContext<AlterIndexStatement> sqlStatementContext,
- final List<Object> parameters, final ShardingSphereDatabase database, final ConfigurationProperties props) {
+ final List<Object> params, final ShardingSphereDatabase database, final ConfigurationProperties props) {
Optional<IndexSegment> index = sqlStatementContext.getSqlStatement().getIndex();
String defaultSchemaName = DatabaseTypeEngine.getDefaultSchemaName(sqlStatementContext.getDatabaseType(), database.getName());
ShardingSphereSchema schema = index.flatMap(optional -> optional.getOwner()
@@ -56,7 +56,7 @@ public final class ShardingAlterIndexStatementValidator extends ShardingDDLState
}
@Override
- public void postValidate(final ShardingRule shardingRule, final SQLStatementContext<AlterIndexStatement> sqlStatementContext, final List<Object> parameters,
+ public void postValidate(final ShardingRule shardingRule, final SQLStatementContext<AlterIndexStatement> sqlStatementContext, final List<Object> params,
final ShardingSphereDatabase database, final ConfigurationProperties props, final RouteContext routeContext) {
}
}
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/impl/ShardingAlterTableStatementValidator.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/impl/ShardingAlterTableStatementValidator.java
index 1da1778b88b..7659a0f5b29 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/impl/ShardingAlterTableStatementValidator.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/impl/ShardingAlterTableStatementValidator.java
@@ -41,7 +41,7 @@ public final class ShardingAlterTableStatementValidator extends ShardingDDLState
@Override
public void preValidate(final ShardingRule shardingRule, final SQLStatementContext<AlterTableStatement> sqlStatementContext,
- final List<Object> parameters, final ShardingSphereDatabase database, final ConfigurationProperties props) {
+ final List<Object> params, final ShardingSphereDatabase database, final ConfigurationProperties props) {
Collection<String> tableNames = sqlStatementContext instanceof TableAvailable
? ((TableAvailable) sqlStatementContext).getAllTables().stream().map(each -> each.getTableName().getIdentifier().getValue()).collect(Collectors.toList())
: sqlStatementContext.getTablesContext().getTableNames();
@@ -56,7 +56,7 @@ public final class ShardingAlterTableStatementValidator extends ShardingDDLState
}
@Override
- public void postValidate(final ShardingRule shardingRule, final SQLStatementContext<AlterTableStatement> sqlStatementContext, final List<Object> parameters,
+ public void postValidate(final ShardingRule shardingRule, final SQLStatementContext<AlterTableStatement> sqlStatementContext, final List<Object> params,
final ShardingSphereDatabase database, final ConfigurationProperties props, final RouteContext routeContext) {
String primaryTable = sqlStatementContext.getSqlStatement().getTable().getTableName().getIdentifier().getValue();
if (isRouteUnitDataNodeDifferentSize(shardingRule, routeContext, primaryTable)) {
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/impl/ShardingAlterViewStatementValidator.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/impl/ShardingAlterViewStatementValidator.java
index 6047cfa87d3..8a0a117d8e0 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/impl/ShardingAlterViewStatementValidator.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/impl/ShardingAlterViewStatementValidator.java
@@ -41,7 +41,7 @@ public final class ShardingAlterViewStatementValidator extends ShardingDDLStatem
@Override
public void preValidate(final ShardingRule shardingRule, final SQLStatementContext<AlterViewStatement> sqlStatementContext,
- final List<Object> parameters, final ShardingSphereDatabase database, final ConfigurationProperties props) {
+ final List<Object> params, final ShardingSphereDatabase database, final ConfigurationProperties props) {
Optional<SelectStatement> selectStatement = AlterViewStatementHandler.getSelectStatement(sqlStatementContext.getSqlStatement());
if (selectStatement.isPresent()) {
TableExtractor extractor = new TableExtractor();
@@ -68,7 +68,7 @@ public final class ShardingAlterViewStatementValidator extends ShardingDDLStatem
}
@Override
- public void postValidate(final ShardingRule shardingRule, final SQLStatementContext<AlterViewStatement> sqlStatementContext, final List<Object> parameters,
+ public void postValidate(final ShardingRule shardingRule, final SQLStatementContext<AlterViewStatement> sqlStatementContext, final List<Object> params,
final ShardingSphereDatabase database, final ConfigurationProperties props, final RouteContext routeContext) {
}
}
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/impl/ShardingCreateFunctionStatementValidator.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/impl/ShardingCreateFunctionStatementValidator.java
index 1b6ddf5a7a8..4d1df41fe03 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/impl/ShardingCreateFunctionStatementValidator.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/impl/ShardingCreateFunctionStatementValidator.java
@@ -42,7 +42,7 @@ public final class ShardingCreateFunctionStatementValidator extends ShardingDDLS
@Override
public void preValidate(final ShardingRule shardingRule, final SQLStatementContext<CreateFunctionStatement> sqlStatementContext,
- final List<Object> parameters, final ShardingSphereDatabase database, final ConfigurationProperties props) {
+ final List<Object> params, final ShardingSphereDatabase database, final ConfigurationProperties props) {
Optional<RoutineBodySegment> routineBodySegment = CreateFunctionStatementHandler.getRoutineBodySegment(sqlStatementContext.getSqlStatement());
if (!routineBodySegment.isPresent()) {
return;
@@ -58,7 +58,7 @@ public final class ShardingCreateFunctionStatementValidator extends ShardingDDLS
}
@Override
- public void postValidate(final ShardingRule shardingRule, final SQLStatementContext<CreateFunctionStatement> sqlStatementContext, final List<Object> parameters,
+ public void postValidate(final ShardingRule shardingRule, final SQLStatementContext<CreateFunctionStatement> sqlStatementContext, final List<Object> params,
final ShardingSphereDatabase database, final ConfigurationProperties props, final RouteContext routeContext) {
}
}
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/impl/ShardingCreateIndexStatementValidator.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/impl/ShardingCreateIndexStatementValidator.java
index 8941a277e98..984c2b5b3bf 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/impl/ShardingCreateIndexStatementValidator.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/impl/ShardingCreateIndexStatementValidator.java
@@ -40,7 +40,7 @@ public final class ShardingCreateIndexStatementValidator extends ShardingDDLStat
@Override
public void preValidate(final ShardingRule shardingRule, final SQLStatementContext<CreateIndexStatement> sqlStatementContext,
- final List<Object> parameters, final ShardingSphereDatabase database, final ConfigurationProperties props) {
+ final List<Object> params, final ShardingSphereDatabase database, final ConfigurationProperties props) {
if (CreateIndexStatementHandler.ifNotExists(sqlStatementContext.getSqlStatement())) {
return;
}
@@ -56,7 +56,7 @@ public final class ShardingCreateIndexStatementValidator extends ShardingDDLStat
}
@Override
- public void postValidate(final ShardingRule shardingRule, final SQLStatementContext<CreateIndexStatement> sqlStatementContext, final List<Object> parameters,
+ public void postValidate(final ShardingRule shardingRule, final SQLStatementContext<CreateIndexStatement> sqlStatementContext, final List<Object> params,
final ShardingSphereDatabase database, final ConfigurationProperties props, final RouteContext routeContext) {
}
}
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/impl/ShardingCreateProcedureStatementValidator.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/impl/ShardingCreateProcedureStatementValidator.java
index f361a72a420..09c98a66d67 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/impl/ShardingCreateProcedureStatementValidator.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/impl/ShardingCreateProcedureStatementValidator.java
@@ -42,7 +42,7 @@ public final class ShardingCreateProcedureStatementValidator extends ShardingDDL
@Override
public void preValidate(final ShardingRule shardingRule, final SQLStatementContext<CreateProcedureStatement> sqlStatementContext,
- final List<Object> parameters, final ShardingSphereDatabase database, final ConfigurationProperties props) {
+ final List<Object> params, final ShardingSphereDatabase database, final ConfigurationProperties props) {
Optional<RoutineBodySegment> routineBodySegment = CreateProcedureStatementHandler.getRoutineBodySegment(sqlStatementContext.getSqlStatement());
if (!routineBodySegment.isPresent()) {
return;
@@ -59,7 +59,7 @@ public final class ShardingCreateProcedureStatementValidator extends ShardingDDL
}
@Override
- public void postValidate(final ShardingRule shardingRule, final SQLStatementContext<CreateProcedureStatement> sqlStatementContext, final List<Object> parameters,
+ public void postValidate(final ShardingRule shardingRule, final SQLStatementContext<CreateProcedureStatement> sqlStatementContext, final List<Object> params,
final ShardingSphereDatabase database, final ConfigurationProperties props, final RouteContext routeContext) {
}
}
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/impl/ShardingCreateTableStatementValidator.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/impl/ShardingCreateTableStatementValidator.java
index ec34ab5279b..6c2b9d3767b 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/impl/ShardingCreateTableStatementValidator.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/impl/ShardingCreateTableStatementValidator.java
@@ -39,7 +39,7 @@ public final class ShardingCreateTableStatementValidator extends ShardingDDLStat
@Override
public void preValidate(final ShardingRule shardingRule, final SQLStatementContext<CreateTableStatement> sqlStatementContext,
- final List<Object> parameters, final ShardingSphereDatabase database, final ConfigurationProperties props) {
+ final List<Object> params, final ShardingSphereDatabase database, final ConfigurationProperties props) {
if (!CreateTableStatementHandler.ifNotExists(sqlStatementContext.getSqlStatement())) {
String defaultSchemaName = DatabaseTypeEngine.getDefaultSchemaName(sqlStatementContext.getDatabaseType(), database.getName());
ShardingSphereSchema schema = sqlStatementContext.getTablesContext().getSchemaName()
@@ -49,7 +49,7 @@ public final class ShardingCreateTableStatementValidator extends ShardingDDLStat
}
@Override
- public void postValidate(final ShardingRule shardingRule, final SQLStatementContext<CreateTableStatement> sqlStatementContext, final List<Object> parameters,
+ public void postValidate(final ShardingRule shardingRule, final SQLStatementContext<CreateTableStatement> sqlStatementContext, final List<Object> params,
final ShardingSphereDatabase database, final ConfigurationProperties props, final RouteContext routeContext) {
String primaryTable = sqlStatementContext.getSqlStatement().getTable().getTableName().getIdentifier().getValue();
if (isRouteUnitDataNodeDifferentSize(shardingRule, routeContext, primaryTable)) {
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/impl/ShardingCreateViewStatementValidator.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/impl/ShardingCreateViewStatementValidator.java
index f575cc34b98..083b1fc2c67 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/impl/ShardingCreateViewStatementValidator.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/impl/ShardingCreateViewStatementValidator.java
@@ -46,7 +46,7 @@ public final class ShardingCreateViewStatementValidator extends ShardingDDLState
@Override
public void preValidate(final ShardingRule shardingRule, final SQLStatementContext<CreateViewStatement> sqlStatementContext,
- final List<Object> parameters, final ShardingSphereDatabase database, final ConfigurationProperties props) {
+ final List<Object> params, final ShardingSphereDatabase database, final ConfigurationProperties props) {
SelectStatement selectStatement = sqlStatementContext.getSqlStatement().getSelect();
TableExtractor extractor = new TableExtractor();
extractor.extractTablesFromSelect(selectStatement);
@@ -61,7 +61,7 @@ public final class ShardingCreateViewStatementValidator extends ShardingDDLState
}
@Override
- public void postValidate(final ShardingRule shardingRule, final SQLStatementContext<CreateViewStatement> sqlStatementContext, final List<Object> parameters,
+ public void postValidate(final ShardingRule shardingRule, final SQLStatementContext<CreateViewStatement> sqlStatementContext, final List<Object> params,
final ShardingSphereDatabase database, final ConfigurationProperties props, final RouteContext routeContext) {
SelectStatement selectStatement = sqlStatementContext.getSqlStatement().getSelect();
if (isContainsNotSupportedViewStatement(selectStatement, routeContext)) {
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/impl/ShardingDropIndexStatementValidator.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/impl/ShardingDropIndexStatementValidator.java
index b3086454941..62fabe60019 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/impl/ShardingDropIndexStatementValidator.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/impl/ShardingDropIndexStatementValidator.java
@@ -43,7 +43,7 @@ public final class ShardingDropIndexStatementValidator extends ShardingDDLStatem
@Override
public void preValidate(final ShardingRule shardingRule, final SQLStatementContext<DropIndexStatement> sqlStatementContext,
- final List<Object> parameters, final ShardingSphereDatabase database, final ConfigurationProperties props) {
+ final List<Object> params, final ShardingSphereDatabase database, final ConfigurationProperties props) {
if (DropIndexStatementHandler.ifExists(sqlStatementContext.getSqlStatement())) {
return;
}
@@ -58,7 +58,7 @@ public final class ShardingDropIndexStatementValidator extends ShardingDDLStatem
}
@Override
- public void postValidate(final ShardingRule shardingRule, final SQLStatementContext<DropIndexStatement> sqlStatementContext, final List<Object> parameters,
+ public void postValidate(final ShardingRule shardingRule, final SQLStatementContext<DropIndexStatement> sqlStatementContext, final List<Object> params,
final ShardingSphereDatabase database, final ConfigurationProperties props, final RouteContext routeContext) {
Collection<IndexSegment> indexSegments = sqlStatementContext.getSqlStatement().getIndexes();
Optional<String> logicTableName = DropIndexStatementHandler.getSimpleTableSegment(sqlStatementContext.getSqlStatement()).map(optional -> optional.getTableName().getIdentifier().getValue());
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/impl/ShardingDropTableStatementValidator.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/impl/ShardingDropTableStatementValidator.java
index 17014a6aa40..296d0ad3c43 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/impl/ShardingDropTableStatementValidator.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/impl/ShardingDropTableStatementValidator.java
@@ -47,7 +47,7 @@ public final class ShardingDropTableStatementValidator extends ShardingDDLStatem
@Override
public void preValidate(final ShardingRule shardingRule, final SQLStatementContext<DropTableStatement> sqlStatementContext,
- final List<Object> parameters, final ShardingSphereDatabase database, final ConfigurationProperties props) {
+ final List<Object> params, final ShardingSphereDatabase database, final ConfigurationProperties props) {
if (!DropTableStatementHandler.ifExists(sqlStatementContext.getSqlStatement())) {
String defaultSchemaName = DatabaseTypeEngine.getDefaultSchemaName(sqlStatementContext.getDatabaseType(), database.getName());
ShardingSphereSchema schema = sqlStatementContext.getTablesContext().getSchemaName()
@@ -60,7 +60,7 @@ public final class ShardingDropTableStatementValidator extends ShardingDDLStatem
}
@Override
- public void postValidate(final ShardingRule shardingRule, final SQLStatementContext<DropTableStatement> sqlStatementContext, final List<Object> parameters,
+ public void postValidate(final ShardingRule shardingRule, final SQLStatementContext<DropTableStatement> sqlStatementContext, final List<Object> params,
final ShardingSphereDatabase database, final ConfigurationProperties props, final RouteContext routeContext) {
checkTableInUsed(shardingRule, sqlStatementContext.getSqlStatement(), routeContext);
for (SimpleTableSegment each : sqlStatementContext.getSqlStatement().getTables()) {
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/impl/ShardingPrepareStatementValidator.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/impl/ShardingPrepareStatementValidator.java
index 57efd335b5c..d8d3a8f823f 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/impl/ShardingPrepareStatementValidator.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/impl/ShardingPrepareStatementValidator.java
@@ -37,12 +37,12 @@ import java.util.stream.Collectors;
public final class ShardingPrepareStatementValidator extends ShardingDDLStatementValidator<PrepareStatement> {
@Override
- public void preValidate(final ShardingRule shardingRule, final SQLStatementContext<PrepareStatement> sqlStatementContext, final List<Object> parameters, final ShardingSphereDatabase database,
+ public void preValidate(final ShardingRule shardingRule, final SQLStatementContext<PrepareStatement> sqlStatementContext, final List<Object> params, final ShardingSphereDatabase database,
final ConfigurationProperties props) {
}
@Override
- public void postValidate(final ShardingRule shardingRule, final SQLStatementContext<PrepareStatement> sqlStatementContext, final List<Object> parameters,
+ public void postValidate(final ShardingRule shardingRule, final SQLStatementContext<PrepareStatement> sqlStatementContext, final List<Object> params,
final ShardingSphereDatabase database, final ConfigurationProperties props, final RouteContext routeContext) {
if (routeContext.getRouteUnits().isEmpty()) {
throw new EmptyShardingRouteResultException();
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/impl/ShardingRenameTableStatementValidator.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/impl/ShardingRenameTableStatementValidator.java
index 5992bc4f79f..fa450f85811 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/impl/ShardingRenameTableStatementValidator.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/ddl/impl/ShardingRenameTableStatementValidator.java
@@ -40,7 +40,7 @@ import java.util.stream.Collectors;
public final class ShardingRenameTableStatementValidator extends ShardingDDLStatementValidator<RenameTableStatement> {
@Override
- public void preValidate(final ShardingRule shardingRule, final SQLStatementContext<RenameTableStatement> sqlStatementContext, final List<Object> parameters, final ShardingSphereDatabase database,
+ public void preValidate(final ShardingRule shardingRule, final SQLStatementContext<RenameTableStatement> sqlStatementContext, final List<Object> params, final ShardingSphereDatabase database,
final ConfigurationProperties props) {
Collection<String> tableNames = sqlStatementContext instanceof TableAvailable
? ((TableAvailable) sqlStatementContext).getAllTables().stream().map(each -> each.getTableName().getIdentifier().getValue()).collect(Collectors.toList())
@@ -56,7 +56,7 @@ public final class ShardingRenameTableStatementValidator extends ShardingDDLStat
}
@Override
- public void postValidate(final ShardingRule shardingRule, final SQLStatementContext<RenameTableStatement> sqlStatementContext, final List<Object> parameters,
+ public void postValidate(final ShardingRule shardingRule, final SQLStatementContext<RenameTableStatement> sqlStatementContext, final List<Object> params,
final ShardingSphereDatabase database, final ConfigurationProperties props, final RouteContext routeContext) {
for (RenameTableDefinitionSegment each : sqlStatementContext.getSqlStatement().getRenameTables()) {
String primaryTable = each.getTable().getTableName().getIdentifier().getValue();
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/dml/ShardingDMLStatementValidator.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/dml/ShardingDMLStatementValidator.java
index ff53bf2f765..157850a1469 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/dml/ShardingDMLStatementValidator.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/dml/ShardingDMLStatementValidator.java
@@ -112,18 +112,18 @@ public abstract class ShardingDMLStatementValidator<T extends SQLStatement> impl
* @param sqlStatementContext SQL statement context
* @param shardingRule shardingRule
* @param assignments assignments
- * @param parameters parameter collection
+ * @param params parameters
* @return sharding conditions
*/
@SuppressWarnings({"rawtypes", "unchecked"})
protected Optional<ShardingConditions> createShardingConditions(final SQLStatementContext<?> sqlStatementContext, final ShardingRule shardingRule,
- final Collection<AssignmentSegment> assignments, final List<Object> parameters) {
+ final Collection<AssignmentSegment> assignments, final List<Object> params) {
Collection<ShardingConditionValue> values = new LinkedList<>();
String tableName = sqlStatementContext.getTablesContext().getTableNames().iterator().next();
for (AssignmentSegment each : assignments) {
String shardingColumn = each.getColumns().get(0).getIdentifier().getValue();
if (shardingRule.findShardingColumn(shardingColumn, tableName).isPresent()) {
- Optional<Object> assignmentValue = getShardingColumnAssignmentValue(each, parameters);
+ Optional<Object> assignmentValue = getShardingColumnAssignmentValue(each, params);
assignmentValue.ifPresent(optional -> values.add(new ListShardingConditionValue(shardingColumn, tableName, Collections.singletonList(optional))));
}
}
@@ -135,7 +135,7 @@ public abstract class ShardingDMLStatementValidator<T extends SQLStatement> impl
return Optional.of(new ShardingConditions(Collections.singletonList(shardingCondition), sqlStatementContext, shardingRule));
}
- private Optional<Object> getShardingColumnAssignmentValue(final AssignmentSegment assignmentSegment, final List<Object> parameters) {
+ private Optional<Object> getShardingColumnAssignmentValue(final AssignmentSegment assignmentSegment, final List<Object> params) {
ExpressionSegment segment = assignmentSegment.getValue();
int shardingSetAssignIndex = -1;
if (segment instanceof ParameterMarkerExpressionSegment) {
@@ -144,9 +144,9 @@ public abstract class ShardingDMLStatementValidator<T extends SQLStatement> impl
if (segment instanceof LiteralExpressionSegment) {
return Optional.of(((LiteralExpressionSegment) segment).getLiterals());
}
- if (-1 == shardingSetAssignIndex || shardingSetAssignIndex > parameters.size() - 1) {
+ if (-1 == shardingSetAssignIndex || shardingSetAssignIndex > params.size() - 1) {
return Optional.empty();
}
- return Optional.of(parameters.get(shardingSetAssignIndex));
+ return Optional.of(params.get(shardingSetAssignIndex));
}
}
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/dml/impl/ShardingCopyStatementValidator.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/dml/impl/ShardingCopyStatementValidator.java
index 0431a2ef5b2..efdcc13c0e1 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/dml/impl/ShardingCopyStatementValidator.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/dml/impl/ShardingCopyStatementValidator.java
@@ -35,7 +35,7 @@ public final class ShardingCopyStatementValidator extends ShardingDMLStatementVa
@Override
public void preValidate(final ShardingRule shardingRule, final SQLStatementContext<CopyStatement> sqlStatementContext,
- final List<Object> parameters, final ShardingSphereDatabase database, final ConfigurationProperties props) {
+ final List<Object> params, final ShardingSphereDatabase database, final ConfigurationProperties props) {
String tableName = sqlStatementContext.getSqlStatement().getTableSegment().getTableName().getIdentifier().getValue();
if (shardingRule.isShardingTable(tableName)) {
throw new UnsupportedShardingOperationException("COPY", tableName);
@@ -44,6 +44,6 @@ public final class ShardingCopyStatementValidator extends ShardingDMLStatementVa
@Override
public void postValidate(final ShardingRule shardingRule, final SQLStatementContext<CopyStatement> sqlStatementContext,
- final List<Object> parameters, final ShardingSphereDatabase database, final ConfigurationProperties props, final RouteContext routeContext) {
+ final List<Object> params, final ShardingSphereDatabase database, final ConfigurationProperties props, final RouteContext routeContext) {
}
}
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/dml/impl/ShardingDeleteStatementValidator.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/dml/impl/ShardingDeleteStatementValidator.java
index f06ddac7d0d..49a48bb7980 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/dml/impl/ShardingDeleteStatementValidator.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/dml/impl/ShardingDeleteStatementValidator.java
@@ -36,12 +36,12 @@ public final class ShardingDeleteStatementValidator extends ShardingDMLStatement
@Override
public void preValidate(final ShardingRule shardingRule, final SQLStatementContext<DeleteStatement> sqlStatementContext,
- final List<Object> parameters, final ShardingSphereDatabase database, final ConfigurationProperties props) {
+ final List<Object> params, final ShardingSphereDatabase database, final ConfigurationProperties props) {
validateMultipleTable(shardingRule, sqlStatementContext);
}
@Override
- public void postValidate(final ShardingRule shardingRule, final SQLStatementContext<DeleteStatement> sqlStatementContext, final List<Object> parameters,
+ public void postValidate(final ShardingRule shardingRule, final SQLStatementContext<DeleteStatement> sqlStatementContext, final List<Object> params,
final ShardingSphereDatabase database, final ConfigurationProperties props, final RouteContext routeContext) {
if (!shardingRule.isBroadcastTable(sqlStatementContext.getTablesContext().getTableNames().iterator().next())
&& DeleteStatementHandler.getLimitSegment(sqlStatementContext.getSqlStatement()).isPresent() && routeContext.getRouteUnits().size() > 1) {
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/dml/impl/ShardingInsertStatementValidator.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/dml/impl/ShardingInsertStatementValidator.java
index 9cf68815074..950eb5dbdb1 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/dml/impl/ShardingInsertStatementValidator.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/dml/impl/ShardingInsertStatementValidator.java
@@ -54,7 +54,7 @@ public final class ShardingInsertStatementValidator extends ShardingDMLStatement
@Override
public void preValidate(final ShardingRule shardingRule, final SQLStatementContext<InsertStatement> sqlStatementContext,
- final List<Object> parameters, final ShardingSphereDatabase database, final ConfigurationProperties props) {
+ final List<Object> params, final ShardingSphereDatabase database, final ConfigurationProperties props) {
if (null == ((InsertStatementContext) sqlStatementContext).getInsertSelectContext()) {
validateMultipleTable(shardingRule, sqlStatementContext);
}
@@ -84,7 +84,7 @@ public final class ShardingInsertStatementValidator extends ShardingDMLStatement
}
@Override
- public void postValidate(final ShardingRule shardingRule, final SQLStatementContext<InsertStatement> sqlStatementContext, final List<Object> parameters,
+ public void postValidate(final ShardingRule shardingRule, final SQLStatementContext<InsertStatement> sqlStatementContext, final List<Object> params,
final ShardingSphereDatabase database, final ConfigurationProperties props, final RouteContext routeContext) {
Optional<SubquerySegment> insertSelect = sqlStatementContext.getSqlStatement().getInsertSelect();
if (insertSelect.isPresent() && shardingConditions.isNeedMerge()) {
@@ -94,7 +94,7 @@ public final class ShardingInsertStatementValidator extends ShardingDMLStatement
String tableName = sqlStatementContext.getSqlStatement().getTable().getTableName().getIdentifier().getValue();
Collection<AssignmentSegment> assignments = InsertStatementHandler.getOnDuplicateKeyColumnsSegment(sqlStatementContext.getSqlStatement())
.map(OnDuplicateKeyColumnsSegment::getColumns).orElse(Collections.emptyList());
- Optional<ShardingConditions> onDuplicateKeyShardingConditions = createShardingConditions(sqlStatementContext, shardingRule, assignments, parameters);
+ Optional<ShardingConditions> onDuplicateKeyShardingConditions = createShardingConditions(sqlStatementContext, shardingRule, assignments, params);
Optional<RouteContext> onDuplicateKeyRouteContext = onDuplicateKeyShardingConditions.map(optional -> new ShardingStandardRoutingEngine(tableName, optional,
sqlStatementContext, props).route(shardingRule));
if (onDuplicateKeyRouteContext.isPresent() && !isSameRouteContext(routeContext, onDuplicateKeyRouteContext.get())) {
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/dml/impl/ShardingUpdateStatementValidator.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/dml/impl/ShardingUpdateStatementValidator.java
index 834d8f60a82..1381d80c137 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/dml/impl/ShardingUpdateStatementValidator.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/validator/dml/impl/ShardingUpdateStatementValidator.java
@@ -39,17 +39,17 @@ import java.util.Optional;
public final class ShardingUpdateStatementValidator extends ShardingDMLStatementValidator<UpdateStatement> {
@Override
- public void preValidate(final ShardingRule shardingRule, final SQLStatementContext<UpdateStatement> sqlStatementContext, final List<Object> parameters, final ShardingSphereDatabase database,
+ public void preValidate(final ShardingRule shardingRule, final SQLStatementContext<UpdateStatement> sqlStatementContext, final List<Object> params, final ShardingSphereDatabase database,
final ConfigurationProperties props) {
validateMultipleTable(shardingRule, sqlStatementContext);
}
@Override
- public void postValidate(final ShardingRule shardingRule, final SQLStatementContext<UpdateStatement> sqlStatementContext, final List<Object> parameters,
+ public void postValidate(final ShardingRule shardingRule, final SQLStatementContext<UpdateStatement> sqlStatementContext, final List<Object> params,
final ShardingSphereDatabase database, final ConfigurationProperties props, final RouteContext routeContext) {
String tableName = sqlStatementContext.getTablesContext().getTableNames().iterator().next();
Optional<ShardingConditions> shardingConditions = createShardingConditions(sqlStatementContext, shardingRule,
- sqlStatementContext.getSqlStatement().getSetAssignment().getAssignments(), parameters);
+ sqlStatementContext.getSqlStatement().getSetAssignment().getAssignments(), params);
Optional<RouteContext> setAssignmentRouteContext = shardingConditions.map(optional -> new ShardingStandardRoutingEngine(tableName, optional, sqlStatementContext, props).route(shardingRule));
if (setAssignmentRouteContext.isPresent() && !isSameRouteContext(routeContext, setAssignmentRouteContext.get())) {
throw new UnsupportedUpdatingShardingValueException(tableName);
diff --git a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/checker/ShardingAuditCheckerTest.java b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/checker/ShardingAuditCheckerTest.java
index 936b8aa1073..7bea8867795 100644
--- a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/checker/ShardingAuditCheckerTest.java
+++ b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/checker/ShardingAuditCheckerTest.java
@@ -34,8 +34,6 @@ import org.mockito.junit.MockitoJUnitRunner;
import java.util.Collections;
import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.List;
import java.util.Map;
import java.util.Optional;
@@ -61,11 +59,7 @@ public final class ShardingAuditCheckerTest {
@Mock
private ShardingAuditStrategyConfiguration auditStrategy;
- private final ShardingAuditChecker checker = new ShardingAuditChecker();
-
- private final Map<String, ShardingSphereDatabase> databases = new LinkedHashMap<>();
-
- private final List<Object> parameters = Collections.emptyList();
+ private final Map<String, ShardingSphereDatabase> databases = Collections.singletonMap("foo_db", mock(ShardingSphereDatabase.class));
@Before
public void setUp() {
@@ -75,30 +69,30 @@ public final class ShardingAuditCheckerTest {
when(rule.findTableRule("foo_table")).thenReturn(Optional.of(tableRule));
when(rule.getAuditStrategyConfiguration(tableRule)).thenReturn(auditStrategy);
when(auditStrategy.getAuditorNames()).thenReturn(Collections.singleton("auditor_1"));
- databases.put("foo_db", mock(ShardingSphereDatabase.class));
}
@Test
public void assertCheckSQLStatementPass() {
- when(rule.getAuditors().get("auditor_1").check(sqlStatementContext, parameters, grantee, databases.get("foo_db"))).thenReturn(new SQLCheckResult(true, ""));
- assertCheckResult(checker.check(sqlStatementContext, Collections.emptyList(), grantee, "foo_db", databases, rule), true, "");
- verify(rule.getAuditors().get("auditor_1"), times(1)).check(sqlStatementContext, parameters, grantee, databases.get("foo_db"));
+ when(rule.getAuditors().get("auditor_1").check(sqlStatementContext, Collections.emptyList(), grantee, databases.get("foo_db"))).thenReturn(new SQLCheckResult(true, ""));
+ assertCheckResult(new ShardingAuditChecker().check(sqlStatementContext, Collections.emptyList(), grantee, "foo_db", databases, rule), true, "");
+ verify(rule.getAuditors().get("auditor_1"), times(1)).check(sqlStatementContext, Collections.emptyList(), grantee, databases.get("foo_db"));
}
@Test
public void assertSQCheckPassByDisableAuditNames() {
- when(rule.getAuditors().get("auditor_1").check(sqlStatementContext, parameters, grantee, databases.get("foo_db"))).thenReturn(new SQLCheckResult(false, ""));
+ when(rule.getAuditors().get("auditor_1").check(sqlStatementContext, Collections.emptyList(), grantee, databases.get("foo_db"))).thenReturn(new SQLCheckResult(false, ""));
when(auditStrategy.isAllowHintDisable()).thenReturn(true);
- assertCheckResult(checker.check(sqlStatementContext, Collections.emptyList(), grantee, "foo_db", databases, rule), true, "");
- verify(rule.getAuditors().get("auditor_1"), times(0)).check(sqlStatementContext, parameters, grantee, databases.get("foo_db"));
+ assertCheckResult(new ShardingAuditChecker().check(sqlStatementContext, Collections.emptyList(), grantee, "foo_db", databases, rule), true, "");
+ verify(rule.getAuditors().get("auditor_1"), times(0)).check(sqlStatementContext, Collections.emptyList(), grantee, databases.get("foo_db"));
}
@Test
public void assertSQLCheckNotPass() {
- when(rule.getAuditors().get("auditor_1").check(sqlStatementContext, parameters, grantee, databases.get("foo_db")))
+ when(rule.getAuditors().get("auditor_1").check(sqlStatementContext, Collections.emptyList(), grantee, databases.get("foo_db")))
.thenReturn(new SQLCheckResult(false, "Not allow DML operation without sharding conditions"));
- assertCheckResult(checker.check(sqlStatementContext, Collections.emptyList(), grantee, "foo_db", databases, rule), false, "Not allow DML operation without sharding conditions");
- verify(rule.getAuditors().get("auditor_1"), times(1)).check(sqlStatementContext, parameters, grantee, databases.get("foo_db"));
+ assertCheckResult(new ShardingAuditChecker().check(
+ sqlStatementContext, Collections.emptyList(), grantee, "foo_db", databases, rule), false, "Not allow DML operation without sharding conditions");
+ verify(rule.getAuditors().get("auditor_1"), times(1)).check(sqlStatementContext, Collections.emptyList(), grantee, databases.get("foo_db"));
}
private void assertCheckResult(final SQLCheckResult checkResult, final boolean isPassed, final String errorMessage) {
diff --git a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/context/ShardingSQLRewriteContextDecoratorTest.java b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/context/ShardingSQLRewriteContextDecoratorTest.java
index 30908a5ad82..509f7a33eb7 100644
--- a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/context/ShardingSQLRewriteContextDecoratorTest.java
+++ b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/context/ShardingSQLRewriteContextDecoratorTest.java
@@ -23,8 +23,7 @@ import org.apache.shardingsphere.infra.route.context.RouteContext;
import org.apache.shardingsphere.sharding.rule.ShardingRule;
import org.junit.Test;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.Collections;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
@@ -34,13 +33,9 @@ public final class ShardingSQLRewriteContextDecoratorTest {
@Test
public void assertDecorate() {
- List<Object> parameters = new ArrayList<>();
- parameters.add(new Object());
- ShardingSQLRewriteContextDecorator decorator = new ShardingSQLRewriteContextDecorator();
SQLRewriteContext sqlRewriteContext = mock(SQLRewriteContext.class);
- when(sqlRewriteContext.getParameters()).thenReturn(parameters);
- RouteContext routeContext = mock(RouteContext.class);
- decorator.decorate(mock(ShardingRule.class), mock(ConfigurationProperties.class), sqlRewriteContext, routeContext);
+ when(sqlRewriteContext.getParameters()).thenReturn(Collections.singletonList(new Object()));
+ new ShardingSQLRewriteContextDecorator().decorate(mock(ShardingRule.class), mock(ConfigurationProperties.class), sqlRewriteContext, mock(RouteContext.class));
assertTrue(sqlRewriteContext.getSqlTokens().isEmpty());
}
}
diff --git a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameter/ShardingGeneratedKeyInsertValueParameterRewriterTest.java b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameter/ShardingGeneratedKeyInsertValueParameterRewriterTest.java
index 749b6f1783b..745ab89e2b5 100644
--- a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameter/ShardingGeneratedKeyInsertValueParameterRewriterTest.java
+++ b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameter/ShardingGeneratedKeyInsertValueParameterRewriterTest.java
@@ -50,41 +50,40 @@ public final class ShardingGeneratedKeyInsertValueParameterRewriterTest {
@Test
public void assertIsNeedRewrite() {
- ShardingGeneratedKeyInsertValueParameterRewriter shardingGeneratedKeyInsertValueParameterRewriter = new ShardingGeneratedKeyInsertValueParameterRewriter();
+ ShardingGeneratedKeyInsertValueParameterRewriter paramRewriter = new ShardingGeneratedKeyInsertValueParameterRewriter();
SelectStatementContext selectStatementContext = mock(SelectStatementContext.class);
- assertFalse(shardingGeneratedKeyInsertValueParameterRewriter.isNeedRewrite(selectStatementContext));
+ assertFalse(paramRewriter.isNeedRewrite(selectStatementContext));
InsertStatementContext insertStatementContext = mock(InsertStatementContext.class, RETURNS_DEEP_STUBS);
- assertFalse(shardingGeneratedKeyInsertValueParameterRewriter.isNeedRewrite(insertStatementContext));
+ assertFalse(paramRewriter.isNeedRewrite(insertStatementContext));
when(insertStatementContext.getGeneratedKeyContext().isPresent()).thenReturn(Boolean.TRUE);
- assertFalse(shardingGeneratedKeyInsertValueParameterRewriter.isNeedRewrite(insertStatementContext));
+ assertFalse(paramRewriter.isNeedRewrite(insertStatementContext));
when(insertStatementContext.getGeneratedKeyContext().get().isGenerated()).thenReturn(Boolean.TRUE);
when(insertStatementContext.getGeneratedKeyContext().get().getGeneratedValues().isEmpty()).thenReturn(Boolean.TRUE);
- assertFalse(shardingGeneratedKeyInsertValueParameterRewriter.isNeedRewrite(insertStatementContext));
+ assertFalse(paramRewriter.isNeedRewrite(insertStatementContext));
when(insertStatementContext.getGeneratedKeyContext().get().getGeneratedValues().isEmpty()).thenReturn(Boolean.FALSE);
- assertTrue(shardingGeneratedKeyInsertValueParameterRewriter.isNeedRewrite(insertStatementContext));
+ assertTrue(paramRewriter.isNeedRewrite(insertStatementContext));
}
@Test
public void assertRewrite() {
InsertStatementContext insertStatementContext = getInsertStatementContext();
- ParameterBuilder groupedParameterBuilder = getParameterBuilder();
+ ParameterBuilder groupedParamBuilder = getParameterBuilder();
ShardingGeneratedKeyInsertValueParameterRewriter shardingGeneratedKeyInsertValueParameterRewriter = new ShardingGeneratedKeyInsertValueParameterRewriter();
- shardingGeneratedKeyInsertValueParameterRewriter.rewrite(groupedParameterBuilder, insertStatementContext, null);
- assertThat(((GroupedParameterBuilder) groupedParameterBuilder).getParameterBuilders().get(0).getAddedIndexAndParameters().get(TEST_PARAMETER_COUNT), hasItem(TEST_GENERATED_VALUE));
+ shardingGeneratedKeyInsertValueParameterRewriter.rewrite(groupedParamBuilder, insertStatementContext, null);
+ assertThat(((GroupedParameterBuilder) groupedParamBuilder).getParameterBuilders().get(0).getAddedIndexAndParameters().get(TEST_PARAMETER_COUNT), hasItem(TEST_GENERATED_VALUE));
}
private ParameterBuilder getParameterBuilder() {
- StandardParameterBuilder standardParameterBuilder = mock(StandardParameterBuilder.class);
- Map<Integer, Collection<Object>> addedIndexAndParameters = new HashMap<>();
- when(standardParameterBuilder.getAddedIndexAndParameters()).thenReturn(addedIndexAndParameters);
+ StandardParameterBuilder standardParamBuilder = mock(StandardParameterBuilder.class);
+ Map<Integer, Collection<Object>> addedIndexAndParams = new HashMap<>();
+ when(standardParamBuilder.getAddedIndexAndParameters()).thenReturn(addedIndexAndParams);
doAnswer((Answer<Void>) invocation -> {
int index = invocation.getArgument(0);
- Collection<Object> parameters = invocation.getArgument(1);
- addedIndexAndParameters.put(index, parameters);
+ addedIndexAndParams.put(index, invocation.getArgument(1));
return null;
- }).when(standardParameterBuilder).addAddedParameters(anyInt(), anyCollection());
+ }).when(standardParamBuilder).addAddedParameters(anyInt(), anyCollection());
GroupedParameterBuilder result = mock(GroupedParameterBuilder.class);
- when(result.getParameterBuilders()).thenReturn(Collections.singletonList(standardParameterBuilder));
+ when(result.getParameterBuilders()).thenReturn(Collections.singletonList(standardParamBuilder));
return result;
}
diff --git a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/GeneratedKeyAssignmentTokenGeneratorTest.java b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/GeneratedKeyAssignmentTokenGeneratorTest.java
index 222d9dc9cb9..41fcbe30e67 100644
--- a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/GeneratedKeyAssignmentTokenGeneratorTest.java
+++ b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/GeneratedKeyAssignmentTokenGeneratorTest.java
@@ -27,35 +27,39 @@ import org.apache.shardingsphere.sql.parser.sql.dialect.statement.mysql.dml.MySQ
import org.junit.Test;
import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
import java.util.Optional;
import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
public final class GeneratedKeyAssignmentTokenGeneratorTest {
@Test
- public void assertGenerateSQLToken() {
- GeneratedKeyContext generatedKeyContext = mock(GeneratedKeyContext.class, RETURNS_DEEP_STUBS);
- when(generatedKeyContext.getColumnName()).thenReturn("testColumnName");
- when(generatedKeyContext.getGeneratedValues()).thenReturn(Collections.singleton(4));
- InsertStatementContext insertStatementContext = mock(InsertStatementContext.class);
- when(insertStatementContext.getGeneratedKeyContext()).thenReturn(Optional.of(generatedKeyContext));
- MySQLInsertStatement insertStatement = mock(MySQLInsertStatement.class);
- when(insertStatementContext.getSqlStatement()).thenReturn(insertStatement);
- SetAssignmentSegment setAssignmentSegment = mock(SetAssignmentSegment.class);
- when(setAssignmentSegment.getStopIndex()).thenReturn(2);
- when(insertStatement.getSetAssignment()).thenReturn(Optional.of(setAssignmentSegment));
- List<Object> testParameters = new LinkedList<>();
+ public void assertGenerateSQLTokenWithLiteralValue() {
+ InsertStatementContext insertStatementContext = mockInsertStatementContext();
GeneratedKeyAssignmentTokenGenerator generator = new GeneratedKeyAssignmentTokenGenerator();
- generator.setParameters(testParameters);
+ generator.setParameters(Collections.emptyList());
assertThat(generator.generateSQLToken(insertStatementContext), instanceOf(LiteralGeneratedKeyAssignmentToken.class));
- testParameters.add("testObject");
+ }
+
+ @Test
+ public void assertGenerateSQLTokenWithPlaceholder() {
+ InsertStatementContext insertStatementContext = mockInsertStatementContext();
+ GeneratedKeyAssignmentTokenGenerator generator = new GeneratedKeyAssignmentTokenGenerator();
+ generator.setParameters(Collections.singletonList("testObject"));
assertThat(generator.generateSQLToken(insertStatementContext), instanceOf(ParameterMarkerGeneratedKeyAssignmentToken.class));
}
+
+ private InsertStatementContext mockInsertStatementContext() {
+ InsertStatementContext result = mock(InsertStatementContext.class);
+ GeneratedKeyContext generatedKeyContext = new GeneratedKeyContext("testColumnName", false);
+ generatedKeyContext.getGeneratedValues().add(4);
+ when(result.getGeneratedKeyContext()).thenReturn(Optional.of(generatedKeyContext));
+ MySQLInsertStatement insertStatement = new MySQLInsertStatement();
+ insertStatement.setSetAssignment(new SetAssignmentSegment(0, 2, Collections.emptyList()));
+ when(result.getSqlStatement()).thenReturn(insertStatement);
+ return result;
+ }
}
diff --git a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/standard/AbstractSQLRouteTest.java b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/standard/AbstractSQLRouteTest.java
index 72be45160e0..f34882863f6 100644
--- a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/standard/AbstractSQLRouteTest.java
+++ b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/standard/AbstractSQLRouteTest.java
@@ -53,7 +53,7 @@ import static org.mockito.Mockito.when;
public abstract class AbstractSQLRouteTest extends AbstractRoutingEngineTest {
- protected final RouteContext assertRoute(final String sql, final List<Object> parameters) {
+ protected final RouteContext assertRoute(final String sql, final List<Object> params) {
ShardingRule shardingRule = createAllShardingRule();
SingleTableRule singleTableRule = createSingleTableRule(Collections.singletonList(shardingRule));
Map<String, ShardingSphereSchema> schemas = buildSchemas();
@@ -65,8 +65,8 @@ public abstract class AbstractSQLRouteTest extends AbstractRoutingEngineTest {
when(resourceMetaData.getStorageTypes()).thenReturn(Collections.singletonMap("ds_0", new MySQLDatabaseType()));
ShardingSphereDatabase database = new ShardingSphereDatabase(DefaultDatabase.LOGIC_NAME, DatabaseTypeFactory.getInstance("MySQL"), resourceMetaData, ruleMetaData, schemas);
Map<String, ShardingSphereDatabase> databases = Collections.singletonMap(DefaultDatabase.LOGIC_NAME, database);
- SQLStatementContext<?> sqlStatementContext = SQLStatementContextFactory.newInstance(databases, parameters, sqlStatementParserEngine.parse(sql, false), DefaultDatabase.LOGIC_NAME);
- QueryContext queryContext = new QueryContext(sqlStatementContext, sql, parameters);
+ SQLStatementContext<?> sqlStatementContext = SQLStatementContextFactory.newInstance(databases, params, sqlStatementParserEngine.parse(sql, false), DefaultDatabase.LOGIC_NAME);
+ QueryContext queryContext = new QueryContext(sqlStatementContext, sql, params);
return new SQLRouteEngine(Arrays.asList(shardingRule, singleTableRule), props).route(new ConnectionContext(), queryContext, database);
}
diff --git a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/standard/SQLRouteTest.java b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/standard/SQLRouteTest.java
index 828f7cee225..ded4a4e85d2 100644
--- a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/standard/SQLRouteTest.java
+++ b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/standard/SQLRouteTest.java
@@ -19,50 +19,38 @@ package org.apache.shardingsphere.sharding.route.engine.type.standard;
import org.junit.Test;
-import java.util.LinkedList;
-import java.util.List;
+import java.util.Arrays;
+import java.util.Collections;
public final class SQLRouteTest extends AbstractSQLRouteTest {
@Test
public void assertNoTableUnicastRandomDataSource() {
String sql = "SELECT id,name ";
- List<Object> parameters = new LinkedList<>();
- parameters.add(1);
- assertRoute(sql, parameters);
+ assertRoute(sql, Collections.singletonList(1));
}
@Test
public void assertWithBroadcastTable() {
String sql = "SELECT id,name from t_order_item a join t_product b on a.product_id = b.product_id where user_id = ?";
- List<Object> parameters = new LinkedList<>();
- parameters.add(1);
- assertRoute(sql, parameters);
+ assertRoute(sql, Collections.singletonList(1));
}
@Test
public void assertAllBindingWithBroadcastTable() {
String sql = "SELECT id,name from t_order a join t_order_item b on a.order_id = b.order_id join t_product c on b.product_id = c.product_id where a.user_id = ?";
- List<Object> parameters = new LinkedList<>();
- parameters.add(1);
- assertRoute(sql, parameters);
+ assertRoute(sql, Collections.singletonList(1));
}
@Test
public void assertComplexTableWithBroadcastTable() {
String sql = "SELECT id,name from t_order a join t_user b on a.user_id = b.user_id join t_product c on a.product_id = c.product_id where a.user_id = ? and b.user_id =?";
- List<Object> parameters = new LinkedList<>();
- parameters.add(1);
- parameters.add(1);
- assertRoute(sql, parameters);
+ assertRoute(sql, Arrays.asList(1, 1));
}
@Test
public void assertInsertTable() {
String sql = "INSERT INTO t_order (order_id, user_id) VALUES (?, ?)";
- List<Object> parameters = new LinkedList<>();
- parameters.add(1);
- parameters.add(1);
- assertRoute(sql, parameters);
+ assertRoute(sql, Arrays.asList(1, 1));
}
}
diff --git a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/standard/SubqueryRouteTest.java b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/standard/SubqueryRouteTest.java
index e15de6c1b79..e610427fdae 100644
--- a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/standard/SubqueryRouteTest.java
+++ b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/standard/SubqueryRouteTest.java
@@ -20,133 +20,89 @@ package org.apache.shardingsphere.sharding.route.engine.type.standard;
import org.apache.shardingsphere.infra.hint.HintManager;
import org.junit.Test;
-import java.util.LinkedList;
-import java.util.List;
+import java.util.Arrays;
+import java.util.Collections;
public final class SubqueryRouteTest extends AbstractSQLRouteTest {
@Test
public void assertOneTableDifferentConditionWithFederation() {
String sql = "select (select max(id) from t_order b where b.user_id =? ) from t_order a where user_id = ? ";
- List<Object> parameters = new LinkedList<>();
- parameters.add(3);
- parameters.add(2);
- assertRoute(sql, parameters);
+ assertRoute(sql, Arrays.asList(3, 2));
}
@Test
public void assertOneTableSameConditionWithFederation() {
String sql = "select (select max(id) from t_order b where b.user_id = ? and b.user_id = a.user_id) from t_order a where user_id = ? ";
- List<Object> parameters = new LinkedList<>();
- parameters.add(1);
- parameters.add(1);
- assertRoute(sql, parameters);
+ assertRoute(sql, Arrays.asList(1, 1));
}
@Test
public void assertBindingTableWithFederation() {
String sql = "select (select max(id) from t_order_item b where b.user_id = ?) from t_order a where user_id = ? ";
- List<Object> parameters = new LinkedList<>();
- parameters.add(1);
- parameters.add(1);
- assertRoute(sql, parameters);
+ assertRoute(sql, Arrays.asList(1, 1));
}
@Test
public void assertNotShardingTable() {
String sql = "select (select max(id) from t_category b where b.id = ?) from t_category a where id = ? ";
- List<Object> parameters = new LinkedList<>();
- parameters.add(1);
- parameters.add(1);
- assertRoute(sql, parameters);
+ assertRoute(sql, Arrays.asList(1, 1));
}
@Test
public void assertBindingTableWithDifferentValueWithFederation() {
String sql = "select (select max(id) from t_order_item b where b.user_id = ? ) from t_order a where user_id = ? ";
- List<Object> parameters = new LinkedList<>();
- parameters.add(2);
- parameters.add(3);
- assertRoute(sql, parameters);
+ assertRoute(sql, Arrays.asList(2, 3));
}
@Test
public void assertTwoTableWithDifferentOperatorWithFederation() {
- List<Object> parameters = new LinkedList<>();
- parameters.add(1);
- parameters.add(2);
- parameters.add(1);
String sql = "select (select max(id) from t_order_item b where b.user_id in(?,?)) from t_order a where user_id = ? ";
- assertRoute(sql, parameters);
+ assertRoute(sql, Arrays.asList(1, 2, 1));
}
@Test
public void assertTwoTableWithInWithFederation() {
- List<Object> parameters = new LinkedList<>();
- parameters.add(1);
- parameters.add(2);
- parameters.add(1);
- parameters.add(3);
String sql = "select (select max(id) from t_order_item b where b.user_id in(?,?)) from t_order a where user_id in(?,?) ";
- assertRoute(sql, parameters);
+ assertRoute(sql, Arrays.asList(1, 2, 1, 3));
}
@Test
public void assertSubqueryInSubqueryError() {
- List<Object> parameters = new LinkedList<>();
- parameters.add(11);
- parameters.add(2);
- parameters.add(1);
- parameters.add(1);
String sql = "select (select status from t_order b where b.user_id =? and status = (select status from t_order b where b.user_id =?)) as c from t_order a "
+ "where status = (select status from t_order b where b.user_id =? and status = (select status from t_order b where b.user_id =?))";
- assertRoute(sql, parameters);
+ assertRoute(sql, Arrays.asList(11, 2, 1, 1));
}
@Test
public void assertSubqueryInSubquery() {
- List<Object> parameters = new LinkedList<>();
- parameters.add(1);
- parameters.add(1);
- parameters.add(1);
- parameters.add(1);
String sql = "select (select status from t_order b where b.user_id =? and status = (select status from t_order b where b.user_id =?)) as c from t_order a "
+ "where status = (select status from t_order b where b.user_id =? and status = (select status from t_order b where b.user_id =?))";
- assertRoute(sql, parameters);
+ assertRoute(sql, Arrays.asList(1, 1, 1, 1));
}
@Test
public void assertSubqueryInFromError() {
String sql = "select status from t_order b join (select user_id,status from t_order b where b.user_id =?) c on b.user_id = c.user_id where b.user_id =? ";
- List<Object> parameters = new LinkedList<>();
- parameters.add(11);
- parameters.add(1);
- assertRoute(sql, parameters);
+ assertRoute(sql, Arrays.asList(11, 1));
}
@Test
public void assertSubqueryInFrom() {
String sql = "select status from t_order b join (select user_id,status from t_order b where b.user_id =?) c on b.user_id = c.user_id where b.user_id =? ";
- List<Object> parameters = new LinkedList<>();
- parameters.add(1);
- parameters.add(1);
- assertRoute(sql, parameters);
+ assertRoute(sql, Arrays.asList(1, 1));
}
@Test
public void assertSubqueryForAggregation() {
String sql = "select count(*) from t_order where user_id = (select user_id from t_order where user_id =?) ";
- List<Object> parameters = new LinkedList<>();
- parameters.add(1);
- assertRoute(sql, parameters);
+ assertRoute(sql, Collections.singletonList(1));
}
@Test
public void assertSubqueryForBinding() {
String sql = "select count(*) from t_order where user_id = (select user_id from t_order_item where user_id =?) ";
- List<Object> parameters = new LinkedList<>();
- parameters.add(1);
- assertRoute(sql, parameters);
+ assertRoute(sql, Collections.singletonList(1));
}
@Test
@@ -154,20 +110,14 @@ public final class SubqueryRouteTest extends AbstractSQLRouteTest {
HintManager hintManager = HintManager.getInstance();
hintManager.addDatabaseShardingValue("t_hint_test", 1);
hintManager.addTableShardingValue("t_hint_test", 1);
- List<Object> parameters = new LinkedList<>();
- parameters.add(1);
- parameters.add(3);
- parameters.add(5);
String sql = "select count(*) from t_hint_test where user_id = (select t_hint_test from t_hint_test where user_id in (?,?,?)) ";
- assertRoute(sql, parameters);
+ assertRoute(sql, Arrays.asList(1, 3, 5));
hintManager.close();
}
@Test
public void assertSubqueryWithOneInstance() {
String sql = "select count(*) from t_order where user_id =?";
- List<Object> parameters = new LinkedList<>();
- parameters.add(1);
- assertRoute(sql, parameters);
+ assertRoute(sql, Collections.singletonList(1));
}
}
diff --git a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/validator/dml/ShardingInsertStatementValidatorTest.java b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/validator/dml/ShardingInsertStatementValidatorTest.java
index 8eb2ab6c090..fefc4e4d47f 100644
--- a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/validator/dml/ShardingInsertStatementValidatorTest.java
+++ b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/validator/dml/ShardingInsertStatementValidatorTest.java
@@ -94,10 +94,10 @@ public final class ShardingInsertStatementValidatorTest {
sqlStatementContext, Collections.emptyList(), mock(ShardingSphereDatabase.class, RETURNS_DEEP_STUBS), mock(ConfigurationProperties.class));
}
- private InsertStatementContext createInsertStatementContext(final List<Object> parameters, final InsertStatement insertStatement) {
+ private InsertStatementContext createInsertStatementContext(final List<Object> params, final InsertStatement insertStatement) {
ShardingSphereDatabase database = mock(ShardingSphereDatabase.class, RETURNS_DEEP_STUBS);
when(database.getSchema(DefaultDatabase.LOGIC_NAME)).thenReturn(mock(ShardingSphereSchema.class));
- return new InsertStatementContext(Collections.singletonMap(DefaultDatabase.LOGIC_NAME, database), parameters, insertStatement, DefaultDatabase.LOGIC_NAME);
+ return new InsertStatementContext(Collections.singletonMap(DefaultDatabase.LOGIC_NAME, database), params, insertStatement, DefaultDatabase.LOGIC_NAME);
}
@Test(expected = MissingGenerateKeyColumnWithInsertSelectException.class)
@@ -183,30 +183,30 @@ public final class ShardingInsertStatementValidatorTest {
@Test
public void assertPostValidateWhenNotOnDuplicateKeyUpdateShardingColumn() {
- List<Object> parameters = Collections.singletonList(1);
+ List<Object> params = Collections.singletonList(1);
RouteContext routeContext = mock(RouteContext.class);
when(routeContext.isSingleRouting()).thenReturn(true);
- InsertStatementContext insertStatementContext = createInsertStatementContext(parameters, createInsertStatement());
+ InsertStatementContext insertStatementContext = createInsertStatementContext(params, createInsertStatement());
new ShardingInsertStatementValidator(mock(ShardingConditions.class)).postValidate(shardingRule,
- insertStatementContext, parameters, mock(ShardingSphereDatabase.class, RETURNS_DEEP_STUBS), mock(ConfigurationProperties.class), routeContext);
+ insertStatementContext, params, mock(ShardingSphereDatabase.class, RETURNS_DEEP_STUBS), mock(ConfigurationProperties.class), routeContext);
}
@Test
public void assertPostValidateWhenOnDuplicateKeyUpdateShardingColumnWithSameRouteContext() {
mockShardingRuleForUpdateShardingColumn();
- List<Object> parameters = Collections.singletonList(1);
- InsertStatementContext insertStatementContext = createInsertStatementContext(parameters, createInsertStatement());
+ List<Object> params = Collections.singletonList(1);
+ InsertStatementContext insertStatementContext = createInsertStatementContext(params, createInsertStatement());
new ShardingInsertStatementValidator(mock(ShardingConditions.class)).postValidate(shardingRule,
- insertStatementContext, parameters, mock(ShardingSphereDatabase.class, RETURNS_DEEP_STUBS), mock(ConfigurationProperties.class), createSingleRouteContext());
+ insertStatementContext, params, mock(ShardingSphereDatabase.class, RETURNS_DEEP_STUBS), mock(ConfigurationProperties.class), createSingleRouteContext());
}
@Test(expected = UnsupportedUpdatingShardingValueException.class)
public void assertPostValidateWhenOnDuplicateKeyUpdateShardingColumnWithDifferentRouteContext() {
mockShardingRuleForUpdateShardingColumn();
- List<Object> parameters = Collections.singletonList(1);
- InsertStatementContext insertStatementContext = createInsertStatementContext(parameters, createInsertStatement());
+ List<Object> params = Collections.singletonList(1);
+ InsertStatementContext insertStatementContext = createInsertStatementContext(params, createInsertStatement());
new ShardingInsertStatementValidator(mock(ShardingConditions.class)).postValidate(shardingRule,
- insertStatementContext, parameters, mock(ShardingSphereDatabase.class, RETURNS_DEEP_STUBS), mock(ConfigurationProperties.class), createFullRouteContext());
+ insertStatementContext, params, mock(ShardingSphereDatabase.class, RETURNS_DEEP_STUBS), mock(ConfigurationProperties.class), createFullRouteContext());
}
private void mockShardingRuleForUpdateShardingColumn() {
diff --git a/features/sharding/plugin/cache/src/main/java/org/apache/shardingsphere/sharding/cache/checker/ShardingRouteCacheableChecker.java b/features/sharding/plugin/cache/src/main/java/org/apache/shardingsphere/sharding/cache/checker/ShardingRouteCacheableChecker.java
index 0a0b9465c8c..2b5379a1a5e 100644
--- a/features/sharding/plugin/cache/src/main/java/org/apache/shardingsphere/sharding/cache/checker/ShardingRouteCacheableChecker.java
+++ b/features/sharding/plugin/cache/src/main/java/org/apache/shardingsphere/sharding/cache/checker/ShardingRouteCacheableChecker.java
@@ -95,7 +95,7 @@ public final class ShardingRouteCacheableChecker {
return result;
}
- private ShardingRouteCacheableCheckResult checkSelectCacheable(final SelectStatementContext statementContext, final List<Object> parameters, final ShardingSphereDatabase database) {
+ private ShardingRouteCacheableCheckResult checkSelectCacheable(final SelectStatementContext statementContext, final List<Object> params, final ShardingSphereDatabase database) {
Collection<String> tableNames = new HashSet<>(statementContext.getTablesContext().getTableNames());
if (!shardingRule.isAllShardingTables(tableNames) || shardingRule.isAllBroadcastTables(tableNames)) {
return new ShardingRouteCacheableCheckResult(false, Collections.emptyList());
@@ -104,15 +104,15 @@ public final class ShardingRouteCacheableChecker {
if (1 != tableNames.size() && !shardingRule.isAllBindingTables(tableNames) || containsNonCacheableShardingAlgorithm(tableNames)) {
return new ShardingRouteCacheableCheckResult(false, Collections.emptyList());
}
- List<ShardingCondition> shardingConditions = new WhereClauseShardingConditionEngine(shardingRule, database).createShardingConditions(statementContext, parameters);
+ List<ShardingCondition> shardingConditions = new WhereClauseShardingConditionEngine(shardingRule, database).createShardingConditions(statementContext, params);
return checkShardingConditionsCacheable(shardingConditions);
}
- private ShardingRouteCacheableCheckResult checkUpdateCacheable(final UpdateStatementContext statementContext, final List<Object> parameters, final ShardingSphereDatabase database) {
- return checkUpdateOrDeleteCacheable(statementContext, parameters, database);
+ private ShardingRouteCacheableCheckResult checkUpdateCacheable(final UpdateStatementContext statementContext, final List<Object> params, final ShardingSphereDatabase database) {
+ return checkUpdateOrDeleteCacheable(statementContext, params, database);
}
- private ShardingRouteCacheableCheckResult checkInsertCacheable(final InsertStatementContext statementContext, final List<Object> parameters, final ShardingSphereDatabase database) {
+ private ShardingRouteCacheableCheckResult checkInsertCacheable(final InsertStatementContext statementContext, final List<Object> params, final ShardingSphereDatabase database) {
Collection<String> tableNames = statementContext.getTablesContext().getTableNames();
boolean isShardingTable;
if (1 != tableNames.size() || null != statementContext.getInsertSelectContext() || null != statementContext.getOnDuplicateKeyUpdateValueContext()
@@ -131,22 +131,22 @@ public final class ShardingRouteCacheableChecker {
return new ShardingRouteCacheableCheckResult(false, Collections.emptyList());
}
}
- List<ShardingCondition> shardingConditions = new InsertClauseShardingConditionEngine(shardingRule, database).createShardingConditions(statementContext, parameters);
+ List<ShardingCondition> shardingConditions = new InsertClauseShardingConditionEngine(shardingRule, database).createShardingConditions(statementContext, params);
return checkShardingConditionsCacheable(shardingConditions);
}
- private ShardingRouteCacheableCheckResult checkDeleteCacheable(final DeleteStatementContext statementContext, final List<Object> parameters, final ShardingSphereDatabase database) {
- return checkUpdateOrDeleteCacheable(statementContext, parameters, database);
+ private ShardingRouteCacheableCheckResult checkDeleteCacheable(final DeleteStatementContext statementContext, final List<Object> params, final ShardingSphereDatabase database) {
+ return checkUpdateOrDeleteCacheable(statementContext, params, database);
}
- private ShardingRouteCacheableCheckResult checkUpdateOrDeleteCacheable(final SQLStatementContext<?> statementContext, final List<Object> parameters, final ShardingSphereDatabase database) {
+ private ShardingRouteCacheableCheckResult checkUpdateOrDeleteCacheable(final SQLStatementContext<?> statementContext, final List<Object> params, final ShardingSphereDatabase database) {
Collection<String> tableNames = statementContext.getTablesContext().getTableNames();
boolean isShardingTable;
if (1 != tableNames.size() || (isShardingTable = shardingRule.isAllShardingTables(tableNames)) && containsNonCacheableShardingAlgorithm(tableNames)
|| !isShardingTable && !shardingRule.isAllBroadcastTables(tableNames)) {
return new ShardingRouteCacheableCheckResult(false, Collections.emptyList());
}
- List<ShardingCondition> shardingConditions = new WhereClauseShardingConditionEngine(shardingRule, database).createShardingConditions(statementContext, parameters);
+ List<ShardingCondition> shardingConditions = new WhereClauseShardingConditionEngine(shardingRule, database).createShardingConditions(statementContext, params);
return checkShardingConditionsCacheable(shardingConditions);
}
@@ -218,11 +218,11 @@ public final class ShardingRouteCacheableChecker {
private final List<Object> parameters;
- Key(final ShardingSphereDatabase database, final String sql, final SQLStatementContext<?> sqlStatementContext, final List<Object> parameters) {
+ Key(final ShardingSphereDatabase database, final String sql, final SQLStatementContext<?> sqlStatementContext, final List<Object> params) {
this.database = database;
this.sql = sql;
this.sqlStatementContext = sqlStatementContext;
- this.parameters = new ArrayList<>(parameters);
+ this.parameters = new ArrayList<>(params);
}
}
}
diff --git a/features/sharding/plugin/cache/src/main/java/org/apache/shardingsphere/sharding/cache/route/CachedShardingSQLRouter.java b/features/sharding/plugin/cache/src/main/java/org/apache/shardingsphere/sharding/cache/route/CachedShardingSQLRouter.java
index 25a6e20af74..750443067b6 100644
--- a/features/sharding/plugin/cache/src/main/java/org/apache/shardingsphere/sharding/cache/route/CachedShardingSQLRouter.java
+++ b/features/sharding/plugin/cache/src/main/java/org/apache/shardingsphere/sharding/cache/route/CachedShardingSQLRouter.java
@@ -50,18 +50,18 @@ public final class CachedShardingSQLRouter implements SQLRouter<ShardingCacheRul
if (!cacheableCheckResult.isProbablyCacheable()) {
return new RouteContext();
}
- List<Object> shardingConditionParameters = new ArrayList<>(cacheableCheckResult.getShardingConditionParameterMarkerIndexes().size());
+ List<Object> shardingConditionParams = new ArrayList<>(cacheableCheckResult.getShardingConditionParameterMarkerIndexes().size());
for (int each : cacheableCheckResult.getShardingConditionParameterMarkerIndexes()) {
if (each >= queryContext.getParameters().size()) {
return new RouteContext();
}
- shardingConditionParameters.add(queryContext.getParameters().get(each));
+ shardingConditionParams.add(queryContext.getParameters().get(each));
}
- Optional<RouteContext> cachedRouteContext = rule.getRouteCache().get(new ShardingRouteCacheKey(queryContext.getSql(), shardingConditionParameters))
+ Optional<RouteContext> cachedRouteContext = rule.getRouteCache().get(new ShardingRouteCacheKey(queryContext.getSql(), shardingConditionParams))
.flatMap(ShardingRouteCacheValue::getCachedRouteContext);
RouteContext result = cachedRouteContext.orElseGet(() -> new ShardingSQLRouter().createRouteContext(queryContext, database, rule.getShardingRule(), props, connectionContext));
if (!cachedRouteContext.isPresent() && hitOneShardOnly(result)) {
- rule.getRouteCache().put(new ShardingRouteCacheKey(queryContext.getSql(), shardingConditionParameters), new ShardingRouteCacheValue(result));
+ rule.getRouteCache().put(new ShardingRouteCacheKey(queryContext.getSql(), shardingConditionParams), new ShardingRouteCacheValue(result));
}
return result;
}
diff --git a/features/sharding/plugin/cache/src/test/java/org/apache/shardingsphere/sharding/cache/checker/ShardingRouteCacheableCheckerTest.java b/features/sharding/plugin/cache/src/test/java/org/apache/shardingsphere/sharding/cache/checker/ShardingRouteCacheableCheckerTest.java
index efa565b20e2..a65ae24a171 100644
--- a/features/sharding/plugin/cache/src/test/java/org/apache/shardingsphere/sharding/cache/checker/ShardingRouteCacheableCheckerTest.java
+++ b/features/sharding/plugin/cache/src/test/java/org/apache/shardingsphere/sharding/cache/checker/ShardingRouteCacheableCheckerTest.java
@@ -168,9 +168,9 @@ public final class ShardingRouteCacheableCheckerTest {
new ShardingSphereRuleMetaData(Arrays.asList(shardingRule, shardingCacheRule)), Collections.singletonMap(SCHEMA_NAME, schema));
}
- private QueryContext prepareQueryContext(final ShardingSphereDatabase database, final String sql, final List<Object> parameters) {
- SQLStatementContext<?> sqlStatementContext = SQLStatementContextFactory.newInstance(Collections.singletonMap(DATABASE_NAME, database), parameters, parse(sql), DATABASE_NAME);
- return new QueryContext(sqlStatementContext, sql, parameters);
+ private QueryContext prepareQueryContext(final ShardingSphereDatabase database, final String sql, final List<Object> params) {
+ SQLStatementContext<?> sqlStatementContext = SQLStatementContextFactory.newInstance(Collections.singletonMap(DATABASE_NAME, database), params, parse(sql), DATABASE_NAME);
+ return new QueryContext(sqlStatementContext, sql, params);
}
private SQLStatement parse(final String sql) {
diff --git a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/QueryContext.java b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/QueryContext.java
index 0c83364e172..f3c2f849055 100644
--- a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/QueryContext.java
+++ b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/QueryContext.java
@@ -38,10 +38,10 @@ public final class QueryContext {
private String sqlStatementDatabaseName;
- public QueryContext(final SQLStatementContext<?> sqlStatementContext, final String sql, final List<Object> parameters) {
+ public QueryContext(final SQLStatementContext<?> sqlStatementContext, final String sql, final List<Object> params) {
this.sqlStatementContext = sqlStatementContext;
this.sql = sql;
- this.parameters = parameters;
+ this.parameters = params;
if (sqlStatementContext instanceof TableAvailable) {
((TableAvailable) sqlStatementContext).getTablesContext().getDatabaseName().ifPresent(optional -> sqlStatementDatabaseName = optional);
}
diff --git a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/SQLStatementContextFactory.java b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/SQLStatementContextFactory.java
index 3cfd90aa449..49c4be6cce3 100644
--- a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/SQLStatementContextFactory.java
+++ b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/SQLStatementContextFactory.java
@@ -135,18 +135,18 @@ public final class SQLStatementContextFactory {
* Create SQL statement context.
*
* @param databases databases
- * @param parameters SQL parameters
+ * @param params SQL parameters
* @param sqlStatement SQL statement
* @param defaultDatabaseName default database name
* @return SQL statement context
*/
public static SQLStatementContext<?> newInstance(final Map<String, ShardingSphereDatabase> databases,
- final List<Object> parameters, final SQLStatement sqlStatement, final String defaultDatabaseName) {
+ final List<Object> params, final SQLStatement sqlStatement, final String defaultDatabaseName) {
if (sqlStatement instanceof DMLStatement) {
- return getDMLStatementContext(databases, parameters, (DMLStatement) sqlStatement, defaultDatabaseName);
+ return getDMLStatementContext(databases, params, (DMLStatement) sqlStatement, defaultDatabaseName);
}
if (sqlStatement instanceof DDLStatement) {
- return getDDLStatementContext(databases, parameters, (DDLStatement) sqlStatement, defaultDatabaseName);
+ return getDDLStatementContext(databases, params, (DDLStatement) sqlStatement, defaultDatabaseName);
}
if (sqlStatement instanceof DCLStatement) {
return getDCLStatementContext((DCLStatement) sqlStatement);
@@ -158,9 +158,9 @@ public final class SQLStatementContextFactory {
}
private static SQLStatementContext<?> getDMLStatementContext(final Map<String, ShardingSphereDatabase> databases,
- final List<Object> parameters, final DMLStatement sqlStatement, final String defaultDatabaseName) {
+ final List<Object> params, final DMLStatement sqlStatement, final String defaultDatabaseName) {
if (sqlStatement instanceof SelectStatement) {
- return new SelectStatementContext(databases, parameters, (SelectStatement) sqlStatement, defaultDatabaseName);
+ return new SelectStatementContext(databases, params, (SelectStatement) sqlStatement, defaultDatabaseName);
}
if (sqlStatement instanceof UpdateStatement) {
return new UpdateStatementContext((UpdateStatement) sqlStatement);
@@ -169,7 +169,7 @@ public final class SQLStatementContextFactory {
return new DeleteStatementContext((DeleteStatement) sqlStatement);
}
if (sqlStatement instanceof InsertStatement) {
- return new InsertStatementContext(databases, parameters, (InsertStatement) sqlStatement, defaultDatabaseName);
+ return new InsertStatementContext(databases, params, (InsertStatement) sqlStatement, defaultDatabaseName);
}
if (sqlStatement instanceof CallStatement) {
return new CallStatementContext((CallStatement) sqlStatement);
@@ -183,7 +183,7 @@ public final class SQLStatementContextFactory {
throw new UnsupportedSQLOperationException(String.format("Unsupported SQL statement `%s`", sqlStatement.getClass().getSimpleName()));
}
- private static SQLStatementContext<?> getDDLStatementContext(final Map<String, ShardingSphereDatabase> databases, final List<Object> parameters,
+ private static SQLStatementContext<?> getDDLStatementContext(final Map<String, ShardingSphereDatabase> databases, final List<Object> params,
final DDLStatement sqlStatement, final String defaultDatabaseName) {
if (sqlStatement instanceof CreateSchemaStatement) {
return new CreateSchemaStatementContext((CreateSchemaStatement) sqlStatement);
@@ -234,7 +234,7 @@ public final class SQLStatementContextFactory {
return new CommentStatementContext((CommentStatement) sqlStatement);
}
if (sqlStatement instanceof OpenGaussCursorStatement) {
- return new CursorStatementContext(databases, parameters, (OpenGaussCursorStatement) sqlStatement, defaultDatabaseName);
+ return new CursorStatementContext(databases, params, (OpenGaussCursorStatement) sqlStatement, defaultDatabaseName);
}
if (sqlStatement instanceof CloseStatement) {
return new CloseStatementContext((CloseStatement) sqlStatement);
diff --git a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/aware/ParameterAware.java b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/aware/ParameterAware.java
index 384c8fb2dcf..dbe3251073e 100644
--- a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/aware/ParameterAware.java
+++ b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/aware/ParameterAware.java
@@ -27,7 +27,7 @@ public interface ParameterAware {
/**
* Set up parameters.
*
- * @param parameters parameters
+ * @param params parameters
*/
- void setUpParameters(List<Object> parameters);
+ void setUpParameters(List<Object> params);
}
diff --git a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/segment/insert/keygen/engine/GeneratedKeyContextEngine.java b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/segment/insert/keygen/engine/GeneratedKeyContextEngine.java
index c5c4c58f6c8..d9b4c4175d1 100644
--- a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/segment/insert/keygen/engine/GeneratedKeyContextEngine.java
+++ b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/segment/insert/keygen/engine/GeneratedKeyContextEngine.java
@@ -49,13 +49,13 @@ public final class GeneratedKeyContextEngine {
*
* @param insertColumnNames insert column names
* @param valueExpressions value expressions
- * @param parameters SQL parameters
+ * @param params SQL parameters
* @return generate key context
*/
- public Optional<GeneratedKeyContext> createGenerateKeyContext(final List<String> insertColumnNames, final List<List<ExpressionSegment>> valueExpressions, final List<Object> parameters) {
+ public Optional<GeneratedKeyContext> createGenerateKeyContext(final List<String> insertColumnNames, final List<List<ExpressionSegment>> valueExpressions, final List<Object> params) {
String tableName = insertStatement.getTable().getTableName().getIdentifier().getValue();
return findGenerateKeyColumn(tableName).map(optional -> containsGenerateKey(insertColumnNames, optional)
- ? findGeneratedKey(insertColumnNames, valueExpressions, parameters, optional)
+ ? findGeneratedKey(insertColumnNames, valueExpressions, params, optional)
: new GeneratedKeyContext(optional, true));
}
@@ -91,15 +91,15 @@ public final class GeneratedKeyContextEngine {
}
private GeneratedKeyContext findGeneratedKey(final List<String> insertColumnNames, final List<List<ExpressionSegment>> valueExpressions,
- final List<Object> parameters, final String generateKeyColumnName) {
+ final List<Object> params, final String generateKeyColumnName) {
GeneratedKeyContext result = new GeneratedKeyContext(generateKeyColumnName, false);
for (ExpressionSegment each : findGenerateKeyExpressions(insertColumnNames, valueExpressions, generateKeyColumnName)) {
if (each instanceof ParameterMarkerExpressionSegment) {
- if (parameters.isEmpty()) {
+ if (params.isEmpty()) {
continue;
}
- if (null != parameters.get(((ParameterMarkerExpressionSegment) each).getParameterMarkerIndex())) {
- result.getGeneratedValues().add((Comparable<?>) parameters.get(((ParameterMarkerExpressionSegment) each).getParameterMarkerIndex()));
+ if (null != params.get(((ParameterMarkerExpressionSegment) each).getParameterMarkerIndex())) {
+ result.getGeneratedValues().add((Comparable<?>) params.get(((ParameterMarkerExpressionSegment) each).getParameterMarkerIndex()));
}
} else if (each instanceof LiteralExpressionSegment) {
result.getGeneratedValues().add((Comparable<?>) ((LiteralExpressionSegment) each).getLiterals());
diff --git a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/segment/insert/values/InsertSelectContext.java b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/segment/insert/values/InsertSelectContext.java
index 26cd08754a5..43a19b7ae33 100644
--- a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/segment/insert/values/InsertSelectContext.java
+++ b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/segment/insert/values/InsertSelectContext.java
@@ -38,18 +38,18 @@ public final class InsertSelectContext {
private final SelectStatementContext selectStatementContext;
- public InsertSelectContext(final SelectStatementContext selectStatementContext, final List<Object> parameters, final int parametersOffset) {
+ public InsertSelectContext(final SelectStatementContext selectStatementContext, final List<Object> params, final int parametersOffset) {
parameterCount = selectStatementContext.getSqlStatement().getParameterCount();
this.selectStatementContext = selectStatementContext;
- this.parameters = getParameters(parameters, parametersOffset);
+ this.parameters = getParameters(params, parametersOffset);
}
- private List<Object> getParameters(final List<Object> parameters, final int parametersOffset) {
- if (parameters.isEmpty() || 0 == parameterCount) {
+ private List<Object> getParameters(final List<Object> params, final int parametersOffset) {
+ if (params.isEmpty() || 0 == parameterCount) {
return Collections.emptyList();
}
List<Object> result = new ArrayList<>(parameterCount);
- result.addAll(parameters.subList(parametersOffset, parametersOffset + parameterCount));
+ result.addAll(params.subList(parametersOffset, parametersOffset + parameterCount));
return result;
}
}
diff --git a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/segment/insert/values/InsertValueContext.java b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/segment/insert/values/InsertValueContext.java
index 85fc76f79f6..3bf7ad811c1 100644
--- a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/segment/insert/values/InsertValueContext.java
+++ b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/segment/insert/values/InsertValueContext.java
@@ -46,11 +46,11 @@ public final class InsertValueContext {
private final List<Object> parameters;
- public InsertValueContext(final Collection<ExpressionSegment> assignments, final List<Object> parameters, final int parametersOffset) {
+ public InsertValueContext(final Collection<ExpressionSegment> assignments, final List<Object> params, final int parametersOffset) {
valueExpressions = getValueExpressions(assignments);
parameterMarkerExpressions = ExpressionExtractUtil.getParameterMarkerExpressions(assignments);
parameterCount = parameterMarkerExpressions.size();
- this.parameters = getParameters(parameters, parametersOffset);
+ this.parameters = getParameters(params, parametersOffset);
}
private List<ExpressionSegment> getValueExpressions(final Collection<ExpressionSegment> assignments) {
@@ -59,12 +59,12 @@ public final class InsertValueContext {
return result;
}
- private List<Object> getParameters(final List<Object> parameters, final int parametersOffset) {
- if (parameters.isEmpty() || 0 == parameterCount) {
+ private List<Object> getParameters(final List<Object> params, final int paramsOffset) {
+ if (params.isEmpty() || 0 == parameterCount) {
return Collections.emptyList();
}
List<Object> result = new ArrayList<>(parameterCount);
- result.addAll(parameters.subList(parametersOffset, parametersOffset + parameterCount));
+ result.addAll(params.subList(paramsOffset, paramsOffset + parameterCount));
return result;
}
@@ -85,8 +85,8 @@ public final class InsertValueContext {
return Optional.empty();
}
- private int getParameterIndex(final ParameterMarkerExpressionSegment parameterMarkerExpression) {
- int parameterIndex = parameterMarkerExpressions.indexOf(parameterMarkerExpression);
+ private int getParameterIndex(final ParameterMarkerExpressionSegment paramMarkerExpression) {
+ int parameterIndex = parameterMarkerExpressions.indexOf(paramMarkerExpression);
Preconditions.checkArgument(parameterIndex >= 0, "Can not get parameter index.");
return parameterIndex;
}
diff --git a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/segment/insert/values/OnDuplicateUpdateContext.java b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/segment/insert/values/OnDuplicateUpdateContext.java
index 939dbd51274..d8df607551b 100644
--- a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/segment/insert/values/OnDuplicateUpdateContext.java
+++ b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/segment/insert/values/OnDuplicateUpdateContext.java
@@ -48,12 +48,12 @@ public final class OnDuplicateUpdateContext {
private final List<ColumnSegment> columns;
- public OnDuplicateUpdateContext(final Collection<AssignmentSegment> assignments, final List<Object> parameters, final int parametersOffset) {
+ public OnDuplicateUpdateContext(final Collection<AssignmentSegment> assignments, final List<Object> params, final int parametersOffset) {
List<ExpressionSegment> expressionSegments = assignments.stream().map(AssignmentSegment::getValue).collect(Collectors.toList());
valueExpressions = getValueExpressions(expressionSegments);
parameterMarkerExpressions = ExpressionExtractUtil.getParameterMarkerExpressions(expressionSegments);
parameterCount = parameterMarkerExpressions.size();
- this.parameters = getParameters(parameters, parametersOffset);
+ this.parameters = getParameters(params, parametersOffset);
columns = assignments.stream().map(each -> each.getColumns().get(0)).collect(Collectors.toList());
}
@@ -63,12 +63,12 @@ public final class OnDuplicateUpdateContext {
return result;
}
- private List<Object> getParameters(final List<Object> parameters, final int parametersOffset) {
- if (parameters.isEmpty() || 0 == parameterCount) {
+ private List<Object> getParameters(final List<Object> params, final int paramsOffset) {
+ if (params.isEmpty() || 0 == parameterCount) {
return Collections.emptyList();
}
List<Object> result = new ArrayList<>(parameterCount);
- result.addAll(parameters.subList(parametersOffset, parametersOffset + parameterCount));
+ result.addAll(params.subList(paramsOffset, paramsOffset + parameterCount));
return result;
}
diff --git a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/segment/select/pagination/PaginationContext.java b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/segment/select/pagination/PaginationContext.java
index e18d3a859c0..e8c620c488f 100644
--- a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/segment/select/pagination/PaginationContext.java
+++ b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/segment/select/pagination/PaginationContext.java
@@ -43,17 +43,17 @@ public final class PaginationContext {
private final Long actualRowCount;
- public PaginationContext(final PaginationValueSegment offsetSegment, final PaginationValueSegment rowCountSegment, final List<Object> parameters) {
+ public PaginationContext(final PaginationValueSegment offsetSegment, final PaginationValueSegment rowCountSegment, final List<Object> params) {
hasPagination = null != offsetSegment || null != rowCountSegment;
this.offsetSegment = offsetSegment;
this.rowCountSegment = rowCountSegment;
- actualOffset = null == offsetSegment ? 0L : getValue(offsetSegment, parameters);
- actualRowCount = null == rowCountSegment ? null : getValue(rowCountSegment, parameters);
+ actualOffset = null == offsetSegment ? 0L : getValue(offsetSegment, params);
+ actualRowCount = null == rowCountSegment ? null : getValue(rowCountSegment, params);
}
- private long getValue(final PaginationValueSegment paginationValueSegment, final List<Object> parameters) {
+ private long getValue(final PaginationValueSegment paginationValueSegment, final List<Object> params) {
if (paginationValueSegment instanceof ParameterMarkerPaginationValueSegment) {
- Object obj = null == parameters || parameters.isEmpty() ? 0L : parameters.get(((ParameterMarkerPaginationValueSegment) paginationValueSegment).getParameterIndex());
+ Object obj = null == params || params.isEmpty() ? 0L : params.get(((ParameterMarkerPaginationValueSegment) paginationValueSegment).getParameterIndex());
return obj instanceof Long ? (long) obj : (int) obj;
}
return ((NumberLiteralPaginationValueSegment) paginationValueSegment).getValue();
diff --git a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/segment/select/pagination/engine/LimitPaginationContextEngine.java b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/segment/select/pagination/engine/LimitPaginationContextEngine.java
index 6d38d79f3b8..02b732a50e7 100644
--- a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/segment/select/pagination/engine/LimitPaginationContextEngine.java
+++ b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/segment/select/pagination/engine/LimitPaginationContextEngine.java
@@ -31,10 +31,10 @@ public final class LimitPaginationContextEngine {
* Create pagination context.
*
* @param limitSegment limit segment
- * @param parameters SQL parameters
+ * @param params SQL parameters
* @return pagination context
*/
- public PaginationContext createPaginationContext(final LimitSegment limitSegment, final List<Object> parameters) {
- return new PaginationContext(limitSegment.getOffset().orElse(null), limitSegment.getRowCount().orElse(null), parameters);
+ public PaginationContext createPaginationContext(final LimitSegment limitSegment, final List<Object> params) {
+ return new PaginationContext(limitSegment.getOffset().orElse(null), limitSegment.getRowCount().orElse(null), params);
}
}
diff --git a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/segment/select/pagination/engine/PaginationContextEngine.java b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/segment/select/pagination/engine/PaginationContextEngine.java
index e6504fbc18f..94cd07ff86e 100644
--- a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/segment/select/pagination/engine/PaginationContextEngine.java
+++ b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/segment/select/pagination/engine/PaginationContextEngine.java
@@ -46,15 +46,15 @@ public final class PaginationContextEngine {
*
* @param selectStatement SQL statement
* @param projectionsContext projections context
- * @param parameters SQL parameters
+ * @param params SQL parameters
* @param whereSegments where segments
* @return pagination context
*/
public PaginationContext createPaginationContext(final SelectStatement selectStatement, final ProjectionsContext projectionsContext,
- final List<Object> parameters, final Collection<WhereSegment> whereSegments) {
+ final List<Object> params, final Collection<WhereSegment> whereSegments) {
Optional<LimitSegment> limitSegment = SelectStatementHandler.getLimitSegment(selectStatement);
if (limitSegment.isPresent()) {
- return new LimitPaginationContextEngine().createPaginationContext(limitSegment.get(), parameters);
+ return new LimitPaginationContextEngine().createPaginationContext(limitSegment.get(), params);
}
Optional<TopProjectionSegment> topProjectionSegment = findTopProjection(selectStatement);
Collection<ExpressionSegment> expressions = new LinkedList<>();
@@ -62,12 +62,12 @@ public final class PaginationContextEngine {
expressions.add(each.getExpr());
}
if (topProjectionSegment.isPresent()) {
- return new TopPaginationContextEngine().createPaginationContext(topProjectionSegment.get(), expressions, parameters);
+ return new TopPaginationContextEngine().createPaginationContext(topProjectionSegment.get(), expressions, params);
}
if (!expressions.isEmpty() && containsRowNumberPagination(selectStatement)) {
- return new RowNumberPaginationContextEngine().createPaginationContext(expressions, projectionsContext, parameters);
+ return new RowNumberPaginationContextEngine().createPaginationContext(expressions, projectionsContext, params);
}
- return new PaginationContext(null, null, parameters);
+ return new PaginationContext(null, null, params);
}
private boolean containsRowNumberPagination(final SelectStatement selectStatement) {
diff --git a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/segment/select/pagination/engine/RowNumberPaginationContextEngine.java b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/segment/select/pagination/engine/RowNumberPaginationContextEngine.java
index 6ee5e0cf572..4f90ac11201 100644
--- a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/segment/select/pagination/engine/RowNumberPaginationContextEngine.java
+++ b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/segment/select/pagination/engine/RowNumberPaginationContextEngine.java
@@ -54,17 +54,17 @@ public final class RowNumberPaginationContextEngine {
*
* @param expressions expressions
* @param projectionsContext projections context
- * @param parameters SQL parameters
+ * @param params SQL parameters
* @return pagination context
*/
- public PaginationContext createPaginationContext(final Collection<ExpressionSegment> expressions, final ProjectionsContext projectionsContext, final List<Object> parameters) {
+ public PaginationContext createPaginationContext(final Collection<ExpressionSegment> expressions, final ProjectionsContext projectionsContext, final List<Object> params) {
Optional<String> rowNumberAlias = isRowNumberAlias(projectionsContext);
if (!rowNumberAlias.isPresent()) {
- return new PaginationContext(null, null, parameters);
+ return new PaginationContext(null, null, params);
}
Collection<AndPredicate> andPredicates = expressions.stream().flatMap(each -> ExpressionExtractUtil.getAndPredicates(each).stream()).collect(Collectors.toList());
Collection<BinaryOperationExpression> rowNumberPredicates = getRowNumberPredicates(andPredicates, rowNumberAlias.get());
- return rowNumberPredicates.isEmpty() ? new PaginationContext(null, null, parameters) : createPaginationWithRowNumber(rowNumberPredicates, parameters);
+ return rowNumberPredicates.isEmpty() ? new PaginationContext(null, null, params) : createPaginationWithRowNumber(rowNumberPredicates, params);
}
private Collection<BinaryOperationExpression> getRowNumberPredicates(final Collection<AndPredicate> andPredicates, final String rowNumberAlias) {
@@ -109,7 +109,7 @@ public final class RowNumberPaginationContextEngine {
return false;
}
- private PaginationContext createPaginationWithRowNumber(final Collection<BinaryOperationExpression> rowNumberPredicates, final List<Object> parameters) {
+ private PaginationContext createPaginationWithRowNumber(final Collection<BinaryOperationExpression> rowNumberPredicates, final List<Object> params) {
RowNumberValueSegment offset = null;
RowNumberValueSegment rowCount = null;
for (BinaryOperationExpression each : rowNumberPredicates) {
@@ -131,7 +131,7 @@ public final class RowNumberPaginationContextEngine {
break;
}
}
- return new PaginationContext(offset, rowCount, parameters);
+ return new PaginationContext(offset, rowCount, params);
}
private RowNumberValueSegment createRowNumberValueSegment(final ExpressionSegment expression, final boolean boundOpened) {
diff --git a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/segment/select/pagination/engine/TopPaginationContextEngine.java b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/segment/select/pagination/engine/TopPaginationContextEngine.java
index 928b98a370d..7bc0ed2c8d2 100644
--- a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/segment/select/pagination/engine/TopPaginationContextEngine.java
+++ b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/segment/select/pagination/engine/TopPaginationContextEngine.java
@@ -46,15 +46,15 @@ public final class TopPaginationContextEngine {
*
* @param topProjectionSegment top projection segment
* @param expressions expressions
- * @param parameters SQL parameters
+ * @param params SQL parameters
* @return pagination context
*/
- public PaginationContext createPaginationContext(final TopProjectionSegment topProjectionSegment, final Collection<ExpressionSegment> expressions, final List<Object> parameters) {
+ public PaginationContext createPaginationContext(final TopProjectionSegment topProjectionSegment, final Collection<ExpressionSegment> expressions, final List<Object> params) {
Collection<AndPredicate> andPredicates = expressions.stream().flatMap(each -> ExpressionExtractUtil.getAndPredicates(each).stream()).collect(Collectors.toList());
Optional<ExpressionSegment> rowNumberPredicate = !expressions.isEmpty() ? getRowNumberPredicate(andPredicates, topProjectionSegment.getAlias()) : Optional.empty();
Optional<PaginationValueSegment> offset = rowNumberPredicate.isPresent() ? createOffsetWithRowNumber(rowNumberPredicate.get()) : Optional.empty();
PaginationValueSegment rowCount = topProjectionSegment.getTop();
- return new PaginationContext(offset.orElse(null), rowCount, parameters);
+ return new PaginationContext(offset.orElse(null), rowCount, params);
}
private Optional<ExpressionSegment> getRowNumberPredicate(final Collection<AndPredicate> andPredicates, final String rowNumberAlias) {
diff --git a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/ddl/CursorStatementContext.java b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/ddl/CursorStatementContext.java
index 358709ce059..2904a73881d 100644
--- a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/ddl/CursorStatementContext.java
+++ b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/ddl/CursorStatementContext.java
@@ -56,13 +56,13 @@ public final class CursorStatementContext extends CommonSQLStatementContext<Open
private final SelectStatementContext selectStatementContext;
- public CursorStatementContext(final Map<String, ShardingSphereDatabase> databases, final List<Object> parameters,
+ public CursorStatementContext(final Map<String, ShardingSphereDatabase> databases, final List<Object> params,
final OpenGaussCursorStatement sqlStatement, final String defaultDatabaseName) {
super(sqlStatement);
tablesContext = new TablesContext(getSimpleTableSegments(), getDatabaseType());
extractWhereSegments(whereSegments, sqlStatement.getSelect());
ColumnExtractor.extractColumnSegments(columnSegments, whereSegments);
- selectStatementContext = new SelectStatementContext(databases, parameters, sqlStatement.getSelect(), defaultDatabaseName);
+ selectStatementContext = new SelectStatementContext(databases, params, sqlStatement.getSelect(), defaultDatabaseName);
}
private Collection<SimpleTableSegment> getSimpleTableSegments() {
diff --git a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/dml/InsertStatementContext.java b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/dml/InsertStatementContext.java
index a7f8ad704ad..dca2f347fd8 100644
--- a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/dml/InsertStatementContext.java
+++ b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/dml/InsertStatementContext.java
@@ -81,20 +81,20 @@ public final class InsertStatementContext extends CommonSQLStatementContext<Inse
private GeneratedKeyContext generatedKeyContext;
- public InsertStatementContext(final Map<String, ShardingSphereDatabase> databases, final List<Object> parameters, final InsertStatement sqlStatement, final String defaultDatabaseName) {
+ public InsertStatementContext(final Map<String, ShardingSphereDatabase> databases, final List<Object> params, final InsertStatement sqlStatement, final String defaultDatabaseName) {
super(sqlStatement);
this.databases = databases;
this.defaultDatabaseName = defaultDatabaseName;
insertColumnNames = getInsertColumnNames();
valueExpressions = getAllValueExpressions(sqlStatement);
AtomicInteger parametersOffset = new AtomicInteger(0);
- insertValueContexts = getInsertValueContexts(parameters, parametersOffset, valueExpressions);
- insertSelectContext = getInsertSelectContext(databases, parameters, parametersOffset, defaultDatabaseName).orElse(null);
- onDuplicateKeyUpdateValueContext = getOnDuplicateKeyUpdateValueContext(parameters, parametersOffset).orElse(null);
+ insertValueContexts = getInsertValueContexts(params, parametersOffset, valueExpressions);
+ insertSelectContext = getInsertSelectContext(databases, params, parametersOffset, defaultDatabaseName).orElse(null);
+ onDuplicateKeyUpdateValueContext = getOnDuplicateKeyUpdateValueContext(params, parametersOffset).orElse(null);
tablesContext = new TablesContext(getAllSimpleTableSegments(), getDatabaseType());
ShardingSphereSchema schema = getSchema(databases, defaultDatabaseName);
columnNames = containsInsertColumns() ? insertColumnNames : schema.getVisibleColumnNames(sqlStatement.getTable().getTableName().getIdentifier().getValue());
- generatedKeyContext = new GeneratedKeyContextEngine(sqlStatement, schema).createGenerateKeyContext(insertColumnNames, getAllValueExpressions(sqlStatement), parameters).orElse(null);
+ generatedKeyContext = new GeneratedKeyContextEngine(sqlStatement, schema).createGenerateKeyContext(insertColumnNames, getAllValueExpressions(sqlStatement), params).orElse(null);
}
private ShardingSphereSchema getSchema(final Map<String, ShardingSphereDatabase> databases, final String defaultDatabaseName) {
@@ -112,35 +112,35 @@ public final class InsertStatementContext extends CommonSQLStatementContext<Inse
return tableExtractor.getRewriteTables();
}
- private List<InsertValueContext> getInsertValueContexts(final List<Object> parameters, final AtomicInteger parametersOffset, final List<List<ExpressionSegment>> valueExpressions) {
+ private List<InsertValueContext> getInsertValueContexts(final List<Object> params, final AtomicInteger paramsOffset, final List<List<ExpressionSegment>> valueExpressions) {
List<InsertValueContext> result = new LinkedList<>();
for (Collection<ExpressionSegment> each : valueExpressions) {
- InsertValueContext insertValueContext = new InsertValueContext(each, parameters, parametersOffset.get());
+ InsertValueContext insertValueContext = new InsertValueContext(each, params, paramsOffset.get());
result.add(insertValueContext);
- parametersOffset.addAndGet(insertValueContext.getParameterCount());
+ paramsOffset.addAndGet(insertValueContext.getParameterCount());
}
return result;
}
- private Optional<InsertSelectContext> getInsertSelectContext(final Map<String, ShardingSphereDatabase> databases, final List<Object> parameters,
- final AtomicInteger parametersOffset, final String defaultDatabaseName) {
+ private Optional<InsertSelectContext> getInsertSelectContext(final Map<String, ShardingSphereDatabase> databases, final List<Object> params,
+ final AtomicInteger paramsOffset, final String defaultDatabaseName) {
if (!getSqlStatement().getInsertSelect().isPresent()) {
return Optional.empty();
}
SubquerySegment insertSelectSegment = getSqlStatement().getInsertSelect().get();
- SelectStatementContext selectStatementContext = new SelectStatementContext(databases, parameters, insertSelectSegment.getSelect(), defaultDatabaseName);
- InsertSelectContext insertSelectContext = new InsertSelectContext(selectStatementContext, parameters, parametersOffset.get());
- parametersOffset.addAndGet(insertSelectContext.getParameterCount());
+ SelectStatementContext selectStatementContext = new SelectStatementContext(databases, params, insertSelectSegment.getSelect(), defaultDatabaseName);
+ InsertSelectContext insertSelectContext = new InsertSelectContext(selectStatementContext, params, paramsOffset.get());
+ paramsOffset.addAndGet(insertSelectContext.getParameterCount());
return Optional.of(insertSelectContext);
}
- private Optional<OnDuplicateUpdateContext> getOnDuplicateKeyUpdateValueContext(final List<Object> parameters, final AtomicInteger parametersOffset) {
+ private Optional<OnDuplicateUpdateContext> getOnDuplicateKeyUpdateValueContext(final List<Object> params, final AtomicInteger parametersOffset) {
Optional<OnDuplicateKeyColumnsSegment> onDuplicateKeyColumnsSegment = InsertStatementHandler.getOnDuplicateKeyColumnsSegment(getSqlStatement());
if (!onDuplicateKeyColumnsSegment.isPresent()) {
return Optional.empty();
}
Collection<AssignmentSegment> onDuplicateKeyColumns = onDuplicateKeyColumnsSegment.get().getColumns();
- OnDuplicateUpdateContext onDuplicateUpdateContext = new OnDuplicateUpdateContext(onDuplicateKeyColumns, parameters, parametersOffset.get());
+ OnDuplicateUpdateContext onDuplicateUpdateContext = new OnDuplicateUpdateContext(onDuplicateKeyColumns, params, parametersOffset.get());
parametersOffset.addAndGet(onDuplicateUpdateContext.getParameterCount());
return Optional.of(onDuplicateUpdateContext);
}
@@ -262,12 +262,12 @@ public final class InsertStatementContext extends CommonSQLStatementContext<Inse
}
@Override
- public void setUpParameters(final List<Object> parameters) {
+ public void setUpParameters(final List<Object> params) {
AtomicInteger parametersOffset = new AtomicInteger(0);
- insertValueContexts = getInsertValueContexts(parameters, parametersOffset, valueExpressions);
- insertSelectContext = getInsertSelectContext(databases, parameters, parametersOffset, defaultDatabaseName).orElse(null);
- onDuplicateKeyUpdateValueContext = getOnDuplicateKeyUpdateValueContext(parameters, parametersOffset).orElse(null);
+ insertValueContexts = getInsertValueContexts(params, parametersOffset, valueExpressions);
+ insertSelectContext = getInsertSelectContext(databases, params, parametersOffset, defaultDatabaseName).orElse(null);
+ onDuplicateKeyUpdateValueContext = getOnDuplicateKeyUpdateValueContext(params, parametersOffset).orElse(null);
ShardingSphereSchema schema = getSchema(databases, defaultDatabaseName);
- generatedKeyContext = new GeneratedKeyContextEngine(getSqlStatement(), schema).createGenerateKeyContext(insertColumnNames, valueExpressions, parameters).orElse(null);
+ generatedKeyContext = new GeneratedKeyContextEngine(getSqlStatement(), schema).createGenerateKeyContext(insertColumnNames, valueExpressions, params).orElse(null);
}
}
diff --git a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/dml/SelectStatementContext.java b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/dml/SelectStatementContext.java
index ecc0d6de65e..5aecc3d0696 100644
--- a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/dml/SelectStatementContext.java
+++ b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/statement/dml/SelectStatementContext.java
@@ -104,25 +104,25 @@ public final class SelectStatementContext extends CommonSQLStatementContext<Sele
private PaginationContext paginationContext;
- public SelectStatementContext(final Map<String, ShardingSphereDatabase> databases, final List<Object> parameters, final SelectStatement sqlStatement, final String defaultDatabaseName) {
+ public SelectStatementContext(final Map<String, ShardingSphereDatabase> databases, final List<Object> params, final SelectStatement sqlStatement, final String defaultDatabaseName) {
super(sqlStatement);
extractWhereSegments(whereSegments, sqlStatement);
ColumnExtractor.extractColumnSegments(columnSegments, whereSegments);
- subqueryContexts = createSubqueryContexts(databases, parameters, defaultDatabaseName);
+ subqueryContexts = createSubqueryContexts(databases, params, defaultDatabaseName);
tablesContext = new TablesContext(getAllTableSegments(), subqueryContexts, getDatabaseType());
String databaseName = tablesContext.getDatabaseName().orElse(defaultDatabaseName);
groupByContext = new GroupByContextEngine().createGroupByContext(sqlStatement);
orderByContext = new OrderByContextEngine().createOrderBy(sqlStatement, groupByContext);
projectionsContext = new ProjectionsContextEngine(databaseName, getSchemas(databases, databaseName), getDatabaseType())
.createProjectionsContext(getSqlStatement().getFrom(), getSqlStatement().getProjections(), groupByContext, orderByContext);
- paginationContext = new PaginationContextEngine().createPaginationContext(sqlStatement, projectionsContext, parameters, whereSegments);
+ paginationContext = new PaginationContextEngine().createPaginationContext(sqlStatement, projectionsContext, params, whereSegments);
}
- private Map<Integer, SelectStatementContext> createSubqueryContexts(final Map<String, ShardingSphereDatabase> databases, final List<Object> parameters, final String defaultDatabaseName) {
+ private Map<Integer, SelectStatementContext> createSubqueryContexts(final Map<String, ShardingSphereDatabase> databases, final List<Object> params, final String defaultDatabaseName) {
Collection<SubquerySegment> subquerySegments = SubqueryExtractUtil.getSubquerySegments(getSqlStatement());
Map<Integer, SelectStatementContext> result = new HashMap<>(subquerySegments.size(), 1);
for (SubquerySegment each : subquerySegments) {
- SelectStatementContext subqueryContext = new SelectStatementContext(databases, parameters, each.getSelect(), defaultDatabaseName);
+ SelectStatementContext subqueryContext = new SelectStatementContext(databases, params, each.getSelect(), defaultDatabaseName);
subqueryContext.setSubqueryType(each.getSubqueryType());
result.put(each.getStartIndex(), subqueryContext);
}
@@ -331,7 +331,7 @@ public final class SelectStatementContext extends CommonSQLStatementContext<Sele
}
@Override
- public void setUpParameters(final List<Object> parameters) {
- paginationContext = new PaginationContextEngine().createPaginationContext(getSqlStatement(), projectionsContext, parameters, whereSegments);
+ public void setUpParameters(final List<Object> params) {
+ paginationContext = new PaginationContextEngine().createPaginationContext(getSqlStatement(), projectionsContext, params, whereSegments);
}
}
diff --git a/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/segment/insert/values/InsertValueContextTest.java b/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/segment/insert/values/InsertValueContextTest.java
index 38b74c6b7b3..8683b175caa 100644
--- a/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/segment/insert/values/InsertValueContextTest.java
+++ b/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/segment/insert/values/InsertValueContextTest.java
@@ -43,37 +43,33 @@ public final class InsertValueContextTest {
@Test
public void assertInstanceConstructedOk() throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
Collection<ExpressionSegment> assignments = Collections.emptyList();
- List<Object> parameters = Collections.emptyList();
+ List<Object> params = Collections.emptyList();
int parametersOffset = 0;
- InsertValueContext insertValueContext = new InsertValueContext(assignments, parameters, parametersOffset);
+ InsertValueContext insertValueContext = new InsertValueContext(assignments, params, parametersOffset);
Method getValueExpressionsMethod = InsertValueContext.class.getDeclaredMethod("getValueExpressions", Collection.class);
getValueExpressionsMethod.setAccessible(true);
List<ExpressionSegment> getValueExpressionsResult = (List<ExpressionSegment>) getValueExpressionsMethod.invoke(insertValueContext, new Object[]{assignments});
assertThat(insertValueContext.getValueExpressions(), is(getValueExpressionsResult));
Method getParametersMethod = InsertValueContext.class.getDeclaredMethod("getParameters", List.class, int.class);
getParametersMethod.setAccessible(true);
- List<Object> getParametersResult = (List<Object>) getParametersMethod.invoke(insertValueContext, new Object[]{parameters, parametersOffset});
+ List<Object> getParametersResult = (List<Object>) getParametersMethod.invoke(insertValueContext, new Object[]{params, parametersOffset});
assertThat(insertValueContext.getParameters(), is(getParametersResult));
}
@Test
- public void assertGetLiteralValueWhenParameterMarker() {
+ public void assertGetLiteralValueWithParameterMarker() {
Collection<ExpressionSegment> assignments = makeParameterMarkerExpressionSegment();
String parameterValue = "test";
- List<Object> parameters = Collections.singletonList(parameterValue);
- int parametersOffset = 0;
- InsertValueContext insertValueContext = new InsertValueContext(assignments, parameters, parametersOffset);
+ InsertValueContext insertValueContext = new InsertValueContext(assignments, Collections.singletonList(parameterValue), 0);
Object valueFromInsertValueContext = insertValueContext.getLiteralValue(0).get();
assertThat(valueFromInsertValueContext, is(parameterValue));
}
@Test
- public void assertGetLiteralValueWhenParameterisNull() {
+ public void assertGetLiteralValueWhenParameterIsNull() {
Collection<ExpressionSegment> assignments = makeParameterMarkerExpressionSegment();
- String parameterValue = null;
- List<Object> parameters = Collections.singletonList(parameterValue);
int parametersOffset = 0;
- InsertValueContext insertValueContext = new InsertValueContext(assignments, parameters, parametersOffset);
+ InsertValueContext insertValueContext = new InsertValueContext(assignments, Collections.singletonList(null), parametersOffset);
Optional<Object> literalValue = insertValueContext.getLiteralValue(0);
assertThat(false, is(literalValue.isPresent()));
}
@@ -86,8 +82,7 @@ public final class InsertValueContextTest {
public void assertGetLiteralValueWhenLiteralExpressionSegment() {
Object literalObject = new Object();
Collection<ExpressionSegment> assignments = makeLiteralExpressionSegment(literalObject);
- List<Object> parameters = Collections.emptyList();
- InsertValueContext insertValueContext = new InsertValueContext(assignments, parameters, 0);
+ InsertValueContext insertValueContext = new InsertValueContext(assignments, Collections.emptyList(), 0);
Object valueFromInsertValueContext = insertValueContext.getLiteralValue(0).get();
assertThat(valueFromInsertValueContext, is(literalObject));
}
@@ -103,8 +98,7 @@ public final class InsertValueContextTest {
new ExpressionProjectionSegment(0, 10, ""),
new ParameterMarkerExpressionSegment(0, 10, 5),
new BinaryOperationExpression(0, 0, new ColumnSegment(0, 0, new IdentifierValue("")), new ParameterMarkerExpressionSegment(0, 10, 5), "=", ""));
- List<Object> parameters = Arrays.asList("", "");
- InsertValueContext insertValueContext = new InsertValueContext(expressions, parameters, 0);
+ InsertValueContext insertValueContext = new InsertValueContext(expressions, Arrays.asList("", ""), 0);
assertThat(insertValueContext.getParameterCount(), is(2));
}
}
diff --git a/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/segment/insert/values/OnDuplicateUpdateContextTest.java b/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/segment/insert/values/OnDuplicateUpdateContextTest.java
index b1a0f2de759..521c224bfe1 100644
--- a/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/segment/insert/values/OnDuplicateUpdateContextTest.java
+++ b/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/segment/insert/values/OnDuplicateUpdateContextTest.java
@@ -44,16 +44,16 @@ public final class OnDuplicateUpdateContextTest {
@Test
public void assertInstanceConstructedOk() throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
Collection<AssignmentSegment> assignments = Collections.emptyList();
- List<Object> parameters = Collections.emptyList();
+ List<Object> params = Collections.emptyList();
int parametersOffset = 0;
- OnDuplicateUpdateContext onDuplicateUpdateContext = new OnDuplicateUpdateContext(assignments, parameters, parametersOffset);
+ OnDuplicateUpdateContext onDuplicateUpdateContext = new OnDuplicateUpdateContext(assignments, params, parametersOffset);
Method getValueExpressionsMethod = OnDuplicateUpdateContext.class.getDeclaredMethod("getValueExpressions", Collection.class);
getValueExpressionsMethod.setAccessible(true);
List<ExpressionSegment> getValueExpressionsResult = (List<ExpressionSegment>) getValueExpressionsMethod.invoke(onDuplicateUpdateContext, new Object[]{assignments});
assertThat(onDuplicateUpdateContext.getValueExpressions(), is(getValueExpressionsResult));
Method getParametersMethod = OnDuplicateUpdateContext.class.getDeclaredMethod("getParameters", List.class, int.class);
getParametersMethod.setAccessible(true);
- List<Object> getParametersResult = (List<Object>) getParametersMethod.invoke(onDuplicateUpdateContext, new Object[]{parameters, parametersOffset});
+ List<Object> getParametersResult = (List<Object>) getParametersMethod.invoke(onDuplicateUpdateContext, new Object[]{params, parametersOffset});
assertThat(onDuplicateUpdateContext.getParameters(), is(getParametersResult));
}
@@ -62,9 +62,9 @@ public final class OnDuplicateUpdateContextTest {
Collection<AssignmentSegment> assignments = createParameterMarkerExpressionAssignmentSegment();
String parameterValue1 = "test1";
String parameterValue2 = "test2";
- List<Object> parameters = Arrays.asList(parameterValue1, parameterValue2);
+ List<Object> params = Arrays.asList(parameterValue1, parameterValue2);
int parametersOffset = 0;
- OnDuplicateUpdateContext onDuplicateUpdateContext = new OnDuplicateUpdateContext(assignments, parameters, parametersOffset);
+ OnDuplicateUpdateContext onDuplicateUpdateContext = new OnDuplicateUpdateContext(assignments, params, parametersOffset);
Object valueFromInsertValueContext1 = onDuplicateUpdateContext.getValue(0);
assertThat(valueFromInsertValueContext1, is(parameterValue1));
Object valueFromInsertValueContext2 = onDuplicateUpdateContext.getValue(1);
@@ -83,8 +83,8 @@ public final class OnDuplicateUpdateContextTest {
public void assertGetValueWhenLiteralExpressionSegment() {
Object literalObject = new Object();
Collection<AssignmentSegment> assignments = createLiteralExpressionSegment(literalObject);
- List<Object> parameters = Collections.emptyList();
- OnDuplicateUpdateContext onDuplicateUpdateContext = new OnDuplicateUpdateContext(assignments, parameters, 0);
+ List<Object> params = Collections.emptyList();
+ OnDuplicateUpdateContext onDuplicateUpdateContext = new OnDuplicateUpdateContext(assignments, params, 0);
Object valueFromInsertValueContext = onDuplicateUpdateContext.getValue(0);
assertThat(valueFromInsertValueContext, is(literalObject));
}
@@ -115,8 +115,8 @@ public final class OnDuplicateUpdateContextTest {
public void assertGetColumn() {
Object literalObject = new Object();
Collection<AssignmentSegment> assignments = createLiteralExpressionSegment(literalObject);
- List<Object> parameters = Collections.emptyList();
- OnDuplicateUpdateContext onDuplicateUpdateContext = new OnDuplicateUpdateContext(assignments, parameters, 0);
+ List<Object> params = Collections.emptyList();
+ OnDuplicateUpdateContext onDuplicateUpdateContext = new OnDuplicateUpdateContext(assignments, params, 0);
ColumnSegment column = onDuplicateUpdateContext.getColumn(0);
assertThat(column, is(assignments.iterator().next().getColumns().get(0)));
}
diff --git a/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/segment/select/pagination/engine/TopPaginationContextEngineTest.java b/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/segment/select/pagination/engine/TopPaginationContextEngineTest.java
index 2ea08cccedb..ec56b70716e 100644
--- a/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/segment/select/pagination/engine/TopPaginationContextEngineTest.java
+++ b/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/segment/select/pagination/engine/TopPaginationContextEngineTest.java
@@ -33,12 +33,11 @@ import org.junit.Before;
import org.junit.Test;
import java.util.Collections;
-import java.util.List;
import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertFalse;
import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
public final class TopPaginationContextEngineTest {
@@ -53,8 +52,7 @@ public final class TopPaginationContextEngineTest {
@Test
public void assertCreatePaginationContextWhenRowNumberPredicateNotPresent() {
TopProjectionSegment topProjectionSegment = new TopProjectionSegment(0, 10, null, "rowNumberAlias");
- List<Object> parameters = Collections.emptyList();
- PaginationContext paginationContext = topPaginationContextEngine.createPaginationContext(topProjectionSegment, Collections.emptyList(), parameters);
+ PaginationContext paginationContext = topPaginationContextEngine.createPaginationContext(topProjectionSegment, Collections.emptyList(), Collections.emptyList());
assertFalse(paginationContext.getOffsetSegment().isPresent());
assertFalse(paginationContext.getRowCountSegment().isPresent());
}
diff --git a/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/statement/impl/InsertStatementContextTest.java b/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/statement/impl/InsertStatementContextTest.java
index 7e600592f0f..c0ad190a848 100644
--- a/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/statement/impl/InsertStatementContextTest.java
+++ b/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/statement/impl/InsertStatementContextTest.java
@@ -105,13 +105,13 @@ public final class InsertStatementContextTest {
assertInsertStatementContext(actual);
}
- private InsertStatementContext createInsertStatementContext(final List<Object> parameters, final InsertStatement insertStatement) {
+ private InsertStatementContext createInsertStatementContext(final List<Object> params, final InsertStatement insertStatement) {
ShardingSphereDatabase database = mock(ShardingSphereDatabase.class, RETURNS_DEEP_STUBS);
ShardingSphereSchema schema = mock(ShardingSphereSchema.class);
String defaultSchemaName = insertStatement instanceof PostgreSQLStatement || insertStatement instanceof OpenGaussStatement ? "public" : DefaultDatabase.LOGIC_NAME;
when(database.getSchema(defaultSchemaName)).thenReturn(schema);
when(schema.getVisibleColumnNames("tbl")).thenReturn(Arrays.asList("id", "name", "status"));
- return new InsertStatementContext(Collections.singletonMap(DefaultDatabase.LOGIC_NAME, database), parameters, insertStatement, DefaultDatabase.LOGIC_NAME);
+ return new InsertStatementContext(Collections.singletonMap(DefaultDatabase.LOGIC_NAME, database), params, insertStatement, DefaultDatabase.LOGIC_NAME);
}
@Test
diff --git a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/check/SQLCheckEngine.java b/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/check/SQLCheckEngine.java
index 27e4be0a482..b8c5b70f7f6 100644
--- a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/check/SQLCheckEngine.java
+++ b/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/check/SQLCheckEngine.java
@@ -61,17 +61,17 @@ public final class SQLCheckEngine {
* Check SQL.
*
* @param sqlStatementContext SQL statement context
- * @param parameters SQL parameters
+ * @param params SQL parameters
* @param rules rules
* @param currentDatabase current database
* @param databases databases
* @param grantee grantee
*/
@SuppressWarnings({"rawtypes", "unchecked"})
- public static void check(final SQLStatementContext<?> sqlStatementContext, final List<Object> parameters, final Collection<ShardingSphereRule> rules,
+ public static void check(final SQLStatementContext<?> sqlStatementContext, final List<Object> params, final Collection<ShardingSphereRule> rules,
final String currentDatabase, final Map<String, ShardingSphereDatabase> databases, final Grantee grantee) {
for (Entry<ShardingSphereRule, SQLChecker> entry : SQLCheckerFactory.getInstance(rules).entrySet()) {
- SQLCheckResult checkResult = entry.getValue().check(sqlStatementContext, parameters, grantee, currentDatabase, databases, entry.getKey());
+ SQLCheckResult checkResult = entry.getValue().check(sqlStatementContext, params, grantee, currentDatabase, databases, entry.getKey());
if (!checkResult.isPassed()) {
throw new SQLCheckException(checkResult.getErrorMessage());
}
@@ -80,6 +80,7 @@ public final class SQLCheckEngine {
/**
* Check user exists.
+ *
* @param user user
* @param rules rules
* @return check result
diff --git a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/check/SQLChecker.java b/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/check/SQLChecker.java
index 1d88c3a27b2..bbc6ea9a3e0 100644
--- a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/check/SQLChecker.java
+++ b/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/check/SQLChecker.java
@@ -49,14 +49,14 @@ public interface SQLChecker<T extends ShardingSphereRule> extends OrderedSPI<T>
* Check SQL.
*
* @param sqlStatementContext SQL statement context
- * @param parameters SQL parameters
+ * @param params SQL parameters
* @param grantee grantee
* @param currentDatabase current database
* @param databases databases
* @param rule rule
* @return SQL check result
*/
- SQLCheckResult check(SQLStatementContext<?> sqlStatementContext, List<Object> parameters, Grantee grantee, String currentDatabase, Map<String, ShardingSphereDatabase> databases, T rule);
+ SQLCheckResult check(SQLStatementContext<?> sqlStatementContext, List<Object> params, Grantee grantee, String currentDatabase, Map<String, ShardingSphereDatabase> databases, T rule);
/**
* Check User.
diff --git a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/context/SQLUnit.java b/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/context/SQLUnit.java
index f7ba893bec7..9acd76de29b 100644
--- a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/context/SQLUnit.java
+++ b/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/context/SQLUnit.java
@@ -41,7 +41,7 @@ public final class SQLUnit {
private final List<RouteMapper> tableRouteMappers;
- public SQLUnit(final String sql, final List<Object> parameters) {
- this(sql, parameters, Collections.emptyList());
+ public SQLUnit(final String sql, final List<Object> params) {
+ this(sql, params, Collections.emptyList());
}
}
diff --git a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/hook/SPISQLExecutionHook.java b/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/hook/SPISQLExecutionHook.java
index 7dfc3ed9b29..f621c16b604 100644
--- a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/hook/SPISQLExecutionHook.java
+++ b/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/hook/SPISQLExecutionHook.java
@@ -31,10 +31,10 @@ public final class SPISQLExecutionHook implements SQLExecutionHook {
private final Collection<SQLExecutionHook> sqlExecutionHooks = SQLExecutionHookFactory.getAllInstances();
@Override
- public void start(final String dataSourceName, final String sql, final List<Object> parameters,
+ public void start(final String dataSourceName, final String sql, final List<Object> params,
final DataSourceMetaData dataSourceMetaData, final boolean isTrunkThread, final Map<String, Object> shardingExecuteDataMap) {
for (SQLExecutionHook each : sqlExecutionHooks) {
- each.start(dataSourceName, sql, parameters, dataSourceMetaData, isTrunkThread, shardingExecuteDataMap);
+ each.start(dataSourceName, sql, params, dataSourceMetaData, isTrunkThread, shardingExecuteDataMap);
}
}
diff --git a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/hook/SQLExecutionHook.java b/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/hook/SQLExecutionHook.java
index 99ec9c7d791..b9767689b16 100644
--- a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/hook/SQLExecutionHook.java
+++ b/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/hook/SQLExecutionHook.java
@@ -32,12 +32,12 @@ public interface SQLExecutionHook {
*
* @param dataSourceName data source name
* @param sql SQL
- * @param parameters parameters of SQL
+ * @param params SQL parameters
* @param dataSourceMetaData data source meta data
* @param isTrunkThread is execution in trunk thread
* @param shardingExecuteDataMap sharding execute data map
*/
- void start(String dataSourceName, String sql, List<Object> parameters, DataSourceMetaData dataSourceMetaData, boolean isTrunkThread, Map<String, Object> shardingExecuteDataMap);
+ void start(String dataSourceName, String sql, List<Object> params, DataSourceMetaData dataSourceMetaData, boolean isTrunkThread, Map<String, Object> shardingExecuteDataMap);
/**
* Handle when SQL execution finished success.
diff --git a/infra/executor/src/test/java/org/apache/shardingsphere/infra/executor/check/fixture/SQLCheckerFixture.java b/infra/executor/src/test/java/org/apache/shardingsphere/infra/executor/check/fixture/SQLCheckerFixture.java
index 001c62fb073..b8622998a20 100644
--- a/infra/executor/src/test/java/org/apache/shardingsphere/infra/executor/check/fixture/SQLCheckerFixture.java
+++ b/infra/executor/src/test/java/org/apache/shardingsphere/infra/executor/check/fixture/SQLCheckerFixture.java
@@ -36,7 +36,7 @@ public final class SQLCheckerFixture implements SQLChecker<MockedRule> {
}
@Override
- public SQLCheckResult check(final SQLStatementContext<?> sqlStatementContext, final List<Object> parameters, final Grantee grantee, final String currentDatabase,
+ public SQLCheckResult check(final SQLStatementContext<?> sqlStatementContext, final List<Object> params, final Grantee grantee, final String currentDatabase,
final Map<String, ShardingSphereDatabase> databases, final MockedRule rule) {
return null;
}
diff --git a/infra/executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/context/ExecutionContextBuilderTest.java b/infra/executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/context/ExecutionContextBuilderTest.java
index a88ae47b48f..9a30df80f56 100644
--- a/infra/executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/context/ExecutionContextBuilderTest.java
+++ b/infra/executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/context/ExecutionContextBuilderTest.java
@@ -39,7 +39,6 @@ import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.LinkedHashSet;
-import java.util.List;
import java.util.Map;
import static org.hamcrest.CoreMatchers.is;
@@ -52,15 +51,14 @@ public final class ExecutionContextBuilderTest {
@Test
public void assertBuildGenericSQLRewriteResult() {
String sql = "sql";
- List<Object> parameters = Collections.singletonList("parameter");
- GenericSQLRewriteResult genericSQLRewriteResult = new GenericSQLRewriteResult(new SQLRewriteUnit(sql, parameters));
+ GenericSQLRewriteResult genericSQLRewriteResult = new GenericSQLRewriteResult(new SQLRewriteUnit(sql, Collections.singletonList("foo_param")));
ShardingSphereResourceMetaData resourceMetaData = mock(ShardingSphereResourceMetaData.class);
String firstDataSourceName = "firstDataSourceName";
when(resourceMetaData.getAllInstanceDataSourceNames()).thenReturn(Arrays.asList(firstDataSourceName, "lastDataSourceName"));
ShardingSphereRuleMetaData ruleMetaData = new ShardingSphereRuleMetaData(Collections.emptyList());
ShardingSphereDatabase database = new ShardingSphereDatabase(DefaultDatabase.LOGIC_NAME, mock(DatabaseType.class), resourceMetaData, ruleMetaData, buildDatabase());
Collection<ExecutionUnit> actual = ExecutionContextBuilder.build(database, genericSQLRewriteResult, mock(SQLStatementContext.class));
- Collection<ExecutionUnit> expected = Collections.singletonList(new ExecutionUnit(firstDataSourceName, new SQLUnit(sql, parameters)));
+ Collection<ExecutionUnit> expected = Collections.singletonList(new ExecutionUnit(firstDataSourceName, new SQLUnit(sql, Collections.singletonList("foo_param"))));
assertThat(actual, is(expected));
}
diff --git a/infra/executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/hook/fixture/SQLExecutionHookFixture.java b/infra/executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/hook/fixture/SQLExecutionHookFixture.java
index 32076230d5f..f627d52bf2f 100644
--- a/infra/executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/hook/fixture/SQLExecutionHookFixture.java
+++ b/infra/executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/hook/fixture/SQLExecutionHookFixture.java
@@ -30,7 +30,7 @@ public final class SQLExecutionHookFixture implements SQLExecutionHook {
private static final Collection<String> ACTIONS = new LinkedList<>();
@Override
- public void start(final String dataSourceName, final String sql, final List<Object> parameters,
+ public void start(final String dataSourceName, final String sql, final List<Object> params,
final DataSourceMetaData dataSourceMetaData, final boolean isTrunkThread, final Map<String, Object> shardingExecuteDataMap) {
ACTIONS.add("start");
}
diff --git a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/SQLRewriteEntry.java b/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/SQLRewriteEntry.java
index d0f9b49b78e..47be0b22725 100644
--- a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/SQLRewriteEntry.java
+++ b/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/SQLRewriteEntry.java
@@ -62,15 +62,15 @@ public final class SQLRewriteEntry {
* Rewrite.
*
* @param sql SQL
- * @param parameters SQL parameters
+ * @param params SQL parameters
* @param sqlStatementContext SQL statement context
* @param routeContext route context
* @param connectionContext connection context
* @return route unit and SQL rewrite result map
*/
- public SQLRewriteResult rewrite(final String sql, final List<Object> parameters, final SQLStatementContext<?> sqlStatementContext,
+ public SQLRewriteResult rewrite(final String sql, final List<Object> params, final SQLStatementContext<?> sqlStatementContext,
final RouteContext routeContext, final ConnectionContext connectionContext) {
- SQLRewriteContext sqlRewriteContext = createSQLRewriteContext(sql, parameters, sqlStatementContext, routeContext, connectionContext);
+ SQLRewriteContext sqlRewriteContext = createSQLRewriteContext(sql, params, sqlStatementContext, routeContext, connectionContext);
SQLTranslatorRule rule = globalRuleMetaData.getSingleRule(SQLTranslatorRule.class);
DatabaseType protocolType = database.getProtocolType();
Map<String, DatabaseType> storageTypes = database.getResourceMetaData().getStorageTypes();
@@ -79,9 +79,9 @@ public final class SQLRewriteEntry {
: new RouteSQLRewriteEngine(rule, protocolType, storageTypes).rewrite(sqlRewriteContext, routeContext);
}
- private SQLRewriteContext createSQLRewriteContext(final String sql, final List<Object> parameters, final SQLStatementContext<?> sqlStatementContext,
+ private SQLRewriteContext createSQLRewriteContext(final String sql, final List<Object> params, final SQLStatementContext<?> sqlStatementContext,
final RouteContext routeContext, final ConnectionContext connectionContext) {
- SQLRewriteContext result = new SQLRewriteContext(database.getName(), database.getSchemas(), sqlStatementContext, sql, parameters, connectionContext);
+ SQLRewriteContext result = new SQLRewriteContext(database.getName(), database.getSchemas(), sqlStatementContext, sql, params, connectionContext);
decorate(decorators, result, routeContext);
result.generateSQLTokens();
return result;
diff --git a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/context/SQLRewriteContext.java b/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/context/SQLRewriteContext.java
index f987a17b67d..7500398e37a 100644
--- a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/context/SQLRewriteContext.java
+++ b/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/context/SQLRewriteContext.java
@@ -62,18 +62,18 @@ public final class SQLRewriteContext {
private final ConnectionContext connectionContext;
public SQLRewriteContext(final String databaseName, final Map<String, ShardingSphereSchema> schemas,
- final SQLStatementContext<?> sqlStatementContext, final String sql, final List<Object> parameters, final ConnectionContext connectionContext) {
+ final SQLStatementContext<?> sqlStatementContext, final String sql, final List<Object> params, final ConnectionContext connectionContext) {
this.databaseName = databaseName;
this.schemas = schemas;
this.sqlStatementContext = sqlStatementContext;
this.sql = sql;
- this.parameters = parameters;
+ this.parameters = params;
this.connectionContext = connectionContext;
addSQLTokenGenerators(new DefaultTokenGeneratorBuilder(sqlStatementContext).getSQLTokenGenerators());
parameterBuilder = ((sqlStatementContext instanceof InsertStatementContext) && (null == ((InsertStatementContext) sqlStatementContext).getInsertSelectContext()))
? new GroupedParameterBuilder(
((InsertStatementContext) sqlStatementContext).getGroupedParameters(), ((InsertStatementContext) sqlStatementContext).getOnDuplicateKeyUpdateParameters())
- : new StandardParameterBuilder(parameters);
+ : new StandardParameterBuilder(params);
}
/**
diff --git a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/engine/RouteSQLRewriteEngine.java b/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/engine/RouteSQLRewriteEngine.java
index 44672c1750f..2381a73b9c8 100644
--- a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/engine/RouteSQLRewriteEngine.java
+++ b/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/engine/RouteSQLRewriteEngine.java
@@ -77,17 +77,17 @@ public final class RouteSQLRewriteEngine {
private SQLRewriteUnit createSQLRewriteUnit(final SQLRewriteContext sqlRewriteContext, final RouteContext routeContext, final Collection<RouteUnit> routeUnits) {
Collection<String> sql = new LinkedList<>();
- List<Object> parameters = new LinkedList<>();
+ List<Object> params = new LinkedList<>();
boolean containsDollarMarker = sqlRewriteContext.getSqlStatementContext() instanceof SelectStatementContext
&& ((SelectStatementContext) (sqlRewriteContext.getSqlStatementContext())).isContainsDollarParameterMarker();
for (RouteUnit each : routeUnits) {
sql.add(SQLUtil.trimSemicolon(new RouteSQLBuilder(sqlRewriteContext, each).toSQL()));
- if (containsDollarMarker && !parameters.isEmpty()) {
+ if (containsDollarMarker && !params.isEmpty()) {
continue;
}
- parameters.addAll(getParameters(sqlRewriteContext.getParameterBuilder(), routeContext, each));
+ params.addAll(getParameters(sqlRewriteContext.getParameterBuilder(), routeContext, each));
}
- return new SQLRewriteUnit(String.join(" UNION ALL ", sql), parameters);
+ return new SQLRewriteUnit(String.join(" UNION ALL ", sql), params);
}
private void addSQLRewriteUnits(final Map<RouteUnit, SQLRewriteUnit> sqlRewriteUnits, final SQLRewriteContext sqlRewriteContext,
diff --git a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/parameter/builder/impl/GroupedParameterBuilder.java b/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/parameter/builder/impl/GroupedParameterBuilder.java
index b9457b94afc..d4d09aa55b2 100644
--- a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/parameter/builder/impl/GroupedParameterBuilder.java
+++ b/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/parameter/builder/impl/GroupedParameterBuilder.java
@@ -40,12 +40,12 @@ public final class GroupedParameterBuilder implements ParameterBuilder {
@Setter
private String derivedColumnName;
- public GroupedParameterBuilder(final List<List<Object>> groupedParameters, final List<Object> genericParameters) {
- parameterBuilders = new ArrayList<>(groupedParameters.size());
- for (List<Object> each : groupedParameters) {
+ public GroupedParameterBuilder(final List<List<Object>> groupedParams, final List<Object> genericParams) {
+ parameterBuilders = new ArrayList<>(groupedParams.size());
+ for (List<Object> each : groupedParams) {
parameterBuilders.add(new StandardParameterBuilder(each));
}
- genericParameterBuilder = new StandardParameterBuilder(genericParameters);
+ genericParameterBuilder = new StandardParameterBuilder(genericParams);
}
@Override
diff --git a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/parameter/builder/impl/StandardParameterBuilder.java b/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/parameter/builder/impl/StandardParameterBuilder.java
index d28d1eb354a..942395cf3fc 100644
--- a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/parameter/builder/impl/StandardParameterBuilder.java
+++ b/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/parameter/builder/impl/StandardParameterBuilder.java
@@ -47,47 +47,46 @@ public final class StandardParameterBuilder implements ParameterBuilder {
* Add added parameters.
*
* @param index parameters index to be added
- * @param parameters parameters to be added
+ * @param params parameters to be added
*/
- public void addAddedParameters(final int index, final Collection<Object> parameters) {
- addedIndexAndParameters.put(index, parameters);
+ public void addAddedParameters(final int index, final Collection<Object> params) {
+ addedIndexAndParameters.put(index, params);
}
/**
* Add replaced parameter.
*
* @param index parameter index to be replaced
- * @param parameter parameter to be replaced
+ * @param param parameter to be replaced
*/
- public void addReplacedParameters(final int index, final Object parameter) {
- replacedIndexAndParameters.put(index, parameter);
+ public void addReplacedParameters(final int index, final Object param) {
+ replacedIndexAndParameters.put(index, param);
}
@Override
public List<Object> getParameters() {
- List<Object> replacedParameters = new ArrayList<>(originalParameters);
+ List<Object> replacedParams = new ArrayList<>(originalParameters);
for (Entry<Integer, Object> entry : replacedIndexAndParameters.entrySet()) {
- replacedParameters.set(entry.getKey(), entry.getValue());
+ replacedParams.set(entry.getKey(), entry.getValue());
}
- int maxParameterIndex = getMaxParameterIndex(originalParameters, addedIndexAndParameters);
+ int maxParameterIndex = getMaxParameterIndex();
List<Object> result = new LinkedList<>();
for (int index = 0; index <= maxParameterIndex; index++) {
- List<Object> currentIndexParameters = new LinkedList<>();
- if (replacedParameters.size() > index) {
- currentIndexParameters.add(replacedParameters.get(index));
+ List<Object> currentIndexParams = new LinkedList<>();
+ if (replacedParams.size() > index) {
+ currentIndexParams.add(replacedParams.get(index));
}
if (addedIndexAndParameters.containsKey(index)) {
- currentIndexParameters.addAll(addedIndexAndParameters.get(index));
+ currentIndexParams.addAll(addedIndexAndParameters.get(index));
}
- result.addAll(currentIndexParameters);
+ result.addAll(currentIndexParams);
}
return result;
}
- private int getMaxParameterIndex(final List<Object> originalParameters, final Map<Integer, Collection<Object>> addedIndexAndParameters) {
- if (addedIndexAndParameters.isEmpty()) {
- return originalParameters.size() - 1;
- }
- return Math.max(originalParameters.size() - 1, ((TreeMap<Integer, Collection<Object>>) addedIndexAndParameters).descendingMap().firstKey());
+ private int getMaxParameterIndex() {
+ return addedIndexAndParameters.isEmpty()
+ ? originalParameters.size() - 1
+ : Math.max(originalParameters.size() - 1, ((TreeMap<Integer, Collection<Object>>) addedIndexAndParameters).descendingMap().firstKey());
}
}
diff --git a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/parameter/rewriter/ParameterRewriter.java b/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/parameter/rewriter/ParameterRewriter.java
index 168bf2bdf45..c0e87a7b116 100644
--- a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/parameter/rewriter/ParameterRewriter.java
+++ b/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/parameter/rewriter/ParameterRewriter.java
@@ -42,7 +42,7 @@ public interface ParameterRewriter<T extends SQLStatementContext<?>> {
*
* @param parameterBuilder parameter builder
* @param sqlStatementContext SQL statement context
- * @param parameters SQL parameters
+ * @param params SQL parameters
*/
- void rewrite(ParameterBuilder parameterBuilder, T sqlStatementContext, List<Object> parameters);
+ void rewrite(ParameterBuilder parameterBuilder, T sqlStatementContext, List<Object> params);
}
diff --git a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/generator/SQLTokenGenerators.java b/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/generator/SQLTokenGenerators.java
index 1c2141fe2ee..350b92bed77 100644
--- a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/generator/SQLTokenGenerators.java
+++ b/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/generator/SQLTokenGenerators.java
@@ -57,17 +57,17 @@ public final class SQLTokenGenerators {
*
* @param databaseName database name
* @param sqlStatementContext SQL statement context
- * @param parameters SQL parameters
+ * @param params SQL parameters
* @param schemas ShardingSphere schema map
* @param connectionContext connection context
* @return SQL tokens
*/
@SuppressWarnings({"rawtypes", "unchecked"})
public List<SQLToken> generateSQLTokens(final String databaseName, final Map<String, ShardingSphereSchema> schemas,
- final SQLStatementContext sqlStatementContext, final List<Object> parameters, final ConnectionContext connectionContext) {
+ final SQLStatementContext sqlStatementContext, final List<Object> params, final ConnectionContext connectionContext) {
List<SQLToken> result = new LinkedList<>();
for (SQLTokenGenerator each : sqlTokenGenerators.values()) {
- setUpSQLTokenGenerator(each, parameters, databaseName, schemas, result, connectionContext);
+ setUpSQLTokenGenerator(each, params, databaseName, schemas, result, connectionContext);
if (each instanceof OptionalSQLTokenGenerator) {
SQLToken sqlToken = ((OptionalSQLTokenGenerator) each).generateSQLToken(sqlStatementContext);
if (!result.contains(sqlToken)) {
@@ -80,10 +80,10 @@ public final class SQLTokenGenerators {
return result;
}
- private void setUpSQLTokenGenerator(final SQLTokenGenerator sqlTokenGenerator, final List<Object> parameters,
+ private void setUpSQLTokenGenerator(final SQLTokenGenerator sqlTokenGenerator, final List<Object> params,
final String databaseName, final Map<String, ShardingSphereSchema> schemas, final List<SQLToken> previousSQLTokens, final ConnectionContext connectionContext) {
if (sqlTokenGenerator instanceof ParametersAware) {
- ((ParametersAware) sqlTokenGenerator).setParameters(parameters);
+ ((ParametersAware) sqlTokenGenerator).setParameters(params);
}
if (sqlTokenGenerator instanceof SchemaMetaDataAware) {
((SchemaMetaDataAware) sqlTokenGenerator).setSchemas(schemas);
diff --git a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/generator/aware/ParametersAware.java b/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/generator/aware/ParametersAware.java
index d4cd442060f..4593d03ca46 100644
--- a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/generator/aware/ParametersAware.java
+++ b/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/token/generator/aware/ParametersAware.java
@@ -27,7 +27,7 @@ public interface ParametersAware {
/**
* Set parameters.
*
- * @param parameters parameters
+ * @param params parameters
*/
- void setParameters(List<Object> parameters);
+ void setParameters(List<Object> params);
}
diff --git a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/adapter/AbstractPreparedStatementAdapter.java b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/adapter/AbstractPreparedStatementAdapter.java
index b65629e67ac..d168a20b29a 100644
--- a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/adapter/AbstractPreparedStatementAdapter.java
+++ b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/adapter/AbstractPreparedStatementAdapter.java
@@ -274,17 +274,17 @@ public abstract class AbstractPreparedStatementAdapter extends AbstractUnsupport
parameters.set(parameterIndex - 1, value);
}
- protected final void replaySetParameter(final PreparedStatement preparedStatement, final List<Object> parameters) throws SQLException {
+ protected final void replaySetParameter(final PreparedStatement preparedStatement, final List<Object> params) throws SQLException {
setParameterMethodInvocations.clear();
- addParameters(parameters);
+ addParameters(params);
for (PreparedStatementInvocationReplayer each : setParameterMethodInvocations) {
each.replayOn(preparedStatement);
}
}
- private void addParameters(final List<Object> parameters) {
+ private void addParameters(final List<Object> params) {
int i = 0;
- for (Object each : parameters) {
+ for (Object each : params) {
int index = ++i;
setParameterMethodInvocations.add(preparedStatement -> preparedStatement.setObject(index, each));
}
diff --git a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java
index fc53e4a587e..7cd669da875 100644
--- a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java
+++ b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java
@@ -508,11 +508,11 @@ public final class ShardingSpherePreparedStatement extends AbstractPreparedState
}
private QueryContext createQueryContext() {
- List<Object> parameters = new ArrayList<>(getParameters());
+ List<Object> params = new ArrayList<>(getParameters());
if (sqlStatementContext instanceof ParameterAware) {
- ((ParameterAware) sqlStatementContext).setUpParameters(parameters);
+ ((ParameterAware) sqlStatementContext).setUpParameters(params);
}
- return new QueryContext(sqlStatementContext, sql, parameters);
+ return new QueryContext(sqlStatementContext, sql, params);
}
private MergedResult mergeQuery(final List<QueryResult> queryResults) throws SQLException {
@@ -621,9 +621,9 @@ public final class ShardingSpherePreparedStatement extends AbstractPreparedState
private void setBatchParametersForStatements() throws SQLException {
for (Statement each : batchPreparedStatementExecutor.getStatements()) {
- List<List<Object>> parameterSet = batchPreparedStatementExecutor.getParameterSet(each);
- for (List<Object> eachParameters : parameterSet) {
- replaySetParameter((PreparedStatement) each, eachParameters);
+ List<List<Object>> paramSet = batchPreparedStatementExecutor.getParameterSet(each);
+ for (List<Object> eachParams : paramSet) {
+ replaySetParameter((PreparedStatement) each, eachParams);
((PreparedStatement) each).addBatch();
}
}
diff --git a/kernel/authority/core/src/main/java/org/apache/shardingsphere/authority/checker/AuthorityChecker.java b/kernel/authority/core/src/main/java/org/apache/shardingsphere/authority/checker/AuthorityChecker.java
index 56f35d64f43..c4d324485c3 100644
--- a/kernel/authority/core/src/main/java/org/apache/shardingsphere/authority/checker/AuthorityChecker.java
+++ b/kernel/authority/core/src/main/java/org/apache/shardingsphere/authority/checker/AuthorityChecker.java
@@ -61,7 +61,7 @@ public final class AuthorityChecker implements SQLChecker<AuthorityRule> {
}
@Override
- public SQLCheckResult check(final SQLStatementContext<?> sqlStatementContext, final List<Object> parameters, final Grantee grantee,
+ public SQLCheckResult check(final SQLStatementContext<?> sqlStatementContext, final List<Object> params, final Grantee grantee,
final String currentDatabase, final Map<String, ShardingSphereDatabase> databases, final AuthorityRule rule) {
if (null == grantee) {
return new SQLCheckResult(true, "");
diff --git a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/AbstractPostgresDDLAdapter.java b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/AbstractPostgresDDLAdapter.java
index ae49a990266..0c1b6cfb85b 100644
--- a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/AbstractPostgresDDLAdapter.java
+++ b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/AbstractPostgresDDLAdapter.java
@@ -54,11 +54,11 @@ public abstract class AbstractPostgresDDLAdapter {
this.minorVersion = minorVersion;
}
- @SneakyThrows
- protected Collection<Map<String, Object>> executeByTemplate(final Map<String, Object> parameters, final String path) {
+ @SneakyThrows(SQLException.class)
+ protected Collection<Map<String, Object>> executeByTemplate(final Map<String, Object> params, final String path) {
try (
Statement statement = connection.createStatement();
- ResultSet resultSet = statement.executeQuery(PostgreSQLPipelineFreemarkerManager.getSQLByVersion(parameters, path, majorVersion, minorVersion))) {
+ ResultSet resultSet = statement.executeQuery(PostgreSQLPipelineFreemarkerManager.getSQLByVersion(params, path, majorVersion, minorVersion))) {
return getRows(resultSet);
}
}
diff --git a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/PostgresColumnPropertiesAppender.java b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/PostgresColumnPropertiesAppender.java
index 45339e17f47..d0642332793 100644
--- a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/PostgresColumnPropertiesAppender.java
+++ b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/PostgresColumnPropertiesAppender.java
@@ -92,18 +92,18 @@ public final class PostgresColumnPropertiesAppender extends AbstractPostgresDDLA
Collection<Map<String, Object>> result = new LinkedList<>();
for (Map<String, Object> each : executeByTemplate(new LinkedHashMap<>(), "component/table/%s/get_inherits.ftl")) {
if (collInherits.contains((String) each.get("inherits"))) {
- Map<String, Object> parameters = new LinkedHashMap<>();
- parameters.put("tid", each.get("oid"));
- result.addAll(executeByTemplate(parameters, "table/%s/get_columns_for_table.ftl"));
+ Map<String, Object> params = new LinkedHashMap<>();
+ params.put("tid", each.get("oid"));
+ result.addAll(executeByTemplate(params, "table/%s/get_columns_for_table.ftl"));
}
}
return result;
}
private Collection<Map<String, Object>> getColumnFromType(final Map<String, Object> context) {
- Map<String, Object> parameters = new LinkedHashMap<>();
- parameters.put("tid", context.get("typoid"));
- return executeByTemplate(parameters, "component/table/%s/get_columns_for_table.ftl");
+ Map<String, Object> params = new LinkedHashMap<>();
+ params.put("tid", context.get("typoid"));
+ return executeByTemplate(params, "component/table/%s/get_columns_for_table.ftl");
}
@SuppressWarnings("unchecked")
@@ -123,9 +123,9 @@ public final class PostgresColumnPropertiesAppender extends AbstractPostgresDDLA
private Map<String, Collection<String>> getEditTypes(final Collection<Map<String, Object>> allColumns) throws SQLException {
Map<String, Collection<String>> result = new LinkedHashMap<>();
- Map<String, Object> parameters = new LinkedHashMap<>();
- parameters.put("type_ids", allColumns.stream().map(each -> each.get("atttypid").toString()).collect(Collectors.joining(",")));
- for (Map<String, Object> each : executeByTemplate(parameters, "component/columns/%s/edit_mode_types_multi.ftl")) {
+ Map<String, Object> params = new LinkedHashMap<>();
+ params.put("type_ids", allColumns.stream().map(each -> each.get("atttypid").toString()).collect(Collectors.joining(",")));
+ for (Map<String, Object> each : executeByTemplate(params, "component/columns/%s/edit_mode_types_multi.ftl")) {
result.put(each.get("main_oid").toString(), covertPgArrayAndSort(each.get("edit_types")));
}
return result;
diff --git a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/PostgresConstraintsPropertiesAppender.java b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/PostgresConstraintsPropertiesAppender.java
index e54d8a9f819..f5014d5a2c4 100644
--- a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/PostgresConstraintsPropertiesAppender.java
+++ b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/PostgresConstraintsPropertiesAppender.java
@@ -92,11 +92,11 @@ public final class PostgresConstraintsPropertiesAppender extends AbstractPostgre
}
private void appendConstraintsInclude(final Map<String, Object> constraintsProp) {
- Map<String, Object> parameters = new LinkedHashMap<>();
- parameters.put("cid", constraintsProp.get("oid"));
+ Map<String, Object> params = new LinkedHashMap<>();
+ params.put("cid", constraintsProp.get("oid"));
Collection<Object> includes = new LinkedList<>();
if (getMajorVersion() >= PG_CONSTRAINTS_INCLUDE_VERSION) {
- for (Map<String, Object> each : executeByTemplate(parameters, "component/index_constraint/%s/get_constraint_include.ftl")) {
+ for (Map<String, Object> each : executeByTemplate(params, "component/index_constraint/%s/get_constraint_include.ftl")) {
includes.add(each.get("colname"));
}
}
@@ -115,26 +115,26 @@ public final class PostgresConstraintsPropertiesAppender extends AbstractPostgre
}
private Collection<Map<String, Object>> fetchConstraintsCols(final Map<String, Object> constraintColProps) {
- Map<String, Object> parameters = new HashMap<>();
- parameters.put("cid", constraintColProps.get("oid"));
- parameters.put("colcnt", constraintColProps.get("col_count"));
- return executeByTemplate(parameters, "component/index_constraint/%s/get_costraint_cols.ftl");
+ Map<String, Object> params = new HashMap<>();
+ params.put("cid", constraintColProps.get("oid"));
+ params.put("colcnt", constraintColProps.get("col_count"));
+ return executeByTemplate(params, "component/index_constraint/%s/get_costraint_cols.ftl");
}
private Collection<Map<String, Object>> fetchConstraintsProperties(final Map<String, Object> context, final String constraintType) {
- Map<String, Object> parameters = new HashMap<>();
- parameters.put("did", context.get("did"));
- parameters.put("tid", context.get("tid"));
- parameters.put("cid", context.get("cid"));
- parameters.put("constraint_type", constraintType);
- return executeByTemplate(parameters, "component/index_constraint/%s/properties.ftl");
+ Map<String, Object> params = new HashMap<>();
+ params.put("did", context.get("did"));
+ params.put("tid", context.get("tid"));
+ params.put("cid", context.get("cid"));
+ params.put("constraint_type", constraintType);
+ return executeByTemplate(params, "component/index_constraint/%s/properties.ftl");
}
private Collection<Map<String, Object>> getExclusionConstraints(final Map<String, Object> context) {
- Map<String, Object> parameters = new HashMap<>();
- parameters.put("tid", context.get("tid"));
- parameters.put("did", context.get("did"));
- Collection<Map<String, Object>> result = executeByTemplate(parameters, "component/exclusion_constraint/%s/properties.ftl");
+ Map<String, Object> params = new HashMap<>();
+ params.put("tid", context.get("tid"));
+ params.put("did", context.get("did"));
+ Collection<Map<String, Object>> result = executeByTemplate(params, "component/exclusion_constraint/%s/properties.ftl");
for (Map<String, Object> each : result) {
getExclusionConstraintsColumns(each);
}
@@ -142,11 +142,11 @@ public final class PostgresConstraintsPropertiesAppender extends AbstractPostgre
}
private void getExclusionConstraintsColumns(final Map<String, Object> exclusionConstraintsProps) {
- Map<String, Object> parameters = new HashMap<>();
- parameters.put("cid", exclusionConstraintsProps.get("oid"));
- parameters.put("col_count", exclusionConstraintsProps.get("col_count"));
+ Map<String, Object> params = new HashMap<>();
+ params.put("cid", exclusionConstraintsProps.get("oid"));
+ params.put("col_count", exclusionConstraintsProps.get("col_count"));
Collection<Map<String, Object>> columns = new LinkedList<>();
- for (Map<String, Object> each : executeByTemplate(parameters, "component/exclusion_constraint/%s/get_constraint_cols.ftl")) {
+ for (Map<String, Object> each : executeByTemplate(params, "component/exclusion_constraint/%s/get_constraint_cols.ftl")) {
boolean order = 0 == (((int) each.get("options")) & 1);
boolean nullsOrder = 0 != (((int) each.get("options")) & 2);
Map<String, Object> col = new HashMap<>();
@@ -172,9 +172,9 @@ public final class PostgresConstraintsPropertiesAppender extends AbstractPostgre
}
private Collection<Map<String, Object>> getForeignKeys(final Long tid) {
- Map<String, Object> parameters = new HashMap<>();
- parameters.put("tid", tid);
- Collection<Map<String, Object>> result = executeByTemplate(parameters, "component/foreign_key/%s/properties.ftl");
+ Map<String, Object> params = new HashMap<>();
+ params.put("tid", tid);
+ Collection<Map<String, Object>> result = executeByTemplate(params, "component/foreign_key/%s/properties.ftl");
for (Map<String, Object> each : result) {
Collection<Map<String, Object>> columns = new LinkedList<>();
Set<String> cols = new HashSet<>();
@@ -198,9 +198,9 @@ public final class PostgresConstraintsPropertiesAppender extends AbstractPostgre
}
private void setRemoteName(final Map<String, Object> foreignKey, final Collection<Map<String, Object>> columns) {
- Map<String, Object> parameters = new HashMap<>();
- parameters.put("tid", columns.iterator().next().get("references"));
- Collection<Map<String, Object>> parents = executeByTemplate(parameters, "component/foreign_key/%s/get_parent.ftl");
+ Map<String, Object> params = new HashMap<>();
+ params.put("tid", columns.iterator().next().get("references"));
+ Collection<Map<String, Object>> parents = executeByTemplate(params, "component/foreign_key/%s/get_parent.ftl");
for (Map<String, Object> each : parents) {
foreignKey.put("remote_schema", each.get("schema"));
foreignKey.put("remote_table", each.get("table"));
@@ -209,15 +209,15 @@ public final class PostgresConstraintsPropertiesAppender extends AbstractPostgre
}
private Collection<Map<String, Object>> getForeignKeysCols(final Long tid, final Map<String, Object> foreignKeyProps) {
- Map<String, Object> parameters = new HashMap<>();
- parameters.put("tid", tid);
+ Map<String, Object> params = new HashMap<>();
+ params.put("tid", tid);
Collection<Map<String, Object>> keys = new LinkedList<>();
Map<String, Object> key = new HashMap<>();
key.put("confkey", foreignKeyProps.get("confkey"));
key.put("conkey", foreignKeyProps.get("conkey"));
keys.add(key);
- parameters.put("keys", keys);
- return executeByTemplate(parameters, "component/foreign_key/%s/get_constraint_cols.ftl");
+ params.put("keys", keys);
+ return executeByTemplate(params, "component/foreign_key/%s/get_constraint_cols.ftl");
}
private boolean isPartitionAndConstraintInherited(final Map<String, Object> constraint, final Map<String, Object> context) {
@@ -225,9 +225,9 @@ public final class PostgresConstraintsPropertiesAppender extends AbstractPostgre
}
private Optional<String> searchCoveringIndex(final Long tid, final Set<String> cols) {
- Map<String, Object> parameters = new HashMap<>();
- parameters.put("tid", tid);
- for (Map<String, Object> each : executeByTemplate(parameters, "component/foreign_key/%s/get_constraints.ftl")) {
+ Map<String, Object> params = new HashMap<>();
+ params.put("tid", tid);
+ for (Map<String, Object> each : executeByTemplate(params, "component/foreign_key/%s/get_constraints.ftl")) {
Map<String, Object> map = new HashMap<>();
map.put("cid", each.get("oid"));
map.put("colcnt", each.get("col_count"));
@@ -265,8 +265,8 @@ public final class PostgresConstraintsPropertiesAppender extends AbstractPostgre
}
private Collection<Map<String, Object>> getCheckConstraints(final Long tid) {
- Map<String, Object> parameters = new HashMap<>();
- parameters.put("tid", tid);
- return executeByTemplate(parameters, "component/check_constraint/%s/properties.ftl");
+ Map<String, Object> params = new HashMap<>();
+ params.put("tid", tid);
+ return executeByTemplate(params, "component/check_constraint/%s/properties.ftl");
}
}
diff --git a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/PostgresTablePropertiesLoader.java b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/PostgresTablePropertiesLoader.java
index 751f86149cc..c97a0200f11 100644
--- a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/PostgresTablePropertiesLoader.java
+++ b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ddlgenerator/PostgresTablePropertiesLoader.java
@@ -55,22 +55,22 @@ public final class PostgresTablePropertiesLoader extends AbstractPostgresDDLAdap
}
private void fetchDataBaseId(final Map<String, Object> context) throws SQLException {
- Map<String, Object> parameters = new LinkedHashMap<>();
- parameters.put("databaseName", getConnection().getCatalog());
- appendFirstRow(executeByTemplate(parameters, "component/table/%s/get_database_id.ftl"), context);
+ Map<String, Object> params = new LinkedHashMap<>();
+ params.put("databaseName", getConnection().getCatalog());
+ appendFirstRow(executeByTemplate(params, "component/table/%s/get_database_id.ftl"), context);
}
private void fetchTableId(final Map<String, Object> context) {
- Map<String, Object> parameters = new LinkedHashMap<>();
- parameters.put("schemaName", schemaName);
- parameters.put("tableName", tableName);
- appendFirstRow(executeByTemplate(parameters, "component/table/%s/get_table_id.ftl"), context);
+ Map<String, Object> params = new LinkedHashMap<>();
+ params.put("schemaName", schemaName);
+ params.put("tableName", tableName);
+ appendFirstRow(executeByTemplate(params, "component/table/%s/get_table_id.ftl"), context);
}
private void fetchSchemaId(final Map<String, Object> context) {
- Map<String, Object> parameters = new LinkedHashMap<>();
- parameters.put("schemaName", schemaName);
- appendFirstRow(executeByTemplate(parameters, "component/table/%s/get_schema_id.ftl"), context);
+ Map<String, Object> params = new LinkedHashMap<>();
+ params.put("schemaName", schemaName);
+ appendFirstRow(executeByTemplate(params, "component/table/%s/get_schema_id.ftl"), context);
}
private void fetchTableProperties(final Map<String, Object> context) throws SQLException {
diff --git a/kernel/sql-federation/executor/advanced/src/main/java/org/apache/shardingsphere/sqlfederation/advanced/AdvancedSQLFederationExecutor.java b/kernel/sql-federation/executor/advanced/src/main/java/org/apache/shardingsphere/sqlfederation/advanced/AdvancedSQLFederationExecutor.java
index 34f2541e069..b6bc3b75b20 100644
--- a/kernel/sql-federation/executor/advanced/src/main/java/org/apache/shardingsphere/sqlfederation/advanced/AdvancedSQLFederationExecutor.java
+++ b/kernel/sql-federation/executor/advanced/src/main/java/org/apache/shardingsphere/sqlfederation/advanced/AdvancedSQLFederationExecutor.java
@@ -114,15 +114,15 @@ public final class AdvancedSQLFederationExecutor implements SQLFederationExecuto
ShardingSphereDatabase database = federationContext.getDatabases().get(databaseName.toLowerCase());
ShardingSphereSchema schema = database.getSchema(schemaName);
AbstractSchema sqlFederationSchema = createSQLFederationSchema(prepareEngine, database.getProtocolType(), schema, callback, federationContext);
- Map<String, Object> parameters = createParameters(federationContext.getQueryContext().getParameters());
- resultSet = execute((SelectStatementContext) sqlStatementContext, schema, sqlFederationSchema, parameters);
+ Map<String, Object> params = createParameters(federationContext.getQueryContext().getParameters());
+ resultSet = execute((SelectStatementContext) sqlStatementContext, schema, sqlFederationSchema, params);
return resultSet;
}
- private Map<String, Object> createParameters(final List<Object> parameters) {
- Map<String, Object> result = new HashMap<>(parameters.size(), 1);
+ private Map<String, Object> createParameters(final List<Object> params) {
+ Map<String, Object> result = new HashMap<>(params.size(), 1);
int index = 0;
- for (Object each : parameters) {
+ for (Object each : params) {
result.put("?" + index++, each);
}
return result;
@@ -139,7 +139,7 @@ public final class AdvancedSQLFederationExecutor implements SQLFederationExecuto
}
@SuppressWarnings("unchecked")
- private ResultSet execute(final SelectStatementContext selectStatementContext, final ShardingSphereSchema schema, final AbstractSchema sqlFederationSchema, final Map<String, Object> parameters) {
+ private ResultSet execute(final SelectStatementContext selectStatementContext, final ShardingSphereSchema schema, final AbstractSchema sqlFederationSchema, final Map<String, Object> params) {
OptimizerParserContext parserContext = optimizerContext.getParserContexts().get(databaseName);
CalciteConnectionConfig connectionConfig = new CalciteConnectionConfigImpl(parserContext.getDialectProps());
CalciteCatalogReader catalogReader = SQLFederationPlannerUtil.createCatalogReader(schemaName, sqlFederationSchema, JAVA_TYPE_FACTORY, connectionConfig);
@@ -149,7 +149,7 @@ public final class AdvancedSQLFederationExecutor implements SQLFederationExecuto
SQLOptimizeContext optimizeContext =
new SQLOptimizeEngine(converter, SQLFederationPlannerUtil.createHepPlanner()).optimize(selectStatementContext.getSqlStatement());
Bindable<Object> executablePlan = EnumerableInterpretable.toBindable(Collections.emptyMap(), null, (EnumerableRel) optimizeContext.getBestPlan(), EnumerableRel.Prefer.ARRAY);
- Enumerator<Object> enumerator = executablePlan.bind(new SQLFederationDataContext(validator, converter, parameters)).enumerator();
+ Enumerator<Object> enumerator = executablePlan.bind(new SQLFederationDataContext(validator, converter, params)).enumerator();
return new SQLFederationResultSet(enumerator, schema, sqlFederationSchema, selectStatementContext, optimizeContext.getValidatedNodeType());
}
diff --git a/kernel/sql-federation/executor/core/src/main/java/org/apache/shardingsphere/sqlfederation/executor/FilterableTableScanExecutor.java b/kernel/sql-federation/executor/core/src/main/java/org/apache/shardingsphere/sqlfederation/executor/FilterableTableScanExecutor.java
index 579878959a7..e7b73082e04 100644
--- a/kernel/sql-federation/executor/core/src/main/java/org/apache/shardingsphere/sqlfederation/executor/FilterableTableScanExecutor.java
+++ b/kernel/sql-federation/executor/core/src/main/java/org/apache/shardingsphere/sqlfederation/executor/FilterableTableScanExecutor.java
@@ -211,10 +211,9 @@ public final class FilterableTableScanExecutor implements TableScanExecutor {
}
@SneakyThrows(SQLException.class)
- private void setParameters(final PreparedStatement preparedStatement, final List<Object> parameters) {
- for (int i = 0; i < parameters.size(); i++) {
- Object parameter = parameters.get(i);
- preparedStatement.setObject(i + 1, parameter);
+ private void setParameters(final PreparedStatement preparedStatement, final List<Object> params) {
+ for (int i = 0; i < params.size(); i++) {
+ preparedStatement.setObject(i + 1, params.get(i));
}
}
@@ -270,17 +269,17 @@ public final class FilterableTableScanExecutor implements TableScanExecutor {
SQLStatement sqlStatement = new SQLStatementParserEngine(databaseType.getType(),
optimizerContext.getSqlParserRule().getSqlStatementCache(), optimizerContext.getSqlParserRule().getParseTreeCache(),
optimizerContext.getSqlParserRule().isSqlCommentParseEnabled()).parse(sql, false);
- List<Object> parameters = getParameters(sqlString.getDynamicParameters());
- SQLStatementContext<?> sqlStatementContext = SQLStatementContextFactory.newInstance(databases, parameters, sqlStatement, executorContext.getDatabaseName());
- return new QueryContext(sqlStatementContext, sql, parameters);
+ List<Object> params = getParameters(sqlString.getDynamicParameters());
+ SQLStatementContext<?> sqlStatementContext = SQLStatementContextFactory.newInstance(databases, params, sqlStatement, executorContext.getDatabaseName());
+ return new QueryContext(sqlStatementContext, sql, params);
}
- private List<Object> getParameters(final List<Integer> parameterIndexes) {
- if (null == parameterIndexes) {
+ private List<Object> getParameters(final List<Integer> paramIndexes) {
+ if (null == paramIndexes) {
return Collections.emptyList();
}
List<Object> result = new ArrayList<>();
- for (Integer each : parameterIndexes) {
+ for (Integer each : paramIndexes) {
result.add(executorContext.getFederationContext().getQueryContext().getParameters().get(each));
}
return result;
diff --git a/kernel/sql-federation/executor/core/src/main/java/org/apache/shardingsphere/sqlfederation/executor/TranslatableTableScanExecutor.java b/kernel/sql-federation/executor/core/src/main/java/org/apache/shardingsphere/sqlfederation/executor/TranslatableTableScanExecutor.java
index 8bafadeae5f..f18419ef2ef 100644
--- a/kernel/sql-federation/executor/core/src/main/java/org/apache/shardingsphere/sqlfederation/executor/TranslatableTableScanExecutor.java
+++ b/kernel/sql-federation/executor/core/src/main/java/org/apache/shardingsphere/sqlfederation/executor/TranslatableTableScanExecutor.java
@@ -213,10 +213,9 @@ public final class TranslatableTableScanExecutor implements TableScanExecutor {
}
@SneakyThrows(SQLException.class)
- private void setParameters(final PreparedStatement preparedStatement, final List<Object> parameters) {
- for (int i = 0; i < parameters.size(); i++) {
- Object parameter = parameters.get(i);
- preparedStatement.setObject(i + 1, parameter);
+ private void setParameters(final PreparedStatement preparedStatement, final List<Object> params) {
+ for (int i = 0; i < params.size(); i++) {
+ preparedStatement.setObject(i + 1, params.get(i));
}
}
@@ -287,17 +286,17 @@ public final class TranslatableTableScanExecutor implements TableScanExecutor {
SQLStatement sqlStatement = new SQLStatementParserEngine(databaseType.getType(),
optimizerContext.getSqlParserRule().getSqlStatementCache(), optimizerContext.getSqlParserRule().getParseTreeCache(),
optimizerContext.getSqlParserRule().isSqlCommentParseEnabled()).parse(sql, false);
- List<Object> parameters = getParameters(sqlString.getDynamicParameters());
- SQLStatementContext<?> sqlStatementContext = SQLStatementContextFactory.newInstance(databases, parameters, sqlStatement, executorContext.getDatabaseName());
- return new QueryContext(sqlStatementContext, sql, parameters);
+ List<Object> params = getParameters(sqlString.getDynamicParameters());
+ SQLStatementContext<?> sqlStatementContext = SQLStatementContextFactory.newInstance(databases, params, sqlStatement, executorContext.getDatabaseName());
+ return new QueryContext(sqlStatementContext, sql, params);
}
- private List<Object> getParameters(final List<Integer> parameterIndexes) {
- if (null == parameterIndexes) {
+ private List<Object> getParameters(final List<Integer> paramIndexes) {
+ if (null == paramIndexes) {
return Collections.emptyList();
}
List<Object> result = new ArrayList<>();
- for (Integer each : parameterIndexes) {
+ for (Integer each : paramIndexes) {
result.add(executorContext.getFederationContext().getQueryContext().getParameters().get(each));
}
return result;
diff --git a/kernel/sql-federation/executor/original/src/main/java/org/apache/shardingsphere/sqlfederation/original/OriginalSQLFederationExecutor.java b/kernel/sql-federation/executor/original/src/main/java/org/apache/shardingsphere/sqlfederation/original/OriginalSQLFederationExecutor.java
index 260f0c74d3f..2e1fc25be3f 100644
--- a/kernel/sql-federation/executor/original/src/main/java/org/apache/shardingsphere/sqlfederation/original/OriginalSQLFederationExecutor.java
+++ b/kernel/sql-federation/executor/original/src/main/java/org/apache/shardingsphere/sqlfederation/original/OriginalSQLFederationExecutor.java
@@ -129,9 +129,9 @@ public final class OriginalSQLFederationExecutor implements SQLFederationExecuto
connection.setSchema(schemaName);
}
- private void setParameters(final PreparedStatement preparedStatement, final List<Object> parameters) throws SQLException {
+ private void setParameters(final PreparedStatement preparedStatement, final List<Object> params) throws SQLException {
int count = 1;
- for (Object each : parameters) {
+ for (Object each : params) {
preparedStatement.setObject(count, each);
count++;
}
diff --git a/kernel/sql-federation/optimizer/src/main/java/org/apache/shardingsphere/sqlfederation/optimizer/converter/segment/projection/impl/AggregationProjectionConverter.java b/kernel/sql-federation/optimizer/src/main/java/org/apache/shardingsphere/sqlfederation/optimizer/converter/segment/projection/impl/AggregationProjectionConverter.java
index f5094504aa5..94bc8963aeb 100644
--- a/kernel/sql-federation/optimizer/src/main/java/org/apache/shardingsphere/sqlfederation/optimizer/converter/segment/projection/impl/AggregationProjectionConverter.java
+++ b/kernel/sql-federation/optimizer/src/main/java/org/apache/shardingsphere/sqlfederation/optimizer/converter/segment/projection/impl/AggregationProjectionConverter.java
@@ -68,8 +68,8 @@ public final class AggregationProjectionConverter implements SQLSegmentConverter
}
SqlLiteral functionQuantifier = segment instanceof AggregationDistinctProjectionSegment ? SqlLiteral.createSymbol(SqlSelectKeyword.DISTINCT, SqlParserPos.ZERO) : null;
SqlAggFunction operator = convertOperator(segment.getType().name());
- List<SqlNode> parameters = convertParameters(segment.getParameters(), segment.getInnerExpression());
- SqlBasicCall sqlBasicCall = new SqlBasicCall(operator, parameters, SqlParserPos.ZERO, functionQuantifier);
+ List<SqlNode> params = convertParameters(segment.getParameters(), segment.getInnerExpression());
+ SqlBasicCall sqlBasicCall = new SqlBasicCall(operator, params, SqlParserPos.ZERO, functionQuantifier);
if (segment.getAlias().isPresent()) {
return Optional.of(new SqlBasicCall(SqlStdOperatorTable.AS, Arrays.asList(sqlBasicCall,
SqlIdentifier.star(Collections.singletonList(segment.getAlias().get()), SqlParserPos.ZERO, Collections.singletonList(SqlParserPos.ZERO))), SqlParserPos.ZERO));
@@ -82,13 +82,13 @@ public final class AggregationProjectionConverter implements SQLSegmentConverter
return REGISTRY.get(operator);
}
- private List<SqlNode> convertParameters(final Collection<ExpressionSegment> parameters, final String innerExpression) {
+ private List<SqlNode> convertParameters(final Collection<ExpressionSegment> params, final String innerExpression) {
if (innerExpression.contains("*")) {
return Collections.singletonList(SqlIdentifier.star(SqlParserPos.ZERO));
}
List<SqlNode> result = new LinkedList<>();
ExpressionConverter expressionConverter = new ExpressionConverter();
- for (ExpressionSegment each : parameters) {
+ for (ExpressionSegment each : params) {
expressionConverter.convert(each).ifPresent(result::add);
}
return result;
diff --git a/kernel/traffic/core/src/main/java/org/apache/shardingsphere/traffic/executor/TrafficExecutor.java b/kernel/traffic/core/src/main/java/org/apache/shardingsphere/traffic/executor/TrafficExecutor.java
index cd09896a8bb..4aa5856962b 100644
--- a/kernel/traffic/core/src/main/java/org/apache/shardingsphere/traffic/executor/TrafficExecutor.java
+++ b/kernel/traffic/core/src/main/java/org/apache/shardingsphere/traffic/executor/TrafficExecutor.java
@@ -49,17 +49,17 @@ public final class TrafficExecutor implements AutoCloseable {
return callback.execute(statement, sqlUnit.getSql());
}
- private void cacheStatement(final List<Object> parameters, final Statement statement) throws SQLException {
+ private void cacheStatement(final List<Object> params, final Statement statement) throws SQLException {
this.statement = statement;
- setParameters(statement, parameters);
+ setParameters(statement, params);
}
- private void setParameters(final Statement statement, final List<Object> parameters) throws SQLException {
+ private void setParameters(final Statement statement, final List<Object> params) throws SQLException {
if (!(statement instanceof PreparedStatement)) {
return;
}
int index = 1;
- for (Object each : parameters) {
+ for (Object each : params) {
((PreparedStatement) statement).setObject(index++, each);
}
}
diff --git a/kernel/transaction/type/base/seata-at/src/main/java/org/apache/shardingsphere/transaction/base/seata/at/TransactionalSQLExecutionHook.java b/kernel/transaction/type/base/seata-at/src/main/java/org/apache/shardingsphere/transaction/base/seata/at/TransactionalSQLExecutionHook.java
index 557d2c4059c..68d44dca0f5 100644
--- a/kernel/transaction/type/base/seata-at/src/main/java/org/apache/shardingsphere/transaction/base/seata/at/TransactionalSQLExecutionHook.java
+++ b/kernel/transaction/type/base/seata-at/src/main/java/org/apache/shardingsphere/transaction/base/seata/at/TransactionalSQLExecutionHook.java
@@ -35,7 +35,7 @@ public final class TransactionalSQLExecutionHook implements SQLExecutionHook {
private boolean seataBranch;
@Override
- public void start(final String dataSourceName, final String sql, final List<Object> parameters,
+ public void start(final String dataSourceName, final String sql, final List<Object> params,
final DataSourceMetaData dataSourceMetaData, final boolean isTrunkThread, final Map<String, Object> shardingExecuteDataMap) {
if (isTrunkThread) {
if (RootContext.inGlobalTransaction()) {
diff --git a/proxy/frontend/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/execute/MySQLComStmtExecuteExecutor.java b/proxy/frontend/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/execute/MySQLComStmtExecuteExecutor.java
index dd471aa8c82..bd8737001da 100644
--- a/proxy/frontend/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/execute/MySQLComStmtExecuteExecutor.java
+++ b/proxy/frontend/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/execute/MySQLComStmtExecuteExecutor.java
@@ -71,13 +71,13 @@ public final class MySQLComStmtExecuteExecutor implements QueryCommandExecutor {
@Override
public Collection<DatabasePacket<?>> execute() throws SQLException {
MySQLServerPreparedStatement preparedStatement = updateAndGetPreparedStatement();
- List<Object> parameters = packet.readParameters(preparedStatement.getParameterTypes(), preparedStatement.getLongData().keySet());
- preparedStatement.getLongData().forEach(parameters::set);
+ List<Object> params = packet.readParameters(preparedStatement.getParameterTypes(), preparedStatement.getLongData().keySet());
+ preparedStatement.getLongData().forEach(params::set);
SQLStatementContext<?> sqlStatementContext = preparedStatement.getSqlStatementContext();
if (sqlStatementContext instanceof ParameterAware) {
- ((ParameterAware) sqlStatementContext).setUpParameters(parameters);
+ ((ParameterAware) sqlStatementContext).setUpParameters(params);
}
- QueryContext queryContext = new QueryContext(sqlStatementContext, preparedStatement.getSql(), parameters);
+ QueryContext queryContext = new QueryContext(sqlStatementContext, preparedStatement.getSql(), params);
connectionSession.setQueryContext(queryContext);
proxyBackendHandler = ProxyBackendHandlerFactory.newInstance(DatabaseTypeFactory.getInstance("MySQL"), queryContext, connectionSession, true);
ResponseHeader responseHeader = proxyBackendHandler.execute();
diff --git a/proxy/frontend/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/JDBCPortal.java b/proxy/frontend/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/JDBCPortal.java
index 05ca9fae920..ac95a2cb08e 100644
--- a/proxy/frontend/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/JDBCPortal.java
+++ b/proxy/frontend/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/JDBCPortal.java
@@ -78,7 +78,7 @@ public final class JDBCPortal implements Portal<Void> {
private ResponseHeader responseHeader;
- public JDBCPortal(final String name, final PostgreSQLServerPreparedStatement preparedStatement, final List<Object> parameters, final List<PostgreSQLValueFormat> resultFormats,
+ public JDBCPortal(final String name, final PostgreSQLServerPreparedStatement preparedStatement, final List<Object> params, final List<PostgreSQLValueFormat> resultFormats,
final JDBCBackendConnection backendConnection) throws SQLException {
this.name = name;
this.sqlStatement = preparedStatement.getSqlStatementContext().getSqlStatement();
@@ -87,10 +87,10 @@ public final class JDBCPortal implements Portal<Void> {
String databaseName = backendConnection.getConnectionSession().getDefaultDatabaseName();
SQLStatementContext<?> sqlStatementContext = preparedStatement.getSqlStatementContext();
if (sqlStatementContext instanceof ParameterAware) {
- ((ParameterAware) sqlStatementContext).setUpParameters(parameters);
+ ((ParameterAware) sqlStatementContext).setUpParameters(params);
}
DatabaseType protocolType = ProxyContext.getInstance().getDatabase(databaseName).getProtocolType();
- QueryContext queryContext = new QueryContext(sqlStatementContext, preparedStatement.getSql(), parameters);
+ QueryContext queryContext = new QueryContext(sqlStatementContext, preparedStatement.getSql(), params);
backendConnection.getConnectionSession().setQueryContext(queryContext);
proxyBackendHandler = ProxyBackendHandlerFactory.newInstance(protocolType, queryContext, backendConnection.getConnectionSession(), true);
}
diff --git a/proxy/frontend/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/PostgreSQLBatchedStatementsExecutor.java b/proxy/frontend/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/PostgreSQLBatchedStatementsExecutor.java
index 640b1f41b5e..c9b8741d282 100644
--- a/proxy/frontend/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/PostgreSQLBatchedStatementsExecutor.java
+++ b/proxy/frontend/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/PostgreSQLBatchedStatementsExecutor.java
@@ -103,14 +103,14 @@ public final class PostgreSQLBatchedStatementsExecutor {
prepareForRestOfParametersSet(parameterSetsIterator, sqlStatementContext);
}
- private SQLStatementContext<?> createSQLStatementContext(final List<Object> parameters) {
- return SQLStatementContextFactory.newInstance(metaDataContexts.getMetaData().getDatabases(), parameters, preparedStatement.getSqlStatementContext().getSqlStatement(),
+ private SQLStatementContext<?> createSQLStatementContext(final List<Object> params) {
+ return SQLStatementContextFactory.newInstance(metaDataContexts.getMetaData().getDatabases(), params, preparedStatement.getSqlStatementContext().getSqlStatement(),
connectionSession.getDatabaseName());
}
- private void prepareForRestOfParametersSet(final Iterator<List<Object>> parameterSetsIterator, final SQLStatementContext<?> sqlStatementContext) {
- while (parameterSetsIterator.hasNext()) {
- List<Object> eachGroupOfParameter = parameterSetsIterator.next();
+ private void prepareForRestOfParametersSet(final Iterator<List<Object>> paramSetsIterator, final SQLStatementContext<?> sqlStatementContext) {
+ while (paramSetsIterator.hasNext()) {
+ List<Object> eachGroupOfParameter = paramSetsIterator.next();
if (sqlStatementContext instanceof ParameterAware) {
((ParameterAware) sqlStatementContext).setUpParameters(eachGroupOfParameter);
}
@@ -121,8 +121,8 @@ public final class PostgreSQLBatchedStatementsExecutor {
}
}
- private QueryContext createQueryContext(final SQLStatementContext<?> sqlStatementContext, final List<Object> parameters) {
- return new QueryContext(sqlStatementContext, preparedStatement.getSql(), parameters);
+ private QueryContext createQueryContext(final SQLStatementContext<?> sqlStatementContext, final List<Object> params) {
+ return new QueryContext(sqlStatementContext, preparedStatement.getSql(), params);
}
private ExecutionContext createExecutionContext(final QueryContext queryContext) {
diff --git a/proxy/frontend/reactive-mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/reactive/mysql/command/query/binary/execute/ReactiveMySQLComStmtExecuteExecutor.java b/proxy/frontend/reactive-mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/reactive/mysql/command/query/binary/execute/ReactiveMySQLComStmtExecuteExecutor.java
index 8550d604f9f..79a812a50cd 100644
--- a/proxy/frontend/reactive-mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/reactive/mysql/command/query/binary/execute/ReactiveMySQLComStmtExecuteExecutor.java
+++ b/proxy/frontend/reactive-mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/reactive/mysql/command/query/binary/execute/ReactiveMySQLComStmtExecuteExecutor.java
@@ -85,18 +85,18 @@ public final class ReactiveMySQLComStmtExecuteExecutor implements ReactiveComman
@Override
public Future<Collection<DatabasePacket<?>>> executeFuture() {
MySQLServerPreparedStatement preparedStatement = updateAndGetPreparedStatement();
- List<Object> parameters = packet.readParameters(preparedStatement.getParameterTypes(), preparedStatement.getLongData().keySet());
- preparedStatement.getLongData().forEach(parameters::set);
+ List<Object> params = packet.readParameters(preparedStatement.getParameterTypes(), preparedStatement.getLongData().keySet());
+ preparedStatement.getLongData().forEach(params::set);
SQLStatementContext<?> sqlStatementContext = preparedStatement.getSqlStatementContext();
if (sqlStatementContext instanceof ParameterAware) {
- ((ParameterAware) sqlStatementContext).setUpParameters(parameters);
+ ((ParameterAware) sqlStatementContext).setUpParameters(params);
}
- QueryContext queryContext = new QueryContext(sqlStatementContext, preparedStatement.getSql(), parameters);
+ QueryContext queryContext = new QueryContext(sqlStatementContext, preparedStatement.getSql(), params);
connectionSession.setQueryContext(queryContext);
SQLStatement sqlStatement = preparedStatement.getSqlStatementContext().getSqlStatement();
String databaseName = connectionSession.getDatabaseName();
MetaDataContexts metaDataContexts = ProxyContext.getInstance().getContextManager().getMetaDataContexts();
- SQLCheckEngine.check(sqlStatementContext, parameters, getRules(databaseName), databaseName, metaDataContexts.getMetaData().getDatabases(), connectionSession.getGrantee());
+ SQLCheckEngine.check(sqlStatementContext, params, getRules(databaseName), databaseName, metaDataContexts.getMetaData().getDatabases(), connectionSession.getGrantee());
int characterSet = connectionSession.getAttributeMap().attr(MySQLConstants.MYSQL_CHARACTER_SET_ATTRIBUTE_KEY).get().getId();
// TODO Refactor the following branch
if (sqlStatement instanceof TCLStatement) {
diff --git a/sql-parser/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/impl/MySQLDMLStatementSQLVisitor.java b/sql-parser/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/impl/MySQLDMLStatementSQLVisitor.java
index d2ba08ddfa9..fb221db80dd 100644
--- a/sql-parser/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/impl/MySQLDMLStatementSQLVisitor.java
+++ b/sql-parser/dialect/mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/statement/impl/MySQLDMLStatementSQLVisitor.java
@@ -43,15 +43,15 @@ public final class MySQLDMLStatementSQLVisitor extends MySQLStatementSQLVisitor
@Override
public ASTNode visitCall(final CallContext ctx) {
- List<ExpressionSegment> parameters = new ArrayList<>();
- ctx.expr().forEach(each -> parameters.add((ExpressionSegment) visit(each)));
- return new MySQLCallStatement(ctx.identifier().getText(), parameters);
+ List<ExpressionSegment> params = new ArrayList<>();
+ ctx.expr().forEach(each -> params.add((ExpressionSegment) visit(each)));
+ return new MySQLCallStatement(ctx.identifier().getText(), params);
}
@Override
public ASTNode visitDoStatement(final DoStatementContext ctx) {
- List<ExpressionSegment> parameters = new ArrayList<>();
- ctx.expr().forEach(each -> parameters.add((ExpressionSegment) visit(each)));
- return new MySQLDoStatement(parameters);
+ List<ExpressionSegment> params = new ArrayList<>();
+ ctx.expr().forEach(each -> params.add((ExpressionSegment) visit(each)));
+ return new MySQLDoStatement(params);
}
}
diff --git a/sql-parser/dialect/postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/impl/PostgreSQLDMLStatementSQLVisitor.java b/sql-parser/dialect/postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/impl/PostgreSQLDMLStatementSQLVisitor.java
index 9f08ac12814..fe27cd49999 100644
--- a/sql-parser/dialect/postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/impl/PostgreSQLDMLStatementSQLVisitor.java
+++ b/sql-parser/dialect/postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/impl/PostgreSQLDMLStatementSQLVisitor.java
@@ -66,11 +66,11 @@ public final class PostgreSQLDMLStatementSQLVisitor extends PostgreSQLStatementS
PostgreSQLCallStatement result = new PostgreSQLCallStatement();
result.setProcedureName(((IdentifierValue) visit(ctx.identifier())).getValue());
if (null != ctx.callArguments()) {
- Collection<ExpressionSegment> parameters = new LinkedList<>();
+ Collection<ExpressionSegment> params = new LinkedList<>();
for (CallArgumentContext each : ctx.callArguments().callArgument()) {
- parameters.add((ExpressionSegment) visit(each));
+ params.add((ExpressionSegment) visit(each));
}
- result.getParameters().addAll(parameters);
+ result.getParameters().addAll(params);
}
return result;
}
diff --git a/test/integration-test/fixture/src/test/java/org/apache/shardingsphere/test/integration/fixture/ITShardingAuditAlgorithmFixture.java b/test/integration-test/fixture/src/test/java/org/apache/shardingsphere/test/integration/fixture/ITShardingAuditAlgorithmFixture.java
index a8f1dee6d6b..aa875ecbb43 100644
--- a/test/integration-test/fixture/src/test/java/org/apache/shardingsphere/test/integration/fixture/ITShardingAuditAlgorithmFixture.java
+++ b/test/integration-test/fixture/src/test/java/org/apache/shardingsphere/test/integration/fixture/ITShardingAuditAlgorithmFixture.java
@@ -38,7 +38,7 @@ public final class ITShardingAuditAlgorithmFixture implements ShardingAuditAlgor
}
@Override
- public SQLCheckResult check(final SQLStatementContext<?> sqlStatementContext, final List<Object> parameters, final Grantee grantee, final ShardingSphereDatabase database) {
+ public SQLCheckResult check(final SQLStatementContext<?> sqlStatementContext, final List<Object> params, final Grantee grantee, final ShardingSphereDatabase database) {
return new SQLCheckResult(true, "");
}
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/distsql/loader/DistSQLCasesLoader.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/distsql/loader/DistSQLCasesLoader.java
index dd62847bb79..3d5268cf8e4 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/distsql/loader/DistSQLCasesLoader.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/distsql/loader/DistSQLCasesLoader.java
@@ -54,15 +54,15 @@ public final class DistSQLCasesLoader extends CasesLoader {
public Collection<Object[]> getTestParameters(final Collection<String> databaseTypes) {
Collection<Object[]> result = new LinkedList<>();
for (Case each : super.getCases().values()) {
- Object[] parameters = new Object[1];
- parameters[0] = each.getId();
- result.add(parameters);
+ Object[] params = new Object[1];
+ params[0] = each.getId();
+ result.add(params);
}
return result;
}
@Override
- public String getCaseValue(final String sqlCaseId, final SQLCaseType sqlCaseType, final List<?> parameters, final String databaseType) {
+ public String getCaseValue(final String sqlCaseId, final SQLCaseType sqlCaseType, final List<?> params, final String databaseType) {
Map<String, Case> sqlCaseMap = super.getCases();
Preconditions.checkState(sqlCaseMap.containsKey(sqlCaseId), "Can't find case of ID: %s", sqlCaseId);
DistSQLCase statement = (DistSQLCase) sqlCaseMap.get(sqlCaseId);
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/sql/loader/SQLCasesLoader.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/sql/loader/SQLCasesLoader.java
index d91690fe019..5eb8fb2c27f 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/sql/loader/SQLCasesLoader.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/sql/loader/SQLCasesLoader.java
@@ -66,15 +66,15 @@ public final class SQLCasesLoader extends CasesLoader {
*
* @param sqlCaseId SQL case ID
* @param sqlCaseType SQL case type
- * @param parameters SQL parameters
+ * @param params SQL parameters
* @param databaseType databaseType
* @return SQL
*/
@Override
- public String getCaseValue(final String sqlCaseId, final SQLCaseType sqlCaseType, final List<?> parameters, final String databaseType) {
+ public String getCaseValue(final String sqlCaseId, final SQLCaseType sqlCaseType, final List<?> params, final String databaseType) {
switch (sqlCaseType) {
case Literal:
- return getLiteralSQL(getSQLFromMap(sqlCaseId, super.getCases()), parameters);
+ return getLiteralSQL(getSQLFromMap(sqlCaseId, super.getCases()), params);
case Placeholder:
return getPlaceholderSQL(getSQLFromMap(sqlCaseId, super.getCases()));
default:
@@ -107,11 +107,11 @@ public final class SQLCasesLoader extends CasesLoader {
return sql;
}
- private String getLiteralSQL(final String sql, final List<?> parameters) {
- if (null == parameters || parameters.isEmpty()) {
+ private String getLiteralSQL(final String sql, final List<?> params) {
+ if (null == params || params.isEmpty()) {
return sql;
}
- return replace(sql, parameters.toArray());
+ return replace(sql, params.toArray());
}
private Collection<Object[]> getSQLTestParameters(final Collection<String> databaseTypes, final SQLCase sqlCase) {
@@ -126,11 +126,11 @@ public final class SQLCasesLoader extends CasesLoader {
Collection<Object[]> result = new LinkedList<>();
for (String each : getDatabaseTypes(sqlCase.getDatabaseTypes())) {
if (databaseTypes.contains(each)) {
- Object[] parameters = new Object[3];
- parameters[0] = sqlCase.getId();
- parameters[1] = each;
- parameters[2] = sqlCaseType;
- result.add(parameters);
+ Object[] params = new Object[3];
+ params[0] = sqlCase.getId();
+ params[1] = each;
+ params[2] = sqlCaseType;
+ result.add(params);
}
}
return result;
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/loader/CasesLoader.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/loader/CasesLoader.java
index 3ef80ecc206..04089697f98 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/loader/CasesLoader.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/loader/CasesLoader.java
@@ -88,11 +88,11 @@ public abstract class CasesLoader {
*
* @param sqlCaseId case ID
* @param sqlCaseType SQL case type
- * @param parameters SQL parameters
+ * @param params SQL parameters
* @param databaseType databaseType
* @return SQL
*/
- public abstract String getCaseValue(String sqlCaseId, SQLCaseType sqlCaseType, List<?> parameters, String databaseType);
+ public abstract String getCaseValue(String sqlCaseId, SQLCaseType sqlCaseType, List<?> params, String databaseType);
/**
* Get all SQL case IDs.
diff --git a/test/rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/engine/parameter/SQLRewriteEngineTestParametersBuilder.java b/test/rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/engine/parameter/SQLRewriteEngineTestParametersBuilder.java
index cb4b40640ec..2cf64d65424 100644
--- a/test/rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/engine/parameter/SQLRewriteEngineTestParametersBuilder.java
+++ b/test/rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/engine/parameter/SQLRewriteEngineTestParametersBuilder.java
@@ -112,18 +112,18 @@ public final class SQLRewriteEngineTestParametersBuilder {
return Arrays.asList("MySQL", "PostgreSQL", "Oracle", "SQLServer", "SQL92", "openGauss");
}
- private static List<Object> createParameters(final String inputParameters) {
- if (null == inputParameters) {
+ private static List<Object> createParameters(final String inputParams) {
+ if (null == inputParams) {
return Collections.emptyList();
}
- return Splitter.on(",").trimResults().splitToList(inputParameters).stream().map(SQLRewriteEngineTestParametersBuilder::createInputParameter).collect(Collectors.toList());
+ return Splitter.on(",").trimResults().splitToList(inputParams).stream().map(SQLRewriteEngineTestParametersBuilder::createInputParameter).collect(Collectors.toList());
}
- private static Object createInputParameter(final String inputParameter) {
- if (StringUtils.isNumeric(inputParameter)) {
- return NumberUtils.createNumber(inputParameter);
+ private static Object createInputParameter(final String inputParam) {
+ if (StringUtils.isNumeric(inputParam)) {
+ return NumberUtils.createNumber(inputParam);
}
- return "NULL".equals(inputParameter) ? null : inputParameter;
+ return "NULL".equals(inputParam) ? null : inputParam;
}
private static List<String> createOutputSQLs(final List<RewriteOutputEntity> outputs) {
diff --git a/test/rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/scenario/EncryptSQLRewriterParameterizedTest.java b/test/rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/scenario/EncryptSQLRewriterParameterizedTest.java
index 2ab0d7483d3..9b3e3c37af5 100644
--- a/test/rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/scenario/EncryptSQLRewriterParameterizedTest.java
+++ b/test/rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/scenario/EncryptSQLRewriterParameterizedTest.java
@@ -56,8 +56,8 @@ public final class EncryptSQLRewriterParameterizedTest extends AbstractSQLRewrit
private static final String CASE_PATH = "scenario/encrypt/case";
- public EncryptSQLRewriterParameterizedTest(final String type, final String name, final String fileName, final String databaseType, final SQLRewriteEngineTestParameters testParameters) {
- super(testParameters);
+ public EncryptSQLRewriterParameterizedTest(final String type, final String name, final String fileName, final String databaseType, final SQLRewriteEngineTestParameters testParams) {
+ super(testParams);
}
@Parameters(name = "{0}: {1} ({3}) -> {2}")
diff --git a/test/rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/scenario/MixSQLRewriterParameterizedTest.java b/test/rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/scenario/MixSQLRewriterParameterizedTest.java
index 84c42f6c61e..e0b113f1420 100644
--- a/test/rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/scenario/MixSQLRewriterParameterizedTest.java
+++ b/test/rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/scenario/MixSQLRewriterParameterizedTest.java
@@ -49,9 +49,8 @@ public final class MixSQLRewriterParameterizedTest extends AbstractSQLRewriterPa
private static final String CASE_PATH = "scenario/mix/case";
- public MixSQLRewriterParameterizedTest(final String type, final String name, final String fileName,
- final String databaseType, final SQLRewriteEngineTestParameters testParameters) {
- super(testParameters);
+ public MixSQLRewriterParameterizedTest(final String type, final String name, final String fileName, final String databaseType, final SQLRewriteEngineTestParameters testParams) {
+ super(testParams);
}
@Parameters(name = "{0}: {1} ({3}) -> {2}")
diff --git a/test/rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/scenario/ShardingSQLRewriterParameterizedTest.java b/test/rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/scenario/ShardingSQLRewriterParameterizedTest.java
index 57037824e33..98f62989a8c 100644
--- a/test/rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/scenario/ShardingSQLRewriterParameterizedTest.java
+++ b/test/rewrite/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameterized/scenario/ShardingSQLRewriterParameterizedTest.java
@@ -53,9 +53,8 @@ public final class ShardingSQLRewriterParameterizedTest extends AbstractSQLRewri
private static final String CASE_PATH = "scenario/sharding/case";
- public ShardingSQLRewriterParameterizedTest(final String type, final String name, final String fileName,
- final String databaseType, final SQLRewriteEngineTestParameters testParameters) {
- super(testParameters);
+ public ShardingSQLRewriterParameterizedTest(final String type, final String name, final String fileName, final String databaseType, final SQLRewriteEngineTestParameters testParams) {
+ super(testParams);
}
@Parameters(name = "{0}: {1} ({3}) -> {2}")