hcq/oceanbase
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/sql/optimizer/ob_log_plan.cpp
View File

@ -1197,12 +1197,13 @@ int ObLogPlan::generate_inner_join_detectors(const ObIArray<TableItem*>& table_i
if (OB_ISNULL(expr)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("unexpect null expr", K(ret));
} else if (!expr->get_relation_ids().is_subset(table_ids)) {
// do nothing
} else if (!expr->get_relation_ids().is_subset(table_ids) ||
expr->has_flag(CNT_SUB_QUERY)) {
} else if (OB_FAIL(table_filters.push_back(expr))) {
LOG_WARN("failed to push back expr", K(ret));
} else if (OB_FAIL(all_table_filters.push_back(expr))) {
LOG_WARN("failed to push back expr", K(ret));
} else {
}
}
if (OB_SUCC(ret)) {
@ -1268,8 +1269,6 @@ int ObLogPlan::generate_inner_join_detectors(const ObIArray<TableItem*>& table_i
LOG_WARN("failed to generate R-TES", K(ret));
}
}
//对于inner join来说，满足交换律，所以不需要区分L_TES、R_TES
//为了方便之后统一applicable算法，L_TES、R_TES都等于SES
if (OB_FAIL(ret)) {
} else if (OB_FAIL(inner_detector->L_TES_.add_members(table_set))) {
LOG_WARN("failed to generate L-TES", K(ret));
@ -3715,8 +3714,11 @@ int ObLogPlan::extract_params(ObRawExpr*& expr, const int32_t level, ObIArray<st
}
}
}
if (OB_SUCC(ret) && OB_FAIL(expr->extract_info())) {
if (OB_FAIL(ret)) {
} else if (OB_FAIL(expr->extract_info())) {
LOG_WARN("failed to extract expr info", K(ret));
} else if (OB_FAIL(expr->pull_relation_id_and_levels(get_stmt()->get_current_level()))) {
LOG_WARN("pull up rel id and level failed", K(ret));
}
return ret;
}

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

11
src/sql/rewrite/ob_transform_aggr_subquery.cpp
View File

@ -1186,9 +1186,6 @@ int ObTransformAggrSubquery::revert_vec_assign_exprs(ObSelectStmt *&child_stmt,
return ret;
}
/**
* 获取from list中所有基表的primary key
*/
int ObTransformAggrSubquery::get_unique_keys(ObDMLStmt &stmt, ObIArray<ObRawExpr *> &pkeys, const bool is_first_trans)
{
int ret = OB_SUCCESS;
@ -1593,7 +1590,13 @@ int ObTransformAggrSubquery::is_valid_group_by(const ObSelectStmt& subquery, boo
LOG_WARN("failed to compute const exprs", K(ret));
}
for (int64_t i = 0; OB_SUCC(ret) && is_valid && i < subquery.get_group_expr_size(); ++i) {
if (ObOptimizerUtil::is_const_expr(subquery.get_group_exprs().at(i), subquery.get_current_level())) {
bool is_correlated = false;
if (OB_FAIL(ObTransformUtils::is_correlated_expr(
subquery.get_group_exprs().at(i), subquery.get_current_level() - 1, is_correlated))) {
LOG_WARN("judge group expr correlated failed", K(ret));
} else if (is_correlated) {
is_valid = false;
} else if (ObOptimizerUtil::is_const_expr(subquery.get_group_exprs().at(i), subquery.get_current_level())) {
// do nothing
} else if (ObOptimizerUtil::find_item(const_exprs, subquery.get_group_exprs().at(i))) {
// do nothing

83
src/sql/rewrite/ob_transform_groupby_placement.cpp
View File

@ -177,20 +177,45 @@ int ObTransformGroupByPlacement::check_groupby_validity(const ObSelectStmt& stmt
ObSEArray<ObRawExpr*, 4> exprs;
if (OB_FAIL(stmt.get_select_exprs(exprs))) {
LOG_WARN("failed to get select exprs", K(ret));
} else if (OB_FAIL(append(exprs, stmt.get_having_exprs()))) {
LOG_WARN("failed to get having exprs", K(ret));
} else {
for (int64_t i = 0; OB_SUCC(ret) && i < stmt.get_order_item_size(); ++i) {
if (OB_FAIL(exprs.push_back(stmt.get_order_item(i).expr_))) {
LOG_WARN("failed to push back expr", K(ret));
}
} else if (OB_FAIL(stmt.get_order_exprs(exprs))) {
LOG_WARN("failed to get order exprs", K(ret));
}
for (int64_t i = 0; OB_SUCC(ret) && is_valid && i < exprs.count(); i++) {
if (OB_FAIL(check_group_by_subset(exprs.at(i), stmt.get_group_exprs(), is_valid))) {
LOG_WARN("check group by exprs failed", K(ret));
}
ObSEArray<ObRawExpr*, 4> col_exprs;
for (int64_t i = 0; OB_SUCC(ret) && i < exprs.count(); ++i) {
if (OB_FAIL(extract_non_agg_columns(exprs.at(i), stmt.get_current_level(), col_exprs))) {
LOG_WARN("failed to extract non agg columns", K(ret));
}
for (int64_t i = 0; OB_SUCC(ret) && is_valid && i < stmt.get_having_exprs().count(); i++) {
if (OB_FAIL(check_group_by_subset(stmt.get_having_exprs().at(i), stmt.get_group_exprs(), is_valid))) {
LOG_WARN("check group by exprs failed", K(ret));
}
}
return ret;
}
int ObTransformGroupByPlacement::check_group_by_subset(ObRawExpr *expr,
const ObIArray<ObRawExpr *> &group_exprs,
bool &bret)
{
int ret = OB_SUCCESS;
if (OB_ISNULL(expr)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("expr is null", K(ret));
} else {
bret = true;
int64_t idx = -1;
if (expr->has_flag(IS_AGG) || expr->has_flag(IS_CONST)
|| expr->has_flag(IS_EXEC_PARAM) || expr->has_flag(IS_PARAM)) {
//do nothing
} else if (!ObRawExprUtils::find_expr(group_exprs, expr)) {
if (expr->get_param_count() == 0) {
bret = false;
} else {
is_valid = ObOptimizerUtil::subset_exprs(col_exprs, stmt.get_group_exprs());
for (int64_t i = 0; OB_SUCC(ret) && bret && i < expr->get_param_count(); i++) {
if (SMART_CALL(check_group_by_subset(expr->get_param_expr(i), group_exprs, bret))) {
LOG_WARN("check group by subset faield", K(ret));
}
}
}
}
}
@ -397,39 +422,8 @@ int ObTransformGroupByPlacement::get_null_side_tables(
return ret;
}
int ObTransformGroupByPlacement::extract_non_agg_columns(
ObRawExpr* expr, const int64_t stmt_level, ObIArray<ObRawExpr*>& col_exprs)
{
int ret = OB_SUCCESS;
bool is_stack_overflow = false;
if (OB_ISNULL(expr)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("expr is null", K(ret));
} else if (OB_FAIL(check_stack_overflow(is_stack_overflow))) {
LOG_WARN("failed to check stack overflow", K(ret));
} else if (is_stack_overflow) {
ret = OB_SIZE_OVERFLOW;
LOG_WARN("too deep recursive", K(ret), K(is_stack_overflow));
} else if (!expr->get_expr_levels().has_member(stmt_level)) {
// do nothing
} else if (expr->is_column_ref_expr()) {
if (OB_FAIL(col_exprs.push_back(expr))) {
LOG_WARN("failed to push back expr", K(ret));
}
} else if (expr->is_aggr_expr()) {
// do nothing
} else if (expr->has_flag(CNT_COLUMN)) {
for (int64_t i = 0; OB_SUCC(ret) && i < expr->get_param_count(); ++i) {
if (OB_FAIL(SMART_CALL(extract_non_agg_columns(expr->get_param_expr(i), stmt_level, col_exprs)))) {
LOG_WARN("failed to extract non agg columns", K(ret));
}
}
}
return ret;
}
int ObTransformGroupByPlacement::is_filterable_join(
ObSelectStmt* stmt, ObRawExpr* join_cond, ObIArray<PushDownParam>& params, bool& is_valid)
ObSelectStmt *stmt, ObRawExpr *join_cond, ObIArray<PushDownParam> &params, bool &is_valid)
{
int ret = OB_SUCCESS;
is_valid = true;
@ -1603,7 +1597,6 @@ int ObTransformGroupByPlacement::check_groupby_pullup_validity(ObDMLStmt* stmt,
// do nothing
} else if (OB_FAIL(sub_stmt->has_rand(has_rand))) {
LOG_WARN("failed to check stmt has rand func", K(ret));
// stmt不能包含rand函数 https://work.aone.alibaba-inc.com/issue/35875561
} else if (!(can_pullup = !has_rand)) {
// do nothing
} else if (OB_FALSE_IT(helper.need_merge_ = sub_stmt->get_stmt_hint().enable_view_merge())) {

73
src/sql/rewrite/ob_transform_groupby_placement.h
View File

@ -127,67 +127,80 @@ private:
int transform_aggregation_expr(ObDMLStmt& stmt, ObAggFunRawExpr& aggr_expr, ObIArray<TableItem*>& eager_aggr_views,
ObIArray<bool>& table_types, ObRawExpr*& new_aggr_expr);
int convert_aggr_expr(ObDMLStmt* stmt, ObAggFunRawExpr* aggr_expr, ObRawExpr*& output_expr);
int convert_aggr_expr(ObDMLStmt *stmt, ObAggFunRawExpr *aggr_expr, ObRawExpr *&output_expr);
int build_case_when(
ObDMLStmt* stmt, ObRawExpr* when_expr, ObRawExpr* value_expr, ObRawExpr* else_expr, ObRawExpr*& case_when);
ObDMLStmt *stmt, ObRawExpr *when_expr, ObRawExpr *value_expr, ObRawExpr *else_expr, ObRawExpr *&case_when);
int has_stmt_column(ObRawExpr* expr, const int64_t stmt_level, bool& has);
int has_stmt_column(
ObRawExpr *expr, const int64_t stmt_level, bool &has);
int get_count_star(ObDMLStmt& stmt, TableItem* table_item, bool is_outer_join_table, ObRawExpr*& count_column);
int get_count_star(
ObDMLStmt &stmt, TableItem *table_item, bool is_outer_join_table, ObRawExpr *&count_column);
int get_view_column(
ObDMLStmt& stmt, TableItem* table_item, bool is_outer_join_table, ObRawExpr* aggr_expr, ObRawExpr*& aggr_column);
ObDMLStmt &stmt, TableItem *table_item, bool is_outer_join_table, ObRawExpr *aggr_expr, ObRawExpr *&aggr_column);
int wrap_case_when_for_count(
ObDMLStmt* stmt, ObColumnRefRawExpr* view_count, ObRawExpr*& output, bool is_count_star = false);
ObDMLStmt *stmt, ObColumnRefRawExpr *view_count, ObRawExpr *&output, bool is_count_star = false);
int update_joined_table(TableItem* table, const TableItem* old_table, TableItem* new_table, bool& is_found);
int update_joined_table(
TableItem *table, const TableItem *old_table, TableItem *new_table, bool &is_found);
int check_unique(ObSelectStmt* stmt, PushDownParam& param, bool& is_unique);
int check_unique(
ObSelectStmt *stmt, PushDownParam &param, bool &is_unique);
int add_exprs(
const ObIArray<ObRawExpr*>& exprs, int64_t stmt_level, ObSqlBitSet<>& table_set, ObIArray<ObRawExpr*>& dest);
const ObIArray<ObRawExpr *> &exprs, int64_t stmt_level, ObSqlBitSet<> &table_set, ObIArray<ObRawExpr *> &dest);
int extract_non_agg_columns(ObRawExpr* expr, const int64_t stmt_level, ObIArray<ObRawExpr*>& col_exprs);
int merge_tables(ObIArray<PushDownParam>& params, const ObSqlBitSet<>& table_set);
int merge_tables(ObIArray<PushDownParam> &params, const ObSqlBitSet<> &table_set);
///////////////////// transform group by pull up //////////////////////////////
int transform_groupby_pull_up(
common::ObIArray<ObParentDMLStmt>& parent_stmts, ObDMLStmt*& stmt, bool& trans_happened);
common::ObIArray<ObParentDMLStmt> &parent_stmts, ObDMLStmt *&stmt, bool &trans_happened);
int check_groupby_pullup_validity(ObDMLStmt* stmt, ObIArray<PullupHelper>& valid_views);
int check_groupby_pullup_validity(
ObDMLStmt *stmt, ObIArray<PullupHelper> &valid_views);
int check_groupby_pullup_validity(ObDMLStmt* stmt, TableItem* table, PullupHelper& helper, bool contain_inner_table,
ObSqlBitSet<>& ignore_tables, ObIArray<PullupHelper>& valid_views, bool& is_valid);
int check_groupby_pullup_validity(
ObDMLStmt *stmt, TableItem *table, PullupHelper &helper, bool contain_inner_table,
ObSqlBitSet<> &ignore_tables, ObIArray<PullupHelper> &valid_views, bool &is_valid);
int check_ignore_views(ObDMLStmt& stmt, ObIArray<ObRawExpr*>& conditions, ObSqlBitSet<>& ignore_tables);
int check_ignore_views(
ObDMLStmt &stmt, ObIArray<ObRawExpr*> &conditions, ObSqlBitSet<> &ignore_tables);
int is_contain_aggr_item(ObColumnRefRawExpr* column_expr, TableItem* view_table, bool& is_contain);
int is_contain_aggr_item(
ObColumnRefRawExpr *column_expr, TableItem *view_table, bool &is_contain);
int is_valid_group_stmt(ObSelectStmt* sub_stmt, bool& is_valid_group);
int is_valid_group_stmt(
ObSelectStmt *sub_stmt, bool &is_valid_group);
int check_null_propagate(ObDMLStmt* parent_stmt, ObSelectStmt* child_stmt, PullupHelper& helper, bool& is_valid);
int check_null_propagate(
ObDMLStmt *parent_stmt, ObSelectStmt* child_stmt, PullupHelper &helper, bool &is_valid);
int find_not_null_column(ObDMLStmt& parent_stmt, ObSelectStmt& child_stmt, PullupHelper& helper,
ObIArray<ObRawExpr*>& column_exprs, ObRawExpr*& not_null_column);
int find_not_null_column_with_condition(ObDMLStmt& parent_stmt, ObSelectStmt& child_stmt, PullupHelper& helper,
ObIArray<ObRawExpr*>& column_exprs, ObRawExpr*& not_null_column);
int find_not_null_column(
ObDMLStmt &parent_stmt, ObSelectStmt &child_stmt, PullupHelper &helper,
ObIArray<ObRawExpr *> &column_exprs, ObRawExpr *&not_null_column);
int find_not_null_column_with_condition(
ObDMLStmt &parent_stmt, ObSelectStmt &child_stmt, PullupHelper &helper,
ObIArray<ObRawExpr *> &column_exprs, ObRawExpr *&not_null_column);
int find_null_propagate_column(
ObRawExpr* condition, ObIArray<ObRawExpr*>& columns, ObRawExpr*& null_propagate_column, bool& is_valid);
ObRawExpr *condition, ObIArray<ObRawExpr*> &columns, ObRawExpr *&null_propagate_column, bool &is_valid);
int do_groupby_pull_up(ObSelectStmt* stmt, PullupHelper& helper);
int do_groupby_pull_up(ObSelectStmt *stmt, PullupHelper &helper);
int get_trans_view(ObDMLStmt* stmt, ObSelectStmt*& view_stmt);
int get_trans_view(ObDMLStmt *stmt, ObSelectStmt *&view_stmt);
int wrap_case_when_if_necessary(ObSelectStmt& child_stmt, PullupHelper& helper, ObIArray<ObRawExpr*>& exprs);
int wrap_case_when_if_necessary(
ObSelectStmt &child_stmt, PullupHelper &helper, ObIArray<ObRawExpr *> &exprs);
int wrap_case_when(ObSelectStmt& child_stmt, ObRawExpr* not_null_column, ObRawExpr*& expr);
int wrap_case_when(
ObSelectStmt &child_stmt, ObRawExpr *not_null_column, ObRawExpr *&expr);
int check_group_by_subset(ObRawExpr *expr, const ObIArray<ObRawExpr *> &group_exprs, bool &bret);
private:
// help functions
int64_t get_count_sum_num(const ObIArray<ObRawExpr*>& exprs)

9
src/sql/rewrite/ob_transform_semi_to_inner.cpp
View File

@ -189,8 +189,13 @@ int ObTransformSemiToInner::check_basic_validity(ObDMLStmt* root_stmt, ObDMLStmt
LOG_WARN("failed to check can add distinct", K(ret));
} else if (!is_valid) {
LOG_TRACE("semi right table output can not add distinct");
} else if (OB_FAIL(
check_join_condition_match_index(root_stmt, stmt, semi_info, semi_info.semi_conditions_, is_valid))) {
} else if (stmt.get_stmt_hint().enable_unnest()) {
//do nothing
need_check_cost = false;
is_valid = true;
} else if (OB_FAIL(check_join_condition_match_index(root_stmt, stmt, semi_info,
semi_info.semi_conditions_,
is_valid))) {
LOG_WARN("failed to check join condition match index", K(ret));
} else {
need_check_cost = is_valid | need_add_distinct;

8
src/sql/rewrite/ob_transform_utils.cpp
View File

@ -5332,7 +5332,13 @@ int ObTransformUtils::create_simple_view(
LOG_WARN("failed to create stmt", K(ret));
} else if (OB_FAIL(view_stmt->ObDMLStmt::assign(*stmt))) {
LOG_WARN("failed to assign stmt", K(ret));
} else {
} else if (!stmt->is_select_stmt()) {
//do nothing
} else if (OB_FAIL(view_stmt->get_sample_infos().assign(static_cast<ObSelectStmt *>(stmt)->get_sample_infos()))) {
LOG_WARN("assign array failed", K(ret));
}
if (OB_SUCC(ret)) {
view_stmt->set_stmt_type(stmt::T_SELECT);
// 1. handle table, columns, from
// dml_stmt: from table, semi table, joined table

2
src/sql/rewrite/ob_transform_where_subquery_pullup.cpp
View File

@ -2353,6 +2353,8 @@ int ObWhereSubQueryPullup::unnest_single_set_subquery(ObDMLStmt* stmt, ObQueryRe
LOG_WARN("failed to merge others to parent stmt", K(ret));
} else if (OB_FAIL(stmt->get_stmt_hint().add_view_merge_hint(&(subquery->get_stmt_hint())))) {
LOG_WARN("Failed to add view merge hint", K(ret));
} else if (OB_FAIL(append(stmt->get_stmt_hint().part_hints_, subquery->get_stmt_hint().part_hints_))) {
LOG_WARN("Failed to append partition hint", K(ret));
} else if (OB_FAIL(stmt->replace_inner_stmt_expr(query_refs, select_list))) {
LOG_WARN("failed to replace inner stmt expr", K(ret));
} else if (OB_FAIL(ObOptimizerUtil::remove_item(stmt->get_subquery_exprs(), query_expr))) {

3
unittest/sql/rewrite/result/test_transformer_stmt_after_together.result
View File

@ -14869,6 +14869,7 @@ SQL: select * from t1 right join t3 on (t1.c1 = t3.c1) where t3.c1 = (select t2.
"CNT_IS_EXPR"
],
"rel_id": [
1
],
"expr_levels": [
0
@ -16316,6 +16317,7 @@ SQL: select * from t3 left join t1 on (t1.c1 = t3.c1) where t3.c1 = (select t2.c
"CNT_IS_EXPR"
],
"rel_id": [
2
],
"expr_levels": [
0
@ -18279,6 +18281,7 @@ SQL: select * from t3 left join (t1 inner join t4 on (t1.c2 = t4.c1)) on (t1.c2
"CNT_IS_EXPR"
],
"rel_id": [
2
],
"expr_levels": [
0

2
unittest/sql/rewrite/result/test_transformer_stmt_after_trans_aggr.result
View File

@ -86426,6 +86426,7 @@ SQL: SELECT MIN(1) FROM agg_t2 ORDER BY (SELECT AVG(c2) FROM agg_t1);
"CNT_AGG"
],
"rel_id": [
1
],
"expr_levels": [
0
@ -96957,6 +96958,7 @@ SQL: select * from (select c1 as col from t1) as L where col = (select max(c1) f
"IS_RANGE_COND"
],
"rel_id": [
1
],
"expr_levels": [
0