Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cherry pick V2.6.0 1021 #3177

Merged
merged 3 commits into from
Oct 22, 2021
Merged

Cherry pick V2.6.0 1021 #3177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
80f22a8
Fix the interval time of memory checking in graph background thread (…
yixinglu Oct 21, 2021
9372528
fix PushLimitDownProjRule (#3167)
czpmango Oct 21, 2021
7788ebc
Fix the lookup limit result (#3171)
Shylock-Hg Oct 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions src/graph/util/ScopedTimer.h → src/common/time/ScopedTimer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down Expand Up @@ -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_
1 change: 1 addition & 0 deletions src/common/time/test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ nebula_add_test(
duration_test
SOURCES
DurationTest.cpp
ScopedTimerTest.cpp
OBJECTS
$<TARGET_OBJECTS:base_obj>
$<TARGET_OBJECTS:time_obj>
Expand Down
2 changes: 1 addition & 1 deletion src/graph/util/test/ScopedTimerTest.cpp → src/common/time/test/ScopedTimerTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#include <gtest/gtest.h>

#include "graph/util/ScopedTimer.h"
#include "common/time/ScopedTimer.h"

namespace nebula {

Expand Down
1 change: 0 additions & 1 deletion src/graph/context/ast/QueryAstContext.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/graph/executor/Executor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/graph/executor/Executor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/graph/executor/admin/CharsetExecutor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/graph/executor/admin/ConfigExecutor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/graph/executor/admin/GroupExecutor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/graph/executor/admin/PartExecutor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion src/graph/executor/admin/ShowHostsExecutor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/graph/executor/admin/ShowMetaLeaderExecutor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/graph/executor/admin/ShowQueriesExecutor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/graph/executor/admin/ShowStatsExecutor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/graph/executor/admin/SnapshotExecutor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/graph/executor/admin/SpaceExecutor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/graph/executor/admin/SubmitJobExecutor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/graph/executor/admin/SwitchSpaceExecutor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/graph/executor/admin/ZoneExecutor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/graph/executor/logic/LoopExecutor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/graph/executor/logic/PassThroughExecutor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/graph/executor/logic/SelectExecutor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/graph/executor/logic/StartExecutor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/graph/executor/maintain/EdgeExecutor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/graph/executor/maintain/TagExecutor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/graph/executor/mutate/DeleteExecutor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion src/graph/executor/mutate/InsertExecutor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion src/graph/executor/mutate/UpdateExecutor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion src/graph/executor/query/AggregateExecutor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/graph/executor/query/DataCollectExecutor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/graph/executor/query/DedupExecutor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/graph/executor/query/FilterExecutor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/graph/executor/query/GetEdgesExecutor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/graph/executor/query/GetNeighborsExecutor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading