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

[BUGFIX] fix hash distinct

Browse Source
This commit is contained in:
obdev
2023-05-06 06:12:00 +00:00
committed by ob-robot
parent 9e328378c8
commit 4b60f93f18
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/sql/engine/basic/ob_hash_partitioning_infrastructure_op.cpp
View File

@ -85,7 +85,7 @@ int ObHashPartCols::equal_distinct(
ObDatum *l_cells = store_row_->cells(); ObDatum *l_cells = store_row_->cells();
ObDatum *r_cell = nullptr; ObDatum *r_cell = nullptr;
// must evaled in calc_hash_values // must evaled in calc_hash_values
for (int64_t i = 0; i < OB_SUCC(ret) && sort_collations->count() && 0 == cmp_result; ++i) { for (int64_t i = 0; OB_SUCC(ret) && i < sort_collations->count() && 0 == cmp_result; ++i) {
int64_t idx = sort_collations->at(i).field_idx_; int64_t idx = sort_collations->at(i).field_idx_;
r_cell = &exprs->at(idx)->locate_expr_datum(*eval_ctx); r_cell = &exprs->at(idx)->locate_expr_datum(*eval_ctx);
if (OB_FAIL(cmp_funcs->at(i).cmp_func_(l_cells[idx], *r_cell, cmp_result))) { if (OB_FAIL(cmp_funcs->at(i).cmp_func_(l_cells[idx], *r_cell, cmp_result))) {

2
src/sql/privilege_check/ob_ora_priv_check.cpp
View File

@ -2626,7 +2626,7 @@ int ObOraSysChecker::check_ora_grant_role_priv(
2. 对于每个role id，根据user info，或者下标 2. 对于每个role id，根据user info，或者下标
3. 调用get nth role option获取option 3. 调用get nth role option获取option
4. 调用get_admin_option 判断是否有 admin option */ 4. 调用get_admin_option 判断是否有 admin option */
for (int i = 0; i < OB_SUCC(ret) && role_granted_id_array.count(); i++) { for (int i = 0; OB_SUCC(ret) && i < role_granted_id_array.count(); i++) {
if (!user_info->role_exists(role_granted_id_array.at(i), ADMIN_OPTION)) { if (!user_info->role_exists(role_granted_id_array.at(i), ADMIN_OPTION)) {
const ObUserInfo *user_info = NULL; const ObUserInfo *user_info = NULL;
OZ (guard.get_user_info(tenant_id, role_granted_id_array.at(i), user_info)); OZ (guard.get_user_info(tenant_id, role_granted_id_array.at(i), user_info));