From f2161e3b587162b82da113243541860b8712e003 Mon Sep 17 00:00:00 2001 From: Karol Sobczak Date: Tue, 6 Aug 2024 12:45:04 +0200 Subject: [PATCH] Simplify testJoinDynamicFilteringBlockProbeSide tests The assumption for waiting for build side only works for first join due to how Driver#processInternal works. --- .../plugin/kudu/TestKuduIntegrationDynamicFilter.java | 11 +++++------ .../trino/plugin/memory/TestMemoryConnectorTest.java | 11 +++++------ .../plugin/mongodb/TestMongoDynamicFiltering.java | 11 +++++------ 3 files changed, 15 insertions(+), 18 deletions(-) diff --git a/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestKuduIntegrationDynamicFilter.java b/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestKuduIntegrationDynamicFilter.java index a21c50545a0c..945e225c1c99 100644 --- a/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestKuduIntegrationDynamicFilter.java +++ b/plugin/trino-kudu/src/test/java/io/trino/plugin/kudu/TestKuduIntegrationDynamicFilter.java @@ -159,15 +159,14 @@ public void testJoinDynamicFilteringSingleValue() @Test public void testJoinDynamicFilteringBlockProbeSide() { - // Wait for both build sides to finish before starting the scan of 'lineitem' table (should be very selective given the dynamic filters). + // Wait for both build side to finish before starting the scan of 'lineitem' table (should be very selective given the dynamic filters). assertDynamicFiltering( "SELECT l.comment" + - " FROM lineitem l, part p, orders o" + - " WHERE l.orderkey = o.orderkey AND o.comment = 'nstructions sleep furiously among '" + - " AND p.partkey = l.partkey AND p.comment = 'onic deposits'", + " FROM lineitem l, orders o" + + " WHERE l.orderkey = o.orderkey AND o.comment = 'nstructions sleep furiously among '", withBroadcastJoinNonReordering(), - 1, - 1); + 6, + 6); } private void assertDynamicFiltering(@Language("SQL") String selectQuery, Session session, int expectedRowCount, int expectedProbeInputRowsRead) diff --git a/plugin/trino-memory/src/test/java/io/trino/plugin/memory/TestMemoryConnectorTest.java b/plugin/trino-memory/src/test/java/io/trino/plugin/memory/TestMemoryConnectorTest.java index 41cd715e0f67..bea34b658d7f 100644 --- a/plugin/trino-memory/src/test/java/io/trino/plugin/memory/TestMemoryConnectorTest.java +++ b/plugin/trino-memory/src/test/java/io/trino/plugin/memory/TestMemoryConnectorTest.java @@ -282,15 +282,14 @@ public void testJoinDynamicFilteringImplicitCoercion() public void testJoinDynamicFilteringBlockProbeSide() { for (JoinDistributionType joinDistributionType : JoinDistributionType.values()) { - // Wait for both build sides to finish before starting the scan of 'lineitem' table (should be very selective given the dynamic filters). + // Wait for both build side to finish before starting the scan of 'lineitem' table (should be very selective given the dynamic filters). assertDynamicFiltering( "SELECT l.comment" + - " FROM lineitem l, part p, orders o" + - " WHERE l.orderkey = o.orderkey AND o.comment = 'nstructions sleep furiously among '" + - " AND p.partkey = l.partkey AND p.comment = 'onic deposits'", + " FROM lineitem l, orders o" + + " WHERE l.orderkey = o.orderkey AND o.comment = 'nstructions sleep furiously among '", noJoinReordering(joinDistributionType), - 1, - 1, PART_COUNT, ORDERS_COUNT); + 6, + 6, ORDERS_COUNT); } } diff --git a/plugin/trino-mongodb/src/test/java/io/trino/plugin/mongodb/TestMongoDynamicFiltering.java b/plugin/trino-mongodb/src/test/java/io/trino/plugin/mongodb/TestMongoDynamicFiltering.java index 611b9a30251f..c6d1a6cac6e2 100644 --- a/plugin/trino-mongodb/src/test/java/io/trino/plugin/mongodb/TestMongoDynamicFiltering.java +++ b/plugin/trino-mongodb/src/test/java/io/trino/plugin/mongodb/TestMongoDynamicFiltering.java @@ -156,15 +156,14 @@ public void testJoinDynamicFilteringSingleValue() @Test public void testJoinDynamicFilteringBlockProbeSide() { - // Wait for both build sides to finish before starting the scan of 'lineitem' table (should be very selective given the dynamic filters). + // Wait for both build side to finish before starting the scan of 'lineitem' table (should be very selective given the dynamic filters). assertDynamicFiltering( "SELECT l.comment" + - " FROM lineitem l, part p, orders o" + - " WHERE l.orderkey = o.orderkey AND o.comment = 'nstructions sleep furiously among '" + - " AND p.partkey = l.partkey AND p.comment = 'onic deposits'", + " FROM lineitem l, orders o" + + " WHERE l.orderkey = o.orderkey AND o.comment = 'nstructions sleep furiously among '", withBroadcastJoinNonReordering(), - 1, - 1); + 6, + 6); } private void assertDynamicFiltering(@Language("SQL") String selectQuery, Session session, int expectedRowCount, int... expectedOperatorRowsRead)