Skip to content

[Bug] Fix bug of outer join cause error result #5285

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 1 commit into from
Jan 24, 2021
Merged

[Bug] Fix bug of outer join cause error result #5285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 30 additions & 0 deletions fe/fe-core/src/main/java/org/apache/doris/planner/HashJoinNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import org.apache.doris.analysis.SlotId;
import org.apache.doris.analysis.SlotRef;
import org.apache.doris.analysis.TableRef;
import org.apache.doris.analysis.TupleId;
import org.apache.doris.catalog.ColumnStats;
import org.apache.doris.common.UserException;
import org.apache.doris.thrift.TEqJoinCondition;
Expand All @@ -41,6 +42,7 @@
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;

Expand Down Expand Up @@ -139,6 +141,10 @@ public void init(Analyzer analyzer) throws UserException {
// Set smap to the combined children's smaps and apply that to all conjuncts_.
createDefaultSmap(analyzer);

// outSmap replace in outer join may cause NULL be replace by literal
// so need replace the outsmap in nullableTupleID
replaceOutputSmapForOuterJoin();

computeStats(analyzer);
//assignedConjuncts = analyzr.getAssignedConjuncts();

Expand All @@ -151,6 +157,30 @@ public void init(Analyzer analyzer) throws UserException {
Expr.substituteList(otherJoinConjuncts, combinedChildSmap, analyzer, false);
}

private void replaceOutputSmapForOuterJoin() {
if (joinOp.isOuterJoin()) {
List<Expr> lhs = new ArrayList<>();
List<Expr> rhs = new ArrayList<>();

for (int i = 0; i < outputSmap.size(); i++) {
Expr expr = outputSmap.getLhs().get(i);
boolean isInNullableTuple = false;
for (TupleId tupleId : nullableTupleIds) {
if (expr.isBound(tupleId)) {
isInNullableTuple = true;
break;
}
}

if (!isInNullableTuple) {
lhs.add(outputSmap.getLhs().get(i));
rhs.add(outputSmap.getRhs().get(i));
}
}
outputSmap = new ExprSubstitutionMap(lhs, rhs);
}
}

@Override
public void computeStats(Analyzer analyzer) {
super.computeStats(analyzer);
Expand Down
21 changes: 21 additions & 0 deletions fe/fe-core/src/test/java/org/apache/doris/planner/QueryPlanTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1400,6 +1400,27 @@ public void testIntDateTime() throws Exception {
explainString = UtFrameUtils.getSQLPlanOrErrorMsg(connectContext, "EXPLAIN " + sql);
Assert.assertTrue(explainString.contains("PREDICATES: `date` IN ('2020-10-30 00:00:00')"));
}

@Test
public void testOutJoinSmapReplace() throws Exception {
connectContext.setDatabase("default_cluster:test");
//valid date
String sql = "SELECT a.aid, b.bid FROM (SELECT 3 AS aid) a right outer JOIN (SELECT 4 AS bid) b ON (a.aid=b.bid)";
String explainString = UtFrameUtils.getSQLPlanOrErrorMsg(connectContext, "EXPLAIN " + sql);
Assert.assertTrue(explainString.contains("OUTPUT EXPRS:`a`.`aid` | 4"));

sql = "SELECT a.aid, b.bid FROM (SELECT 3 AS aid) a left outer JOIN (SELECT 4 AS bid) b ON (a.aid=b.bid)";
explainString = UtFrameUtils.getSQLPlanOrErrorMsg(connectContext, "EXPLAIN " + sql);
Assert.assertTrue(explainString.contains("OUTPUT EXPRS:3 | `b`.`bid`"));

sql = "SELECT a.aid, b.bid FROM (SELECT 3 AS aid) a full outer JOIN (SELECT 4 AS bid) b ON (a.aid=b.bid)";
explainString = UtFrameUtils.getSQLPlanOrErrorMsg(connectContext, "EXPLAIN " + sql);
Assert.assertTrue(explainString.contains("OUTPUT EXPRS:`a`.`aid` | `b`.`bid`"));

sql = "SELECT a.aid, b.bid FROM (SELECT 3 AS aid) a JOIN (SELECT 4 AS bid) b ON (a.aid=b.bid)";
explainString = UtFrameUtils.getSQLPlanOrErrorMsg(connectContext, "EXPLAIN " + sql);
Assert.assertTrue(explainString.contains("OUTPUT EXPRS:3 | 4"));
}
}