hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix sharable exprs rel_ids not correct bug

Browse Source
This commit is contained in:
my0
2022-03-16 14:57:48 +08:00
committed by LINxiansheng
parent 3233a7d49a
commit a4c7d7dc9f
14 changed files with 163 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/sql/resolver/dml/ob_dml_stmt.cpp
View File

@ -1773,7 +1773,21 @@ int ObDMLStmt::get_order_exprs(ObIArray<ObRawExpr*>& order_exprs)
return ret;
}
int ObDMLStmt::formalize_stmt(ObSQLSessionInfo* session_info)
int ObDMLStmt::get_order_exprs(ObIArray<ObRawExpr*> &order_exprs) const
{
int ret = OB_SUCCESS;
for (int64_t i = 0; OB_SUCC(ret) && i < order_items_.count(); i++) {
if (OB_ISNULL(order_items_.at(i).expr_)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("get unexpected null", K(ret));
} else if (OB_FAIL(order_exprs.push_back(order_items_.at(i).expr_))) {
LOG_WARN("failed to push back exprs", K(ret));
} else { /*do nothing*/ }
}
return ret;
}
int ObDMLStmt::formalize_stmt(ObSQLSessionInfo *session_info)
{
int ret = OB_SUCCESS;
ObArray<ObRawExpr*> relation_exprs;

1
src/sql/resolver/dml/ob_dml_stmt.h
View File

@ -877,6 +877,7 @@ public:
return order_items_;
}
int get_order_exprs(common::ObIArray<ObRawExpr*>& order_exprs);
int get_order_exprs(common::ObIArray<ObRawExpr*> &order_exprs) const;
inline const ObViewTableIds& get_view_table_id_store() const
{
return view_table_id_store_;

7
src/sql/resolver/dml/ob_merge_stmt.cpp
View File

@ -99,6 +99,11 @@ int ObMergeStmt::assign(const ObMergeStmt& other)
int64_t ObMergeStmt::to_string(char* buf, const int64_t buf_len) const
{
int64_t pos = 0;
int ret = OB_SUCCESS;
ObArray<ObSelectStmt*> child_stmts;
if (OB_FAIL(ObDMLStmt::get_child_stmts(child_stmts))) {
databuff_printf(buf, buf_len, pos, "ERROR get child stmts failed");
} else {
J_OBJ_START();
J_KV(N_STMT_TYPE,
((int)stmt_type_),
@ -125,9 +130,11 @@ int64_t ObMergeStmt::to_string(char* buf, const int64_t buf_len) const
N_PARTITION_EXPR,
part_expr_items_,
K_(all_table_columns),
K(child_stmts),
N_QUERY_CTX,
stmt_hint_);
J_OBJ_END();
}
return pos;
}

33
src/sql/resolver/expr/ob_expr_relation_analyzer.cpp
View File

@ -44,36 +44,43 @@ ObExprRelationAnalyzer::ObExprRelationAnalyzer() : query_exprs_()
int ObExprRelationAnalyzer::pull_expr_relation_id_and_levels(ObRawExpr* expr, int32_t cur_stmt_level)
{
int ret = OB_SUCCESS;
UNUSED(cur_stmt_level);
int64_t expr_level = -1;
if (OB_ISNULL(expr)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("expr is null", K(ret), K(expr));
} else if (OB_FAIL(visit_expr(*expr, cur_stmt_level))) {
} else if (OB_FAIL(visit_expr(*expr, expr_level))) {
LOG_WARN("failed to pull expr relation id and levels", K(ret));
}
return ret;
}
int ObExprRelationAnalyzer::visit_expr(ObRawExpr& expr, int32_t stmt_level)
int ObExprRelationAnalyzer::visit_expr(ObRawExpr &expr, int64_t &expr_level)
{
int ret = OB_SUCCESS;
// corner case: select min(t1.c1) from t1 group by c2 order by (select avg(t1.c1) from t2);
// avg(t1.1) exists in the subquery, but belongs to the main query
int64_t expr_level = expr.is_aggr_expr() ? expr.get_expr_level() : stmt_level;
expr_level = -1;
int64_t param_count = expr.get_param_count();
if (OB_FAIL(init_expr_info(expr))) {
if (OB_FAIL(init_expr_info(expr, expr_level))) {
LOG_WARN("failed into init expr level and relation ids", K(ret));
}
for (int64_t i = 0; OB_SUCC(ret) && i < param_count; ++i) {
ObRawExpr* param = NULL;
ObRawExpr *param = NULL;
int64_t param_level = -1;
if (OB_ISNULL(param = expr.get_param_expr(i))) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("param expr is null", K(ret));
} else if (OB_FAIL(SMART_CALL(visit_expr(*param, stmt_level)))) {
} else if (OB_FAIL(SMART_CALL(visit_expr(*param, param_level)))) {
LOG_WARN("failed to visit param", K(ret));
} else if (param_level > expr_level) {
expr.get_relation_ids().reuse();
expr_level = param_level;
}
if (OB_FAIL(ret)) {
} else if (OB_FAIL(expr.get_expr_levels().add_members(param->get_expr_levels()))) {
LOG_WARN("failed to add expr levels", K(ret));
} else if (!param->get_expr_levels().has_member(expr_level)) {
} else if (expr_level != param_level || expr_level < 0) {
// skip
} else if (OB_FAIL(expr.get_relation_ids().add_members(param->get_relation_ids()))) {
LOG_WARN("failed to add relation ids", K(ret));
@ -82,7 +89,7 @@ int ObExprRelationAnalyzer::visit_expr(ObRawExpr& expr, int32_t stmt_level)
return ret;
}
int ObExprRelationAnalyzer::init_expr_info(ObRawExpr& expr)
int ObExprRelationAnalyzer::init_expr_info(ObRawExpr &expr, int64_t &expr_level)
{
int ret = OB_SUCCESS;
expr.get_expr_levels().reuse();
@ -92,7 +99,7 @@ int ObExprRelationAnalyzer::init_expr_info(ObRawExpr& expr)
if (expr.is_column_ref_expr() || expr.is_aggr_expr() || expr.is_set_op_expr() || expr.is_win_func_expr() ||
T_ORA_ROWSCN == expr.get_expr_type()) {
int32_t expr_level = expr.get_expr_level();
expr_level = expr.get_expr_level();
if (OB_UNLIKELY(expr_level >= OB_MAX_SUBQUERY_LAYER_NUM || expr_level < 0)) {
ret = OB_INVALID_ARGUMENT;
LOG_WARN("the subquery nested layers is out of range", K(ret), K(expr_level));
@ -114,6 +121,7 @@ int ObExprRelationAnalyzer::init_expr_info(ObRawExpr& expr)
}
} else if (expr.is_query_ref_expr()) {
ObQueryRefRawExpr &query = static_cast<ObQueryRefRawExpr &>(expr);
expr_level = query.get_expr_level();
if (OB_FAIL(query_exprs_.push_back(&query))) {
LOG_WARN("failed to push back query ref", K(ret));
} else if (OB_UNLIKELY(!query.is_ref_stmt())) {
@ -142,11 +150,12 @@ int ObExprRelationAnalyzer::visit_stmt(ObDMLStmt* stmt)
LOG_WARN("failed to get relation exprs", K(ret));
} else {
for (int64_t i = 0; OB_SUCC(ret) && i < relation_exprs.count(); ++i) {
ObRawExpr* expr = NULL;
ObRawExpr *expr = NULL;
int64_t expr_level = -1;
if (OB_ISNULL(expr = relation_exprs.at(i))) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("relation expr is null", K(ret), K(expr));
} else if (OB_FAIL(visit_expr(*expr, stmt->get_current_level()))) {
} else if (OB_FAIL(visit_expr(*expr, expr_level))) {
LOG_WARN("failed to visit expr", K(ret));
}
}

6
src/sql/resolver/expr/ob_expr_relation_analyzer.h
View File

@ -25,9 +25,9 @@ public:
int pull_expr_relation_id_and_levels(ObRawExpr* expr, int32_t cur_stmt_level);
private:
int init_expr_info(ObRawExpr& expr);
int visit_expr(ObRawExpr& expr, int32_t stmt_level);
int visit_stmt(ObDMLStmt* stmt);
int init_expr_info(ObRawExpr &expr, int64_t &expr_level);
int visit_expr(ObRawExpr &expr, int64_t &expr_level);
int visit_stmt(ObDMLStmt *stmt);
private:
// auto_free = false, only used in function stack