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

Fix mysql rollup duplicate columns wrong result in parallel rollup

Browse Source
This commit is contained in:
hezuojiao
2023-05-29 11:41:08 +00:00
committed by ob-robot
parent 7abde61e9c
commit 15254bd0e4
2 changed files with 5185 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/sql/engine/aggregate/ob_merge_groupby_op.cpp
View File

@ -408,7 +408,7 @@ int ObMergeGroupByOp::find_candidate_key(ObRollupNDVInfo &ndv_info)
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
int64_t n_group = MY_SPEC.group_exprs_.count(); int64_t n_group = MY_SPEC.group_exprs_.count();
uint64_t candicate_ndv = 0; uint64_t candidate_ndv = 0;
ObPxSqcHandler *sqc_handle = ctx_.get_sqc_handler(); ObPxSqcHandler *sqc_handle = ctx_.get_sqc_handler();
ndv_info.dop_ = 1; ndv_info.dop_ = 1;
// ndv_info.max_keys_ = 0; // ndv_info.max_keys_ = 0;
@ -420,22 +420,25 @@ int ObMergeGroupByOp::find_candidate_key(ObRollupNDVInfo &ndv_info)
ObPxRpcInitSqcArgs &sqc_args = sqc_handle->get_sqc_init_arg(); ObPxRpcInitSqcArgs &sqc_args = sqc_handle->get_sqc_init_arg();
ndv_info.dop_ = sqc_args.sqc_.get_total_task_count(); ndv_info.dop_ = sqc_args.sqc_.get_total_task_count();
} }
const bool is_mysql_mode = lib::is_mysql_mode();
for (int64_t i = 0; i < MY_SPEC.rollup_exprs_.count() + 1 && OB_SUCC(ret); ++i) { for (int64_t i = 0; i < MY_SPEC.rollup_exprs_.count() + 1 && OB_SUCC(ret); ++i) {
if (0 == n_group && i == MY_SPEC.rollup_exprs_.count()) { if (0 == n_group && i == MY_SPEC.rollup_exprs_.count()) {
break; break;
} }
candicate_ndv = ndv_calculator_[i].estimate(); candidate_ndv = ndv_calculator_[i].estimate();
if (candicate_ndv >= ObRollupKeyPieceMsgCtx::FAR_GREATER_THAN_RATIO * ndv_info.dop_) { if ((is_mysql_mode && MY_SPEC.is_duplicate_rollup_expr_[i]) ||
ndv_info.ndv_ = candicate_ndv; (candidate_ndv >= ObRollupKeyPieceMsgCtx::FAR_GREATER_THAN_RATIO * ndv_info.dop_)) {
ndv_info.ndv_ = candidate_ndv;
ndv_info.n_keys_ = 0 == n_group ? i + 1 : i + n_group; ndv_info.n_keys_ = 0 == n_group ? i + 1 : i + n_group;
break; break;
} }
} }
if (0 == ndv_info.n_keys_) { if (0 == ndv_info.n_keys_) {
// can't found, use all groupby keys // can't found, use all groupby keys
ndv_info.ndv_ = candicate_ndv; ndv_info.ndv_ = candidate_ndv;
ndv_info.n_keys_ = all_groupby_exprs_.count(); ndv_info.n_keys_ = all_groupby_exprs_.count();
} }
LOG_INFO("find candidate rollup key", K(ndv_info));
return ret; return ret;
} }

5177
tools/deploy/mysql_test/test_suite/geometry/t/default_srs_data_mysql.sql Normal file
View File

File diff suppressed because it is too large Load Diff