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

Merge branch 'column_store'

Browse Source 
Co-authored-by: wangt1xiuyi <13547954130@163.com>
Co-authored-by: yangqise7en <877793735@qq.com>
Co-authored-by: Zach41 <zach_41@163.com>
This commit is contained in:
chaser-ch
2023-10-31 15:39:20 +00:00
committed by ob-robot
parent 4057fbc4ae
commit 566e920620
1375 changed files with 239147 additions and 56014 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/storage/ob_storage_struct.cpp
View File

@ -19,6 +19,7 @@
using namespace oceanbase;
using namespace storage;
using namespace compaction;
using namespace common;
using namespace oceanbase::share::schema;
using namespace oceanbase::share;
@ -237,8 +238,8 @@ ObGetMergeTablesParam::ObGetMergeTablesParam()
bool ObGetMergeTablesParam::is_valid() const
{
return (merge_type_ > INVALID_MERGE_TYPE && merge_type_ < MERGE_TYPE_MAX)
&& (!storage::is_major_merge_type(merge_type_) || merge_version_ > 0);
return is_valid_merge_type(merge_type_)
&& (!compaction::is_major_merge_type(merge_type_) || merge_version_ > 0);
}
ObGetMergeTablesResult::ObGetMergeTablesResult()
@ -246,21 +247,22 @@ ObGetMergeTablesResult::ObGetMergeTablesResult()
handle_(),
merge_version_(),
create_snapshot_version_(INVALID_INT_VALUE),
suggest_merge_type_(INVALID_MERGE_TYPE),
update_tablet_directly_(false),
schedule_major_(false),
is_simplified_(false),
scn_range_(),
read_base_version_(0)
read_base_version_(0),
error_location_(nullptr),
snapshot_info_()
{
}
bool ObGetMergeTablesResult::is_valid() const
{
return scn_range_.is_valid()
&& handle_.get_count() >= 1
&& (is_simplified_ || handle_.get_count() >= 1)
&& merge_version_ >= 0
&& create_snapshot_version_ >= 0
&& (suggest_merge_type_ > INVALID_MERGE_TYPE && suggest_merge_type_ < MERGE_TYPE_MAX);
&& create_snapshot_version_ >= 0;
}
void ObGetMergeTablesResult::reset_handle_and_range()
@ -270,16 +272,24 @@ void ObGetMergeTablesResult::reset_handle_and_range()
scn_range_.reset();
}
void ObGetMergeTablesResult::simplify_handle()
{
handle_.reset();
is_simplified_ = true;
}
void ObGetMergeTablesResult::reset()
{
version_range_.reset();
handle_.reset();
merge_version_ = ObVersionRange::MIN_VERSION;
create_snapshot_version_ = 0;
suggest_merge_type_ = INVALID_MERGE_TYPE;
schedule_major_ = false;
scn_range_.reset();
read_base_version_ = 0;
error_location_ = nullptr;
is_simplified_ = false;
snapshot_info_.reset();
}
int ObGetMergeTablesResult::copy_basic_info(const ObGetMergeTablesResult &src)
@ -292,9 +302,10 @@ int ObGetMergeTablesResult::copy_basic_info(const ObGetMergeTablesResult &src)
version_range_ = src.version_range_;
merge_version_ = src.merge_version_;
create_snapshot_version_ = src.create_snapshot_version_;
suggest_merge_type_ = src.suggest_merge_type_;
schedule_major_ = src.schedule_major_;
scn_range_ = src.scn_range_;
error_location_ = src.error_location_;
is_simplified_ = src.is_simplified_;
}
return ret;
}
@ -334,6 +345,7 @@ bool ObDDLTableStoreParam::is_valid() const
&& data_format_version_ >= 0;
}
ObUpdateTableStoreParam::ObUpdateTableStoreParam(
const int64_t snapshot_version,
const int64_t multi_version_start,