Optimize TupleDomain#contains using Domain#contains

trinodb · Oct 20, 2021 · e149082 · e149082
1 parent 2b8468c
commit e149082
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 2 deletions.
diff --git a/core/trino-spi/src/main/java/io/trino/spi/predicate/TupleDomain.java b/core/trino-spi/src/main/java/io/trino/spi/predicate/TupleDomain.java
@@ -450,7 +450,21 @@ public boolean overlaps(TupleDomain<T> other)
      */
     public boolean contains(TupleDomain<T> other)
     {
-        return other.isNone() || columnWiseUnion(this, other).equals(this);
+        if (other.isNone() || this == other) {
+            return true;
+        }
+        if (isNone()) {
+            return false;
+        }
+        Map<T, Domain> thisDomains = domains.orElseThrow();
+        Map<T, Domain> otherDomains = other.getDomains().orElseThrow();
+        for (Map.Entry<T, Domain> entry : thisDomains.entrySet()) {
+            Domain otherDomain = otherDomains.get(entry.getKey());
+            if (otherDomain == null || !entry.getValue().contains(otherDomain)) {
+                return false;
+            }
+        }
+        return true;
     }
 
     @Override

diff --git a/core/trino-spi/src/test/java/io/trino/spi/predicate/TestTupleDomain.java b/core/trino-spi/src/test/java/io/trino/spi/predicate/TestTupleDomain.java
@@ -733,7 +733,16 @@ private boolean contains(Map<ColumnHandle, Domain> superSet, Map<ColumnHandle, D
     {
         TupleDomain<ColumnHandle> superSetTupleDomain = TupleDomain.withColumnDomains(superSet);
         TupleDomain<ColumnHandle> subSetTupleDomain = TupleDomain.withColumnDomains(subSet);
-        return superSetTupleDomain.contains(subSetTupleDomain);
+        boolean contains = superSetTupleDomain.contains(subSetTupleDomain);
+        // Results from computing contains using union and using the method directly should match
+        assertThat(contains).isEqualTo(containsFromUnion(superSetTupleDomain, subSetTupleDomain));
+        return contains;
+    }
+
+    private static boolean containsFromUnion(TupleDomain<ColumnHandle> superSetTupleDomain, TupleDomain<ColumnHandle> subSetTupleDomain)
+    {
+        return subSetTupleDomain.isNone()
+                || columnWiseUnion(superSetTupleDomain, subSetTupleDomain).equals(superSetTupleDomain);
     }
 
     private boolean equals(Map<ColumnHandle, Domain> domains1, Map<ColumnHandle, Domain> domains2)