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

Fix sort error invalid idx

Browse Source
This commit is contained in:
obdev
2024-07-22 13:19:38 +00:00
committed by ob-robot
parent 35db8e8d98
commit 96ca3131b4
2 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/sql/engine/sort/ob_sort_op_impl.cpp
View File

@ -1421,12 +1421,9 @@ int ObSortOpImpl::prepare_bucket_array(ArrayType *&buckets, uint64_t bucket_num)
SQL_ENG_LOG(WARN, "failed to init bucket", K(ret), K(bucket_num)); SQL_ENG_LOG(WARN, "failed to init bucket", K(ret), K(bucket_num));
} }
} else { } else {
int64_t max_bucket_cnt = buckets->get_capacity(); buckets->reuse();
if (max_bucket_cnt < bucket_num) { if (OB_FAIL(buckets->init(bucket_num))) {
buckets->reuse(); LOG_WARN("failed to init bucket array", K(ret), K(bucket_num));
if (OB_FAIL(buckets->init(bucket_num))) {
LOG_WARN("failed to init bucket array", K(ret), K(bucket_num));
}
} }
} }
return ret; return ret;

9
src/sql/engine/sort/ob_sort_vec_op_impl.h
View File

@ -381,12 +381,9 @@ protected:
SQL_ENG_LOG(WARN, "failed to init bucket", K(ret), K(bucket_num)); SQL_ENG_LOG(WARN, "failed to init bucket", K(ret), K(bucket_num));
} }
} else { } else {
int64_t max_bucket_cnt = buckets->get_capacity(); buckets->reuse();
if (max_bucket_cnt < bucket_num) { if (OB_FAIL(buckets->init(bucket_num))) {
buckets->reuse(); LOG_WARN("failed to init bucket array", K(ret), K(bucket_num));
if (OB_FAIL(buckets->init(bucket_num))) {
LOG_WARN("failed to init bucket array", K(ret), K(bucket_num));
}
} }
} }
return ret; return ret;