This is an automated email from the ASF dual-hosted git repository.
zhangliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new dcd34bddee2 Adjust parameter order in InsertStatementContext
constructor (#35498)
dcd34bddee2 is described below
commit dcd34bddee2fbed788a10bae9163af7258e6e1fd
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Sat May 24 00:12:24 2025 +0800
Adjust parameter order in InsertStatementContext constructor (#35498)
* Adjust parameter order in InsertStatementContext constructor
- Reorder constructor parameters to improve readability and consistency
- Update related test cases and factories to reflect the new parameter order
- This change does not affect functionality but improves code
maintainability
* Adjust parameter order in InsertStatementContext constructor
- Reorder constructor parameters to improve readability and consistency
- Update related test cases and factories to reflect the new parameter order
- This change does not affect functionality but improves code
maintainability
---
.../generator/fixture/EncryptGeneratorFixtureBuilder.java | 4 ++--
.../checker/sql/ddl/ShardingInsertSupportedCheckerTest.java | 2 +-
.../sharding/merge/ShardingResultMergerEngineTest.java | 2 +-
.../checker/dml/ShardingInsertRouteContextCheckerTest.java | 2 +-
.../binder/context/statement/SQLStatementContextFactory.java | 2 +-
.../binder/context/statement/dml/InsertStatementContext.java | 12 ++++++------
.../context/statement/dml/InsertStatementContextTest.java | 2 +-
.../proxy/backend/connector/ProxySQLExecutorTest.java | 2 +-
8 files changed, 14 insertions(+), 14 deletions(-)
diff --git
a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/fixture/EncryptGeneratorFixtureBuilder.java
b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/fixture/EncryptGeneratorFixtureBuilder.java
index d4332c07a09..60b71c8ce2b 100644
---
a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/fixture/EncryptGeneratorFixtureBuilder.java
+++
b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/token/generator/fixture/EncryptGeneratorFixtureBuilder.java
@@ -117,7 +117,7 @@ public final class EncryptGeneratorFixtureBuilder {
ShardingSphereSchema schema = mock(ShardingSphereSchema.class);
when(database.getSchema("foo_db")).thenReturn(schema);
ShardingSphereMetaData metaData = new
ShardingSphereMetaData(Collections.singleton(database),
mock(ResourceMetaData.class), mock(RuleMetaData.class),
mock(ConfigurationProperties.class));
- return new InsertStatementContext(metaData, DATABASE_TYPE, params,
createInsertStatement(), "foo_db");
+ return new InsertStatementContext(DATABASE_TYPE,
createInsertStatement(), params, metaData, "foo_db");
}
private static InsertStatement createInsertStatement() {
@@ -222,6 +222,6 @@ public final class EncryptGeneratorFixtureBuilder {
ShardingSphereSchema schema = mock(ShardingSphereSchema.class);
when(database.getSchema("foo_db")).thenReturn(schema);
ShardingSphereMetaData metaData = new
ShardingSphereMetaData(Collections.singleton(database),
mock(ResourceMetaData.class), mock(RuleMetaData.class),
mock(ConfigurationProperties.class));
- return new InsertStatementContext(metaData, DATABASE_TYPE, params,
createInsertSelectStatement(containsInsertColumns), "foo_db");
+ return new InsertStatementContext(DATABASE_TYPE,
createInsertSelectStatement(containsInsertColumns), params, metaData, "foo_db");
}
}
diff --git
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/checker/sql/ddl/ShardingInsertSupportedCheckerTest.java
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/checker/sql/ddl/ShardingInsertSupportedCheckerTest.java
index 4ed9cd5f99c..7e96c9c9afb 100644
---
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/checker/sql/ddl/ShardingInsertSupportedCheckerTest.java
+++
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/checker/sql/ddl/ShardingInsertSupportedCheckerTest.java
@@ -82,7 +82,7 @@ class ShardingInsertSupportedCheckerTest {
private InsertStatementContext createInsertStatementContext(final
List<Object> params, final InsertStatement insertStatement) {
when(database.getName()).thenReturn("foo_db");
ShardingSphereMetaData metaData = new
ShardingSphereMetaData(Collections.singleton(database), mock(), mock(), mock());
- return new InsertStatementContext(metaData, databaseType, params,
insertStatement, "foo_db");
+ return new InsertStatementContext(databaseType, insertStatement,
params, metaData, "foo_db");
}
@Test
diff --git
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/ShardingResultMergerEngineTest.java
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/ShardingResultMergerEngineTest.java
index a1026a8ec3d..30edc0ddb3d 100644
---
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/ShardingResultMergerEngineTest.java
+++
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/ShardingResultMergerEngineTest.java
@@ -89,7 +89,7 @@ class ShardingResultMergerEngineTest {
private InsertStatementContext createInsertStatementContext(final
InsertStatement insertStatement) {
ShardingSphereDatabase database = mock(ShardingSphereDatabase.class,
RETURNS_DEEP_STUBS);
when(database.getName()).thenReturn("foo_db");
- return new InsertStatementContext(new
ShardingSphereMetaData(Collections.singleton(database), mock(), mock(),
mock()), databaseType, Collections.emptyList(), insertStatement, "foo_db");
+ return new InsertStatementContext(databaseType, insertStatement,
Collections.emptyList(), new
ShardingSphereMetaData(Collections.singleton(database), mock(), mock(),
mock()), "foo_db");
}
@Test
diff --git
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/checker/dml/ShardingInsertRouteContextCheckerTest.java
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/checker/dml/ShardingInsertRouteContextCheckerTest.java
index 1dbc8753f50..d6c9d8fd67d 100644
---
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/checker/dml/ShardingInsertRouteContextCheckerTest.java
+++
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/checker/dml/ShardingInsertRouteContextCheckerTest.java
@@ -98,7 +98,7 @@ class ShardingInsertRouteContextCheckerTest {
private InsertStatementContext createInsertStatementContext(final
List<Object> params, final InsertStatement insertStatement) {
when(database.getName()).thenReturn("foo_db");
ShardingSphereMetaData metaData = new
ShardingSphereMetaData(Collections.singleton(database), mock(), mock(), mock());
- return new InsertStatementContext(metaData, databaseType, params,
insertStatement, "foo_db");
+ return new InsertStatementContext(databaseType, insertStatement,
params, metaData, "foo_db");
}
@Test
diff --git
a/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/SQLStatementContextFactory.java
b/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/SQLStatementContextFactory.java
index c3d7e5376f5..dc30405590f 100644
---
a/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/SQLStatementContextFactory.java
+++
b/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/SQLStatementContextFactory.java
@@ -157,7 +157,7 @@ public final class SQLStatementContextFactory {
return new DeleteStatementContext(databaseType, (DeleteStatement)
sqlStatement);
}
if (sqlStatement instanceof InsertStatement) {
- return new InsertStatementContext(metaData, databaseType, params,
(InsertStatement) sqlStatement, currentDatabaseName);
+ return new InsertStatementContext(databaseType, (InsertStatement)
sqlStatement, params, metaData, currentDatabaseName);
}
if (sqlStatement instanceof CopyStatement) {
return new CopyStatementContext(databaseType, (CopyStatement)
sqlStatement);
diff --git
a/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dml/InsertStatementContext.java
b/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dml/InsertStatementContext.java
index a171cad9f86..d2c873cb565 100644
---
a/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dml/InsertStatementContext.java
+++
b/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dml/InsertStatementContext.java
@@ -97,8 +97,8 @@ public final class InsertStatementContext extends
CommonSQLStatementContext impl
private GeneratedKeyContext generatedKeyContext;
- public InsertStatementContext(final ShardingSphereMetaData metaData, final
DatabaseType databaseType, final List<Object> params,
- final InsertStatement sqlStatement, final
String currentDatabaseName) {
+ public InsertStatementContext(final DatabaseType databaseType, final
InsertStatement sqlStatement,
+ final List<Object> params, final
ShardingSphereMetaData metaData, final String currentDatabaseName) {
super(databaseType, sqlStatement);
this.metaData = metaData;
this.databaseType = databaseType;
@@ -106,7 +106,7 @@ public final class InsertStatementContext extends
CommonSQLStatementContext impl
valueExpressions = getAllValueExpressions(sqlStatement);
AtomicInteger parametersOffset = new AtomicInteger(0);
insertValueContexts = getInsertValueContexts(params, parametersOffset,
valueExpressions);
- insertSelectContext = getInsertSelectContext(metaData, params,
parametersOffset, currentDatabaseName).orElse(null);
+ insertSelectContext = getInsertSelectContext(params, parametersOffset,
metaData, currentDatabaseName).orElse(null);
onDuplicateKeyUpdateValueContext =
getOnDuplicateKeyUpdateValueContext(params, parametersOffset).orElse(null);
tablesContext = new TablesContext(getAllSimpleTableSegments());
List<String> insertColumnNames = getInsertColumnNames();
@@ -140,8 +140,8 @@ public final class InsertStatementContext extends
CommonSQLStatementContext impl
return result;
}
- private Optional<InsertSelectContext> getInsertSelectContext(final
ShardingSphereMetaData metaData, final List<Object> params,
- final
AtomicInteger paramsOffset, final String currentDatabaseName) {
+ private Optional<InsertSelectContext> getInsertSelectContext(final
List<Object> params, final AtomicInteger paramsOffset,
+ final
ShardingSphereMetaData metaData, final String currentDatabaseName) {
if (!getSqlStatement().getInsertSelect().isPresent()) {
return Optional.empty();
}
@@ -318,7 +318,7 @@ public final class InsertStatementContext extends
CommonSQLStatementContext impl
public void setUpParameters(final List<Object> params) {
AtomicInteger parametersOffset = new AtomicInteger(0);
insertValueContexts = getInsertValueContexts(params, parametersOffset,
valueExpressions);
- insertSelectContext = getInsertSelectContext(metaData, params,
parametersOffset, currentDatabaseName).orElse(null);
+ insertSelectContext = getInsertSelectContext(params, parametersOffset,
metaData, currentDatabaseName).orElse(null);
onDuplicateKeyUpdateValueContext =
getOnDuplicateKeyUpdateValueContext(params, parametersOffset).orElse(null);
ShardingSphereSchema schema = getSchema(metaData, currentDatabaseName);
generatedKeyContext = new GeneratedKeyContextEngine(getSqlStatement(),
schema).createGenerateKeyContext(insertColumnNamesAndIndexes,
insertValueContexts, params).orElse(null);
diff --git
a/infra/binder/core/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/dml/InsertStatementContextTest.java
b/infra/binder/core/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/dml/InsertStatementContextTest.java
index 6cb32b55a96..1b58deb2fb8 100644
---
a/infra/binder/core/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/dml/InsertStatementContextTest.java
+++
b/infra/binder/core/src/test/java/org/apache/shardingsphere/infra/binder/context/statement/dml/InsertStatementContextTest.java
@@ -87,7 +87,7 @@ class InsertStatementContextTest {
when(schema.getName()).thenReturn("foo_db");
when(schema.getVisibleColumnNames("tbl")).thenReturn(Arrays.asList("id",
"name", "status"));
ShardingSphereDatabase database = new ShardingSphereDatabase("foo_db",
mock(), mock(), mock(), Collections.singleton(schema));
- return new InsertStatementContext(new
ShardingSphereMetaData(Collections.singleton(database), mock(), mock(),
mock()), databaseType, params, insertStatement, "foo_db");
+ return new InsertStatementContext(databaseType, insertStatement,
params, new ShardingSphereMetaData(Collections.singleton(database), mock(),
mock(), mock()), "foo_db");
}
@Test
diff --git
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/ProxySQLExecutorTest.java
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/ProxySQLExecutorTest.java
index ee41c5472b2..01ac97c9ea6 100644
---
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/ProxySQLExecutorTest.java
+++
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/ProxySQLExecutorTest.java
@@ -279,6 +279,6 @@ class ProxySQLExecutorTest {
when(sqlStatement.getTable()).thenReturn(Optional.of(new
SimpleTableSegment(new TableNameSegment(0, 0, new
IdentifierValue("t_order")))));
ShardingSphereDatabase database = mock(ShardingSphereDatabase.class,
RETURNS_DEEP_STUBS);
when(database.getName()).thenReturn("foo_db");
- return new
InsertStatementContext(createShardingSphereMetaData(database), databaseType,
Collections.emptyList(), sqlStatement, "foo_db");
+ return new InsertStatementContext(databaseType, sqlStatement,
Collections.emptyList(), createShardingSphereMetaData(database), "foo_db");
}
}
