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

Fix sstable exist with rowsinfo

Browse Source
This commit is contained in:
haitaoyang
2024-03-29 06:15:58 +00:00
committed by ob-robot
parent 4362e9c224
commit 080d9f785a
2 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/storage/blocksstable/ob_sstable.cpp
View File

@ -656,8 +656,15 @@ int ObSSTable::exist(ObRowsInfo &rows_info, bool &is_exist, bool &all_rows_found
} else { } else {
ObStoreRowIterator *iter = nullptr; ObStoreRowIterator *iter = nullptr;
const ObDatumRow *store_row = nullptr; const ObDatumRow *store_row = nullptr;
common::ObSEArray<ObDatumRowkey, ObRowsInfo::MAX_ROW_KEYS_ON_STACK> datum_rowkeys;
if (OB_FAIL(build_multi_exist_iterator(rows_info, iter))) { for (int64_t i = 0; OB_SUCC(ret) && i < rows_info.rowkeys_.count(); i++) {
if (OB_FAIL(datum_rowkeys.push_back(rows_info.get_rowkey(i)))) {
LOG_WARN("Failed to push back rowkey", K(ret), K(i), K(rows_info.rowkeys_.count()));
}
}
if (OB_FAIL(ret)) {
} else if (OB_FAIL(build_multi_exist_iterator(rows_info.exist_helper_.table_iter_param_, datum_rowkeys,
rows_info.exist_helper_.table_access_context_, iter))) {
LOG_WARN("Fail to build multi exist iterator", K(ret)); LOG_WARN("Fail to build multi exist iterator", K(ret));
} }
@ -1729,25 +1736,28 @@ int ObSSTable::build_exist_iterator(
return ret; return ret;
} }
int ObSSTable::build_multi_exist_iterator(ObRowsInfo &rows_info, ObStoreRowIterator *&iter) int ObSSTable::build_multi_exist_iterator(
const ObTableIterParam &iter_param,
const common::ObIArray<blocksstable::ObDatumRowkey> &rowkeys,
ObTableAccessContext &access_context,
ObStoreRowIterator *&iter)
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
void *buf = nullptr; void *buf = nullptr;
ObStoreRowIterator *tmp_iter = nullptr; ObStoreRowIterator *tmp_iter = nullptr;
ObTableAccessContext &context = rows_info.exist_helper_.table_access_context_;
if (!contain_uncommitted_row()) { if (!contain_uncommitted_row()) {
ALLOCATE_TABLE_STORE_ROW_IETRATOR(context, ObSSTableRowMultiExister, tmp_iter); ALLOCATE_TABLE_STORE_ROW_IETRATOR(access_context, ObSSTableRowMultiExister, tmp_iter);
} else if (is_multi_version_minor_sstable()) { } else if (is_multi_version_minor_sstable()) {
ALLOCATE_TABLE_STORE_ROW_IETRATOR(context, ObSSTableMultiVersionRowMultiGetter, tmp_iter); ALLOCATE_TABLE_STORE_ROW_IETRATOR(access_context, ObSSTableMultiVersionRowMultiGetter, tmp_iter);
} else { } else {
ALLOCATE_TABLE_STORE_ROW_IETRATOR(context, ObSSTableRowMultiGetter, tmp_iter); ALLOCATE_TABLE_STORE_ROW_IETRATOR(access_context, ObSSTableRowMultiGetter, tmp_iter);
} }
if (OB_FAIL(ret)) { if (OB_FAIL(ret)) {
} else if (OB_FAIL(tmp_iter->init(rows_info.exist_helper_.table_iter_param_, } else if (OB_FAIL(tmp_iter->init(iter_param,
context, access_context,
this, &rows_info.rowkeys_))) { this, &rowkeys))) {
LOG_WARN("Fail to init store row iter", K(ret)); LOG_WARN("Fail to init store row iter", K(ret));
} else { } else {
iter = tmp_iter; iter = tmp_iter;
@ -1755,7 +1765,7 @@ int ObSSTable::build_multi_exist_iterator(ObRowsInfo &rows_info, ObStoreRowItera
if (OB_FAIL(ret) && OB_NOT_NULL(tmp_iter)) { if (OB_FAIL(ret) && OB_NOT_NULL(tmp_iter)) {
tmp_iter->~ObStoreRowIterator(); tmp_iter->~ObStoreRowIterator();
FREE_TABLE_STORE_ROW_IETRATOR(context, tmp_iter); FREE_TABLE_STORE_ROW_IETRATOR(access_context, tmp_iter);
tmp_iter = nullptr; tmp_iter = nullptr;
} }

6
src/storage/blocksstable/ob_sstable.h
View File

@ -344,7 +344,11 @@ protected:
const ObDatumRowkey &rowkey, const ObDatumRowkey &rowkey,
ObTableAccessContext &access_context, ObTableAccessContext &access_context,
ObStoreRowIterator *&iter); ObStoreRowIterator *&iter);
int build_multi_exist_iterator(ObRowsInfo &rows_info, ObStoreRowIterator *&iter); int build_multi_exist_iterator(
const ObTableIterParam &iter_param,
const common::ObIArray<blocksstable::ObDatumRowkey> &rowkeys,
ObTableAccessContext &access_context,
ObStoreRowIterator *&iter);
int init_sstable_meta(const ObTabletCreateSSTableParam &param, common::ObArenaAllocator *allocator); int init_sstable_meta(const ObTabletCreateSSTableParam &param, common::ObArenaAllocator *allocator);
int get_last_rowkey(const ObDatumRowkey *&sstable_endkey); int get_last_rowkey(const ObDatumRowkey *&sstable_endkey);
int serialize_fixed_struct(char *buf, const int64_t buf_len, int64_t &pos) const; int serialize_fixed_struct(char *buf, const int64_t buf_len, int64_t &pos) const;