Merge branch 'role' of github.com:jackwener/nebula into role

vesoft-inc · Feb 10, 2022 · 34a3ac2 · 34a3ac2
2 parents 2a2b436 + ecce0fa
commit 34a3ac2
Show file tree

Hide file tree

Showing 62 changed files with 76 additions and 779 deletions.
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
@@ -7,15 +7,13 @@ nebula_add_subdirectory(time)
 nebula_add_subdirectory(network)
 nebula_add_subdirectory(thrift)
 nebula_add_subdirectory(fs)
-nebula_add_subdirectory(concurrent)
 nebula_add_subdirectory(thread)
 nebula_add_subdirectory(process)
 nebula_add_subdirectory(hdfs)
 nebula_add_subdirectory(http)
 nebula_add_subdirectory(stats)
 nebula_add_subdirectory(charset)
 nebula_add_subdirectory(algorithm)
-nebula_add_subdirectory(encryption)
 nebula_add_subdirectory(datatypes)
 nebula_add_subdirectory(conf)
 nebula_add_subdirectory(meta)

diff --git a/src/common/base/CMakeLists.txt b/src/common/base/CMakeLists.txt
@@ -14,7 +14,6 @@ nebula_add_library(
     SanitizerOptions.cpp
     SignalHandler.cpp
     SlowOpTracker.cpp
-    StringValue.cpp
     ${gdb_debug_script}
 )
 

diff --git a/src/common/base/ObjectPool.h b/src/common/base/ObjectPool.h
@@ -8,6 +8,7 @@
 
 #include <folly/SpinLock.h>
 
+#include <boost/core/noncopyable.hpp>
 #include <functional>
 #include <list>
 #include <type_traits>
@@ -21,7 +22,7 @@ class Expression;
 
 typedef std::lock_guard<folly::SpinLock> SLGuard;
 
-class ObjectPool final : private cpp::NonCopyable, private cpp::NonMovable {
+class ObjectPool final : private boost::noncopyable, private cpp::NonMovable {
  public:
   ObjectPool() {}
 

diff --git a/src/common/base/StringUnorderedMap.h b/src/common/base/StringUnorderedMap.h
diff --git a/src/common/base/StringValue.cpp b/src/common/base/StringValue.cpp
diff --git a/src/common/base/StringValue.h b/src/common/base/StringValue.h
diff --git a/src/common/concurrent/Barrier.cpp b/src/common/concurrent/Barrier.cpp
diff --git a/src/common/concurrent/Barrier.h b/src/common/concurrent/Barrier.h
diff --git a/src/common/concurrent/CMakeLists.txt b/src/common/concurrent/CMakeLists.txt
diff --git a/src/common/concurrent/Latch.cpp b/src/common/concurrent/Latch.cpp