Skip to content

Remove BaseCalciteQueryTest implements PlannerComponentSupplier #16245

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
kgyrtkirk wants to merge 1 commit into from
Closed

Remove BaseCalciteQueryTest implements PlannerComponentSupplier #16245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 4 additions & 38 deletions sql/src/test/java/org/apache/druid/sql/calcite/BaseCalciteQueryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -303,7 +299,7 @@ public static Map<String, Object> getTimeseriesContextWithFloorTime(
public boolean skipVectorize = false;

private QueryComponentSupplier baseComponentSupplier;
public PlannerComponentSupplier basePlannerComponentSupplier = new StandardPlannerComponentSupplier();
public PlannerComponentSupplier plannerComponentSupplier = new StandardPlannerComponentSupplier();

public BaseCalciteQueryTest()
{
Expand Down Expand Up @@ -724,36 +720,6 @@ public void finalizeTestFramework(SqlTestFramework sqlTestFramework)
baseComponentSupplier.finalizeTestFramework(sqlTestFramework);
}

@Override
public Set<ExtensionCalciteRuleProvider> 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);
Expand Down Expand Up @@ -1020,7 +986,7 @@ public CalciteTestConfig(Map<String, Object> baseQueryContext)
@Override
public PlannerFixture plannerFixture(PlannerConfig plannerConfig, AuthConfig authConfig)
{
return queryFramework().plannerFixture(BaseCalciteQueryTest.this, plannerConfig, authConfig);
return queryFramework().plannerFixture(plannerComponentSupplier, plannerConfig, authConfig);
}

@Override
Expand Down Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion sql/src/test/java/org/apache/druid/sql/calcite/DecoupledPlanningCalciteJoinQueryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion sql/src/test/java/org/apache/druid/sql/calcite/DecoupledPlanningCalciteQueryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion sql/src/test/java/org/apache/druid/sql/calcite/DecoupledPlanningCalciteUnionQueryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down