From f4c83615fb856f1e4f0df09b2c4faf83a45d08b5 Mon Sep 17 00:00:00 2001 From: bright-starry-sky <56461666+bright-starry-sky@users.noreply.github.com> Date: Tue, 31 Mar 2020 11:19:41 +0800 Subject: [PATCH] fixed loop depend problem for compile link (#1995) * fixed loop depend problem * fixed error for clang9 and gcc9 * Addressed laura-ding's comment --- src/common/CMakeLists.txt | 1 + src/common/base/CMakeLists.txt | 4 +++- src/common/base/test/CMakeLists.txt | 7 ------- src/common/utils/CMakeLists.txt | 6 ++++++ src/common/{base => utils}/NebulaKeyUtils.cpp | 2 +- src/common/{base => utils}/NebulaKeyUtils.h | 0 src/common/utils/test/CMakeLists.txt | 12 ++++++++++++ .../{base => utils}/test/NebulaKeyUtilsTest.cpp | 2 +- src/daemons/CMakeLists.txt | 3 +++ src/graph/test/CMakeLists.txt | 1 + src/kvstore/CompactionFilter.h | 2 +- src/kvstore/Part.cpp | 2 +- src/kvstore/Part.h | 2 +- src/kvstore/SnapshotManagerImpl.cpp | 2 +- src/kvstore/plugins/hbase/HBaseStore.cpp | 2 +- src/kvstore/plugins/hbase/test/CMakeLists.txt | 2 ++ src/kvstore/plugins/hbase/test/HBaseStoreTest.cpp | 2 +- src/kvstore/raftex/SnapshotManager.cpp | 2 +- src/kvstore/raftex/test/CMakeLists.txt | 1 + src/kvstore/test/CMakeLists.txt | 2 ++ src/meta/test/CMakeLists.txt | 1 + src/storage/CompactionFilter.h | 2 +- src/storage/index/IndexPolicyMaker.cpp | 2 +- src/storage/kv/GetProcessor.cpp | 2 +- src/storage/mutate/AddEdgesProcessor.cpp | 2 +- src/storage/mutate/AddVerticesProcessor.cpp | 2 +- src/storage/mutate/DeleteEdgesProcessor.cpp | 2 +- src/storage/mutate/DeleteVerticesProcessor.cpp | 2 +- src/storage/mutate/UpdateEdgeProcessor.cpp | 2 +- src/storage/mutate/UpdateVertexProcessor.cpp | 2 +- src/storage/query/QueryBaseProcessor.inl | 2 +- src/storage/query/QueryEdgePropsProcessor.cpp | 2 +- src/storage/query/ScanEdgeProcessor.cpp | 2 +- src/storage/query/ScanVertexProcessor.cpp | 2 +- src/storage/test/AddEdgesTest.cpp | 2 +- src/storage/test/AddVerticesTest.cpp | 2 +- src/storage/test/CMakeLists.txt | 1 + src/storage/test/CompactionTest.cpp | 2 +- src/storage/test/DeleteEdgesTest.cpp | 2 +- src/storage/test/DeleteVerticesTest.cpp | 2 +- src/storage/test/IndexScanTest.cpp | 2 +- src/storage/test/IndexTest.cpp | 2 +- src/storage/test/QueryBoundBenchmark.cpp | 2 +- src/storage/test/QueryBoundTest.cpp | 2 +- src/storage/test/QueryEdgePropsTest.cpp | 2 +- src/storage/test/QueryStatsTest.cpp | 2 +- src/storage/test/QueryVertexPropsTest.cpp | 2 +- src/storage/test/ScanEdgeTest.cpp | 2 +- src/storage/test/ScanVertexTest.cpp | 2 +- src/storage/test/StorageServiceHandlerTest.cpp | 2 +- src/storage/test/UpdateEdgeTest.cpp | 2 +- src/storage/test/UpdateVertexTest.cpp | 2 +- src/storage/test/VertexCacheTest.cpp | 2 +- src/tools/db-dump/CMakeLists.txt | 1 + src/tools/db-dump/DbDumper.cpp | 2 +- src/tools/dump-edges/CMakeLists.txt | 1 + src/tools/dump-edges/DumpEdgesTool.cpp | 2 +- src/tools/simple-kv-verify/CMakeLists.txt | 1 + src/tools/storage-perf/CMakeLists.txt | 2 ++ 59 files changed, 80 insertions(+), 50 deletions(-) create mode 100644 src/common/utils/CMakeLists.txt rename src/common/{base => utils}/NebulaKeyUtils.cpp (99%) rename src/common/{base => utils}/NebulaKeyUtils.h (100%) create mode 100644 src/common/utils/test/CMakeLists.txt rename src/common/{base => utils}/test/NebulaKeyUtilsTest.cpp (99%) diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 408b01fb7e7..b3712f80a5b 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -16,4 +16,5 @@ nebula_add_subdirectory(algorithm) nebula_add_subdirectory(encryption) nebula_add_subdirectory(permission) nebula_add_subdirectory(session) +nebula_add_subdirectory(utils) diff --git a/src/common/base/CMakeLists.txt b/src/common/base/CMakeLists.txt index 017e02cff6c..493dffa5947 100644 --- a/src/common/base/CMakeLists.txt +++ b/src/common/base/CMakeLists.txt @@ -1,3 +1,6 @@ + +# The base_obj is a basic library. Other libraries are not allowed to depend on it. + add_library( base_obj OBJECT Base.cpp @@ -6,7 +9,6 @@ add_library( Status.cpp SanitizerOptions.cpp SignalHandler.cpp - NebulaKeyUtils.cpp SlowOpTracker.cpp ) diff --git a/src/common/base/test/CMakeLists.txt b/src/common/base/test/CMakeLists.txt index 4e75ab7debf..9dd6519d3ac 100644 --- a/src/common/base/test/CMakeLists.txt +++ b/src/common/base/test/CMakeLists.txt @@ -75,13 +75,6 @@ nebula_add_test( LIBRARIES gtest gtest_main ) -nebula_add_test( - NAME nebulakey_utils_test - SOURCES NebulaKeyUtilsTest.cpp - OBJECTS $ - LIBRARIES gtest gtest_main -) - nebula_add_test( NAME slow_op_tracker_test SOURCES SlowOpTrackerTest.cpp diff --git a/src/common/utils/CMakeLists.txt b/src/common/utils/CMakeLists.txt new file mode 100644 index 00000000000..76237b1b033 --- /dev/null +++ b/src/common/utils/CMakeLists.txt @@ -0,0 +1,6 @@ +nebula_add_library( + kvstore_storage_utils_obj OBJECT + NebulaKeyUtils.cpp +) + +nebula_add_subdirectory(test) diff --git a/src/common/base/NebulaKeyUtils.cpp b/src/common/utils/NebulaKeyUtils.cpp similarity index 99% rename from src/common/base/NebulaKeyUtils.cpp rename to src/common/utils/NebulaKeyUtils.cpp index daf46b11775..c9c19b62fbc 100644 --- a/src/common/base/NebulaKeyUtils.cpp +++ b/src/common/utils/NebulaKeyUtils.cpp @@ -4,7 +4,7 @@ * attached with Common Clause Condition 1.0, found in the LICENSES directory. */ -#include "base/NebulaKeyUtils.h" +#include "utils/NebulaKeyUtils.h" namespace nebula { diff --git a/src/common/base/NebulaKeyUtils.h b/src/common/utils/NebulaKeyUtils.h similarity index 100% rename from src/common/base/NebulaKeyUtils.h rename to src/common/utils/NebulaKeyUtils.h diff --git a/src/common/utils/test/CMakeLists.txt b/src/common/utils/test/CMakeLists.txt new file mode 100644 index 00000000000..fd67133ebe5 --- /dev/null +++ b/src/common/utils/test/CMakeLists.txt @@ -0,0 +1,12 @@ +nebula_add_test( + NAME + nebula_key_utils_test + SOURCES + NebulaKeyUtilsTest.cpp + OBJECTS + $ + $ + LIBRARIES + gtest + gtest_main +) diff --git a/src/common/base/test/NebulaKeyUtilsTest.cpp b/src/common/utils/test/NebulaKeyUtilsTest.cpp similarity index 99% rename from src/common/base/test/NebulaKeyUtilsTest.cpp rename to src/common/utils/test/NebulaKeyUtilsTest.cpp index 4ae78bc9f55..b72671345f2 100644 --- a/src/common/base/test/NebulaKeyUtilsTest.cpp +++ b/src/common/utils/test/NebulaKeyUtilsTest.cpp @@ -5,7 +5,7 @@ */ #include "base/Base.h" -#include "base/NebulaKeyUtils.h" +#include "utils/NebulaKeyUtils.h" #include namespace nebula { diff --git a/src/daemons/CMakeLists.txt b/src/daemons/CMakeLists.txt index ca2964b49de..2dc9437c43e 100644 --- a/src/daemons/CMakeLists.txt +++ b/src/daemons/CMakeLists.txt @@ -35,6 +35,7 @@ nebula_add_executable( $ $ $ + $ LIBRARIES proxygenhttpserver proxygenlib @@ -80,6 +81,7 @@ nebula_add_executable( $ $ $ + $ LIBRARIES proxygenhttpserver proxygenlib @@ -124,6 +126,7 @@ nebula_add_executable( $ $ $ + $ LIBRARIES proxygenhttpserver proxygenlib diff --git a/src/graph/test/CMakeLists.txt b/src/graph/test/CMakeLists.txt index 6b441b30b5f..26bed558fb8 100644 --- a/src/graph/test/CMakeLists.txt +++ b/src/graph/test/CMakeLists.txt @@ -1,6 +1,7 @@ set(GRAPH_TEST_LIBS $ $ + $ $ $ $ diff --git a/src/kvstore/CompactionFilter.h b/src/kvstore/CompactionFilter.h index ce4420ba7c5..61c659b3ddd 100644 --- a/src/kvstore/CompactionFilter.h +++ b/src/kvstore/CompactionFilter.h @@ -9,7 +9,7 @@ #include "base/Base.h" #include -#include "base/NebulaKeyUtils.h" +#include "utils/NebulaKeyUtils.h" #include "time/WallClock.h" #include "kvstore/Common.h" diff --git a/src/kvstore/Part.cpp b/src/kvstore/Part.cpp index 00766662aef..75e89bf8774 100644 --- a/src/kvstore/Part.cpp +++ b/src/kvstore/Part.cpp @@ -6,7 +6,7 @@ #include "kvstore/Part.h" #include "kvstore/LogEncoder.h" -#include "base/NebulaKeyUtils.h" +#include "utils/NebulaKeyUtils.h" #include "kvstore/RocksEngineConfig.h" DEFINE_int32(cluster_id, 0, "A unique id for each cluster"); diff --git a/src/kvstore/Part.h b/src/kvstore/Part.h index 90cd98f0984..56a99df3925 100644 --- a/src/kvstore/Part.h +++ b/src/kvstore/Part.h @@ -8,7 +8,7 @@ #define KVSTORE_PART_H_ #include "base/Base.h" -#include "base/NebulaKeyUtils.h" +#include "utils/NebulaKeyUtils.h" #include "raftex/RaftPart.h" #include "kvstore/Common.h" #include "kvstore/KVEngine.h" diff --git a/src/kvstore/SnapshotManagerImpl.cpp b/src/kvstore/SnapshotManagerImpl.cpp index 413ae34e7b0..41c32cbfc16 100644 --- a/src/kvstore/SnapshotManagerImpl.cpp +++ b/src/kvstore/SnapshotManagerImpl.cpp @@ -4,7 +4,7 @@ * attached with Common Clause Condition 1.0, found in the LICENSES directory. */ #include "kvstore/SnapshotManagerImpl.h" -#include "base/NebulaKeyUtils.h" +#include "utils/NebulaKeyUtils.h" #include "kvstore/LogEncoder.h" DEFINE_int32(snapshot_batch_size, 1024 * 1024 * 10, "batch size for snapshot"); diff --git a/src/kvstore/plugins/hbase/HBaseStore.cpp b/src/kvstore/plugins/hbase/HBaseStore.cpp index abb7695bc48..2481453ddca 100644 --- a/src/kvstore/plugins/hbase/HBaseStore.cpp +++ b/src/kvstore/plugins/hbase/HBaseStore.cpp @@ -5,7 +5,7 @@ */ #include "base/Base.h" -#include "base/NebulaKeyUtils.h" +#include "utils/NebulaKeyUtils.h" #include "network/NetworkUtils.h" #include "dataman/NebulaCodecImpl.h" #include "kvstore/plugins/hbase/HBaseStore.h" diff --git a/src/kvstore/plugins/hbase/test/CMakeLists.txt b/src/kvstore/plugins/hbase/test/CMakeLists.txt index 3e2fa231579..961fe4dc237 100644 --- a/src/kvstore/plugins/hbase/test/CMakeLists.txt +++ b/src/kvstore/plugins/hbase/test/CMakeLists.txt @@ -20,6 +20,7 @@ nebula_add_test( $ $ $ + $ LIBRARIES ${ROCKSDB_LIBRARIES} ${THRIFT_LIBRARIES} @@ -50,6 +51,7 @@ nebula_add_test( $ $ $ + $ LIBRARIES ${ROCKSDB_LIBRARIES} ${THRIFT_LIBRARIES} diff --git a/src/kvstore/plugins/hbase/test/HBaseStoreTest.cpp b/src/kvstore/plugins/hbase/test/HBaseStoreTest.cpp index 1aab3a2bf79..708e56ac62f 100644 --- a/src/kvstore/plugins/hbase/test/HBaseStoreTest.cpp +++ b/src/kvstore/plugins/hbase/test/HBaseStoreTest.cpp @@ -5,7 +5,7 @@ */ #include "base/Base.h" -#include "base/NebulaKeyUtils.h" +#include "utils/NebulaKeyUtils.h" #include "dataman/RowReader.h" #include "dataman/RowWriter.h" #include "kvstore/plugins/hbase/HBaseStore.h" diff --git a/src/kvstore/raftex/SnapshotManager.cpp b/src/kvstore/raftex/SnapshotManager.cpp index 78b21625ea4..8d1984bf773 100644 --- a/src/kvstore/raftex/SnapshotManager.cpp +++ b/src/kvstore/raftex/SnapshotManager.cpp @@ -4,7 +4,7 @@ * attached with Common Clause Condition 1.0, found in the LICENSES directory. */ #include "kvstore/raftex/SnapshotManager.h" -#include "base/NebulaKeyUtils.h" +#include "utils/NebulaKeyUtils.h" #include "kvstore/raftex/RaftPart.h" DEFINE_int32(snapshot_worker_threads, 4, "Threads number for snapshot"); diff --git a/src/kvstore/raftex/test/CMakeLists.txt b/src/kvstore/raftex/test/CMakeLists.txt index bf16b49a0d7..d29348b4789 100644 --- a/src/kvstore/raftex/test/CMakeLists.txt +++ b/src/kvstore/raftex/test/CMakeLists.txt @@ -8,6 +8,7 @@ set(RAFTEX_TEST_LIBS $ $ $ + $ ) diff --git a/src/kvstore/test/CMakeLists.txt b/src/kvstore/test/CMakeLists.txt index 4a67b55f7b0..139acce63a8 100644 --- a/src/kvstore/test/CMakeLists.txt +++ b/src/kvstore/test/CMakeLists.txt @@ -16,6 +16,7 @@ set(KVSTORE_TEST_LIBS $ $ $ + $ ) nebula_add_test( @@ -77,6 +78,7 @@ nebula_add_test( $ $ $ + $ LIBRARIES ${THRIFT_LIBRARIES} ${ROCKSDB_LIBRARIES} diff --git a/src/meta/test/CMakeLists.txt b/src/meta/test/CMakeLists.txt index 532cd12db43..e637783d798 100644 --- a/src/meta/test/CMakeLists.txt +++ b/src/meta/test/CMakeLists.txt @@ -20,6 +20,7 @@ set(meta_test_deps $ $ $ + $ ) nebula_add_test( diff --git a/src/storage/CompactionFilter.h b/src/storage/CompactionFilter.h index b84b027c35c..ec83e7b3fa4 100644 --- a/src/storage/CompactionFilter.h +++ b/src/storage/CompactionFilter.h @@ -8,7 +8,7 @@ #define STORAGE_COMPACTIONFILTER_H_ #include "base/Base.h" -#include "base/NebulaKeyUtils.h" +#include "utils/NebulaKeyUtils.h" #include "dataman/RowReader.h" #include "meta/NebulaSchemaProvider.h" #include "kvstore/CompactionFilter.h" diff --git a/src/storage/index/IndexPolicyMaker.cpp b/src/storage/index/IndexPolicyMaker.cpp index b6b2bf10884..d5a16d51ddc 100644 --- a/src/storage/index/IndexPolicyMaker.cpp +++ b/src/storage/index/IndexPolicyMaker.cpp @@ -5,7 +5,7 @@ */ #include "storage/index/IndexPolicyMaker.h" -#include "common/base/NebulaKeyUtils.h" +#include "utils/NebulaKeyUtils.h" namespace nebula { namespace storage { diff --git a/src/storage/kv/GetProcessor.cpp b/src/storage/kv/GetProcessor.cpp index 1f43edd40ac..b9065bf87b9 100644 --- a/src/storage/kv/GetProcessor.cpp +++ b/src/storage/kv/GetProcessor.cpp @@ -5,7 +5,7 @@ */ #include "storage/kv/GetProcessor.h" -#include "base/NebulaKeyUtils.h" +#include "utils/NebulaKeyUtils.h" namespace nebula { namespace storage { diff --git a/src/storage/mutate/AddEdgesProcessor.cpp b/src/storage/mutate/AddEdgesProcessor.cpp index 633fa86f3c8..9275b07a843 100644 --- a/src/storage/mutate/AddEdgesProcessor.cpp +++ b/src/storage/mutate/AddEdgesProcessor.cpp @@ -4,7 +4,7 @@ * attached with Common Clause Condition 1.0, found in the LICENSES directory. */ #include "storage/mutate/AddEdgesProcessor.h" -#include "base/NebulaKeyUtils.h" +#include "utils/NebulaKeyUtils.h" #include #include #include "time/WallClock.h" diff --git a/src/storage/mutate/AddVerticesProcessor.cpp b/src/storage/mutate/AddVerticesProcessor.cpp index befa809f342..1758bfd6a12 100644 --- a/src/storage/mutate/AddVerticesProcessor.cpp +++ b/src/storage/mutate/AddVerticesProcessor.cpp @@ -5,7 +5,7 @@ */ #include "storage/mutate/AddVerticesProcessor.h" -#include "base/NebulaKeyUtils.h" +#include "utils/NebulaKeyUtils.h" #include #include #include "time/WallClock.h" diff --git a/src/storage/mutate/DeleteEdgesProcessor.cpp b/src/storage/mutate/DeleteEdgesProcessor.cpp index 9295955b897..ec92f510386 100644 --- a/src/storage/mutate/DeleteEdgesProcessor.cpp +++ b/src/storage/mutate/DeleteEdgesProcessor.cpp @@ -6,7 +6,7 @@ #include "storage/mutate/DeleteEdgesProcessor.h" #include #include -#include "base/NebulaKeyUtils.h" +#include "utils/NebulaKeyUtils.h" namespace nebula { namespace storage { diff --git a/src/storage/mutate/DeleteVerticesProcessor.cpp b/src/storage/mutate/DeleteVerticesProcessor.cpp index 5ebb823eb5e..b57a96e2517 100644 --- a/src/storage/mutate/DeleteVerticesProcessor.cpp +++ b/src/storage/mutate/DeleteVerticesProcessor.cpp @@ -5,7 +5,7 @@ */ #include "storage/mutate/DeleteVerticesProcessor.h" -#include "base/NebulaKeyUtils.h" +#include "utils/NebulaKeyUtils.h" DECLARE_bool(enable_vertex_cache); diff --git a/src/storage/mutate/UpdateEdgeProcessor.cpp b/src/storage/mutate/UpdateEdgeProcessor.cpp index a42261903bf..309403b463a 100644 --- a/src/storage/mutate/UpdateEdgeProcessor.cpp +++ b/src/storage/mutate/UpdateEdgeProcessor.cpp @@ -5,7 +5,7 @@ */ #include "storage/mutate/UpdateEdgeProcessor.h" -#include "base/NebulaKeyUtils.h" +#include "utils/NebulaKeyUtils.h" #include "dataman/RowWriter.h" #include "kvstore/LogEncoder.h" diff --git a/src/storage/mutate/UpdateVertexProcessor.cpp b/src/storage/mutate/UpdateVertexProcessor.cpp index 6685f4f6153..01dbea5e0aa 100644 --- a/src/storage/mutate/UpdateVertexProcessor.cpp +++ b/src/storage/mutate/UpdateVertexProcessor.cpp @@ -6,7 +6,7 @@ #include "base/Base.h" #include "storage/mutate/UpdateVertexProcessor.h" -#include "base/NebulaKeyUtils.h" +#include "utils/NebulaKeyUtils.h" #include "dataman/RowWriter.h" #include "kvstore/LogEncoder.h" diff --git a/src/storage/query/QueryBaseProcessor.inl b/src/storage/query/QueryBaseProcessor.inl index 9a71e1a336a..6c262760a3f 100644 --- a/src/storage/query/QueryBaseProcessor.inl +++ b/src/storage/query/QueryBaseProcessor.inl @@ -4,7 +4,7 @@ * attached with Common Clause Condition 1.0, found in the LICENSES directory. */ #include "storage/query/QueryBaseProcessor.h" -#include "base/NebulaKeyUtils.h" +#include "utils/NebulaKeyUtils.h" #include #include "dataman/RowReader.h" #include "dataman/RowWriter.h" diff --git a/src/storage/query/QueryEdgePropsProcessor.cpp b/src/storage/query/QueryEdgePropsProcessor.cpp index 8ea7cea5faa..58e41e90114 100644 --- a/src/storage/query/QueryEdgePropsProcessor.cpp +++ b/src/storage/query/QueryEdgePropsProcessor.cpp @@ -5,7 +5,7 @@ */ #include "storage/query/QueryEdgePropsProcessor.h" -#include "base/NebulaKeyUtils.h" +#include "utils/NebulaKeyUtils.h" #include #include "time/Duration.h" #include "dataman/RowReader.h" diff --git a/src/storage/query/ScanEdgeProcessor.cpp b/src/storage/query/ScanEdgeProcessor.cpp index 0f6a650d3ac..15f60128fd3 100644 --- a/src/storage/query/ScanEdgeProcessor.cpp +++ b/src/storage/query/ScanEdgeProcessor.cpp @@ -4,7 +4,7 @@ * attached with Common Clause Condition 1.0, found in the LICENSES directory. */ #include "storage/query/ScanEdgeProcessor.h" -#include "base/NebulaKeyUtils.h" +#include "utils/NebulaKeyUtils.h" #include #include #include "time/WallClock.h" diff --git a/src/storage/query/ScanVertexProcessor.cpp b/src/storage/query/ScanVertexProcessor.cpp index 0aa2ebc2ed1..598fee9a53e 100644 --- a/src/storage/query/ScanVertexProcessor.cpp +++ b/src/storage/query/ScanVertexProcessor.cpp @@ -4,7 +4,7 @@ * attached with Common Clause Condition 1.0, found in the LICENSES directory. */ #include "storage/query/ScanVertexProcessor.h" -#include "base/NebulaKeyUtils.h" +#include "utils/NebulaKeyUtils.h" #include #include #include "time/WallClock.h" diff --git a/src/storage/test/AddEdgesTest.cpp b/src/storage/test/AddEdgesTest.cpp index 2c1d384cdb4..817f9c0c993 100644 --- a/src/storage/test/AddEdgesTest.cpp +++ b/src/storage/test/AddEdgesTest.cpp @@ -5,7 +5,7 @@ */ #include "base/Base.h" -#include "base/NebulaKeyUtils.h" +#include "utils/NebulaKeyUtils.h" #include #include #include "fs/TempDir.h" diff --git a/src/storage/test/AddVerticesTest.cpp b/src/storage/test/AddVerticesTest.cpp index 2be49a0cda8..bc0bf3813ac 100644 --- a/src/storage/test/AddVerticesTest.cpp +++ b/src/storage/test/AddVerticesTest.cpp @@ -5,7 +5,7 @@ */ #include "base/Base.h" -#include "base/NebulaKeyUtils.h" +#include "utils/NebulaKeyUtils.h" #include #include #include "fs/TempDir.h" diff --git a/src/storage/test/CMakeLists.txt b/src/storage/test/CMakeLists.txt index b9bd4ab178b..f6d85af8f69 100644 --- a/src/storage/test/CMakeLists.txt +++ b/src/storage/test/CMakeLists.txt @@ -1,4 +1,5 @@ set(storage_test_deps + $ $ $ $ diff --git a/src/storage/test/CompactionTest.cpp b/src/storage/test/CompactionTest.cpp index 0719380d4a9..1169e955300 100644 --- a/src/storage/test/CompactionTest.cpp +++ b/src/storage/test/CompactionTest.cpp @@ -5,7 +5,7 @@ */ #include "base/Base.h" -#include "base/NebulaKeyUtils.h" +#include "utils/NebulaKeyUtils.h" #include #include #include "fs/TempDir.h" diff --git a/src/storage/test/DeleteEdgesTest.cpp b/src/storage/test/DeleteEdgesTest.cpp index 3808102dc07..e17d79ced08 100644 --- a/src/storage/test/DeleteEdgesTest.cpp +++ b/src/storage/test/DeleteEdgesTest.cpp @@ -11,7 +11,7 @@ #include "storage/test/TestUtils.h" #include "storage/mutate/DeleteEdgesProcessor.h" #include "storage/mutate/AddEdgesProcessor.h" -#include "base/NebulaKeyUtils.h" +#include "utils/NebulaKeyUtils.h" namespace nebula { diff --git a/src/storage/test/DeleteVerticesTest.cpp b/src/storage/test/DeleteVerticesTest.cpp index 27536f1aebf..fdc30b8ad21 100644 --- a/src/storage/test/DeleteVerticesTest.cpp +++ b/src/storage/test/DeleteVerticesTest.cpp @@ -11,7 +11,7 @@ #include "storage/test/TestUtils.h" #include "storage/mutate/DeleteVerticesProcessor.h" #include "storage/mutate/AddVerticesProcessor.h" -#include "base/NebulaKeyUtils.h" +#include "utils/NebulaKeyUtils.h" namespace nebula { diff --git a/src/storage/test/IndexScanTest.cpp b/src/storage/test/IndexScanTest.cpp index bdbe2127f26..5349d2cc14f 100644 --- a/src/storage/test/IndexScanTest.cpp +++ b/src/storage/test/IndexScanTest.cpp @@ -5,7 +5,7 @@ */ #include "base/Base.h" -#include "base/NebulaKeyUtils.h" +#include "utils/NebulaKeyUtils.h" #include #include #include diff --git a/src/storage/test/IndexTest.cpp b/src/storage/test/IndexTest.cpp index dd59d0b3868..b55acb7be6a 100644 --- a/src/storage/test/IndexTest.cpp +++ b/src/storage/test/IndexTest.cpp @@ -5,7 +5,7 @@ */ #include "base/Base.h" -#include "base/NebulaKeyUtils.h" +#include "utils/NebulaKeyUtils.h" #include #include #include "fs/TempDir.h" diff --git a/src/storage/test/QueryBoundBenchmark.cpp b/src/storage/test/QueryBoundBenchmark.cpp index 4d4a186ad74..f396579fe5b 100644 --- a/src/storage/test/QueryBoundBenchmark.cpp +++ b/src/storage/test/QueryBoundBenchmark.cpp @@ -12,7 +12,7 @@ #include "fs/TempDir.h" #include "storage/test/TestUtils.h" #include "storage/query/QueryBoundProcessor.h" -#include "base/NebulaKeyUtils.h" +#include "utils/NebulaKeyUtils.h" #include "dataman/RowSetReader.h" #include "dataman/RowReader.h" #include "meta/SchemaManager.h" diff --git a/src/storage/test/QueryBoundTest.cpp b/src/storage/test/QueryBoundTest.cpp index 442da356c49..f9e1c1fe100 100644 --- a/src/storage/test/QueryBoundTest.cpp +++ b/src/storage/test/QueryBoundTest.cpp @@ -5,7 +5,7 @@ */ #include "base/Base.h" -#include "base/NebulaKeyUtils.h" +#include "utils/NebulaKeyUtils.h" #include #include #include diff --git a/src/storage/test/QueryEdgePropsTest.cpp b/src/storage/test/QueryEdgePropsTest.cpp index 42002577b99..3b464b1b2cc 100644 --- a/src/storage/test/QueryEdgePropsTest.cpp +++ b/src/storage/test/QueryEdgePropsTest.cpp @@ -5,7 +5,7 @@ */ #include "base/Base.h" -#include "base/NebulaKeyUtils.h" +#include "utils/NebulaKeyUtils.h" #include #include #include "fs/TempDir.h" diff --git a/src/storage/test/QueryStatsTest.cpp b/src/storage/test/QueryStatsTest.cpp index 447d8d79770..4613625de9e 100644 --- a/src/storage/test/QueryStatsTest.cpp +++ b/src/storage/test/QueryStatsTest.cpp @@ -5,7 +5,7 @@ */ #include "base/Base.h" -#include "base/NebulaKeyUtils.h" +#include "utils/NebulaKeyUtils.h" #include #include #include "fs/TempDir.h" diff --git a/src/storage/test/QueryVertexPropsTest.cpp b/src/storage/test/QueryVertexPropsTest.cpp index 9ad38d4078b..244359c205d 100644 --- a/src/storage/test/QueryVertexPropsTest.cpp +++ b/src/storage/test/QueryVertexPropsTest.cpp @@ -5,7 +5,7 @@ */ #include "base/Base.h" -#include "base/NebulaKeyUtils.h" +#include "utils/NebulaKeyUtils.h" #include #include #include "fs/TempDir.h" diff --git a/src/storage/test/ScanEdgeTest.cpp b/src/storage/test/ScanEdgeTest.cpp index 8da59232073..6a617de28b3 100644 --- a/src/storage/test/ScanEdgeTest.cpp +++ b/src/storage/test/ScanEdgeTest.cpp @@ -5,7 +5,7 @@ */ #include "base/Base.h" -#include "base/NebulaKeyUtils.h" +#include "utils/NebulaKeyUtils.h" #include #include #include "fs/TempDir.h" diff --git a/src/storage/test/ScanVertexTest.cpp b/src/storage/test/ScanVertexTest.cpp index 9d64d8c6e7e..4ca386f28de 100644 --- a/src/storage/test/ScanVertexTest.cpp +++ b/src/storage/test/ScanVertexTest.cpp @@ -5,7 +5,7 @@ */ #include "base/Base.h" -#include "base/NebulaKeyUtils.h" +#include "utils/NebulaKeyUtils.h" #include #include #include "fs/TempDir.h" diff --git a/src/storage/test/StorageServiceHandlerTest.cpp b/src/storage/test/StorageServiceHandlerTest.cpp index b06bfee581e..0d272c899c2 100644 --- a/src/storage/test/StorageServiceHandlerTest.cpp +++ b/src/storage/test/StorageServiceHandlerTest.cpp @@ -5,7 +5,7 @@ */ #include "base/Base.h" -#include "base/NebulaKeyUtils.h" +#include "utils/NebulaKeyUtils.h" #include #include "fs/TempDir.h" #include "storage/test/TestUtils.h" diff --git a/src/storage/test/UpdateEdgeTest.cpp b/src/storage/test/UpdateEdgeTest.cpp index f0ce309d3b5..9c679cb7aad 100644 --- a/src/storage/test/UpdateEdgeTest.cpp +++ b/src/storage/test/UpdateEdgeTest.cpp @@ -5,7 +5,7 @@ */ #include "base/Base.h" -#include "base/NebulaKeyUtils.h" +#include "utils/NebulaKeyUtils.h" #include #include #include diff --git a/src/storage/test/UpdateVertexTest.cpp b/src/storage/test/UpdateVertexTest.cpp index 4ccf2cb512b..2505a23a3d3 100644 --- a/src/storage/test/UpdateVertexTest.cpp +++ b/src/storage/test/UpdateVertexTest.cpp @@ -5,7 +5,7 @@ */ #include "base/Base.h" -#include "base/NebulaKeyUtils.h" +#include "utils/NebulaKeyUtils.h" #include #include #include diff --git a/src/storage/test/VertexCacheTest.cpp b/src/storage/test/VertexCacheTest.cpp index 7825bbd4e78..5b620d89abf 100644 --- a/src/storage/test/VertexCacheTest.cpp +++ b/src/storage/test/VertexCacheTest.cpp @@ -5,7 +5,7 @@ */ #include "base/Base.h" -#include "base/NebulaKeyUtils.h" +#include "utils/NebulaKeyUtils.h" #include #include #include "fs/TempDir.h" diff --git a/src/tools/db-dump/CMakeLists.txt b/src/tools/db-dump/CMakeLists.txt index 861a9f13040..ce6079bd75a 100644 --- a/src/tools/db-dump/CMakeLists.txt +++ b/src/tools/db-dump/CMakeLists.txt @@ -18,6 +18,7 @@ nebula_add_executable( $ $ $ + $ LIBRARIES ${ROCKSDB_LIBRARIES} ${THRIFT_LIBRARIES} diff --git a/src/tools/db-dump/DbDumper.cpp b/src/tools/db-dump/DbDumper.cpp index 5d30f02aa60..75b1d0d584a 100644 --- a/src/tools/db-dump/DbDumper.cpp +++ b/src/tools/db-dump/DbDumper.cpp @@ -6,7 +6,7 @@ #include "base/Base.h" #include "DbDumper.h" -#include "base/NebulaKeyUtils.h" +#include "utils/NebulaKeyUtils.h" #include "fs/FileUtils.h" #include "kvstore/RocksEngine.h" #include "time/Duration.h" diff --git a/src/tools/dump-edges/CMakeLists.txt b/src/tools/dump-edges/CMakeLists.txt index 11672959579..e42528915ca 100644 --- a/src/tools/dump-edges/CMakeLists.txt +++ b/src/tools/dump-edges/CMakeLists.txt @@ -5,6 +5,7 @@ nebula_add_executable( DumpEdgesTool.cpp OBJECTS $ + $ LIBRARIES ${ROCKSDB_LIBRARIES} glog diff --git a/src/tools/dump-edges/DumpEdgesTool.cpp b/src/tools/dump-edges/DumpEdgesTool.cpp index bf67fe2b978..44fc219bf8e 100644 --- a/src/tools/dump-edges/DumpEdgesTool.cpp +++ b/src/tools/dump-edges/DumpEdgesTool.cpp @@ -4,7 +4,7 @@ * attached with Common Clause Condition 1.0, found in the LICENSES directory. */ -#include "base/NebulaKeyUtils.h" +#include "utils/NebulaKeyUtils.h" #include DEFINE_string(path, "", "rocksdb instance path"); diff --git a/src/tools/simple-kv-verify/CMakeLists.txt b/src/tools/simple-kv-verify/CMakeLists.txt index fdde00575c7..9ba8be957c0 100644 --- a/src/tools/simple-kv-verify/CMakeLists.txt +++ b/src/tools/simple-kv-verify/CMakeLists.txt @@ -25,6 +25,7 @@ nebula_add_executable( $ $ $ + $ LIBRARIES ${ROCKSDB_LIBRARIES} ${THRIFT_LIBRARIES} diff --git a/src/tools/storage-perf/CMakeLists.txt b/src/tools/storage-perf/CMakeLists.txt index b5daab7b7f3..55c2bfa022e 100644 --- a/src/tools/storage-perf/CMakeLists.txt +++ b/src/tools/storage-perf/CMakeLists.txt @@ -26,6 +26,7 @@ nebula_add_executable( $ $ $ + $ LIBRARIES ${ROCKSDB_LIBRARIES} ${THRIFT_LIBRARIES} @@ -70,6 +71,7 @@ nebula_add_executable( $ $ $ + $ LIBRARIES ${ROCKSDB_LIBRARIES} ${THRIFT_LIBRARIES}