empty addr semantic support for complex addr
This commit is contained in:
@ -94,7 +94,7 @@ TEST_F(TestTabletDumpedMediumInfo, overlap)
|
||||
compaction::ObMediumCompactionInfo *info = nullptr;
|
||||
|
||||
ObTabletDumpedMediumInfo input_medium_info1;
|
||||
ret = input_medium_info1.init(allocator);
|
||||
ret = input_medium_info1.init_for_first_creation(allocator);
|
||||
ASSERT_EQ(OB_SUCCESS, ret);
|
||||
|
||||
APPEND_MEDIUM_INFO(input_medium_info1, allocator, 5, 4, true, info);
|
||||
@ -102,7 +102,7 @@ TEST_F(TestTabletDumpedMediumInfo, overlap)
|
||||
APPEND_MEDIUM_INFO(input_medium_info1, allocator, 7, 6, true, info);
|
||||
|
||||
ObTabletDumpedMediumInfo input_medium_info2;
|
||||
ret = input_medium_info2.init(allocator);
|
||||
ret = input_medium_info2.init_for_first_creation(allocator);
|
||||
ASSERT_EQ(OB_SUCCESS, ret);
|
||||
|
||||
APPEND_MEDIUM_INFO(input_medium_info2, allocator, 2, 1, true, info);
|
||||
@ -112,7 +112,7 @@ TEST_F(TestTabletDumpedMediumInfo, overlap)
|
||||
APPEND_MEDIUM_INFO(input_medium_info1, allocator, 6, 5, true, info);
|
||||
|
||||
ObTabletDumpedMediumInfo result;
|
||||
ret = result.init(allocator);
|
||||
ret = result.init_for_first_creation(allocator);
|
||||
ASSERT_EQ(OB_SUCCESS, ret);
|
||||
|
||||
const int64_t finish_medium_scn = 3;
|
||||
@ -136,7 +136,7 @@ TEST_F(TestTabletDumpedMediumInfo, no_overlap)
|
||||
compaction::ObMediumCompactionInfo *info = nullptr;
|
||||
|
||||
ObTabletDumpedMediumInfo input_medium_info1;
|
||||
ret = input_medium_info1.init(allocator);
|
||||
ret = input_medium_info1.init_for_first_creation(allocator);
|
||||
ASSERT_EQ(OB_SUCCESS, ret);
|
||||
|
||||
APPEND_MEDIUM_INFO(input_medium_info1, allocator, 5, 4, true, info);
|
||||
@ -144,7 +144,7 @@ TEST_F(TestTabletDumpedMediumInfo, no_overlap)
|
||||
APPEND_MEDIUM_INFO(input_medium_info1, allocator, 7, 6, true, info);
|
||||
|
||||
ObTabletDumpedMediumInfo input_medium_info2;
|
||||
ret = input_medium_info2.init(allocator);
|
||||
ret = input_medium_info2.init_for_first_creation(allocator);
|
||||
ASSERT_EQ(OB_SUCCESS, ret);
|
||||
|
||||
APPEND_MEDIUM_INFO(input_medium_info2, allocator, 2, 1, true, info);
|
||||
@ -152,7 +152,7 @@ TEST_F(TestTabletDumpedMediumInfo, no_overlap)
|
||||
|
||||
{
|
||||
ObTabletDumpedMediumInfo result;
|
||||
ret = result.init(allocator);
|
||||
ret = result.init_for_first_creation(allocator);
|
||||
ASSERT_EQ(OB_SUCCESS, ret);
|
||||
|
||||
const int64_t finish_medium_scn = 1;
|
||||
@ -172,7 +172,7 @@ TEST_F(TestTabletDumpedMediumInfo, no_overlap)
|
||||
APPEND_MEDIUM_INFO(input_medium_info2, allocator, 4, 3, true, info);
|
||||
{
|
||||
ObTabletDumpedMediumInfo result;
|
||||
ret = result.init(allocator);
|
||||
ret = result.init_for_first_creation(allocator);
|
||||
ASSERT_EQ(OB_SUCCESS, ret);
|
||||
|
||||
const int64_t finish_medium_scn = 1;
|
||||
@ -198,7 +198,7 @@ TEST_F(TestTabletDumpedMediumInfo, overlap_and_filter)
|
||||
compaction::ObMediumCompactionInfo *info = nullptr;
|
||||
|
||||
ObTabletDumpedMediumInfo input_medium_info1;
|
||||
ret = input_medium_info1.init(allocator);
|
||||
ret = input_medium_info1.init_for_first_creation(allocator);
|
||||
ASSERT_EQ(OB_SUCCESS, ret);
|
||||
|
||||
APPEND_MEDIUM_INFO(input_medium_info1, allocator, 5, 4, true, info);
|
||||
@ -206,7 +206,7 @@ TEST_F(TestTabletDumpedMediumInfo, overlap_and_filter)
|
||||
APPEND_MEDIUM_INFO(input_medium_info1, allocator, 7, 6, true, info);
|
||||
|
||||
ObTabletDumpedMediumInfo input_medium_info2;
|
||||
ret = input_medium_info2.init(allocator);
|
||||
ret = input_medium_info2.init_for_first_creation(allocator);
|
||||
ASSERT_EQ(OB_SUCCESS, ret);
|
||||
|
||||
APPEND_MEDIUM_INFO(input_medium_info2, allocator, 2, 1, true, info);
|
||||
@ -216,7 +216,7 @@ TEST_F(TestTabletDumpedMediumInfo, overlap_and_filter)
|
||||
APPEND_MEDIUM_INFO(input_medium_info1, allocator, 6, 5, true, info);
|
||||
|
||||
ObTabletDumpedMediumInfo result;
|
||||
ret = result.init(allocator);
|
||||
ret = result.init_for_first_creation(allocator);
|
||||
ASSERT_EQ(OB_SUCCESS, ret);
|
||||
|
||||
const int64_t finish_medium_scn = 6;
|
||||
@ -236,7 +236,7 @@ TEST_F(TestTabletDumpedMediumInfo, no_overlap_and_filter)
|
||||
compaction::ObMediumCompactionInfo *info = nullptr;
|
||||
|
||||
ObTabletDumpedMediumInfo input_medium_info1;
|
||||
ret = input_medium_info1.init(allocator);
|
||||
ret = input_medium_info1.init_for_first_creation(allocator);
|
||||
ASSERT_EQ(OB_SUCCESS, ret);
|
||||
|
||||
APPEND_MEDIUM_INFO(input_medium_info1, allocator, 5, 4, true, info);
|
||||
@ -244,7 +244,7 @@ TEST_F(TestTabletDumpedMediumInfo, no_overlap_and_filter)
|
||||
APPEND_MEDIUM_INFO(input_medium_info1, allocator, 7, 6, true, info);
|
||||
|
||||
ObTabletDumpedMediumInfo input_medium_info2;
|
||||
ret = input_medium_info2.init(allocator);
|
||||
ret = input_medium_info2.init_for_first_creation(allocator);
|
||||
ASSERT_EQ(OB_SUCCESS, ret);
|
||||
|
||||
APPEND_MEDIUM_INFO(input_medium_info2, allocator, 2, 1, true, info);
|
||||
@ -252,7 +252,7 @@ TEST_F(TestTabletDumpedMediumInfo, no_overlap_and_filter)
|
||||
APPEND_MEDIUM_INFO(input_medium_info2, allocator, 4, 3, true, info);
|
||||
|
||||
ObTabletDumpedMediumInfo result;
|
||||
ret = result.init(allocator);
|
||||
ret = result.init_for_first_creation(allocator);
|
||||
ASSERT_EQ(OB_SUCCESS, ret);
|
||||
|
||||
const int64_t finish_medium_scn = 7;
|
||||
@ -271,21 +271,21 @@ TEST_F(TestTabletDumpedMediumInfo, standby_cluster)
|
||||
compaction::ObMediumCompactionInfo *info = nullptr;
|
||||
|
||||
ObTabletDumpedMediumInfo input_medium_info1;
|
||||
ret = input_medium_info1.init(allocator);
|
||||
ret = input_medium_info1.init_for_first_creation(allocator);
|
||||
ASSERT_EQ(OB_SUCCESS, ret);
|
||||
|
||||
APPEND_MEDIUM_INFO(input_medium_info1, allocator, 7, 5, false, info);
|
||||
APPEND_MEDIUM_INFO(input_medium_info1, allocator, 9, 8, false, info);
|
||||
|
||||
ObTabletDumpedMediumInfo input_medium_info2;
|
||||
ret = input_medium_info2.init(allocator);
|
||||
ret = input_medium_info2.init_for_first_creation(allocator);
|
||||
ASSERT_EQ(OB_SUCCESS, ret);
|
||||
|
||||
APPEND_MEDIUM_INFO(input_medium_info2, allocator, 2, 1, false, info);
|
||||
APPEND_MEDIUM_INFO(input_medium_info2, allocator, 4, 2, false, info);
|
||||
|
||||
ObTabletDumpedMediumInfo result;
|
||||
ret = result.init(allocator);
|
||||
ret = result.init_for_first_creation(allocator);
|
||||
ASSERT_EQ(OB_SUCCESS, ret);
|
||||
|
||||
const int64_t finish_medium_scn = 3;
|
||||
@ -307,7 +307,7 @@ TEST_F(TestTabletDumpedMediumInfo, mds_table_dump)
|
||||
compaction::ObMediumCompactionInfo *info = nullptr;
|
||||
|
||||
ObTabletDumpedMediumInfo input_medium_info1;
|
||||
ret = input_medium_info1.init(allocator);
|
||||
ret = input_medium_info1.init_for_first_creation(allocator);
|
||||
ASSERT_EQ(OB_SUCCESS, ret);
|
||||
ObTabletComplexAddr<ObTabletDumpedMediumInfo> mds_table_data;
|
||||
mds_table_data.ptr_ = &input_medium_info1;
|
||||
@ -316,7 +316,7 @@ TEST_F(TestTabletDumpedMediumInfo, mds_table_dump)
|
||||
APPEND_MEDIUM_INFO(input_medium_info1, allocator, 9, 7, false, info);
|
||||
|
||||
ObTabletDumpedMediumInfo input_medium_info2;
|
||||
ret = input_medium_info2.init(allocator);
|
||||
ret = input_medium_info2.init_for_first_creation(allocator);
|
||||
ASSERT_EQ(OB_SUCCESS, ret);
|
||||
ObTabletComplexAddr<ObTabletDumpedMediumInfo> base_data;
|
||||
base_data.ptr_ = &input_medium_info2;
|
||||
@ -326,19 +326,17 @@ TEST_F(TestTabletDumpedMediumInfo, mds_table_dump)
|
||||
APPEND_MEDIUM_INFO(input_medium_info2, allocator, 6, 4, false, info);
|
||||
APPEND_MEDIUM_INFO(input_medium_info2, allocator, 7, 6, false, info);
|
||||
|
||||
ObTabletDumpedMediumInfo result;
|
||||
ret = result.init(allocator);
|
||||
ASSERT_EQ(OB_SUCCESS, ret);
|
||||
ObTabletComplexAddr<ObTabletDumpedMediumInfo> result_data;
|
||||
result_data.ptr_ = &result;
|
||||
ObTabletDumpedMediumInfo *&result = result_data.ptr_;
|
||||
|
||||
const int64_t finish_medium_scn = 4;
|
||||
ret = ObTabletMdsData::fuse_mds_dump_node(allocator, finish_medium_scn, mds_table_data, base_data, result_data);
|
||||
ret = ObTabletMdsData::init_single_complex_addr(allocator, mds_table_data, base_data, finish_medium_scn, result_data);
|
||||
ASSERT_EQ(OB_SUCCESS, ret);
|
||||
ASSERT_EQ(3, result.medium_info_list_.count());
|
||||
ASSERT_EQ(6, result.medium_info_list_.at(0)->medium_snapshot_);
|
||||
ASSERT_EQ(7, result.medium_info_list_.at(1)->medium_snapshot_);
|
||||
ASSERT_EQ(9, result.medium_info_list_.at(2)->medium_snapshot_);
|
||||
ASSERT_EQ(3, result->medium_info_list_.count());
|
||||
ASSERT_EQ(6, result->medium_info_list_.at(0)->medium_snapshot_);
|
||||
ASSERT_EQ(7, result->medium_info_list_.at(1)->medium_snapshot_);
|
||||
ASSERT_EQ(9, result->medium_info_list_.at(2)->medium_snapshot_);
|
||||
}
|
||||
} // namespace unittest
|
||||
} // namespace oceanbase
|
||||
|
||||
@ -19,14 +19,15 @@
|
||||
#include "lib/ob_errno.h"
|
||||
#include "lib/oblog/ob_log_module.h"
|
||||
#include "share/ob_rpc_struct.h"
|
||||
#include "share/scn.h"
|
||||
#include "storage/tx/ob_trans_define.h"
|
||||
#include "storage/ls/ob_ls_tablet_service.h"
|
||||
#include "storage/ls/ob_ls.h"
|
||||
#include "share/scn.h"
|
||||
#include "storage/meta_mem/ob_tenant_meta_mem_mgr.h"
|
||||
#include "storage/tablet/ob_tablet_create_delete_helper.h"
|
||||
#include "storage/tablet/ob_tablet_obj_load_helper.h"
|
||||
#include "storage/tablet/ob_tablet_slog_helper.h"
|
||||
#include "storage/init_basic_struct.h"
|
||||
#include "storage/tablet/ob_tablet_create_delete_helper.h"
|
||||
|
||||
namespace oceanbase
|
||||
{
|
||||
@ -112,12 +113,9 @@ inline int TestTabletHelper::create_tablet(
|
||||
|
||||
ObTabletCreateSSTableParam param;
|
||||
prepare_sstable_param(tablet_id, table_schema, param);
|
||||
void *buff = nullptr;
|
||||
ObSSTable *sstable = nullptr;
|
||||
if (OB_ISNULL(buff = allocator.alloc(sizeof(ObSSTable)))) {
|
||||
ret = OB_ALLOCATE_MEMORY_FAILED;
|
||||
STORAGE_LOG(WARN, "fail to allocate memory", K(ret));
|
||||
} else if (FALSE_IT(sstable = new (buff) ObSSTable())) {
|
||||
if (OB_FAIL(ObTabletObjLoadHelper::alloc_and_new(allocator, sstable))) {
|
||||
STORAGE_LOG(WARN, "fail to alloc and new", K(ret));
|
||||
} else if (OB_FAIL(ObTabletCreateDeleteHelper::create_sstable(param, allocator, *sstable))) {
|
||||
STORAGE_LOG(WARN, "failed to acquire sstable", K(ret));
|
||||
} else if (OB_FAIL(ObSSTableMergeRes::fill_column_checksum_for_empty_major(param.column_cnt_, param.column_checksums_))) {
|
||||
@ -145,13 +143,17 @@ inline int TestTabletHelper::create_tablet(
|
||||
if (tablet_status == ObTabletStatus::Status::DELETED) {
|
||||
data.delete_commit_scn_ = SCN::base_scn();
|
||||
}
|
||||
|
||||
ObTabletComplexAddr<mds::MdsDumpKV> &tablet_status_committed_kv = tablet_handle.get_obj()->mds_data_.tablet_status_.committed_kv_;
|
||||
const int64_t data_serialize_size = data.get_serialize_size();
|
||||
int64_t pos = 0;
|
||||
char *buf = static_cast<char *>(t3m->full_tablet_creator_.get_allocator().alloc(data_serialize_size));
|
||||
if (OB_FAIL(data.serialize(buf, data_serialize_size, pos))) {
|
||||
STORAGE_LOG(WARN, "data serialize failed", K(ret), K(data_serialize_size), K(pos));
|
||||
} else if (ObTabletObjLoadHelper::alloc_and_new(*tablet_handle.get_allocator(), tablet_status_committed_kv.ptr_)) {
|
||||
STORAGE_LOG(WARN, "failed to alloc and new", K(ret));
|
||||
} else {
|
||||
tablet_handle.get_obj()->mds_data_.tablet_status_.committed_kv_.get_ptr()->v_.user_data_.assign(buf, data_serialize_size);
|
||||
tablet_status_committed_kv.ptr_->v_.user_data_.assign(buf, data_serialize_size);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user