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 09:24:23 UTC
[shardingsphere] branch master updated: Rename variable name of Statement and ResultSet (#22104)
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 9f2d3ce53db Rename variable name of Statement and ResultSet (#22104)
9f2d3ce53db is described below
commit 9f2d3ce53dbb3e61349f5312cd10d12beebd1a2b
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sat Nov 12 17:24:16 2022 +0800
Rename variable name of Statement and ResultSet (#22104)
---
.../advice/SQLParserEngineAdviceTest.java | 16 +--
.../zipkin/advice/SQLParserEngineAdviceTest.java | 12 +--
.../pojo/EncryptPredicateEqualRightValueToken.java | 2 +-
.../pojo/EncryptPredicateInRightValueToken.java | 2 +-
.../statement/ShardingSpherePreparedStatement.java | 4 +-
.../statement/EncryptPreparedStatementTest.java | 112 +++++++++++----------
.../statement/ShadowPreparedStatementTest.java | 20 ++--
.../pipeline/core/importer/DefaultImporter.java | 34 +++----
.../core/prepare/InventoryTaskSplitter.java | 24 ++---
.../cases/base/BaseTransactionTestCase.java | 4 +-
.../transaction/engine/base/BaseITCase.java | 4 +-
11 files changed, 118 insertions(+), 116 deletions(-)
diff --git a/agent/plugins/tracing/opentelemetry/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/SQLParserEngineAdviceTest.java b/agent/plugins/tracing/opentelemetry/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/SQLParserEngineAdviceTest.java
index d1830d5f1d3..e46abac8c97 100644
--- a/agent/plugins/tracing/opentelemetry/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/SQLParserEngineAdviceTest.java
+++ b/agent/plugins/tracing/opentelemetry/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/SQLParserEngineAdviceTest.java
@@ -44,7 +44,7 @@ public final class SQLParserEngineAdviceTest extends AbstractSQLParserEngineAdvi
@ClassRule
public static final OpenTelemetryCollector COLLECTOR = new OpenTelemetryCollector();
- private static final String SQL_STMT = "select 1";
+ private static final String SQL_STATEMENT = "select 1";
private SQLParserEngineAdvice advice;
@@ -61,8 +61,8 @@ public final class SQLParserEngineAdviceTest extends AbstractSQLParserEngineAdvi
@Test
public void assertMethod() {
- advice.beforeMethod(getTargetObject(), null, new Object[]{SQL_STMT, true}, new MethodInvocationResult());
- advice.afterMethod(getTargetObject(), null, new Object[]{SQL_STMT, true}, new MethodInvocationResult());
+ advice.beforeMethod(getTargetObject(), null, new Object[]{SQL_STATEMENT, true}, new MethodInvocationResult());
+ advice.afterMethod(getTargetObject(), null, new Object[]{SQL_STATEMENT, true}, new MethodInvocationResult());
parentSpan.end();
List<SpanData> spanItems = COLLECTOR.getSpanItems();
assertThat(spanItems.size(), is(2));
@@ -71,14 +71,14 @@ public final class SQLParserEngineAdviceTest extends AbstractSQLParserEngineAdvi
Attributes attributes = spanItems.get(0).getAttributes();
assertThat(attributes.get(AttributeKey.stringKey(OpenTelemetryConstants.COMPONENT)), is(OpenTelemetryConstants.COMPONENT_NAME));
assertThat(attributes.get(AttributeKey.stringKey(OpenTelemetryConstants.DB_TYPE)), is(OpenTelemetryConstants.DB_TYPE_VALUE));
- assertThat(attributes.get(AttributeKey.stringKey(OpenTelemetryConstants.DB_STATEMENT)), is(SQL_STMT));
+ assertThat(attributes.get(AttributeKey.stringKey(OpenTelemetryConstants.DB_STATEMENT)), is(SQL_STATEMENT));
}
@Test
public void assertExceptionHandle() {
- advice.beforeMethod(getTargetObject(), null, new Object[]{SQL_STMT, true}, new MethodInvocationResult());
- advice.onThrowing(getTargetObject(), null, new Object[]{SQL_STMT, true}, new IOException());
- advice.afterMethod(getTargetObject(), null, new Object[]{SQL_STMT, true}, new MethodInvocationResult());
+ advice.beforeMethod(getTargetObject(), null, new Object[]{SQL_STATEMENT, true}, new MethodInvocationResult());
+ advice.onThrowing(getTargetObject(), null, new Object[]{SQL_STATEMENT, true}, new IOException());
+ advice.afterMethod(getTargetObject(), null, new Object[]{SQL_STATEMENT, true}, new MethodInvocationResult());
parentSpan.end();
List<SpanData> spanItems = COLLECTOR.getSpanItems();
assertThat(spanItems.size(), is(2));
@@ -88,6 +88,6 @@ public final class SQLParserEngineAdviceTest extends AbstractSQLParserEngineAdvi
Attributes attributes = spanItems.get(0).getAttributes();
assertThat(attributes.get(AttributeKey.stringKey(OpenTelemetryConstants.COMPONENT)), is(OpenTelemetryConstants.COMPONENT_NAME));
assertThat(attributes.get(AttributeKey.stringKey(OpenTelemetryConstants.DB_TYPE)), is(OpenTelemetryConstants.DB_TYPE_VALUE));
- assertThat(attributes.get(AttributeKey.stringKey(OpenTelemetryConstants.DB_STATEMENT)), is(SQL_STMT));
+ assertThat(attributes.get(AttributeKey.stringKey(OpenTelemetryConstants.DB_STATEMENT)), is(SQL_STATEMENT));
}
}
diff --git a/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/SQLParserEngineAdviceTest.java b/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/SQLParserEngineAdviceTest.java
index 965b603fd87..1672cb9bdc5 100644
--- a/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/SQLParserEngineAdviceTest.java
+++ b/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/zipkin/advice/SQLParserEngineAdviceTest.java
@@ -40,7 +40,7 @@ public final class SQLParserEngineAdviceTest extends AbstractSQLParserEngineAdvi
@ClassRule
public static final ZipkinCollector COLLECTOR = new ZipkinCollector();
- private static final String SQL_STMT = "select 1";
+ private static final String SQL_STATEMENT = "select 1";
private SQLParserEngineAdvice advice;
@@ -55,8 +55,8 @@ public final class SQLParserEngineAdviceTest extends AbstractSQLParserEngineAdvi
@Test
public void assertMethod() {
- advice.beforeMethod(getTargetObject(), null, new Object[]{SQL_STMT, true}, new MethodInvocationResult());
- advice.afterMethod(getTargetObject(), null, new Object[]{SQL_STMT, true}, new MethodInvocationResult());
+ advice.beforeMethod(getTargetObject(), null, new Object[]{SQL_STATEMENT, true}, new MethodInvocationResult());
+ advice.afterMethod(getTargetObject(), null, new Object[]{SQL_STATEMENT, true}, new MethodInvocationResult());
parentSpan.finish();
zipkin2.Span span = COLLECTOR.pop();
assertNotNull(span.parentId());
@@ -67,9 +67,9 @@ public final class SQLParserEngineAdviceTest extends AbstractSQLParserEngineAdvi
@Test
public void assertExceptionHandle() {
- advice.beforeMethod(getTargetObject(), null, new Object[]{SQL_STMT, true}, new MethodInvocationResult());
- advice.onThrowing(getTargetObject(), null, new Object[]{SQL_STMT, true}, new IOException());
- advice.afterMethod(getTargetObject(), null, new Object[]{SQL_STMT, true}, new MethodInvocationResult());
+ advice.beforeMethod(getTargetObject(), null, new Object[]{SQL_STATEMENT, true}, new MethodInvocationResult());
+ advice.onThrowing(getTargetObject(), null, new Object[]{SQL_STATEMENT, true}, new IOException());
+ advice.afterMethod(getTargetObject(), null, new Object[]{SQL_STATEMENT, true}, new MethodInvocationResult());
parentSpan.finish();
zipkin2.Span span = COLLECTOR.pop();
assertNotNull(span.parentId());
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 800785e7c83..fb19571c16f 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(callSuper = true)
+@EqualsAndHashCode
public final class EncryptPredicateEqualRightValueToken extends SQLToken implements Substitutable {
@Getter
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 42249860f63..a4277df5afd 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(callSuper = true)
+@EqualsAndHashCode
public final class EncryptPredicateInRightValueToken extends SQLToken implements Substitutable {
@Getter
diff --git a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java
index 7cd669da875..a353575669d 100644
--- a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java
+++ b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java
@@ -562,8 +562,8 @@ public final class ShardingSpherePreparedStatement extends AbstractPreparedState
if (generatedKey.isPresent() && statementOption.isReturnGeneratedKeys() && !generatedValues.isEmpty()) {
return new GeneratedKeysResultSet(generatedKey.get().getColumnName(), generatedValues.iterator(), this);
}
- for (PreparedStatement statement : statements) {
- ResultSet resultSet = statement.getGeneratedKeys();
+ for (PreparedStatement each : statements) {
+ ResultSet resultSet = each.getGeneratedKeys();
while (resultSet.next()) {
generatedValues.add((Comparable<?>) resultSet.getObject(1));
}
diff --git a/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/EncryptPreparedStatementTest.java b/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/EncryptPreparedStatementTest.java
index d2277a4d34a..dac515da51e 100644
--- a/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/EncryptPreparedStatementTest.java
+++ b/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/EncryptPreparedStatementTest.java
@@ -60,33 +60,33 @@ public final class EncryptPreparedStatementTest extends AbstractShardingSphereDa
@Test
public void assertInsertWithExecute() throws SQLException {
- try (PreparedStatement statement = getEncryptConnection().prepareStatement(INSERT_SQL)) {
- statement.setObject(1, 2);
- statement.setObject(2, 'b');
- statement.execute();
+ try (PreparedStatement preparedStatement = getEncryptConnection().prepareStatement(INSERT_SQL)) {
+ preparedStatement.setObject(1, 2);
+ preparedStatement.setObject(2, 'b');
+ preparedStatement.execute();
}
assertResultSet(3, 2, "encryptValue", "assistedEncryptValue");
}
@Test
public void assertInsertWithBatchExecute() throws SQLException {
- try (PreparedStatement statement = getEncryptConnection().prepareStatement(INSERT_SQL)) {
- statement.setObject(1, 3);
- statement.setObject(2, 'c');
- statement.addBatch();
- statement.setObject(1, 4);
- statement.setObject(2, 'd');
- statement.addBatch();
- statement.executeBatch();
+ try (PreparedStatement preparedStatement = getEncryptConnection().prepareStatement(INSERT_SQL)) {
+ preparedStatement.setObject(1, 3);
+ preparedStatement.setObject(2, 'c');
+ preparedStatement.addBatch();
+ preparedStatement.setObject(1, 4);
+ preparedStatement.setObject(2, 'd');
+ preparedStatement.addBatch();
+ preparedStatement.executeBatch();
}
assertResultSet(4, 3, "encryptValue", "assistedEncryptValue");
}
@Test
public void assertInsertWithExecuteWithGeneratedKey() throws SQLException {
- try (PreparedStatement statement = getEncryptConnection().prepareStatement(INSERT_GENERATED_KEY_SQL, Statement.RETURN_GENERATED_KEYS)) {
- statement.execute();
- ResultSet resultSet = statement.getGeneratedKeys();
+ try (PreparedStatement preparedStatement = getEncryptConnection().prepareStatement(INSERT_GENERATED_KEY_SQL, Statement.RETURN_GENERATED_KEYS)) {
+ preparedStatement.execute();
+ ResultSet resultSet = preparedStatement.getGeneratedKeys();
assertTrue(resultSet.next());
assertThat(resultSet.getInt(1), is(6));
assertFalse(resultSet.next());
@@ -96,22 +96,22 @@ public final class EncryptPreparedStatementTest extends AbstractShardingSphereDa
@Test
public void assertInsertWithBatchExecuteWithGeneratedKeys() throws SQLException {
- try (PreparedStatement statement = getEncryptConnection().prepareStatement(INSERT_GENERATED_KEY_SQL, Statement.RETURN_GENERATED_KEYS)) {
- statement.setObject(1, 'b');
- statement.addBatch();
- statement.setObject(1, 'c');
- statement.addBatch();
- statement.executeBatch();
+ try (PreparedStatement preparedStatement = getEncryptConnection().prepareStatement(INSERT_GENERATED_KEY_SQL, Statement.RETURN_GENERATED_KEYS)) {
+ preparedStatement.setObject(1, 'b');
+ preparedStatement.addBatch();
+ preparedStatement.setObject(1, 'c');
+ preparedStatement.addBatch();
+ preparedStatement.executeBatch();
}
assertResultSet(3, 2, "encryptValue", "assistedEncryptValue");
}
@Test
public void assertDeleteWithExecute() throws SQLException {
- try (PreparedStatement statement = getEncryptConnection().prepareStatement(DELETE_SQL)) {
- statement.setObject(1, 'a');
- statement.setObject(2, 1);
- statement.execute();
+ try (PreparedStatement preparedStatement = getEncryptConnection().prepareStatement(DELETE_SQL)) {
+ preparedStatement.setObject(1, 'a');
+ preparedStatement.setObject(2, 1);
+ preparedStatement.execute();
}
assertResultSet(1, 5, "encryptValue", "assistedEncryptValue");
}
@@ -119,10 +119,10 @@ public final class EncryptPreparedStatementTest extends AbstractShardingSphereDa
@Test
public void assertUpdateWithExecuteUpdate() throws SQLException {
int result;
- try (PreparedStatement statement = getEncryptConnection().prepareStatement(UPDATE_SQL)) {
- statement.setObject(1, 'f');
- statement.setObject(2, 'a');
- result = statement.executeUpdate();
+ try (PreparedStatement preparedStatement = getEncryptConnection().prepareStatement(UPDATE_SQL)) {
+ preparedStatement.setObject(1, 'f');
+ preparedStatement.setObject(2, 'a');
+ result = preparedStatement.executeUpdate();
}
assertThat(result, is(2));
assertResultSet(2, 1, "encryptValue", "assistedEncryptValue");
@@ -130,9 +130,9 @@ public final class EncryptPreparedStatementTest extends AbstractShardingSphereDa
@Test
public void assertSelectWithExecuteQuery() throws SQLException {
- try (PreparedStatement statement = getEncryptConnection().prepareStatement(SELECT_SQL)) {
- statement.setObject(1, 'a');
- ResultSet resultSet = statement.executeQuery();
+ try (PreparedStatement preparedStatement = getEncryptConnection().prepareStatement(SELECT_SQL)) {
+ preparedStatement.setObject(1, 'a');
+ ResultSet resultSet = preparedStatement.executeQuery();
assertTrue(resultSet.next());
assertThat(resultSet.getInt(1), is(1));
assertThat(resultSet.getString(2), is("decryptValue"));
@@ -144,11 +144,11 @@ public final class EncryptPreparedStatementTest extends AbstractShardingSphereDa
@Test
public void assertSelectWithOr() throws SQLException {
- try (PreparedStatement statement = getEncryptConnection().prepareStatement(SELECT_SQL_OR)) {
- statement.setObject(1, "plainValue");
- statement.setObject(2, 1);
- statement.setObject(3, 5);
- ResultSet resultSet = statement.executeQuery();
+ try (PreparedStatement preparedStatement = getEncryptConnection().prepareStatement(SELECT_SQL_OR)) {
+ preparedStatement.setObject(1, "plainValue");
+ preparedStatement.setObject(2, 1);
+ preparedStatement.setObject(3, 5);
+ ResultSet resultSet = preparedStatement.executeQuery();
assertTrue(resultSet.next());
assertThat(resultSet.getInt(1), is(1));
assertTrue(resultSet.next());
@@ -158,9 +158,9 @@ public final class EncryptPreparedStatementTest extends AbstractShardingSphereDa
@Test
public void assertSelectWithMetaData() throws SQLException {
- try (PreparedStatement statement = getEncryptConnection().prepareStatement(SELECT_SQL)) {
- statement.setObject(1, 'a');
- ResultSetMetaData metaData = statement.executeQuery().getMetaData();
+ try (PreparedStatement prepareStatement = getEncryptConnection().prepareStatement(SELECT_SQL)) {
+ prepareStatement.setObject(1, 'a');
+ ResultSetMetaData metaData = prepareStatement.executeQuery().getMetaData();
assertThat(metaData.getColumnCount(), is(2));
for (int i = 0; i < metaData.getColumnCount(); i++) {
assertThat(metaData.getColumnLabel(1), is("id"));
@@ -171,12 +171,14 @@ public final class EncryptPreparedStatementTest extends AbstractShardingSphereDa
@Test
public void assertSelectWithExecuteWithProperties() throws SQLException {
- try (PreparedStatement statement = getEncryptConnection().prepareStatement(SELECT_ALL_SQL, ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY, ResultSet.HOLD_CURSORS_OVER_COMMIT)) {
- boolean result = statement.execute();
+ try (
+ PreparedStatement preparedStatement = getEncryptConnection().prepareStatement(
+ SELECT_ALL_SQL, ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY, ResultSet.HOLD_CURSORS_OVER_COMMIT)) {
+ boolean result = preparedStatement.execute();
assertTrue(result);
- assertThat(statement.getResultSetType(), is(ResultSet.TYPE_FORWARD_ONLY));
- assertThat(statement.getResultSetConcurrency(), is(ResultSet.CONCUR_READ_ONLY));
- assertThat(statement.getResultSetHoldability(), is(ResultSet.HOLD_CURSORS_OVER_COMMIT));
+ assertThat(preparedStatement.getResultSetType(), is(ResultSet.TYPE_FORWARD_ONLY));
+ assertThat(preparedStatement.getResultSetConcurrency(), is(ResultSet.CONCUR_READ_ONLY));
+ assertThat(preparedStatement.getResultSetHoldability(), is(ResultSet.HOLD_CURSORS_OVER_COMMIT));
}
}
@@ -199,23 +201,23 @@ public final class EncryptPreparedStatementTest extends AbstractShardingSphereDa
@Test(expected = SQLException.class)
public void assertQueryWithNull() throws SQLException {
- try (PreparedStatement statement = getEncryptConnection().prepareStatement(null)) {
- statement.executeQuery();
+ try (PreparedStatement preparedStatement = getEncryptConnection().prepareStatement(null)) {
+ preparedStatement.executeQuery();
}
}
@Test(expected = SQLException.class)
public void assertQueryWithEmptyString() throws SQLException {
- try (PreparedStatement statement = getEncryptConnection().prepareStatement("")) {
- statement.executeQuery();
+ try (PreparedStatement preparedStatement = getEncryptConnection().prepareStatement("")) {
+ preparedStatement.executeQuery();
}
}
@Test
public void assertSelectWithInOperator() throws SQLException {
- try (PreparedStatement statement = getEncryptConnection().prepareStatement(SELECT_SQL_WITH_IN_OPERATOR)) {
- statement.setObject(1, 'a');
- ResultSetMetaData metaData = statement.executeQuery().getMetaData();
+ try (PreparedStatement preparedStatement = getEncryptConnection().prepareStatement(SELECT_SQL_WITH_IN_OPERATOR)) {
+ preparedStatement.setObject(1, 'a');
+ ResultSetMetaData metaData = preparedStatement.executeQuery().getMetaData();
assertThat(metaData.getColumnCount(), is(2));
for (int i = 0; i < metaData.getColumnCount(); i++) {
assertThat(metaData.getColumnLabel(1), is("id"));
@@ -226,9 +228,9 @@ public final class EncryptPreparedStatementTest extends AbstractShardingSphereDa
@Test
public void assertSelectWithPlainColumnForContainsColumn() throws SQLException {
- try (PreparedStatement statement = getEncryptConnectionWithProps().prepareStatement(SELECT_SQL_FOR_CONTAINS_COLUMN)) {
- statement.setObject(1, "plainValue");
- ResultSetMetaData metaData = statement.executeQuery().getMetaData();
+ try (PreparedStatement preparedStatement = getEncryptConnectionWithProps().prepareStatement(SELECT_SQL_FOR_CONTAINS_COLUMN)) {
+ preparedStatement.setObject(1, "plainValue");
+ ResultSetMetaData metaData = preparedStatement.executeQuery().getMetaData();
assertThat(metaData.getColumnCount(), is(3));
for (int i = 0; i < metaData.getColumnCount(); i++) {
assertThat(metaData.getColumnLabel(1), is("id"));
diff --git a/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShadowPreparedStatementTest.java b/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShadowPreparedStatementTest.java
index 49266963be5..2a9900fc6ec 100644
--- a/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShadowPreparedStatementTest.java
+++ b/jdbc/core/src/test/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShadowPreparedStatementTest.java
@@ -47,11 +47,11 @@ public final class ShadowPreparedStatementTest extends AbstractShardingSphereDat
@Test
public void assertInsertNativeCase() throws SQLException {
- try (PreparedStatement statement = getShadowDataSource().getConnection().prepareStatement(INSERT_SQL)) {
- statement.setObject(1, 2);
- statement.setString(2, "cipher");
- statement.setString(3, "plain");
- statement.execute();
+ try (PreparedStatement preparedStatement = getShadowDataSource().getConnection().prepareStatement(INSERT_SQL)) {
+ preparedStatement.setObject(1, 2);
+ preparedStatement.setString(2, "cipher");
+ preparedStatement.setString(3, "plain");
+ preparedStatement.execute();
}
assertResultSet(true, 0, "cipher");
assertResultSet(false, 1, "cipher");
@@ -72,11 +72,11 @@ public final class ShadowPreparedStatementTest extends AbstractShardingSphereDat
@Test
public void assertInsertShadowCase() throws SQLException {
- try (PreparedStatement statement = getShadowDataSource().getConnection().prepareStatement(INSERT_SQL)) {
- statement.setObject(1, 1);
- statement.setString(2, "cipher");
- statement.setString(3, "plain");
- statement.execute();
+ try (PreparedStatement preparedStatement = getShadowDataSource().getConnection().prepareStatement(INSERT_SQL)) {
+ preparedStatement.setObject(1, 1);
+ preparedStatement.setString(2, "cipher");
+ preparedStatement.setString(3, "plain");
+ preparedStatement.execute();
}
assertResultSet(true, 1, "cipher");
assertResultSet(false, 0, "cipher");
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 af90af06594..f31b6e1142a 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
@@ -191,16 +191,16 @@ public final class DefaultImporter extends AbstractLifecycleExecutor implements
private void executeBatchInsert(final Connection connection, final List<DataRecord> dataRecords) throws SQLException {
DataRecord dataRecord = dataRecords.get(0);
String insertSql = pipelineSqlBuilder.buildInsertSQL(getSchemaName(dataRecord.getTableName()), dataRecord);
- try (PreparedStatement ps = connection.prepareStatement(insertSql)) {
- batchInsertStatement = ps;
- ps.setQueryTimeout(30);
+ try (PreparedStatement preparedStatement = connection.prepareStatement(insertSql)) {
+ batchInsertStatement = preparedStatement;
+ preparedStatement.setQueryTimeout(30);
for (DataRecord each : dataRecords) {
for (int i = 0; i < each.getColumnCount(); i++) {
- ps.setObject(i + 1, each.getColumn(i).getValue());
+ preparedStatement.setObject(i + 1, each.getColumn(i).getValue());
}
- ps.addBatch();
+ preparedStatement.addBatch();
}
- ps.executeBatch();
+ preparedStatement.executeBatch();
} finally {
batchInsertStatement = null;
}
@@ -224,16 +224,16 @@ public final class DefaultImporter extends AbstractLifecycleExecutor implements
List<Column> conditionColumns = RecordUtil.extractConditionColumns(record, shardingColumns);
List<Column> updatedColumns = pipelineSqlBuilder.extractUpdatedColumns(record);
String updateSql = pipelineSqlBuilder.buildUpdateSQL(getSchemaName(record.getTableName()), record, conditionColumns);
- try (PreparedStatement ps = connection.prepareStatement(updateSql)) {
- updateStatement = ps;
+ try (PreparedStatement preparedStatement = connection.prepareStatement(updateSql)) {
+ updateStatement = preparedStatement;
for (int i = 0; i < updatedColumns.size(); i++) {
- ps.setObject(i + 1, updatedColumns.get(i).getValue());
+ preparedStatement.setObject(i + 1, updatedColumns.get(i).getValue());
}
for (int i = 0; i < conditionColumns.size(); i++) {
Column keyColumn = conditionColumns.get(i);
- ps.setObject(updatedColumns.size() + i + 1, (keyColumn.isUniqueKey() && keyColumn.isUpdated()) ? keyColumn.getOldValue() : keyColumn.getValue());
+ preparedStatement.setObject(updatedColumns.size() + i + 1, (keyColumn.isUniqueKey() && keyColumn.isUpdated()) ? keyColumn.getOldValue() : keyColumn.getValue());
}
- int updateCount = ps.executeUpdate();
+ int updateCount = preparedStatement.executeUpdate();
if (1 != updateCount) {
log.warn("executeUpdate failed, updateCount={}, updateSql={}, updatedColumns={}, conditionColumns={}", updateCount, updateSql, updatedColumns, conditionColumns);
}
@@ -246,17 +246,17 @@ public final class DefaultImporter extends AbstractLifecycleExecutor implements
DataRecord dataRecord = dataRecords.get(0);
List<Column> conditionColumns = RecordUtil.extractConditionColumns(dataRecord, importerConfig.getShardingColumns(dataRecord.getTableName()));
String deleteSQL = pipelineSqlBuilder.buildDeleteSQL(getSchemaName(dataRecord.getTableName()), dataRecord, conditionColumns);
- try (PreparedStatement ps = connection.prepareStatement(deleteSQL)) {
- batchDeleteStatement = ps;
- ps.setQueryTimeout(30);
+ try (PreparedStatement preparedStatement = connection.prepareStatement(deleteSQL)) {
+ batchDeleteStatement = preparedStatement;
+ preparedStatement.setQueryTimeout(30);
for (DataRecord each : dataRecords) {
conditionColumns = RecordUtil.extractConditionColumns(each, importerConfig.getShardingColumns(each.getTableName()));
for (int i = 0; i < conditionColumns.size(); i++) {
- ps.setObject(i + 1, conditionColumns.get(i).getValue());
+ preparedStatement.setObject(i + 1, conditionColumns.get(i).getValue());
}
- ps.addBatch();
+ preparedStatement.addBatch();
}
- ps.executeBatch();
+ preparedStatement.executeBatch();
} finally {
batchDeleteStatement = null;
}
diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/prepare/InventoryTaskSplitter.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/prepare/InventoryTaskSplitter.java
index e17251f5040..ff60d0765d0 100644
--- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/prepare/InventoryTaskSplitter.java
+++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/prepare/InventoryTaskSplitter.java
@@ -163,20 +163,20 @@ public final class InventoryTaskSplitter {
int shardingSize = jobItemContext.getJobProcessContext().getPipelineProcessConfig().getRead().getShardingSize();
try (
Connection connection = dataSource.getConnection();
- PreparedStatement ps = connection.prepareStatement(sql)) {
+ PreparedStatement preparedStatement = connection.prepareStatement(sql)) {
// TODO query minimum value less than 0
long beginId = 0;
long recordsCount = 0;
for (int i = 0; i < Integer.MAX_VALUE; i++) {
- ps.setLong(1, beginId);
- ps.setLong(2, shardingSize);
- try (ResultSet rs = ps.executeQuery()) {
- if (!rs.next()) {
- log.info("getPositionByPrimaryKeyRange, rs.next false, break");
+ preparedStatement.setLong(1, beginId);
+ preparedStatement.setLong(2, shardingSize);
+ try (ResultSet resultSet = preparedStatement.executeQuery()) {
+ if (!resultSet.next()) {
+ log.info("getPositionByPrimaryKeyRange, resultSet's next return false, break");
break;
}
- long endId = rs.getLong(1);
- recordsCount += rs.getLong(2);
+ long endId = resultSet.getLong(1);
+ recordsCount += resultSet.getLong(2);
if (0 == endId) {
log.info("getPositionByPrimaryKeyRange, endId is 0, break, tableName={}, primaryKey={}, beginId={}", dumperConfig.getActualTableName(), dumperConfig.getUniqueKey(), beginId);
break;
@@ -204,10 +204,10 @@ public final class InventoryTaskSplitter {
String sql = PipelineSQLBuilderFactory.getInstance(jobConfig.getSourceDatabaseType()).buildCountSQL(schemaName, actualTableName);
try (
Connection connection = dataSource.getConnection();
- PreparedStatement ps = connection.prepareStatement(sql)) {
- try (ResultSet rs = ps.executeQuery()) {
- rs.next();
- jobItemContext.updateInventoryRecordsCount(rs.getLong(1));
+ PreparedStatement preparedStatement = connection.prepareStatement(sql)) {
+ try (ResultSet resultSet = preparedStatement.executeQuery()) {
+ resultSet.next();
+ jobItemContext.updateInventoryRecordsCount(resultSet.getLong(1));
}
} catch (final SQLException ex) {
throw new SplitPipelineJobByUniqueKeyException(dumperConfig.getActualTableName(), dumperConfig.getUniqueKey(), ex);
diff --git a/test/integration-test/transaction/src/test/java/org/apache/shardingsphere/integration/transaction/cases/base/BaseTransactionTestCase.java b/test/integration-test/transaction/src/test/java/org/apache/shardingsphere/integration/transaction/cases/base/BaseTransactionTestCase.java
index 659dc773a0e..7bdfc294ec0 100644
--- a/test/integration-test/transaction/src/test/java/org/apache/shardingsphere/integration/transaction/cases/base/BaseTransactionTestCase.java
+++ b/test/integration-test/transaction/src/test/java/org/apache/shardingsphere/integration/transaction/cases/base/BaseTransactionTestCase.java
@@ -110,9 +110,9 @@ public abstract class BaseTransactionTestCase {
protected int countWithLog(final Connection connection, final String sql) throws SQLException {
Statement statement = connection.createStatement();
- ResultSet rs = statement.executeQuery(sql);
+ ResultSet resultSet = statement.executeQuery(sql);
int result = 0;
- while (rs.next()) {
+ while (resultSet.next()) {
result++;
}
return result;
diff --git a/test/integration-test/transaction/src/test/java/org/apache/shardingsphere/integration/transaction/engine/base/BaseITCase.java b/test/integration-test/transaction/src/test/java/org/apache/shardingsphere/integration/transaction/engine/base/BaseITCase.java
index 7d4bd0b4e4e..f44f872f644 100644
--- a/test/integration-test/transaction/src/test/java/org/apache/shardingsphere/integration/transaction/engine/base/BaseITCase.java
+++ b/test/integration-test/transaction/src/test/java/org/apache/shardingsphere/integration/transaction/engine/base/BaseITCase.java
@@ -324,9 +324,9 @@ public abstract class BaseITCase {
while (retryNumber <= 3) {
try {
Statement statement = connection.createStatement();
- ResultSet rs = statement.executeQuery(sql);
+ ResultSet resultSet = statement.executeQuery(sql);
int result = 0;
- while (rs.next()) {
+ while (resultSet.next()) {
result++;
}
return result;