Merge branch 'column_store'

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

View File

@ -89,13 +89,13 @@ bool ObSnapshotInfo::is_valid() const
return bret;
}
const char * ObSnapshotInfo::get_snapshot_type_str() const
const char * ObSnapshotInfo::get_snapshot_type_str(const ObSnapShotType &snapshot_type)
{
const char * str = nullptr;
if (OB_UNLIKELY(snapshot_type_ < SNAPSHOT_FOR_MAJOR || snapshot_type_ >= MAX_SNAPSHOT_TYPE)) {
if (OB_UNLIKELY(snapshot_type < SNAPSHOT_FOR_MAJOR || snapshot_type >= MAX_SNAPSHOT_TYPE)) {
str = "invalid_snapshot_type";
} else {
str = ObSnapShotTypeStr[snapshot_type_];
str = ObSnapShotTypeStr[snapshot_type];
}
return str;
}