fixed loop depend problem for compile link (#1995)

* fixed loop depend problem * fixed error for clang9 and gcc9 * Addressed laura-ding's comment
vesoft-inc · Mar 31, 2020 · f4c8361 · f4c8361
1 parent 4e434a5
commit f4c8361
Show file tree

Hide file tree

Showing 59 changed files with 80 additions and 50 deletions.
diff --git 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
@@ -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
@@ -75,13 +75,6 @@ nebula_add_test(
  LIBRARIES gtest gtest_main
 )
 
-nebula_add_test(
- NAME nebulakey_utils_test
- SOURCES NebulaKeyUtilsTest.cpp
- OBJECTS $<TARGET_OBJECTS:base_obj>
- 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
@@ -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 → src/common/utils/NebulaKeyUtils.cpp b/src/common/base/NebulaKeyUtils.cpp → 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 → src/common/utils/NebulaKeyUtils.h b/src/common/base/NebulaKeyUtils.h → src/common/utils/NebulaKeyUtils.h
diff --git a/src/common/utils/test/CMakeLists.txt b/src/common/utils/test/CMakeLists.txt
@@ -0,0 +1,12 @@
+nebula_add_test(
+ NAME
+ nebula_key_utils_test
+ SOURCES
+ NebulaKeyUtilsTest.cpp
+ OBJECTS
+ $<TARGET_OBJECTS:base_obj>
+ $<TARGET_OBJECTS:kvstore_storage_utils_obj>
+ LIBRARIES
+ gtest
+ gtest_main
+)
diff --git a/src/common/base/test/NebulaKeyUtilsTest.cpp → src/common/utils/test/NebulaKeyUtilsTest.cpp b/src/common/base/test/NebulaKeyUtilsTest.cpp → src/common/utils/test/NebulaKeyUtilsTest.cpp
@@ -5,7 +5,7 @@
  */
 
 #include "base/Base.h"
-#include "base/NebulaKeyUtils.h"
+#include "utils/NebulaKeyUtils.h"
 #include <gtest/gtest.h>
 
 namespace nebula {

diff --git a/src/daemons/CMakeLists.txt b/src/daemons/CMakeLists.txt
@@ -35,6 +35,7 @@ nebula_add_executable(
  $<TARGET_OBJECTS:encryption_obj>
  $<TARGET_OBJECTS:session_obj>
  $<TARGET_OBJECTS:permission_obj>
+ $<TARGET_OBJECTS:kvstore_storage_utils_obj>
  LIBRARIES
  proxygenhttpserver
  proxygenlib
@@ -80,6 +81,7 @@ nebula_add_executable(
  $<TARGET_OBJECTS:fs_obj>
  $<TARGET_OBJECTS:stats_obj>
  $<TARGET_OBJECTS:base_obj>
+ $<TARGET_OBJECTS:kvstore_storage_utils_obj>
  LIBRARIES
  proxygenhttpserver
  proxygenlib
@@ -124,6 +126,7 @@ nebula_add_executable(
  $<TARGET_OBJECTS:fs_obj>
  $<TARGET_OBJECTS:base_obj>
  $<TARGET_OBJECTS:encryption_obj>
+ $<TARGET_OBJECTS:kvstore_storage_utils_obj>
  LIBRARIES
  proxygenhttpserver
  proxygenlib

diff --git a/src/graph/test/CMakeLists.txt b/src/graph/test/CMakeLists.txt
@@ -1,6 +1,7 @@
 set(GRAPH_TEST_LIBS
  $<TARGET_OBJECTS:graph_obj>
  $<TARGET_OBJECTS:graph_thrift_obj>
+ $<TARGET_OBJECTS:kvstore_storage_utils_obj>
  $<TARGET_OBJECTS:storage_service_handler>
  $<TARGET_OBJECTS:storage_client>
  $<TARGET_OBJECTS:storage_thrift_obj>

diff --git a/src/kvstore/CompactionFilter.h b/src/kvstore/CompactionFilter.h
@@ -9,7 +9,7 @@
 
 #include "base/Base.h"
 #include <rocksdb/compaction_filter.h>
-#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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -20,6 +20,7 @@ nebula_add_test(
  $<TARGET_OBJECTS:time_obj>
  $<TARGET_OBJECTS:meta_thrift_obj>
  $<TARGET_OBJECTS:gflags_man_obj>
+ $<TARGET_OBJECTS:kvstore_storage_utils_obj>
  LIBRARIES
  ${ROCKSDB_LIBRARIES}
  ${THRIFT_LIBRARIES}
@@ -50,6 +51,7 @@ nebula_add_test(
  $<TARGET_OBJECTS:meta_thrift_obj>
  $<TARGET_OBJECTS:adHocSchema_obj>
  $<TARGET_OBJECTS:gflags_man_obj>
+ $<TARGET_OBJECTS:kvstore_storage_utils_obj>
  LIBRARIES
  ${ROCKSDB_LIBRARIES}
  ${THRIFT_LIBRARIES}

diff --git 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
@@ -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
@@ -8,6 +8,7 @@ set(RAFTEX_TEST_LIBS
  $<TARGET_OBJECTS:network_obj>
  $<TARGET_OBJECTS:thrift_obj>
  $<TARGET_OBJECTS:time_obj>
+ $<TARGET_OBJECTS:kvstore_storage_utils_obj>
 )
 
 

diff --git a/src/kvstore/test/CMakeLists.txt b/src/kvstore/test/CMakeLists.txt
@@ -16,6 +16,7 @@ set(KVSTORE_TEST_LIBS
  $<TARGET_OBJECTS:thrift_obj>
  $<TARGET_OBJECTS:time_obj>
  $<TARGET_OBJECTS:gflags_man_obj>
+ $<TARGET_OBJECTS:kvstore_storage_utils_obj>
 )
 
 nebula_add_test(
@@ -77,6 +78,7 @@ nebula_add_test(
  $<TARGET_OBJECTS:network_obj>
  $<TARGET_OBJECTS:thrift_obj>
  $<TARGET_OBJECTS:time_obj>
+ $<TARGET_OBJECTS:kvstore_storage_utils_obj>
  LIBRARIES
  ${THRIFT_LIBRARIES}
  ${ROCKSDB_LIBRARIES}

diff --git a/src/meta/test/CMakeLists.txt b/src/meta/test/CMakeLists.txt
@@ -20,6 +20,7 @@ set(meta_test_deps
  $<TARGET_OBJECTS:network_obj>
  $<TARGET_OBJECTS:thread_obj>
  $<TARGET_OBJECTS:base_obj>
+ $<TARGET_OBJECTS:kvstore_storage_utils_obj>
 )
 
 nebula_add_test(

diff --git 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
@@ -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
@@ -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
@@ -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 <algorithm>
 #include <limits>
 #include "time/WallClock.h"

diff --git 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 <algorithm>
 #include <limits>
 #include "time/WallClock.h"

diff --git a/src/storage/mutate/DeleteEdgesProcessor.cpp b/src/storage/mutate/DeleteEdgesProcessor.cpp
@@ -6,7 +6,7 @@
 #include "storage/mutate/DeleteEdgesProcessor.h"
 #include <algorithm>
 #include <limits>
-#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
@@ -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
@@ -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
@@ -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
@@ -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 <algorithm>
 #include "dataman/RowReader.h"
 #include "dataman/RowWriter.h"

diff --git 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 <algorithm>
 #include "time/Duration.h"
 #include "dataman/RowReader.h"

diff --git 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 <algorithm>
 #include <limits>
 #include "time/WallClock.h"

diff --git 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 <algorithm>
 #include <limits>
 #include "time/WallClock.h"

diff --git 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 <gtest/gtest.h>
 #include <rocksdb/db.h>
 #include "fs/TempDir.h"

diff --git 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 <gtest/gtest.h>
 #include <rocksdb/db.h>
 #include "fs/TempDir.h"

diff --git a/src/storage/test/CMakeLists.txt b/src/storage/test/CMakeLists.txt
@@ -1,4 +1,5 @@
 set(storage_test_deps
+ $<TARGET_OBJECTS:kvstore_storage_utils_obj>
  $<TARGET_OBJECTS:storage_service_handler>
  $<TARGET_OBJECTS:filter_obj>
  $<TARGET_OBJECTS:storage_client>

diff --git 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 <gtest/gtest.h>
 #include <folly/synchronization/Baton.h>
 #include "fs/TempDir.h"

diff --git 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
@@ -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
@@ -5,7 +5,7 @@
  */
 
 #include "base/Base.h"
-#include "base/NebulaKeyUtils.h"
+#include "utils/NebulaKeyUtils.h"
 #include <gtest/gtest.h>
 #include <rocksdb/db.h>
 #include <limits>