Skip to content

[chore] remove useless get_json_rowset_meta related #59722

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yiguolei merged 2 commits into from
Jan 13, 2026
Merged

[chore] remove useless get_json_rowset_meta related #59722

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6652238
remove useless
zhiqiang-hhhh Jan 9, 2026
cc22daf
dev 2
zhiqiang-hhhh Jan 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 0 additions & 36 deletions be/src/olap/rowset/rowset_meta_manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<SERIALIZE_PROTOBUF_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) {
Expand Down Expand Up @@ -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<SERIALIZE_PROTOBUF_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) {
Expand Down
6 changes: 0 additions & 6 deletions be/src/olap/rowset/rowset_meta_manager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down
37 changes: 0 additions & 37 deletions be/test/olap/rowset/rowset_meta_manager_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading