Skip to content

Commit 91efb6a

Browse files
committed
Revert "[fix](meta-tool) Fix compile meta tool (#31457)"
This reverts commit 60de835.
1 parent 792907f commit 91efb6a

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

be/src/tools/meta_tool.cpp

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
#include "olap/options.h"
3939
#include "olap/rowset/segment_v2/binary_plain_page.h"
4040
#include "olap/rowset/segment_v2/column_reader.h"
41-
#include "olap/storage_engine.h"
4241
#include "olap/tablet_meta.h"
4342
#include "olap/tablet_meta_manager.h"
4443
#include "olap/utils.h"
@@ -47,7 +46,6 @@
4746

4847
using std::filesystem::path;
4948
using doris::DataDir;
50-
using doris::StorageEngine;
5149
using doris::OlapMeta;
5250
using doris::Status;
5351
using doris::TabletMeta;
@@ -142,7 +140,7 @@ void delete_meta(DataDir* data_dir) {
142140
std::cout << "delete meta successfully" << std::endl;
143141
}
144142

145-
Status init_data_dir(StorageEngine& engine, const std::string& dir, std::unique_ptr<DataDir>* ret) {
143+
Status init_data_dir(const std::string& dir, std::unique_ptr<DataDir>* ret) {
146144
std::string root_path;
147145
RETURN_IF_ERROR(doris::io::global_local_filesystem()->canonicalize(dir, &root_path));
148146
doris::StorePath path;
@@ -152,7 +150,8 @@ Status init_data_dir(StorageEngine& engine, const std::string& dir, std::unique_
152150
return Status::InternalError("parse root path failed");
153151
}
154152

155-
auto p = std::make_unique<DataDir>(engine, path.path, path.capacity_bytes, path.storage_medium);
153+
std::unique_ptr<DataDir> p(
154+
new (std::nothrow) DataDir(path.path, path.capacity_bytes, path.storage_medium));
156155
if (p == nullptr) {
157156
std::cout << "new data dir failed" << std::endl;
158157
return Status::InternalError("new data dir failed");
@@ -178,7 +177,6 @@ void batch_delete_meta(const std::string& tablet_file) {
178177
int err_num = 0;
179178
int delete_num = 0;
180179
int total_num = 0;
181-
StorageEngine engine(doris::EngineOptions {});
182180
std::unordered_map<std::string, std::unique_ptr<DataDir>> dir_map;
183181
while (std::getline(infile, line)) {
184182
total_num++;
@@ -200,7 +198,7 @@ void batch_delete_meta(const std::string& tablet_file) {
200198
if (dir_map.find(dir) == dir_map.end()) {
201199
// new data dir, init it
202200
std::unique_ptr<DataDir> data_dir_p;
203-
Status st = init_data_dir(engine, dir, &data_dir_p);
201+
Status st = init_data_dir(dir, &data_dir_p);
204202
if (!st.ok()) {
205203
std::cout << "invalid root path:" << FLAGS_root_path
206204
<< ", error: " << st.to_string() << std::endl;
@@ -352,9 +350,8 @@ int main(int argc, char** argv) {
352350
return -1;
353351
}
354352

355-
StorageEngine engine(doris::EngineOptions {});
356353
std::unique_ptr<DataDir> data_dir;
357-
Status st = init_data_dir(engine, FLAGS_root_path, &data_dir);
354+
Status st = init_data_dir(FLAGS_root_path, &data_dir);
358355
if (!st.ok()) {
359356
std::cout << "invalid root path:" << FLAGS_root_path << ", error: " << st.to_string()
360357
<< std::endl;

0 commit comments

Comments
 (0)