diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/jobs/executor/Rewriter.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/jobs/executor/Rewriter.java index 8976e274893646..33d39dc56d56c0 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/nereids/jobs/executor/Rewriter.java +++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/jobs/executor/Rewriter.java @@ -32,7 +32,7 @@ import org.apache.doris.nereids.rules.expression.ExpressionNormalization; import org.apache.doris.nereids.rules.expression.ExpressionOptimization; import org.apache.doris.nereids.rules.expression.ExpressionRewrite; -import org.apache.doris.nereids.rules.expression.HighPriorityColumnCollector; +import org.apache.doris.nereids.rules.expression.QueryColumnCollector; import org.apache.doris.nereids.rules.rewrite.AddDefaultLimit; import org.apache.doris.nereids.rules.rewrite.AdjustConjunctsReturnType; import org.apache.doris.nereids.rules.rewrite.AdjustNullable; @@ -455,7 +455,7 @@ public class Rewriter extends AbstractBatchJobExecutor { new CollectProjectAboveConsumer() ) ), - topic("Collect used column", custom(RuleType.COLLECT_COLUMNS, HighPriorityColumnCollector::new)) + topic("Collect used column", custom(RuleType.COLLECT_COLUMNS, QueryColumnCollector::new)) ); private static final List WHOLE_TREE_REWRITE_JOBS diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/expression/HighPriorityColumnCollector.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/expression/QueryColumnCollector.java similarity index 89% rename from fe/fe-core/src/main/java/org/apache/doris/nereids/rules/expression/HighPriorityColumnCollector.java rename to fe/fe-core/src/main/java/org/apache/doris/nereids/rules/expression/QueryColumnCollector.java index e20363b12027a4..ebf361de1d3a9a 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/expression/HighPriorityColumnCollector.java +++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/rules/expression/QueryColumnCollector.java @@ -21,7 +21,7 @@ import org.apache.doris.catalog.Env; import org.apache.doris.catalog.TableIf; import org.apache.doris.nereids.jobs.JobContext; -import org.apache.doris.nereids.rules.expression.HighPriorityColumnCollector.CollectorContext; +import org.apache.doris.nereids.rules.expression.QueryColumnCollector.CollectorContext; import org.apache.doris.nereids.trees.expressions.NamedExpression; import org.apache.doris.nereids.trees.expressions.Slot; import org.apache.doris.nereids.trees.expressions.SlotReference; @@ -51,9 +51,9 @@ import java.util.stream.Collectors; /** - * Used to collect High priority column. + * Used to collect query column. */ -public class HighPriorityColumnCollector extends DefaultPlanRewriter implements CustomRewriter { +public class QueryColumnCollector extends DefaultPlanRewriter implements CustomRewriter { @Override public Plan rewriteRoot(Plan plan, JobContext jobContext) { @@ -64,10 +64,10 @@ public Plan rewriteRoot(Plan plan, JobContext jobContext) { CollectorContext context = new CollectorContext(); plan.accept(this, context); if (StatisticsUtil.enableAutoAnalyze()) { - context.queried.removeAll(context.usedInPredicate); + context.midPriority.removeAll(context.highPriority); AnalysisManager analysisManager = Env.getCurrentEnv().getAnalysisManager(); - analysisManager.updateColumnUsedInPredicate(context.usedInPredicate); - analysisManager.updateQueriedColumn(context.queried); + analysisManager.updateHighPriorityColumn(context.highPriority); + analysisManager.updateMidPriorityColumn(context.midPriority); } return plan; } @@ -78,9 +78,9 @@ public Plan rewriteRoot(Plan plan, JobContext jobContext) { public static class CollectorContext { public Map projects = new HashMap<>(); - public Set usedInPredicate = new HashSet<>(); + public Set highPriority = new HashSet<>(); - public Set queried = new HashSet<>(); + public Set midPriority = new HashSet<>(); } @Override @@ -103,7 +103,7 @@ public Plan visitLogicalProject(LogicalProject project, Collecto List outputOfScan = scan.getOutput(); for (Slot slot : outputOfScan) { if (!allUsed.contains(slot)) { - context.queried.remove(slot); + context.midPriority.remove(slot); } } } @@ -114,7 +114,7 @@ public Plan visitLogicalProject(LogicalProject project, Collecto public Plan visitLogicalJoin(LogicalJoin join, CollectorContext context) { join.child(0).accept(this, context); join.child(1).accept(this, context); - context.usedInPredicate.addAll( + context.highPriority.addAll( (join.isMarkJoin() ? join.getLeftConditionSlot() : join.getConditionSlot()) .stream().flatMap(s -> backtrace(s, context).stream()) .collect(Collectors.toSet()) @@ -125,7 +125,7 @@ public Plan visitLogicalJoin(LogicalJoin join, C @Override public Plan visitLogicalAggregate(LogicalAggregate aggregate, CollectorContext context) { aggregate.child(0).accept(this, context); - context.usedInPredicate.addAll(aggregate.getGroupByExpressions() + context.highPriority.addAll(aggregate.getGroupByExpressions() .stream() .flatMap(e -> e.>collect(n -> n instanceof SlotReference).stream()) .flatMap(s -> backtrace(s, context).stream()) @@ -136,7 +136,7 @@ public Plan visitLogicalAggregate(LogicalAggregate aggregate, Co @Override public Plan visitLogicalHaving(LogicalHaving having, CollectorContext context) { having.child(0).accept(this, context); - context.usedInPredicate.addAll( + context.highPriority.addAll( having.getExpressions().stream() .flatMap(e -> e.>collect(n -> n instanceof SlotReference).stream()) .flatMap(s -> backtrace(s, context).stream()) @@ -147,21 +147,21 @@ public Plan visitLogicalHaving(LogicalHaving having, CollectorCo @Override public Plan visitLogicalOlapScan(LogicalOlapScan olapScan, CollectorContext context) { List slots = olapScan.getOutput(); - context.queried.addAll(slots); + context.midPriority.addAll(slots); return olapScan; } @Override public Plan visitLogicalFileScan(LogicalFileScan fileScan, CollectorContext context) { List slots = fileScan.getOutput(); - context.queried.addAll(slots); + context.midPriority.addAll(slots); return fileScan; } @Override public Plan visitLogicalFilter(LogicalFilter filter, CollectorContext context) { filter.child(0).accept(this, context); - context.usedInPredicate.addAll(filter + context.highPriority.addAll(filter .getExpressions() .stream() .flatMap(e -> e.>collect(n -> n instanceof SlotReference).stream()) @@ -173,7 +173,7 @@ public Plan visitLogicalFilter(LogicalFilter filter, CollectorCo @Override public Plan visitLogicalWindow(LogicalWindow window, CollectorContext context) { window.child(0).accept(this, context); - context.usedInPredicate.addAll(window + context.highPriority.addAll(window .getWindowExpressions() .stream() .flatMap(e -> e.>collect(n -> n instanceof SlotReference).stream()) diff --git a/fe/fe-core/src/main/java/org/apache/doris/statistics/AnalysisManager.java b/fe/fe-core/src/main/java/org/apache/doris/statistics/AnalysisManager.java index 8a30aec9e60af8..d795b64fbaa101 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/statistics/AnalysisManager.java +++ b/fe/fe-core/src/main/java/org/apache/doris/statistics/AnalysisManager.java @@ -111,7 +111,7 @@ public class AnalysisManager implements Writable { private static final Logger LOG = LogManager.getLogger(AnalysisManager.class); - private static final int COLUMN_QUEUE_SIZE = 1000; + public static final int COLUMN_QUEUE_SIZE = 1000; public final Queue highPriorityColumns = new ArrayBlockingQueue<>(COLUMN_QUEUE_SIZE); public final Queue midPriorityColumns = new ArrayBlockingQueue<>(COLUMN_QUEUE_SIZE); public final Map> highPriorityJobs = new LinkedHashMap<>(); @@ -1152,11 +1152,11 @@ public boolean canSample(TableIf table) { } - public void updateColumnUsedInPredicate(Set slotReferences) { + public void updateHighPriorityColumn(Set slotReferences) { updateColumn(slotReferences, highPriorityColumns); } - public void updateQueriedColumn(Collection slotReferences) { + public void updateMidPriorityColumn(Collection slotReferences) { updateColumn(slotReferences, midPriorityColumns); }