Skip to content

[Bug] Fix hard cardinality check which makes queries fail #4678

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
morningman merged 2 commits into from
Oct 13, 2020
Merged

[Bug] Fix hard cardinality check which makes queries fail #4678

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f3984f
fix hard cardinality check which makes the queries fail
Sep 27, 2020
821b5a6
Update fe/fe-core/src/main/java/org/apache/doris/planner/SelectNode.java
ccoffline Oct 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions fe/fe-core/src/main/java/org/apache/doris/planner/OlapRewriteNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

package org.apache.doris.planner;

import com.google.common.collect.Lists;
import org.apache.doris.analysis.Analyzer;
import org.apache.doris.analysis.Expr;
import org.apache.doris.analysis.ExprSubstitutionMap;
Expand All @@ -29,10 +30,6 @@
import org.apache.doris.thrift.TOlapRewriteNode;
import org.apache.doris.thrift.TPlanNode;
import org.apache.doris.thrift.TPlanNodeType;

import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;

import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

Expand Down Expand Up @@ -104,11 +101,12 @@ protected void toThrift(TPlanNode msg) {
@Override
public void computeStats(Analyzer analyzer) {
super.computeStats(analyzer);
if (getChild(0).cardinality == -1) {
cardinality = -1;
long cardinality = getChild(0).cardinality;
double selectivity = computeSelectivity();
if (cardinality < 0 || selectivity < 0) {
this.cardinality = -1;
} else {
cardinality = Math.round(((double) getChild(0).cardinality) * computeSelectivity());
Preconditions.checkState(cardinality >= 0);
this.cardinality = Math.round(cardinality * selectivity);
}
}

Expand Down
3 changes: 3 additions & 0 deletions fe/fe-core/src/main/java/org/apache/doris/planner/PlanNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,6 +428,9 @@ protected void computeStats(Analyzer analyzer) {
protected double computeSelectivity() {
double prod = 1.0;
for (Expr e : conjuncts) {
if (e.getSelectivity() < 0) {
return -1.0;
}
prod *= e.getSelectivity();
}
return prod;
Expand Down
12 changes: 6 additions & 6 deletions fe/fe-core/src/main/java/org/apache/doris/planner/SelectNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
import org.apache.doris.thrift.TExplainLevel;
import org.apache.doris.thrift.TPlanNode;
import org.apache.doris.thrift.TPlanNodeType;
import com.google.common.base.Preconditions;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import java.util.List;
Expand Down Expand Up @@ -63,13 +62,14 @@ public void init(Analyzer analyzer) throws UserException {
@Override
public void computeStats(Analyzer analyzer) {
super.computeStats(analyzer);
if (getChild(0).cardinality == -1) {
cardinality = -1;
long cardinality = getChild(0).cardinality;
double selectivity = computeSelectivity();
if (cardinality < 0 || selectivity < 0) {
this.cardinality = -1;
} else {
cardinality = Math.round(((double) getChild(0).cardinality) * computeSelectivity());
Preconditions.checkState(cardinality >= 0);
this.cardinality = Math.round(cardinality * selectivity);
}
LOG.info("stats Select: cardinality=" + Long.toString(cardinality));
LOG.debug("stats Select: cardinality={}", this.cardinality);
}

@Override
Expand Down