Keep same domain in simplify() when already simple

trinodb · Oct 2, 2020 · b69ed98 · b69ed98
1 parent 870c075
commit b69ed98
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/presto-spi/src/main/java/io/prestosql/spi/predicate/Domain.java b/presto-spi/src/main/java/io/prestosql/spi/predicate/Domain.java
@@ -283,7 +283,7 @@ public Domain simplify()
 
     public Domain simplify(int threshold)
     {
-        ValueSet simplifiedValueSet = values.getValuesProcessor().<Optional<ValueSet>>transform(
+        Optional<ValueSet> simplifiedValueSet = values.getValuesProcessor().transform(
                 ranges -> {
                     if (ranges.getRangeCount() <= threshold) {
                         return Optional.empty();
@@ -296,9 +296,11 @@ public Domain simplify(int threshold)
                     }
                     return Optional.of(ValueSet.all(values.getType()));
                 },
-                allOrNone -> Optional.empty())
-                .orElse(values);
-        return Domain.create(simplifiedValueSet, nullAllowed);
+                allOrNone -> Optional.empty());
+        if (simplifiedValueSet.isEmpty()) {
+            return this;
+        }
+        return Domain.create(simplifiedValueSet.get(), nullAllowed);
     }
 
     @Override