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

fix merge 4103

Browse Source
This commit is contained in:
z404289981
2024-03-18 06:15:59 +00:00
committed by ob-robot
parent 4390e56ec0
commit 7d023cf96b
6 changed files with 36 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/storage/compaction/ob_partition_merge_fuser.cpp
View File

@ -241,9 +241,11 @@ int ObMajorPartitionMergeFuser::inner_init(const ObMergeParameter &merge_param)
const common::ObIArray<share::schema::ObColDesc> &multi_version_column_ids = merge_param.static_param_.multi_version_column_descs_;
const ObStorageSchema *schema = merge_param.get_schema();
column_cnt_ = multi_version_column_ids.count();
const bool need_trim_default_row = cluster_version_ >= DATA_VERSION_4_3_1_0 || cluster_version_ < DATA_VERSION_4_3_0_0;
if (OB_FAIL(default_row_.init(allocator_, column_cnt_))) {
STORAGE_LOG(WARN, "Failed to init datum row", K(ret), K_(column_cnt));
} else if (OB_FAIL(schema->get_orig_default_row(multi_version_column_ids, default_row_))) {
} else if (OB_FAIL(schema->get_orig_default_row(multi_version_column_ids, need_trim_default_row, default_row_))) {
STORAGE_LOG(WARN, "Failed to get default row from table schema", K(ret), K(multi_version_column_ids));
} else if (OB_FAIL(ObLobManager::fill_lob_header(allocator_, multi_version_column_ids, default_row_))) {
STORAGE_LOG(WARN, "fail to fill lob header for default row", K(ret), K(multi_version_column_ids));
@ -373,6 +375,7 @@ int ObMinorPartitionMergeFuser::preprocess_fuse_row(const blocksstable::ObDatumR
int ObMergeFuserBuilder::build(const ObMergeParameter &merge_param,
const int64_t cluster_version,
ObIAllocator &allocator,
ObIPartitionMergeFuser *&partition_fuser)
{
@ -388,7 +391,7 @@ int ObMergeFuserBuilder::build(const ObMergeParameter &merge_param,
partition_fuser = alloc_helper<ObCOMinorSSTableFuser>(allocator, allocator);
} else if (is_major_or_meta_merge_type(merge_type)) {
is_fuse_row_flag = false;
partition_fuser = alloc_helper<ObMajorPartitionMergeFuser>(allocator, allocator);
partition_fuser = alloc_helper<ObMajorPartitionMergeFuser>(allocator, allocator, cluster_version);
} else {
partition_fuser = alloc_helper<ObMinorPartitionMergeFuser>(allocator, allocator);
}

19
src/storage/compaction/ob_partition_merge_fuser.h
View File

@ -145,10 +145,11 @@ protected:
class ObMajorPartitionMergeFuser : public ObIPartitionMergeFuser
{
public:
ObMajorPartitionMergeFuser(common::ObIAllocator &allocator)
ObMajorPartitionMergeFuser(common::ObIAllocator &allocator, const int64_t cluster_version)
: ObIPartitionMergeFuser(allocator),
default_row_(),
generated_cols_(allocator_)
generated_cols_(allocator_),
cluster_version_(cluster_version)
{}
virtual ~ObMajorPartitionMergeFuser();
virtual int end_fuse_row(const storage::ObNopPos &nop_pos, blocksstable::ObDatumRow &result_row) override;
@ -158,22 +159,11 @@ protected:
protected:
blocksstable::ObDatumRow default_row_;
ObFixedArray<int32_t, ObIAllocator> generated_cols_;
const int64_t cluster_version_;
private:
DISALLOW_COPY_AND_ASSIGN(ObMajorPartitionMergeFuser);
};
class ObMetaPartitionMergeFuser : public ObMajorPartitionMergeFuser
{
public:
ObMetaPartitionMergeFuser(common::ObIAllocator &allocator) : ObMajorPartitionMergeFuser(allocator) {}
virtual ~ObMetaPartitionMergeFuser() {}
INHERIT_TO_STRING_KV("ObMajorPartitionMergeFuser", ObMajorPartitionMergeFuser,
"cur_fuser", "ObMetaPartitionMergeFuser");
private:
DISALLOW_COPY_AND_ASSIGN(ObMetaPartitionMergeFuser);
};
class ObMinorPartitionMergeFuser : public ObIPartitionMergeFuser
{
public:
@ -197,6 +187,7 @@ protected:
class ObMergeFuserBuilder {
public:
static int build(const ObMergeParameter &merge_param,
const int64_t cluster_version,
ObIAllocator &allocator,
ObIPartitionMergeFuser *&partition_fuser);
};

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

@ -263,7 +263,7 @@ int ObMerger::prepare_merge(ObBasicTabletMergeCtx &ctx, const int64_t idx)
} else {
merge_param_.trans_state_mgr_ = &trans_state_mgr_;
}
if (OB_FAIL(ObMergeFuserBuilder::build(merge_param_, merger_arena_, partition_fuser_))) {
if (OB_FAIL(ObMergeFuserBuilder::build(merge_param_, ctx.static_desc_.major_working_cluster_version_ ,merger_arena_, partition_fuser_))) {
STORAGE_LOG(WARN, "failed to build partition fuser", K(ret), K(merge_param_));
} else if (OB_FAIL(inner_prepare_merge(ctx, idx))) {
STORAGE_LOG(WARN, "failed to inner prepare merge", K(ret), K(ctx));