This is an automated email from the ASF dual-hosted git repository.
huajianlan pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.1 by this push:
new ee65195ba5b [enhancement](nereids) Speedup partition pruner (#38191)
(#38405)
ee65195ba5b is described below
commit ee65195ba5b743e955ca76bf926d049073a6975c
Author: 924060929 <924060...@qq.com>
AuthorDate: Fri Jul 26 15:19:32 2024 +0800
[enhancement](nereids) Speedup partition pruner (#38191) (#38405)
1. fast return when partition predicate is true/false/null
2. fast compute table's hash code
3. fast merge two ranges when equals
---
fe/fe-core/src/main/java/org/apache/doris/analysis/Expr.java | 10 ++++++----
.../src/main/java/org/apache/doris/catalog/OlapTable.java | 4 +---
.../src/main/java/org/apache/doris/common/TreeNode.java | 2 +-
.../rules/expression/rules/OneRangePartitionEvaluator.java | 4 ++++
.../nereids/rules/expression/rules/PartitionPruner.java | 12 +++++++++---
.../nereids/trees/expressions/literal/DateV2Literal.java | 11 ++++++++---
.../src/main/java/org/apache/doris/qe/ConnectContext.java | 3 ++-
.../src/main/java/org/apache/doris/qe/SessionVariable.java | 11 ++++++-----
8 files changed, 37 insertions(+), 20 deletions(-)
diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/Expr.java
b/fe/fe-core/src/main/java/org/apache/doris/analysis/Expr.java
index 37fe0fb0128..4bba9eef74d 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/analysis/Expr.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/Expr.java
@@ -55,6 +55,7 @@ import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
+import com.google.common.base.Suppliers;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import org.apache.commons.collections.CollectionUtils;
@@ -71,6 +72,7 @@ import java.util.ListIterator;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
+import java.util.function.Supplier;
import java.util.stream.Collectors;
/**
@@ -272,7 +274,7 @@ public abstract class Expr extends TreeNode<Expr>
implements ParseNode, Cloneabl
protected Function fn;
// Cached value of IsConstant(), set during analyze() and valid if
isAnalyzed_ is true.
- private boolean isConstant;
+ private Supplier<Boolean> isConstant = Suppliers.memoize(() -> false);
// Flag to indicate whether to wrap this expr's toSql() in parenthesis.
Set by parser.
// Needed for properly capturing expr precedences in the SQL string.
@@ -455,7 +457,7 @@ public abstract class Expr extends TreeNode<Expr>
implements ParseNode, Cloneabl
Preconditions.checkState(!isAnalyzed);
// We need to compute the const-ness as the last step, since analysis
may change
// the result, e.g. by resolving function.
- isConstant = isConstantImpl();
+ isConstant = Suppliers.memoize(this::isConstantImpl);
isAnalyzed = true;
}
@@ -1348,7 +1350,7 @@ public abstract class Expr extends TreeNode<Expr>
implements ParseNode, Cloneabl
*/
public final boolean isConstant() {
if (isAnalyzed) {
- return isConstant;
+ return isConstant.get();
}
return isConstantImpl();
}
@@ -2567,7 +2569,7 @@ public abstract class Expr extends TreeNode<Expr>
implements ParseNode, Cloneabl
// In this case, agg output must be materialized whether
outer query block required or not.
if (f.getFunctionName().getFunction().equals("count")) {
for (Expr expr : funcExpr.children) {
- if (expr.isConstant && !(expr instanceof
LiteralExpr)) {
+ if (expr.isConstant() && !(expr instanceof
LiteralExpr)) {
return true;
}
}
diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/OlapTable.java
b/fe/fe-core/src/main/java/org/apache/doris/catalog/OlapTable.java
index 8a4a9fee95f..9a66cbc68ae 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/catalog/OlapTable.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/OlapTable.java
@@ -1935,9 +1935,7 @@ public class OlapTable extends Table implements
MTMVRelatedTableIf {
@Override
public int hashCode() {
- return Objects.hash(state, indexIdToMeta, indexNameToId, keysType,
partitionInfo, idToPartition,
- nameToPartition, defaultDistributionInfo, tempPartitions,
bfColumns, bfFpp, colocateGroup,
- hasSequenceCol, sequenceType, indexes, baseIndexId,
tableProperty);
+ return (int) baseIndexId;
}
public Column getBaseColumn(String columnName) {
diff --git a/fe/fe-core/src/main/java/org/apache/doris/common/TreeNode.java
b/fe/fe-core/src/main/java/org/apache/doris/common/TreeNode.java
index 855a7788c97..e0651644e59 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/common/TreeNode.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/common/TreeNode.java
@@ -31,7 +31,7 @@ import java.util.List;
* Generic tree structure. Only concrete subclasses of this can be
instantiated.
*/
public class TreeNode<NodeType extends TreeNode<NodeType>> {
- protected ArrayList<NodeType> children = Lists.newArrayList();
+ protected ArrayList<NodeType> children = Lists.newArrayListWithCapacity(2);
public NodeType getChild(int i) {
return hasChild(i) ? children.get(i) : null;
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/expression/rules/OneRangePartitionEvaluator.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/expression/rules/OneRangePartitionEvaluator.java
index 4b7b940c9f6..8b01d2b8c67 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/expression/rules/OneRangePartitionEvaluator.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/expression/rules/OneRangePartitionEvaluator.java
@@ -571,6 +571,10 @@ public class OneRangePartitionEvaluator
Map<Slot, ColumnRange> leftRanges = left.columnRanges;
Map<Slot, ColumnRange> rightRanges = right.columnRanges;
+ if (leftRanges.equals(rightRanges)) {
+ return new EvaluateRangeResult(originResult, leftRanges,
ImmutableList.of(left, right));
+ }
+
Set<Slot> slots = ImmutableSet.<Slot>builder()
.addAll(leftRanges.keySet())
.addAll(rightRanges.keySet())
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/expression/rules/PartitionPruner.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/expression/rules/PartitionPruner.java
index b65c0d2ec55..b0b45077dcc 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/expression/rules/PartitionPruner.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/expression/rules/PartitionPruner.java
@@ -33,6 +33,7 @@ import
org.apache.doris.nereids.trees.expressions.literal.DateTimeLiteral;
import org.apache.doris.nereids.trees.expressions.literal.NullLiteral;
import
org.apache.doris.nereids.trees.expressions.visitor.DefaultExpressionRewriter;
import org.apache.doris.nereids.types.DateTimeType;
+import org.apache.doris.nereids.util.Utils;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableList.Builder;
@@ -125,14 +126,19 @@ public class PartitionPruner extends
DefaultExpressionRewriter<Void> {
"partitionPruningExpandThreshold",
10, sessionVariable ->
sessionVariable.partitionPruningExpandThreshold);
+ partitionPredicate = OrToIn.INSTANCE.rewriteTree(
+ partitionPredicate, new
ExpressionRewriteContext(cascadesContext));
+ if (BooleanLiteral.TRUE.equals(partitionPredicate)) {
+ return Utils.fastToImmutableList(idToPartitions.keySet());
+ } else if (Boolean.FALSE.equals(partitionPredicate) ||
partitionPredicate.isNullLiteral()) {
+ return ImmutableList.of();
+ }
+
List<OnePartitionEvaluator> evaluators =
Lists.newArrayListWithCapacity(idToPartitions.size());
for (Entry<Long, PartitionItem> kv : idToPartitions.entrySet()) {
evaluators.add(toPartitionEvaluator(
kv.getKey(), kv.getValue(), partitionSlots,
cascadesContext, expandThreshold));
}
-
- partitionPredicate = OrToIn.INSTANCE.rewriteTree(
- partitionPredicate, new
ExpressionRewriteContext(cascadesContext));
PartitionPruner partitionPruner = new PartitionPruner(evaluators,
partitionPredicate);
//TODO: we keep default partition because it's too hard to prune it,
we return false in canPrune().
return partitionPruner.prune();
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/literal/DateV2Literal.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/literal/DateV2Literal.java
index d51a0eccc82..1534d551850 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/literal/DateV2Literal.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/literal/DateV2Literal.java
@@ -17,7 +17,6 @@
package org.apache.doris.nereids.trees.expressions.literal;
-import org.apache.doris.analysis.LiteralExpr;
import org.apache.doris.catalog.Type;
import org.apache.doris.nereids.exceptions.AnalysisException;
import org.apache.doris.nereids.trees.expressions.Expression;
@@ -25,12 +24,18 @@ import
org.apache.doris.nereids.trees.expressions.visitor.ExpressionVisitor;
import org.apache.doris.nereids.types.DateTimeV2Type;
import org.apache.doris.nereids.types.DateV2Type;
+import com.google.common.base.Suppliers;
+
import java.time.LocalDateTime;
+import java.util.function.Supplier;
/**
* date v2 literal for nereids
*/
public class DateV2Literal extends DateLiteral {
+ private final Supplier<org.apache.doris.analysis.DateLiteral>
legacyLiteral = Suppliers.memoize(() ->
+ new org.apache.doris.analysis.DateLiteral(year, month, day,
Type.DATEV2)
+ );
public DateV2Literal(String s) throws AnalysisException {
super(DateV2Type.INSTANCE, s);
@@ -41,8 +46,8 @@ public class DateV2Literal extends DateLiteral {
}
@Override
- public LiteralExpr toLegacyLiteral() {
- return new org.apache.doris.analysis.DateLiteral(year, month, day,
Type.DATEV2);
+ public org.apache.doris.analysis.DateLiteral toLegacyLiteral() {
+ return legacyLiteral.get();
}
@Override
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectContext.java
b/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectContext.java
index aa837eced3e..d9ce2a0a5ae 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectContext.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectContext.java
@@ -70,6 +70,7 @@ import com.google.common.base.Strings;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
+import io.netty.util.concurrent.FastThreadLocal;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.json.JSONObject;
@@ -90,7 +91,7 @@ import javax.annotation.Nullable;
// Use `volatile` to make the reference change atomic.
public class ConnectContext {
private static final Logger LOG =
LogManager.getLogger(ConnectContext.class);
- protected static ThreadLocal<ConnectContext> threadLocalInfo = new
ThreadLocal<>();
+ protected static FastThreadLocal<ConnectContext> threadLocalInfo = new
FastThreadLocal<>();
private static final String SSL_PROTOCOL = "TLS";
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/SessionVariable.java
b/fe/fe-core/src/main/java/org/apache/doris/qe/SessionVariable.java
index 1ab8deb36ec..606259c21c4 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/SessionVariable.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/SessionVariable.java
@@ -3048,20 +3048,21 @@ public class SessionVariable implements Serializable,
Writable {
public Set<String> getDisableNereidsRuleNames() {
String checkPrivilege = RuleType.CHECK_PRIVILEGES.name();
String checkRowPolicy = RuleType.CHECK_ROW_POLICY.name();
- return Arrays.stream(disableNereidsRules.split(",[\\s]*"))
- .map(rule -> rule.toUpperCase(Locale.ROOT))
- .filter(rule -> !StringUtils.equalsIgnoreCase(rule,
checkPrivilege)
+ return Arrays.stream(disableNereidsRules.split(","))
+ .map(rule -> rule.trim().toUpperCase(Locale.ROOT))
+ .filter(rule -> !rule.isEmpty()
+ && !StringUtils.equalsIgnoreCase(rule, checkPrivilege)
&& !StringUtils.equalsIgnoreCase(rule, checkRowPolicy))
.collect(ImmutableSet.toImmutableSet());
}
public BitSet getDisableNereidsRules() {
BitSet bitSet = new BitSet();
- for (String ruleName : disableNereidsRules.split(",[\\s]*")) {
+ for (String ruleName : disableNereidsRules.split(",")) {
+ ruleName = ruleName.trim().toUpperCase(Locale.ROOT);
if (ruleName.isEmpty()) {
continue;
}
- ruleName = ruleName.toUpperCase(Locale.ROOT);
RuleType ruleType = RuleType.valueOf(ruleName);
if (ruleType == RuleType.CHECK_PRIVILEGES || ruleType ==
RuleType.CHECK_ROW_POLICY) {
continue;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
