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

[fix](planner)should save original select list item before analyze (#28187)

Browse Source 
* [fix](planner)should save original select list item before analyze

* fix test case

* fix failed case
This commit is contained in:
starocean999
2023-12-25 23:06:45 +08:00
committed by GitHub
parent 2411dbe0e6
commit 17f3ca7349
4 changed files with 53 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
fe/fe-core/src/main/java/org/apache/doris/analysis/SelectStmt.java
View File

@ -561,8 +561,14 @@ public class SelectStmt extends QueryStmt {
// remove excepted columns
resultExprs.removeIf(expr -> exceptCols.contains(expr.toColumnLabel()));
colLabels.removeIf(exceptCols::contains);
if (needToSql) {
originalExpr = Expr.cloneList(resultExprs);
}
} else {
if (needToSql) {
originalExpr = new ArrayList<>();
}
List<SelectListItem> items = selectList.getItems();
for (int i = 0; i < items.size(); i++) {
SelectListItem item = items.get(i);
@ -574,6 +580,11 @@ public class SelectStmt extends QueryStmt {
expandStar(analyzer, tblName);
}
} else {
// save originalExpr before being analyzed
// because analyze may change the expr by adding cast or some other stuff
if (needToSql) {
originalExpr.add(item.getExpr().clone());
}
// Analyze the resultExpr before generating a label to ensure enforcement
// of expr child and depth limits (toColumn() label may call toSql()).
item.getExpr().analyze(analyzer);
@ -647,10 +658,6 @@ public class SelectStmt extends QueryStmt {
subColPath.add(expr.toSubColumnLabel());
}
}
// analyze valueList if exists
if (needToSql) {
originalExpr = Expr.cloneList(resultExprs);
}
// analyze selectListExprs
Expr.analyze(resultExprs, analyzer);
@ -1252,6 +1259,9 @@ public class SelectStmt extends QueryStmt {
slot.setTable(desc.getTable());
slot.setTupleId(desc.getId());
resultExprs.add(rewriteQueryExprByMvColumnExpr(slot, analyzer));
if (needToSql) {
originalExpr.add(slot);
}
colLabels.add(col.getName());
// empty sub lables
subColPath.add(Lists.newArrayList());
@ -2601,6 +2611,9 @@ public class SelectStmt extends QueryStmt {
tblRef.analyze(analyzer);
leftTblRef = tblRef;
}
if (needToSql) {
originalExpr = new ArrayList<>();
}
// populate selectListExprs, aliasSMap, and colNames
for (SelectListItem item : selectList.getItems()) {
if (item.isStar()) {
@ -2611,6 +2624,11 @@ public class SelectStmt extends QueryStmt {
expandStar(analyzer, tblName);
}
} else {
if (needToSql) {
// save originalExpr before being analyzed
// because analyze may change the expr by adding cast or some other stuff
originalExpr.add(item.getExpr().clone());
}
// to make sure the sortinfo's AnalyticExpr and resultExprs's AnalyticExpr analytic once
if (item.getExpr() instanceof AnalyticExpr) {
item.getExpr().analyze(analyzer);
@ -2624,9 +2642,7 @@ public class SelectStmt extends QueryStmt {
resultExprs.add(rewriteQueryExprByMvColumnExpr(item.getExpr(), analyzer));
}
}
if (needToSql) {
originalExpr = Expr.cloneList(resultExprs);
}
// substitute group by
if (groupByClause != null) {
boolean aliasFirst = false;