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 07:53:35 UTC
[shardingsphere] branch master updated: Rename variable from parameters to params (#22101)
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 9c443b4afaf Rename variable from parameters to params (#22101)
9c443b4afaf is described below
commit 9c443b4afaf378fbb65933c5c8c1b9c9e13d18b4
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sat Nov 12 15:53:28 2022 +0800
Rename variable from parameters to params (#22101)
---
.../service/ZipkinTracingPluginBootService.java | 10 ++---
.../binary/execute/MySQLComStmtExecutePacket.java | 28 +++++++-------
.../extended/bind/OpenGaussComBatchBindPacket.java | 26 ++++++-------
.../extended/bind/PostgreSQLComBindPacket.java | 44 +++++++++++-----------
.../PostgreSQLTypeUnspecifiedSQLParameterTest.java | 4 +-
.../condition/impl/EncryptEqualCondition.java | 6 +--
.../rewrite/condition/impl/EncryptInCondition.java | 6 +--
.../condition/impl/EncryptLikeCondition.java | 6 +--
.../parameter/EncryptParameterRewriterBuilder.java | 26 ++++++-------
.../EncryptAssignmentParameterRewriter.java | 16 ++++----
...OnDuplicateKeyUpdateValueParameterRewriter.java | 10 ++---
.../EncryptInsertValueParameterRewriter.java | 10 ++---
.../EncryptPredicateParameterRewriter.java | 8 ++--
.../pojo/EncryptPredicateEqualRightValueToken.java | 10 ++---
.../pojo/EncryptPredicateInRightValueToken.java | 12 +++---
.../EncryptParameterRewriterBuilderTest.java | 3 +-
.../ShardingParameterRewriterBuilder.java | 18 ++++-----
...ngGeneratedKeyInsertValueParameterRewriter.java | 6 +--
.../impl/ShardingPaginationParameterRewriter.java | 18 ++++-----
...neratedKeyInsertValueParameterRewriterTest.java | 4 +-
.../ShardingPaginationParameterRewriterTest.java | 25 ++++++------
.../handler/update/MigrateTableUpdater.java | 5 +--
.../checker/ShardingRouteCacheableChecker.java | 2 +-
.../shardingsphere/infra/binder/QueryContext.java | 2 +-
.../segment/insert/values/InsertSelectContext.java | 2 +-
.../segment/insert/values/InsertValueContext.java | 8 ++--
.../insert/values/OnDuplicateUpdateContext.java | 10 ++---
.../dialect/OpenGaussSchemaMetaDataLoader.java | 6 +--
.../dialect/PostgreSQLSchemaMetaDataLoader.java | 6 +--
.../infra/rewrite/context/SQLRewriteContext.java | 2 +-
.../rewrite/engine/RouteSQLRewriteEngine.java | 16 ++++----
.../builder/impl/StandardParameterBuilder.java | 4 +-
.../parameter/rewriter/ParameterRewriter.java | 4 +-
.../builder/impl/StandardParameterBuilderTest.java | 16 ++------
.../core/datasource/ShardingSphereDataSource.java | 4 +-
.../jdbc/adapter/PreparedStatementAdapterTest.java | 4 +-
.../spring/boot/util/PropertyUtil.java | 10 ++---
.../pipeline/api/ConsistencyCheckJobPublicAPI.java | 4 +-
.../data/pipeline/api/MigrationJobPublicAPI.java | 4 +-
.../PipelineDataSourceConfigurationFactory.java | 8 ++--
...rdingSpherePipelineDataSourceConfiguration.java | 9 ++---
.../StandardPipelineDataSourceConfiguration.java | 12 +++---
.../listener/PipelineJobProgressListener.java | 4 +-
.../DataConsistencyCalculateAlgorithm.java | 4 +-
...SingleTableInventoryDataConsistencyChecker.java | 8 ++--
...StreamingDataConsistencyCalculateAlgorithm.java | 18 ++++-----
...RC32MatchDataConsistencyCalculateAlgorithm.java | 16 ++++----
...DataMatchDataConsistencyCalculateAlgorithm.java | 32 ++++++++--------
.../pipeline/core/importer/DefaultImporter.java | 4 +-
.../core/prepare/PipelineJobPreparerUtils.java | 12 +++---
.../datasource/AbstractDataSourcePreparer.java | 8 ++--
.../prepare/datasource/DataSourcePreparer.java | 8 ++--
.../ConsistencyCheckJobAPIImpl.java | 8 ++--
.../ConsistencyCheckJobItemContext.java | 4 +-
.../scenario/migration/MigrationJobAPIImpl.java | 24 ++++++------
.../migration/MigrationJobItemContext.java | 4 +-
.../scenario/migration/MigrationJobPreparer.java | 7 ++--
.../YamlDataConsistencyCheckResultSwapper.java | 6 +--
...amlConsistencyCheckJobConfigurationSwapper.java | 6 +--
.../job/YamlMigrationJobConfigurationSwapper.java | 6 +--
.../datasource/MySQLDataSourcePreparer.java | 8 ++--
.../datasource/OpenGaussDataSourcePreparer.java | 8 ++--
.../datasource/PostgreSQLDataSourcePreparer.java | 8 ++--
.../mode/manager/ContextManagerBuilder.java | 4 +-
.../mode/metadata/MetaDataContextsFactory.java | 17 ++++-----
.../ContextManagerBuilderParameterTest.java | 12 +++---
.../fixture/ContextManagerBuilderFixture.java | 2 +-
.../cluster/ClusterContextManagerBuilder.java | 31 ++++++++-------
.../StandaloneContextManagerBuilder.java | 22 +++++------
.../jdbc/statement/JDBCBackendStatement.java | 12 +++---
.../proxy/initializer/BootstrapInitializer.java | 4 +-
.../PostgreSQLBatchedStatementsExecutor.java | 32 ++++++++--------
.../PostgreSQLBatchedStatementsExecutorTest.java | 2 +-
.../impl/OpenGaussStatementSQLVisitor.java | 8 ++--
.../impl/PostgreSQLStatementSQLVisitor.java | 8 ++--
.../limit/ParameterMarkerLimitValueSegment.java | 4 +-
.../ParameterMarkerRowNumberValueSegment.java | 4 +-
.../dal/OpenGaussResetParameterStatement.java | 4 +-
.../dal/PostgreSQLResetParameterStatement.java | 4 +-
.../assertion/IntegrationTestCaseAssertion.java | 14 +++----
.../test/integration/engine/SingleITCase.java | 4 +-
.../framework/param/RunnerParameters.java | 4 +-
.../SQLNodeConverterEngineParameterizedTest.java | 8 ++--
.../engine/SQLParserParameterizedTest.java | 4 +-
.../api/impl/ConsistencyCheckJobAPIImplTest.java | 6 +--
.../core/api/impl/MigrationJobAPIImplTest.java | 3 +-
...MatchDataConsistencyCalculateAlgorithmTest.java | 16 ++++----
.../DataConsistencyCalculateAlgorithmFixture.java | 2 +-
.../core/fixture/FixtureDataSourcePreparer.java | 4 +-
.../FixtureInventoryIncrementalJobItemContext.java | 2 +-
.../datasource/AbstractDataSourcePreparerTest.java | 2 +-
91 files changed, 426 insertions(+), 450 deletions(-)
diff --git a/agent/plugins/tracing/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/service/ZipkinTracingPluginBootService.java b/agent/plugins/tracing/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/service/ZipkinTracingPluginBootService.java
index 00ba309900e..42a965353b4 100644
--- a/agent/plugins/tracing/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/service/ZipkinTracingPluginBootService.java
+++ b/agent/plugins/tracing/zipkin/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/service/ZipkinTracingPluginBootService.java
@@ -70,16 +70,16 @@ public final class ZipkinTracingPluginBootService implements PluginBootService {
private Sampler createSampler(final PluginConfiguration pluginConfig) {
String samplerType = Optional.ofNullable(pluginConfig.getProps().getProperty(KEY_SAMPLER_TYPE)).orElse(DEFAULT_SAMPLER_TYPE);
- String samplerParameter = Optional.ofNullable(pluginConfig.getProps().getProperty(KEY_SAMPLER_PARAM)).orElse(DEFAULT_SAMPLER_PARAM);
+ String samplerParam = Optional.ofNullable(pluginConfig.getProps().getProperty(KEY_SAMPLER_PARAM)).orElse(DEFAULT_SAMPLER_PARAM);
switch (samplerType) {
case "const":
- return "0".equals(samplerParameter) ? Sampler.NEVER_SAMPLE : Sampler.ALWAYS_SAMPLE;
+ return "0".equals(samplerParam) ? Sampler.NEVER_SAMPLE : Sampler.ALWAYS_SAMPLE;
case "counting":
- return Sampler.create(Float.parseFloat(samplerParameter));
+ return Sampler.create(Float.parseFloat(samplerParam));
case "ratelimiting":
- return RateLimitingSampler.create(Integer.parseInt(samplerParameter));
+ return RateLimitingSampler.create(Integer.parseInt(samplerParam));
case "boundary":
- return BoundarySampler.create(Float.parseFloat(samplerParameter));
+ return BoundarySampler.create(Float.parseFloat(samplerParam));
default:
return Sampler.ALWAYS_SAMPLE;
}
diff --git a/db-protocol/mysql/src/main/java/org/apache/shardingsphere/db/protocol/mysql/packet/command/query/binary/execute/MySQLComStmtExecutePacket.java b/db-protocol/mysql/src/main/java/org/apache/shardingsphere/db/protocol/mysql/packet/command/query/binary/execute/MySQLComStmtExecutePacket.java
index eed17e8ecca..bb941eed3f9 100644
--- a/db-protocol/mysql/src/main/java/org/apache/shardingsphere/db/protocol/mysql/packet/command/query/binary/execute/MySQLComStmtExecutePacket.java
+++ b/db-protocol/mysql/src/main/java/org/apache/shardingsphere/db/protocol/mysql/packet/command/query/binary/execute/MySQLComStmtExecutePacket.java
@@ -62,19 +62,19 @@ public final class MySQLComStmtExecutePacket extends MySQLCommandPacket {
@Getter
private final List<MySQLPreparedStatementParameterType> newParameterTypes;
- public MySQLComStmtExecutePacket(final MySQLPacketPayload payload, final int parameterCount) {
+ public MySQLComStmtExecutePacket(final MySQLPacketPayload payload, final int paramCount) {
super(MySQLCommandPacketType.COM_STMT_EXECUTE);
this.payload = payload;
statementId = payload.readInt4();
flags = payload.readInt1();
Preconditions.checkArgument(ITERATION_COUNT == payload.readInt4());
- if (parameterCount > 0) {
- nullBitmap = new MySQLNullBitmap(parameterCount, NULL_BITMAP_OFFSET);
+ if (paramCount > 0) {
+ nullBitmap = new MySQLNullBitmap(paramCount, NULL_BITMAP_OFFSET);
for (int i = 0; i < nullBitmap.getNullBitmap().length; i++) {
nullBitmap.getNullBitmap()[i] = payload.readInt1();
}
newParametersBoundFlag = MySQLNewParametersBoundFlag.valueOf(payload.readInt1());
- newParameterTypes = MySQLNewParametersBoundFlag.PARAMETER_TYPE_EXIST == newParametersBoundFlag ? getNewParameterTypes(parameterCount) : Collections.emptyList();
+ newParameterTypes = MySQLNewParametersBoundFlag.PARAMETER_TYPE_EXIST == newParametersBoundFlag ? getNewParameterTypes(paramCount) : Collections.emptyList();
} else {
nullBitmap = null;
newParametersBoundFlag = null;
@@ -82,9 +82,9 @@ public final class MySQLComStmtExecutePacket extends MySQLCommandPacket {
}
}
- private List<MySQLPreparedStatementParameterType> getNewParameterTypes(final int parameterCount) {
- List<MySQLPreparedStatementParameterType> result = new ArrayList<>(parameterCount);
- for (int parameterIndex = 0; parameterIndex < parameterCount; parameterIndex++) {
+ private List<MySQLPreparedStatementParameterType> getNewParameterTypes(final int paramCount) {
+ List<MySQLPreparedStatementParameterType> result = new ArrayList<>(paramCount);
+ for (int paramIndex = 0; paramIndex < paramCount; paramIndex++) {
MySQLBinaryColumnType columnType = MySQLBinaryColumnType.valueOf(payload.readInt1());
int unsignedFlag = payload.readInt1();
result.add(new MySQLPreparedStatementParameterType(columnType, unsignedFlag));
@@ -95,20 +95,20 @@ public final class MySQLComStmtExecutePacket extends MySQLCommandPacket {
/**
* Read parameter values from packet.
*
- * @param parameterTypes parameter type of values
+ * @param paramTypes parameter type of values
* @param longDataIndexes indexes of long data
* @return parameter values
* @throws SQLException SQL exception
*/
- public List<Object> readParameters(final List<MySQLPreparedStatementParameterType> parameterTypes, final Set<Integer> longDataIndexes) throws SQLException {
- List<Object> result = new ArrayList<>(parameterTypes.size());
- for (int parameterIndex = 0; parameterIndex < parameterTypes.size(); parameterIndex++) {
- if (longDataIndexes.contains(parameterIndex)) {
+ public List<Object> readParameters(final List<MySQLPreparedStatementParameterType> paramTypes, final Set<Integer> longDataIndexes) throws SQLException {
+ List<Object> result = new ArrayList<>(paramTypes.size());
+ for (int paramIndex = 0; paramIndex < paramTypes.size(); paramIndex++) {
+ if (longDataIndexes.contains(paramIndex)) {
result.add(null);
continue;
}
- MySQLBinaryProtocolValue binaryProtocolValue = MySQLBinaryProtocolValueFactory.getBinaryProtocolValue(parameterTypes.get(parameterIndex).getColumnType());
- result.add(nullBitmap.isNullParameter(parameterIndex) ? null : binaryProtocolValue.read(payload));
+ MySQLBinaryProtocolValue binaryProtocolValue = MySQLBinaryProtocolValueFactory.getBinaryProtocolValue(paramTypes.get(paramIndex).getColumnType());
+ result.add(nullBitmap.isNullParameter(paramIndex) ? null : binaryProtocolValue.read(payload));
}
return result;
}
diff --git a/db-protocol/opengauss/src/main/java/org/apache/shardingsphere/db/protocol/opengauss/packet/command/query/extended/bind/OpenGaussComBatchBindPacket.java b/db-protocol/opengauss/src/main/java/org/apache/shardingsphere/db/protocol/opengauss/packet/command/query/extended/bind/OpenGaussComBatchBindPacket.java
index 6aafaba54f3..5d71be310b9 100644
--- a/db-protocol/opengauss/src/main/java/org/apache/shardingsphere/db/protocol/opengauss/packet/command/query/extended/bind/OpenGaussComBatchBindPacket.java
+++ b/db-protocol/opengauss/src/main/java/org/apache/shardingsphere/db/protocol/opengauss/packet/command/query/extended/bind/OpenGaussComBatchBindPacket.java
@@ -90,27 +90,27 @@ public final class OpenGaussComBatchBindPacket extends OpenGaussCommandPacket {
private List<Object> readOneGroupOfParameters(final List<PostgreSQLColumnType> parameterTypes) {
List<Object> result = new ArrayList<>(eachGroupParametersCount);
- for (int parameterIndex = 0; parameterIndex < eachGroupParametersCount; parameterIndex++) {
- int parameterValueLength = payload.readInt4();
- if (-1 == parameterValueLength) {
+ for (int paramIndex = 0; paramIndex < eachGroupParametersCount; paramIndex++) {
+ int paramValueLength = payload.readInt4();
+ if (-1 == paramValueLength) {
result.add(null);
continue;
}
- Object parameterValue = isTextParameterValue(parameterFormats, parameterIndex)
- ? getTextParameters(payload, parameterValueLength, parameterTypes.get(parameterIndex))
- : getBinaryParameters(payload, parameterValueLength, parameterTypes.get(parameterIndex));
+ Object parameterValue = isTextParameterValue(parameterFormats, paramIndex)
+ ? getTextParameters(payload, paramValueLength, parameterTypes.get(paramIndex))
+ : getBinaryParameters(payload, paramValueLength, parameterTypes.get(paramIndex));
result.add(parameterValue);
}
return result;
}
- private boolean isTextParameterValue(final List<Integer> parameterFormats, final int parameterIndex) {
- return parameterFormats.isEmpty() || 0 == parameterFormats.get(parameterIndex % parameterFormats.size());
+ private boolean isTextParameterValue(final List<Integer> paramFormats, final int paramIndex) {
+ return paramFormats.isEmpty() || 0 == paramFormats.get(paramIndex % paramFormats.size());
}
- private Object getTextParameters(final PostgreSQLPacketPayload payload, final int parameterValueLength, final PostgreSQLColumnType parameterType) {
- String value = payload.getByteBuf().readCharSequence(parameterValueLength, payload.getCharset()).toString();
- return getTextParameters(value, parameterType);
+ private Object getTextParameters(final PostgreSQLPacketPayload payload, final int paramValueLength, final PostgreSQLColumnType paramType) {
+ String value = payload.getByteBuf().readCharSequence(paramValueLength, payload.getCharset()).toString();
+ return getTextParameters(value, paramType);
}
private Object getTextParameters(final String textValue, final PostgreSQLColumnType columnType) {
@@ -148,9 +148,9 @@ public final class OpenGaussComBatchBindPacket extends OpenGaussCommandPacket {
}
}
- private Object getBinaryParameters(final PostgreSQLPacketPayload payload, final int parameterValueLength, final PostgreSQLColumnType columnType) {
+ private Object getBinaryParameters(final PostgreSQLPacketPayload payload, final int paramValueLength, final PostgreSQLColumnType columnType) {
PostgreSQLBinaryProtocolValue binaryProtocolValue = PostgreSQLBinaryProtocolValueFactory.getBinaryProtocolValue(columnType);
- return binaryProtocolValue.read(payload, parameterValueLength);
+ return binaryProtocolValue.read(payload, paramValueLength);
}
@Override
diff --git a/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/PostgreSQLComBindPacket.java b/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/PostgreSQLComBindPacket.java
index e5cbb2d7a7a..1b8f0167997 100644
--- a/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/PostgreSQLComBindPacket.java
+++ b/db-protocol/postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/PostgreSQLComBindPacket.java
@@ -59,48 +59,48 @@ public final class PostgreSQLComBindPacket extends PostgreSQLCommandPacket {
/**
* Read parameters from Bind message.
*
- * @param parameterTypes parameter types
+ * @param paramTypes parameter types
* @return values of parameter
*/
- public List<Object> readParameters(final List<PostgreSQLColumnType> parameterTypes) {
+ public List<Object> readParameters(final List<PostgreSQLColumnType> paramTypes) {
int parameterFormatCount = payload.readInt2();
- List<Integer> parameterFormats = new ArrayList<>(parameterFormatCount);
+ List<Integer> paramFormats = new ArrayList<>(parameterFormatCount);
for (int i = 0; i < parameterFormatCount; i++) {
- parameterFormats.add(payload.readInt2());
+ paramFormats.add(payload.readInt2());
}
int parameterCount = payload.readInt2();
List<Object> result = new ArrayList<>(parameterCount);
- for (int parameterIndex = 0; parameterIndex < parameterCount; parameterIndex++) {
+ for (int paramIndex = 0; paramIndex < parameterCount; paramIndex++) {
int parameterValueLength = payload.readInt4();
if (-1 == parameterValueLength) {
result.add(null);
continue;
}
- Object parameterValue = isTextParameterValue(parameterFormats, parameterIndex)
- ? getTextParameters(payload, parameterValueLength, parameterTypes.get(parameterIndex))
- : getBinaryParameters(payload, parameterValueLength, parameterTypes.get(parameterIndex));
- result.add(parameterValue);
+ Object paramValue = isTextParameterValue(paramFormats, paramIndex)
+ ? getTextParameters(payload, parameterValueLength, paramTypes.get(paramIndex))
+ : getBinaryParameters(payload, parameterValueLength, paramTypes.get(paramIndex));
+ result.add(paramValue);
}
return result;
}
- private boolean isTextParameterValue(final List<Integer> parameterFormats, final int parameterIndex) {
- if (parameterFormats.isEmpty()) {
+ private boolean isTextParameterValue(final List<Integer> paramFormats, final int paramIndex) {
+ if (paramFormats.isEmpty()) {
return true;
}
- if (1 == parameterFormats.size()) {
- return 0 == parameterFormats.get(0);
+ if (1 == paramFormats.size()) {
+ return 0 == paramFormats.get(0);
}
- return 0 == parameterFormats.get(parameterIndex);
+ return 0 == paramFormats.get(paramIndex);
}
- private Object getTextParameters(final PostgreSQLPacketPayload payload, final int parameterValueLength, final PostgreSQLColumnType parameterType) {
- String value = payload.getByteBuf().readCharSequence(parameterValueLength, payload.getCharset()).toString();
- return getTextParameters(value, parameterType);
+ private Object getTextParameters(final PostgreSQLPacketPayload payload, final int paramValueLength, final PostgreSQLColumnType paramType) {
+ String value = payload.getByteBuf().readCharSequence(paramValueLength, payload.getCharset()).toString();
+ return getTextParameters(value, paramType);
}
- private Object getTextParameters(final String textValue, final PostgreSQLColumnType parameterType) {
- switch (parameterType) {
+ private Object getTextParameters(final String textValue, final PostgreSQLColumnType paramType) {
+ switch (paramType) {
case POSTGRESQL_TYPE_UNSPECIFIED:
return new PostgreSQLTypeUnspecifiedSQLParameter(textValue);
case POSTGRESQL_TYPE_BOOL:
@@ -136,9 +136,9 @@ public final class PostgreSQLComBindPacket extends PostgreSQLCommandPacket {
}
}
- private Object getBinaryParameters(final PostgreSQLPacketPayload payload, final int parameterValueLength, final PostgreSQLColumnType parameterType) {
- PostgreSQLBinaryProtocolValue binaryProtocolValue = PostgreSQLBinaryProtocolValueFactory.getBinaryProtocolValue(parameterType);
- return binaryProtocolValue.read(payload, parameterValueLength);
+ private Object getBinaryParameters(final PostgreSQLPacketPayload payload, final int paramValueLength, final PostgreSQLColumnType paramType) {
+ PostgreSQLBinaryProtocolValue binaryProtocolValue = PostgreSQLBinaryProtocolValueFactory.getBinaryProtocolValue(paramType);
+ return binaryProtocolValue.read(payload, paramValueLength);
}
/**
diff --git a/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/PostgreSQLTypeUnspecifiedSQLParameterTest.java b/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/PostgreSQLTypeUnspecifiedSQLParameterTest.java
index 1925d838d96..51f24687722 100644
--- a/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/PostgreSQLTypeUnspecifiedSQLParameterTest.java
+++ b/db-protocol/postgresql/src/test/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/PostgreSQLTypeUnspecifiedSQLParameterTest.java
@@ -26,8 +26,6 @@ public final class PostgreSQLTypeUnspecifiedSQLParameterTest {
@Test
public void assertToString() {
- String timestampStr = "2020-08-23 15:57:03+08";
- PostgreSQLTypeUnspecifiedSQLParameter parameter = new PostgreSQLTypeUnspecifiedSQLParameter(timestampStr);
- assertThat(parameter.toString(), is(timestampStr));
+ assertThat(new PostgreSQLTypeUnspecifiedSQLParameter("2020-08-23 15:57:03+08").toString(), is("2020-08-23 15:57:03+08"));
}
}
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 b7fbf6af63b..11c1a535aa7 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
@@ -76,11 +76,11 @@ public final class EncryptEqualCondition implements EncryptCondition {
public List<Object> getValues(final List<Object> params) {
List<Object> result = new ArrayList<>(positionValueMap.values());
for (Entry<Integer, Integer> entry : positionIndexMap.entrySet()) {
- Object parameter = params.get(entry.getValue());
+ Object param = params.get(entry.getValue());
if (entry.getKey() < result.size()) {
- result.add(entry.getKey(), parameter);
+ result.add(entry.getKey(), param);
} else {
- result.add(parameter);
+ result.add(param);
}
}
return result;
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 43323eb987d..ac0c0afe529 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
@@ -75,11 +75,11 @@ public final class EncryptInCondition implements EncryptCondition {
public List<Object> getValues(final List<Object> params) {
List<Object> result = new ArrayList<>(positionValueMap.values());
for (Entry<Integer, Integer> entry : positionIndexMap.entrySet()) {
- Object parameter = params.get(entry.getValue());
+ Object param = params.get(entry.getValue());
if (entry.getKey() < result.size()) {
- result.add(entry.getKey(), parameter);
+ result.add(entry.getKey(), param);
} else {
- result.add(parameter);
+ result.add(param);
}
}
return result;
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 b1d5ddc9370..93d3bbd0272 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
@@ -77,11 +77,11 @@ public final class EncryptLikeCondition implements EncryptCondition {
public List<Object> getValues(final List<Object> params) {
List<Object> result = new ArrayList<>(positionValueMap.values());
for (Entry<Integer, Integer> entry : positionIndexMap.entrySet()) {
- Object parameter = params.get(entry.getValue());
+ Object param = params.get(entry.getValue());
if (entry.getKey() < result.size()) {
- result.add(entry.getKey(), parameter);
+ result.add(entry.getKey(), param);
} else {
- result.add(parameter);
+ result.add(param);
}
}
return result;
diff --git a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/EncryptParameterRewriterBuilder.java b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/EncryptParameterRewriterBuilder.java
index d058d555b8b..48c81aa6943 100644
--- a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/EncryptParameterRewriterBuilder.java
+++ b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/EncryptParameterRewriterBuilder.java
@@ -64,26 +64,26 @@ public final class EncryptParameterRewriterBuilder implements ParameterRewriterB
return result;
}
- private void addParameterRewriter(final Collection<ParameterRewriter> parameterRewriters, final ParameterRewriter<?> toBeAddedParameterRewriter) {
- if (toBeAddedParameterRewriter.isNeedRewrite(sqlStatementContext)) {
- setUpParameterRewriter(toBeAddedParameterRewriter);
- parameterRewriters.add(toBeAddedParameterRewriter);
+ private void addParameterRewriter(final Collection<ParameterRewriter> paramRewriters, final ParameterRewriter<?> toBeAddedParamRewriter) {
+ if (toBeAddedParamRewriter.isNeedRewrite(sqlStatementContext)) {
+ setUpParameterRewriter(toBeAddedParamRewriter);
+ paramRewriters.add(toBeAddedParamRewriter);
}
}
@SuppressWarnings("rawtypes")
- private void setUpParameterRewriter(final ParameterRewriter toBeAddedParameterRewriter) {
- if (toBeAddedParameterRewriter instanceof SchemaMetaDataAware) {
- ((SchemaMetaDataAware) toBeAddedParameterRewriter).setSchemas(schemas);
+ private void setUpParameterRewriter(final ParameterRewriter toBeAddedParamRewriter) {
+ if (toBeAddedParamRewriter instanceof SchemaMetaDataAware) {
+ ((SchemaMetaDataAware) toBeAddedParamRewriter).setSchemas(schemas);
}
- if (toBeAddedParameterRewriter instanceof EncryptRuleAware) {
- ((EncryptRuleAware) toBeAddedParameterRewriter).setEncryptRule(encryptRule);
+ if (toBeAddedParamRewriter instanceof EncryptRuleAware) {
+ ((EncryptRuleAware) toBeAddedParamRewriter).setEncryptRule(encryptRule);
}
- if (toBeAddedParameterRewriter instanceof EncryptConditionsAware) {
- ((EncryptConditionsAware) toBeAddedParameterRewriter).setEncryptConditions(encryptConditions);
+ if (toBeAddedParamRewriter instanceof EncryptConditionsAware) {
+ ((EncryptConditionsAware) toBeAddedParamRewriter).setEncryptConditions(encryptConditions);
}
- if (toBeAddedParameterRewriter instanceof DatabaseNameAware) {
- ((DatabaseNameAware) toBeAddedParameterRewriter).setDatabaseName(databaseName);
+ if (toBeAddedParamRewriter instanceof DatabaseNameAware) {
+ ((DatabaseNameAware) toBeAddedParamRewriter).setDatabaseName(databaseName);
}
}
}
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 ae4b7b7e4a9..97da9e53458 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,15 +67,15 @@ public final class EncryptAssignmentParameterRewriter implements ParameterRewrit
}
@Override
- public void rewrite(final ParameterBuilder parameterBuilder, final SQLStatementContext<?> sqlStatementContext, final List<Object> params) {
+ public void rewrite(final ParameterBuilder paramBuilder, 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()) {
if (each.getValue() instanceof ParameterMarkerExpressionSegment && encryptRule.findEncryptor(tableName, each.getColumns().get(0).getIdentifier().getValue()).isPresent()) {
- StandardParameterBuilder standardParameterBuilder = parameterBuilder instanceof StandardParameterBuilder
- ? (StandardParameterBuilder) parameterBuilder
- : ((GroupedParameterBuilder) parameterBuilder).getParameterBuilders().get(0);
- encryptParameters(standardParameterBuilder, schemaName, tableName, each, params);
+ StandardParameterBuilder standardParamBuilder = paramBuilder instanceof StandardParameterBuilder
+ ? (StandardParameterBuilder) paramBuilder
+ : ((GroupedParameterBuilder) paramBuilder).getParameterBuilders().get(0);
+ encryptParameters(standardParamBuilder, schemaName, tableName, each, params);
}
}
}
@@ -89,13 +89,13 @@ public final class EncryptAssignmentParameterRewriter implements ParameterRewrit
return ((UpdateStatement) sqlStatement).getSetAssignment();
}
- private void encryptParameters(final StandardParameterBuilder parameterBuilder, final String schemaName,
+ private void encryptParameters(final StandardParameterBuilder paramBuilder, final String schemaName,
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 = params.get(parameterMarkerIndex);
Object cipherValue = encryptRule.getEncryptValues(databaseName, schemaName, tableName, columnName, Collections.singletonList(originalValue)).iterator().next();
- parameterBuilder.addReplacedParameters(parameterMarkerIndex, cipherValue);
+ paramBuilder.addReplacedParameters(parameterMarkerIndex, cipherValue);
Collection<Object> addedParams = new LinkedList<>();
if (encryptRule.findAssistedQueryColumn(tableName, columnName).isPresent()) {
Object assistedQueryValue = encryptRule.getEncryptAssistedQueryValues(databaseName, schemaName, tableName, columnName, Collections.singletonList(originalValue)).iterator().next();
@@ -109,7 +109,7 @@ public final class EncryptAssignmentParameterRewriter implements ParameterRewrit
addedParams.add(originalValue);
}
if (!addedParams.isEmpty()) {
- parameterBuilder.addAddedParameters(parameterMarkerIndex, addedParams);
+ paramBuilder.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 f19716aff28..2f745e81e96 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
@@ -60,7 +60,7 @@ public final class EncryptInsertOnDuplicateKeyUpdateValueParameterRewriter imple
@Override
public void rewrite(final ParameterBuilder paramBuilder, final InsertStatementContext insertStatementContext, final List<Object> params) {
String tableName = insertStatementContext.getSqlStatement().getTable().getTableName().getIdentifier().getValue();
- GroupedParameterBuilder groupedParameterBuilder = (GroupedParameterBuilder) paramBuilder;
+ GroupedParameterBuilder groupedParamBuilder = (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++) {
@@ -74,7 +74,7 @@ public final class EncryptInsertOnDuplicateKeyUpdateValueParameterRewriter imple
return;
}
Object cipherColumnValue = encryptor.get().encrypt(plainColumnValue, encryptContext);
- groupedParameterBuilder.getGenericParameterBuilder().addReplacedParameters(columnIndex, cipherColumnValue);
+ groupedParamBuilder.getGenericParameterBuilder().addReplacedParameters(columnIndex, cipherColumnValue);
Collection<Object> addedParams = new LinkedList<>();
Optional<EncryptAlgorithm> assistedQueryEncryptor = encryptRule.findAssistedQueryEncryptor(tableName, encryptLogicColumnName);
if (assistedQueryEncryptor.isPresent()) {
@@ -92,10 +92,10 @@ public final class EncryptInsertOnDuplicateKeyUpdateValueParameterRewriter imple
addedParams.add(plainColumnValue);
}
if (!addedParams.isEmpty()) {
- if (!groupedParameterBuilder.getGenericParameterBuilder().getAddedIndexAndParameters().containsKey(columnIndex)) {
- groupedParameterBuilder.getGenericParameterBuilder().getAddedIndexAndParameters().put(columnIndex, new LinkedList<>());
+ if (!groupedParamBuilder.getGenericParameterBuilder().getAddedIndexAndParameters().containsKey(columnIndex)) {
+ groupedParamBuilder.getGenericParameterBuilder().getAddedIndexAndParameters().put(columnIndex, new LinkedList<>());
}
- groupedParameterBuilder.getGenericParameterBuilder().getAddedIndexAndParameters().get(columnIndex).addAll(addedParams);
+ groupedParamBuilder.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 0fa26ec69b2..62fc63b001b 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> params) {
+ public void rewrite(final ParameterBuilder paramBuilder, 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));
@@ -68,7 +68,7 @@ public final class EncryptInsertValueParameterRewriter implements ParameterRewri
String columnName = descendingColumnNames.next();
EncryptContext encryptContext = EncryptContextBuilder.build(databaseName, schemaName, tableName, columnName);
encryptRule.findEncryptor(tableName, columnName).ifPresent(
- optional -> encryptInsertValues((GroupedParameterBuilder) parameterBuilder, insertStatementContext, optional,
+ optional -> encryptInsertValues((GroupedParameterBuilder) paramBuilder, insertStatementContext, optional,
encryptRule.findAssistedQueryEncryptor(tableName, columnName).orElse(null),
encryptRule.findFuzzyQueryEncryptor(tableName, columnName).orElse(null), encryptContext));
}
@@ -80,14 +80,14 @@ public final class EncryptInsertValueParameterRewriter implements ParameterRewri
int columnIndex = getColumnIndex(paramBuilder, insertStatementContext, encryptContext.getColumnName());
int count = 0;
for (List<Object> each : insertStatementContext.getGroupedParameters()) {
- int parameterIndex = insertStatementContext.getInsertValueContexts().get(count).getParameterIndex(columnIndex);
+ int paramIndex = insertStatementContext.getInsertValueContexts().get(count).getParameterIndex(columnIndex);
if (!each.isEmpty()) {
- StandardParameterBuilder standardParameterBuilder = paramBuilder.getParameterBuilders().get(count);
+ StandardParameterBuilder standardParamBuilder = 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)
.orElse(null);
- encryptInsertValue(encryptAlgorithm, assistEncryptAlgorithm, fuzzyEncryptAlgorithm, parameterIndex, literalValue, standardParameterBuilder, encryptContext);
+ encryptInsertValue(encryptAlgorithm, assistEncryptAlgorithm, fuzzyEncryptAlgorithm, paramIndex, literalValue, standardParamBuilder, encryptContext);
}
}
count++;
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 0396f02f64e..0ec300c3b7c 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> params) {
+ public void rewrite(final ParameterBuilder paramBuilder, 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(params)));
+ encryptParameters(paramBuilder, each.getPositionIndexMap(), getEncryptedValues(schemaName, each, each.getValues(params)));
}
}
}
@@ -76,10 +76,10 @@ public final class EncryptPredicateParameterRewriter implements ParameterRewrite
: encryptRule.getEncryptValues(databaseName, schemaName, tableName, columnName, originalValues);
}
- private void encryptParameters(final ParameterBuilder parameterBuilder, final Map<Integer, Integer> positionIndexes, final List<Object> encryptValues) {
+ private void encryptParameters(final ParameterBuilder paramBuilder, final Map<Integer, Integer> positionIndexes, final List<Object> encryptValues) {
if (!positionIndexes.isEmpty()) {
for (Entry<Integer, Integer> entry : positionIndexes.entrySet()) {
- ((StandardParameterBuilder) parameterBuilder).addReplacedParameters(entry.getValue(), encryptValues.get(entry.getKey()));
+ ((StandardParameterBuilder) paramBuilder).addReplacedParameters(entry.getValue(), encryptValues.get(entry.getKey()));
}
}
}
diff --git a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/pojo/EncryptPredicateEqualRightValueToken.java b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/pojo/EncryptPredicateEqualRightValueToken.java
index a0e40a0d39b..800785e7c83 100644
--- a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/pojo/EncryptPredicateEqualRightValueToken.java
+++ b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/pojo/EncryptPredicateEqualRightValueToken.java
@@ -28,7 +28,7 @@ import java.util.Map;
/**
* Predicate equal right value token for encrypt.
*/
-@EqualsAndHashCode
+@EqualsAndHashCode(callSuper = true)
public final class EncryptPredicateEqualRightValueToken extends SQLToken implements Substitutable {
@Getter
@@ -36,18 +36,18 @@ public final class EncryptPredicateEqualRightValueToken extends SQLToken impleme
private final Map<Integer, Object> indexValues;
- private final Collection<Integer> parameterMarkerIndexes;
+ private final Collection<Integer> paramMarkerIndexes;
- public EncryptPredicateEqualRightValueToken(final int startIndex, final int stopIndex, final Map<Integer, Object> indexValues, final Collection<Integer> parameterMarkerIndexes) {
+ public EncryptPredicateEqualRightValueToken(final int startIndex, final int stopIndex, final Map<Integer, Object> indexValues, final Collection<Integer> paramMarkerIndexes) {
super(startIndex);
this.stopIndex = stopIndex;
this.indexValues = indexValues;
- this.parameterMarkerIndexes = parameterMarkerIndexes;
+ this.paramMarkerIndexes = paramMarkerIndexes;
}
@Override
public String toString() {
- if (parameterMarkerIndexes.isEmpty()) {
+ if (paramMarkerIndexes.isEmpty()) {
return indexValues.get(0) instanceof String ? "'" + indexValues.get(0) + "'" : indexValues.get(0).toString();
}
return "?";
diff --git a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/pojo/EncryptPredicateInRightValueToken.java b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/pojo/EncryptPredicateInRightValueToken.java
index cadedad8d3a..42249860f63 100644
--- a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/pojo/EncryptPredicateInRightValueToken.java
+++ b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/token/pojo/EncryptPredicateInRightValueToken.java
@@ -28,7 +28,7 @@ import java.util.Map;
/**
* Predicate in right value token for encrypt.
*/
-@EqualsAndHashCode
+@EqualsAndHashCode(callSuper = true)
public final class EncryptPredicateInRightValueToken extends SQLToken implements Substitutable {
@Getter
@@ -36,21 +36,21 @@ public final class EncryptPredicateInRightValueToken extends SQLToken implements
private final Map<Integer, Object> indexValues;
- private final Collection<Integer> parameterMarkerIndexes;
+ private final Collection<Integer> paramMarkerIndexes;
- public EncryptPredicateInRightValueToken(final int startIndex, final int stopIndex, final Map<Integer, Object> indexValues, final Collection<Integer> parameterMarkerIndexes) {
+ public EncryptPredicateInRightValueToken(final int startIndex, final int stopIndex, final Map<Integer, Object> indexValues, final Collection<Integer> paramMarkerIndexes) {
super(startIndex);
this.stopIndex = stopIndex;
this.indexValues = indexValues;
- this.parameterMarkerIndexes = parameterMarkerIndexes;
+ this.paramMarkerIndexes = paramMarkerIndexes;
}
@Override
public String toString() {
StringBuilder result = new StringBuilder();
result.append("(");
- for (int i = 0; i < indexValues.size() + parameterMarkerIndexes.size(); i++) {
- if (parameterMarkerIndexes.contains(i)) {
+ for (int i = 0; i < indexValues.size() + paramMarkerIndexes.size(); i++) {
+ if (paramMarkerIndexes.contains(i)) {
result.append("?");
} else {
if (indexValues.get(i) instanceof String) {
diff --git a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/parameter/EncryptParameterRewriterBuilderTest.java b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/parameter/EncryptParameterRewriterBuilderTest.java
index 58324bd2bfb..fb72a998004 100644
--- a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/parameter/EncryptParameterRewriterBuilderTest.java
+++ b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/parameter/EncryptParameterRewriterBuilderTest.java
@@ -50,8 +50,7 @@ public final class EncryptParameterRewriterBuilderTest {
Collection<ParameterRewriter> actual = new EncryptParameterRewriterBuilder(
encryptRule, DefaultDatabase.LOGIC_NAME, Collections.singletonMap("test", mock(ShardingSphereSchema.class)), sqlStatementContext, Collections.emptyList()).getParameterRewriters();
assertThat(actual.size(), is(1));
- ParameterRewriter parameterRewriter = actual.iterator().next();
- assertThat(parameterRewriter, instanceOf(EncryptPredicateParameterRewriter.class));
+ assertThat(actual.iterator().next(), instanceOf(EncryptPredicateParameterRewriter.class));
}
@Test
diff --git a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/parameter/ShardingParameterRewriterBuilder.java b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/parameter/ShardingParameterRewriterBuilder.java
index 80e4883c6e2..c71d9027e99 100644
--- a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/parameter/ShardingParameterRewriterBuilder.java
+++ b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/parameter/ShardingParameterRewriterBuilder.java
@@ -58,18 +58,18 @@ public final class ShardingParameterRewriterBuilder implements ParameterRewriter
}
@SuppressWarnings("rawtypes")
- private void addParameterRewriter(final Collection<ParameterRewriter> parameterRewriters, final ParameterRewriter toBeAddedParameterRewriter) {
- if (toBeAddedParameterRewriter instanceof SchemaMetaDataAware) {
- ((SchemaMetaDataAware) toBeAddedParameterRewriter).setSchemas(schemas);
+ private void addParameterRewriter(final Collection<ParameterRewriter> paramRewriters, final ParameterRewriter toBeAddedParamRewriter) {
+ if (toBeAddedParamRewriter instanceof SchemaMetaDataAware) {
+ ((SchemaMetaDataAware) toBeAddedParamRewriter).setSchemas(schemas);
}
- if (toBeAddedParameterRewriter instanceof ShardingRuleAware) {
- ((ShardingRuleAware) toBeAddedParameterRewriter).setShardingRule(shardingRule);
+ if (toBeAddedParamRewriter instanceof ShardingRuleAware) {
+ ((ShardingRuleAware) toBeAddedParamRewriter).setShardingRule(shardingRule);
}
- if (toBeAddedParameterRewriter instanceof RouteContextAware) {
- ((RouteContextAware) toBeAddedParameterRewriter).setRouteContext(routeContext);
+ if (toBeAddedParamRewriter instanceof RouteContextAware) {
+ ((RouteContextAware) toBeAddedParamRewriter).setRouteContext(routeContext);
}
- if (toBeAddedParameterRewriter.isNeedRewrite(sqlStatementContext)) {
- parameterRewriters.add(toBeAddedParameterRewriter);
+ if (toBeAddedParamRewriter.isNeedRewrite(sqlStatementContext)) {
+ paramRewriters.add(toBeAddedParamRewriter);
}
}
}
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 307db9d524b..880d2d982a1 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,9 +45,9 @@ public final class ShardingGeneratedKeyInsertValueParameterRewriter implements P
}
@Override
- public void rewrite(final ParameterBuilder parameterBuilder, final InsertStatementContext insertStatementContext, final List<Object> params) {
+ public void rewrite(final ParameterBuilder paramBuilder, final InsertStatementContext insertStatementContext, final List<Object> params) {
Preconditions.checkState(insertStatementContext.getGeneratedKeyContext().isPresent());
- ((GroupedParameterBuilder) parameterBuilder).setDerivedColumnName(insertStatementContext.getGeneratedKeyContext().get().getColumnName());
+ ((GroupedParameterBuilder) paramBuilder).setDerivedColumnName(insertStatementContext.getGeneratedKeyContext().get().getColumnName());
Iterator<Comparable<?>> generatedValues = insertStatementContext.getGeneratedKeyContext().get().getGeneratedValues().iterator();
int count = 0;
int parameterCount = 0;
@@ -55,7 +55,7 @@ public final class ShardingGeneratedKeyInsertValueParameterRewriter implements P
parameterCount += insertStatementContext.getInsertValueContexts().get(count).getParameterCount();
Comparable<?> generatedValue = generatedValues.next();
if (!each.isEmpty()) {
- ((GroupedParameterBuilder) parameterBuilder).getParameterBuilders().get(count).addAddedParameters(parameterCount, new ArrayList<>(Collections.singleton(generatedValue)));
+ ((GroupedParameterBuilder) paramBuilder).getParameterBuilders().get(count).addAddedParameters(parameterCount, new ArrayList<>(Collections.singleton(generatedValue)));
}
count++;
}
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 5e24ce453fb..333811f2f45 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
@@ -39,24 +39,22 @@ public final class ShardingPaginationParameterRewriter implements ParameterRewri
@Override
public boolean isNeedRewrite(final SQLStatementContext<?> sqlStatementContext) {
- return sqlStatementContext instanceof SelectStatementContext
- && ((SelectStatementContext) sqlStatementContext).getPaginationContext().isHasPagination() && !routeContext.isSingleRouting();
+ return sqlStatementContext instanceof SelectStatementContext && ((SelectStatementContext) sqlStatementContext).getPaginationContext().isHasPagination() && !routeContext.isSingleRouting();
}
@Override
- public void rewrite(final ParameterBuilder parameterBuilder, final SelectStatementContext selectStatementContext, final List<Object> params) {
+ public void rewrite(final ParameterBuilder paramBuilder, final SelectStatementContext selectStatementContext, final List<Object> params) {
PaginationContext pagination = selectStatementContext.getPaginationContext();
- pagination.getOffsetParameterIndex().ifPresent(optional -> rewriteOffset(pagination, optional, (StandardParameterBuilder) parameterBuilder));
+ pagination.getOffsetParameterIndex().ifPresent(optional -> rewriteOffset(pagination, optional, (StandardParameterBuilder) paramBuilder));
pagination.getRowCountParameterIndex()
- .ifPresent(optional -> rewriteRowCount(pagination, optional, (StandardParameterBuilder) parameterBuilder, selectStatementContext));
+ .ifPresent(optional -> rewriteRowCount(pagination, optional, (StandardParameterBuilder) paramBuilder, selectStatementContext));
}
- private void rewriteOffset(final PaginationContext pagination, final int offsetParameterIndex, final StandardParameterBuilder parameterBuilder) {
- parameterBuilder.addReplacedParameters(offsetParameterIndex, pagination.getRevisedOffset());
+ private void rewriteOffset(final PaginationContext pagination, final int offsetParamIndex, final StandardParameterBuilder paramBuilder) {
+ paramBuilder.addReplacedParameters(offsetParamIndex, pagination.getRevisedOffset());
}
- private void rewriteRowCount(final PaginationContext pagination,
- final int rowCountParameterIndex, final StandardParameterBuilder parameterBuilder, final SQLStatementContext sqlStatementContext) {
- parameterBuilder.addReplacedParameters(rowCountParameterIndex, pagination.getRevisedRowCount((SelectStatementContext) sqlStatementContext));
+ private void rewriteRowCount(final PaginationContext pagination, final int rowCountParamIndex, final StandardParameterBuilder paramBuilder, final SQLStatementContext sqlStatementContext) {
+ paramBuilder.addReplacedParameters(rowCountParamIndex, pagination.getRevisedRowCount((SelectStatementContext) sqlStatementContext));
}
}
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 745ab89e2b5..4caa20691f5 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
@@ -68,8 +68,8 @@ public final class ShardingGeneratedKeyInsertValueParameterRewriterTest {
public void assertRewrite() {
InsertStatementContext insertStatementContext = getInsertStatementContext();
ParameterBuilder groupedParamBuilder = getParameterBuilder();
- ShardingGeneratedKeyInsertValueParameterRewriter shardingGeneratedKeyInsertValueParameterRewriter = new ShardingGeneratedKeyInsertValueParameterRewriter();
- shardingGeneratedKeyInsertValueParameterRewriter.rewrite(groupedParamBuilder, insertStatementContext, null);
+ ShardingGeneratedKeyInsertValueParameterRewriter paramRewriter = new ShardingGeneratedKeyInsertValueParameterRewriter();
+ paramRewriter.rewrite(groupedParamBuilder, insertStatementContext, null);
assertThat(((GroupedParameterBuilder) groupedParamBuilder).getParameterBuilders().get(0).getAddedIndexAndParameters().get(TEST_PARAMETER_COUNT), hasItem(TEST_GENERATED_VALUE));
}
diff --git a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameter/ShardingPaginationParameterRewriterTest.java b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameter/ShardingPaginationParameterRewriterTest.java
index 9875048a1b2..ef3a1f678f7 100644
--- a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameter/ShardingPaginationParameterRewriterTest.java
+++ b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/rewrite/parameter/ShardingPaginationParameterRewriterTest.java
@@ -53,37 +53,37 @@ public final class ShardingPaginationParameterRewriterTest {
@Test
public void assertIsNeedRewrite() {
- ShardingPaginationParameterRewriter shardingPaginationParameterRewriter = new ShardingPaginationParameterRewriter();
+ ShardingPaginationParameterRewriter paramRewriter = new ShardingPaginationParameterRewriter();
RouteContext routeContext = mock(RouteContext.class);
- shardingPaginationParameterRewriter.setRouteContext(routeContext);
+ paramRewriter.setRouteContext(routeContext);
InsertStatementContext insertStatementContext = mock(InsertStatementContext.class);
- assertFalse(shardingPaginationParameterRewriter.isNeedRewrite(insertStatementContext));
+ assertFalse(paramRewriter.isNeedRewrite(insertStatementContext));
SelectStatementContext selectStatementContext = mock(SelectStatementContext.class, RETURNS_DEEP_STUBS);
when(selectStatementContext.getPaginationContext().isHasPagination()).thenReturn(Boolean.FALSE);
- assertFalse(shardingPaginationParameterRewriter.isNeedRewrite(selectStatementContext));
+ assertFalse(paramRewriter.isNeedRewrite(selectStatementContext));
when(selectStatementContext.getPaginationContext().isHasPagination()).thenReturn(Boolean.TRUE);
when(routeContext.isSingleRouting()).thenReturn(Boolean.TRUE);
- assertFalse(shardingPaginationParameterRewriter.isNeedRewrite(selectStatementContext));
+ assertFalse(paramRewriter.isNeedRewrite(selectStatementContext));
when(routeContext.isSingleRouting()).thenReturn(Boolean.FALSE);
- assertTrue(shardingPaginationParameterRewriter.isNeedRewrite(selectStatementContext));
+ assertTrue(paramRewriter.isNeedRewrite(selectStatementContext));
}
@Test
public void assertRewrite() {
addOffsetParametersFlag = false;
addRowCountParameterFlag = false;
- StandardParameterBuilder standardParameterBuilder = mock(StandardParameterBuilder.class);
+ StandardParameterBuilder standardParamBuilder = mock(StandardParameterBuilder.class);
doAnswer((Answer<Void>) invocation -> {
int index = invocation.getArgument(0);
- long parameter = invocation.getArgument(1);
- if (index == TEST_OFFSET_PARAMETER_INDEX && parameter == TEST_REVISED_OFFSET) {
+ long param = invocation.getArgument(1);
+ if (index == TEST_OFFSET_PARAMETER_INDEX && param == TEST_REVISED_OFFSET) {
addOffsetParametersFlag = true;
}
- if (index == TEST_ROW_COUNT_PARAMETER_INDEX && parameter == TEST_REVISED_ROW_COUNT) {
+ if (index == TEST_ROW_COUNT_PARAMETER_INDEX && param == TEST_REVISED_ROW_COUNT) {
addRowCountParameterFlag = true;
}
return null;
- }).when(standardParameterBuilder).addReplacedParameters(anyInt(), anyLong());
+ }).when(standardParamBuilder).addReplacedParameters(anyInt(), anyLong());
SelectStatementContext selectStatementContext = mock(SelectStatementContext.class);
PaginationContext pagination = mock(PaginationContext.class);
when(pagination.getOffsetParameterIndex()).thenReturn(Optional.of(TEST_OFFSET_PARAMETER_INDEX));
@@ -91,8 +91,7 @@ public final class ShardingPaginationParameterRewriterTest {
when(pagination.getRevisedOffset()).thenReturn(TEST_REVISED_OFFSET);
when(pagination.getRevisedRowCount(selectStatementContext)).thenReturn(TEST_REVISED_ROW_COUNT);
when(selectStatementContext.getPaginationContext()).thenReturn(pagination);
- ShardingPaginationParameterRewriter shardingPaginationParameterRewriter = new ShardingPaginationParameterRewriter();
- shardingPaginationParameterRewriter.rewrite(standardParameterBuilder, selectStatementContext, null);
+ new ShardingPaginationParameterRewriter().rewrite(standardParamBuilder, selectStatementContext, null);
assertTrue(addOffsetParametersFlag);
assertTrue(addRowCountParameterFlag);
}
diff --git a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/migration/distsql/handler/update/MigrateTableUpdater.java b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/migration/distsql/handler/update/MigrateTableUpdater.java
index bee94607911..a79ccbf9b71 100644
--- a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/migration/distsql/handler/update/MigrateTableUpdater.java
+++ b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/migration/distsql/handler/update/MigrateTableUpdater.java
@@ -38,9 +38,8 @@ public final class MigrateTableUpdater implements RALUpdater<MigrateTableStateme
log.info("start migrate job by {}", sqlStatement);
String targetDatabaseName = null == sqlStatement.getTargetDatabaseName() ? databaseName : sqlStatement.getTargetDatabaseName();
Preconditions.checkNotNull(targetDatabaseName, "Target database name is null. You could define it in DistSQL or select a database.");
- CreateMigrationJobParameter createMigrationJobParameter = new CreateMigrationJobParameter(
- sqlStatement.getSourceResourceName(), sqlStatement.getSourceSchemaName(), sqlStatement.getSourceTableName(), targetDatabaseName, sqlStatement.getTargetTableName());
- JOB_API.createJobAndStart(createMigrationJobParameter);
+ JOB_API.createJobAndStart(new CreateMigrationJobParameter(
+ sqlStatement.getSourceResourceName(), sqlStatement.getSourceSchemaName(), sqlStatement.getSourceTableName(), targetDatabaseName, sqlStatement.getTargetTableName()));
}
@Override
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 2b5379a1a5e..3b4e1e56084 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
@@ -222,7 +222,7 @@ public final class ShardingRouteCacheableChecker {
this.database = database;
this.sql = sql;
this.sqlStatementContext = sqlStatementContext;
- this.parameters = new ArrayList<>(params);
+ parameters = new ArrayList<>(params);
}
}
}
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 f3c2f849055..a8462d2d953 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
@@ -41,7 +41,7 @@ public final class QueryContext {
public QueryContext(final SQLStatementContext<?> sqlStatementContext, final String sql, final List<Object> params) {
this.sqlStatementContext = sqlStatementContext;
this.sql = sql;
- this.parameters = params;
+ 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/segment/insert/values/InsertSelectContext.java b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/segment/insert/values/InsertSelectContext.java
index 43a19b7ae33..5b9ed63c36e 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
@@ -41,7 +41,7 @@ public final class InsertSelectContext {
public InsertSelectContext(final SelectStatementContext selectStatementContext, final List<Object> params, final int parametersOffset) {
parameterCount = selectStatementContext.getSqlStatement().getParameterCount();
this.selectStatementContext = selectStatementContext;
- this.parameters = getParameters(params, parametersOffset);
+ parameters = getParameters(params, parametersOffset);
}
private List<Object> getParameters(final List<Object> params, final int parametersOffset) {
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 3bf7ad811c1..4dc4665b90c 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
@@ -50,7 +50,7 @@ public final class InsertValueContext {
valueExpressions = getValueExpressions(assignments);
parameterMarkerExpressions = ExpressionExtractUtil.getParameterMarkerExpressions(assignments);
parameterCount = parameterMarkerExpressions.size();
- this.parameters = getParameters(params, parametersOffset);
+ parameters = getParameters(params, parametersOffset);
}
private List<ExpressionSegment> getValueExpressions(final Collection<ExpressionSegment> assignments) {
@@ -86,9 +86,9 @@ public final class InsertValueContext {
}
private int getParameterIndex(final ParameterMarkerExpressionSegment paramMarkerExpression) {
- int parameterIndex = parameterMarkerExpressions.indexOf(paramMarkerExpression);
- Preconditions.checkArgument(parameterIndex >= 0, "Can not get parameter index.");
- return parameterIndex;
+ int result = parameterMarkerExpressions.indexOf(paramMarkerExpression);
+ Preconditions.checkArgument(result >= 0, "Can not get parameter index.");
+ return result;
}
/**
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 d8df607551b..09bde68eb52 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
@@ -53,7 +53,7 @@ public final class OnDuplicateUpdateContext {
valueExpressions = getValueExpressions(expressionSegments);
parameterMarkerExpressions = ExpressionExtractUtil.getParameterMarkerExpressions(expressionSegments);
parameterCount = parameterMarkerExpressions.size();
- this.parameters = getParameters(params, parametersOffset);
+ parameters = getParameters(params, parametersOffset);
columns = assignments.stream().map(each -> each.getColumns().get(0)).collect(Collectors.toList());
}
@@ -89,10 +89,10 @@ public final class OnDuplicateUpdateContext {
return ((LiteralExpressionSegment) valueExpression).getLiterals();
}
- private int getParameterIndex(final ParameterMarkerExpressionSegment parameterMarkerExpression) {
- int parameterIndex = parameterMarkerExpressions.indexOf(parameterMarkerExpression);
- Preconditions.checkArgument(parameterIndex >= 0, "Can not get parameter index.");
- return parameterIndex;
+ private int getParameterIndex(final ParameterMarkerExpressionSegment paramMarkerExpression) {
+ int result = parameterMarkerExpressions.indexOf(paramMarkerExpression);
+ Preconditions.checkArgument(result >= 0, "Can not get parameter index.");
+ return result;
}
/**
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/dialect/OpenGaussSchemaMetaDataLoader.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/dialect/OpenGaussSchemaMetaDataLoader.java
index 47be9fdae93..32eeca38650 100644
--- a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/dialect/OpenGaussSchemaMetaDataLoader.java
+++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/dialect/OpenGaussSchemaMetaDataLoader.java
@@ -134,9 +134,9 @@ public final class OpenGaussSchemaMetaDataLoader implements DialectSchemaMetaDat
}
private String getColumnMetaDataSQL(final Collection<String> schemaNames, final Collection<String> tables) {
- String schemaNameParameter = schemaNames.stream().map(each -> String.format("'%s'", each)).collect(Collectors.joining(","));
- return tables.isEmpty() ? String.format(TABLE_META_DATA_SQL_WITHOUT_TABLES, schemaNameParameter)
- : String.format(TABLE_META_DATA_SQL_WITH_TABLES, schemaNameParameter, tables.stream().map(each -> String.format("'%s'", each)).collect(Collectors.joining(",")));
+ String schemaNameParam = schemaNames.stream().map(each -> String.format("'%s'", each)).collect(Collectors.joining(","));
+ return tables.isEmpty() ? String.format(TABLE_META_DATA_SQL_WITHOUT_TABLES, schemaNameParam)
+ : String.format(TABLE_META_DATA_SQL_WITH_TABLES, schemaNameParam, tables.stream().map(each -> String.format("'%s'", each)).collect(Collectors.joining(",")));
}
private Map<String, Multimap<String, IndexMetaData>> loadIndexMetaDataMap(final DataSource dataSource, final Collection<String> schemaNames) throws SQLException {
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/dialect/PostgreSQLSchemaMetaDataLoader.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/dialect/PostgreSQLSchemaMetaDataLoader.java
index 37fc1cf43ff..1055ade4d71 100644
--- a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/dialect/PostgreSQLSchemaMetaDataLoader.java
+++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/dialect/PostgreSQLSchemaMetaDataLoader.java
@@ -174,9 +174,9 @@ public final class PostgreSQLSchemaMetaDataLoader implements DialectSchemaMetaDa
}
private String getColumnMetaDataSQL(final Collection<String> schemaNames, final Collection<String> tables) {
- String schemaNameParameter = schemaNames.stream().map(each -> String.format("'%s'", each)).collect(Collectors.joining(","));
- return tables.isEmpty() ? String.format(TABLE_META_DATA_SQL_WITHOUT_TABLES, schemaNameParameter)
- : String.format(TABLE_META_DATA_SQL_WITH_TABLES, schemaNameParameter, tables.stream().map(each -> String.format("'%s'", each)).collect(Collectors.joining(",")));
+ String schemaNameParam = schemaNames.stream().map(each -> String.format("'%s'", each)).collect(Collectors.joining(","));
+ return tables.isEmpty() ? String.format(TABLE_META_DATA_SQL_WITHOUT_TABLES, schemaNameParam)
+ : String.format(TABLE_META_DATA_SQL_WITH_TABLES, schemaNameParam, tables.stream().map(each -> String.format("'%s'", each)).collect(Collectors.joining(",")));
}
private Map<String, Multimap<String, IndexMetaData>> loadIndexMetaDataMap(final DataSource dataSource, final Collection<String> schemaNames) throws SQLException {
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 7500398e37a..baf0fc53fd1 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
@@ -67,7 +67,7 @@ public final class SQLRewriteContext {
this.schemas = schemas;
this.sqlStatementContext = sqlStatementContext;
this.sql = sql;
- this.parameters = params;
+ parameters = params;
this.connectionContext = connectionContext;
addSQLTokenGenerators(new DefaultTokenGeneratorBuilder(sqlStatementContext).getSQLTokenGenerators());
parameterBuilder = ((sqlStatementContext instanceof InsertStatementContext) && (null == ((InsertStatementContext) sqlStatementContext).getInsertSelectContext()))
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 2381a73b9c8..1df3aa96142 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
@@ -119,25 +119,25 @@ public final class RouteSQLRewriteEngine {
return result;
}
- private List<Object> getParameters(final ParameterBuilder parameterBuilder, final RouteContext routeContext, final RouteUnit routeUnit) {
- if (parameterBuilder instanceof StandardParameterBuilder) {
- return parameterBuilder.getParameters();
+ private List<Object> getParameters(final ParameterBuilder paramBuilder, final RouteContext routeContext, final RouteUnit routeUnit) {
+ if (paramBuilder instanceof StandardParameterBuilder) {
+ return paramBuilder.getParameters();
}
return routeContext.getOriginalDataNodes().isEmpty()
- ? ((GroupedParameterBuilder) parameterBuilder).getParameters()
- : buildRouteParameters((GroupedParameterBuilder) parameterBuilder, routeContext, routeUnit);
+ ? ((GroupedParameterBuilder) paramBuilder).getParameters()
+ : buildRouteParameters((GroupedParameterBuilder) paramBuilder, routeContext, routeUnit);
}
- private List<Object> buildRouteParameters(final GroupedParameterBuilder parameterBuilder, final RouteContext routeContext, final RouteUnit routeUnit) {
+ private List<Object> buildRouteParameters(final GroupedParameterBuilder paramBuilder, final RouteContext routeContext, final RouteUnit routeUnit) {
List<Object> result = new LinkedList<>();
int count = 0;
for (Collection<DataNode> each : routeContext.getOriginalDataNodes()) {
if (isInSameDataNode(each, routeUnit)) {
- result.addAll(parameterBuilder.getParameters(count));
+ result.addAll(paramBuilder.getParameters(count));
}
count++;
}
- result.addAll(parameterBuilder.getGenericParameterBuilder().getParameters());
+ result.addAll(paramBuilder.getGenericParameterBuilder().getParameters());
return result;
}
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 942395cf3fc..336fb46248c 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
@@ -69,9 +69,9 @@ public final class StandardParameterBuilder implements ParameterBuilder {
for (Entry<Integer, Object> entry : replacedIndexAndParameters.entrySet()) {
replacedParams.set(entry.getKey(), entry.getValue());
}
- int maxParameterIndex = getMaxParameterIndex();
+ int maxParamIndex = getMaxParameterIndex();
List<Object> result = new LinkedList<>();
- for (int index = 0; index <= maxParameterIndex; index++) {
+ for (int index = 0; index <= maxParamIndex; index++) {
List<Object> currentIndexParams = new LinkedList<>();
if (replacedParams.size() > index) {
currentIndexParams.add(replacedParams.get(index));
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 c0e87a7b116..f9c48e1d143 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
@@ -40,9 +40,9 @@ public interface ParameterRewriter<T extends SQLStatementContext<?>> {
/**
* Rewrite SQL parameters.
*
- * @param parameterBuilder parameter builder
+ * @param paramBuilder parameter builder
* @param sqlStatementContext SQL statement context
* @param params SQL parameters
*/
- void rewrite(ParameterBuilder parameterBuilder, T sqlStatementContext, List<Object> params);
+ void rewrite(ParameterBuilder paramBuilder, T sqlStatementContext, List<Object> params);
}
diff --git a/infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/parameter/builder/impl/StandardParameterBuilderTest.java b/infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/parameter/builder/impl/StandardParameterBuilderTest.java
index da0a9c8fe4b..fdb5aafc8f9 100644
--- a/infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/parameter/builder/impl/StandardParameterBuilderTest.java
+++ b/infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/parameter/builder/impl/StandardParameterBuilderTest.java
@@ -17,30 +17,20 @@
package org.apache.shardingsphere.infra.rewrite.parameter.builder.impl;
-import org.junit.Before;
import org.junit.Test;
import java.util.Arrays;
import java.util.Collections;
-import java.util.List;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
public final class StandardParameterBuilderTest {
- private final List<Object> parameters = Arrays.asList(1, 2, 1, 5);
-
- private StandardParameterBuilder parameterBuilder;
-
- @Before
- public void setUp() {
- parameterBuilder = new StandardParameterBuilder(parameters);
- parameterBuilder.addAddedParameters(4, Collections.singleton(7));
- }
-
@Test
public void assertGetParameters() {
- assertThat(parameterBuilder.getParameters(), is(Arrays.<Object>asList(1, 2, 1, 5, 7)));
+ StandardParameterBuilder paramBuilder = new StandardParameterBuilder(Arrays.asList(1, 2, 1, 5));
+ paramBuilder.addAddedParameters(4, Collections.singleton(7));
+ assertThat(paramBuilder.getParameters(), is(Arrays.<Object>asList(1, 2, 1, 5, 7)));
}
}
diff --git a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/datasource/ShardingSphereDataSource.java b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/datasource/ShardingSphereDataSource.java
index 8cba0f40744..03e63232112 100644
--- a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/datasource/ShardingSphereDataSource.java
+++ b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/datasource/ShardingSphereDataSource.java
@@ -71,9 +71,9 @@ public final class ShardingSphereDataSource extends AbstractDataSourceAdapter im
Collection<RuleConfiguration> globalRuleConfigs = ruleConfigs.stream().filter(each -> each instanceof GlobalRuleConfiguration).collect(Collectors.toList());
Collection<RuleConfiguration> databaseRuleConfigs = new LinkedList<>(ruleConfigs);
databaseRuleConfigs.removeAll(globalRuleConfigs);
- ContextManagerBuilderParameter parameter = new ContextManagerBuilderParameter(modeConfig, Collections.singletonMap(databaseName,
+ ContextManagerBuilderParameter param = new ContextManagerBuilderParameter(modeConfig, Collections.singletonMap(databaseName,
new DataSourceProvidedDatabaseConfiguration(dataSourceMap, databaseRuleConfigs)), globalRuleConfigs, props, Collections.emptyList(), instanceMetaData, false);
- return ContextManagerBuilderFactory.getInstance(modeConfig).build(parameter);
+ return ContextManagerBuilderFactory.getInstance(modeConfig).build(param);
}
@Override
diff --git a/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/adapter/PreparedStatementAdapterTest.java b/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/adapter/PreparedStatementAdapterTest.java
index 810270314e3..37439490f6f 100644
--- a/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/adapter/PreparedStatementAdapterTest.java
+++ b/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/adapter/PreparedStatementAdapterTest.java
@@ -268,8 +268,8 @@ public final class PreparedStatementAdapterTest {
assertParameter(shardingSpherePreparedStatement, 5, obj);
}
- private void assertParameter(final PreparedStatement actual, final int index, final Object parameter) {
- assertThat(((ShardingSpherePreparedStatement) actual).getParameters().get(index - 1), is(parameter));
+ private void assertParameter(final PreparedStatement actual, final int index, final Object param) {
+ assertThat(((ShardingSpherePreparedStatement) actual).getParameters().get(index - 1), is(param));
}
@Test
diff --git a/jdbc/spring/infra/spring-boot-starter/src/main/java/org/apache/shardingsphere/spring/boot/util/PropertyUtil.java b/jdbc/spring/infra/spring-boot-starter/src/main/java/org/apache/shardingsphere/spring/boot/util/PropertyUtil.java
index d8a0fba6eff..238ad68af5b 100644
--- a/jdbc/spring/infra/spring-boot-starter/src/main/java/org/apache/shardingsphere/spring/boot/util/PropertyUtil.java
+++ b/jdbc/spring/infra/spring-boot-starter/src/main/java/org/apache/shardingsphere/spring/boot/util/PropertyUtil.java
@@ -92,15 +92,15 @@ public final class PropertyUtil {
Constructor<?> resolverConstructor = resolverClass.getDeclaredConstructor(PropertyResolver.class);
Method getSubPropertiesMethod = resolverClass.getDeclaredMethod("getSubProperties", String.class);
Object resolverObject = resolverConstructor.newInstance(environment);
- String prefixParameter = prefix.endsWith(".") ? prefix : prefix + ".";
+ String prefixParam = prefix.endsWith(".") ? prefix : prefix + ".";
Method getPropertyMethod = resolverClass.getDeclaredMethod("getProperty", String.class);
- Map<String, Object> dataSourceProps = (Map<String, Object>) getSubPropertiesMethod.invoke(resolverObject, prefixParameter);
+ Map<String, Object> dataSourceProps = (Map<String, Object>) getSubPropertiesMethod.invoke(resolverObject, prefixParam);
Map<String, Object> result = new HashMap<>(dataSourceProps.size(), 1);
for (Entry<String, Object> entry : dataSourceProps.entrySet()) {
String key = entry.getKey();
Object value = entry.getValue();
if (handlePlaceholder && value instanceof String && ((String) value).contains(PlaceholderConfigurerSupport.DEFAULT_PLACEHOLDER_PREFIX)) {
- String resolvedValue = (String) getPropertyMethod.invoke(resolverObject, prefixParameter + key);
+ String resolvedValue = (String) getPropertyMethod.invoke(resolverObject, prefixParam + key);
result.put(key, resolvedValue);
} else {
result.put(key, value);
@@ -116,8 +116,8 @@ public final class PropertyUtil {
Method getMethod = binderClass.getDeclaredMethod("get", Environment.class);
Method bindMethod = binderClass.getDeclaredMethod("bind", String.class, Class.class);
Object binderObject = getMethod.invoke(null, environment);
- String prefixParameter = dashedPrefix.endsWith(".") ? dashedPrefix.substring(0, prefix.length() - 1) : dashedPrefix;
- Object bindResultObject = bindMethod.invoke(binderObject, prefixParameter, targetClass);
+ String prefixParam = dashedPrefix.endsWith(".") ? dashedPrefix.substring(0, prefix.length() - 1) : dashedPrefix;
+ Object bindResultObject = bindMethod.invoke(binderObject, prefixParam, targetClass);
Method resultGetMethod = bindResultObject.getClass().getDeclaredMethod("get");
return resultGetMethod.invoke(bindResultObject);
}
diff --git a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/ConsistencyCheckJobPublicAPI.java b/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/ConsistencyCheckJobPublicAPI.java
index 039b2a0342c..d34b34a4717 100644
--- a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/ConsistencyCheckJobPublicAPI.java
+++ b/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/ConsistencyCheckJobPublicAPI.java
@@ -34,10 +34,10 @@ public interface ConsistencyCheckJobPublicAPI extends PipelineJobPublicAPI, Requ
/**
* Create consistency check configuration and start job.
*
- * @param parameter create consistency check job parameter
+ * @param param create consistency check job parameter
* @return job id
*/
- String createJobAndStart(CreateConsistencyCheckJobParameter parameter);
+ String createJobAndStart(CreateConsistencyCheckJobParameter param);
/**
* Get latest data consistency check result.
diff --git a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/MigrationJobPublicAPI.java b/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/MigrationJobPublicAPI.java
index 866c0948c8a..6c616ad0b93 100644
--- a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/MigrationJobPublicAPI.java
+++ b/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/MigrationJobPublicAPI.java
@@ -55,8 +55,8 @@ public interface MigrationJobPublicAPI extends InventoryIncrementalJobPublicAPI,
/**
* Create job migration config and start.
*
- * @param parameter create migration job parameter
+ * @param param create migration job parameter
* @return job id
*/
- String createJobAndStart(CreateMigrationJobParameter parameter);
+ String createJobAndStart(CreateMigrationJobParameter param);
}
diff --git a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/datasource/config/PipelineDataSourceConfigurationFactory.java b/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/datasource/config/PipelineDataSourceConfigurationFactory.java
index c7bce682cd0..eb98bb58114 100644
--- a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/datasource/config/PipelineDataSourceConfigurationFactory.java
+++ b/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/datasource/config/PipelineDataSourceConfigurationFactory.java
@@ -33,15 +33,15 @@ public final class PipelineDataSourceConfigurationFactory {
* Create new instance of pipeline data source configuration.
*
* @param type type of pipeline data source configuration
- * @param parameter parameter of pipeline data source configuration
+ * @param param parameter of pipeline data source configuration
* @return created instance
*/
- public static PipelineDataSourceConfiguration newInstance(final String type, final String parameter) {
+ public static PipelineDataSourceConfiguration newInstance(final String type, final String param) {
switch (type) {
case StandardPipelineDataSourceConfiguration.TYPE:
- return new StandardPipelineDataSourceConfiguration(parameter);
+ return new StandardPipelineDataSourceConfiguration(param);
case ShardingSpherePipelineDataSourceConfiguration.TYPE:
- return new ShardingSpherePipelineDataSourceConfiguration(parameter);
+ return new ShardingSpherePipelineDataSourceConfiguration(param);
default:
throw new UnsupportedSQLOperationException(String.format("Unsupported data source type `%s`", type));
}
diff --git a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/datasource/config/impl/ShardingSpherePipelineDataSourceConfiguration.java b/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/datasource/config/impl/ShardingSpherePipelineDataSourceConfiguration.java
index 8b4531637cd..40db91b8d45 100644
--- a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/datasource/config/impl/ShardingSpherePipelineDataSourceConfiguration.java
+++ b/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/datasource/config/impl/ShardingSpherePipelineDataSourceConfiguration.java
@@ -57,9 +57,9 @@ public final class ShardingSpherePipelineDataSourceConfiguration implements Pipe
private final DatabaseType databaseType;
- public ShardingSpherePipelineDataSourceConfiguration(final String parameter) {
- this.parameter = parameter;
- rootConfig = YamlEngine.unmarshal(parameter, YamlRootConfiguration.class, true);
+ public ShardingSpherePipelineDataSourceConfiguration(final String param) {
+ parameter = param;
+ rootConfig = YamlEngine.unmarshal(param, YamlRootConfiguration.class, true);
Map<String, Object> props = rootConfig.getDataSources().values().iterator().next();
databaseType = DatabaseTypeEngine.getDatabaseType(getJdbcUrl(props));
appendJdbcQueryProperties(databaseType.getType());
@@ -67,8 +67,7 @@ public final class ShardingSpherePipelineDataSourceConfiguration implements Pipe
}
public ShardingSpherePipelineDataSourceConfiguration(final YamlRootConfiguration rootConfig) {
- YamlParameterConfiguration parameterConfig = new YamlParameterConfiguration(rootConfig.getDataSources(), rootConfig.getRules());
- this.parameter = YamlEngine.marshal(parameterConfig);
+ parameter = YamlEngine.marshal(new YamlParameterConfiguration(rootConfig.getDataSources(), rootConfig.getRules()));
this.rootConfig = rootConfig;
Map<String, Object> props = rootConfig.getDataSources().values().iterator().next();
databaseType = DatabaseTypeEngine.getDatabaseType(getJdbcUrl(props));
diff --git a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/datasource/config/impl/StandardPipelineDataSourceConfiguration.java b/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/datasource/config/impl/StandardPipelineDataSourceConfiguration.java
index adb3c3c6850..03533affb42 100644
--- a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/datasource/config/impl/StandardPipelineDataSourceConfiguration.java
+++ b/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/datasource/config/impl/StandardPipelineDataSourceConfiguration.java
@@ -58,16 +58,16 @@ public final class StandardPipelineDataSourceConfiguration implements PipelineDa
private final DatabaseType databaseType;
@SuppressWarnings("unchecked")
- public StandardPipelineDataSourceConfiguration(final String parameter) {
- this(parameter, YamlEngine.unmarshal(parameter, Map.class));
+ public StandardPipelineDataSourceConfiguration(final String param) {
+ this(param, YamlEngine.unmarshal(param, Map.class));
}
- public StandardPipelineDataSourceConfiguration(final Map<String, Object> yamlDataSourceConfig) {
- this(YamlEngine.marshal(yamlDataSourceConfig), yamlDataSourceConfig);
+ public StandardPipelineDataSourceConfiguration(final Map<String, Object> yamlConfig) {
+ this(YamlEngine.marshal(yamlConfig), yamlConfig);
}
- private StandardPipelineDataSourceConfiguration(final String parameter, final Map<String, Object> yamlConfig) {
- this.parameter = parameter;
+ private StandardPipelineDataSourceConfiguration(final String param, final Map<String, Object> yamlConfig) {
+ parameter = param;
for (String each : Arrays.asList("minPoolSize", "minimumIdle")) {
yamlConfig.put(each, "1");
}
diff --git a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/job/progress/listener/PipelineJobProgressListener.java b/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/job/progress/listener/PipelineJobProgressListener.java
index b8fadbde343..c92254dbc34 100644
--- a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/job/progress/listener/PipelineJobProgressListener.java
+++ b/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/job/progress/listener/PipelineJobProgressListener.java
@@ -25,7 +25,7 @@ public interface PipelineJobProgressListener {
/**
* Emit on progress updated.
*
- * @param parameter process update parameter
+ * @param param process update parameter
*/
- void onProgressUpdated(PipelineJobProgressUpdatedParameter parameter);
+ void onProgressUpdated(PipelineJobProgressUpdatedParameter param);
}
diff --git a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/spi/check/consistency/DataConsistencyCalculateAlgorithm.java b/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/spi/check/consistency/DataConsistencyCalculateAlgorithm.java
index 64474fbc009..a1f466d6e54 100644
--- a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/spi/check/consistency/DataConsistencyCalculateAlgorithm.java
+++ b/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/spi/check/consistency/DataConsistencyCalculateAlgorithm.java
@@ -32,10 +32,10 @@ public interface DataConsistencyCalculateAlgorithm extends ShardingSphereAlgorit
/**
* Calculate data for consistency check.
*
- * @param parameter data consistency calculate parameter
+ * @param param data consistency calculate parameter
* @return calculated result
*/
- Iterable<DataConsistencyCalculatedResult> calculate(DataConsistencyCalculateParameter parameter);
+ Iterable<DataConsistencyCalculatedResult> calculate(DataConsistencyCalculateParameter param);
/**
* Cancel calculation.
diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/check/consistency/SingleTableInventoryDataConsistencyChecker.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/check/consistency/SingleTableInventoryDataConsistencyChecker.java
index 899c0f17ceb..476283688f2 100644
--- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/check/consistency/SingleTableInventoryDataConsistencyChecker.java
+++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/check/consistency/SingleTableInventoryDataConsistencyChecker.java
@@ -103,15 +103,15 @@ public final class SingleTableInventoryDataConsistencyChecker {
ShardingSpherePreconditions.checkNotNull(tableMetaData, () -> new PipelineTableDataConsistencyCheckLoadingFailedException(schemaName, sourceTableName));
Collection<String> columnNames = tableMetaData.getColumnNames();
Map<String, Object> tableCheckPositions = jobItemContext.getTableCheckPositions();
- DataConsistencyCalculateParameter sourceParameter = buildParameter(
+ DataConsistencyCalculateParameter sourceParam = buildParameter(
sourceDataSource, schemaName, sourceTableName, columnNames, sourceDatabaseType, targetDatabaseType, uniqueKey,
tableCheckPositions.get(sourceTableName));
String targetTableName = targetTable.getTableName().getOriginal();
- DataConsistencyCalculateParameter targetParameter = buildParameter(
+ DataConsistencyCalculateParameter targetParam = buildParameter(
targetDataSource, targetTable.getSchemaName().getOriginal(), targetTableName, columnNames, targetDatabaseType, sourceDatabaseType, uniqueKey,
tableCheckPositions.get(targetTableName));
- Iterator<DataConsistencyCalculatedResult> sourceCalculatedResults = calculateAlgorithm.calculate(sourceParameter).iterator();
- Iterator<DataConsistencyCalculatedResult> targetCalculatedResults = calculateAlgorithm.calculate(targetParameter).iterator();
+ Iterator<DataConsistencyCalculatedResult> sourceCalculatedResults = calculateAlgorithm.calculate(sourceParam).iterator();
+ Iterator<DataConsistencyCalculatedResult> targetCalculatedResults = calculateAlgorithm.calculate(targetParam).iterator();
long sourceRecordsCount = 0;
long targetRecordsCount = 0;
boolean contentMatched = true;
diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/check/consistency/algorithm/AbstractStreamingDataConsistencyCalculateAlgorithm.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/check/consistency/algorithm/AbstractStreamingDataConsistencyCalculateAlgorithm.java
index c1c18347e88..2531d0ebf02 100644
--- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/check/consistency/algorithm/AbstractStreamingDataConsistencyCalculateAlgorithm.java
+++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/check/consistency/algorithm/AbstractStreamingDataConsistencyCalculateAlgorithm.java
@@ -36,17 +36,17 @@ import java.util.concurrent.atomic.AtomicInteger;
public abstract class AbstractStreamingDataConsistencyCalculateAlgorithm extends AbstractDataConsistencyCalculateAlgorithm {
@Override
- public final Iterable<DataConsistencyCalculatedResult> calculate(final DataConsistencyCalculateParameter parameter) {
- return new ResultIterable(parameter);
+ public final Iterable<DataConsistencyCalculatedResult> calculate(final DataConsistencyCalculateParameter param) {
+ return new ResultIterable(param);
}
/**
* Calculate chunked records at one time.
*
- * @param parameter data consistency calculate parameter
+ * @param param data consistency calculate parameter
* @return optional calculated result, empty means there's no more result
*/
- protected abstract Optional<DataConsistencyCalculatedResult> calculateChunk(DataConsistencyCalculateParameter parameter);
+ protected abstract Optional<DataConsistencyCalculatedResult> calculateChunk(DataConsistencyCalculateParameter param);
/**
* It's not thread-safe, it should be executed in only one thread at the same time.
@@ -54,18 +54,18 @@ public abstract class AbstractStreamingDataConsistencyCalculateAlgorithm extends
@RequiredArgsConstructor
final class ResultIterable implements Iterable<DataConsistencyCalculatedResult> {
- private final DataConsistencyCalculateParameter parameter;
+ private final DataConsistencyCalculateParameter param;
@Override
public Iterator<DataConsistencyCalculatedResult> iterator() {
- return new ResultIterator(parameter);
+ return new ResultIterator(param);
}
}
@RequiredArgsConstructor
final class ResultIterator implements Iterator<DataConsistencyCalculatedResult> {
- private final DataConsistencyCalculateParameter parameter;
+ private final DataConsistencyCalculateParameter param;
private final AtomicInteger calculationCount = new AtomicInteger(0);
@@ -81,7 +81,7 @@ public abstract class AbstractStreamingDataConsistencyCalculateAlgorithm extends
public DataConsistencyCalculatedResult next() {
calculateIfNecessary();
Optional<DataConsistencyCalculatedResult> nextResult = this.nextResult;
- parameter.setPreviousCalculatedResult(nextResult.orElse(null));
+ param.setPreviousCalculatedResult(nextResult.orElse(null));
this.nextResult = null;
return nextResult.orElse(null);
}
@@ -90,7 +90,7 @@ public abstract class AbstractStreamingDataConsistencyCalculateAlgorithm extends
if (null != nextResult) {
return;
}
- nextResult = calculateChunk(parameter);
+ nextResult = calculateChunk(param);
if (!nextResult.isPresent()) {
log.info("nextResult not present, calculation done. calculationCount={}", calculationCount);
}
diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/check/consistency/algorithm/CRC32MatchDataConsistencyCalculateAlgorithm.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/check/consistency/algorithm/CRC32MatchDataConsistencyCalculateAlgorithm.java
index aefc709ebb0..f4a27a1dc25 100644
--- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/check/consistency/algorithm/CRC32MatchDataConsistencyCalculateAlgorithm.java
+++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/check/consistency/algorithm/CRC32MatchDataConsistencyCalculateAlgorithm.java
@@ -57,17 +57,17 @@ public final class CRC32MatchDataConsistencyCalculateAlgorithm extends AbstractD
}
@Override
- public Iterable<DataConsistencyCalculatedResult> calculate(final DataConsistencyCalculateParameter parameter) {
- PipelineSQLBuilder sqlBuilder = PipelineSQLBuilderFactory.getInstance(parameter.getDatabaseType());
- List<CalculatedItem> calculatedItems = parameter.getColumnNames().stream().map(each -> calculateCRC32(sqlBuilder, parameter, each)).collect(Collectors.toList());
+ public Iterable<DataConsistencyCalculatedResult> calculate(final DataConsistencyCalculateParameter param) {
+ PipelineSQLBuilder sqlBuilder = PipelineSQLBuilderFactory.getInstance(param.getDatabaseType());
+ List<CalculatedItem> calculatedItems = param.getColumnNames().stream().map(each -> calculateCRC32(sqlBuilder, param, each)).collect(Collectors.toList());
return Collections.singletonList(new CalculatedResult(calculatedItems.get(0).getRecordsCount(), calculatedItems.stream().map(CalculatedItem::getCrc32).collect(Collectors.toList())));
}
- private CalculatedItem calculateCRC32(final PipelineSQLBuilder sqlBuilder, final DataConsistencyCalculateParameter parameter, final String columnName) {
- Optional<String> sql = sqlBuilder.buildCRC32SQL(parameter.getSchemaName(), parameter.getLogicTableName(), columnName);
- ShardingSpherePreconditions.checkState(sql.isPresent(), () -> new UnsupportedCRC32DataConsistencyCalculateAlgorithmException(parameter.getDatabaseType()));
+ private CalculatedItem calculateCRC32(final PipelineSQLBuilder sqlBuilder, final DataConsistencyCalculateParameter param, final String columnName) {
+ Optional<String> sql = sqlBuilder.buildCRC32SQL(param.getSchemaName(), param.getLogicTableName(), columnName);
+ ShardingSpherePreconditions.checkState(sql.isPresent(), () -> new UnsupportedCRC32DataConsistencyCalculateAlgorithmException(param.getDatabaseType()));
try (
- Connection connection = parameter.getDataSource().getConnection();
+ Connection connection = param.getDataSource().getConnection();
PreparedStatement preparedStatement = setCurrentStatement(connection.prepareStatement(sql.get()));
ResultSet resultSet = preparedStatement.executeQuery()) {
resultSet.next();
@@ -75,7 +75,7 @@ public final class CRC32MatchDataConsistencyCalculateAlgorithm extends AbstractD
int recordsCount = resultSet.getInt(2);
return new CalculatedItem(crc32, recordsCount);
} catch (final SQLException ex) {
- throw new PipelineTableDataConsistencyCheckLoadingFailedException(parameter.getSchemaName(), parameter.getLogicTableName(), ex);
+ throw new PipelineTableDataConsistencyCheckLoadingFailedException(param.getSchemaName(), param.getLogicTableName(), ex);
}
}
diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/check/consistency/algorithm/DataMatchDataConsistencyCalculateAlgorithm.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/check/consistency/algorithm/DataMatchDataConsistencyCalculateAlgorithm.java
index 676c3c71fcd..92492a3099f 100644
--- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/check/consistency/algorithm/DataMatchDataConsistencyCalculateAlgorithm.java
+++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/check/consistency/algorithm/DataMatchDataConsistencyCalculateAlgorithm.java
@@ -89,14 +89,14 @@ public final class DataMatchDataConsistencyCalculateAlgorithm extends AbstractSt
}
@Override
- protected Optional<DataConsistencyCalculatedResult> calculateChunk(final DataConsistencyCalculateParameter parameter) {
- CalculatedResult previousCalculatedResult = (CalculatedResult) parameter.getPreviousCalculatedResult();
- String sql = getQuerySQL(parameter);
+ protected Optional<DataConsistencyCalculatedResult> calculateChunk(final DataConsistencyCalculateParameter param) {
+ CalculatedResult previousCalculatedResult = (CalculatedResult) param.getPreviousCalculatedResult();
+ String sql = getQuerySQL(param);
try (
- Connection connection = parameter.getDataSource().getConnection();
+ Connection connection = param.getDataSource().getConnection();
PreparedStatement preparedStatement = setCurrentStatement(connection.prepareStatement(sql))) {
preparedStatement.setFetchSize(chunkSize);
- Object tableCheckPosition = parameter.getTableCheckPosition();
+ Object tableCheckPosition = param.getTableCheckPosition();
if (null == previousCalculatedResult) {
if (null == tableCheckPosition) {
preparedStatement.setInt(1, chunkSize);
@@ -111,10 +111,10 @@ public final class DataMatchDataConsistencyCalculateAlgorithm extends AbstractSt
Collection<Collection<Object>> records = new LinkedList<>();
Object maxUniqueKeyValue = null;
try (ResultSet resultSet = preparedStatement.executeQuery()) {
- ColumnValueReader columnValueReader = ColumnValueReaderFactory.getInstance(parameter.getDatabaseType());
+ ColumnValueReader columnValueReader = ColumnValueReaderFactory.getInstance(param.getDatabaseType());
while (resultSet.next()) {
if (isCanceling()) {
- throw new PipelineTableDataConsistencyCheckLoadingFailedException(parameter.getSchemaName(), parameter.getLogicTableName());
+ throw new PipelineTableDataConsistencyCheckLoadingFailedException(param.getSchemaName(), param.getLogicTableName());
}
ResultSetMetaData resultSetMetaData = resultSet.getMetaData();
int columnCount = resultSetMetaData.getColumnCount();
@@ -123,24 +123,24 @@ public final class DataMatchDataConsistencyCalculateAlgorithm extends AbstractSt
record.add(columnValueReader.readValue(resultSet, resultSetMetaData, columnIndex));
}
records.add(record);
- maxUniqueKeyValue = columnValueReader.readValue(resultSet, resultSetMetaData, parameter.getUniqueKey().getOrdinalPosition());
+ maxUniqueKeyValue = columnValueReader.readValue(resultSet, resultSetMetaData, param.getUniqueKey().getOrdinalPosition());
}
}
return records.isEmpty() ? Optional.empty() : Optional.of(new CalculatedResult(maxUniqueKeyValue, records.size(), records));
} catch (final SQLException ex) {
- throw new PipelineTableDataConsistencyCheckLoadingFailedException(parameter.getSchemaName(), parameter.getLogicTableName(), ex);
+ throw new PipelineTableDataConsistencyCheckLoadingFailedException(param.getSchemaName(), param.getLogicTableName(), ex);
}
}
- private String getQuerySQL(final DataConsistencyCalculateParameter parameter) {
- PipelineSQLBuilder sqlBuilder = PipelineSQLBuilderFactory.getInstance(parameter.getDatabaseType());
- String logicTableName = parameter.getLogicTableName();
- String schemaName = parameter.getSchemaName();
- String uniqueKey = parameter.getUniqueKey().getName();
- String cacheKey = parameter.getDatabaseType() + "-" + (null != schemaName && DatabaseTypeFactory.getInstance(parameter.getDatabaseType()).isSchemaAvailable()
+ private String getQuerySQL(final DataConsistencyCalculateParameter param) {
+ PipelineSQLBuilder sqlBuilder = PipelineSQLBuilderFactory.getInstance(param.getDatabaseType());
+ String logicTableName = param.getLogicTableName();
+ String schemaName = param.getSchemaName();
+ String uniqueKey = param.getUniqueKey().getName();
+ String cacheKey = param.getDatabaseType() + "-" + (null != schemaName && DatabaseTypeFactory.getInstance(param.getDatabaseType()).isSchemaAvailable()
? schemaName + "." + logicTableName
: logicTableName);
- if (null == parameter.getPreviousCalculatedResult() && null == parameter.getTableCheckPosition()) {
+ if (null == param.getPreviousCalculatedResult() && null == param.getTableCheckPosition()) {
return firstSQLCache.computeIfAbsent(cacheKey, s -> sqlBuilder.buildChunkedQuerySQL(schemaName, logicTableName, uniqueKey, true));
}
return laterSQLCache.computeIfAbsent(cacheKey, s -> sqlBuilder.buildChunkedQuerySQL(schemaName, logicTableName, uniqueKey, false));
diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/importer/DefaultImporter.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/importer/DefaultImporter.java
index 2a60564a4e0..af90af06594 100644
--- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/importer/DefaultImporter.java
+++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/importer/DefaultImporter.java
@@ -105,9 +105,9 @@ public final class DefaultImporter extends AbstractLifecycleExecutor implements
if (null != records && !records.isEmpty()) {
round++;
rowCount += records.size();
- PipelineJobProgressUpdatedParameter updatedParameter = flush(dataSourceManager.getDataSource(importerConfig.getDataSourceConfig()), records);
+ PipelineJobProgressUpdatedParameter updatedParam = flush(dataSourceManager.getDataSource(importerConfig.getDataSourceConfig()), records);
channel.ack(records);
- jobProgressListener.onProgressUpdated(updatedParameter);
+ jobProgressListener.onProgressUpdated(updatedParam);
if (0 == round % 50) {
log.info("importer write, round={}, rowCount={}", round, rowCount);
}
diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/prepare/PipelineJobPreparerUtils.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/prepare/PipelineJobPreparerUtils.java
index 7fb523081eb..e1284c59298 100644
--- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/prepare/PipelineJobPreparerUtils.java
+++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/prepare/PipelineJobPreparerUtils.java
@@ -71,17 +71,17 @@ public final class PipelineJobPreparerUtils {
* Prepare target schema.
*
* @param databaseType database type
- * @param prepareTargetSchemasParameter prepare target schemas parameter
+ * @param prepareTargetSchemasParam prepare target schemas parameter
* @throws SQLException if prepare target schema fail
*/
- public static void prepareTargetSchema(final String databaseType, final PrepareTargetSchemasParameter prepareTargetSchemasParameter) throws SQLException {
+ public static void prepareTargetSchema(final String databaseType, final PrepareTargetSchemasParameter prepareTargetSchemasParam) throws SQLException {
Optional<DataSourcePreparer> dataSourcePreparer = DataSourcePreparerFactory.getInstance(databaseType);
if (!dataSourcePreparer.isPresent()) {
log.info("dataSourcePreparer null, ignore prepare target");
return;
}
long startTimeMillis = System.currentTimeMillis();
- dataSourcePreparer.get().prepareTargetSchemas(prepareTargetSchemasParameter);
+ dataSourcePreparer.get().prepareTargetSchemas(prepareTargetSchemasParam);
log.info("prepareTargetSchema cost {} ms", System.currentTimeMillis() - startTimeMillis);
}
@@ -101,17 +101,17 @@ public final class PipelineJobPreparerUtils {
* Prepare target tables.
*
* @param databaseType database type
- * @param prepareTargetTablesParameter prepare target tables parameter
+ * @param prepareTargetTablesParam prepare target tables parameter
* @throws SQLException SQL exception
*/
- public static void prepareTargetTables(final String databaseType, final PrepareTargetTablesParameter prepareTargetTablesParameter) throws SQLException {
+ public static void prepareTargetTables(final String databaseType, final PrepareTargetTablesParameter prepareTargetTablesParam) throws SQLException {
Optional<DataSourcePreparer> dataSourcePreparer = DataSourcePreparerFactory.getInstance(databaseType);
if (!dataSourcePreparer.isPresent()) {
log.info("dataSourcePreparer null, ignore prepare target");
return;
}
long startTimeMillis = System.currentTimeMillis();
- dataSourcePreparer.get().prepareTargetTables(prepareTargetTablesParameter);
+ dataSourcePreparer.get().prepareTargetTables(prepareTargetTablesParam);
log.info("prepareTargetTables cost {} ms", System.currentTimeMillis() - startTimeMillis);
}
diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/prepare/datasource/AbstractDataSourcePreparer.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/prepare/datasource/AbstractDataSourcePreparer.java
index fc1b948aa6b..1fde15978c8 100644
--- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/prepare/datasource/AbstractDataSourcePreparer.java
+++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/prepare/datasource/AbstractDataSourcePreparer.java
@@ -53,13 +53,13 @@ public abstract class AbstractDataSourcePreparer implements DataSourcePreparer {
private static final String[] IGNORE_EXCEPTION_MESSAGE = {"multiple primary keys for table", "already exists"};
@Override
- public void prepareTargetSchemas(final PrepareTargetSchemasParameter parameter) {
- DatabaseType targetDatabaseType = parameter.getTargetDatabaseType();
+ public void prepareTargetSchemas(final PrepareTargetSchemasParameter param) {
+ DatabaseType targetDatabaseType = param.getTargetDatabaseType();
if (!targetDatabaseType.isSchemaAvailable()) {
log.info("prepareTargetSchemas, target database does not support schema, ignore, targetDatabaseType={}", targetDatabaseType);
return;
}
- CreateTableConfiguration createTableConfig = parameter.getCreateTableConfig();
+ CreateTableConfiguration createTableConfig = param.getCreateTableConfig();
String defaultSchema = DatabaseTypeEngine.getDefaultSchemaName(targetDatabaseType).orElse(null);
PipelineSQLBuilder sqlBuilder = PipelineSQLBuilderFactory.getInstance(targetDatabaseType.getType());
Collection<String> createdSchemaNames = new HashSet<>();
@@ -70,7 +70,7 @@ public abstract class AbstractDataSourcePreparer implements DataSourcePreparer {
}
Optional<String> sql = sqlBuilder.buildCreateSchemaSQL(targetSchemaName);
if (sql.isPresent()) {
- executeCreateSchema(parameter.getDataSourceManager(), each.getTargetDataSourceConfig(), sql.get());
+ executeCreateSchema(param.getDataSourceManager(), each.getTargetDataSourceConfig(), sql.get());
createdSchemaNames.add(targetSchemaName);
}
}
diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/prepare/datasource/DataSourcePreparer.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/prepare/datasource/DataSourcePreparer.java
index 501765108aa..a2578594de9 100644
--- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/prepare/datasource/DataSourcePreparer.java
+++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/prepare/datasource/DataSourcePreparer.java
@@ -31,16 +31,16 @@ public interface DataSourcePreparer extends TypedSPI {
/**
* Prepare target schemas.
*
- * @param parameter prepare target schemas parameter
+ * @param param prepare target schemas parameter
* @throws SQLException if prepare target schema fail
*/
- void prepareTargetSchemas(PrepareTargetSchemasParameter parameter) throws SQLException;
+ void prepareTargetSchemas(PrepareTargetSchemasParameter param) throws SQLException;
/**
* Prepare target tables.
*
- * @param parameter prepare target tables parameter
+ * @param param prepare target tables parameter
* @throws SQLException SQL exception
*/
- void prepareTargetTables(PrepareTargetTablesParameter parameter) throws SQLException;
+ void prepareTargetTables(PrepareTargetTablesParameter param) throws SQLException;
}
diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/consistencycheck/ConsistencyCheckJobAPIImpl.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/consistencycheck/ConsistencyCheckJobAPIImpl.java
index 60270e3bc0e..82820f2aa5c 100644
--- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/consistencycheck/ConsistencyCheckJobAPIImpl.java
+++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/consistencycheck/ConsistencyCheckJobAPIImpl.java
@@ -76,9 +76,9 @@ public final class ConsistencyCheckJobAPIImpl extends AbstractPipelineJobAPIImpl
}
@Override
- public String createJobAndStart(final CreateConsistencyCheckJobParameter parameter) {
+ public String createJobAndStart(final CreateConsistencyCheckJobParameter param) {
GovernanceRepositoryAPI repositoryAPI = PipelineAPIFactory.getGovernanceRepositoryAPI();
- String parentJobId = parameter.getJobId();
+ String parentJobId = param.getJobId();
Optional<String> checkLatestJobId = repositoryAPI.getCheckLatestJobId(parentJobId);
if (checkLatestJobId.isPresent()) {
PipelineJobItemProgress progress = getJobItemProgress(checkLatestJobId.get(), 0);
@@ -95,8 +95,8 @@ public final class ConsistencyCheckJobAPIImpl extends AbstractPipelineJobAPIImpl
YamlConsistencyCheckJobConfiguration yamlConfig = new YamlConsistencyCheckJobConfiguration();
yamlConfig.setJobId(result);
yamlConfig.setParentJobId(parentJobId);
- yamlConfig.setAlgorithmTypeName(parameter.getAlgorithmTypeName());
- yamlConfig.setAlgorithmProps(parameter.getAlgorithmProps());
+ yamlConfig.setAlgorithmTypeName(param.getAlgorithmTypeName());
+ yamlConfig.setAlgorithmProps(param.getAlgorithmProps());
start(new YamlConsistencyCheckJobConfigurationSwapper().swapToObject(yamlConfig));
return result;
}
diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/consistencycheck/ConsistencyCheckJobItemContext.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/consistencycheck/ConsistencyCheckJobItemContext.java
index 3a47d8489a3..c26c4d6dc39 100644
--- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/consistencycheck/ConsistencyCheckJobItemContext.java
+++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/consistencycheck/ConsistencyCheckJobItemContext.java
@@ -84,8 +84,8 @@ public final class ConsistencyCheckJobItemContext implements PipelineJobItemCont
}
@Override
- public void onProgressUpdated(final PipelineJobProgressUpdatedParameter parameter) {
- checkedRecordsCount.addAndGet(parameter.getProcessedRecordsCount());
+ public void onProgressUpdated(final PipelineJobProgressUpdatedParameter param) {
+ checkedRecordsCount.addAndGet(param.getProcessedRecordsCount());
PipelineJobProgressPersistService.notifyPersist(jobId, shardingItem);
}
}
diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/MigrationJobAPIImpl.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/MigrationJobAPIImpl.java
index 322a40f6750..d1f88d38014 100644
--- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/MigrationJobAPIImpl.java
+++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/MigrationJobAPIImpl.java
@@ -399,39 +399,39 @@ public final class MigrationJobAPIImpl extends AbstractInventoryIncrementalJobAP
}
@Override
- public String createJobAndStart(final CreateMigrationJobParameter parameter) {
+ public String createJobAndStart(final CreateMigrationJobParameter param) {
YamlMigrationJobConfiguration result = new YamlMigrationJobConfiguration();
Map<String, DataSourceProperties> metaDataDataSource = dataSourcePersistService.load(JobType.MIGRATION);
- Map<String, Object> sourceDataSourceProps = swapper.swapToMap(metaDataDataSource.get(parameter.getSourceResourceName()));
+ Map<String, Object> sourceDataSourceProps = swapper.swapToMap(metaDataDataSource.get(param.getSourceResourceName()));
YamlPipelineDataSourceConfiguration sourcePipelineDataSourceConfig = createYamlPipelineDataSourceConfiguration(
StandardPipelineDataSourceConfiguration.TYPE, YamlEngine.marshal(sourceDataSourceProps));
result.setSource(sourcePipelineDataSourceConfig);
- result.setSourceResourceName(parameter.getSourceResourceName());
+ result.setSourceResourceName(param.getSourceResourceName());
StandardPipelineDataSourceConfiguration sourceDataSourceConfig = new StandardPipelineDataSourceConfiguration(sourceDataSourceProps);
DatabaseType sourceDatabaseType = sourceDataSourceConfig.getDatabaseType();
result.setSourceDatabaseType(sourceDatabaseType.getType());
- String sourceSchemaName = null == parameter.getSourceSchemaName() && sourceDatabaseType.isSchemaAvailable()
+ String sourceSchemaName = null == param.getSourceSchemaName() && sourceDatabaseType.isSchemaAvailable()
? PipelineSchemaUtil.getDefaultSchema(sourceDataSourceConfig)
- : parameter.getSourceSchemaName();
+ : param.getSourceSchemaName();
result.setSourceSchemaName(sourceSchemaName);
- result.setSourceTableName(parameter.getSourceTableName());
+ result.setSourceTableName(param.getSourceTableName());
Map<String, Map<String, Object>> targetDataSourceProps = new HashMap<>();
- ShardingSphereDatabase targetDatabase = PipelineContext.getContextManager().getMetaDataContexts().getMetaData().getDatabase(parameter.getTargetDatabaseName());
+ ShardingSphereDatabase targetDatabase = PipelineContext.getContextManager().getMetaDataContexts().getMetaData().getDatabase(param.getTargetDatabaseName());
for (Entry<String, DataSource> entry : targetDatabase.getResourceMetaData().getDataSources().entrySet()) {
Map<String, Object> dataSourceProps = swapper.swapToMap(DataSourcePropertiesCreator.create(entry.getValue()));
targetDataSourceProps.put(entry.getKey(), dataSourceProps);
}
- String targetDatabaseName = parameter.getTargetDatabaseName();
+ String targetDatabaseName = param.getTargetDatabaseName();
YamlRootConfiguration targetRootConfig = getYamlRootConfiguration(targetDatabaseName, targetDataSourceProps, targetDatabase.getRuleMetaData().getConfigurations());
PipelineDataSourceConfiguration targetPipelineDataSource = new ShardingSpherePipelineDataSourceConfiguration(targetRootConfig);
result.setTarget(createYamlPipelineDataSourceConfiguration(targetPipelineDataSource.getType(), YamlEngine.marshal(targetPipelineDataSource.getDataSourceConfiguration())));
result.setTargetDatabaseType(targetPipelineDataSource.getDatabaseType().getType());
result.setTargetDatabaseName(targetDatabaseName);
- result.setTargetTableName(parameter.getTargetTableName());
+ result.setTargetTableName(param.getTargetTableName());
try (PipelineDataSourceWrapper dataSource = PipelineDataSourceFactory.newInstance(sourceDataSourceConfig)) {
StandardPipelineTableMetaDataLoader metaDataLoader = new StandardPipelineTableMetaDataLoader(dataSource);
YamlPipelineColumnMetaData uniqueKeyColumn = new YamlPipelineColumnMetaDataSwapper().swapToYamlConfiguration(
- PipelineTableMetaDataUtil.getUniqueKeyColumn(sourceSchemaName, parameter.getSourceTableName(), metaDataLoader));
+ PipelineTableMetaDataUtil.getUniqueKeyColumn(sourceSchemaName, param.getSourceTableName(), metaDataLoader));
result.setUniqueKeyColumn(uniqueKeyColumn);
} catch (final SQLException ex) {
throw new RuntimeException(ex);
@@ -451,10 +451,10 @@ public final class MigrationJobAPIImpl extends AbstractInventoryIncrementalJobAP
return result;
}
- private YamlPipelineDataSourceConfiguration createYamlPipelineDataSourceConfiguration(final String type, final String parameter) {
+ private YamlPipelineDataSourceConfiguration createYamlPipelineDataSourceConfiguration(final String type, final String param) {
YamlPipelineDataSourceConfiguration result = new YamlPipelineDataSourceConfiguration();
result.setType(type);
- result.setParameter(parameter);
+ result.setParameter(param);
return result;
}
diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/MigrationJobItemContext.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/MigrationJobItemContext.java
index 53b6e94236b..52b8c2c858f 100644
--- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/MigrationJobItemContext.java
+++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/MigrationJobItemContext.java
@@ -132,8 +132,8 @@ public final class MigrationJobItemContext implements InventoryIncrementalJobIte
}
@Override
- public void onProgressUpdated(final PipelineJobProgressUpdatedParameter parameter) {
- processedRecordsCount.addAndGet(parameter.getProcessedRecordsCount());
+ public void onProgressUpdated(final PipelineJobProgressUpdatedParameter param) {
+ processedRecordsCount.addAndGet(param.getProcessedRecordsCount());
PipelineJobProgressPersistService.notifyPersist(jobId, shardingItem);
}
diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/MigrationJobPreparer.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/MigrationJobPreparer.java
index 32d8e98ca55..122a20d5b77 100644
--- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/MigrationJobPreparer.java
+++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/MigrationJobPreparer.java
@@ -136,12 +136,11 @@ public final class MigrationJobPreparer {
MigrationJobConfiguration jobConfig = jobItemContext.getJobConfig();
String targetDatabaseType = jobConfig.getTargetDatabaseType();
CreateTableConfiguration createTableConfig = jobItemContext.getTaskConfig().getCreateTableConfig();
- PrepareTargetSchemasParameter prepareTargetSchemasParameter = new PrepareTargetSchemasParameter(
+ PrepareTargetSchemasParameter prepareTargetSchemasParam = new PrepareTargetSchemasParameter(
DatabaseTypeFactory.getInstance(targetDatabaseType), createTableConfig, jobItemContext.getDataSourceManager());
- PipelineJobPreparerUtils.prepareTargetSchema(targetDatabaseType, prepareTargetSchemasParameter);
+ PipelineJobPreparerUtils.prepareTargetSchema(targetDatabaseType, prepareTargetSchemasParam);
ShardingSphereSQLParserEngine sqlParserEngine = PipelineJobPreparerUtils.getSQLParserEngine(jobConfig.getTargetDatabaseName());
- PrepareTargetTablesParameter prepareTargetTablesParameter = new PrepareTargetTablesParameter(createTableConfig, jobItemContext.getDataSourceManager(), sqlParserEngine);
- PipelineJobPreparerUtils.prepareTargetTables(targetDatabaseType, prepareTargetTablesParameter);
+ PipelineJobPreparerUtils.prepareTargetTables(targetDatabaseType, new PrepareTargetTablesParameter(createTableConfig, jobItemContext.getDataSourceManager(), sqlParserEngine));
}
private void initInventoryTasks(final MigrationJobItemContext jobItemContext) {
diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/yaml/consistency/YamlDataConsistencyCheckResultSwapper.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/yaml/consistency/YamlDataConsistencyCheckResultSwapper.java
index b2204ae26ae..89ae13291a1 100644
--- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/yaml/consistency/YamlDataConsistencyCheckResultSwapper.java
+++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/yaml/consistency/YamlDataConsistencyCheckResultSwapper.java
@@ -58,10 +58,10 @@ public final class YamlDataConsistencyCheckResultSwapper implements YamlConfigur
/**
* Swap string to data consistency check result.
*
- * @param parameter parameter
+ * @param param parameter
* @return data consistency check result
*/
- public DataConsistencyCheckResult swapToObject(final String parameter) {
- return swapToObject(YamlEngine.unmarshal(parameter, YamlDataConsistencyCheckResult.class, true));
+ public DataConsistencyCheckResult swapToObject(final String param) {
+ return swapToObject(YamlEngine.unmarshal(param, YamlDataConsistencyCheckResult.class, true));
}
}
diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/yaml/job/YamlConsistencyCheckJobConfigurationSwapper.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/yaml/job/YamlConsistencyCheckJobConfigurationSwapper.java
index 30f6ae20ed2..8cb33a3f037 100644
--- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/yaml/job/YamlConsistencyCheckJobConfigurationSwapper.java
+++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/yaml/job/YamlConsistencyCheckJobConfigurationSwapper.java
@@ -44,10 +44,10 @@ public final class YamlConsistencyCheckJobConfigurationSwapper implements YamlCo
/**
* Swap to job configuration from text.
*
- * @param jobParameter job parameter
+ * @param jobParam job parameter
* @return job configuration
*/
- public ConsistencyCheckJobConfiguration swapToObject(final String jobParameter) {
- return null == jobParameter ? null : swapToObject(YamlEngine.unmarshal(jobParameter, YamlConsistencyCheckJobConfiguration.class, true));
+ public ConsistencyCheckJobConfiguration swapToObject(final String jobParam) {
+ return null == jobParam ? null : swapToObject(YamlEngine.unmarshal(jobParam, YamlConsistencyCheckJobConfiguration.class, true));
}
}
diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/yaml/job/YamlMigrationJobConfigurationSwapper.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/yaml/job/YamlMigrationJobConfigurationSwapper.java
index bb3ccedd031..a88359b552c 100644
--- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/yaml/job/YamlMigrationJobConfigurationSwapper.java
+++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/yaml/job/YamlMigrationJobConfigurationSwapper.java
@@ -67,10 +67,10 @@ public final class YamlMigrationJobConfigurationSwapper implements YamlConfigura
/**
* Swap to migration job configuration from YAML text.
*
- * @param jobParameter job parameter YAML text
+ * @param jobParam job parameter YAML text
* @return migration job configuration
*/
- public MigrationJobConfiguration swapToObject(final String jobParameter) {
- return swapToObject(YamlEngine.unmarshal(jobParameter, YamlMigrationJobConfiguration.class, true));
+ public MigrationJobConfiguration swapToObject(final String jobParam) {
+ return swapToObject(YamlEngine.unmarshal(jobParam, YamlMigrationJobConfiguration.class, true));
}
}
diff --git a/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/prepare/datasource/MySQLDataSourcePreparer.java b/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/prepare/datasource/MySQLDataSourcePreparer.java
index 489775e35ef..974d4defccb 100644
--- a/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/prepare/datasource/MySQLDataSourcePreparer.java
+++ b/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/prepare/datasource/MySQLDataSourcePreparer.java
@@ -31,10 +31,10 @@ import java.sql.SQLException;
public final class MySQLDataSourcePreparer extends AbstractDataSourcePreparer {
@Override
- public void prepareTargetTables(final PrepareTargetTablesParameter parameter) throws SQLException {
- PipelineDataSourceManager dataSourceManager = parameter.getDataSourceManager();
- for (CreateTableEntry each : parameter.getCreateTableConfig().getCreateTableEntries()) {
- String createTargetTableSQL = getCreateTargetTableSQL(each, dataSourceManager, parameter.getSqlParserEngine());
+ public void prepareTargetTables(final PrepareTargetTablesParameter param) throws SQLException {
+ PipelineDataSourceManager dataSourceManager = param.getDataSourceManager();
+ for (CreateTableEntry each : param.getCreateTableConfig().getCreateTableEntries()) {
+ String createTargetTableSQL = getCreateTargetTableSQL(each, dataSourceManager, param.getSqlParserEngine());
try (Connection targetConnection = getCachedDataSource(dataSourceManager, each.getTargetDataSourceConfig()).getConnection()) {
executeTargetTableSQL(targetConnection, addIfNotExistsForCreateTableSQL(createTargetTableSQL));
}
diff --git a/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/prepare/datasource/OpenGaussDataSourcePreparer.java b/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/prepare/datasource/OpenGaussDataSourcePreparer.java
index 0677aedd125..889562fe45e 100644
--- a/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/prepare/datasource/OpenGaussDataSourcePreparer.java
+++ b/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/prepare/datasource/OpenGaussDataSourcePreparer.java
@@ -34,10 +34,10 @@ import java.util.stream.Collectors;
public final class OpenGaussDataSourcePreparer extends AbstractDataSourcePreparer {
@Override
- public void prepareTargetTables(final PrepareTargetTablesParameter parameter) throws SQLException {
- PipelineDataSourceManager dataSourceManager = parameter.getDataSourceManager();
- for (CreateTableEntry each : parameter.getCreateTableConfig().getCreateTableEntries()) {
- String createTargetTableSQL = getCreateTargetTableSQL(each, dataSourceManager, parameter.getSqlParserEngine());
+ public void prepareTargetTables(final PrepareTargetTablesParameter param) throws SQLException {
+ PipelineDataSourceManager dataSourceManager = param.getDataSourceManager();
+ for (CreateTableEntry each : param.getCreateTableConfig().getCreateTableEntries()) {
+ String createTargetTableSQL = getCreateTargetTableSQL(each, dataSourceManager, param.getSqlParserEngine());
try (Connection targetConnection = getCachedDataSource(dataSourceManager, each.getTargetDataSourceConfig()).getConnection()) {
for (String sql : Splitter.on(";").trimResults().splitToList(createTargetTableSQL).stream().filter(cs -> !Strings.isNullOrEmpty(cs)).collect(Collectors.toList())) {
executeTargetTableSQL(targetConnection, addIfNotExistsForCreateTableSQL(sql));
diff --git a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/prepare/datasource/PostgreSQLDataSourcePreparer.java b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/prepare/datasource/PostgreSQLDataSourcePreparer.java
index 63b3532c72d..9784a91d457 100644
--- a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/prepare/datasource/PostgreSQLDataSourcePreparer.java
+++ b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/prepare/datasource/PostgreSQLDataSourcePreparer.java
@@ -34,10 +34,10 @@ import java.util.stream.Collectors;
public final class PostgreSQLDataSourcePreparer extends AbstractDataSourcePreparer {
@Override
- public void prepareTargetTables(final PrepareTargetTablesParameter parameter) throws SQLException {
- PipelineDataSourceManager dataSourceManager = parameter.getDataSourceManager();
- for (CreateTableEntry each : parameter.getCreateTableConfig().getCreateTableEntries()) {
- String createTargetTableSQL = getCreateTargetTableSQL(each, dataSourceManager, parameter.getSqlParserEngine());
+ public void prepareTargetTables(final PrepareTargetTablesParameter param) throws SQLException {
+ PipelineDataSourceManager dataSourceManager = param.getDataSourceManager();
+ for (CreateTableEntry each : param.getCreateTableConfig().getCreateTableEntries()) {
+ String createTargetTableSQL = getCreateTargetTableSQL(each, dataSourceManager, param.getSqlParserEngine());
try (Connection targetConnection = getCachedDataSource(dataSourceManager, each.getTargetDataSourceConfig()).getConnection()) {
for (String sql : Splitter.on(";").trimResults().splitToList(createTargetTableSQL).stream().filter(cs -> !Strings.isNullOrEmpty(cs)).collect(Collectors.toList())) {
executeTargetTableSQL(targetConnection, sql);
diff --git a/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManagerBuilder.java b/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManagerBuilder.java
index a8cdfacb601..a58d1bdf190 100644
--- a/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManagerBuilder.java
+++ b/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManagerBuilder.java
@@ -32,9 +32,9 @@ public interface ContextManagerBuilder extends TypedSPI, RequiredSPI {
/**
* Build context manager.
*
- * @param parameter context manager builder parameter
+ * @param param context manager builder parameter
* @return context manager
* @throws SQLException SQL exception
*/
- ContextManager build(ContextManagerBuilderParameter parameter) throws SQLException;
+ ContextManager build(ContextManagerBuilderParameter param) throws SQLException;
}
diff --git a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContextsFactory.java b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContextsFactory.java
index f32316edbd1..5298286f7fc 100644
--- a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContextsFactory.java
+++ b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContextsFactory.java
@@ -59,33 +59,32 @@ public final class MetaDataContextsFactory {
* Create meta data contexts.
*
* @param persistService persist service
- * @param parameter database configurations
+ * @param param context manager builder parameter
* @param instanceContext instance context
* @return meta data contexts
* @throws SQLException SQL exception
*/
- public static MetaDataContexts create(final MetaDataPersistService persistService, final ContextManagerBuilderParameter parameter,
- final InstanceContext instanceContext) throws SQLException {
- return create(persistService, parameter, instanceContext, Collections.emptyMap());
+ public static MetaDataContexts create(final MetaDataPersistService persistService, final ContextManagerBuilderParameter param, final InstanceContext instanceContext) throws SQLException {
+ return create(persistService, param, instanceContext, Collections.emptyMap());
}
/**
* Create meta data contexts.
*
* @param persistService persist service
- * @param parameter database configurations
+ * @param param context manager builder parameter
* @param instanceContext instance context
* @param storageNodes storage nodes
* @return meta data contexts
* @throws SQLException SQL exception
*/
- public static MetaDataContexts create(final MetaDataPersistService persistService, final ContextManagerBuilderParameter parameter,
+ public static MetaDataContexts create(final MetaDataPersistService persistService, final ContextManagerBuilderParameter param,
final InstanceContext instanceContext, final Map<String, StorageNodeDataSource> storageNodes) throws SQLException {
Collection<String> databaseNames = instanceContext.getInstance().getMetaData() instanceof JDBCInstanceMetaData
- ? parameter.getDatabaseConfigs().keySet()
+ ? param.getDatabaseConfigs().keySet()
: persistService.getDatabaseMetaDataService().loadAllDatabaseNames();
- Map<String, DatabaseConfiguration> effectiveDatabaseConfigs = createEffectiveDatabaseConfigurations(databaseNames, parameter.getDatabaseConfigs(), persistService);
- checkDataSourceStates(effectiveDatabaseConfigs, storageNodes, parameter.isForce());
+ Map<String, DatabaseConfiguration> effectiveDatabaseConfigs = createEffectiveDatabaseConfigurations(databaseNames, param.getDatabaseConfigs(), persistService);
+ checkDataSourceStates(effectiveDatabaseConfigs, storageNodes, param.isForce());
Collection<RuleConfiguration> globalRuleConfigs = persistService.getGlobalRuleService().load();
ConfigurationProperties props = new ConfigurationProperties(persistService.getPropsService().load());
Map<String, ShardingSphereDatabase> databases = ShardingSphereDatabasesFactory.create(effectiveDatabaseConfigs, props, instanceContext);
diff --git a/mode/core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerBuilderParameterTest.java b/mode/core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerBuilderParameterTest.java
index fc2eb974e6b..9dfade39828 100644
--- a/mode/core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerBuilderParameterTest.java
+++ b/mode/core/src/test/java/org/apache/shardingsphere/mode/manager/ContextManagerBuilderParameterTest.java
@@ -84,16 +84,16 @@ public final class ContextManagerBuilderParameterTest {
@Test
public void assertGetDefaultModeConfiguration() {
- ContextManagerBuilderParameter parameter = new ContextManagerBuilderParameter(null, Collections.emptyMap(), Collections.emptyList(), new Properties(), null, null, false);
- assertThat(parameter.getModeConfiguration().getType(), is("Standalone"));
- assertNull(parameter.getModeConfiguration().getRepository());
+ ContextManagerBuilderParameter param = new ContextManagerBuilderParameter(null, Collections.emptyMap(), Collections.emptyList(), new Properties(), null, null, false);
+ assertThat(param.getModeConfiguration().getType(), is("Standalone"));
+ assertNull(param.getModeConfiguration().getRepository());
}
@Test
public void assertGetModeConfiguration() {
ModeConfiguration modeConfig = new ModeConfiguration("Cluster", mock(PersistRepositoryConfiguration.class));
- ContextManagerBuilderParameter parameter = new ContextManagerBuilderParameter(modeConfig, Collections.emptyMap(), Collections.emptyList(), new Properties(), null, null, false);
- assertThat(parameter.getModeConfiguration().getType(), is("Cluster"));
- assertNotNull(parameter.getModeConfiguration().getRepository());
+ ContextManagerBuilderParameter param = new ContextManagerBuilderParameter(modeConfig, Collections.emptyMap(), Collections.emptyList(), new Properties(), null, null, false);
+ assertThat(param.getModeConfiguration().getType(), is("Cluster"));
+ assertNotNull(param.getModeConfiguration().getRepository());
}
}
diff --git a/mode/core/src/test/java/org/apache/shardingsphere/mode/manager/fixture/ContextManagerBuilderFixture.java b/mode/core/src/test/java/org/apache/shardingsphere/mode/manager/fixture/ContextManagerBuilderFixture.java
index 8589bc783d6..198170b64e5 100644
--- a/mode/core/src/test/java/org/apache/shardingsphere/mode/manager/fixture/ContextManagerBuilderFixture.java
+++ b/mode/core/src/test/java/org/apache/shardingsphere/mode/manager/fixture/ContextManagerBuilderFixture.java
@@ -26,7 +26,7 @@ import static org.mockito.Mockito.mock;
public final class ContextManagerBuilderFixture implements ContextManagerBuilder {
@Override
- public ContextManager build(final ContextManagerBuilderParameter parameter) {
+ public ContextManager build(final ContextManagerBuilderParameter param) {
return mock(ContextManager.class);
}
diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java
index 0e47566a4f4..ce629315670 100644
--- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java
+++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java
@@ -45,32 +45,32 @@ import java.util.Map.Entry;
public final class ClusterContextManagerBuilder implements ContextManagerBuilder {
@Override
- public ContextManager build(final ContextManagerBuilderParameter parameter) throws SQLException {
- ClusterPersistRepository repository = ClusterPersistRepositoryFactory.getInstance((ClusterPersistRepositoryConfiguration) parameter.getModeConfiguration().getRepository());
+ public ContextManager build(final ContextManagerBuilderParameter param) throws SQLException {
+ ClusterPersistRepository repository = ClusterPersistRepositoryFactory.getInstance((ClusterPersistRepositoryConfiguration) param.getModeConfiguration().getRepository());
MetaDataPersistService persistService = new MetaDataPersistService(repository);
- persistConfigurations(persistService, parameter);
- RegistryCenter registryCenter = new RegistryCenter(repository, new EventBusContext(), parameter.getInstanceMetaData(), parameter.getDatabaseConfigs());
- InstanceContext instanceContext = buildInstanceContext(registryCenter, parameter);
+ persistConfigurations(persistService, param);
+ RegistryCenter registryCenter = new RegistryCenter(repository, new EventBusContext(), param.getInstanceMetaData(), param.getDatabaseConfigs());
+ InstanceContext instanceContext = buildInstanceContext(registryCenter, param);
ClusterPersistRepository persistRepository = registryCenter.getRepository();
if (persistRepository instanceof InstanceContextAware) {
((InstanceContextAware) persistRepository).setInstanceContext(instanceContext);
}
- MetaDataContexts metaDataContexts = MetaDataContextsFactory.create(persistService, parameter, instanceContext, registryCenter.getStorageNodeStatusService().loadStorageNodes());
+ MetaDataContexts metaDataContexts = MetaDataContextsFactory.create(persistService, param, instanceContext, registryCenter.getStorageNodeStatusService().loadStorageNodes());
persistMetaData(metaDataContexts);
ContextManager result = new ContextManager(metaDataContexts, instanceContext);
- registerOnline(persistService, registryCenter, parameter, result);
+ registerOnline(persistService, registryCenter, param, result);
return result;
}
- private void persistConfigurations(final MetaDataPersistService persistService, final ContextManagerBuilderParameter parameter) {
- if (!parameter.isEmpty()) {
- persistService.persistConfigurations(parameter.getDatabaseConfigs(), parameter.getGlobalRuleConfigs(), parameter.getProps());
+ private void persistConfigurations(final MetaDataPersistService persistService, final ContextManagerBuilderParameter param) {
+ if (!param.isEmpty()) {
+ persistService.persistConfigurations(param.getDatabaseConfigs(), param.getGlobalRuleConfigs(), param.getProps());
}
}
- private InstanceContext buildInstanceContext(final RegistryCenter registryCenter, final ContextManagerBuilderParameter parameter) {
- return new InstanceContext(new ComputeNodeInstance(parameter.getInstanceMetaData()), new ClusterWorkerIdGenerator(registryCenter, parameter.getInstanceMetaData()),
- parameter.getModeConfiguration(), new GlobalLockContext(registryCenter.getGlobalLockPersistService()), registryCenter.getEventBusContext());
+ private InstanceContext buildInstanceContext(final RegistryCenter registryCenter, final ContextManagerBuilderParameter param) {
+ return new InstanceContext(new ComputeNodeInstance(param.getInstanceMetaData()), new ClusterWorkerIdGenerator(registryCenter, param.getInstanceMetaData()),
+ param.getModeConfiguration(), new GlobalLockContext(registryCenter.getGlobalLockPersistService()), registryCenter.getEventBusContext());
}
private void persistMetaData(final MetaDataContexts metaDataContexts) {
@@ -82,9 +82,8 @@ public final class ClusterContextManagerBuilder implements ContextManagerBuilder
}
}
- private void registerOnline(final MetaDataPersistService persistService, final RegistryCenter registryCenter,
- final ContextManagerBuilderParameter parameter, final ContextManager contextManager) {
- contextManager.getInstanceContext().getInstance().setLabels(parameter.getLabels());
+ private void registerOnline(final MetaDataPersistService persistService, final RegistryCenter registryCenter, final ContextManagerBuilderParameter param, final ContextManager contextManager) {
+ contextManager.getInstanceContext().getInstance().setLabels(param.getLabels());
contextManager.getInstanceContext().getAllClusterInstances().addAll(registryCenter.getComputeNodeStatusService().loadAllComputeNodeInstances());
new ContextManagerSubscriberFacade(persistService, registryCenter, contextManager);
registryCenter.onlineInstance(contextManager.getInstanceContext().getInstance());
diff --git a/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneContextManagerBuilder.java b/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneContextManagerBuilder.java
index a2ee6f34aab..7b705b9dbed 100644
--- a/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneContextManagerBuilder.java
+++ b/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneContextManagerBuilder.java
@@ -40,25 +40,25 @@ import java.sql.SQLException;
public final class StandaloneContextManagerBuilder implements ContextManagerBuilder {
@Override
- public ContextManager build(final ContextManagerBuilderParameter parameter) throws SQLException {
- StandalonePersistRepository repository = StandalonePersistRepositoryFactory.getInstance(parameter.getModeConfiguration().getRepository());
+ public ContextManager build(final ContextManagerBuilderParameter param) throws SQLException {
+ StandalonePersistRepository repository = StandalonePersistRepositoryFactory.getInstance(param.getModeConfiguration().getRepository());
MetaDataPersistService persistService = new MetaDataPersistService(repository);
- persistConfigurations(persistService, parameter);
- InstanceContext instanceContext = buildInstanceContext(parameter);
+ persistConfigurations(persistService, param);
+ InstanceContext instanceContext = buildInstanceContext(param);
new ProcessStandaloneSubscriber(instanceContext.getEventBusContext());
- MetaDataContexts metaDataContexts = MetaDataContextsFactory.create(persistService, parameter, instanceContext);
+ MetaDataContexts metaDataContexts = MetaDataContextsFactory.create(persistService, param, instanceContext);
return new ContextManager(metaDataContexts, instanceContext);
}
- private void persistConfigurations(final MetaDataPersistService persistService, final ContextManagerBuilderParameter parameter) {
- if (!parameter.isEmpty()) {
- persistService.persistConfigurations(parameter.getDatabaseConfigs(), parameter.getGlobalRuleConfigs(), parameter.getProps());
+ private void persistConfigurations(final MetaDataPersistService persistService, final ContextManagerBuilderParameter param) {
+ if (!param.isEmpty()) {
+ persistService.persistConfigurations(param.getDatabaseConfigs(), param.getGlobalRuleConfigs(), param.getProps());
}
}
- private InstanceContext buildInstanceContext(final ContextManagerBuilderParameter parameter) {
- return new InstanceContext(new ComputeNodeInstance(parameter.getInstanceMetaData()),
- new StandaloneWorkerIdGenerator(), parameter.getModeConfiguration(), new GlobalLockContext(null), new EventBusContext());
+ private InstanceContext buildInstanceContext(final ContextManagerBuilderParameter param) {
+ return new InstanceContext(new ComputeNodeInstance(param.getInstanceMetaData()),
+ new StandaloneWorkerIdGenerator(), param.getModeConfiguration(), new GlobalLockContext(null), new EventBusContext());
}
@Override
diff --git a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/statement/JDBCBackendStatement.java b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/statement/JDBCBackendStatement.java
index be8ee0d48c7..f19a016f363 100644
--- a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/statement/JDBCBackendStatement.java
+++ b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/statement/JDBCBackendStatement.java
@@ -50,16 +50,16 @@ public final class JDBCBackendStatement implements ExecutorJDBCStatementManager
public Statement createStorageResource(final ExecutionUnit executionUnit, final Connection connection, final ConnectionMode connectionMode, final StatementOption option,
final DatabaseType databaseType) throws SQLException {
String sql = executionUnit.getSqlUnit().getSql();
- List<Object> parameters = executionUnit.getSqlUnit().getParameters();
+ List<Object> params = executionUnit.getSqlUnit().getParameters();
PreparedStatement result = option.isReturnGeneratedKeys()
? connection.prepareStatement(executionUnit.getSqlUnit().getSql(), Statement.RETURN_GENERATED_KEYS)
: connection.prepareStatement(sql);
- for (int i = 0; i < parameters.size(); i++) {
- Object parameter = parameters.get(i);
- if (parameter instanceof TypeUnspecifiedSQLParameter) {
- result.setObject(i + 1, parameter, Types.OTHER);
+ for (int i = 0; i < params.size(); i++) {
+ Object param = params.get(i);
+ if (param instanceof TypeUnspecifiedSQLParameter) {
+ result.setObject(i + 1, param, Types.OTHER);
} else {
- result.setObject(i + 1, parameter);
+ result.setObject(i + 1, param);
}
}
if (ConnectionMode.MEMORY_STRICTLY == connectionMode) {
diff --git a/proxy/bootstrap/src/main/java/org/apache/shardingsphere/proxy/initializer/BootstrapInitializer.java b/proxy/bootstrap/src/main/java/org/apache/shardingsphere/proxy/initializer/BootstrapInitializer.java
index 44a942f19d1..56c21583b59 100644
--- a/proxy/bootstrap/src/main/java/org/apache/shardingsphere/proxy/initializer/BootstrapInitializer.java
+++ b/proxy/bootstrap/src/main/java/org/apache/shardingsphere/proxy/initializer/BootstrapInitializer.java
@@ -62,10 +62,10 @@ public final class BootstrapInitializer {
}
private ContextManager createContextManager(final ProxyConfiguration proxyConfig, final ModeConfiguration modeConfig, final int port, final boolean force) throws SQLException {
- ContextManagerBuilderParameter parameter = new ContextManagerBuilderParameter(modeConfig, proxyConfig.getDatabaseConfigurations(),
+ ContextManagerBuilderParameter param = new ContextManagerBuilderParameter(modeConfig, proxyConfig.getDatabaseConfigurations(),
proxyConfig.getGlobalConfiguration().getRules(), proxyConfig.getGlobalConfiguration().getProperties(), proxyConfig.getGlobalConfiguration().getLabels(),
createInstanceMetaData(proxyConfig, port), force);
- return ContextManagerBuilderFactory.getInstance(modeConfig).build(parameter);
+ return ContextManagerBuilderFactory.getInstance(modeConfig).build(param);
}
private InstanceMetaData createInstanceMetaData(final ProxyConfiguration proxyConfig, final int port) {
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 c9b8741d282..641c2264b5a 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
@@ -77,7 +77,7 @@ public final class PostgreSQLBatchedStatementsExecutor {
private final PostgreSQLServerPreparedStatement preparedStatement;
- private final Map<ExecutionUnit, List<List<Object>>> executionUnitParameters = new HashMap<>();
+ private final Map<ExecutionUnit, List<List<Object>>> executionUnitParams = new HashMap<>();
private final ExecutionContext anyExecutionContext;
@@ -92,11 +92,11 @@ public final class PostgreSQLBatchedStatementsExecutor {
SQLStatementContext<?> sqlStatementContext = null;
ExecutionContext executionContext = null;
if (parameterSetsIterator.hasNext()) {
- List<Object> firstGroupOfParameter = parameterSetsIterator.next();
- sqlStatementContext = createSQLStatementContext(firstGroupOfParameter);
- executionContext = createExecutionContext(createQueryContext(sqlStatementContext, firstGroupOfParameter));
+ List<Object> firstGroupOfParam = parameterSetsIterator.next();
+ sqlStatementContext = createSQLStatementContext(firstGroupOfParam);
+ executionContext = createExecutionContext(createQueryContext(sqlStatementContext, firstGroupOfParam));
for (ExecutionUnit each : executionContext.getExecutionUnits()) {
- executionUnitParameters.computeIfAbsent(each, unused -> new LinkedList<>()).add(each.getSqlUnit().getParameters());
+ executionUnitParams.computeIfAbsent(each, unused -> new LinkedList<>()).add(each.getSqlUnit().getParameters());
}
}
anyExecutionContext = executionContext;
@@ -110,13 +110,13 @@ public final class PostgreSQLBatchedStatementsExecutor {
private void prepareForRestOfParametersSet(final Iterator<List<Object>> paramSetsIterator, final SQLStatementContext<?> sqlStatementContext) {
while (paramSetsIterator.hasNext()) {
- List<Object> eachGroupOfParameter = paramSetsIterator.next();
+ List<Object> eachGroupOfParam = paramSetsIterator.next();
if (sqlStatementContext instanceof ParameterAware) {
- ((ParameterAware) sqlStatementContext).setUpParameters(eachGroupOfParameter);
+ ((ParameterAware) sqlStatementContext).setUpParameters(eachGroupOfParam);
}
- ExecutionContext eachExecutionContext = createExecutionContext(createQueryContext(sqlStatementContext, eachGroupOfParameter));
+ ExecutionContext eachExecutionContext = createExecutionContext(createQueryContext(sqlStatementContext, eachGroupOfParam));
for (ExecutionUnit each : eachExecutionContext.getExecutionUnits()) {
- executionUnitParameters.computeIfAbsent(each, unused -> new LinkedList<>()).add(each.getSqlUnit().getParameters());
+ executionUnitParams.computeIfAbsent(each, unused -> new LinkedList<>()).add(each.getSqlUnit().getParameters());
}
}
}
@@ -151,7 +151,7 @@ public final class PostgreSQLBatchedStatementsExecutor {
metaDataContexts.getMetaData().getProps().<Integer>getValue(ConfigurationPropertyKey.MAX_CONNECTIONS_SIZE_PER_QUERY),
(JDBCBackendConnection) connectionSession.getBackendConnection(), (JDBCBackendStatement) connectionSession.getStatementManager(),
new StatementOption(false), rules, metaDataContexts.getMetaData().getDatabase(connectionSession.getDatabaseName()).getResourceMetaData().getStorageTypes());
- executionGroupContext = prepareEngine.prepare(anyExecutionContext.getRouteContext(), executionUnitParameters.keySet());
+ executionGroupContext = prepareEngine.prepare(anyExecutionContext.getRouteContext(), executionUnitParams.keySet());
for (ExecutionGroup<JDBCExecutionUnit> eachGroup : executionGroupContext.getInputGroups()) {
for (JDBCExecutionUnit each : eachGroup.getInputs()) {
prepareJDBCExecutionUnit(each);
@@ -161,15 +161,15 @@ public final class PostgreSQLBatchedStatementsExecutor {
private void prepareJDBCExecutionUnit(final JDBCExecutionUnit jdbcExecutionUnit) throws SQLException {
PreparedStatement preparedStatement = (PreparedStatement) jdbcExecutionUnit.getStorageResource();
- for (List<Object> eachGroupParameter : executionUnitParameters.getOrDefault(jdbcExecutionUnit.getExecutionUnit(), Collections.emptyList())) {
- ListIterator<Object> parametersIterator = eachGroupParameter.listIterator();
- while (parametersIterator.hasNext()) {
- int parameterIndex = parametersIterator.nextIndex() + 1;
- Object value = parametersIterator.next();
+ for (List<Object> eachGroupParam : executionUnitParams.getOrDefault(jdbcExecutionUnit.getExecutionUnit(), Collections.emptyList())) {
+ ListIterator<Object> params = eachGroupParam.listIterator();
+ while (params.hasNext()) {
+ int paramIndex = params.nextIndex() + 1;
+ Object value = params.next();
if (value instanceof PostgreSQLTypeUnspecifiedSQLParameter) {
value = value.toString();
}
- preparedStatement.setObject(parameterIndex, value);
+ preparedStatement.setObject(paramIndex, value);
}
preparedStatement.addBatch();
}
diff --git a/proxy/frontend/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/PostgreSQLBatchedStatementsExecutorTest.java b/proxy/frontend/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/PostgreSQLBatchedStatementsExecutorTest.java
index cb1f34cbe17..0ee7652967b 100644
--- a/proxy/frontend/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/PostgreSQLBatchedStatementsExecutorTest.java
+++ b/proxy/frontend/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/PostgreSQLBatchedStatementsExecutorTest.java
@@ -134,7 +134,7 @@ public final class PostgreSQLBatchedStatementsExecutorTest extends ProxyContextR
@SuppressWarnings("unchecked")
@SneakyThrows(ReflectiveOperationException.class)
private void prepareExecutionUnitParameters(final PostgreSQLBatchedStatementsExecutor target, final List<List<Object>> parameterSets) {
- Field executionUnitParametersField = PostgreSQLBatchedStatementsExecutor.class.getDeclaredField("executionUnitParameters");
+ Field executionUnitParametersField = PostgreSQLBatchedStatementsExecutor.class.getDeclaredField("executionUnitParams");
executionUnitParametersField.setAccessible(true);
Map<ExecutionUnit, List<List<Object>>> map = (Map<ExecutionUnit, List<List<Object>>>) executionUnitParametersField.get(target);
map.replaceAll((k, v) -> parameterSets);
diff --git a/sql-parser/dialect/opengauss/src/main/java/org/apache/shardingsphere/sql/parser/opengauss/visitor/statement/impl/OpenGaussStatementSQLVisitor.java b/sql-parser/dialect/opengauss/src/main/java/org/apache/shardingsphere/sql/parser/opengauss/visitor/statement/impl/OpenGaussStatementSQLVisitor.java
index 5dc4adccdfb..d11bc2fe488 100644
--- a/sql-parser/dialect/opengauss/src/main/java/org/apache/shardingsphere/sql/parser/opengauss/visitor/statement/impl/OpenGaussStatementSQLVisitor.java
+++ b/sql-parser/dialect/opengauss/src/main/java/org/apache/shardingsphere/sql/parser/opengauss/visitor/statement/impl/OpenGaussStatementSQLVisitor.java
@@ -205,11 +205,11 @@ public abstract class OpenGaussStatementSQLVisitor extends OpenGaussStatementBas
@Override
public final ASTNode visitParameterMarker(final ParameterMarkerContext ctx) {
if (null != ctx.DOLLAR_()) {
- int parameterIndex = ((NumberLiteralValue) visit(ctx.numberLiterals())).getValue().intValue();
- if (parameterIndex > currentParameterIndex) {
- currentParameterIndex = parameterIndex;
+ int paramIndex = ((NumberLiteralValue) visit(ctx.numberLiterals())).getValue().intValue();
+ if (paramIndex > currentParameterIndex) {
+ currentParameterIndex = paramIndex;
}
- return new ParameterMarkerValue(parameterIndex - 1, ParameterMarkerType.DOLLAR);
+ return new ParameterMarkerValue(paramIndex - 1, ParameterMarkerType.DOLLAR);
}
return new ParameterMarkerValue(currentParameterIndex++, ParameterMarkerType.QUESTION);
}
diff --git a/sql-parser/dialect/postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/impl/PostgreSQLStatementSQLVisitor.java b/sql-parser/dialect/postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/impl/PostgreSQLStatementSQLVisitor.java
index 58dd12ba80d..71b89a98039 100644
--- a/sql-parser/dialect/postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/impl/PostgreSQLStatementSQLVisitor.java
+++ b/sql-parser/dialect/postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/impl/PostgreSQLStatementSQLVisitor.java
@@ -207,11 +207,11 @@ public abstract class PostgreSQLStatementSQLVisitor extends PostgreSQLStatementP
if (null == ctx.DOLLAR_()) {
return new ParameterMarkerValue(currentParameterIndex++, ParameterMarkerType.QUESTION);
}
- int parameterIndex = ((NumberLiteralValue) visit(ctx.numberLiterals())).getValue().intValue();
- if (parameterIndex > currentParameterIndex) {
- currentParameterIndex = parameterIndex;
+ int paramIndex = ((NumberLiteralValue) visit(ctx.numberLiterals())).getValue().intValue();
+ if (paramIndex > currentParameterIndex) {
+ currentParameterIndex = paramIndex;
}
- return new ParameterMarkerValue(parameterIndex - 1, ParameterMarkerType.DOLLAR);
+ return new ParameterMarkerValue(paramIndex - 1, ParameterMarkerType.DOLLAR);
}
@Override
diff --git a/sql-parser/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/segment/dml/pagination/limit/ParameterMarkerLimitValueSegment.java b/sql-parser/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/segment/dml/pagination/limit/ParameterMarkerLimitValueSegment.java
index 9e7d4ea0dce..08bbeac7d88 100644
--- a/sql-parser/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/segment/dml/pagination/limit/ParameterMarkerLimitValueSegment.java
+++ b/sql-parser/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/segment/dml/pagination/limit/ParameterMarkerLimitValueSegment.java
@@ -30,8 +30,8 @@ public final class ParameterMarkerLimitValueSegment extends LimitValueSegment im
private final int parameterIndex;
- public ParameterMarkerLimitValueSegment(final int startIndex, final int stopIndex, final int parameterIndex) {
+ public ParameterMarkerLimitValueSegment(final int startIndex, final int stopIndex, final int paramIndex) {
super(startIndex, stopIndex);
- this.parameterIndex = parameterIndex;
+ this.parameterIndex = paramIndex;
}
}
diff --git a/sql-parser/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/segment/dml/pagination/rownum/ParameterMarkerRowNumberValueSegment.java b/sql-parser/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/segment/dml/pagination/rownum/ParameterMarkerRowNumberValueSegment.java
index e8acec802f2..ac5bee31438 100644
--- a/sql-parser/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/segment/dml/pagination/rownum/ParameterMarkerRowNumberValueSegment.java
+++ b/sql-parser/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/segment/dml/pagination/rownum/ParameterMarkerRowNumberValueSegment.java
@@ -30,8 +30,8 @@ public final class ParameterMarkerRowNumberValueSegment extends RowNumberValueSe
private final int parameterIndex;
- public ParameterMarkerRowNumberValueSegment(final int startIndex, final int stopIndex, final int parameterIndex, final boolean boundOpened) {
+ public ParameterMarkerRowNumberValueSegment(final int startIndex, final int stopIndex, final int paramIndex, final boolean boundOpened) {
super(startIndex, stopIndex, boundOpened);
- this.parameterIndex = parameterIndex;
+ this.parameterIndex = paramIndex;
}
}
diff --git a/sql-parser/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/opengauss/dal/OpenGaussResetParameterStatement.java b/sql-parser/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/opengauss/dal/OpenGaussResetParameterStatement.java
index 346dedc5fbc..2bf59a45121 100644
--- a/sql-parser/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/opengauss/dal/OpenGaussResetParameterStatement.java
+++ b/sql-parser/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/opengauss/dal/OpenGaussResetParameterStatement.java
@@ -27,7 +27,7 @@ import org.apache.shardingsphere.sql.parser.sql.dialect.statement.opengauss.Open
@ToString(callSuper = true)
public final class OpenGaussResetParameterStatement extends ResetParameterStatement implements OpenGaussStatement {
- public OpenGaussResetParameterStatement(final String configurationParameter) {
- super(configurationParameter);
+ public OpenGaussResetParameterStatement(final String configurationParam) {
+ super(configurationParam);
}
}
diff --git a/sql-parser/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/postgresql/dal/PostgreSQLResetParameterStatement.java b/sql-parser/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/postgresql/dal/PostgreSQLResetParameterStatement.java
index cc4779bfb7f..39d0ad6a0fe 100644
--- a/sql-parser/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/postgresql/dal/PostgreSQLResetParameterStatement.java
+++ b/sql-parser/statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/dialect/statement/postgresql/dal/PostgreSQLResetParameterStatement.java
@@ -27,7 +27,7 @@ import org.apache.shardingsphere.sql.parser.sql.dialect.statement.postgresql.Pos
@ToString(callSuper = true)
public final class PostgreSQLResetParameterStatement extends ResetParameterStatement implements PostgreSQLStatement {
- public PostgreSQLResetParameterStatement(final String configurationParameter) {
- super(configurationParameter);
+ public PostgreSQLResetParameterStatement(final String configurationParam) {
+ super(configurationParam);
}
}
diff --git a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/cases/assertion/IntegrationTestCaseAssertion.java b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/cases/assertion/IntegrationTestCaseAssertion.java
index c50e6a96c39..3714e0b8b69 100644
--- a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/cases/assertion/IntegrationTestCaseAssertion.java
+++ b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/cases/assertion/IntegrationTestCaseAssertion.java
@@ -78,20 +78,20 @@ public final class IntegrationTestCaseAssertion {
return result;
}
- private List<String> parse(final String parameter) {
- List<String> result = Splitter.on(":").trimResults().splitToList(parameter);
+ private List<String> parse(final String param) {
+ List<String> result = Splitter.on(":").trimResults().splitToList(param);
int size = result.size();
if (size <= 2) {
return result;
}
- return parseComplex(parameter);
+ return parseComplex(param);
}
- private List<String> parseComplex(final String parameter) {
+ private List<String> parseComplex(final String param) {
List<String> result = new ArrayList<>(2);
- int index = parameter.lastIndexOf(":");
- result.add(parameter.substring(0, index));
- result.add(parameter.substring(index + 1));
+ int index = param.lastIndexOf(":");
+ result.add(param.substring(0, index));
+ result.add(param.substring(index + 1));
return result;
}
}
diff --git a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/SingleITCase.java b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/SingleITCase.java
index bc987801b73..a5480d1d4ab 100644
--- a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/SingleITCase.java
+++ b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/SingleITCase.java
@@ -60,7 +60,7 @@ public abstract class SingleITCase extends BaseITCase {
}
private String getLiteralSQL(final String sql) throws ParseException {
- List<Object> parameters = null == assertion ? Collections.emptyList() : assertion.getSQLValues().stream().map(SQLValue::toString).collect(Collectors.toList());
- return parameters.isEmpty() ? sql : String.format(sql.replace("%", "$").replace("?", "%s"), parameters.toArray()).replace("$", "%").replace("%%", "%").replace("'%'", "'%%'");
+ List<Object> params = null == assertion ? Collections.emptyList() : assertion.getSQLValues().stream().map(SQLValue::toString).collect(Collectors.toList());
+ return params.isEmpty() ? sql : String.format(sql.replace("%", "$").replace("?", "%s"), params.toArray()).replace("$", "%").replace("%%", "%").replace("'%'", "'%%'");
}
}
diff --git a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/RunnerParameters.java b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/RunnerParameters.java
index 0b68c7651f3..410a7e15c6a 100644
--- a/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/RunnerParameters.java
+++ b/test/integration-test/test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/param/RunnerParameters.java
@@ -41,8 +41,8 @@ public final class RunnerParameters {
public ParameterizedArray getParameterizedArray() {
Field parametersField = BlockJUnit4ClassRunnerWithParameters.class.getDeclaredField("parameters");
parametersField.setAccessible(true);
- Object[] parameters = (Object[]) parametersField.get(getRunner());
- return (ParameterizedArray) parameters[0];
+ Object[] params = (Object[]) parametersField.get(getRunner());
+ return (ParameterizedArray) params[0];
}
@SneakyThrows(ReflectiveOperationException.class)
diff --git a/test/optimize/src/test/java/org/apache/shardingsphere/infra/federation/converter/parameterized/engine/SQLNodeConverterEngineParameterizedTest.java b/test/optimize/src/test/java/org/apache/shardingsphere/infra/federation/converter/parameterized/engine/SQLNodeConverterEngineParameterizedTest.java
index d65413da202..4a1c218b7a0 100644
--- a/test/optimize/src/test/java/org/apache/shardingsphere/infra/federation/converter/parameterized/engine/SQLNodeConverterEngineParameterizedTest.java
+++ b/test/optimize/src/test/java/org/apache/shardingsphere/infra/federation/converter/parameterized/engine/SQLNodeConverterEngineParameterizedTest.java
@@ -163,12 +163,12 @@ public final class SQLNodeConverterEngineParameterizedTest {
return result;
}
- private static boolean isPlaceholderWithoutParameter(final Object[] sqlTestParameter) {
- return SQLCaseType.Placeholder == sqlTestParameter[2] && SQL_PARSER_TEST_CASES_REGISTRY.get(sqlTestParameter[0].toString()).getParameters().isEmpty();
+ private static boolean isPlaceholderWithoutParameter(final Object[] sqlTestParam) {
+ return SQLCaseType.Placeholder == sqlTestParam[2] && SQL_PARSER_TEST_CASES_REGISTRY.get(sqlTestParam[0].toString()).getParameters().isEmpty();
}
- private static boolean isSupportedSQLCase(final Object[] sqlTestParameter) {
- String sqlCaseId = sqlTestParameter[0].toString();
+ private static boolean isSupportedSQLCase(final Object[] sqlTestParam) {
+ String sqlCaseId = sqlTestParam[0].toString();
return sqlCaseId.toUpperCase().startsWith(SELECT_STATEMENT_PREFIX) && SUPPORTED_SQL_CASE_IDS.contains(sqlCaseId);
}
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/engine/SQLParserParameterizedTest.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/engine/SQLParserParameterizedTest.java
index d8399a3281b..abfd2f40dca 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/engine/SQLParserParameterizedTest.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/engine/SQLParserParameterizedTest.java
@@ -60,8 +60,8 @@ public abstract class SQLParserParameterizedTest {
return result;
}
- private static boolean isPlaceholderWithoutParameter(final Object[] sqlTestParameter) {
- return SQLCaseType.Placeholder == sqlTestParameter[2] && SQL_PARSER_TEST_CASES_REGISTRY.get(sqlTestParameter[0].toString()).getParameters().isEmpty();
+ private static boolean isPlaceholderWithoutParameter(final Object[] sqlTestParam) {
+ return SQLCaseType.Placeholder == sqlTestParam[2] && SQL_PARSER_TEST_CASES_REGISTRY.get(sqlTestParam[0].toString()).getParameters().isEmpty();
}
@Test
diff --git a/test/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/core/api/impl/ConsistencyCheckJobAPIImplTest.java b/test/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/core/api/impl/ConsistencyCheckJobAPIImplTest.java
index 0d0a25a722f..56612d25beb 100644
--- a/test/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/core/api/impl/ConsistencyCheckJobAPIImplTest.java
+++ b/test/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/core/api/impl/ConsistencyCheckJobAPIImplTest.java
@@ -58,8 +58,7 @@ public final class ConsistencyCheckJobAPIImplTest {
@Test
public void assertCreateJobConfig() {
String migrationJobId = "j0101test";
- CreateConsistencyCheckJobParameter parameter = new CreateConsistencyCheckJobParameter(migrationJobId, null, null);
- String checkJobId = checkJobAPI.createJobAndStart(parameter);
+ String checkJobId = checkJobAPI.createJobAndStart(new CreateConsistencyCheckJobParameter(migrationJobId, null, null));
ConsistencyCheckJobConfiguration jobConfig = (ConsistencyCheckJobConfiguration) checkJobAPI.getJobConfiguration(checkJobId);
int expectedSequence = ConsistencyCheckJobId.MIN_SEQUENCE;
String expectCheckJobId = "j0201" + migrationJobId + expectedSequence;
@@ -73,8 +72,7 @@ public final class ConsistencyCheckJobAPIImplTest {
public void assertGetLatestDataConsistencyCheckResult() {
Optional<String> jobId = migrationJobAPI.start(JobConfigurationBuilder.createJobConfiguration());
assertTrue(jobId.isPresent());
- CreateConsistencyCheckJobParameter parameter = new CreateConsistencyCheckJobParameter(jobId.get(), null, null);
- String checkJobId = checkJobAPI.createJobAndStart(parameter);
+ String checkJobId = checkJobAPI.createJobAndStart(new CreateConsistencyCheckJobParameter(jobId.get(), null, null));
PipelineAPIFactory.getGovernanceRepositoryAPI().persistCheckLatestJobId(jobId.get(), checkJobId);
Map<String, DataConsistencyCheckResult> expectedCheckResult = Collections.singletonMap("t_order", new DataConsistencyCheckResult(new DataConsistencyCountCheckResult(1, 1),
new DataConsistencyContentCheckResult(true)));
diff --git a/test/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/core/api/impl/MigrationJobAPIImplTest.java b/test/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/core/api/impl/MigrationJobAPIImplTest.java
index 9f6c2d5f2b8..f69b7a1a2fb 100644
--- a/test/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/core/api/impl/MigrationJobAPIImplTest.java
+++ b/test/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/core/api/impl/MigrationJobAPIImplTest.java
@@ -252,8 +252,7 @@ public final class MigrationJobAPIImplTest {
@Test
public void assertCreateJobConfig() throws SQLException {
initIntPrimaryEnvironment();
- CreateMigrationJobParameter parameter = new CreateMigrationJobParameter("ds_0", null, "t_order", "logic_db", "t_order");
- String jobId = jobAPI.createJobAndStart(parameter);
+ String jobId = jobAPI.createJobAndStart(new CreateMigrationJobParameter("ds_0", null, "t_order", "logic_db", "t_order"));
MigrationJobConfiguration jobConfig = jobAPI.getJobConfiguration(jobId);
assertThat(jobConfig.getSourceResourceName(), is("ds_0"));
assertThat(jobConfig.getSourceTableName(), is("t_order"));
diff --git a/test/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/core/check/consistency/algorithm/DataMatchDataConsistencyCalculateAlgorithmTest.java b/test/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/core/check/consistency/algorithm/DataMatchDataConsistencyCalculateAlgorithmTest.java
index d6842a93b1c..e784fb3ff66 100644
--- a/test/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/core/check/consistency/algorithm/DataMatchDataConsistencyCalculateAlgorithmTest.java
+++ b/test/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/core/check/consistency/algorithm/DataMatchDataConsistencyCalculateAlgorithmTest.java
@@ -84,10 +84,10 @@ public final class DataMatchDataConsistencyCalculateAlgorithmTest {
public void assertCalculateFromBegin() throws NoSuchFieldException, IllegalAccessException {
DataMatchDataConsistencyCalculateAlgorithm calculateAlgorithm = new DataMatchDataConsistencyCalculateAlgorithm();
ReflectionUtil.setFieldValue(calculateAlgorithm, "chunkSize", 5);
- DataConsistencyCalculateParameter sourceParameter = generateParameter(source, "t_order_copy", 0);
- Optional<DataConsistencyCalculatedResult> sourceCalculateResult = calculateAlgorithm.calculateChunk(sourceParameter);
- DataConsistencyCalculateParameter targetParameter = generateParameter(target, "t_order", 0);
- Optional<DataConsistencyCalculatedResult> targetCalculateResult = calculateAlgorithm.calculateChunk(targetParameter);
+ DataConsistencyCalculateParameter sourceParam = generateParameter(source, "t_order_copy", 0);
+ Optional<DataConsistencyCalculatedResult> sourceCalculateResult = calculateAlgorithm.calculateChunk(sourceParam);
+ DataConsistencyCalculateParameter targetParam = generateParameter(target, "t_order", 0);
+ Optional<DataConsistencyCalculatedResult> targetCalculateResult = calculateAlgorithm.calculateChunk(targetParam);
assertTrue(sourceCalculateResult.isPresent());
assertTrue(targetCalculateResult.isPresent());
assertTrue(sourceCalculateResult.get().getMaxUniqueKeyValue().isPresent());
@@ -101,10 +101,10 @@ public final class DataMatchDataConsistencyCalculateAlgorithmTest {
public void assertCalculateFromMiddle() throws NoSuchFieldException, IllegalAccessException {
DataMatchDataConsistencyCalculateAlgorithm calculateAlgorithm = new DataMatchDataConsistencyCalculateAlgorithm();
ReflectionUtil.setFieldValue(calculateAlgorithm, "chunkSize", 5);
- DataConsistencyCalculateParameter sourceParameter = generateParameter(source, "t_order_copy", 5);
- Optional<DataConsistencyCalculatedResult> sourceCalculateResult = calculateAlgorithm.calculateChunk(sourceParameter);
- DataConsistencyCalculateParameter targetParameter = generateParameter(target, "t_order", 5);
- Optional<DataConsistencyCalculatedResult> targetCalculateResult = calculateAlgorithm.calculateChunk(targetParameter);
+ DataConsistencyCalculateParameter sourceParam = generateParameter(source, "t_order_copy", 5);
+ Optional<DataConsistencyCalculatedResult> sourceCalculateResult = calculateAlgorithm.calculateChunk(sourceParam);
+ DataConsistencyCalculateParameter targetParam = generateParameter(target, "t_order", 5);
+ Optional<DataConsistencyCalculatedResult> targetCalculateResult = calculateAlgorithm.calculateChunk(targetParam);
assertTrue(sourceCalculateResult.isPresent());
assertTrue(targetCalculateResult.isPresent());
assertTrue(sourceCalculateResult.get().getMaxUniqueKeyValue().isPresent());
diff --git a/test/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/core/fixture/DataConsistencyCalculateAlgorithmFixture.java b/test/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/core/fixture/DataConsistencyCalculateAlgorithmFixture.java
index a0ce9457fb9..4b8a7fc66f0 100644
--- a/test/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/core/fixture/DataConsistencyCalculateAlgorithmFixture.java
+++ b/test/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/core/fixture/DataConsistencyCalculateAlgorithmFixture.java
@@ -40,7 +40,7 @@ public final class DataConsistencyCalculateAlgorithmFixture implements DataConsi
}
@Override
- public Iterable<DataConsistencyCalculatedResult> calculate(final DataConsistencyCalculateParameter parameter) {
+ public Iterable<DataConsistencyCalculatedResult> calculate(final DataConsistencyCalculateParameter param) {
return Collections.singletonList(new FixtureDataConsistencyCalculatedResult(2));
}
diff --git a/test/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/core/fixture/FixtureDataSourcePreparer.java b/test/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/core/fixture/FixtureDataSourcePreparer.java
index 07f5c59616c..6c526d666e2 100644
--- a/test/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/core/fixture/FixtureDataSourcePreparer.java
+++ b/test/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/core/fixture/FixtureDataSourcePreparer.java
@@ -24,10 +24,10 @@ import org.apache.shardingsphere.data.pipeline.core.prepare.datasource.PrepareTa
public final class FixtureDataSourcePreparer implements DataSourcePreparer {
@Override
- public void prepareTargetSchemas(final PrepareTargetSchemasParameter parameter) {
+ public void prepareTargetSchemas(final PrepareTargetSchemasParameter param) {
}
@Override
- public void prepareTargetTables(final PrepareTargetTablesParameter parameter) {
+ public void prepareTargetTables(final PrepareTargetTablesParameter param) {
}
}
diff --git a/test/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/core/fixture/FixtureInventoryIncrementalJobItemContext.java b/test/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/core/fixture/FixtureInventoryIncrementalJobItemContext.java
index ed58fe4951e..5bb36e470a1 100644
--- a/test/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/core/fixture/FixtureInventoryIncrementalJobItemContext.java
+++ b/test/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/core/fixture/FixtureInventoryIncrementalJobItemContext.java
@@ -33,7 +33,7 @@ import java.util.Collection;
public final class FixtureInventoryIncrementalJobItemContext implements InventoryIncrementalJobItemContext {
@Override
- public void onProgressUpdated(final PipelineJobProgressUpdatedParameter parameter) {
+ public void onProgressUpdated(final PipelineJobProgressUpdatedParameter param) {
}
@Override
diff --git a/test/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/core/prepare/datasource/AbstractDataSourcePreparerTest.java b/test/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/core/prepare/datasource/AbstractDataSourcePreparerTest.java
index a06dccc897b..a8bb9dc2da9 100644
--- a/test/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/core/prepare/datasource/AbstractDataSourcePreparerTest.java
+++ b/test/pipeline/src/test/java/org/apache/shardingsphere/data/pipeline/core/prepare/datasource/AbstractDataSourcePreparerTest.java
@@ -40,7 +40,7 @@ public final class AbstractDataSourcePreparerTest {
private final AbstractDataSourcePreparer preparer = new AbstractDataSourcePreparer() {
@Override
- public void prepareTargetTables(final PrepareTargetTablesParameter parameter) {
+ public void prepareTargetTables(final PrepareTargetTablesParameter param) {
}
};