Skip to content

Commit 33ceb93

Browse files
committed
[fix](fe) Restore view alias rewrite guard for simpleColumnDefinitions
The refactoring in fd9451f extracted a static overload of rewriteProjectsToUserDefineAlias but dropped the simpleColumnDefinitions emptiness check from the instance method, causing AS aliases to always be injected into view SQL even when the user did not specify a column list. Restore the guard in BaseViewInfo and revert the test expectations back to lowercase as.
1 parent c86c42a commit 33ceb93

3 files changed

Lines changed: 50 additions & 11 deletions

File tree

‎fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/info/BaseViewInfo.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,9 @@ public static String rewriteSql(TreeMap<Pair<Integer, Integer>, String> indexStr
143143
}
144144

145145
protected String rewriteProjectsToUserDefineAlias(String resSql) {
146+
if (simpleColumnDefinitions.isEmpty()) {
147+
return resSql;
148+
}
146149
return rewriteProjectsToUserDefineAlias(resSql, finalCols.stream()
147150
.map(Column::getName)
148151
.collect(Collectors.toList()));

‎fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/info/CreateViewInfo.java‎

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import org.apache.doris.common.ErrorCode;
2424
import org.apache.doris.common.ErrorReport;
2525
import org.apache.doris.common.FeNameFormat;
26+
import org.apache.doris.common.Pair;
2627
import org.apache.doris.common.UserException;
2728
import org.apache.doris.common.util.Util;
2829
import org.apache.doris.mysql.privilege.PrivPredicate;
@@ -33,6 +34,7 @@
3334
import com.google.common.base.Strings;
3435

3536
import java.util.List;
37+
import java.util.TreeMap;
3638

3739
/**
3840
* CreateViewInfo
@@ -64,16 +66,24 @@ public void init(ConnectContext ctx) throws UserException {
6466
ErrorReport.reportAnalysisException(ErrorCode.ERR_TABLE_ACCESS_DENIED_ERROR,
6567
PrivPredicate.CREATE.getPrivs().toString(), viewName.getTbl());
6668
}
67-
analyzeAndFillRewriteSqlMap(querySql, ctx);
68-
PlanUtils.OutermostPlanFinderContext outermostPlanFinderContext = new PlanUtils.OutermostPlanFinderContext();
69-
analyzedPlan.accept(PlanUtils.OutermostPlanFinder.INSTANCE, outermostPlanFinderContext);
70-
List<Slot> outputs = outermostPlanFinderContext.outermostPlan.getOutput();
71-
createFinalCols(outputs);
72-
73-
// expand star(*) in project list and replace table name with qualifier
74-
String rewrittenSql = rewriteSql(ctx.getStatementContext().getIndexInSqlToString(), querySql);
75-
// rewrite project alias
76-
rewrittenSql = rewriteProjectsToUserDefineAlias(rewrittenSql);
69+
TreeMap<Pair<Integer, Integer>, String> rewriteMap = ctx.getStatementContext().getIndexInSqlToString();
70+
TreeMap<Pair<Integer, Integer>, String> snapshot = new TreeMap<>(rewriteMap);
71+
String rewrittenSql;
72+
try {
73+
rewriteMap.clear();
74+
analyzeAndFillRewriteSqlMap(querySql, ctx);
75+
PlanUtils.OutermostPlanFinderContext outermostPlanFinderContext =
76+
new PlanUtils.OutermostPlanFinderContext();
77+
analyzedPlan.accept(PlanUtils.OutermostPlanFinder.INSTANCE, outermostPlanFinderContext);
78+
List<Slot> outputs = outermostPlanFinderContext.outermostPlan.getOutput();
79+
createFinalCols(outputs);
80+
// expand star(*) in project list and replace table name with qualifier
81+
rewrittenSql = rewriteSql(rewriteMap, querySql);
82+
rewrittenSql = rewriteProjectsToUserDefineAlias(rewrittenSql);
83+
} finally {
84+
rewriteMap.clear();
85+
rewriteMap.putAll(snapshot);
86+
}
7787
checkViewSql(rewrittenSql);
7888
this.inlineViewDef = rewrittenSql;
7989
}

‎fe/fe-core/src/test/java/org/apache/doris/catalog/CreateViewTest.java‎

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ public void testAlterView() throws Exception {
159159
Assertions.assertEquals(
160160
"with `test1_cte` (`w1`, `w2`) as "
161161
+ "(select `internal`.`test`.`tbl1`.`k1`, `internal`.`test`.`tbl1`.`k2` "
162-
+ "from `internal`.`test`.`tbl1`) select w1 AS `c1`, sum(`test1_cte`.`w2`) AS `c2` "
162+
+ "from `internal`.`test`.`tbl1`) select w1 as `c1`, sum(`test1_cte`.`w2`) as `c2` "
163163
+ "from test1_cte where `test1_cte`.`w1` > 10 group by `test1_cte`.`w1` order by w1",
164164
alter1.getInlineViewDef());
165165
}
@@ -187,6 +187,32 @@ public void testCreateViewWithAliasStarOverAggregateSubquery() throws Exception
187187
Assertions.assertFalse(explainString.contains("Unknown column"));
188188
}
189189

190+
@Test
191+
public void testCreateViewWithoutDefinedColumnsDoesNotInjectAliases() throws Exception {
192+
ExceptionChecker.expectThrowsNoException(
193+
() -> createView("create view test.no_alias_view as select k1, k2 from test.tbl1;"));
194+
195+
Database db = Env.getCurrentInternalCatalog().getDbOrDdlException("test");
196+
View view = (View) db.getTableOrDdlException("no_alias_view");
197+
Assert.assertEquals(
198+
"select `internal`.`test`.`tbl1`.`k1`, `internal`.`test`.`tbl1`.`k2` "
199+
+ "from `internal`.`test`.`tbl1`",
200+
view.getInlineViewDef());
201+
}
202+
203+
@Test
204+
public void testCreateViewWithDefinedColumnsRewritesAliases() throws Exception {
205+
ExceptionChecker.expectThrowsNoException(
206+
() -> createView("create view test.with_alias_view(c1, c2) as select k1, k2 from test.tbl1;"));
207+
208+
Database db = Env.getCurrentInternalCatalog().getDbOrDdlException("test");
209+
View view = (View) db.getTableOrDdlException("with_alias_view");
210+
Assert.assertEquals(
211+
"select `internal`.`test`.`tbl1`.`k1` AS `c1`, `internal`.`test`.`tbl1`.`k2` AS `c2` "
212+
+ "from `internal`.`test`.`tbl1`",
213+
view.getInlineViewDef());
214+
}
215+
190216
@Test
191217
public void testViewRejectVarbinary() throws Exception {
192218
ExceptionChecker.expectThrowsWithMsg(

0 commit comments

Comments
 (0)