From f9e79fbed04077c6e631206b5e9dc5f1e066b96c Mon Sep 17 00:00:00 2001 From: Zoltan Haindrich Date: Wed, 3 Apr 2024 14:32:00 +0000 Subject: [PATCH] Remove BaseCalciteQueryTest implements PlannerComponentSupplier --- .../sql/calcite/BaseCalciteQueryTest.java | 42 ++----------------- ...DecoupledPlanningCalciteJoinQueryTest.java | 2 +- .../DecoupledPlanningCalciteQueryTest.java | 2 +- ...ecoupledPlanningCalciteUnionQueryTest.java | 2 +- 4 files changed, 7 insertions(+), 41 deletions(-) diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/BaseCalciteQueryTest.java b/sql/src/test/java/org/apache/druid/sql/calcite/BaseCalciteQueryTest.java index 854ac2215985..140fd2990175 100644 --- a/sql/src/test/java/org/apache/druid/sql/calcite/BaseCalciteQueryTest.java +++ b/sql/src/test/java/org/apache/druid/sql/calcite/BaseCalciteQueryTest.java @@ -99,11 +99,8 @@ import org.apache.druid.sql.calcite.planner.Calcites; import org.apache.druid.sql.calcite.planner.PlannerConfig; import org.apache.druid.sql.calcite.planner.PlannerContext; -import org.apache.druid.sql.calcite.planner.PlannerFactory; -import org.apache.druid.sql.calcite.rule.ExtensionCalciteRuleProvider; import org.apache.druid.sql.calcite.run.EngineFeature; import org.apache.druid.sql.calcite.run.SqlEngine; -import org.apache.druid.sql.calcite.schema.DruidSchemaManager; import org.apache.druid.sql.calcite.util.CalciteTestBase; import org.apache.druid.sql.calcite.util.CalciteTests; import org.apache.druid.sql.calcite.util.SqlTestFramework; @@ -113,7 +110,6 @@ import org.apache.druid.sql.calcite.util.SqlTestFramework.QueryComponentSupplier; import org.apache.druid.sql.calcite.util.SqlTestFramework.StandardComponentSupplier; import org.apache.druid.sql.calcite.util.SqlTestFramework.StandardPlannerComponentSupplier; -import org.apache.druid.sql.calcite.view.ViewManager; import org.apache.druid.sql.http.SqlParameter; import org.hamcrest.CoreMatchers; import org.hamcrest.Matcher; @@ -155,7 +151,7 @@ * and populates data using {@link CalciteTests#createMockWalker}. */ public class BaseCalciteQueryTest extends CalciteTestBase - implements QueryComponentSupplier, PlannerComponentSupplier + implements QueryComponentSupplier { public static final double ASSERTION_EPSILON = 1e-5; public static String NULL_STRING; @@ -303,7 +299,7 @@ public static Map getTimeseriesContextWithFloorTime( public boolean skipVectorize = false; private QueryComponentSupplier baseComponentSupplier; - public PlannerComponentSupplier basePlannerComponentSupplier = new StandardPlannerComponentSupplier(); + public PlannerComponentSupplier plannerComponentSupplier = new StandardPlannerComponentSupplier(); public BaseCalciteQueryTest() { @@ -724,36 +720,6 @@ public void finalizeTestFramework(SqlTestFramework sqlTestFramework) baseComponentSupplier.finalizeTestFramework(sqlTestFramework); } - @Override - public Set extensionCalciteRules() - { - return basePlannerComponentSupplier.extensionCalciteRules(); - } - - @Override - public ViewManager createViewManager() - { - return basePlannerComponentSupplier.createViewManager(); - } - - @Override - public void populateViews(ViewManager viewManager, PlannerFactory plannerFactory) - { - basePlannerComponentSupplier.populateViews(viewManager, plannerFactory); - } - - @Override - public DruidSchemaManager createSchemaManager() - { - return basePlannerComponentSupplier.createSchemaManager(); - } - - @Override - public void finalizePlanner(PlannerFixture plannerFixture) - { - basePlannerComponentSupplier.finalizePlanner(plannerFixture); - } - public void assumeFeatureAvailable(EngineFeature feature) { boolean featureAvailable = queryFramework().engine().featureAvailable(feature); @@ -1020,7 +986,7 @@ public CalciteTestConfig(Map baseQueryContext) @Override public PlannerFixture plannerFixture(PlannerConfig plannerConfig, AuthConfig authConfig) { - return queryFramework().plannerFixture(BaseCalciteQueryTest.this, plannerConfig, authConfig); + return queryFramework().plannerFixture(plannerComponentSupplier, plannerConfig, authConfig); } @Override @@ -1322,7 +1288,7 @@ SqlStatementFactory getSqlStatementFactory( AuthConfig authConfig ) { - return queryFramework().plannerFixture(this, plannerConfig, authConfig).statementFactory(); + return queryFramework().plannerFixture(plannerComponentSupplier, plannerConfig, authConfig).statementFactory(); } protected void cannotVectorize() diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/DecoupledPlanningCalciteJoinQueryTest.java b/sql/src/test/java/org/apache/druid/sql/calcite/DecoupledPlanningCalciteJoinQueryTest.java index 7c73b1125063..4d8c1f07adef 100644 --- a/sql/src/test/java/org/apache/druid/sql/calcite/DecoupledPlanningCalciteJoinQueryTest.java +++ b/sql/src/test/java/org/apache/druid/sql/calcite/DecoupledPlanningCalciteJoinQueryTest.java @@ -50,7 +50,7 @@ public class DecoupledPlanningCalciteJoinQueryTest extends CalciteJoinQueryTest @Override protected QueryTestBuilder testBuilder() { - PlannerComponentSupplier componentSupplier = this; + PlannerComponentSupplier componentSupplier = plannerComponentSupplier; CalciteTestConfig testConfig = new CalciteTestConfig(CONTEXT_OVERRIDES) { @Override diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/DecoupledPlanningCalciteQueryTest.java b/sql/src/test/java/org/apache/druid/sql/calcite/DecoupledPlanningCalciteQueryTest.java index 1a0ae448319f..3cecfdc3ee45 100644 --- a/sql/src/test/java/org/apache/druid/sql/calcite/DecoupledPlanningCalciteQueryTest.java +++ b/sql/src/test/java/org/apache/druid/sql/calcite/DecoupledPlanningCalciteQueryTest.java @@ -41,7 +41,7 @@ public class DecoupledPlanningCalciteQueryTest extends CalciteQueryTest @Override protected QueryTestBuilder testBuilder() { - PlannerComponentSupplier componentSupplier = this; + PlannerComponentSupplier componentSupplier = plannerComponentSupplier; CalciteTestConfig testConfig = new CalciteTestConfig(CONTEXT_OVERRIDES) { @Override diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/DecoupledPlanningCalciteUnionQueryTest.java b/sql/src/test/java/org/apache/druid/sql/calcite/DecoupledPlanningCalciteUnionQueryTest.java index 7ddfc59c9bcd..711cc6401607 100644 --- a/sql/src/test/java/org/apache/druid/sql/calcite/DecoupledPlanningCalciteUnionQueryTest.java +++ b/sql/src/test/java/org/apache/druid/sql/calcite/DecoupledPlanningCalciteUnionQueryTest.java @@ -41,7 +41,7 @@ public class DecoupledPlanningCalciteUnionQueryTest extends CalciteUnionQueryTes @Override protected QueryTestBuilder testBuilder() { - PlannerComponentSupplier componentSupplier = this; + PlannerComponentSupplier componentSupplier = plannerComponentSupplier; CalciteTestConfig testConfig = new CalciteTestConfig(CONTEXT_OVERRIDES) { @Override