[BugFix] Fix partition prune for str2date materialized views with in …

…predicate (#35001) Signed-off-by: shuming.li <ming.moriarty@gmail.com>
StarRocks · Nov 15, 2023 · 77fb6ae · 77fb6ae
1 parent 24da46d
commit 77fb6ae
Show file tree

Hide file tree

Showing 5 changed files with 353 additions and 15 deletions.
diff --git a/fe/fe-core/src/main/java/com/starrocks/connector/PartitionUtil.java b/fe/fe-core/src/main/java/com/starrocks/connector/PartitionUtil.java
@@ -567,13 +567,11 @@ public static boolean isConvertToDate(Column partitionColumn, PartitionColumnFil
         if (partitionColumnFilter == null || partitionColumn == null) {
             return false;
         }
-        LiteralExpr lowerBound = partitionColumnFilter.getLowerBound();
-        LiteralExpr upperBound = partitionColumnFilter.getUpperBound();
-        LiteralExpr literalExpr = (lowerBound == null) ? upperBound : lowerBound;
-        if (literalExpr == null) {
+        Type filterType = partitionColumnFilter.getFilterType();
+        if (filterType == null) {
             return false;
         }
-        return isConvertToDate(partitionColumn.getType(), literalExpr.getType());
+        return isConvertToDate(partitionColumn.getType(), filterType);
     }
 
     /**

diff --git a/fe/fe-core/src/main/java/com/starrocks/planner/PartitionColumnFilter.java b/fe/fe-core/src/main/java/com/starrocks/planner/PartitionColumnFilter.java
@@ -39,12 +39,13 @@
 import com.google.common.collect.Range;
 import com.starrocks.analysis.InPredicate;
 import com.starrocks.analysis.LiteralExpr;
-import com.starrocks.connector.PartitionUtil;
-import com.starrocks.sql.analyzer.SemanticException;
-import com.starrocks.sql.ast.PartitionValue;
 import com.starrocks.catalog.Column;
 import com.starrocks.catalog.PartitionKey;
+import com.starrocks.catalog.Type;
 import com.starrocks.common.AnalysisException;
+import com.starrocks.connector.PartitionUtil;
+import com.starrocks.sql.analyzer.SemanticException;
+import com.starrocks.sql.ast.PartitionValue;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -169,6 +170,22 @@ public Range<PartitionKey> getRange(List<Column> columns) {
         return null;
     }
 
+    public Type getFilterType() {
+        if (lowerBound != null) {
+            return lowerBound.getType();
+        }
+        if (upperBound != null) {
+            return upperBound.getType();
+        }
+        if (inPredicate != null) {
+            return inPredicate.getChild(0).getType();
+        }
+        if (inPredicateLiterals != null && !inPredicateLiterals.isEmpty()) {
+            return inPredicateLiterals.get(0).getType();
+        }
+        return null;
+    }
+
     @Override
     public String toString() {
         String str = "";
@@ -189,6 +206,11 @@ public String toString() {
         } else {
             str += "\ninPredicate is " + inPredicate;
         }
+        if (null == inPredicateLiterals || inPredicateLiterals.isEmpty()) {
+            str += "\ninPredicateLiterals is UNSET";
+        } else {
+            str += "\ninPredicateLiterals is " + inPredicateLiterals;
+        }
         return str;
     }
 }
diff --git a/fe/fe-core/src/main/java/com/starrocks/planner/RangePartitionPruner.java b/fe/fe-core/src/main/java/com/starrocks/planner/RangePartitionPruner.java
@@ -34,6 +34,7 @@
 
 package com.starrocks.planner;
 
+import com.google.common.base.Preconditions;
 import com.google.common.collect.BoundType;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Range;
@@ -113,9 +114,10 @@ private List<Long> prune(RangeMap<PartitionKey, Long> rangeMap,
         }
 
         boolean isConvertToDate = PartitionUtil.isConvertToDate(keyColumn, filter);
-        if (null == inPredicateLiterals || inPredicateLiterals.size() * complex > inPredicateMaxLen) {
-            LiteralExpr lowerBound = filter.getLowerBound();
-            LiteralExpr upperBound = filter.getUpperBound();
+        LiteralExpr lowerBound = filter.getLowerBound();
+        LiteralExpr upperBound = filter.getUpperBound();
+        if (null == inPredicateLiterals || ((lowerBound != null || upperBound != null) &&
+                inPredicateLiterals.size() * complex > inPredicateMaxLen)) {
             if (filter.lowerBoundInclusive && filter.upperBoundInclusive
                     && lowerBound != null && upperBound != null
                     && 0 == lowerBound.compareLiteral(upperBound)) {
@@ -195,8 +197,16 @@ private List<Long> prune(RangeMap<PartitionKey, Long> rangeMap,
         Set<Long> resultSet = Sets.newHashSet();
         int newComplex = inPredicateLiterals.size() * complex;
         for (LiteralExpr expr : inPredicateLiterals) {
-            minKey.pushColumn(expr, keyColumn.getPrimitiveType());
-            maxKey.pushColumn(expr, keyColumn.getPrimitiveType());
+            if (isConvertToDate) {
+                LiteralExpr convertExpr = PartitionUtil.convertToDateLiteral(expr);
+                Preconditions.checkState(convertExpr.getType().equals(keyColumn.getType()));
+                minKey.pushColumn(convertExpr, keyColumn.getPrimitiveType());
+                maxKey.pushColumn(convertExpr, keyColumn.getPrimitiveType());
+            } else {
+                Preconditions.checkState(expr.getType().equals(keyColumn.getType()));
+                minKey.pushColumn(expr, keyColumn.getPrimitiveType());
+                maxKey.pushColumn(expr, keyColumn.getPrimitiveType());
+            }
             Collection<Long> subList = prune(rangeMap, columnIdx + 1, minKey, maxKey, newComplex);
             resultSet.addAll(subList);
             minKey.popColumn();

diff --git a/fe/fe-core/src/main/java/com/starrocks/sql/optimizer/rewrite/OptOlapPartitionPruner.java b/fe/fe-core/src/main/java/com/starrocks/sql/optimizer/rewrite/OptOlapPartitionPruner.java
@@ -179,7 +179,6 @@ private static Pair<ScalarOperator, List<ScalarOperator>> prunePartitionPredicat
             if (null != lowerBound) {
                 lowerBind = false;
                 PartitionKey min = new PartitionKey();
-                // TODO: take care `isConvertToDate` for olap table
                 min.pushColumn(pcf.getLowerBound(), column.getPrimitiveType());
                 int cmp = minRange.compareTo(min);
                 if (cmp > 0 || (0 == cmp && pcf.lowerBoundInclusive)) {
@@ -190,7 +189,6 @@ private static Pair<ScalarOperator, List<ScalarOperator>> prunePartitionPredicat
             if (null != upperBound) {
                 upperBind = false;
                 PartitionKey max = new PartitionKey();
-                // TODO: take care `isConvertToDate` for olap table
                 max.pushColumn(upperBound, column.getPrimitiveType());
                 int cmp = maxRange.compareTo(max);
                 if (cmp < 0 || (0 == cmp && pcf.upperBoundInclusive)) {