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

fix parallel external sort defend too strict issue

Browse Source
This commit is contained in:
oceanoverflow
2023-03-28 02:41:43 +00:00
committed by ob-robot
parent 1bb857cd7e
commit f4e79369a0
2 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/storage/ob_parallel_external_sort.h
View File

@ -1889,7 +1889,7 @@ int ObExternalSort<T, Compare>::get_next_item(const T *&item)
if (OB_SUCC(ret)) { if (OB_SUCC(ret)) {
get_count_++; get_count_++;
} }
if (common::OB_ITER_END == ret && add_count_ != get_count_) { if (common::OB_ITER_END == ret && is_sorted_ && add_count_ != get_count_) {
ret = common::OB_ERR_SYS; ret = common::OB_ERR_SYS;
STORAGE_LOG(WARN, "add count not match get count", K(ret), K_(add_count), K_(get_count)); STORAGE_LOG(WARN, "add count not match get count", K(ret), K_(add_count), K_(get_count));
} }

23
unittest/storage/test_parallel_external_sort.cpp
View File

@ -951,6 +951,29 @@ TEST_F(TestParallelExternalSort, test_multi_task_sort)
test_multi_task_sort(buf_mem_limit, file_buf_size, 10000, task_cnt); test_multi_task_sort(buf_mem_limit, file_buf_size, 10000, task_cnt);
} }
TEST_F(TestParallelExternalSort, test_get_before_sort)
{
int ret = OB_SUCCESS;
const int64_t file_buf_size = MACRO_BLOCK_SIZE;
const int64_t buf_mem_limit = 8 * 1024 * 1024L;
typedef ObExternalSort<TestItem, TestItemCompare> ExternalSort;
ExternalSort external_sort;
ObVector<TestItem *>total_items;
TestItemCompare compare(ret);
const int64_t expire_timestamp = 0;
ret = external_sort.init(buf_mem_limit, file_buf_size, expire_timestamp, OB_SYS_TENANT_ID, &compare);
ASSERT_EQ(OB_SUCCESS, ret);
ret = generate_items(10, false, total_items);
ASSERT_EQ(OB_SUCCESS, ret);
for (int64_t i = 0; OB_SUCC(ret) && i < total_items.size(); ++i) {
ret = external_sort.add_item(*total_items.at(i));
ASSERT_EQ(OB_SUCCESS, ret);
}
const TestItem *item = NULL;
ret = external_sort.get_next_item(item);
ASSERT_EQ(OB_ITER_END, ret);
}
} // end namespace common } // end namespace common
} // end namespace oceanbase } // end namespace oceanbase