concurrent build path

vesoft-inc · Mar 19, 2023 · ae8d23a · ae8d23a
1 parent 6bf3490
commit ae8d23a
Show file tree

Hide file tree

Showing 15 changed files with 204 additions and 334 deletions.
diff --git a/src/common/memory/CMakeLists.txt b/src/common/memory/CMakeLists.txt
@@ -6,6 +6,7 @@ nebula_add_library(
         memory_obj OBJECT
         MemoryUtils.cpp
         MemoryTracker.cpp
+        NewDelete.cpp
 )
 
 nebula_add_subdirectory(test)
diff --git a/src/graph/executor/Executor.h b/src/graph/executor/Executor.h
@@ -77,6 +77,7 @@ class Executor : private boost::noncopyable, private cpp::NonMovable {
   folly::Future<Status> error(Status status) const;
 
   static Status memoryExceededStatus() {
+    DLOG(ERROR) << "test ";
     return Status::GraphMemoryExceeded(
         "(%d)", static_cast<int32_t>(nebula::cpp2::ErrorCode::E_GRAPH_MEMORY_EXCEEDED));
   }

diff --git a/src/graph/executor/PathBaseExecutor.cpp b/src/graph/executor/PathBaseExecutor.cpp
@@ -36,7 +36,7 @@ folly::Future<std::vector<Value>> PathBaseExecutor::getProps(
 
   time::Duration getPropsTime;
   StorageClient* storageClient = qctx_->getStorageClient();
-  StorageClient::CommonRequestParam param(qctx_->spaceId(),
+  StorageClient::CommonRequestParam param(qctx_->rctx()->session()->space().id,
                                           qctx_->rctx()->session()->id(),
                                           qctx_->plan()->id(),
                                           qctx_->plan()->isProfileEnabled());

diff --git a/src/graph/executor/PathBaseExecutor.h b/src/graph/executor/PathBaseExecutor.h
@@ -58,48 +58,6 @@ class PathBaseExecutor : public Executor {
     return Result::State::kSuccess;
   }
 
-  struct VertexHash {
-    std::size_t operator()(const Value& v) const {
-      switch (v.type()) {
-        case Value::Type::VERTEX: {
-          auto& vid = v.getVertex().vid;
-          if (vid.type() == Value::Type::STRING) {
-            return std::hash<std::string>()(vid.getStr());
-          } else {
-            return vid.getInt();
-          }
-        }
-        case Value::Type::STRING: {
-          return std::hash<std::string>()(v.getStr());
-        }
-        case Value::Type::INT: {
-          return v.getInt();
-        }
-        default: {
-          return v.hash();
-        }
-      }
-    }
-  };
-
-  struct VertexEqual {
-    bool operator()(const Value& lhs, const Value& rhs) const {
-      if (lhs.type() == rhs.type()) {
-        if (lhs.isVertex()) {
-          return lhs.getVertex().vid == rhs.getVertex().vid;
-        }
-        return lhs == rhs;
-      }
-      if (lhs.type() == Value::Type::VERTEX) {
-        return lhs.getVertex().vid == rhs;
-      }
-      if (rhs.type() == Value::Type::VERTEX) {
-        return lhs == rhs.getVertex().vid;
-      }
-      return lhs == rhs;
-    }
-  };
-
  protected:
   folly::SpinLock statsLock_;
 };

diff --git a/src/graph/executor/StorageAccessExecutor.h b/src/graph/executor/StorageAccessExecutor.h
@@ -133,6 +133,7 @@ class StorageAccessExecutor : public Executor {
         return Status::Error("Storage Error: Atomic operation failed.");
         // E_GRAPH_MEMORY_EXCEEDED may happen during rpc response deserialize.
       case nebula::cpp2::ErrorCode::E_GRAPH_MEMORY_EXCEEDED:
+        DLOG(ERROR) << "test ";
         return Status::GraphMemoryExceeded("(%d)", static_cast<int32_t>(code));
       case nebula::cpp2::ErrorCode::E_STORAGE_MEMORY_EXCEEDED:
         return Status::StorageMemoryExceeded("(%d)", static_cast<int32_t>(code));