Commit 1317e2ed authored by Huachao Huang's avatar Huachao Huang Committed by dorianzheng

tools: pass options to ldb (#260)

We need to support encryption environment created outside.
parent 306e2010
...@@ -4884,8 +4884,8 @@ uint64_t crocksdb_iostats_context_logger_nanos(crocksdb_iostats_context_t* ctx) ...@@ -4884,8 +4884,8 @@ uint64_t crocksdb_iostats_context_logger_nanos(crocksdb_iostats_context_t* ctx)
return ctx->rep.logger_nanos; return ctx->rep.logger_nanos;
} }
void crocksdb_run_ldb_tool(int argc, char** argv) { void crocksdb_run_ldb_tool(int argc, char** argv, const crocksdb_options_t* opts) {
LDBTool().Run(argc, argv); LDBTool().Run(argc, argv, opts->rep);
} }
/* Titan */ /* Titan */
......
...@@ -1934,7 +1934,7 @@ extern C_ROCKSDB_LIBRARY_API uint64_t ...@@ -1934,7 +1934,7 @@ extern C_ROCKSDB_LIBRARY_API uint64_t
crocksdb_iostats_context_logger_nanos(crocksdb_iostats_context_t*); crocksdb_iostats_context_logger_nanos(crocksdb_iostats_context_t*);
extern C_ROCKSDB_LIBRARY_API void extern C_ROCKSDB_LIBRARY_API void
crocksdb_run_ldb_tool(int argc, char** argv); crocksdb_run_ldb_tool(int argc, char** argv, const crocksdb_options_t* opts);
/* Titan */ /* Titan */
......
Subproject commit aa179a714e8d44ca59f0e5e649056e1fd67e7b82 Subproject commit 3f52e0e76de73dc86dcfa664d0bf2ef2b8a05063
...@@ -1781,7 +1781,7 @@ extern "C" { ...@@ -1781,7 +1781,7 @@ extern "C" {
pub fn crocksdb_iostats_context_prepare_write_nanos(ctx: *mut DBIOStatsContext) -> u64; pub fn crocksdb_iostats_context_prepare_write_nanos(ctx: *mut DBIOStatsContext) -> u64;
pub fn crocksdb_iostats_context_logger_nanos(ctx: *mut DBIOStatsContext) -> u64; pub fn crocksdb_iostats_context_logger_nanos(ctx: *mut DBIOStatsContext) -> u64;
pub fn crocksdb_run_ldb_tool(argc: c_int, argv: *const *const c_char); pub fn crocksdb_run_ldb_tool(argc: c_int, argv: *const *const c_char, opts: *const Options);
} }
// Titan // Titan
......
...@@ -2318,7 +2318,7 @@ pub fn load_latest_options( ...@@ -2318,7 +2318,7 @@ pub fn load_latest_options(
} }
} }
pub fn run_ldb_tool(ldb_args: &Vec<String>) { pub fn run_ldb_tool(ldb_args: &Vec<String>, opts: &DBOptions) {
unsafe { unsafe {
let ldb_args_cstrs: Vec<_> = ldb_args let ldb_args_cstrs: Vec<_> = ldb_args
.iter() .iter()
...@@ -2328,6 +2328,7 @@ pub fn run_ldb_tool(ldb_args: &Vec<String>) { ...@@ -2328,6 +2328,7 @@ pub fn run_ldb_tool(ldb_args: &Vec<String>) {
crocksdb_ffi::crocksdb_run_ldb_tool( crocksdb_ffi::crocksdb_run_ldb_tool(
args.len() as i32, args.len() as i32,
args.as_ptr() as *const *const c_char, args.as_ptr() as *const *const c_char,
opts.inner,
); );
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment