Merge branch 'master' into master

vesoft-inc · Apr 18, 2024 · 73ff1a2 · 73ff1a2
2 parents e7d9962 + 494f48b
commit 73ff1a2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/src/common/base/Cord.h b/src/common/base/Cord.h
@@ -6,8 +6,8 @@
 #ifndef COMMON_BASE_CORD_H_
 #define COMMON_BASE_CORD_H_
 
-#include <stdlib.h>
-
+#include <cstdint>
+#include <cstdlib>
 #include <functional>
 #include <string>
 

diff --git a/src/graph/planner/plan/ExecutionPlan.h b/src/graph/planner/plan/ExecutionPlan.h
@@ -6,6 +6,7 @@
 #ifndef GRAPH_PLANNER_PLAN_EXECUTIONPLAN_H_
 #define GRAPH_PLANNER_PLAN_EXECUTIONPLAN_H_
 
+#include <cstdint>
 #include <string>
 
 namespace nebula {

diff --git a/src/storage/query/ScanEdgeProcessor.cpp b/src/storage/query/ScanEdgeProcessor.cpp
@@ -66,6 +66,10 @@ nebula::cpp2::ErrorCode ScanEdgeProcessor::checkAndBuildContexts(const cpp2::Sca
 
   std::vector<cpp2::EdgeProp> returnProps = *req.return_columns_ref();
   ret = handleEdgeProps(returnProps);
+  if (ret != nebula::cpp2::ErrorCode::SUCCEEDED) {
+    return ret;
+  }
+
   buildEdgeColName(returnProps);
   ret = buildFilter(req, [](const cpp2::ScanEdgeRequest& r, bool onlyTag) -> const std::string* {
     UNUSED(onlyTag);