Cherry pick V2.6.0 1021 (#3177)

* Fix the interval time of memory checking in graph background thread (#3175) * Move ScopedTimer from graph to common module * fix PushLimitDownProjRule (#3167) * Fix the lookup limit result (#3171) * Fix the lookup limit result. * Stablize the limit cast in multiple storage nodes. * Remove limit clause of lookup. Co-authored-by: kyle.cao <[email protected]> Co-authored-by: Shylock Hg <[email protected]>
vesoft-inc · Oct 22, 2021 · 1a82164 · 1a82164
1 parent 0e94042
commit 1a82164
Show file tree

Hide file tree

Showing 63 changed files with 161 additions and 224 deletions.
diff --git a/src/graph/util/ScopedTimer.h → src/common/time/ScopedTimer.h b/src/graph/util/ScopedTimer.h → src/common/time/ScopedTimer.h
@@ -4,8 +4,7 @@
  * attached with Common Clause Condition 1.0, found in the LICENSES directory.
  */
 
-#ifndef GRAPH_UTIL_SCOPEDTIMER_H_
-#define GRAPH_UTIL_SCOPEDTIMER_H_
+#pragma once
 
 #include <functional>
 
@@ -52,5 +51,3 @@ class ScopedTimer final {
 #define CONCAT_IMPL(x, y) x##y
 #define MACRO_CONCAT(x, y) CONCAT_IMPL(x, y)
 #define SCOPED_TIMER(v) ::nebula::ScopedTimer MACRO_CONCAT(_SCOPED_TIMER_, __LINE__)(v)
-
-#endif  // GRAPH_UTIL_SCOPEDTIMER_H_
diff --git a/src/common/time/test/CMakeLists.txt b/src/common/time/test/CMakeLists.txt
@@ -8,6 +8,7 @@ nebula_add_test(
         duration_test
     SOURCES
         DurationTest.cpp
+        ScopedTimerTest.cpp
     OBJECTS
         $<TARGET_OBJECTS:base_obj>
         $<TARGET_OBJECTS:time_obj>

diff --git a/src/graph/util/test/ScopedTimerTest.cpp → src/common/time/test/ScopedTimerTest.cpp b/src/graph/util/test/ScopedTimerTest.cpp → src/common/time/test/ScopedTimerTest.cpp
@@ -6,7 +6,7 @@
 
 #include <gtest/gtest.h>
 
-#include "graph/util/ScopedTimer.h"
+#include "common/time/ScopedTimer.h"
 
 namespace nebula {
 

diff --git a/src/graph/context/ast/QueryAstContext.h b/src/graph/context/ast/QueryAstContext.h
@@ -113,7 +113,6 @@ struct LookupContext final : public AstContext {
   bool dedup{false};
   bool isEmptyResultSet{false};
   int32_t schemaId{-1};
-  int64_t limit{-1};
   Expression* filter{nullptr};
   YieldColumns* yieldExpr{nullptr};
   std::vector<std::string> idxReturnCols;

diff --git a/src/graph/executor/Executor.cpp b/src/graph/executor/Executor.cpp
@@ -13,6 +13,7 @@
 
 #include "common/base/ObjectPool.h"
 #include "common/memory/MemoryUtils.h"
+#include "common/time/ScopedTimer.h"
 #include "graph/context/ExecutionContext.h"
 #include "graph/context/QueryContext.h"
 #include "graph/executor/ExecutionError.h"
@@ -97,7 +98,6 @@
 #include "graph/planner/plan/PlanNode.h"
 #include "graph/planner/plan/Query.h"
 #include "graph/service/GraphFlags.h"
-#include "graph/util/ScopedTimer.h"
 #include "interface/gen-cpp2/graph_types.h"
 
 using folly::stringPrintf;

diff --git a/src/graph/executor/Executor.h b/src/graph/executor/Executor.h
@@ -17,8 +17,8 @@
 #include "common/cpp/helpers.h"
 #include "common/datatypes/Value.h"
 #include "common/time/Duration.h"
+#include "common/time/ScopedTimer.h"
 #include "graph/context/ExecutionContext.h"
-#include "graph/util/ScopedTimer.h"
 
 namespace nebula {
 namespace graph {

diff --git a/src/graph/executor/admin/CharsetExecutor.cpp b/src/graph/executor/admin/CharsetExecutor.cpp
@@ -6,8 +6,8 @@
 
 #include "graph/executor/admin/CharsetExecutor.h"
 
+#include "common/time/ScopedTimer.h"
 #include "graph/context/QueryContext.h"
-#include "graph/util/ScopedTimer.h"
 
 namespace nebula {
 namespace graph {

diff --git a/src/graph/executor/admin/ConfigExecutor.cpp b/src/graph/executor/admin/ConfigExecutor.cpp
@@ -9,10 +9,10 @@
 #include <thrift/lib/cpp/util/EnumUtils.h>
 
 #include "common/conf/Configuration.h"
+#include "common/time/ScopedTimer.h"
 #include "graph/context/QueryContext.h"
 #include "graph/planner/plan/Admin.h"
 #include "graph/util/SchemaUtil.h"
-#include "graph/util/ScopedTimer.h"
 
 namespace nebula {
 namespace graph {

diff --git a/src/graph/executor/admin/GroupExecutor.cpp b/src/graph/executor/admin/GroupExecutor.cpp
@@ -6,8 +6,8 @@
 
 #include "graph/executor/admin/GroupExecutor.h"
 
+#include "common/time/ScopedTimer.h"
 #include "graph/planner/plan/Admin.h"
-#include "graph/util/ScopedTimer.h"
 
 namespace nebula {
 namespace graph {

diff --git a/src/graph/executor/admin/PartExecutor.cpp b/src/graph/executor/admin/PartExecutor.cpp
@@ -6,9 +6,9 @@
 
 #include "graph/executor/admin/PartExecutor.h"
 
+#include "common/time/ScopedTimer.h"
 #include "graph/context/QueryContext.h"
 #include "graph/planner/plan/Admin.h"
-#include "graph/util/ScopedTimer.h"
 
 using nebula::network::NetworkUtils;
 

diff --git a/src/graph/executor/admin/ShowHostsExecutor.cpp b/src/graph/executor/admin/ShowHostsExecutor.cpp
@@ -8,9 +8,9 @@
 
 #include <thrift/lib/cpp/util/EnumUtils.h>
 
+#include "common/time/ScopedTimer.h"
 #include "graph/context/QueryContext.h"
 #include "graph/planner/plan/Admin.h"
-#include "graph/util/ScopedTimer.h"
 
 namespace nebula {
 namespace graph {

diff --git a/src/graph/executor/admin/ShowMetaLeaderExecutor.cpp b/src/graph/executor/admin/ShowMetaLeaderExecutor.cpp
@@ -8,10 +8,10 @@
 
 #include <thrift/lib/cpp/util/EnumUtils.h>
 
+#include "common/time/ScopedTimer.h"
 #include "common/time/TimeUtils.h"
 #include "graph/context/QueryContext.h"
 #include "graph/planner/plan/Admin.h"
-#include "graph/util/ScopedTimer.h"
 
 namespace nebula {
 namespace graph {

diff --git a/src/graph/executor/admin/ShowQueriesExecutor.cpp b/src/graph/executor/admin/ShowQueriesExecutor.cpp
@@ -8,10 +8,10 @@
 
 #include <thrift/lib/cpp/util/EnumUtils.h>
 
+#include "common/time/ScopedTimer.h"
 #include "common/time/TimeUtils.h"
 #include "graph/context/QueryContext.h"
 #include "graph/planner/plan/Admin.h"
-#include "graph/util/ScopedTimer.h"
 
 namespace nebula {
 namespace graph {

diff --git a/src/graph/executor/admin/ShowStatsExecutor.cpp b/src/graph/executor/admin/ShowStatsExecutor.cpp
@@ -6,11 +6,11 @@
 
 #include "graph/executor/admin/ShowStatsExecutor.h"
 
+#include "common/time/ScopedTimer.h"
 #include "graph/context/QueryContext.h"
 #include "graph/planner/plan/Admin.h"
 #include "graph/service/PermissionManager.h"
 #include "graph/util/SchemaUtil.h"
-#include "graph/util/ScopedTimer.h"
 
 namespace nebula {
 namespace graph {

diff --git a/src/graph/executor/admin/SnapshotExecutor.cpp b/src/graph/executor/admin/SnapshotExecutor.cpp
@@ -8,9 +8,9 @@
 
 #include <thrift/lib/cpp/util/EnumUtils.h>
 
+#include "common/time/ScopedTimer.h"
 #include "graph/context/QueryContext.h"
 #include "graph/planner/plan/Admin.h"
-#include "graph/util/ScopedTimer.h"
 
 namespace nebula {
 namespace graph {

diff --git a/src/graph/executor/admin/SpaceExecutor.cpp b/src/graph/executor/admin/SpaceExecutor.cpp
@@ -6,12 +6,12 @@
 
 #include "graph/executor/admin/SpaceExecutor.h"
 
+#include "common/time/ScopedTimer.h"
 #include "graph/context/QueryContext.h"
 #include "graph/planner/plan/Admin.h"
 #include "graph/service/PermissionManager.h"
 #include "graph/util/FTIndexUtils.h"
 #include "graph/util/SchemaUtil.h"
-#include "graph/util/ScopedTimer.h"
 
 namespace nebula {
 namespace graph {

diff --git a/src/graph/executor/admin/SubmitJobExecutor.cpp b/src/graph/executor/admin/SubmitJobExecutor.cpp
@@ -8,10 +8,10 @@
 
 #include <thrift/lib/cpp/util/EnumUtils.h>
 
+#include "common/time/ScopedTimer.h"
 #include "common/time/TimeUtils.h"
 #include "graph/context/QueryContext.h"
 #include "graph/planner/plan/Admin.h"
-#include "graph/util/ScopedTimer.h"
 
 namespace nebula {
 namespace graph {

diff --git a/src/graph/executor/admin/SwitchSpaceExecutor.cpp b/src/graph/executor/admin/SwitchSpaceExecutor.cpp
@@ -7,10 +7,10 @@
 #include "graph/executor/admin/SwitchSpaceExecutor.h"
 
 #include "clients/meta/MetaClient.h"
+#include "common/time/ScopedTimer.h"
 #include "graph/context/QueryContext.h"
 #include "graph/planner/plan/Query.h"
 #include "graph/service/PermissionManager.h"
-#include "graph/util/ScopedTimer.h"
 #include "interface/gen-cpp2/meta_types.h"
 
 namespace nebula {

diff --git a/src/graph/executor/admin/ZoneExecutor.cpp b/src/graph/executor/admin/ZoneExecutor.cpp
@@ -6,8 +6,8 @@
 
 #include "graph/executor/admin/ZoneExecutor.h"
 
+#include "common/time/ScopedTimer.h"
 #include "graph/planner/plan/Admin.h"
-#include "graph/util/ScopedTimer.h"
 
 namespace nebula {
 namespace graph {

diff --git a/src/graph/executor/logic/LoopExecutor.cpp b/src/graph/executor/logic/LoopExecutor.cpp
@@ -8,10 +8,10 @@
 
 #include <folly/String.h>
 
+#include "common/time/ScopedTimer.h"
 #include "graph/context/QueryExpressionContext.h"
 #include "graph/planner/plan/Logic.h"
 #include "graph/planner/plan/Query.h"
-#include "graph/util/ScopedTimer.h"
 #include "interface/gen-cpp2/common_types.h"
 
 using folly::stringPrintf;

diff --git a/src/graph/executor/logic/PassThroughExecutor.cpp b/src/graph/executor/logic/PassThroughExecutor.cpp
@@ -6,8 +6,8 @@
 
 #include "graph/executor/logic/PassThroughExecutor.h"
 
+#include "common/time/ScopedTimer.h"
 #include "graph/planner/plan/Query.h"
-#include "graph/util/ScopedTimer.h"
 
 namespace nebula {
 namespace graph {

diff --git a/src/graph/executor/logic/SelectExecutor.cpp b/src/graph/executor/logic/SelectExecutor.cpp
@@ -6,10 +6,10 @@
 
 #include "graph/executor/logic/SelectExecutor.h"
 
+#include "common/time/ScopedTimer.h"
 #include "graph/context/QueryExpressionContext.h"
 #include "graph/planner/plan/Logic.h"
 #include "graph/planner/plan/Query.h"
-#include "graph/util/ScopedTimer.h"
 
 namespace nebula {
 namespace graph {

diff --git a/src/graph/executor/logic/StartExecutor.cpp b/src/graph/executor/logic/StartExecutor.cpp
@@ -6,8 +6,8 @@
 
 #include "graph/executor/logic/StartExecutor.h"
 
+#include "common/time/ScopedTimer.h"
 #include "graph/planner/plan/PlanNode.h"
-#include "graph/util/ScopedTimer.h"
 
 namespace nebula {
 namespace graph {

diff --git a/src/graph/executor/maintain/EdgeExecutor.cpp b/src/graph/executor/maintain/EdgeExecutor.cpp
@@ -6,10 +6,10 @@
 
 #include "graph/executor/maintain/EdgeExecutor.h"
 
+#include "common/time/ScopedTimer.h"
 #include "graph/context/QueryContext.h"
 #include "graph/planner/plan/Maintain.h"
 #include "graph/util/SchemaUtil.h"
-#include "graph/util/ScopedTimer.h"
 
 namespace nebula {
 namespace graph {

diff --git a/src/graph/executor/maintain/TagExecutor.cpp b/src/graph/executor/maintain/TagExecutor.cpp
@@ -6,10 +6,10 @@
 
 #include "graph/executor/maintain/TagExecutor.h"
 
+#include "common/time/ScopedTimer.h"
 #include "graph/context/QueryContext.h"
 #include "graph/planner/plan/Maintain.h"
 #include "graph/util/SchemaUtil.h"
-#include "graph/util/ScopedTimer.h"
 
 namespace nebula {
 namespace graph {

diff --git a/src/graph/executor/mutate/DeleteExecutor.cpp b/src/graph/executor/mutate/DeleteExecutor.cpp
@@ -6,11 +6,11 @@
 
 #include "DeleteExecutor.h"
 
+#include "common/time/ScopedTimer.h"
 #include "graph/context/QueryContext.h"
 #include "graph/executor/mutate/DeleteExecutor.h"
 #include "graph/planner/plan/Mutate.h"
 #include "graph/util/SchemaUtil.h"
-#include "graph/util/ScopedTimer.h"
 
 using nebula::storage::GraphStorageClient;
 

diff --git a/src/graph/executor/mutate/InsertExecutor.cpp b/src/graph/executor/mutate/InsertExecutor.cpp
@@ -6,10 +6,10 @@
 
 #include "graph/executor/mutate/InsertExecutor.h"
 
+#include "common/time/ScopedTimer.h"
 #include "graph/context/QueryContext.h"
 #include "graph/planner/plan/Mutate.h"
 #include "graph/service/GraphFlags.h"
-#include "graph/util/ScopedTimer.h"
 
 using nebula::storage::GraphStorageClient;
 

diff --git a/src/graph/executor/mutate/UpdateExecutor.cpp b/src/graph/executor/mutate/UpdateExecutor.cpp
@@ -6,11 +6,11 @@
 
 #include "UpdateExecutor.h"
 
+#include "common/time/ScopedTimer.h"
 #include "graph/context/QueryContext.h"
 #include "graph/planner/plan/Mutate.h"
 #include "graph/service/GraphFlags.h"
 #include "graph/util/SchemaUtil.h"
-#include "graph/util/ScopedTimer.h"
 
 using nebula::storage::GraphStorageClient;
 

diff --git a/src/graph/executor/query/AggregateExecutor.cpp b/src/graph/executor/query/AggregateExecutor.cpp
@@ -8,11 +8,11 @@
 
 #include "common/datatypes/List.h"
 #include "common/expression/AggregateExpression.h"
+#include "common/time/ScopedTimer.h"
 #include "graph/context/QueryExpressionContext.h"
 #include "graph/context/Result.h"
 #include "graph/planner/plan/PlanNode.h"
 #include "graph/planner/plan/Query.h"
-#include "graph/util/ScopedTimer.h"
 
 namespace nebula {
 namespace graph {

diff --git a/src/graph/executor/query/DataCollectExecutor.cpp b/src/graph/executor/query/DataCollectExecutor.cpp
@@ -6,8 +6,8 @@
 
 #include "graph/executor/query/DataCollectExecutor.h"
 
+#include "common/time/ScopedTimer.h"
 #include "graph/planner/plan/Query.h"
-#include "graph/util/ScopedTimer.h"
 
 namespace nebula {
 namespace graph {

diff --git a/src/graph/executor/query/DedupExecutor.cpp b/src/graph/executor/query/DedupExecutor.cpp
@@ -6,9 +6,9 @@
 
 #include "graph/executor/query/DedupExecutor.h"
 
+#include "common/time/ScopedTimer.h"
 #include "graph/context/QueryExpressionContext.h"
 #include "graph/planner/plan/Query.h"
-#include "graph/util/ScopedTimer.h"
 
 namespace nebula {
 namespace graph {

diff --git a/src/graph/executor/query/FilterExecutor.cpp b/src/graph/executor/query/FilterExecutor.cpp
@@ -6,9 +6,9 @@
 
 #include "graph/executor/query/FilterExecutor.h"
 
+#include "common/time/ScopedTimer.h"
 #include "graph/context/QueryExpressionContext.h"
 #include "graph/planner/plan/Query.h"
-#include "graph/util/ScopedTimer.h"
 
 namespace nebula {
 namespace graph {

diff --git a/src/graph/executor/query/GetEdgesExecutor.cpp b/src/graph/executor/query/GetEdgesExecutor.cpp
@@ -6,10 +6,10 @@
 
 #include "graph/executor/query/GetEdgesExecutor.h"
 
+#include "common/time/ScopedTimer.h"
 #include "graph/context/QueryContext.h"
 #include "graph/planner/plan/Query.h"
 #include "graph/util/SchemaUtil.h"
-#include "graph/util/ScopedTimer.h"
 
 using nebula::storage::GraphStorageClient;
 using nebula::storage::StorageRpcResponse;

diff --git a/src/graph/executor/query/GetNeighborsExecutor.cpp b/src/graph/executor/query/GetNeighborsExecutor.cpp
@@ -11,9 +11,9 @@
 #include "clients/storage/GraphStorageClient.h"
 #include "common/datatypes/List.h"
 #include "common/datatypes/Vertex.h"
+#include "common/time/ScopedTimer.h"
 #include "graph/context/QueryContext.h"
 #include "graph/service/GraphFlags.h"
-#include "graph/util/ScopedTimer.h"
 
 using nebula::storage::GraphStorageClient;
 using nebula::storage::StorageRpcResponse;