Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -551,10 +551,19 @@ public boolean matchExprs(List<Expr> exprs, SelectStmt stmt, boolean ignoreAlias
if (!(originExpr instanceof SlotRef)) {
return true; // means this is alias of other expr.
}

SlotRef aliasExpr = (SlotRef) originExpr;
if (aliasExpr.getColumnName() == null) {
if (desc.getSourceExprs() != null) {
for (Expr expr : desc.getSourceExprs()) {
if (!expr.matchExprs(exprs, stmt, ignoreAlias, tableName)) {
return false;
}
}
}
return true; // means this is alias of other expr.
}

if (aliasExpr.desc != null) {
TableIf table = aliasExpr.desc.getParent().getTable();
if (table != null && table.getName() != tableName) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@
import org.apache.doris.common.util.VectorizedUtil;
import org.apache.doris.planner.external.ExternalFileScanNode;
import org.apache.doris.qe.ConnectContext;
import org.apache.doris.rewrite.mvrewrite.MVSelectFailedException;
import org.apache.doris.thrift.TNullSide;
import org.apache.doris.thrift.TPushAggOp;

Expand Down Expand Up @@ -1316,8 +1317,10 @@ private PlanNode createRepeatNodePlan(SelectStmt selectStmt, Analyzer analyzer,
}

public boolean selectMaterializedView(QueryStmt queryStmt, Analyzer analyzer)
throws UserException {
throws UserException, MVSelectFailedException {
boolean selectFailed = false;
boolean haveError = false;
String errorMsg = "select fail reason: ";
if (queryStmt instanceof SelectStmt) {
SelectStmt selectStmt = (SelectStmt) queryStmt;
for (TableRef tableRef : selectStmt.getTableRefs()) {
Expand Down Expand Up @@ -1364,6 +1367,11 @@ public boolean selectMaterializedView(QueryStmt queryStmt, Analyzer analyzer)
selectStmt.getAggInfo().updateTypeOfAggregateExprs();
}
} catch (Exception e) {
if (haveError) {
errorMsg += ",";
}
errorMsg += e.getMessage();
haveError = true;
tupleSelectFailed = true;
}
}
Expand All @@ -1379,6 +1387,9 @@ public boolean selectMaterializedView(QueryStmt queryStmt, Analyzer analyzer)
selectFailed |= selectMaterializedView(unionOperand.getQueryStmt(), analyzer);
}
}
if (haveError) {
throw new MVSelectFailedException(errorMsg);
}
return selectFailed;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@ suite ("mv_with_view") {
}
qt_select_star "select * from d_table order by k1;"

sql """
drop view if exists v_k132;
"""

sql """
create view v_k132 as select k1,k3,k2 from d_table where k1 = 1;
"""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,49 +57,8 @@ suite ("test_agg_mv_useless") {
exception "errCode = 2,"
}

sql "create materialized view k1_u1 as select k1 from ${testTable} group by k1;"
max_try_secs = 60
while (max_try_secs--) {
String res = getJobState(testTable)
if (res == "FINISHED") {
break
} else {
Thread.sleep(2000)
if (max_try_secs < 1) {
println "test timeout," + "state:" + res
assertEquals("FINISHED",res)
}
}
}

sql "create materialized view k1_k2_u21 as select k2,k1 from ${testTable} group by k2,k1 order by k2,k1;"
max_try_secs = 60
while (max_try_secs--) {
String res = getJobState(testTable)
if (res == "FINISHED") {
break
} else {
Thread.sleep(2000)
if (max_try_secs < 1) {
println "test timeout," + "state:" + res
assertEquals("FINISHED",res)
}
}
}

sql "create materialized view k1_sumk3 as select k1,sum(k3) from ${testTable} group by k1;"
max_try_secs = 60
while (max_try_secs--) {
String res = getJobState(testTable)
if (res == "FINISHED") {
break
} else {
Thread.sleep(2000)
if (max_try_secs < 1) {
println "test timeout," + "state:" + res
assertEquals("FINISHED",res)
}
}
}
createMV("create materialized view k1_u1 as select k1 from ${testTable} group by k1;")
createMV("create materialized view k1_k2_u21 as select k2,k1 from ${testTable} group by k2,k1 order by k2,k1;")
createMV("create materialized view k1_sumk3 as select k1,sum(k3) from ${testTable} group by k1;")
sql "insert into ${testTable} select 4,4,4;"
}
Original file line number Diff line number Diff line change
Expand Up @@ -49,66 +49,9 @@ suite ("test_dup_mv_useless") {
exception "errCode = 2,"
}

sql "create materialized view k1_u1 as select k1 from ${testTable} group by k1;"
max_try_secs = 60
while (max_try_secs--) {
String res = getJobState(testTable)
if (res == "FINISHED") {
Thread.sleep(5000)
break
} else {
Thread.sleep(2000)
if (max_try_secs < 1) {
println "test timeout," + "state:" + res
assertEquals("FINISHED",res)
}
}
}
sql "create materialized view k1_k2_u12 as select k1,k2 from ${testTable} group by k1,k2;"
max_try_secs = 60
while (max_try_secs--) {
String res = getJobState(testTable)
if (res == "FINISHED") {
Thread.sleep(5000)
break
} else {
Thread.sleep(2000)
if (max_try_secs < 1) {
println "test timeout," + "state:" + res
assertEquals("FINISHED",res)
}
}
}
sql "create materialized view k1_k2_u21 as select k2,k1 from ${testTable} group by k2,k1 order by k2,k1;"
max_try_secs = 60
while (max_try_secs--) {
String res = getJobState(testTable)
if (res == "FINISHED") {
Thread.sleep(5000)
break
} else {
Thread.sleep(2000)
if (max_try_secs < 1) {
println "test timeout," + "state:" + res
assertEquals("FINISHED",res)
}
}
}
sql " create materialized view k1_k2_sumk3 as select k1,k2,sum(k3) from ${testTable} group by k1,k2;"
max_try_secs = 60
while (max_try_secs--) {
String res = getJobState(testTable)
if (res == "FINISHED") {
Thread.sleep(5000)
break
} else {
Thread.sleep(2000)
if (max_try_secs < 1) {
println "test timeout," + "state:" + res
assertEquals("FINISHED",res)
}
}
}

createMV("create materialized view k1_u1 as select k1 from ${testTable} group by k1;")
createMV("create materialized view k1_k2_u12 as select k1,k2 from ${testTable} group by k1,k2;")
createMV("create materialized view k1_k2_u21 as select k2,k1 from ${testTable} group by k2,k1 order by k2,k1;")
createMV("create materialized view k1_k2_sumk3 as select k1,k2,sum(k3) from ${testTable} group by k1,k2;")
sql "insert into ${testTable} select 4,4,4;"
}
Original file line number Diff line number Diff line change
Expand Up @@ -53,20 +53,6 @@ suite ("test_uniq_mv_useless") {
exception "errCode = 2,"
}

sql "create materialized view k1_k2_u21 as select k2,k1 from ${testTable} group by k2,k1 order by k2,k1;"
max_try_secs = 60
while (max_try_secs--) {
String res = getJobState(testTable)
if (res == "FINISHED") {
break
} else {
Thread.sleep(2000)
if (max_try_secs < 1) {
println "test timeout," + "state:" + res
assertEquals("FINISHED",res)
}
}
}

createMV ("create materialized view k1_k2_u21 as select k2,k1 from ${testTable} group by k2,k1 order by k2,k1;")
sql "insert into ${testTable} select 4,4,4;"
}