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

[bugfix] fix rollup bug

Browse Source
This commit is contained in:
obdev
2023-03-06 10:11:21 +00:00
committed by ob-robot
parent d7da0bcfb3
commit 115b2dc7f0
4 changed files with 53 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1002,6 +1002,7 @@ int ObSelectResolver::resolve_normal_query(const ParseNode &parse_tree)
const ParseNode *group_by = NULL;
const ParseNode *having = NULL;
ObSelectStmt *select_stmt = get_select_stmt();
bool has_rollup = false;
CK(OB_NOT_NULL(select_stmt),
OB_NOT_NULL(session_info_),
OB_NOT_NULL(select_stmt->get_query_ctx()));
@ -1023,6 +1024,7 @@ int ObSelectResolver::resolve_normal_query(const ParseNode &parse_tree)
OZ( search_connect_group_by_clause(parse_tree, start_with, connect_by, group_by, having) );
if (OB_SUCC(ret) && OB_NOT_NULL(group_by)) {
set_has_group_by_clause();
OZ (check_rollup_clause(group_by, has_rollup));
}
if (OB_SUCC(ret) && (start_with != NULL || connect_by != NULL)) {
select_stmt->set_hierarchical_query(true);
@ -1044,11 +1046,19 @@ int ObSelectResolver::resolve_normal_query(const ParseNode &parse_tree)
if (!is_oracle_mode()) {
// mysql resolve: from->where->select_item->group by->having->order by
count_name_win_expr = select_stmt->get_window_func_count();
if (has_rollup) {
expr_resv_ctx_.set_new_scope();
}
OZ( resolve_field_list(*(parse_tree.children_[PARSE_SELECT_SELECT])));
}
/* resolve group by clause */
OZ( resolve_group_clause(group_by) );
if (has_rollup && is_oracle_mode()) {
expr_resv_ctx_.set_new_scope();
}
/* resolve having clause */
OZ( resolve_having_clause(having) );
@ -3605,6 +3615,30 @@ int ObSelectResolver::resolve_group_clause(const ParseNode *node)
return ret;
}
int ObSelectResolver::check_rollup_clause(const ParseNode *node, bool &has_rollup)
{
int ret = OB_SUCCESS;
if (OB_ISNULL(node) || OB_ISNULL(node->children_) ||
OB_UNLIKELY(T_GROUPBY_CLAUSE != node->type_)) {
ret = OB_INVALID_ARGUMENT;
LOG_WARN("invalid resolver arguments", K(ret), K(node));
} else {
for (int64_t i = 0; OB_SUCC(ret) && i < node->num_child_; ++i) {
const ParseNode *child_node = node->children_[i];
if (OB_ISNULL(child_node)) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("get unexpected null", K(ret), K(child_node));
} else if (child_node->type_ == T_ROLLUP_LIST ||
child_node->type_ == T_CUBE_LIST ||
child_node->type_ == T_GROUPING_SETS_LIST ||
child_node->type_ == T_WITH_ROLLUP_CLAUSE) {
has_rollup = true;
}
}
}
return ret;
}
int ObSelectResolver::resolve_group_by_list(const ParseNode *node,
common::ObIArray<ObRawExpr*> &groupby_exprs,
common::ObIArray<ObRawExpr*> &rollup_exprs,

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

@ -147,6 +147,8 @@ protected:
ObSelectStmt *select_stmt,
bool &has_explicit_dir,
bool is_groupby_expr);
int check_rollup_clause(const ParseNode *node, bool &has_rollup);
int resolve_group_by_list(const ParseNode *node,
common::ObIArray<ObRawExpr*> &groupby_exprs,
common::ObIArray<ObRawExpr*> &rollup_exprs,