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

change allocator type

Browse Source
This commit is contained in:
renju96
2024-02-08 07:10:24 +00:00
committed by ob-robot
parent 2790042ada
commit 212662cdcf
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/storage/blocksstable/index_block/ob_ddl_index_block_row_iterator.cpp
View File

@ -355,12 +355,12 @@ int ObDDLIndexBlockRowIterator::get_index_row_count(const ObDatumRange &range,
ObDDLSStableAllRangeIterator::ObDDLSStableAllRangeIterator() ObDDLSStableAllRangeIterator::ObDDLSStableAllRangeIterator()
: is_iter_start_(false), : is_iter_start_(false),
is_iter_finish_(true), is_iter_finish_(true),
allocator_(nullptr),
rowkey_read_info_(nullptr), rowkey_read_info_(nullptr),
cur_rowkey_(nullptr), cur_rowkey_(nullptr),
cur_header_(nullptr), cur_header_(nullptr),
index_macro_iter_(), index_macro_iter_(),
iter_param_() iter_param_(),
macro_iter_allocator_("DDLMerge_Iter", OB_MALLOC_NORMAL_BLOCK_SIZE, MTL_ID())
{ {
} }
@ -374,11 +374,11 @@ void ObDDLSStableAllRangeIterator::reset()
ObIndexBlockRowIterator::reset(); ObIndexBlockRowIterator::reset();
is_iter_finish_ = true; is_iter_finish_ = true;
is_iter_start_ = false; is_iter_start_ = false;
allocator_ = nullptr;
rowkey_read_info_ = nullptr; rowkey_read_info_ = nullptr;
cur_rowkey_ = nullptr; cur_rowkey_ = nullptr;
cur_header_ = nullptr; cur_header_ = nullptr;
index_macro_iter_.reset(); index_macro_iter_.reset();
macro_iter_allocator_.reset();
iter_param_.reset(); iter_param_.reset();
} }
@ -390,6 +390,7 @@ void ObDDLSStableAllRangeIterator::reuse()
cur_rowkey_ = nullptr; cur_rowkey_ = nullptr;
cur_header_ = nullptr; cur_header_ = nullptr;
index_macro_iter_.reset(); index_macro_iter_.reset();
macro_iter_allocator_.reset();
iter_param_.reset(); iter_param_.reset();
} }
@ -401,9 +402,9 @@ int ObDDLSStableAllRangeIterator::init(const ObMicroBlockData &idx_block_data,
const ObIndexBlockIterParam &iter_param) const ObIndexBlockIterParam &iter_param)
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
if (OB_ISNULL(allocator) || OB_ISNULL(datum_utils) || !datum_utils->is_valid() || !iter_param.is_valid()) { if (OB_ISNULL(datum_utils) || !datum_utils->is_valid() || !iter_param.is_valid()) {
ret = OB_INVALID_ARGUMENT; ret = OB_INVALID_ARGUMENT;
LOG_WARN("invalid arguement", K(ret), KP(allocator), KPC(datum_utils), K(iter_param)); LOG_WARN("invalid arguement", K(ret), KPC(datum_utils), K(iter_param));
} else { } else {
ObTablet *cur_tablet = nullptr; ObTablet *cur_tablet = nullptr;
ObTabletHandle tmp_tablet_handle; ObTabletHandle tmp_tablet_handle;
@ -427,7 +428,6 @@ int ObDDLSStableAllRangeIterator::init(const ObMicroBlockData &idx_block_data,
if (OB_SUCC(ret)) { if (OB_SUCC(ret)) {
rowkey_read_info_ = &cur_tablet->get_rowkey_read_info(); rowkey_read_info_ = &cur_tablet->get_rowkey_read_info();
allocator_ = allocator;
iter_param_ = iter_param; iter_param_ = iter_param;
is_reverse_scan_ = is_reverse_scan; is_reverse_scan_ = is_reverse_scan;
@ -455,7 +455,7 @@ int ObDDLSStableAllRangeIterator::locate_key(const ObDatumRowkey &rowkey)
range.set_left_closed(); range.set_left_closed();
range.set_right_closed(); range.set_right_closed();
ObSSTable *sstable = const_cast<ObSSTable *>(iter_param_.sstable_); ObSSTable *sstable = const_cast<ObSSTable *>(iter_param_.sstable_);
if (OB_FAIL(index_macro_iter_.open(*sstable, range, *rowkey_read_info_, *allocator_, is_reverse_scan_))) { if (OB_FAIL(index_macro_iter_.open(*sstable, range, *rowkey_read_info_, macro_iter_allocator_, is_reverse_scan_))) {
LOG_WARN("Fail to open micro block range iterator", K(ret), KPC(iter_param_.sstable_), K(range), KPC(rowkey_read_info_), K(is_reverse_scan_)); LOG_WARN("Fail to open micro block range iterator", K(ret), KPC(iter_param_.sstable_), K(range), KPC(rowkey_read_info_), K(is_reverse_scan_));
is_iter_finish_ = true; is_iter_finish_ = true;
} else if (index_macro_iter_.is_iter_end()) { } else if (index_macro_iter_.is_iter_end()) {
@ -482,7 +482,7 @@ int ObDDLSStableAllRangeIterator::locate_range(const ObDatumRange &range,
} else if (OB_UNLIKELY(!range.is_valid())) { } else if (OB_UNLIKELY(!range.is_valid())) {
ret = OB_INVALID_ARGUMENT; ret = OB_INVALID_ARGUMENT;
LOG_WARN("invalid range", K(ret), K(range)); LOG_WARN("invalid range", K(ret), K(range));
} else if (OB_FAIL(index_macro_iter_.open(*sstable, range, *rowkey_read_info_, *allocator_, is_reverse_scan_))) { } else if (OB_FAIL(index_macro_iter_.open(*sstable, range, *rowkey_read_info_, macro_iter_allocator_, is_reverse_scan_))) {
is_iter_finish_ = true; is_iter_finish_ = true;
LOG_WARN("block meta tree locate range failed", K(ret), K(range)); LOG_WARN("block meta tree locate range failed", K(ret), K(range));
} else if (index_macro_iter_.is_iter_end()) { } else if (index_macro_iter_.is_iter_end()) {
@ -589,7 +589,7 @@ int ObDDLSStableAllRangeIterator::get_index_row_count(const ObDatumRange &range,
} else if (OB_UNLIKELY(!range.is_valid())) { } else if (OB_UNLIKELY(!range.is_valid())) {
ret = OB_INVALID_ARGUMENT; ret = OB_INVALID_ARGUMENT;
LOG_WARN("invalid arguement", K(ret), K(range)); LOG_WARN("invalid arguement", K(ret), K(range));
} else if (OB_FAIL(tmp_index_macro_iter.open(*sstable, range, *rowkey_read_info_, *allocator_, is_reverse_scan_))) { } else if (OB_FAIL(tmp_index_macro_iter.open(*sstable, range, *rowkey_read_info_, macro_iter_allocator_, is_reverse_scan_))) {
LOG_WARN("tmp all range iter locate range failed", K(ret), K(range)); LOG_WARN("tmp all range iter locate range failed", K(ret), K(range));
} else { } else {
bool tmp_reach_cursor_end = false; bool tmp_reach_cursor_end = false;

4
src/storage/blocksstable/index_block/ob_ddl_index_block_row_iterator.h
View File

@ -114,17 +114,17 @@ public:
virtual void reuse() override; virtual void reuse() override;
virtual void reset() override; virtual void reset() override;
INHERIT_TO_STRING_KV("base iterator:", ObIndexBlockRowIterator, "format:", "ObDDLSStableAllRangeIterator", K(is_iter_start_), K(is_iter_finish_), INHERIT_TO_STRING_KV("base iterator:", ObIndexBlockRowIterator, "format:", "ObDDLSStableAllRangeIterator", K(is_iter_start_), K(is_iter_finish_),
KP(allocator_), KPC(rowkey_read_info_), K(index_macro_iter_), K(iter_param_), KP(cur_rowkey_), KP(cur_header_)); KPC(rowkey_read_info_), K(index_macro_iter_), K(iter_param_), KP(cur_rowkey_), KP(cur_header_));
private: private:
bool is_iter_start_; bool is_iter_start_;
bool is_iter_finish_; bool is_iter_finish_;
ObIAllocator *allocator_;
const ObITableReadInfo *rowkey_read_info_; const ObITableReadInfo *rowkey_read_info_;
const blocksstable::ObDatumRowkey *cur_rowkey_; const blocksstable::ObDatumRowkey *cur_rowkey_;
const blocksstable::ObIndexBlockRowHeader *cur_header_; const blocksstable::ObIndexBlockRowHeader *cur_header_;
ObIndexBlockMacroIterator index_macro_iter_; ObIndexBlockMacroIterator index_macro_iter_;
ObIndexBlockIterParam iter_param_; ObIndexBlockIterParam iter_param_;
ObArenaAllocator macro_iter_allocator_;
}; };
// for empty ddl_merge_sstable // for empty ddl_merge_sstable