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

use accurate sql in obtest & ignore TRANSFER_SEQ_NOT_EQUAL errno

Browse Source
This commit is contained in:
yangqise7en 2024-03-12 09:44:58 +00:00 committed by ob-robot
parent c0fafd502d
commit 8475beca3f
4 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/storage/column_store/ob_co_merge_writer.cpp
View File

@ -124,8 +124,8 @@ int ObWriteHelper::init(
int ret = OB_SUCCESS;
ObMacroDataSeq macro_start_seq(0);
if (OB_FAIL(ObDataDescHelper::build(merge_param, merge_info, data_store_desc_, merge_info_, cg_idx, &cg_schema))) {
STORAGE_LOG(WARN, "fail to build data desc", K(ret), K(cg_schema));
if (OB_FAIL(ObDataDescHelper::build(merge_param, merge_info, data_store_desc_, merge_info_))) {
STORAGE_LOG(WARN, "fail to build data desc", K(ret));
} else if (OB_FAIL(macro_start_seq.set_parallel_degree(parallel_idx))) {
STORAGE_LOG(WARN, "Failed to set parallel degree to macro start seq", K(ret), K(parallel_idx));
} else if (OB_FAIL(macro_writer_.open(data_store_desc_, macro_start_seq))) {

4
src/storage/compaction/ob_partition_merger.cpp
View File

@ -40,9 +40,7 @@ int ObDataDescHelper::build(
const ObMergeParameter &merge_param,
ObTabletMergeInfo &input_merge_info,
blocksstable::ObDataStoreDesc &data_store_desc,
ObSSTableMergeInfo &output_merge_info,
const uint16_t table_idx,
const storage::ObStorageColumnGroupSchema *cg_schema)
ObSSTableMergeInfo &output_merge_info)
{
int ret = OB_SUCCESS;
if (OB_FAIL(data_store_desc.shallow_copy(input_merge_info.get_sstable_build_desc().get_desc()))) {

4
src/storage/compaction/ob_partition_merger.h
View File

@ -54,9 +54,7 @@ public:
const ObMergeParameter &merge_param,
ObTabletMergeInfo &input_merge_info,
blocksstable::ObDataStoreDesc &data_store_desc,
ObSSTableMergeInfo &output_merge_info,
const uint16_t table_idx = 0,
const storage::ObStorageColumnGroupSchema *cg_schema = nullptr);
ObSSTableMergeInfo &output_merge_info);
};
class ObProgressiveMergeHelper final

3
src/storage/compaction/ob_tablet_merge_task.h
View File

@ -242,7 +242,8 @@ public:
|| OB_TENANT_HAS_BEEN_DROPPED == dag_ret
|| OB_LS_NOT_EXIST == dag_ret
|| OB_TABLET_NOT_EXIST == dag_ret
|| OB_CANCELED == dag_ret;
|| OB_CANCELED == dag_ret
|| OB_TABLET_TRANSFER_SEQ_NOT_MATCH == dag_ret;
}
int get_tablet_and_compat_mode();
int prepare_merge_ctx(bool &finish_flag); // should be called when the first task of dag starts running