38
38
#include " olap/options.h"
39
39
#include " olap/rowset/segment_v2/binary_plain_page.h"
40
40
#include " olap/rowset/segment_v2/column_reader.h"
41
- #include " olap/storage_engine.h"
42
41
#include " olap/tablet_meta.h"
43
42
#include " olap/tablet_meta_manager.h"
44
43
#include " olap/utils.h"
47
46
48
47
using std::filesystem::path;
49
48
using doris::DataDir;
50
- using doris::StorageEngine;
51
49
using doris::OlapMeta;
52
50
using doris::Status;
53
51
using doris::TabletMeta;
@@ -142,7 +140,7 @@ void delete_meta(DataDir* data_dir) {
142
140
std::cout << " delete meta successfully" << std::endl;
143
141
}
144
142
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) {
146
144
std::string root_path;
147
145
RETURN_IF_ERROR (doris::io::global_local_filesystem ()->canonicalize (dir, &root_path));
148
146
doris::StorePath path;
@@ -152,7 +150,8 @@ Status init_data_dir(StorageEngine& engine, const std::string& dir, std::unique_
152
150
return Status::InternalError (" parse root path failed" );
153
151
}
154
152
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 ));
156
155
if (p == nullptr ) {
157
156
std::cout << " new data dir failed" << std::endl;
158
157
return Status::InternalError (" new data dir failed" );
@@ -178,7 +177,6 @@ void batch_delete_meta(const std::string& tablet_file) {
178
177
int err_num = 0 ;
179
178
int delete_num = 0 ;
180
179
int total_num = 0 ;
181
- StorageEngine engine (doris::EngineOptions {});
182
180
std::unordered_map<std::string, std::unique_ptr<DataDir>> dir_map;
183
181
while (std::getline (infile, line)) {
184
182
total_num++;
@@ -200,7 +198,7 @@ void batch_delete_meta(const std::string& tablet_file) {
200
198
if (dir_map.find (dir) == dir_map.end ()) {
201
199
// new data dir, init it
202
200
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);
204
202
if (!st.ok ()) {
205
203
std::cout << " invalid root path:" << FLAGS_root_path
206
204
<< " , error: " << st.to_string () << std::endl;
@@ -352,9 +350,8 @@ int main(int argc, char** argv) {
352
350
return -1 ;
353
351
}
354
352
355
- StorageEngine engine (doris::EngineOptions {});
356
353
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);
358
355
if (!st.ok ()) {
359
356
std::cout << " invalid root path:" << FLAGS_root_path << " , error: " << st.to_string ()
360
357
<< std::endl;
0 commit comments