Skip to content

Commit

Permalink
[fix](nereids)bind slot failed because of "default_cluster" #23008
Browse files Browse the repository at this point in the history 
slot bind failed for following querys:
select tpch.lineitem.* from lineitem
select tpch.lineitem.l_partkey from lineitem

the unbound slot is tpch.lineitem.l_partkey, but the bounded slot is default_cluster:tpch.lineitem.l_partkey. They are not matched.
we need to ignore default_cluster: when compare dbName
  • Loading branch information
@englefly
englefly authored Aug 16, 2023
1 parent 92f443b commit f1880d3
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 14 deletions.
27 changes: 20 additions & 7 deletions fe/fe-core/src/main/java/org/apache/doris/nereids/rules/analysis/SlotBinder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

package org.apache.doris.nereids.rules.analysis;

import org.apache.doris.cluster.ClusterNamespace;
import org.apache.doris.common.util.Util;
import org.apache.doris.nereids.CascadesContext;
import org.apache.doris.nereids.analyzer.Scope;
Expand Down Expand Up @@ -178,7 +179,7 @@ private BoundStar bindQualifiedStar(List<String> qualifierStar, List<Slot> bound
case 1: // bound slot is `table`.`column`
return false;
case 2:// bound slot is `db`.`table`.`column`
return qualifierStar.get(0).equalsIgnoreCase(boundSlotQualifier.get(0))
return compareDbNameIgnoreClusterName(qualifierStar.get(0), boundSlotQualifier.get(0))
&& qualifierStar.get(1).equalsIgnoreCase(boundSlotQualifier.get(1));
default:
throw new AnalysisException("Not supported qualifier: "
Expand All @@ -193,6 +194,18 @@ private BoundStar bindQualifiedStar(List<String> qualifierStar, List<Slot> bound
return new BoundStar(slots);
}

private boolean compareDbNameIgnoreClusterName(String unBoundDbName, String boundedDbName) {
if (unBoundDbName.equalsIgnoreCase(boundedDbName)) {
return true;
}
// boundedDbName example
int idx = boundedDbName.indexOf(ClusterNamespace.CLUSTER_DELIMITER);
if (idx > -1) {
return unBoundDbName.equalsIgnoreCase(boundedDbName.substring(idx + 1));
}
return false;
}

private List<Slot> bindSlot(UnboundSlot unboundSlot, List<Slot> boundSlots) {
return boundSlots.stream().distinct().filter(boundSlot -> {
List<String> nameParts = unboundSlot.getNameParts();
Expand All @@ -205,14 +218,14 @@ private List<Slot> bindSlot(UnboundSlot unboundSlot, List<Slot> boundSlots) {
return nameParts.get(0).equalsIgnoreCase(boundSlot.getName());
}
if (namePartsSize == 2) {
String qualifierDbName = boundSlot.getQualifier().get(qualifierSize - 1);
return qualifierDbName.equalsIgnoreCase(nameParts.get(0))
String qualifierTableName = boundSlot.getQualifier().get(qualifierSize - 1);
return qualifierTableName.equalsIgnoreCase(nameParts.get(0))
&& boundSlot.getName().equalsIgnoreCase(nameParts.get(1));
} else if (nameParts.size() == 3) {
String qualifierDbName = boundSlot.getQualifier().get(qualifierSize - 1);
String qualifierClusterName = boundSlot.getQualifier().get(qualifierSize - 2);
return qualifierClusterName.equalsIgnoreCase(nameParts.get(0))
&& qualifierDbName.equalsIgnoreCase(nameParts.get(1))
String qualifierTableName = boundSlot.getQualifier().get(qualifierSize - 1);
String qualifierDbName = boundSlot.getQualifier().get(qualifierSize - 2);
return compareDbNameIgnoreClusterName(nameParts.get(0), qualifierDbName)
&& qualifierTableName.equalsIgnoreCase(nameParts.get(1))
&& boundSlot.getName().equalsIgnoreCase(nameParts.get(2));
}
//TODO: handle name parts more than three.
Expand Down
2 changes: 1 addition & 1 deletion ...e/src/main/java/org/apache/doris/nereids/trees/expressions/functions/ExpressionTrait.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ default DataType getArgumentType(int index) {
}

default DataType getDataType() throws UnboundException {
throw new UnboundException("dataType");
throw new UnboundException(toSql() + ".getDataType()");
}

default String toSql() throws UnboundException {
Expand Down
3 changes: 3 additions & 0 deletions ...ore/src/main/java/org/apache/doris/nereids/trees/expressions/functions/scalar/Random.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import org.apache.doris.nereids.trees.expressions.Expression;
import org.apache.doris.nereids.trees.expressions.functions.ExplicitlyCastableSignature;
import org.apache.doris.nereids.trees.expressions.functions.Nondeterministic;
import org.apache.doris.nereids.trees.expressions.literal.Literal;
import org.apache.doris.nereids.trees.expressions.visitor.ExpressionVisitor;
import org.apache.doris.nereids.types.BigIntType;
import org.apache.doris.nereids.types.DoubleType;
Expand Down Expand Up @@ -53,6 +54,8 @@ public Random() {
*/
public Random(Expression arg) {
super("random", arg);
// align with original planner behavior, refer to: org/apache/doris/analysis/Expr.getBuiltinFunction()
Preconditions.checkState(arg instanceof Literal, "The param of rand function must be literal");
}

/**
Expand Down
8 changes: 3 additions & 5 deletions fe/fe-core/src/test/java/org/apache/doris/analysis/SelectStmtTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -508,14 +508,12 @@ public void testImplicitConvertSupport() throws Exception {

@Test
public void testDeleteSign() throws Exception {
String sql1 = "SELECT * FROM db1.table1 LEFT ANTI JOIN db1.table2 ON db1.table1.siteid = db1.table2.siteid;";
String sql1 = "SELECT /*+ SET_VAR(enable_nereids_planner=true, ENABLE_FALLBACK_TO_ORIGINAL_PLANNER=false) */ * FROM db1.table1 LEFT ANTI JOIN db1.table2 ON db1.table1.siteid = db1.table2.siteid;";
String explain = dorisAssert.query(sql1).explainQuery();
Assert.assertTrue(explain
.contains("PREDICATES: `default_cluster:db1`.`table1`.`__DORIS_DELETE_SIGN__` = 0"));
Assert.assertTrue(explain
.contains("PREDICATES: `default_cluster:db1`.`table2`.`__DORIS_DELETE_SIGN__` = 0"));
.contains("PREDICATES: __DORIS_DELETE_SIGN__ = 0"));
Assert.assertFalse(explain.contains("other predicates:"));
String sql2 = "SELECT * FROM db1.table1 JOIN db1.table2 ON db1.table1.siteid = db1.table2.siteid;";
String sql2 = "SELECT /*+ SET_VAR(enable_nereids_planner=false) */ * FROM db1.table1 JOIN db1.table2 ON db1.table1.siteid = db1.table2.siteid;";
explain = dorisAssert.query(sql2).explainQuery();
Assert.assertTrue(explain
.contains("PREDICATES: `default_cluster:db1`.`table1`.`__DORIS_DELETE_SIGN__` = 0"));
Expand Down
2 changes: 1 addition & 1 deletion regression-test/suites/nereids_p0/except/test_bound_exception.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,6 @@ suite("test_bound_exception") {
}
test {
sql "SELECT id FROM ${tbName} WHERE id123 = 123 ORDER BY id"
exception "errCode = 2, detailMessage = Unexpected exception: Invalid call to dataType on unbound object"
exception "errCode = 2, detailMessage = Unexpected exception: Invalid call to id123.getDataType() on unbound object"
}
}

0 comments on commit f1880d3

Please sign in to comment.