database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[fix](Nereids) bound error when in diff value of table name case config (#25957)

Browse Source 
- when lower_case_table_names = 0, reference of table name should case sensitive
- when lower_case_table_names = 1 and 2 cte name should case insensitive
more details, please read doris doc: https://doris.apache.org/docs/advanced/variables#supported-variables
This commit is contained in:
morrySnow
2023-10-30 11:04:42 +08:00
committed by GitHub
parent d47a946aab
commit bb814ccff8
2 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
fe/fe-core/src/main/java/org/apache/doris/nereids/CTEContext.java
View File

@ -17,6 +17,7 @@
package org.apache.doris.nereids;
import org.apache.doris.common.Config;
import org.apache.doris.nereids.exceptions.AnalysisException;
import org.apache.doris.nereids.trees.expressions.CTEId;
import org.apache.doris.nereids.trees.plans.Plan;
@ -25,6 +26,7 @@ import org.apache.doris.nereids.trees.plans.logical.LogicalSubQueryAlias;
import com.google.common.collect.ImmutableMap;
import java.util.Locale;
import java.util.Map;
import java.util.Optional;
import javax.annotation.Nullable;
@ -54,7 +56,8 @@ public class CTEContext {
if ((parsedPlan == null && previousCteContext != null) || (parsedPlan != null && previousCteContext == null)) {
throw new AnalysisException("Only first CteContext can contains null cte plan or previousCteContext");
}
this.name = parsedPlan == null ? null : parsedPlan.getAlias();
this.name = parsedPlan == null ? null : Config.lower_case_table_names != 0
? parsedPlan.getAlias().toLowerCase(Locale.ROOT) : parsedPlan.getAlias();
this.cteContextMap = previousCteContext == null
? ImmutableMap.of()
: ImmutableMap.<String, CTEContext>builder()
@ -83,6 +86,9 @@ public class CTEContext {
* findCTEContext
*/
public Optional<CTEContext> findCTEContext(String cteName) {
if (Config.lower_case_table_names != 0) {
cteName = cteName.toLowerCase(Locale.ROOT);
}
if (cteName.equals(name)) {
return Optional.of(this);
}

15
fe/fe-core/src/main/java/org/apache/doris/nereids/rules/analysis/SlotBinder.java
View File

@ -19,6 +19,7 @@ package org.apache.doris.nereids.rules.analysis;
import org.apache.doris.analysis.SetType;
import org.apache.doris.cluster.ClusterNamespace;
import org.apache.doris.common.Config;
import org.apache.doris.common.DdlException;
import org.apache.doris.common.util.Util;
import org.apache.doris.nereids.CascadesContext;
@ -287,14 +288,14 @@ public class SlotBinder extends SubExprAnalyzer {
}
if (namePartsSize == 2) {
String qualifierTableName = boundSlot.getQualifier().get(qualifierSize - 1);
return qualifierTableName.equalsIgnoreCase(nameParts.get(0))
return sameTableName(qualifierTableName, nameParts.get(0))
&& boundSlot.getName().equalsIgnoreCase(nameParts.get(1));
}
if (nameParts.size() == 3) {
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))
&& sameTableName(qualifierTableName, nameParts.get(1))
&& boundSlot.getName().equalsIgnoreCase(nameParts.get(2));
}
// catalog.db.table.column
@ -304,7 +305,7 @@ public class SlotBinder extends SubExprAnalyzer {
String qualifierCatalogName = boundSlot.getQualifier().get(qualifierSize - 3);
return qualifierCatalogName.equalsIgnoreCase(nameParts.get(0))
&& compareDbNameIgnoreClusterName(nameParts.get(1), qualifierDbName)
&& qualifierTableName.equalsIgnoreCase(nameParts.get(2))
&& sameTableName(qualifierTableName, nameParts.get(2))
&& boundSlot.getName().equalsIgnoreCase(nameParts.get(3));
}
//TODO: handle name parts more than three.
@ -312,4 +313,12 @@ public class SlotBinder extends SubExprAnalyzer {
+ StringUtils.join(nameParts, "."));
}).collect(Collectors.toList());
}
private boolean sameTableName(String boundSlot, String unboundSlot) {
if (Config.lower_case_table_names != 1) {
return boundSlot.equals(unboundSlot);
} else {
return boundSlot.equalsIgnoreCase(unboundSlot);
}
}
}