From b2fc59de0478827aa9f976b7aea8944d7cf10e9f Mon Sep 17 00:00:00 2001 From: Piotr Findeisen Date: Thu, 12 Oct 2023 11:23:02 +0200 Subject: [PATCH] Remove usage of customer table in AbstractTestQueries There was only one usage. One table less to create in tests. --- .../main/java/io/trino/testing/AbstractTestQueries.java | 7 +++---- .../src/main/java/io/trino/testing/BaseConnectorTest.java | 7 +++++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/testing/trino-testing/src/main/java/io/trino/testing/AbstractTestQueries.java b/testing/trino-testing/src/main/java/io/trino/testing/AbstractTestQueries.java index 9d6542cbf6a7..6cb30033cddc 100644 --- a/testing/trino-testing/src/main/java/io/trino/testing/AbstractTestQueries.java +++ b/testing/trino-testing/src/main/java/io/trino/testing/AbstractTestQueries.java @@ -35,7 +35,6 @@ import static io.trino.testing.QueryAssertions.assertContains; import static io.trino.testing.StatefulSleepingSum.STATEFUL_SLEEPING_SUM; import static io.trino.testing.assertions.Assert.assertEventually; -import static io.trino.tpch.TpchTable.CUSTOMER; import static io.trino.tpch.TpchTable.NATION; import static io.trino.tpch.TpchTable.ORDERS; import static io.trino.tpch.TpchTable.REGION; @@ -49,7 +48,7 @@ public abstract class AbstractTestQueries extends AbstractTestQueryFramework { - protected static final List> REQUIRED_TPCH_TABLES = ImmutableList.of(CUSTOMER, NATION, ORDERS, REGION); + protected static final List> REQUIRED_TPCH_TABLES = ImmutableList.of(NATION, ORDERS, REGION); // We can just use the default type registry, since we don't use any parametric types protected static final FunctionBundle CUSTOM_FUNCTIONS = InternalFunctionBundle.builder() @@ -364,8 +363,8 @@ public void testInformationSchemaFiltering() "SELECT table_name FROM information_schema.tables WHERE table_name = 'orders' LIMIT 1", "SELECT 'orders' table_name"); assertQuery( - "SELECT table_name FROM information_schema.columns WHERE data_type = 'bigint' AND table_name = 'customer' and column_name = 'custkey' LIMIT 1", - "SELECT 'customer' table_name"); + "SELECT table_name FROM information_schema.columns WHERE data_type = 'bigint' AND table_name = 'nation' and column_name = 'nationkey' LIMIT 1", + "SELECT 'nation' table_name"); } @Test diff --git a/testing/trino-testing/src/main/java/io/trino/testing/BaseConnectorTest.java b/testing/trino-testing/src/main/java/io/trino/testing/BaseConnectorTest.java index 08061c6ced48..b444c4bcce77 100644 --- a/testing/trino-testing/src/main/java/io/trino/testing/BaseConnectorTest.java +++ b/testing/trino-testing/src/main/java/io/trino/testing/BaseConnectorTest.java @@ -44,6 +44,7 @@ import io.trino.sql.planner.plan.TableScanNode; import io.trino.testing.sql.TestTable; import io.trino.testing.sql.TestView; +import io.trino.tpch.TpchTable; import org.intellij.lang.annotations.Language; import org.testng.SkipException; import org.testng.annotations.BeforeClass; @@ -155,6 +156,7 @@ import static io.trino.testing.TestingNames.randomNameSuffix; import static io.trino.testing.assertions.Assert.assertEventually; import static io.trino.testing.assertions.TestUtil.verifyResultOrFailure; +import static io.trino.tpch.TpchTable.CUSTOMER; import static java.lang.String.format; import static java.lang.String.join; import static java.lang.Thread.currentThread; @@ -184,6 +186,11 @@ public abstract class BaseConnectorTest { private static final Logger log = Logger.get(BaseConnectorTest.class); + protected static final List> REQUIRED_TPCH_TABLES = ImmutableSet.>builder() + .addAll(AbstractTestQueries.REQUIRED_TPCH_TABLES) + .add(CUSTOMER) + .build().asList(); + private final ConcurrentMap>> mockTableListings = new ConcurrentHashMap<>(); @BeforeClass