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

fix error caused by aggr func alias in order by

Browse Source
This commit is contained in:
zz0
2021-08-31 13:42:37 +08:00
committed by wangzelin.wzl
parent c5b33f71c2
commit 8967498dc8
4 changed files with 39 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/sql/resolver/dml/ob_dml_resolver.cpp
View File

@ -639,6 +639,7 @@ int ObDMLResolver::resolve_columns(ObRawExpr*& expr, ObArray<ObQualifiedName>& c
for (int64_t i = 0; OB_SUCC(ret) && i < columns.count(); ++i) {
ObQualifiedName& q_name = columns.at(i);
ObRawExpr* real_ref_expr = NULL;
params_.is_column_ref_ = expr->is_column_ref_expr();
if (OB_FAIL(resolve_qualified_identifier(q_name, columns, real_exprs, real_ref_expr))) {
LOG_WARN_IGNORE_COL_NOTFOUND(ret, "resolve column ref expr failed", K(ret), K(q_name));
report_user_error_msg(ret, expr, q_name);

50
src/sql/resolver/dml/ob_select_resolver.cpp
View File

@ -4266,9 +4266,23 @@ int ObSelectResolver::resolve_column_ref_in_all_namespace(const ObQualifiedName&
int ret = OB_SUCCESS;
// first, find column in current namespace
if (OB_UNLIKELY(T_ORDER_SCOPE == current_scope_)) {
if (OB_FAIL(resolve_column_ref_alias_first(q_name, real_ref_expr))) {
LOG_WARN_IGNORE_COL_NOTFOUND(ret, "resolve column ref alias first failed", K(ret), K(q_name));
if (!params_.is_column_ref_) {
// if the item behind order by is an expr, then we should resolve column
// select id as data, data from test order by data + 1;
// select id as data, data from test order by sum(data);
// select id + 1 as data, data from test order by sum(data);
if (OB_FAIL(resolve_column_ref_table_first(q_name, real_ref_expr, false))) {
LOG_WARN_IGNORE_COL_NOTFOUND(ret, "resolve column ref table first failed", K(ret), K(q_name));
}
} else {
// should raise an error
// select id + 1 as data, data from test order by data
// select id as data, data from test order by data
if (OB_FAIL(resolve_column_ref_alias_first(q_name, real_ref_expr))) {
LOG_WARN_IGNORE_COL_NOTFOUND(ret, "resolve column ref alias first failed", K(ret), K(q_name));
}
}
} else if (OB_UNLIKELY(T_HAVING_SCOPE == current_scope_)) {
if (OB_FAIL(resolve_column_ref_for_having(q_name, real_ref_expr))) {
LOG_WARN_IGNORE_COL_NOTFOUND(ret, "resolve column ref for having failed", K(ret), K(q_name));
@ -4279,7 +4293,7 @@ int ObSelectResolver::resolve_column_ref_in_all_namespace(const ObQualifiedName&
}
} else {
// search column in table columns first
if (OB_FAIL(resolve_column_ref_table_first(q_name, real_ref_expr))) {
if (OB_FAIL(resolve_column_ref_table_first(q_name, real_ref_expr, true))) {
LOG_WARN_IGNORE_COL_NOTFOUND(ret, "resolve column ref table first failed", K(ret), K(q_name));
}
}
@ -4595,32 +4609,36 @@ int ObSelectResolver::resolve_column_ref_for_having(const ObQualifiedName& q_nam
return ret;
}
int ObSelectResolver::resolve_column_ref_table_first(const ObQualifiedName& q_name, ObRawExpr*& real_ref_expr)
int ObSelectResolver::resolve_column_ref_table_first(
const ObQualifiedName& q_name, ObRawExpr*& real_ref_expr,
bool need_further_match_alias /* = true */)
{
int ret = OB_SUCCESS;
// search column ref in table columns first, follow by alias name
// if table column exist, check column name whether exist in alias name list
ObRawExpr* tmp_ref = NULL;
if (OB_FAIL(resolve_table_column_ref(q_name, real_ref_expr))) {
if (OB_ERR_BAD_FIELD_ERROR == ret) {
if (OB_ERR_BAD_FIELD_ERROR == ret || OB_NON_UNIQ_ERROR == ret) {
if (OB_FAIL(resolve_alias_column_ref(q_name, real_ref_expr))) {
LOG_WARN_IGNORE_COL_NOTFOUND(ret, "resolve alias column ref failed", K(ret), K(q_name));
}
} else {
LOG_WARN("resolve table column ref failed", K(ret));
}
} else if (OB_FAIL(resolve_alias_column_ref(q_name, tmp_ref))) {
if (OB_ERR_BAD_FIELD_ERROR == ret || OB_ILLEGAL_REFERENCE == ret) {
ret = OB_SUCCESS;
} else {
LOG_WARN("try to hit column on target list failed", K(ret));
} else if (need_further_match_alias) {
if (OB_FAIL(resolve_alias_column_ref(q_name, tmp_ref))) {
if (OB_ERR_BAD_FIELD_ERROR == ret || OB_ILLEGAL_REFERENCE == ret) {
ret = OB_SUCCESS;
} else {
LOG_WARN("try to hit column on target list failed", K(ret));
}
} else if (!ObRawExprUtils::is_same_column_ref(real_ref_expr, tmp_ref)) {
// if column name exist in both table columns and alias name list, use table column and produce warning msg
ObString col_name = concat_qualified_name(q_name.database_name_, q_name.tbl_name_, q_name.col_name_);
ObString scope_name = ObString::make_string(get_scope_name(current_scope_));
LOG_USER_WARN(OB_NON_UNIQ_ERROR, col_name.length(), col_name.ptr(), scope_name.length(), scope_name.ptr());
}
} else if (!ObRawExprUtils::is_same_column_ref(real_ref_expr, tmp_ref)) {
// if column name exist in both table columns and alias name list, use table column and produce warning msg
ObString col_name = concat_qualified_name(q_name.database_name_, q_name.tbl_name_, q_name.col_name_);
ObString scope_name = ObString::make_string(get_scope_name(current_scope_));
LOG_USER_WARN(OB_NON_UNIQ_ERROR, col_name.length(), col_name.ptr(), scope_name.length(), scope_name.ptr());
}
} else { /* do nothing */}
return ret;
}

2
src/sql/resolver/dml/ob_select_resolver.h
View File

@ -350,7 +350,7 @@ protected:
* @param real_ref_expr, column real ref expr
*/
int resolve_column_ref_alias_first(const ObQualifiedName& q_name, ObRawExpr*& real_ref_expr);
int resolve_column_ref_table_first(const ObQualifiedName& q_name, ObRawExpr*& real_ref_expr);
int resolve_column_ref_table_first(const ObQualifiedName& q_name, ObRawExpr*& real_ref_expr, bool need_further_match_alias = true);
int resolve_column_ref_for_having(const ObQualifiedName& q_name, ObRawExpr*& real_ref_expr);
int resolve_column_ref_for_search(const ObQualifiedName& q_name, ObRawExpr*& real_ref_expr);
int resolve_table_column_ref(const ObQualifiedName& q_name, ObRawExpr*& real_ref_expr);

4
src/sql/resolver/ob_resolver_define.h
View File

@ -286,7 +286,8 @@ struct ObResolverParams {
new_cte_tid_(common::OB_MIN_CTE_TABLE_ID),
new_gen_wid_(1),
is_multi_table_insert_(false),
is_resolve_table_function_expr_(false)
is_resolve_table_function_expr_(false),
is_column_ref_(true)
{}
bool is_force_trace_log()
{
@ -339,6 +340,7 @@ private:
public:
bool is_multi_table_insert_; // used to mark is multi table insert
bool is_resolve_table_function_expr_; // used to mark resolve table function expr.
bool is_column_ref_; // used to mark normal column ref
};
} // end namespace sql
} // end namespace oceanbase