提交 f0fbf805 编写于 作者: C chaser-ch 提交者: LINGuanRen

fix some purge bug

上级 483ef5e6
...@@ -124,10 +124,13 @@ int ObMacroBlockBuilder::open(storage::ObSSTableMergeCtx& ctx, const int64_t idx ...@@ -124,10 +124,13 @@ int ObMacroBlockBuilder::open(storage::ObSSTableMergeCtx& ctx, const int64_t idx
ctx.sstable_version_range_.snapshot_version_, ctx.sstable_version_range_.snapshot_version_,
ctx.log_ts_range_.end_log_ts_))) { ctx.log_ts_range_.end_log_ts_))) {
STORAGE_LOG(WARN, "fail to init mark deletion maker, skip maker", K(ret)); STORAGE_LOG(WARN, "fail to init mark deletion maker, skip maker", K(ret));
mark_deletion_maker_->~ObBlockMarkDeletionMaker();
mark_deletion_maker_ = NULL; mark_deletion_maker_ = NULL;
ret = OB_SUCCESS; ret = OB_SUCCESS;
desc_.mark_deletion_maker_ = NULL;
} else {
desc_.mark_deletion_maker_ = mark_deletion_maker_;
} }
desc_.mark_deletion_maker_ = mark_deletion_maker_;
} }
} else { } else {
desc_.mark_deletion_maker_ = NULL; desc_.mark_deletion_maker_ = NULL;
......
...@@ -240,7 +240,6 @@ int ObMemtableScanIterator::prepare_scan() ...@@ -240,7 +240,6 @@ int ObMemtableScanIterator::prepare_scan()
TRANS_LOG(WARN, "get snapshot info failed", K(ret)); TRANS_LOG(WARN, "get snapshot info failed", K(ret));
} else if (OB_FAIL(get_real_range(cur_range_.get_range(), range))) { } else if (OB_FAIL(get_real_range(cur_range_.get_range(), range))) {
TRANS_LOG(WARN, "fail to get_real_range", K(ret), K(cur_range_)); TRANS_LOG(WARN, "fail to get_real_range", K(ret), K(cur_range_));
ret = OB_ITER_END;
} else if (OB_FAIL(ObMemtableKey::build( } else if (OB_FAIL(ObMemtableKey::build(
start_key, param_->table_id_, *param_->out_cols_, &range.get_start_key(), *context_->allocator_))) { start_key, param_->table_id_, *param_->out_cols_, &range.get_start_key(), *context_->allocator_))) {
TRANS_LOG(WARN, "start key build fail", K(param_->table_id_), K(range)); TRANS_LOG(WARN, "start key build fail", K(param_->table_id_), K(range));
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册