You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2026/09/30 15:25:42 UTC
(shardingsphere) branch master updated: Remove useless parameters on SQLFederationProcessor (#40023)
This is an automated email from the ASF dual-hosted git repository.
terrymanu 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 91e2af34806 Remove useless parameters on SQLFederationProcessor (#40023)
91e2af34806 is described below
commit 91e2af348063dc860410a95c8eed6e9e0256363f
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Wed Sep 30 23:25:35 2026 +0800
Remove useless parameters on SQLFederationProcessor (#40023)
---
.../provider/calcite/CalciteSQLFederationExecutor.java | 2 +-
.../engine/processor/SQLFederationProcessor.java | 6 ++----
.../calcite/CalciteSQLFederationExecutorTest.java | 6 +++---
.../engine/processor/SQLFederationProcessorTest.java | 18 +++++++-----------
4 files changed, 13 insertions(+), 19 deletions(-)
diff --git a/kernel/sql-federation/provider/calcite/src/main/java/org/apache/shardingsphere/sqlfederation/provider/calcite/CalciteSQLFederationExecutor.java b/kernel/sql-federation/provider/calcite/src/main/java/org/apache/shardingsphere/sqlfederation/provider/calcite/CalciteSQLFederationExecutor.java
index 67fe5f79b01..4eb98f22b2f 100644
--- a/kernel/sql-federation/provider/calcite/src/main/java/org/apache/shardingsphere/sqlfederation/provider/calcite/CalciteSQLFederationExecutor.java
+++ b/kernel/sql-federation/provider/calcite/src/main/java/org/apache/shardingsphere/sqlfederation/provider/calcite/CalciteSQLFederationExecutor.java
@@ -141,7 +141,7 @@ public final class CalciteSQLFederationExecutor implements SQLFederationExecutor
SQLFederationExecutionPlan executionPlan = compileQuery(converter, currentDatabaseName,
currentSchemaName, federationContext, sqlStatementContext, queryContext.getSql(), processor.getConvention());
logExecutionPlan(executionPlan, federationContext.getMetaData().getProps());
- resultSet = processor.executePlan(prepareEngine, queryCallback, executionPlan, converter, federationContext, schemaPlus);
+ resultSet = processor.executePlan(executionPlan, converter, federationContext, schemaPlus);
return resultSet;
// CHECKSTYLE:OFF
} catch (final Exception ex) {
diff --git a/kernel/sql-federation/provider/calcite/src/main/java/org/apache/shardingsphere/sqlfederation/provider/calcite/engine/processor/SQLFederationProcessor.java b/kernel/sql-federation/provider/calcite/src/main/java/org/apache/shardingsphere/sqlfederation/provider/calcite/engine/processor/SQLFederationProcessor.java
index 1ad1a082aa8..a7a750e0fe0 100644
--- a/kernel/sql-federation/provider/calcite/src/main/java/org/apache/shardingsphere/sqlfederation/provider/calcite/engine/processor/SQLFederationProcessor.java
+++ b/kernel/sql-federation/provider/calcite/src/main/java/org/apache/shardingsphere/sqlfederation/provider/calcite/engine/processor/SQLFederationProcessor.java
@@ -157,16 +157,14 @@ public final class SQLFederationProcessor {
/**
* Execute plan.
*
- * @param prepareEngine prepare engine
- * @param queryCallback query callback
* @param executionPlan execution plan
* @param converter converter
* @param federationContext federation context
* @param schemaPlus SQL federation schema
* @return resultset
*/
- public ResultSet executePlan(final DriverExecutionPrepareEngine<JDBCExecutionUnit, Connection> prepareEngine, final JDBCExecutorCallback<? extends ExecuteResult> queryCallback,
- final SQLFederationExecutionPlan executionPlan, final SQLFederationRelConverter converter, final SQLFederationContext federationContext, final SchemaPlus schemaPlus) {
+ public ResultSet executePlan(final SQLFederationExecutionPlan executionPlan,
+ final SQLFederationRelConverter converter, final SQLFederationContext federationContext, final SchemaPlus schemaPlus) {
Bindable<Object> executablePlan = SQLFederationExecutionPlan.toBindable(executionPlan.getPhysicalPlan(), Collections.emptyMap(), null, Prefer.ARRAY);
SelectStatementContext selectStatementContext = (SelectStatementContext) federationContext.getQueryContext().getSqlStatementContext();
Map<String, Object> params = createParameters(selectStatementContext, federationContext.getQueryContext().getParameters());
diff --git a/kernel/sql-federation/provider/calcite/src/test/java/org/apache/shardingsphere/sqlfederation/provider/calcite/CalciteSQLFederationExecutorTest.java b/kernel/sql-federation/provider/calcite/src/test/java/org/apache/shardingsphere/sqlfederation/provider/calcite/CalciteSQLFederationExecutorTest.java
index ee06f3da796..c42e60f10a5 100644
--- a/kernel/sql-federation/provider/calcite/src/test/java/org/apache/shardingsphere/sqlfederation/provider/calcite/CalciteSQLFederationExecutorTest.java
+++ b/kernel/sql-federation/provider/calcite/src/test/java/org/apache/shardingsphere/sqlfederation/provider/calcite/CalciteSQLFederationExecutorTest.java
@@ -197,7 +197,7 @@ class CalciteSQLFederationExecutorTest {
JDBCExecutorCallback<? extends ExecuteResult> callback = mock(JDBCExecutorCallback.class);
ResultSet resultSet = mock(ResultSet.class);
SQLFederationProcessor processor = mock(SQLFederationProcessor.class);
- when(processor.executePlan(eq(prepareEngine), eq(callback), any(SQLFederationExecutionPlan.class), any(SQLFederationRelConverter.class), eq(federationContext), any())).thenReturn(resultSet);
+ when(processor.executePlan(any(SQLFederationExecutionPlan.class), any(SQLFederationRelConverter.class), eq(federationContext), any())).thenReturn(resultSet);
CalciteSQLFederationExecutor executor = createCalciteSQLFederationExecutor(processor, actualMetaData);
try (
MockedConstruction<SQLFederationRelConverter> converterMocked = mockConstruction(SQLFederationRelConverter.class,
@@ -308,7 +308,7 @@ class CalciteSQLFederationExecutorTest {
when(resultSet.isClosed()).thenReturn(true);
SQLFederationExecutionPlan executionPlan = mock(SQLFederationExecutionPlan.class);
SQLFederationProcessor processor = mock(SQLFederationProcessor.class);
- when(processor.executePlan(eq(prepareEngine), eq(callback), eq(executionPlan), any(SQLFederationRelConverter.class), eq(federationContext), any())).thenReturn(resultSet);
+ when(processor.executePlan(eq(executionPlan), any(SQLFederationRelConverter.class), eq(federationContext), any())).thenReturn(resultSet);
try (
CalciteSQLFederationExecutor executor = createCalciteSQLFederationExecutor(processor, actualMetaData);
MockedConstruction<SQLFederationRelConverter> ignored = mockConstruction(SQLFederationRelConverter.class,
@@ -349,7 +349,7 @@ class CalciteSQLFederationExecutorTest {
relOptUtil.when(() -> RelOptUtil.toString(any(RelNode.class), eq(SqlExplainLevel.ALL_ATTRIBUTES))).thenReturn("plan");
doAnswer(invocation -> {
throw new SQLIntegrityConstraintViolationException();
- }).when(processor).executePlan(eq(prepareEngine), eq(callback), eq(executionPlan), any(SQLFederationRelConverter.class), eq(federationContext), any());
+ }).when(processor).executePlan(eq(executionPlan), any(SQLFederationRelConverter.class), eq(federationContext), any());
assertThrows(SQLIntegrityConstraintViolationException.class, () -> executor.executeQuery(prepareEngine, callback, federationContext));
}
}
diff --git a/kernel/sql-federation/provider/calcite/src/test/java/org/apache/shardingsphere/sqlfederation/provider/calcite/engine/processor/SQLFederationProcessorTest.java b/kernel/sql-federation/provider/calcite/src/test/java/org/apache/shardingsphere/sqlfederation/provider/calcite/engine/processor/SQLFederationProcessorTest.java
index c02898b11d8..714e35c64a5 100644
--- a/kernel/sql-federation/provider/calcite/src/test/java/org/apache/shardingsphere/sqlfederation/provider/calcite/engine/processor/SQLFederationProcessorTest.java
+++ b/kernel/sql-federation/provider/calcite/src/test/java/org/apache/shardingsphere/sqlfederation/provider/calcite/engine/processor/SQLFederationProcessorTest.java
@@ -252,12 +252,11 @@ class SQLFederationProcessorTest {
mockedExecutionPlan.when(() -> SQLFederationExecutionPlan.toBindable(physicalPlan, Collections.emptyMap(), null, Prefer.ARRAY)).thenReturn(bindable);
mockedSpiLoader.when(() -> DatabaseTypedSPILoader
.getService(eq(DialectSQLFederationColumnTypeConverter.class), any(DatabaseType.class))).thenReturn(mock(DialectSQLFederationColumnTypeConverter.class));
- ResultSet result = processor.executePlan(prepareEngine, callback, executionPlan, converter, federationContext, rootSchema);
+ ResultSet result = processor.executePlan(executionPlan, converter, federationContext, rootSchema);
((SQLFederationResultSet) result).close();
}
}
- @SuppressWarnings("unchecked")
@ParameterizedTest(name = "{0}")
@MethodSource("getPaginationParameterArguments")
void assertExecutePlanBindsPaginationParameters(final String name, final int offsetParameterIndex, final int rowCountParameterIndex, final List<Object> params,
@@ -273,7 +272,7 @@ class SQLFederationProcessorTest {
mockedExecutionPlan.when(() -> SQLFederationExecutionPlan.toBindable(executionPlan.getPhysicalPlan(), Collections.emptyMap(), null, Prefer.ARRAY)).thenReturn(bindable);
mockedSpiLoader.when(() -> DatabaseTypedSPILoader
.getService(eq(DialectSQLFederationColumnTypeConverter.class), any(DatabaseType.class))).thenReturn(mock(DialectSQLFederationColumnTypeConverter.class));
- ResultSet result = processor.executePlan(mock(), mock(), executionPlan, converter, federationContext, mock(SchemaPlus.class));
+ ResultSet result = processor.executePlan(executionPlan, converter, federationContext, mock(SchemaPlus.class));
((SQLFederationResultSet) result).close();
}
verify(bindable).bind(dataContextCaptor.capture());
@@ -288,7 +287,6 @@ class SQLFederationProcessorTest {
Arguments.of("preserve_non_number_pagination_parameter", -1, 0, Collections.singletonList((Object) "20"), Collections.singletonMap("?0", (Object) "20")));
}
- @SuppressWarnings("unchecked")
@Test
void assertExecutePlanBindsNestedPaginationParameter() {
SelectStatement nestedSelectStatement = createSelectStatement(-1, 1);
@@ -304,14 +302,13 @@ class SQLFederationProcessorTest {
mockedExecutionPlan.when(() -> SQLFederationExecutionPlan.toBindable(executionPlan.getPhysicalPlan(), Collections.emptyMap(), null, Prefer.ARRAY)).thenReturn(bindable);
mockedSpiLoader.when(() -> DatabaseTypedSPILoader
.getService(eq(DialectSQLFederationColumnTypeConverter.class), any(DatabaseType.class))).thenReturn(mock(DialectSQLFederationColumnTypeConverter.class));
- ResultSet result = processor.executePlan(mock(), mock(), executionPlan, converter, federationContext, mock(SchemaPlus.class));
+ ResultSet result = processor.executePlan(executionPlan, converter, federationContext, mock(SchemaPlus.class));
((SQLFederationResultSet) result).close();
}
verify(bindable).bind(dataContextCaptor.capture());
assertThat(((ExecutorBindContext) dataContextCaptor.getValue()).getParameters(), is(createExpectedParams("?0", 11L, "?1", 20)));
}
- @SuppressWarnings("unchecked")
@Test
void assertExecutePlanRejectsOutOfRangePaginationParameter() {
SQLFederationContext federationContext = createFederationContext(false, -1, 0, Collections.singletonList((Object) (Integer.MAX_VALUE + 1L)));
@@ -320,12 +317,11 @@ class SQLFederationProcessorTest {
try (MockedStatic<SQLFederationExecutionPlan> mockedExecutionPlan = mockStatic(SQLFederationExecutionPlan.class)) {
mockedExecutionPlan.when(() -> SQLFederationExecutionPlan.toBindable(executionPlan.getPhysicalPlan(), Collections.emptyMap(), null, Prefer.ARRAY)).thenReturn(bindable);
IllegalArgumentException ex = assertThrows(IllegalArgumentException.class,
- () -> processor.executePlan(mock(), mock(), executionPlan, mock(SQLFederationRelConverter.class), federationContext, mock(SchemaPlus.class)));
+ () -> processor.executePlan(executionPlan, mock(SQLFederationRelConverter.class), federationContext, mock(SchemaPlus.class)));
assertThat(ex.getMessage(), is("SQL federation pagination parameter value `2147483648` is out of integer range."));
}
}
- @SuppressWarnings("unchecked")
@Test
void assertExecutePlanRejectsFractionalPaginationParameter() {
SQLFederationContext federationContext = createFederationContext(false, -1, 0, Collections.singletonList((Object) 20.5D));
@@ -334,7 +330,7 @@ class SQLFederationProcessorTest {
try (MockedStatic<SQLFederationExecutionPlan> mockedExecutionPlan = mockStatic(SQLFederationExecutionPlan.class)) {
mockedExecutionPlan.when(() -> SQLFederationExecutionPlan.toBindable(executionPlan.getPhysicalPlan(), Collections.emptyMap(), null, Prefer.ARRAY)).thenReturn(bindable);
IllegalArgumentException ex = assertThrows(IllegalArgumentException.class,
- () -> processor.executePlan(mock(), mock(), executionPlan, mock(SQLFederationRelConverter.class), federationContext, mock(SchemaPlus.class)));
+ () -> processor.executePlan(executionPlan, mock(SQLFederationRelConverter.class), federationContext, mock(SchemaPlus.class)));
assertThat(ex.getMessage(), is("SQL federation pagination parameter value `20.5` must be an integer."));
}
}
@@ -375,9 +371,9 @@ class SQLFederationProcessorTest {
mockedExecutionPlan.when(() -> SQLFederationExecutionPlan.toBindable(physicalPlan, Collections.emptyMap(), null, Prefer.ARRAY)).thenReturn(bindable);
mockedSpiLoader.when(() -> DatabaseTypedSPILoader
.getService(eq(DialectSQLFederationColumnTypeConverter.class), any(DatabaseType.class))).thenReturn(mock(DialectSQLFederationColumnTypeConverter.class));
- ResultSet previewResult = processor.executePlan(prepareEngine, callback, executionPlan, converter, federationContext, rootSchema);
+ ResultSet previewResult = processor.executePlan(executionPlan, converter, federationContext, rootSchema);
((SQLFederationResultSet) previewResult).close();
- ResultSet normalResult = processor.executePlan(prepareEngine, callback, executionPlan, converter, federationContext, rootSchema);
+ ResultSet normalResult = processor.executePlan(executionPlan, converter, federationContext, rootSchema);
((SQLFederationResultSet) normalResult).close();
}
}