diff --git a/be/src/olap/rowset/rowset_meta_manager.cpp b/be/src/olap/rowset/rowset_meta_manager.cpp index 43d449d9ec67a5..29254f29ed1833 100644 --- a/be/src/olap/rowset/rowset_meta_manager.cpp +++ b/be/src/olap/rowset/rowset_meta_manager.cpp @@ -72,21 +72,6 @@ Status RowsetMetaManager::get_rowset_meta(OlapMeta* meta, TabletUid tablet_uid, return Status::OK(); } -Status RowsetMetaManager::get_json_rowset_meta(OlapMeta* meta, TabletUid tablet_uid, - const RowsetId& rowset_id, - std::string* json_rowset_meta) { - RowsetMetaSharedPtr rowset_meta_ptr(new (std::nothrow) RowsetMeta()); - Status status = get_rowset_meta(meta, tablet_uid, rowset_id, rowset_meta_ptr); - if (!status.ok()) { - return status; - } - bool ret = rowset_meta_ptr->json_rowset_meta(json_rowset_meta); - if (!ret) { - return Status::Error("get json rowset meta failed. rowset id:{}", - rowset_id.to_string()); - } - return Status::OK(); -} Status RowsetMetaManager::save(OlapMeta* meta, TabletUid tablet_uid, const RowsetId& rowset_id, const RowsetMetaPB& rowset_meta_pb, bool enable_binlog) { if (rowset_meta_pb.partition_id() <= 0) { @@ -575,27 +560,6 @@ Status RowsetMetaManager::traverse_binlog_metas( return status; } -Status RowsetMetaManager::load_json_rowset_meta(OlapMeta* meta, - const std::string& rowset_meta_path) { - std::ifstream infile(rowset_meta_path); - char buffer[1024]; - std::string json_rowset_meta; - while (!infile.eof()) { - infile.getline(buffer, 1024); - json_rowset_meta = json_rowset_meta + buffer; - } - boost::algorithm::trim(json_rowset_meta); - RowsetMeta rowset_meta; - bool ret = rowset_meta.init_from_json(json_rowset_meta); - if (!ret) { - return Status::Error("parse json rowset meta failed."); - } - RowsetId rowset_id = rowset_meta.rowset_id(); - TabletUid tablet_uid = rowset_meta.tablet_uid(); - Status status = save(meta, tablet_uid, rowset_id, rowset_meta.get_rowset_pb(), false); - return status; -} - Status RowsetMetaManager::save_partial_update_info( OlapMeta* meta, int64_t tablet_id, int64_t partition_id, int64_t txn_id, const PartialUpdateInfoPB& partial_update_info_pb) { diff --git a/be/src/olap/rowset/rowset_meta_manager.h b/be/src/olap/rowset/rowset_meta_manager.h index eb04128fdedaf2..1c0c360b16cc5a 100644 --- a/be/src/olap/rowset/rowset_meta_manager.h +++ b/be/src/olap/rowset/rowset_meta_manager.h @@ -53,10 +53,6 @@ class RowsetMetaManager { static Status get_rowset_meta(OlapMeta* meta, TabletUid tablet_uid, const RowsetId& rowset_id, RowsetMetaSharedPtr rowset_meta); - - static Status get_json_rowset_meta(OlapMeta* meta, TabletUid tablet_uid, - const RowsetId& rowset_id, std::string* json_rowset_meta); - // TODO(Drogon): refactor save && _save_with_binlog to one, adapt to ut temperately static Status save(OlapMeta* meta, TabletUid tablet_uid, const RowsetId& rowset_id, const RowsetMetaPB& rowset_meta_pb, bool enable_binlog); @@ -87,8 +83,6 @@ class RowsetMetaManager { static Status remove(OlapMeta* meta, TabletUid tablet_uid, const RowsetId& rowset_id); - static Status load_json_rowset_meta(OlapMeta* meta, const std::string& rowset_meta_path); - static Status save_partial_update_info(OlapMeta* meta, int64_t tablet_id, int64_t partition_id, int64_t txn_id, const PartialUpdateInfoPB& partial_update_info_pb); diff --git a/be/test/olap/rowset/rowset_meta_manager_test.cpp b/be/test/olap/rowset/rowset_meta_manager_test.cpp index 100d0ea892ab1f..95a675f3571aa5 100644 --- a/be/test/olap/rowset/rowset_meta_manager_test.cpp +++ b/be/test/olap/rowset/rowset_meta_manager_test.cpp @@ -85,41 +85,4 @@ class RowsetMetaManagerTest : public testing::Test { TabletUid _tablet_uid {0, 0}; }; -TEST_F(RowsetMetaManagerTest, TestSaveAndGetAndRemove) { - RowsetId rowset_id; - rowset_id.init(10000); - RowsetMeta rowset_meta; - rowset_meta.init_from_json(_json_rowset_meta); - EXPECT_EQ(rowset_meta.rowset_id(), rowset_id); - RowsetMetaPB rowset_meta_pb; - rowset_meta.to_rowset_pb(&rowset_meta_pb); - Status status = RowsetMetaManager::save(_meta, _tablet_uid, rowset_id, rowset_meta_pb, false); - EXPECT_TRUE(status == Status::OK()); - EXPECT_TRUE(RowsetMetaManager::check_rowset_meta(_meta, _tablet_uid, rowset_id)); - std::string json_rowset_meta_read; - status = RowsetMetaManager::get_json_rowset_meta(_meta, _tablet_uid, rowset_id, - &json_rowset_meta_read); - EXPECT_TRUE(status == Status::OK()); - EXPECT_EQ(_json_rowset_meta, json_rowset_meta_read); - status = RowsetMetaManager::remove(_meta, _tablet_uid, rowset_id); - EXPECT_TRUE(status == Status::OK()); - EXPECT_FALSE(RowsetMetaManager::check_rowset_meta(_meta, _tablet_uid, rowset_id)); - RowsetMetaSharedPtr rowset_meta_read(new RowsetMeta()); - status = RowsetMetaManager::get_rowset_meta(_meta, _tablet_uid, rowset_id, rowset_meta_read); - EXPECT_TRUE(status != Status::OK()); -} - -TEST_F(RowsetMetaManagerTest, TestLoad) { - RowsetId rowset_id; - rowset_id.init(10000); - Status status = RowsetMetaManager::load_json_rowset_meta(_meta, rowset_meta_path); - EXPECT_TRUE(status == Status::OK()); - EXPECT_TRUE(RowsetMetaManager::check_rowset_meta(_meta, _tablet_uid, rowset_id)); - std::string json_rowset_meta_read; - status = RowsetMetaManager::get_json_rowset_meta(_meta, _tablet_uid, rowset_id, - &json_rowset_meta_read); - EXPECT_TRUE(status == Status::OK()); - EXPECT_EQ(_json_rowset_meta, json_rowset_meta_read); -} - } // namespace doris