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

fix core for ObTxDataMemtable cast to ObMemtable

Browse Source
This commit is contained in:
yangqise7en
2023-06-22 09:12:16 +00:00
committed by ob-robot
parent 98fd008517
commit 7ee480eceb
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/storage/tablet/ob_table_store_util.cpp
View File

@ -650,12 +650,12 @@ int ObMemtableArray::build(
ObITable *table = nullptr;
for (int64_t i = start_pos; OB_SUCC(ret) && i < table_array.count(); ++i) {
memtable::ObMemtable *memtable = nullptr;
memtable::ObIMemtable *memtable = nullptr;
table = table_array.at(i);
if (OB_UNLIKELY(nullptr == table || !table->is_memtable())) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("table must be memtable", K(ret), K(i), KPC(table));
} else if (FALSE_IT(memtable = reinterpret_cast<memtable::ObMemtable *>(table))) {
} else if (FALSE_IT(memtable = reinterpret_cast<memtable::ObIMemtable *>(table))) {
} else if (memtable->is_empty()) {
FLOG_INFO("empty memtable discarded", KPC(memtable));
} else if (OB_UNLIKELY(count_ == MEMTABLE_ARRAY_SIZE)) {
@ -679,16 +679,16 @@ int ObMemtableArray::rebuild(const common::ObIArray<ObITable *> &table_array)
if (OB_FAIL(trim_empty_last_memtable())) {
LOG_WARN("failed to trim empty last memtable", K(ret));
} else {
const memtable::ObMemtable *last_memtable = count_ > 0 ? memtable_array_[count_ - 1] : nullptr;
const memtable::ObIMemtable *last_memtable = count_ > 0 ? memtable_array_[count_ - 1] : nullptr;
const share::SCN endscn = (NULL == last_memtable) ? share::SCN::min_scn() : last_memtable->get_end_scn();
for (int64_t i = 0; OB_SUCC(ret) && i < table_array.count(); ++i) {
memtable::ObMemtable *memtable = nullptr;
memtable::ObIMemtable *memtable = nullptr;
ObITable *table = table_array.at(i);
if (OB_UNLIKELY(nullptr == table || !table->is_memtable())) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("table must be memtable", K(ret), K(i), KPC(table));
} else if (FALSE_IT(memtable = static_cast<memtable::ObMemtable *>(table))) {
} else if (FALSE_IT(memtable = static_cast<memtable::ObIMemtable *>(table))) {
} else if (memtable->is_empty()) {
FLOG_INFO("Empty memtable discarded", KPC(memtable));
} else if (table->get_end_scn() < endscn) {
@ -718,12 +718,12 @@ int ObMemtableArray::rebuild(
} else {
// use clog checkpoint scn to filter memtable array
for (int64_t i = 0; OB_SUCC(ret) && i < table_array.count(); ++i) {
memtable::ObMemtable *memtable = nullptr;
memtable::ObIMemtable *memtable = nullptr;
ObITable *table = table_array.at(i);
if (OB_UNLIKELY(nullptr == table || !table->is_memtable())) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("table must be memtable", K(ret), K(i), KPC(table));
} else if (FALSE_IT(memtable = static_cast<memtable::ObMemtable *>(table))) {
} else if (FALSE_IT(memtable = static_cast<memtable::ObIMemtable *>(table))) {
} else if (memtable->is_empty()) {
FLOG_INFO("Empty memtable discarded", K(ret), KPC(memtable));
} else if (table->get_end_scn() <= clog_checkpoint_scn) {
@ -829,7 +829,7 @@ int64_t ObMemtableArray::to_string(char *buf, const int64_t buf_len) const
J_NAME("ObMemtableArray");
J_KV(KP(this),
K_(count),
"memtable_ptr_array", ObArrayWrap<memtable::ObMemtable *>(memtable_array_, count_));
"memtable_ptr_array", ObArrayWrap<memtable::ObIMemtable *>(memtable_array_, count_));
J_OBJ_END();
}
return pos;

4
src/storage/tablet/ob_table_store_util.h
View File

@ -95,7 +95,7 @@ class ObMemtableArray
public:
static constexpr int64_t MEMTABLE_ARRAY_SIZE =16;
ObMemtableArray() : memtable_array_(), count_(0) {}
OB_INLINE memtable::ObMemtable *operator[](const int64_t pos) const
OB_INLINE memtable::ObIMemtable *operator[](const int64_t pos) const
{
OB_ASSERT(pos < count_ && pos >= 0);
return memtable_array_[pos];
@ -116,7 +116,7 @@ public:
int64_t to_string(char *buf, const int64_t buf_len) const;
private:
int trim_empty_last_memtable();
memtable::ObMemtable *memtable_array_[MEMTABLE_ARRAY_SIZE];
memtable::ObIMemtable *memtable_array_[MEMTABLE_ARRAY_SIZE];
int64_t count_;
private:
DISALLOW_COPY_AND_ASSIGN(ObMemtableArray);