Fix 'Multiple entries with same key' error with dynamic filter

trinodb · Mar 7, 2024 · 8052969 · 8052969
1 parent b744b8d
commit 8052969
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/core/trino-main/src/main/java/io/trino/server/DynamicFilterService.java b/core/trino-main/src/main/java/io/trino/server/DynamicFilterService.java
@@ -452,7 +452,8 @@ private TupleDomain<ColumnHandle> translateSummaryToTupleDomain(
                                 return applySaturatedCasts(metadata, functionManager, typeOperators, session, updatedSummary, targetType);
                             }
                             return updatedSummary;
-                        })));
+                        },
+                        Domain::intersect)));
     }
 
     private static Set<DynamicFilterId> getLazyDynamicFilters(PlanFragment plan)

diff --git a/testing/trino-testing/src/main/java/io/trino/testing/BaseDynamicPartitionPruningTest.java b/testing/trino-testing/src/main/java/io/trino/testing/BaseDynamicPartitionPruningTest.java
@@ -141,6 +141,29 @@ public void testJoinWithSelectiveBuildSide()
         assertThat(domainStats.getSimplifiedDomain()).isEqualTo(singleValue(BIGINT, 1L).toString(getSession().toConnectorSession()));
     }
 
+    @Test
+    @Timeout(30)
+    public void testJoinWithComparingSameColumnUnderDifferentConditions()
+    {
+        @Language("SQL") String selectQuery = "SELECT * FROM partitioned_lineitem JOIN supplier ON partitioned_lineitem.suppkey >= supplier.suppkey " +
+                "AND partitioned_lineitem.suppkey <= supplier.suppkey " +
+                "AND supplier.name = 'Supplier#000000001'";
+        MaterializedResultWithPlan result = getDistributedQueryRunner().executeWithPlan(
+                getSession(),
+                selectQuery);
+        MaterializedResult expected = computeActual(withDynamicFilteringDisabled(), selectQuery);
+        assertEqualsIgnoreOrder(result.result(), expected);
+
+        DynamicFiltersStats dynamicFiltersStats = getDynamicFilteringStats(result.queryId());
+        assertThat(dynamicFiltersStats.getTotalDynamicFilters()).isEqualTo(1L);
+        assertThat(dynamicFiltersStats.getLazyDynamicFilters()).isEqualTo(1L);
+        assertThat(dynamicFiltersStats.getReplicatedDynamicFilters()).isEqualTo(1L);
+        assertThat(dynamicFiltersStats.getDynamicFiltersCompleted()).isEqualTo(1L);
+
+        DynamicFilterDomainStats domainStats = getOnlyElement(dynamicFiltersStats.getDynamicFilterDomainStats());
+        assertThat(domainStats.getSimplifiedDomain()).isEqualTo(singleValue(BIGINT, 1L).toString(getSession().toConnectorSession()));
+    }
+
     @Test
     @Timeout(30)
     public void testJoinWithNonSelectiveBuildSide()