Commit e296577 1 parent dbe0f32 commit e296577 Copy full SHA for e296577
File tree 7 files changed +16
-14
lines changed
7 files changed +16
-14
lines changed Original file line number Diff line number Diff line change @@ -106,13 +106,17 @@ TESTS = \
106
106
geodb_test
107
107
108
108
TOOLS = \
109
- sst_dump \
109
+ sst_dump \
110
110
db_sanity_test \
111
- db_stress \
112
- ldb \
111
+ db_stress \
112
+ ldb \
113
113
db_repl_stress \
114
114
blob_store_bench
115
115
116
+ LDB_OBJECTS = \
117
+ tools/ldb_cmd.o \
118
+ tools/ldb_tool.o
119
+
116
120
117
121
PROGRAMS = db_bench signal_test table_reader_bench $(TESTS ) $(TOOLS )
118
122
BENCHMARKS = db_bench_sqlite3 db_bench_tree_db table_reader_bench
@@ -410,8 +414,8 @@ auto_roll_logger_test: util/auto_roll_logger_test.o $(LIBOBJECTS) $(TESTHARNESS)
410
414
sst_dump : tools/sst_dump.o $(LIBOBJECTS )
411
415
$(CXX ) tools/sst_dump.o $(LIBOBJECTS ) $(EXEC_LDFLAGS ) -o $@ $(LDFLAGS ) $(COVERAGEFLAGS )
412
416
413
- ldb : tools/ldb.o $(LIBOBJECTS )
414
- $(CXX ) tools/ldb.o $(LIBOBJECTS ) $(EXEC_LDFLAGS ) -o $@ $(LDFLAGS ) $(COVERAGEFLAGS )
417
+ ldb : tools/ldb.o $(LDB_OBJECTS ) $( LIBOBJECTS )
418
+ $(CXX ) tools/ldb.o $(LDB_OBJECTS ) $( LIBOBJECTS ) $(EXEC_LDFLAGS ) -o $@ $(LDFLAGS ) $(COVERAGEFLAGS )
415
419
416
420
# ---------------------------------------------------------------------------
417
421
# Jni stuff
Original file line number Diff line number Diff line change 4
4
// of patent rights can be found in the PATENTS file in the same directory.
5
5
//
6
6
7
- #include " rocksdb /ldb_tool.h"
7
+ #include " tools /ldb_tool.h"
8
8
9
9
int main (int argc, char ** argv) {
10
10
rocksdb::LDBTool tool;
Original file line number Diff line number Diff line change 3
3
// LICENSE file in the root directory of this source tree. An additional grant
4
4
// of patent rights can be found in the PATENTS file in the same directory.
5
5
//
6
- #include " util /ldb_cmd.h"
6
+ #include " tools /ldb_cmd.h"
7
7
8
8
#include " db/dbformat.h"
9
9
#include " db/db_impl.h"
Original file line number Diff line number Diff line change 17
17
#include " rocksdb/iterator.h"
18
18
#include " rocksdb/slice.h"
19
19
#include " util/logging.h"
20
- #include " util /ldb_cmd_execute_result.h"
20
+ #include " tools /ldb_cmd_execute_result.h"
21
21
#include " util/string_util.h"
22
22
#include " utilities/utility_db.h"
23
23
#include " utilities/ttl/db_ttl.h"
File renamed without changes.
Original file line number Diff line number Diff line change 3
3
// LICENSE file in the root directory of this source tree. An additional grant
4
4
// of patent rights can be found in the PATENTS file in the same directory.
5
5
//
6
- #include " rocksdb /ldb_tool.h"
7
- #include " util /ldb_cmd.h"
6
+ #include " tools /ldb_tool.h"
7
+ #include " tools /ldb_cmd.h"
8
8
9
9
namespace rocksdb {
10
10
Original file line number Diff line number Diff line change 2
2
// This source code is licensed under the BSD-style license found in the
3
3
// LICENSE file in the root directory of this source tree. An additional grant
4
4
// of patent rights can be found in the PATENTS file in the same directory.
5
- #ifndef STORAGE_ROCKSDB_INCLUDE_LDB_TOOL_H
6
- # define STORAGE_ROCKSDB_INCLUDE_LDB_TOOL_H
5
+ #pragma once
6
+
7
7
#include " rocksdb/options.h"
8
8
9
9
namespace rocksdb {
@@ -14,5 +14,3 @@ class LDBTool {
14
14
};
15
15
16
16
} // namespace rocksdb
17
-
18
- #endif // STORAGE_ROCKSDB_INCLUDE_LDB_TOOL_H
You can’t perform that action at this time.
0 commit comments