Skip to content

Commit 78a3f46

Browse files
wendigowendigo
committed
Instantiate tpch connector using bootstrap
1 parent ce6eb07 commit 78a3f46

39 files changed

+415
-191
lines changed

‎core/trino-main/src/test/java/io/trino/TestHiddenColumns.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import org.junit.jupiter.api.parallel.Execution;
2626

2727
import static io.trino.SessionTestUtils.TEST_SESSION;
28-
import static io.trino.plugin.tpch.TpchConnectorFactory.TPCH_SPLITS_PER_NODE;
2928
import static io.trino.spi.type.VarcharType.VARCHAR;
3029
import static io.trino.testing.MaterializedResult.resultBuilder;
3130
import static org.assertj.core.api.Assertions.assertThat;
@@ -44,7 +43,7 @@ public void setUp()
4443
{
4544
runner = new StandaloneQueryRunner(TEST_SESSION);
4645
runner.installPlugin(new TpchPlugin());
47-
runner.createCatalog(TEST_SESSION.getCatalog().get(), "tpch", ImmutableMap.of(TPCH_SPLITS_PER_NODE, "1"));
46+
runner.createCatalog(TEST_SESSION.getCatalog().get(), "tpch", ImmutableMap.of("tpch.splits-per-node", "1"));
4847
assertions = new QueryAssertions(runner);
4948
}
5049

‎core/trino-main/src/test/java/io/trino/cost/StatsCalculatorTester.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525

2626
import java.util.function.Function;
2727

28-
import static io.trino.plugin.tpch.TpchConnectorFactory.TPCH_SPLITS_PER_NODE;
2928
import static io.trino.spi.transaction.IsolationLevel.READ_UNCOMMITTED;
3029
import static io.trino.testing.TestingSession.testSession;
3130

@@ -38,7 +37,7 @@ public StatsCalculatorTester(Session session)
3837
{
3938
queryRunner = new StandaloneQueryRunner(session);
4039
queryRunner.installPlugin(new TpchPlugin());
41-
queryRunner.createCatalog(session.getCatalog().orElseThrow(), "tpch", ImmutableMap.of(TPCH_SPLITS_PER_NODE, "1"));
40+
queryRunner.createCatalog(session.getCatalog().orElseThrow(), "tpch", ImmutableMap.of("tpch.splits-per-node", "1"));
4241
}
4342

4443
public StatsCalculatorAssertion assertStatsFor(Function<PlanBuilder, PlanNode> planProvider)

‎core/trino-main/src/test/java/io/trino/cost/TestStatsCalculator.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import org.junit.jupiter.api.TestInstance;
2828
import org.junit.jupiter.api.parallel.Execution;
2929

30-
import static io.trino.plugin.tpch.TpchConnectorFactory.TPCH_SPLITS_PER_NODE;
3130
import static io.trino.sql.planner.assertions.PlanMatchPattern.anyTree;
3231
import static io.trino.sql.planner.assertions.PlanMatchPattern.node;
3332
import static io.trino.testing.TestingHandles.TEST_CATALOG_NAME;
@@ -53,7 +52,7 @@ public void setUp()
5352
queryRunner.createCatalog(
5453
queryRunner.getDefaultSession().getCatalog().get(),
5554
"tpch",
56-
ImmutableMap.of(TPCH_SPLITS_PER_NODE, "1"));
55+
ImmutableMap.of("tpch.splits-per-node", "1"));
5756
}
5857

5958
@AfterAll

‎core/trino-main/src/test/java/io/trino/sql/planner/BenchmarkPlanner.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,6 @@
5656
import static io.trino.execution.querystats.PlanOptimizersStatsCollector.createPlanOptimizersStatsCollector;
5757
import static io.trino.execution.warnings.WarningCollector.NOOP;
5858
import static io.trino.jmh.Benchmarks.benchmark;
59-
import static io.trino.plugin.tpch.TpchConnectorFactory.TPCH_COLUMN_NAMING_PROPERTY;
60-
import static io.trino.plugin.tpch.TpchConnectorFactory.TPCH_SPLITS_PER_NODE;
6159
import static io.trino.spi.type.VarcharType.VARCHAR;
6260
import static io.trino.sql.planner.BenchmarkPlanner.Queries.TPCH;
6361
import static io.trino.sql.planner.LogicalPlanner.Stage.OPTIMIZED;
@@ -103,8 +101,8 @@ public void setup()
103101
planTester = PlanTester.create(session);
104102
planTester.installPlugin(new TpchPlugin());
105103
planTester.createCatalog(tpch, "tpch", ImmutableMap.<String, String>builder()
106-
.put(TPCH_SPLITS_PER_NODE, "4")
107-
.put(TPCH_COLUMN_NAMING_PROPERTY, ColumnNaming.STANDARD.name())
104+
.put("tpch.splits-per-node", "4")
105+
.put("tpch.column-naming", ColumnNaming.STANDARD.name())
108106
.buildOrThrow());
109107

110108
planTester.installPlugin(new MockConnectorPlugin(MockConnectorFactory.builder()

‎core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/BenchmarkReorderChainedJoins.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
import org.openjdk.jmh.runner.RunnerException;
3232

3333
import static io.trino.jmh.Benchmarks.benchmark;
34-
import static io.trino.plugin.tpch.TpchConnectorFactory.TPCH_SPLITS_PER_NODE;
3534
import static io.trino.testing.TestingSession.testSessionBuilder;
3635
import static java.util.concurrent.TimeUnit.MILLISECONDS;
3736
import static org.openjdk.jmh.annotations.Mode.AverageTime;
@@ -83,7 +82,7 @@ public void setup()
8382
.build();
8483
planTester = PlanTester.create(session);
8584
planTester.installPlugin(new TpchPlugin());
86-
planTester.createCatalog("tpch", "tpch", ImmutableMap.of(TPCH_SPLITS_PER_NODE, "1"));
85+
planTester.createCatalog("tpch", "tpch", ImmutableMap.of("tpch.splits-per-node", "1"));
8786
}
8887

8988
public PlanTester getPlanTester()

‎core/trino-main/src/test/java/io/trino/sql/planner/iterative/rule/BenchmarkReorderInterconnectedJoins.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333

3434
import static com.google.common.base.Preconditions.checkState;
3535
import static io.trino.jmh.Benchmarks.benchmark;
36-
import static io.trino.plugin.tpch.TpchConnectorFactory.TPCH_SPLITS_PER_NODE;
3736
import static io.trino.testing.TestingSession.testSessionBuilder;
3837
import static java.lang.String.format;
3938
import static java.util.concurrent.TimeUnit.MILLISECONDS;
@@ -83,7 +82,7 @@ public void setup()
8382
.build();
8483
queryRunner = new StandaloneQueryRunner(session);
8584
queryRunner.installPlugin(new TpchPlugin());
86-
queryRunner.createCatalog("tpch", "tpch", ImmutableMap.of(TPCH_SPLITS_PER_NODE, "1"));
85+
queryRunner.createCatalog("tpch", "tpch", ImmutableMap.of("tpch.splits-per-node", "1"));
8786
StringBuilder stringBuilder = new StringBuilder();
8887
stringBuilder.append("EXPLAIN SELECT * FROM nation n1");
8988
for (int i = 2; i <= numberOfTables; i++) {

‎core/trino-main/src/test/java/io/trino/sql/planner/planprinter/TestAnonymizeJsonRepresentation.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@
4949

5050
import static io.airlift.json.JsonCodec.jsonCodec;
5151
import static io.trino.SessionTestUtils.TEST_SESSION;
52-
import static io.trino.plugin.tpch.TpchConnectorFactory.TPCH_SPLITS_PER_NODE;
5352
import static io.trino.plugin.tpch.TpchMetadata.TINY_SCALE_FACTOR;
5453
import static io.trino.plugin.tpch.TpchMetadata.TINY_SCHEMA_NAME;
5554
import static io.trino.spi.predicate.Domain.all;
@@ -92,7 +91,7 @@ public void setUp()
9291
{
9392
queryRunner = new StandaloneQueryRunner(TEST_SESSION);
9493
queryRunner.installPlugin(new TpchPlugin());
95-
queryRunner.createCatalog(TEST_SESSION.getCatalog().get(), "tpch", ImmutableMap.of(TPCH_SPLITS_PER_NODE, "1"));
94+
queryRunner.createCatalog(TEST_SESSION.getCatalog().get(), "tpch", ImmutableMap.of("tpch.splits-per-node", "1"));
9695
}
9796

9897
@AfterAll

‎core/trino-main/src/test/java/io/trino/sql/planner/planprinter/TestJsonRepresentation.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@
4848
import static io.airlift.json.JsonCodec.mapJsonCodec;
4949
import static io.trino.SessionTestUtils.TEST_SESSION;
5050
import static io.trino.operator.RetryPolicy.NONE;
51-
import static io.trino.plugin.tpch.TpchConnectorFactory.TPCH_SPLITS_PER_NODE;
5251
import static io.trino.plugin.tpch.TpchMetadata.TINY_SCHEMA_NAME;
5352
import static io.trino.spi.type.BigintType.BIGINT;
5453
import static io.trino.spi.type.IntegerType.INTEGER;
@@ -81,7 +80,7 @@ public void setUp()
8180
// the expected values below simple non-distributed plans
8281
queryRunner = new StandaloneQueryRunner(TEST_SESSION);
8382
queryRunner.installPlugin(new TpchPlugin());
84-
queryRunner.createCatalog(TEST_SESSION.getCatalog().get(), "tpch", ImmutableMap.of(TPCH_SPLITS_PER_NODE, "1"));
83+
queryRunner.createCatalog(TEST_SESSION.getCatalog().get(), "tpch", ImmutableMap.of("tpch.splits-per-node", "1"));
8584
}
8685

8786
@AfterAll

‎core/trino-main/src/test/java/io/trino/sql/query/TestCheckConstraint.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030

3131
import static io.trino.connector.MockConnectorEntities.TPCH_NATION_DATA;
3232
import static io.trino.connector.MockConnectorEntities.TPCH_NATION_SCHEMA;
33-
import static io.trino.plugin.tpch.TpchConnectorFactory.TPCH_SPLITS_PER_NODE;
3433
import static io.trino.plugin.tpch.TpchMetadata.TINY_SCHEMA_NAME;
3534
import static io.trino.testing.TestingSession.testSessionBuilder;
3635
import static org.assertj.core.api.Assertions.assertThat;
@@ -58,7 +57,7 @@ public TestCheckConstraint()
5857
QueryRunner runner = new StandaloneQueryRunner(SESSION);
5958

6059
runner.installPlugin(new TpchPlugin());
61-
runner.createCatalog(LOCAL_CATALOG, "tpch", ImmutableMap.of(TPCH_SPLITS_PER_NODE, "1"));
60+
runner.createCatalog(LOCAL_CATALOG, "tpch", ImmutableMap.of("tpch.splits-per-node", "1"));
6261

6362
runner.installPlugin(new MockConnectorPlugin(MockConnectorFactory.builder()
6463
.withGetColumns(schemaTableName -> {

‎core/trino-main/src/test/java/io/trino/sql/query/TestColumnMask.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343

4444
import static io.trino.connector.MockConnectorEntities.TPCH_NATION_WITH_HIDDEN_COLUMN;
4545
import static io.trino.connector.MockConnectorEntities.TPCH_WITH_HIDDEN_COLUMN_DATA;
46-
import static io.trino.plugin.tpch.TpchConnectorFactory.TPCH_SPLITS_PER_NODE;
4746
import static io.trino.plugin.tpch.TpchMetadata.TINY_SCHEMA_NAME;
4847
import static io.trino.spi.type.IntegerType.INTEGER;
4948
import static io.trino.testing.TestingAccessControlManager.TestingPrivilegeType.SELECT_COLUMN;
@@ -76,7 +75,7 @@ public TestColumnMask()
7675
{
7776
QueryRunner runner = new StandaloneQueryRunner(SESSION);
7877
runner.installPlugin(new TpchPlugin());
79-
runner.createCatalog(LOCAL_CATALOG, "tpch", ImmutableMap.of(TPCH_SPLITS_PER_NODE, "1"));
78+
runner.createCatalog(LOCAL_CATALOG, "tpch", ImmutableMap.of("tpch.splits-per-node", "1"));
8079

8180
ConnectorViewDefinition view = new ConnectorViewDefinition(
8281
"SELECT nationkey, name FROM local.tiny.nation",

0 commit comments

Comments
 (0)