diff --git a/src/graph/executor/ExecutionError.h b/src/graph/executor/ExecutionError.h
index fb986e3732a..b625c830e48 100644
--- a/src/graph/executor/ExecutionError.h
+++ b/src/graph/executor/ExecutionError.h
@@ -1,13 +1,10 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #ifndef GRAPH_EXECUTOR_EXECUTIONERROR_H_
 #define GRAPH_EXECUTOR_EXECUTIONERROR_H_
 
-#include <stdexcept>
-
 #include "common/base/Status.h"
 
 namespace nebula {
diff --git a/src/graph/executor/Executor.cpp b/src/graph/executor/Executor.cpp
index 2f3044f9abe..6ded8b16200 100644
--- a/src/graph/executor/Executor.cpp
+++ b/src/graph/executor/Executor.cpp
@@ -1,7 +1,6 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #include "graph/executor/Executor.h"
 
@@ -13,9 +12,7 @@
 #include "common/base/ObjectPool.h"
 #include "common/memory/MemoryUtils.h"
 #include "common/stats/StatsManager.h"
-#include "common/time/ScopedTimer.h"
 #include "graph/context/ExecutionContext.h"
-#include "graph/context/QueryContext.h"
 #include "graph/executor/ExecutionError.h"
 #include "graph/executor/admin/AddHostsExecutor.h"
 #include "graph/executor/admin/ChangePasswordExecutor.h"
diff --git a/src/graph/executor/Executor.h b/src/graph/executor/Executor.h
index e71ac701a65..778cd580eaf 100644
--- a/src/graph/executor/Executor.h
+++ b/src/graph/executor/Executor.h
@@ -1,7 +1,6 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #ifndef GRAPH_EXECUTOR_EXECUTOR_H_
 #define GRAPH_EXECUTOR_EXECUTOR_H_
@@ -9,16 +8,12 @@
 #include <folly/futures/Future.h>
 
 #include <boost/core/noncopyable.hpp>
-#include <set>
-#include <string>
-#include <vector>
 
-#include "common/base/Status.h"
 #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/context/QueryContext.h"
 
 namespace nebula {
 namespace graph {
diff --git a/src/graph/executor/StorageAccessExecutor.cpp b/src/graph/executor/StorageAccessExecutor.cpp
index 201902c8ded..1bd6a17e247 100644
--- a/src/graph/executor/StorageAccessExecutor.cpp
+++ b/src/graph/executor/StorageAccessExecutor.cpp
@@ -1,12 +1,10 @@
-/* Copyright (c) 2021 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #include "graph/executor/StorageAccessExecutor.h"
 
 #include <folly/Format.h>
-
 #include "graph/context/Iterator.h"
 #include "graph/context/QueryExpressionContext.h"
 #include "graph/util/SchemaUtil.h"
diff --git a/src/graph/executor/StorageAccessExecutor.h b/src/graph/executor/StorageAccessExecutor.h
index 37bb0454213..00eca280fc6 100644
--- a/src/graph/executor/StorageAccessExecutor.h
+++ b/src/graph/executor/StorageAccessExecutor.h
@@ -1,7 +1,6 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #ifndef GRAPH_EXECUTOR_STORAGEACCESSEXECUTOR_H_
 #define GRAPH_EXECUTOR_STORAGEACCESSEXECUTOR_H_
@@ -9,7 +8,6 @@
 #include <thrift/lib/cpp/util/EnumUtils.h>
 
 #include "clients/storage/StorageClientBase.h"
-#include "graph/context/QueryContext.h"
 #include "graph/executor/Executor.h"
 
 namespace nebula {
diff --git a/src/graph/executor/admin/AddHostsExecutor.cpp b/src/graph/executor/admin/AddHostsExecutor.cpp
index d24706b114f..9885311320b 100644
--- a/src/graph/executor/admin/AddHostsExecutor.cpp
+++ b/src/graph/executor/admin/AddHostsExecutor.cpp
@@ -1,7 +1,6 @@
-/* Copyright (c) 2021 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #include "graph/executor/admin/AddHostsExecutor.h"
 
diff --git a/src/graph/executor/admin/AddHostsExecutor.h b/src/graph/executor/admin/AddHostsExecutor.h
index 833f430e816..23ce6173e0b 100644
--- a/src/graph/executor/admin/AddHostsExecutor.h
+++ b/src/graph/executor/admin/AddHostsExecutor.h
@@ -1,7 +1,6 @@
-/* Copyright (c) 2021 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #ifndef GRAPH_EXECUTOR_ADMIN_ADD_HOST_EXECUTOR_H_
 #define GRAPH_EXECUTOR_ADMIN_ADD_HOST_EXECUTOR_H_
diff --git a/src/graph/executor/admin/ChangePasswordExecutor.cpp b/src/graph/executor/admin/ChangePasswordExecutor.cpp
index 48df995fd7c..3405d93c6e7 100644
--- a/src/graph/executor/admin/ChangePasswordExecutor.cpp
+++ b/src/graph/executor/admin/ChangePasswordExecutor.cpp
@@ -1,13 +1,10 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #include "graph/executor/admin/ChangePasswordExecutor.h"
 
 #include <proxygen/lib/utils/CryptUtil.h>
-
-#include "graph/context/QueryContext.h"
 #include "graph/planner/plan/Admin.h"
 
 namespace nebula {
diff --git a/src/graph/executor/admin/ChangePasswordExecutor.h b/src/graph/executor/admin/ChangePasswordExecutor.h
index 2f20da3607b..cf134962e8c 100644
--- a/src/graph/executor/admin/ChangePasswordExecutor.h
+++ b/src/graph/executor/admin/ChangePasswordExecutor.h
@@ -1,7 +1,6 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #ifndef GRAPH_EXECUTOR_ADMIN_CHANGEPASSWORDEXECUTOR_H_
 #define GRAPH_EXECUTOR_ADMIN_CHANGEPASSWORDEXECUTOR_H_
diff --git a/src/graph/executor/admin/CharsetExecutor.cpp b/src/graph/executor/admin/CharsetExecutor.cpp
index 1ac91bae195..99c0ba743e1 100644
--- a/src/graph/executor/admin/CharsetExecutor.cpp
+++ b/src/graph/executor/admin/CharsetExecutor.cpp
@@ -1,13 +1,9 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #include "graph/executor/admin/CharsetExecutor.h"
 
-#include "common/time/ScopedTimer.h"
-#include "graph/context/QueryContext.h"
-
 namespace nebula {
 namespace graph {
 folly::Future<Status> ShowCharsetExecutor::execute() {
diff --git a/src/graph/executor/admin/CharsetExecutor.h b/src/graph/executor/admin/CharsetExecutor.h
index 5c910d48c97..37e02439d3a 100644
--- a/src/graph/executor/admin/CharsetExecutor.h
+++ b/src/graph/executor/admin/CharsetExecutor.h
@@ -1,7 +1,6 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #ifndef GRAPH_EXECUTOR_ADMIN_CHARSETEXECUTOR_H_
 #define GRAPH_EXECUTOR_ADMIN_CHARSETEXECUTOR_H_
diff --git a/src/graph/executor/admin/ConfigExecutor.cpp b/src/graph/executor/admin/ConfigExecutor.cpp
index e5f49b6261b..6e0cdeb5234 100644
--- a/src/graph/executor/admin/ConfigExecutor.cpp
+++ b/src/graph/executor/admin/ConfigExecutor.cpp
@@ -1,15 +1,11 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #include "graph/executor/admin/ConfigExecutor.h"
 
 #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"
 
diff --git a/src/graph/executor/admin/ConfigExecutor.h b/src/graph/executor/admin/ConfigExecutor.h
index 3bc6e5b40d2..6f742a92262 100644
--- a/src/graph/executor/admin/ConfigExecutor.h
+++ b/src/graph/executor/admin/ConfigExecutor.h
@@ -1,7 +1,6 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #ifndef GRAPH_EXECUTOR_ADMIN_CONFIGEXECUTOR_H_
 #define GRAPH_EXECUTOR_ADMIN_CONFIGEXECUTOR_H_
diff --git a/src/graph/executor/admin/CreateUserExecutor.cpp b/src/graph/executor/admin/CreateUserExecutor.cpp
index 83ed5b00d8c..42c44871f03 100644
--- a/src/graph/executor/admin/CreateUserExecutor.cpp
+++ b/src/graph/executor/admin/CreateUserExecutor.cpp
@@ -1,13 +1,10 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #include "graph/executor/admin/CreateUserExecutor.h"
 
 #include <proxygen/lib/utils/CryptUtil.h>
-
-#include "graph/context/QueryContext.h"
 #include "graph/planner/plan/Admin.h"
 
 namespace nebula {
diff --git a/src/graph/executor/admin/CreateUserExecutor.h b/src/graph/executor/admin/CreateUserExecutor.h
index 19f2c68e27d..6e95a75811b 100644
--- a/src/graph/executor/admin/CreateUserExecutor.h
+++ b/src/graph/executor/admin/CreateUserExecutor.h
@@ -1,7 +1,6 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #ifndef GRAPH_EXECUTOR_ADMIN_CREATEUSEREXECUTOR_H_
 #define GRAPH_EXECUTOR_ADMIN_CREATEUSEREXECUTOR_H_
diff --git a/src/graph/executor/admin/DescribeUserExecutor.cpp b/src/graph/executor/admin/DescribeUserExecutor.cpp
index 9b2d893b7f8..0ac007508d2 100644
--- a/src/graph/executor/admin/DescribeUserExecutor.cpp
+++ b/src/graph/executor/admin/DescribeUserExecutor.cpp
@@ -1,13 +1,10 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #include "graph/executor/admin/DescribeUserExecutor.h"
 
 #include <thrift/lib/cpp/util/EnumUtils.h>
-
-#include "graph/context/QueryContext.h"
 #include "graph/planner/plan/Admin.h"
 #include "interface/gen-cpp2/meta_types.h"
 
diff --git a/src/graph/executor/admin/DescribeUserExecutor.h b/src/graph/executor/admin/DescribeUserExecutor.h
index 629e1cb7854..c41dfb3a15f 100644
--- a/src/graph/executor/admin/DescribeUserExecutor.h
+++ b/src/graph/executor/admin/DescribeUserExecutor.h
@@ -1,7 +1,6 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #ifndef GRAPH_EXECUTOR_ADMIN_DESCRIBEUSEREXECUTOR_H_
 #define GRAPH_EXECUTOR_ADMIN_DESCRIBEUSEREXECUTOR_H_
diff --git a/src/graph/executor/admin/DownloadExecutor.cpp b/src/graph/executor/admin/DownloadExecutor.cpp
index 94e44b1d897..92b246bbd01 100644
--- a/src/graph/executor/admin/DownloadExecutor.cpp
+++ b/src/graph/executor/admin/DownloadExecutor.cpp
@@ -1,11 +1,9 @@
-/* Copyright (c) 2021 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #include "graph/executor/admin/DownloadExecutor.h"
 
-#include "graph/context/QueryContext.h"
 #include "graph/planner/plan/Admin.h"
 
 namespace nebula {
diff --git a/src/graph/executor/admin/DownloadExecutor.h b/src/graph/executor/admin/DownloadExecutor.h
index c0912c9aedf..932a82c2853 100644
--- a/src/graph/executor/admin/DownloadExecutor.h
+++ b/src/graph/executor/admin/DownloadExecutor.h
@@ -1,7 +1,6 @@
-/* Copyright (c) 2021 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #ifndef GRAPH_EXECUTOR_ADMIN_DOWNLOADEXECUTOR_H_
 #define GRAPH_EXECUTOR_ADMIN_DOWNLOADEXECUTOR_H_
diff --git a/src/graph/executor/admin/DropHostsExecutor.cpp b/src/graph/executor/admin/DropHostsExecutor.cpp
index db51555efd5..c99be627a90 100644
--- a/src/graph/executor/admin/DropHostsExecutor.cpp
+++ b/src/graph/executor/admin/DropHostsExecutor.cpp
@@ -1,7 +1,6 @@
-/* Copyright (c) 2021 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #include "graph/executor/admin/DropHostsExecutor.h"
 
diff --git a/src/graph/executor/admin/DropHostsExecutor.h b/src/graph/executor/admin/DropHostsExecutor.h
index f2fc896c0fb..143dcae63bc 100644
--- a/src/graph/executor/admin/DropHostsExecutor.h
+++ b/src/graph/executor/admin/DropHostsExecutor.h
@@ -1,7 +1,6 @@
-/* Copyright (c) 2021 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #ifndef GRAPH_EXECUTOR_ADMIN_DROP_HOST_EXECUTOR_H_
 #define GRAPH_EXECUTOR_ADMIN_DROP_HOST_EXECUTOR_H_
diff --git a/src/graph/executor/admin/DropUserExecutor.cpp b/src/graph/executor/admin/DropUserExecutor.cpp
index 7f07c3f86f4..3db6ebb5a97 100644
--- a/src/graph/executor/admin/DropUserExecutor.cpp
+++ b/src/graph/executor/admin/DropUserExecutor.cpp
@@ -1,11 +1,8 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #include "graph/executor/admin/DropUserExecutor.h"
-
-#include "graph/context/QueryContext.h"
 #include "graph/planner/plan/Admin.h"
 
 namespace nebula {
diff --git a/src/graph/executor/admin/DropUserExecutor.h b/src/graph/executor/admin/DropUserExecutor.h
index bfd32c807c7..44de51e20a7 100644
--- a/src/graph/executor/admin/DropUserExecutor.h
+++ b/src/graph/executor/admin/DropUserExecutor.h
@@ -1,7 +1,6 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #ifndef GRAPH_EXECUTOR_ADMIN_DROPUSEREXECUTOR_H_
 #define GRAPH_EXECUTOR_ADMIN_DROPUSEREXECUTOR_H_
diff --git a/src/graph/executor/admin/GrantRoleExecutor.cpp b/src/graph/executor/admin/GrantRoleExecutor.cpp
index 5cb7813936b..27f0c29dbfe 100644
--- a/src/graph/executor/admin/GrantRoleExecutor.cpp
+++ b/src/graph/executor/admin/GrantRoleExecutor.cpp
@@ -1,11 +1,9 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #include "graph/executor/admin/GrantRoleExecutor.h"
 
-#include "graph/context/QueryContext.h"
 #include "graph/planner/plan/Admin.h"
 #include "graph/service/PermissionManager.h"
 #include "interface/gen-cpp2/meta_types.h"
diff --git a/src/graph/executor/admin/GrantRoleExecutor.h b/src/graph/executor/admin/GrantRoleExecutor.h
index c7f03616115..cef1322413f 100644
--- a/src/graph/executor/admin/GrantRoleExecutor.h
+++ b/src/graph/executor/admin/GrantRoleExecutor.h
@@ -1,7 +1,6 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #ifndef GRAPH_EXECUTOR_ADMIN_GRANTROLEEXECUTOR_H_
 #define GRAPH_EXECUTOR_ADMIN_GRANTROLEEXECUTOR_H_
diff --git a/src/graph/executor/admin/IngestExecutor.cpp b/src/graph/executor/admin/IngestExecutor.cpp
index 9cb397e3006..43164158ee7 100644
--- a/src/graph/executor/admin/IngestExecutor.cpp
+++ b/src/graph/executor/admin/IngestExecutor.cpp
@@ -1,11 +1,9 @@
-/* Copyright (c) 2021 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #include "graph/executor/admin/IngestExecutor.h"
 
-#include "graph/context/QueryContext.h"
 #include "graph/planner/plan/Admin.h"
 
 namespace nebula {
diff --git a/src/graph/executor/admin/IngestExecutor.h b/src/graph/executor/admin/IngestExecutor.h
index 8a84c1dbf67..845fa6acf4d 100644
--- a/src/graph/executor/admin/IngestExecutor.h
+++ b/src/graph/executor/admin/IngestExecutor.h
@@ -1,7 +1,6 @@
-/* Copyright (c) 2021 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #ifndef GRAPH_EXECUTOR_ADMIN_INGESTEXECUTOR_H_
 #define GRAPH_EXECUTOR_ADMIN_INGESTEXECUTOR_H_
diff --git a/src/graph/executor/admin/KillQueryExecutor.cpp b/src/graph/executor/admin/KillQueryExecutor.cpp
index f9b7044f791..c9ca2c858f8 100644
--- a/src/graph/executor/admin/KillQueryExecutor.cpp
+++ b/src/graph/executor/admin/KillQueryExecutor.cpp
@@ -1,11 +1,8 @@
-/* Copyright (c) 2021 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #include "graph/executor/admin/KillQueryExecutor.h"
-
-#include "graph/context/QueryContext.h"
 #include "graph/planner/plan/Admin.h"
 
 namespace nebula {
diff --git a/src/graph/executor/admin/KillQueryExecutor.h b/src/graph/executor/admin/KillQueryExecutor.h
index 5eea04c647c..8578fec3351 100644
--- a/src/graph/executor/admin/KillQueryExecutor.h
+++ b/src/graph/executor/admin/KillQueryExecutor.h
@@ -1,7 +1,6 @@
-/* Copyright (c) 2021 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #ifndef GRAPH_EXECUTOR_ADMIN_KILLQUERYEXECUTOR_H_
 #define GRAPH_EXECUTOR_ADMIN_KILLQUERYEXECUTOR_H_
diff --git a/src/graph/executor/admin/ListRolesExecutor.cpp b/src/graph/executor/admin/ListRolesExecutor.cpp
index 198714e0954..93cd3b284c5 100644
--- a/src/graph/executor/admin/ListRolesExecutor.cpp
+++ b/src/graph/executor/admin/ListRolesExecutor.cpp
@@ -1,13 +1,10 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #include "graph/executor/admin/ListRolesExecutor.h"
 
 #include <thrift/lib/cpp/util/EnumUtils.h>
-
-#include "graph/context/QueryContext.h"
 #include "graph/planner/plan/Admin.h"
 #include "graph/service/PermissionManager.h"
 
diff --git a/src/graph/executor/admin/ListRolesExecutor.h b/src/graph/executor/admin/ListRolesExecutor.h
index 735f4f4dd01..3cc7f3728ba 100644
--- a/src/graph/executor/admin/ListRolesExecutor.h
+++ b/src/graph/executor/admin/ListRolesExecutor.h
@@ -1,7 +1,6 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #ifndef GRAPH_EXECUTOR_ADMIN_LISTROLESEXECUTOR_H_
 #define GRAPH_EXECUTOR_ADMIN_LISTROLESEXECUTOR_H_
diff --git a/src/graph/executor/admin/ListUserRolesExecutor.cpp b/src/graph/executor/admin/ListUserRolesExecutor.cpp
index 4637721f392..d62d3a31d7b 100644
--- a/src/graph/executor/admin/ListUserRolesExecutor.cpp
+++ b/src/graph/executor/admin/ListUserRolesExecutor.cpp
@@ -1,13 +1,10 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #include "graph/executor/admin/ListUserRolesExecutor.h"
 
 #include <thrift/lib/cpp/util/EnumUtils.h>
-
-#include "graph/context/QueryContext.h"
 #include "graph/planner/plan/Admin.h"
 
 namespace nebula {
diff --git a/src/graph/executor/admin/ListUserRolesExecutor.h b/src/graph/executor/admin/ListUserRolesExecutor.h
index 27f757accd2..0a82556b5cd 100644
--- a/src/graph/executor/admin/ListUserRolesExecutor.h
+++ b/src/graph/executor/admin/ListUserRolesExecutor.h
@@ -1,7 +1,6 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #ifndef GRAPH_EXECUTOR_ADMIN_LISTUSERROLESEXECUTOR_H_
 #define GRAPH_EXECUTOR_ADMIN_LISTUSERROLESEXECUTOR_H_
diff --git a/src/graph/executor/admin/ListUsersExecutor.cpp b/src/graph/executor/admin/ListUsersExecutor.cpp
index b196d660ad3..0059beed85d 100644
--- a/src/graph/executor/admin/ListUsersExecutor.cpp
+++ b/src/graph/executor/admin/ListUsersExecutor.cpp
@@ -1,11 +1,9 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #include "graph/executor/admin/ListUsersExecutor.h"
 
-#include "graph/context/QueryContext.h"
 #include "graph/planner/plan/Admin.h"
 
 namespace nebula {
diff --git a/src/graph/executor/admin/ListUsersExecutor.h b/src/graph/executor/admin/ListUsersExecutor.h
index 02fb737a112..5d8e0d19aeb 100644
--- a/src/graph/executor/admin/ListUsersExecutor.h
+++ b/src/graph/executor/admin/ListUsersExecutor.h
@@ -1,7 +1,6 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #ifndef GRAPH_EXECUTOR_ADMIN_LISTUSERSEXECUTOR_H_
 #define GRAPH_EXECUTOR_ADMIN_LISTUSERSEXECUTOR_H_
diff --git a/src/graph/executor/admin/ListenerExecutor.cpp b/src/graph/executor/admin/ListenerExecutor.cpp
index 11ebf97e8a6..66beaa29bba 100644
--- a/src/graph/executor/admin/ListenerExecutor.cpp
+++ b/src/graph/executor/admin/ListenerExecutor.cpp
@@ -1,7 +1,6 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #include "graph/executor/admin/ListenerExecutor.h"
 
diff --git a/src/graph/executor/admin/ListenerExecutor.h b/src/graph/executor/admin/ListenerExecutor.h
index 63907a8e625..1810b2fd881 100644
--- a/src/graph/executor/admin/ListenerExecutor.h
+++ b/src/graph/executor/admin/ListenerExecutor.h
@@ -1,7 +1,6 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #ifndef GRAPH_EXECUTOR_ADMIN_LISTENEREXECUTOR_H_
 #define GRAPH_EXECUTOR_ADMIN_LISTENEREXECUTOR_H_
diff --git a/src/graph/executor/admin/PartExecutor.cpp b/src/graph/executor/admin/PartExecutor.cpp
index 786f236d33c..dc73ea44ba2 100644
--- a/src/graph/executor/admin/PartExecutor.cpp
+++ b/src/graph/executor/admin/PartExecutor.cpp
@@ -1,12 +1,8 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #include "graph/executor/admin/PartExecutor.h"
-
-#include "common/time/ScopedTimer.h"
-#include "graph/context/QueryContext.h"
 #include "graph/planner/plan/Admin.h"
 
 using nebula::network::NetworkUtils;
diff --git a/src/graph/executor/admin/PartExecutor.h b/src/graph/executor/admin/PartExecutor.h
index fde97f6cc23..5eeb8e7463f 100644
--- a/src/graph/executor/admin/PartExecutor.h
+++ b/src/graph/executor/admin/PartExecutor.h
@@ -1,7 +1,6 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #ifndef GRAPH_EXECUTOR_ADMIN_PARTEXECUTOR_H_
 #define GRAPH_EXECUTOR_ADMIN_PARTEXECUTOR_H_
diff --git a/src/graph/executor/admin/RevokeRoleExecutor.cpp b/src/graph/executor/admin/RevokeRoleExecutor.cpp
index 37ae972ceb5..3f9a0e50fbd 100644
--- a/src/graph/executor/admin/RevokeRoleExecutor.cpp
+++ b/src/graph/executor/admin/RevokeRoleExecutor.cpp
@@ -1,11 +1,8 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #include "graph/executor/admin/RevokeRoleExecutor.h"
-
-#include "graph/context/QueryContext.h"
 #include "graph/planner/plan/Admin.h"
 #include "graph/service/PermissionManager.h"
 #include "interface/gen-cpp2/meta_types.h"
diff --git a/src/graph/executor/admin/RevokeRoleExecutor.h b/src/graph/executor/admin/RevokeRoleExecutor.h
index 69fbd41d423..f31cda22306 100644
--- a/src/graph/executor/admin/RevokeRoleExecutor.h
+++ b/src/graph/executor/admin/RevokeRoleExecutor.h
@@ -1,7 +1,6 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #ifndef GRAPH_EXECUTOR_ADMIN_REVOKEROLEEXECUTOR_H_
 #define GRAPH_EXECUTOR_ADMIN_REVOKEROLEEXECUTOR_H_
diff --git a/src/graph/executor/admin/SessionExecutor.cpp b/src/graph/executor/admin/SessionExecutor.cpp
index b4e4a852288..c53a31cd707 100644
--- a/src/graph/executor/admin/SessionExecutor.cpp
+++ b/src/graph/executor/admin/SessionExecutor.cpp
@@ -1,11 +1,9 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #include "graph/executor/admin/SessionExecutor.h"
 
-#include "graph/context/QueryContext.h"
 #include "graph/planner/plan/Admin.h"
 #include "interface/gen-cpp2/common_types.h"
 #include "interface/gen-cpp2/meta_types.h"
diff --git a/src/graph/executor/admin/SessionExecutor.h b/src/graph/executor/admin/SessionExecutor.h
index 110fbf687c3..8d569b72800 100644
--- a/src/graph/executor/admin/SessionExecutor.h
+++ b/src/graph/executor/admin/SessionExecutor.h
@@ -1,14 +1,12 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #ifndef GRAPH_EXECUTOR_ADMIN_SESSIONEXECUTOR_H_
 #define GRAPH_EXECUTOR_ADMIN_SESSIONEXECUTOR_H_
 
 #include "common/time/TimeUtils.h"
 #include "graph/executor/Executor.h"
-#include "graph/service/RequestContext.h"
 
 namespace nebula {
 namespace graph {
diff --git a/src/graph/executor/admin/ShowHostsExecutor.cpp b/src/graph/executor/admin/ShowHostsExecutor.cpp
index 1b317949447..7eaf7585cd2 100644
--- a/src/graph/executor/admin/ShowHostsExecutor.cpp
+++ b/src/graph/executor/admin/ShowHostsExecutor.cpp
@@ -1,14 +1,10 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #include "graph/executor/admin/ShowHostsExecutor.h"
 
 #include <thrift/lib/cpp/util/EnumUtils.h>
-
-#include "common/time/ScopedTimer.h"
-#include "graph/context/QueryContext.h"
 #include "graph/planner/plan/Admin.h"
 
 namespace nebula {
diff --git a/src/graph/executor/admin/ShowHostsExecutor.h b/src/graph/executor/admin/ShowHostsExecutor.h
index 5ef27542f61..840b9c51bd1 100644
--- a/src/graph/executor/admin/ShowHostsExecutor.h
+++ b/src/graph/executor/admin/ShowHostsExecutor.h
@@ -1,7 +1,6 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #ifndef GRAPH_EXECUTOR_ADMIN_SHOW_HOSTS_EXECUTOR_H_
 #define GRAPH_EXECUTOR_ADMIN_SHOW_HOSTS_EXECUTOR_H_
diff --git a/src/graph/executor/admin/ShowMetaLeaderExecutor.cpp b/src/graph/executor/admin/ShowMetaLeaderExecutor.cpp
index 8d10f523150..d6e51a37128 100644
--- a/src/graph/executor/admin/ShowMetaLeaderExecutor.cpp
+++ b/src/graph/executor/admin/ShowMetaLeaderExecutor.cpp
@@ -1,15 +1,11 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #include "graph/executor/admin/ShowMetaLeaderExecutor.h"
 
 #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"
 
 namespace nebula {
diff --git a/src/graph/executor/admin/ShowMetaLeaderExecutor.h b/src/graph/executor/admin/ShowMetaLeaderExecutor.h
index fe3a2f2b074..d45006daf92 100644
--- a/src/graph/executor/admin/ShowMetaLeaderExecutor.h
+++ b/src/graph/executor/admin/ShowMetaLeaderExecutor.h
@@ -1,7 +1,6 @@
-/* Copyright (c) 2021 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #ifndef GRAPH_EXECUTOR_ADMIN_SHOWMETALEADEREXECUTOR_H
 #define GRAPH_EXECUTOR_ADMIN_SHOWMETALEADEREXECUTOR_H
diff --git a/src/graph/executor/admin/ShowQueriesExecutor.cpp b/src/graph/executor/admin/ShowQueriesExecutor.cpp
index b2166e5a567..128956fe55d 100644
--- a/src/graph/executor/admin/ShowQueriesExecutor.cpp
+++ b/src/graph/executor/admin/ShowQueriesExecutor.cpp
@@ -1,15 +1,12 @@
-/* Copyright (c) 2021 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #include "graph/executor/admin/ShowQueriesExecutor.h"
 
 #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"
 
 namespace nebula {
diff --git a/src/graph/executor/admin/ShowQueriesExecutor.h b/src/graph/executor/admin/ShowQueriesExecutor.h
index 267d15ddcca..0256ad8a3ca 100644
--- a/src/graph/executor/admin/ShowQueriesExecutor.h
+++ b/src/graph/executor/admin/ShowQueriesExecutor.h
@@ -1,7 +1,6 @@
-/* Copyright (c) 2021 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #ifndef GRAPH_EXECUTOR_ADMIN_SHOWQUERIESEXECUTOR_H_
 #define GRAPH_EXECUTOR_ADMIN_SHOWQUERIESEXECUTOR_H_
diff --git a/src/graph/executor/admin/ShowServiceClientsExecutor.cpp b/src/graph/executor/admin/ShowServiceClientsExecutor.cpp
index af9748e60d1..798ac98bf37 100644
--- a/src/graph/executor/admin/ShowServiceClientsExecutor.cpp
+++ b/src/graph/executor/admin/ShowServiceClientsExecutor.cpp
@@ -1,13 +1,10 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #include "graph/executor/admin/ShowServiceClientsExecutor.h"
 
 #include <thrift/lib/cpp/util/EnumUtils.h>
-
-#include "graph/context/QueryContext.h"
 #include "graph/planner/plan/Admin.h"
 #include "graph/service/PermissionManager.h"
 #include "interface/gen-cpp2/meta_types.h"
diff --git a/src/graph/executor/admin/ShowServiceClientsExecutor.h b/src/graph/executor/admin/ShowServiceClientsExecutor.h
index e524954c9d3..2679656117e 100644
--- a/src/graph/executor/admin/ShowServiceClientsExecutor.h
+++ b/src/graph/executor/admin/ShowServiceClientsExecutor.h
@@ -1,7 +1,6 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #ifndef GRAPH_EXECUTOR_ADMIN_SHOW_SERVICE_CLIENTS_EXECUTOR_H_
 #define GRAPH_EXECUTOR_ADMIN_SHOW_SERVICE_CLIENTS_EXECUTOR_H_
diff --git a/src/graph/executor/admin/ShowStatsExecutor.cpp b/src/graph/executor/admin/ShowStatsExecutor.cpp
index aaaccbc2799..85de8001fb9 100644
--- a/src/graph/executor/admin/ShowStatsExecutor.cpp
+++ b/src/graph/executor/admin/ShowStatsExecutor.cpp
@@ -1,12 +1,8 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #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"
diff --git a/src/graph/executor/admin/ShowStatsExecutor.h b/src/graph/executor/admin/ShowStatsExecutor.h
index 1e6e3bcd1d6..11c98aeacca 100644
--- a/src/graph/executor/admin/ShowStatsExecutor.h
+++ b/src/graph/executor/admin/ShowStatsExecutor.h
@@ -1,7 +1,6 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #ifndef GRAPH_EXECUTOR_ADMIN_SHOWSTATUSEXECUTOR_H_
 #define GRAPH_EXECUTOR_ADMIN_SHOWSTATUSEXECUTOR_H_
diff --git a/src/graph/executor/admin/SignInServiceExecutor.cpp b/src/graph/executor/admin/SignInServiceExecutor.cpp
index f83bb068314..3c3072db5ba 100644
--- a/src/graph/executor/admin/SignInServiceExecutor.cpp
+++ b/src/graph/executor/admin/SignInServiceExecutor.cpp
@@ -1,10 +1,8 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #include "graph/executor/admin/SignInServiceExecutor.h"
-
 #include "graph/planner/plan/Admin.h"
 
 namespace nebula {
diff --git a/src/graph/executor/admin/SignInServiceExecutor.h b/src/graph/executor/admin/SignInServiceExecutor.h
index 83d4fd22ed9..4abab8edc86 100644
--- a/src/graph/executor/admin/SignInServiceExecutor.h
+++ b/src/graph/executor/admin/SignInServiceExecutor.h
@@ -1,7 +1,6 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #ifndef GRAPH_EXECUTOR_ADMIN_SIGNINSERVICEEXECUTOR_H_
 #define GRAPH_EXECUTOR_ADMIN_SIGNINSERVICEEXECUTOR_H_
diff --git a/src/graph/executor/admin/SignOutServiceExecutor.cpp b/src/graph/executor/admin/SignOutServiceExecutor.cpp
index 3c6f81c8969..ef33dc211bb 100644
--- a/src/graph/executor/admin/SignOutServiceExecutor.cpp
+++ b/src/graph/executor/admin/SignOutServiceExecutor.cpp
@@ -1,7 +1,6 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #include "graph/executor/admin/SignOutServiceExecutor.h"
 
diff --git a/src/graph/executor/admin/SignOutServiceExecutor.h b/src/graph/executor/admin/SignOutServiceExecutor.h
index 1e1ded6de35..c2133103088 100644
--- a/src/graph/executor/admin/SignOutServiceExecutor.h
+++ b/src/graph/executor/admin/SignOutServiceExecutor.h
@@ -1,7 +1,6 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #ifndef GRAPH_EXECUTOR_ADMIN_SIGNOUTTSSERVICEEXECUTOR_H_
 #define GRAPH_EXECUTOR_ADMIN_SIGNOUTTSSERVICEEXECUTOR_H_
diff --git a/src/graph/executor/admin/SnapshotExecutor.cpp b/src/graph/executor/admin/SnapshotExecutor.cpp
index 43f0d6869b3..17eb1da2d92 100644
--- a/src/graph/executor/admin/SnapshotExecutor.cpp
+++ b/src/graph/executor/admin/SnapshotExecutor.cpp
@@ -1,14 +1,9 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #include "graph/executor/admin/SnapshotExecutor.h"
-
 #include <thrift/lib/cpp/util/EnumUtils.h>
-
-#include "common/time/ScopedTimer.h"
-#include "graph/context/QueryContext.h"
 #include "graph/planner/plan/Admin.h"
 
 namespace nebula {
diff --git a/src/graph/executor/admin/SnapshotExecutor.h b/src/graph/executor/admin/SnapshotExecutor.h
index c3ef848c52b..602ac079879 100644
--- a/src/graph/executor/admin/SnapshotExecutor.h
+++ b/src/graph/executor/admin/SnapshotExecutor.h
@@ -1,7 +1,6 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #ifndef GRAPH_EXECUTOR_ADMIN_SNAPSHOTEXECUTOR_H_
 #define GRAPH_EXECUTOR_ADMIN_SNAPSHOTEXECUTOR_H_
diff --git a/src/graph/executor/admin/SpaceExecutor.cpp b/src/graph/executor/admin/SpaceExecutor.cpp
index d08fca3b7e8..0f2fb07b00c 100644
--- a/src/graph/executor/admin/SpaceExecutor.cpp
+++ b/src/graph/executor/admin/SpaceExecutor.cpp
@@ -1,13 +1,10 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #include "graph/executor/admin/SpaceExecutor.h"
 
 #include "common/stats/StatsManager.h"
-#include "common/time/ScopedTimer.h"
-#include "graph/context/QueryContext.h"
 #include "graph/planner/plan/Admin.h"
 #include "graph/service/PermissionManager.h"
 #include "graph/stats/GraphStats.h"
diff --git a/src/graph/executor/admin/SpaceExecutor.h b/src/graph/executor/admin/SpaceExecutor.h
index 98552765b76..2e43eb3a108 100644
--- a/src/graph/executor/admin/SpaceExecutor.h
+++ b/src/graph/executor/admin/SpaceExecutor.h
@@ -1,7 +1,6 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #ifndef GRAPH_EXECUTOR_ADMIN_SPACESEXECUTOR_H_
 #define GRAPH_EXECUTOR_ADMIN_SPACESEXECUTOR_H_
diff --git a/src/graph/executor/admin/SubmitJobExecutor.cpp b/src/graph/executor/admin/SubmitJobExecutor.cpp
index 0d78361d60f..6359abba1a0 100644
--- a/src/graph/executor/admin/SubmitJobExecutor.cpp
+++ b/src/graph/executor/admin/SubmitJobExecutor.cpp
@@ -1,15 +1,12 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #include "graph/executor/admin/SubmitJobExecutor.h"
 
 #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"
 
 namespace nebula {
diff --git a/src/graph/executor/admin/SubmitJobExecutor.h b/src/graph/executor/admin/SubmitJobExecutor.h
index 92bf2a98857..79b57975960 100644
--- a/src/graph/executor/admin/SubmitJobExecutor.h
+++ b/src/graph/executor/admin/SubmitJobExecutor.h
@@ -1,7 +1,6 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #ifndef GRAPH_EXECUTOR_ADMIN_SUBMIT_JOB_EXECUTOR_H_
 #define GRAPH_EXECUTOR_ADMIN_SUBMIT_JOB_EXECUTOR_H_
diff --git a/src/graph/executor/admin/SwitchSpaceExecutor.cpp b/src/graph/executor/admin/SwitchSpaceExecutor.cpp
index df7217d8f60..1e8196de973 100644
--- a/src/graph/executor/admin/SwitchSpaceExecutor.cpp
+++ b/src/graph/executor/admin/SwitchSpaceExecutor.cpp
@@ -1,13 +1,10 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #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 "interface/gen-cpp2/meta_types.h"
diff --git a/src/graph/executor/admin/SwitchSpaceExecutor.h b/src/graph/executor/admin/SwitchSpaceExecutor.h
index 633d03e9127..b18886f6892 100644
--- a/src/graph/executor/admin/SwitchSpaceExecutor.h
+++ b/src/graph/executor/admin/SwitchSpaceExecutor.h
@@ -1,7 +1,6 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #ifndef GRAPH_EXECUTOR_QUERY_SWITCHSPACEEXECUTOR_H_
 #define GRAPH_EXECUTOR_QUERY_SWITCHSPACEEXECUTOR_H_
diff --git a/src/graph/executor/admin/UpdateUserExecutor.cpp b/src/graph/executor/admin/UpdateUserExecutor.cpp
index 6d1027c4c19..a69896fab3e 100644
--- a/src/graph/executor/admin/UpdateUserExecutor.cpp
+++ b/src/graph/executor/admin/UpdateUserExecutor.cpp
@@ -1,12 +1,11 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
+
 #include "graph/executor/admin/UpdateUserExecutor.h"
 
 #include <proxygen/lib/utils/CryptUtil.h>
 
-#include "graph/context/QueryContext.h"
 #include "graph/planner/plan/Admin.h"
 
 namespace nebula {
diff --git a/src/graph/executor/admin/UpdateUserExecutor.h b/src/graph/executor/admin/UpdateUserExecutor.h
index a7e85bfef5b..350ee318874 100644
--- a/src/graph/executor/admin/UpdateUserExecutor.h
+++ b/src/graph/executor/admin/UpdateUserExecutor.h
@@ -1,7 +1,6 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #ifndef GRAPH_EXECUTOR_ADMIN_UPDATEUSEREXECUTOR_H_
 #define GRAPH_EXECUTOR_ADMIN_UPDATEUSEREXECUTOR_H_
diff --git a/src/graph/executor/admin/ZoneExecutor.cpp b/src/graph/executor/admin/ZoneExecutor.cpp
index f33909a7efd..566fc0fa776 100644
--- a/src/graph/executor/admin/ZoneExecutor.cpp
+++ b/src/graph/executor/admin/ZoneExecutor.cpp
@@ -1,11 +1,9 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #include "graph/executor/admin/ZoneExecutor.h"
 
-#include "common/time/ScopedTimer.h"
 #include "graph/planner/plan/Admin.h"
 
 namespace nebula {
diff --git a/src/graph/executor/admin/ZoneExecutor.h b/src/graph/executor/admin/ZoneExecutor.h
index d742ab2ba03..2d89fdaf2e6 100644
--- a/src/graph/executor/admin/ZoneExecutor.h
+++ b/src/graph/executor/admin/ZoneExecutor.h
@@ -1,7 +1,6 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #ifndef GRAPH_EXECUTOR_ADMIN_ZONEEXECUTOR_H_
 #define GRAPH_EXECUTOR_ADMIN_ZONEEXECUTOR_H_
diff --git a/src/graph/executor/algo/CartesianProductExecutor.cpp b/src/graph/executor/algo/CartesianProductExecutor.cpp
index fe2aa79fbf2..dfe6eb8ad8e 100644
--- a/src/graph/executor/algo/CartesianProductExecutor.cpp
+++ b/src/graph/executor/algo/CartesianProductExecutor.cpp
@@ -1,7 +1,6 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #include "graph/executor/algo/CartesianProductExecutor.h"
 
diff --git a/src/graph/executor/algo/CartesianProductExecutor.h b/src/graph/executor/algo/CartesianProductExecutor.h
index afd3c7ece08..10a0c1755c1 100644
--- a/src/graph/executor/algo/CartesianProductExecutor.h
+++ b/src/graph/executor/algo/CartesianProductExecutor.h
@@ -1,7 +1,6 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #ifndef GRAPH_EXECUTOR_ALGO_CARTESIANPRODUCTEXECUTOR_H_
 #define GRAPH_EXECUTOR_ALGO_CARTESIANPRODUCTEXECUTOR_H_
diff --git a/src/graph/executor/algo/SubgraphExecutor.cpp b/src/graph/executor/algo/SubgraphExecutor.cpp
index 8b98b6f9202..d546e945d1d 100644
--- a/src/graph/executor/algo/SubgraphExecutor.cpp
+++ b/src/graph/executor/algo/SubgraphExecutor.cpp
@@ -1,7 +1,6 @@
-/* Copyright (c) 2021 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #include "graph/executor/algo/SubgraphExecutor.h"
 
diff --git a/src/graph/executor/algo/SubgraphExecutor.h b/src/graph/executor/algo/SubgraphExecutor.h
index 0bd388c76f2..ad15ec14f7e 100644
--- a/src/graph/executor/algo/SubgraphExecutor.h
+++ b/src/graph/executor/algo/SubgraphExecutor.h
@@ -1,7 +1,6 @@
-/* Copyright (c) 2021 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #ifndef GRAPH_EXECUTOR_ALGO_SUBGRAPHEXECUTOR_H_
 #define GRAPH_EXECUTOR_ALGO_SUBGRAPHEXECUTOR_H_
diff --git a/src/graph/executor/logic/ArgumentExecutor.cpp b/src/graph/executor/logic/ArgumentExecutor.cpp
index 5aa86ff8cba..021927ac492 100644
--- a/src/graph/executor/logic/ArgumentExecutor.cpp
+++ b/src/graph/executor/logic/ArgumentExecutor.cpp
@@ -1,10 +1,8 @@
-/* Copyright (c) 2021 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #include "graph/executor/logic/ArgumentExecutor.h"
-
 #include "graph/planner/plan/Logic.h"
 
 namespace nebula {
diff --git a/src/graph/executor/logic/ArgumentExecutor.h b/src/graph/executor/logic/ArgumentExecutor.h
index 7c6e7eea828..7507912746a 100644
--- a/src/graph/executor/logic/ArgumentExecutor.h
+++ b/src/graph/executor/logic/ArgumentExecutor.h
@@ -1,7 +1,6 @@
-/* Copyright (c) 2021 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #ifndef GRAPH_EXECUTOR_LOGIC_ARGUMENTEXECUTOR_H
 #define GRAPH_EXECUTOR_LOGIC_ARGUMENTEXECUTOR_H
diff --git a/src/graph/executor/logic/LoopExecutor.cpp b/src/graph/executor/logic/LoopExecutor.cpp
index c61977c2e94..fb86daa5f78 100644
--- a/src/graph/executor/logic/LoopExecutor.cpp
+++ b/src/graph/executor/logic/LoopExecutor.cpp
@@ -1,19 +1,10 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #include "graph/executor/logic/LoopExecutor.h"
-
-#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 "interface/gen-cpp2/common_types.h"
 
-using folly::stringPrintf;
 
 namespace nebula {
 namespace graph {
diff --git a/src/graph/executor/logic/LoopExecutor.h b/src/graph/executor/logic/LoopExecutor.h
index 7345e2dd6ec..ed01180903c 100644
--- a/src/graph/executor/logic/LoopExecutor.h
+++ b/src/graph/executor/logic/LoopExecutor.h
@@ -1,7 +1,6 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #ifndef GRAPH_EXECUTOR_LOGIC_LOOPEXECUTOR_H_
 #define GRAPH_EXECUTOR_LOGIC_LOOPEXECUTOR_H_
diff --git a/src/graph/executor/logic/PassThroughExecutor.cpp b/src/graph/executor/logic/PassThroughExecutor.cpp
index e380fbe977a..016ac58536d 100644
--- a/src/graph/executor/logic/PassThroughExecutor.cpp
+++ b/src/graph/executor/logic/PassThroughExecutor.cpp
@@ -1,16 +1,13 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #include "graph/executor/logic/PassThroughExecutor.h"
 
-#include "common/time/ScopedTimer.h"
-#include "graph/planner/plan/Query.h"
+#include "graph/planner/plan/PlanNode.h"
 
 namespace nebula {
 namespace graph {
-
 folly::Future<Status> PassThroughExecutor::execute() {
   SCOPED_TIMER(&execTime_);
 
diff --git a/src/graph/executor/logic/PassThroughExecutor.h b/src/graph/executor/logic/PassThroughExecutor.h
index 32b90a0ae33..8b038fbd5a6 100644
--- a/src/graph/executor/logic/PassThroughExecutor.h
+++ b/src/graph/executor/logic/PassThroughExecutor.h
@@ -1,7 +1,6 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #ifndef GRAPH_EXECUTOR_LOGIC_PASSTHROUGHEXECUTOR_H_
 #define GRAPH_EXECUTOR_LOGIC_PASSTHROUGHEXECUTOR_H_
diff --git a/src/graph/executor/logic/SelectExecutor.cpp b/src/graph/executor/logic/SelectExecutor.cpp
index 110d0e80825..b30ca6f28af 100644
--- a/src/graph/executor/logic/SelectExecutor.cpp
+++ b/src/graph/executor/logic/SelectExecutor.cpp
@@ -1,14 +1,9 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #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"
 
 namespace nebula {
 namespace graph {
diff --git a/src/graph/executor/logic/SelectExecutor.h b/src/graph/executor/logic/SelectExecutor.h
index 0707646b27c..e303b4af8ac 100644
--- a/src/graph/executor/logic/SelectExecutor.h
+++ b/src/graph/executor/logic/SelectExecutor.h
@@ -1,7 +1,6 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #ifndef GRAPH_EXECUTOR_LOGIC_SELECTEXECUTOR_H_
 #define GRAPH_EXECUTOR_LOGIC_SELECTEXECUTOR_H_
diff --git a/src/graph/executor/logic/StartExecutor.cpp b/src/graph/executor/logic/StartExecutor.cpp
index 62effcf90c4..2212c79165f 100644
--- a/src/graph/executor/logic/StartExecutor.cpp
+++ b/src/graph/executor/logic/StartExecutor.cpp
@@ -1,13 +1,9 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #include "graph/executor/logic/StartExecutor.h"
 
-#include "common/time/ScopedTimer.h"
-#include "graph/planner/plan/PlanNode.h"
-
 namespace nebula {
 namespace graph {
 
diff --git a/src/graph/executor/logic/StartExecutor.h b/src/graph/executor/logic/StartExecutor.h
index 0c81e00b1aa..c927f31f655 100644
--- a/src/graph/executor/logic/StartExecutor.h
+++ b/src/graph/executor/logic/StartExecutor.h
@@ -1,13 +1,12 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #ifndef GRAPH_EXECUTOR_LOGIC_STARTEXECUTOR_H_
 #define GRAPH_EXECUTOR_LOGIC_STARTEXECUTOR_H_
 
 #include "graph/executor/Executor.h"
-
+// the leaf node of the execution plan does not depend on other operators, do nothing
 namespace nebula {
 namespace graph {
 
diff --git a/src/graph/executor/maintain/EdgeExecutor.cpp b/src/graph/executor/maintain/EdgeExecutor.cpp
index 4ddd35dcd41..21594d9cbf0 100644
--- a/src/graph/executor/maintain/EdgeExecutor.cpp
+++ b/src/graph/executor/maintain/EdgeExecutor.cpp
@@ -1,12 +1,8 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #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"
 
diff --git a/src/graph/executor/maintain/EdgeExecutor.h b/src/graph/executor/maintain/EdgeExecutor.h
index bc6032d108d..6add28ccfbe 100644
--- a/src/graph/executor/maintain/EdgeExecutor.h
+++ b/src/graph/executor/maintain/EdgeExecutor.h
@@ -1,7 +1,6 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #ifndef GRAPH_EXECUTOR_MAINTAIN_EDGEEXECUTOR_H_
 #define GRAPH_EXECUTOR_MAINTAIN_EDGEEXECUTOR_H_
diff --git a/src/graph/executor/maintain/EdgeIndexExecutor.cpp b/src/graph/executor/maintain/EdgeIndexExecutor.cpp
index cfe1b85ba7d..bb3ece6119d 100644
--- a/src/graph/executor/maintain/EdgeIndexExecutor.cpp
+++ b/src/graph/executor/maintain/EdgeIndexExecutor.cpp
@@ -1,7 +1,6 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #include "graph/executor/maintain/EdgeIndexExecutor.h"
 
diff --git a/src/graph/executor/maintain/EdgeIndexExecutor.h b/src/graph/executor/maintain/EdgeIndexExecutor.h
index f477e0b6136..c9a83f01694 100644
--- a/src/graph/executor/maintain/EdgeIndexExecutor.h
+++ b/src/graph/executor/maintain/EdgeIndexExecutor.h
@@ -1,7 +1,6 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #ifndef GRAPH_EXECUTOR_MAINTAIN_EDGEINDEXEXECUTOR_H_
 #define GRAPH_EXECUTOR_MAINTAIN_EDGEINDEXEXECUTOR_H_
diff --git a/src/graph/executor/maintain/FTIndexExecutor.cpp b/src/graph/executor/maintain/FTIndexExecutor.cpp
index 27d4af5c900..2a8ec891001 100644
--- a/src/graph/executor/maintain/FTIndexExecutor.cpp
+++ b/src/graph/executor/maintain/FTIndexExecutor.cpp
@@ -1,11 +1,8 @@
-/* Copyright (c) 2021 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #include "graph/executor/maintain/FTIndexExecutor.h"
-
-#include "graph/context/QueryContext.h"
 #include "graph/planner/plan/Maintain.h"
 #include "graph/util/FTIndexUtils.h"
 #include "interface/gen-cpp2/meta_types.h"
diff --git a/src/graph/executor/maintain/FTIndexExecutor.h b/src/graph/executor/maintain/FTIndexExecutor.h
index 5d402f42690..d3680d5af96 100644
--- a/src/graph/executor/maintain/FTIndexExecutor.h
+++ b/src/graph/executor/maintain/FTIndexExecutor.h
@@ -1,7 +1,6 @@
-/* Copyright (c) 2021 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #ifndef GRAPH_EXECUTOR_ADMIN_SHOW_FT_INDEXES_EXECUTOR_H_
 #define GRAPH_EXECUTOR_ADMIN_SHOW_FT_INDEXES_EXECUTOR_H_
diff --git a/src/graph/executor/maintain/TagExecutor.cpp b/src/graph/executor/maintain/TagExecutor.cpp
index fcb6485ad0a..e92dd68e5a6 100644
--- a/src/graph/executor/maintain/TagExecutor.cpp
+++ b/src/graph/executor/maintain/TagExecutor.cpp
@@ -1,12 +1,8 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #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"
 
diff --git a/src/graph/executor/maintain/TagExecutor.h b/src/graph/executor/maintain/TagExecutor.h
index 7be41c8aed9..2cfd19cfd0b 100644
--- a/src/graph/executor/maintain/TagExecutor.h
+++ b/src/graph/executor/maintain/TagExecutor.h
@@ -1,7 +1,6 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #ifndef GRAPH_EXECUTOR_MAINTAIN_TAGEXECUTOR_H_
 #define GRAPH_EXECUTOR_MAINTAIN_TAGEXECUTOR_H_
diff --git a/src/graph/executor/maintain/TagIndexExecutor.cpp b/src/graph/executor/maintain/TagIndexExecutor.cpp
index 86c53301193..ea16466e4b0 100644
--- a/src/graph/executor/maintain/TagIndexExecutor.cpp
+++ b/src/graph/executor/maintain/TagIndexExecutor.cpp
@@ -1,7 +1,6 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #include "graph/executor/maintain/TagIndexExecutor.h"
 
diff --git a/src/graph/executor/maintain/TagIndexExecutor.h b/src/graph/executor/maintain/TagIndexExecutor.h
index 5dc7e5c0565..3dc45edf055 100644
--- a/src/graph/executor/maintain/TagIndexExecutor.h
+++ b/src/graph/executor/maintain/TagIndexExecutor.h
@@ -1,7 +1,6 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #ifndef GRAPH_EXECUTOR_MAINTAIN_TAGINDEXEXECUTOR_H_
 #define GRAPH_EXECUTOR_MAINTAIN_TAGINDEXEXECUTOR_H_
diff --git a/src/graph/executor/mutate/DeleteExecutor.cpp b/src/graph/executor/mutate/DeleteExecutor.cpp
index bcee155e38e..e5d88c62ee5 100644
--- a/src/graph/executor/mutate/DeleteExecutor.cpp
+++ b/src/graph/executor/mutate/DeleteExecutor.cpp
@@ -1,12 +1,7 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
-#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/service/GraphFlags.h"
diff --git a/src/graph/executor/mutate/DeleteExecutor.h b/src/graph/executor/mutate/DeleteExecutor.h
index 36007e30402..ae73663df20 100644
--- a/src/graph/executor/mutate/DeleteExecutor.h
+++ b/src/graph/executor/mutate/DeleteExecutor.h
@@ -1,7 +1,6 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #ifndef GRAPH_EXECUTOR_MUTATE_DELETEVERTICESEXECUTOR_H_
 #define GRAPH_EXECUTOR_MUTATE_DELETEVERTICESEXECUTOR_H_
@@ -22,6 +21,7 @@ class DeleteVerticesExecutor final : public StorageAccessExecutor {
   folly::Future<Status> deleteVertices();
 };
 
+// delete the specified tag at the specified vertex
 class DeleteTagsExecutor final : public StorageAccessExecutor {
  public:
   DeleteTagsExecutor(const PlanNode *node, QueryContext *qctx)
diff --git a/src/graph/executor/mutate/InsertExecutor.cpp b/src/graph/executor/mutate/InsertExecutor.cpp
index e926d497fe0..221dbefb916 100644
--- a/src/graph/executor/mutate/InsertExecutor.cpp
+++ b/src/graph/executor/mutate/InsertExecutor.cpp
@@ -1,12 +1,8 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #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"
 
diff --git a/src/graph/executor/mutate/InsertExecutor.h b/src/graph/executor/mutate/InsertExecutor.h
index 184cdeac1de..64d00613e5f 100644
--- a/src/graph/executor/mutate/InsertExecutor.h
+++ b/src/graph/executor/mutate/InsertExecutor.h
@@ -1,7 +1,6 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #ifndef GRAPH_EXECUTOR_MUTATE_INSERTVERTICESEXECUTOR_H_
 #define GRAPH_EXECUTOR_MUTATE_INSERTVERTICESEXECUTOR_H_
diff --git a/src/graph/executor/mutate/UpdateExecutor.cpp b/src/graph/executor/mutate/UpdateExecutor.cpp
index d151cc63ef7..e24fb7af4df 100644
--- a/src/graph/executor/mutate/UpdateExecutor.cpp
+++ b/src/graph/executor/mutate/UpdateExecutor.cpp
@@ -1,12 +1,9 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
-#include "UpdateExecutor.h"
+#include "graph/executor/mutate/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"
diff --git a/src/graph/executor/mutate/UpdateExecutor.h b/src/graph/executor/mutate/UpdateExecutor.h
index 728a85f83cc..862c3dcc26d 100644
--- a/src/graph/executor/mutate/UpdateExecutor.h
+++ b/src/graph/executor/mutate/UpdateExecutor.h
@@ -1,12 +1,10 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #ifndef GRAPH_EXECUTOR_MUTATE_UPDATEEXECUTOR_H_
 #define GRAPH_EXECUTOR_MUTATE_UPDATEEXECUTOR_H_
 
-#include "common/base/StatusOr.h"
 #include "graph/executor/StorageAccessExecutor.h"
 
 namespace nebula {
diff --git a/src/graph/executor/query/AggregateExecutor.cpp b/src/graph/executor/query/AggregateExecutor.cpp
index 42358baf28a..ca8e32463d0 100644
--- a/src/graph/executor/query/AggregateExecutor.cpp
+++ b/src/graph/executor/query/AggregateExecutor.cpp
@@ -1,16 +1,8 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #include "graph/executor/query/AggregateExecutor.h"
-
-#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"
 
 namespace nebula {
diff --git a/src/graph/executor/query/AggregateExecutor.h b/src/graph/executor/query/AggregateExecutor.h
index df82eabbbea..af6a66cb6f3 100644
--- a/src/graph/executor/query/AggregateExecutor.h
+++ b/src/graph/executor/query/AggregateExecutor.h
@@ -1,13 +1,13 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #ifndef GRAPH_EXECUTOR_QUERY_AGGREGATEEXECUTOR_H_
 #define GRAPH_EXECUTOR_QUERY_AGGREGATEEXECUTOR_H_
 
 #include "graph/executor/Executor.h"
-
+// calculate a set of data uniformly. use values ​​from multiple records as input
+// and convert those values ​​into one value to aggregate all records
 namespace nebula {
 namespace graph {
 
diff --git a/src/graph/executor/query/AppendVerticesExecutor.cpp b/src/graph/executor/query/AppendVerticesExecutor.cpp
index a092182a8c8..a7aa369ded4 100644
--- a/src/graph/executor/query/AppendVerticesExecutor.cpp
+++ b/src/graph/executor/query/AppendVerticesExecutor.cpp
@@ -1,7 +1,6 @@
-/* Copyright (c) 2021 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2021 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #include "graph/executor/query/AppendVerticesExecutor.h"
 
diff --git a/src/graph/executor/query/AppendVerticesExecutor.h b/src/graph/executor/query/AppendVerticesExecutor.h
index 109b7a08fc2..c4f9818937f 100644
--- a/src/graph/executor/query/AppendVerticesExecutor.h
+++ b/src/graph/executor/query/AppendVerticesExecutor.h
@@ -1,14 +1,16 @@
-/* Copyright (c) 2021 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #ifndef GRAPH_EXECUTOR_QUERY_APPENDVERTICESEXECUTOR_H_
 #define GRAPH_EXECUTOR_QUERY_APPENDVERTICESEXECUTOR_H_
 
 #include "graph/executor/query/GetPropExecutor.h"
 #include "graph/planner/plan/Query.h"
-
+// only used in match scenarios
+// due to the architecture design, the attributes of the destination point and the edge are
+// not stored together, so the last step in the match statement needs to call this operator
+// to obtain the attribute of the destination point
 namespace nebula {
 namespace graph {
 
diff --git a/src/graph/executor/query/AssignExecutor.cpp b/src/graph/executor/query/AssignExecutor.cpp
index 173f6c125d7..8e015551278 100644
--- a/src/graph/executor/query/AssignExecutor.cpp
+++ b/src/graph/executor/query/AssignExecutor.cpp
@@ -1,10 +1,8 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #include "graph/executor/query/AssignExecutor.h"
-
 #include "graph/planner/plan/Query.h"
 
 namespace nebula {
diff --git a/src/graph/executor/query/AssignExecutor.h b/src/graph/executor/query/AssignExecutor.h
index b21ac28a53a..42d861c0d1e 100644
--- a/src/graph/executor/query/AssignExecutor.h
+++ b/src/graph/executor/query/AssignExecutor.h
@@ -1,13 +1,12 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #ifndef GRAPH_EXECUTOR_QUERY_ASSIGNEXECUTOR_H_
 #define GRAPH_EXECUTOR_QUERY_ASSIGNEXECUTOR_H_
 
 #include "graph/executor/Executor.h"
-
+// assign value to variable
 namespace nebula {
 namespace graph {
 
diff --git a/src/graph/executor/query/DataCollectExecutor.cpp b/src/graph/executor/query/DataCollectExecutor.cpp
index 7fefd9012a4..6a2db41daa6 100644
--- a/src/graph/executor/query/DataCollectExecutor.cpp
+++ b/src/graph/executor/query/DataCollectExecutor.cpp
@@ -4,8 +4,6 @@
  */
 
 #include "graph/executor/query/DataCollectExecutor.h"
-
-#include "common/time/ScopedTimer.h"
 #include "graph/planner/plan/Query.h"
 
 namespace nebula {
diff --git a/src/graph/executor/query/DedupExecutor.cpp b/src/graph/executor/query/DedupExecutor.cpp
index cb52c38935f..2170d282de4 100644
--- a/src/graph/executor/query/DedupExecutor.cpp
+++ b/src/graph/executor/query/DedupExecutor.cpp
@@ -1,14 +1,10 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #include "graph/executor/query/DedupExecutor.h"
 
-#include "common/time/ScopedTimer.h"
-#include "graph/context/QueryExpressionContext.h"
 #include "graph/planner/plan/Query.h"
-
 namespace nebula {
 namespace graph {
 folly::Future<Status> DedupExecutor::execute() {
diff --git a/src/graph/executor/query/DedupExecutor.h b/src/graph/executor/query/DedupExecutor.h
index 9ebb3fb9248..7370bc3c7be 100644
--- a/src/graph/executor/query/DedupExecutor.h
+++ b/src/graph/executor/query/DedupExecutor.h
@@ -1,13 +1,13 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #ifndef GRAPH_EXECUTOR_QUERY_DEDUPEXECUTOR_H_
 #define GRAPH_EXECUTOR_QUERY_DEDUPEXECUTOR_H_
 
 #include "graph/executor/Executor.h"
-
+// delete the corresponding iterator, when there are duplicate rows in the dataset.
+// and then save the filtered iterator to the result
 namespace nebula {
 namespace graph {
 
diff --git a/src/graph/executor/query/FilterExecutor.cpp b/src/graph/executor/query/FilterExecutor.cpp
index 0fc7d00acc9..27977c519d7 100644
--- a/src/graph/executor/query/FilterExecutor.cpp
+++ b/src/graph/executor/query/FilterExecutor.cpp
@@ -1,12 +1,8 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #include "graph/executor/query/FilterExecutor.h"
-
-#include "common/time/ScopedTimer.h"
-#include "graph/context/QueryExpressionContext.h"
 #include "graph/planner/plan/Query.h"
 
 namespace nebula {
diff --git a/src/graph/executor/query/FilterExecutor.h b/src/graph/executor/query/FilterExecutor.h
index cfa9b963864..1444b76fa35 100644
--- a/src/graph/executor/query/FilterExecutor.h
+++ b/src/graph/executor/query/FilterExecutor.h
@@ -1,13 +1,14 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #ifndef GRAPH_EXECUTOR_QUERY_FILTEREXECUTOR_H_
 #define GRAPH_EXECUTOR_QUERY_FILTEREXECUTOR_H_
 
 #include "graph/executor/Executor.h"
 
+// delete the corresponding iterator when the row in the dataset does not meet the conditions
+// and save the filtered iterator to the result
 namespace nebula {
 namespace graph {
 
diff --git a/src/graph/executor/query/GetEdgesExecutor.cpp b/src/graph/executor/query/GetEdgesExecutor.cpp
index 157a56ab92a..22f2500f02a 100644
--- a/src/graph/executor/query/GetEdgesExecutor.cpp
+++ b/src/graph/executor/query/GetEdgesExecutor.cpp
@@ -1,14 +1,9 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #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"
 
 using nebula::storage::StorageClient;
 using nebula::storage::StorageRpcResponse;
diff --git a/src/graph/executor/query/GetEdgesExecutor.h b/src/graph/executor/query/GetEdgesExecutor.h
index 39b57f03167..657a302e1de 100644
--- a/src/graph/executor/query/GetEdgesExecutor.h
+++ b/src/graph/executor/query/GetEdgesExecutor.h
@@ -1,13 +1,13 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #ifndef GRAPH_EXECUTOR_QUERY_GETEDGESEXECUTOR_H_
 #define GRAPH_EXECUTOR_QUERY_GETEDGESEXECUTOR_H_
 
 #include "graph/executor/query/GetPropExecutor.h"
 
+// get user-specified edge attributes
 namespace nebula {
 namespace graph {
 class GetEdges;
diff --git a/src/graph/executor/query/GetNeighborsExecutor.cpp b/src/graph/executor/query/GetNeighborsExecutor.cpp
index c315ce53910..df902a8e50f 100644
--- a/src/graph/executor/query/GetNeighborsExecutor.cpp
+++ b/src/graph/executor/query/GetNeighborsExecutor.cpp
@@ -1,17 +1,8 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #include "graph/executor/query/GetNeighborsExecutor.h"
-
-#include <sstream>
-
-#include "clients/storage/StorageClient.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"
 
 using nebula::storage::StorageClient;
diff --git a/src/graph/executor/query/GetNeighborsExecutor.h b/src/graph/executor/query/GetNeighborsExecutor.h
index bc1818df645..a32ffc3b2f4 100644
--- a/src/graph/executor/query/GetNeighborsExecutor.h
+++ b/src/graph/executor/query/GetNeighborsExecutor.h
@@ -1,18 +1,17 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #ifndef GRAPH_EXECUTOR_QUERY_GETNEIGHBORSEXECUTOR_H_
 #define GRAPH_EXECUTOR_QUERY_GETNEIGHBORSEXECUTOR_H_
 
 #include "graph/executor/StorageAccessExecutor.h"
 #include "graph/planner/plan/Query.h"
-#include "interface/gen-cpp2/storage_types.h"
 
+// get the attributes of the start point and edges specified by the user from the storage layer
+// the returned result is a list<dataset>, the format of each dataset refers to the storage.thrift
 namespace nebula {
 namespace graph {
-
 class GetNeighborsExecutor final : public StorageAccessExecutor {
  public:
   GetNeighborsExecutor(const PlanNode* node, QueryContext* qctx)
diff --git a/src/graph/executor/query/GetVerticesExecutor.cpp b/src/graph/executor/query/GetVerticesExecutor.cpp
index 0b519945632..eb88895f66b 100644
--- a/src/graph/executor/query/GetVerticesExecutor.cpp
+++ b/src/graph/executor/query/GetVerticesExecutor.cpp
@@ -1,14 +1,9 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #include "graph/executor/query/GetVerticesExecutor.h"
 
-#include "common/time/ScopedTimer.h"
-#include "graph/context/QueryContext.h"
-#include "graph/util/SchemaUtil.h"
-
 using nebula::storage::StorageClient;
 using nebula::storage::StorageRpcResponse;
 using nebula::storage::cpp2::GetPropResponse;
diff --git a/src/graph/executor/query/GetVerticesExecutor.h b/src/graph/executor/query/GetVerticesExecutor.h
index 2bd1f08410b..5dbfa5f68bc 100644
--- a/src/graph/executor/query/GetVerticesExecutor.h
+++ b/src/graph/executor/query/GetVerticesExecutor.h
@@ -1,14 +1,13 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #ifndef GRAPH_EXECUTOR_QUERY_GETVERTICESEXECUTOR_H_
 #define GRAPH_EXECUTOR_QUERY_GETVERTICESEXECUTOR_H_
 
 #include "graph/executor/query/GetPropExecutor.h"
 #include "graph/planner/plan/Query.h"
-
+// get user-specified vertices attributes
 namespace nebula {
 namespace graph {
 
diff --git a/src/graph/executor/query/IndexScanExecutor.cpp b/src/graph/executor/query/IndexScanExecutor.cpp
index 70c5bd00831..3e66578c0f1 100644
--- a/src/graph/executor/query/IndexScanExecutor.cpp
+++ b/src/graph/executor/query/IndexScanExecutor.cpp
@@ -1,14 +1,8 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #include "graph/executor/query/IndexScanExecutor.h"
-
-#include <algorithm>
-
-#include "graph/context/QueryContext.h"
-#include "graph/planner/plan/PlanNode.h"
 #include "graph/service/GraphFlags.h"
 
 using nebula::storage::StorageClient;
diff --git a/src/graph/executor/query/IndexScanExecutor.h b/src/graph/executor/query/IndexScanExecutor.h
index 4d5e489ec20..ffbda454521 100644
--- a/src/graph/executor/query/IndexScanExecutor.h
+++ b/src/graph/executor/query/IndexScanExecutor.h
@@ -1,16 +1,14 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #ifndef GRAPH_EXECUTOR_QUERY_INDEXSCANEXECUTOR_H_
 #define GRAPH_EXECUTOR_QUERY_INDEXSCANEXECUTOR_H_
 
-#include "clients/storage/StorageClient.h"
 #include "graph/executor/StorageAccessExecutor.h"
 #include "graph/planner/plan/Query.h"
-#include "interface/gen-cpp2/storage_types.h"
-
+// used in lookup and match scenarios.
+// fetch data from storage layer, according to the index selected by the optimizer.
 namespace nebula {
 namespace graph {
 
diff --git a/src/graph/executor/query/InnerJoinExecutor.cpp b/src/graph/executor/query/InnerJoinExecutor.cpp
index 928525eef7b..58c5b2fce69 100644
--- a/src/graph/executor/query/InnerJoinExecutor.cpp
+++ b/src/graph/executor/query/InnerJoinExecutor.cpp
@@ -1,13 +1,8 @@
-/* Copyright (c) 2021 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #include "graph/executor/query/InnerJoinExecutor.h"
-
-#include "common/time/ScopedTimer.h"
-#include "graph/context/Iterator.h"
-#include "graph/context/QueryExpressionContext.h"
 #include "graph/planner/plan/Query.h"
 
 namespace nebula {
diff --git a/src/graph/executor/query/InnerJoinExecutor.h b/src/graph/executor/query/InnerJoinExecutor.h
index 7d914bfd807..aec2447da2e 100644
--- a/src/graph/executor/query/InnerJoinExecutor.h
+++ b/src/graph/executor/query/InnerJoinExecutor.h
@@ -1,13 +1,11 @@
-/* Copyright (c) 2021 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #ifndef GRAPH_EXECUTOR_QUERY_INNERJOINEXECUTOR_H_
 #define GRAPH_EXECUTOR_QUERY_INNERJOINEXECUTOR_H_
 
 #include "graph/executor/query/JoinExecutor.h"
-
 namespace nebula {
 namespace graph {
 
@@ -43,10 +41,8 @@ class InnerJoinExecutor : public JoinExecutor {
   bool exchange_{false};
 };
 
-/**
- * No diffrence with inner join in processing data, but the dependencies would be executed in
- * paralell.
- */
+// No diffrence with inner join in processing data, but the dependencies would be executed in
+// paralell.
 class BiInnerJoinExecutor final : public InnerJoinExecutor {
  public:
   BiInnerJoinExecutor(const PlanNode* node, QueryContext* qctx);
diff --git a/src/graph/executor/query/IntersectExecutor.cpp b/src/graph/executor/query/IntersectExecutor.cpp
index 7d006ff84ac..699238ebc73 100644
--- a/src/graph/executor/query/IntersectExecutor.cpp
+++ b/src/graph/executor/query/IntersectExecutor.cpp
@@ -1,14 +1,8 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #include "graph/executor/query/IntersectExecutor.h"
-
-#include <unordered_set>
-
-#include "common/time/ScopedTimer.h"
-#include "graph/planner/plan/PlanNode.h"
 #include "graph/planner/plan/Query.h"
 
 namespace nebula {
diff --git a/src/graph/executor/query/IntersectExecutor.h b/src/graph/executor/query/IntersectExecutor.h
index d15d36457d8..1c8d717248e 100644
--- a/src/graph/executor/query/IntersectExecutor.h
+++ b/src/graph/executor/query/IntersectExecutor.h
@@ -1,13 +1,12 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #ifndef GRAPH_EXECUTOR_QUERY_INTERSECTEXECUTOR_H_
 #define GRAPH_EXECUTOR_QUERY_INTERSECTEXECUTOR_H_
 
 #include "graph/executor/query/SetExecutor.h"
-
+// get the intersection of left & right sets
 namespace nebula {
 namespace graph {
 
diff --git a/src/graph/executor/query/JoinExecutor.cpp b/src/graph/executor/query/JoinExecutor.cpp
index a5bad010ead..c518446c776 100644
--- a/src/graph/executor/query/JoinExecutor.cpp
+++ b/src/graph/executor/query/JoinExecutor.cpp
@@ -1,12 +1,8 @@
-/* Copyright (c) 2021 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #include "graph/executor/query/JoinExecutor.h"
-
-#include "graph/context/Iterator.h"
-#include "graph/context/QueryExpressionContext.h"
 #include "graph/planner/plan/Query.h"
 
 namespace nebula {
diff --git a/src/graph/executor/query/JoinExecutor.h b/src/graph/executor/query/JoinExecutor.h
index d0c1e1bbe90..80026887f8b 100644
--- a/src/graph/executor/query/JoinExecutor.h
+++ b/src/graph/executor/query/JoinExecutor.h
@@ -1,7 +1,6 @@
-/* Copyright (c) 2021 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #ifndef GRAPH_EXECUTOR_QUERY_JOINEXECUTOR_H_
 #define GRAPH_EXECUTOR_QUERY_JOINEXECUTOR_H_
diff --git a/src/graph/executor/query/LeftJoinExecutor.cpp b/src/graph/executor/query/LeftJoinExecutor.cpp
index 6a8725ad076..300d5d08f95 100644
--- a/src/graph/executor/query/LeftJoinExecutor.cpp
+++ b/src/graph/executor/query/LeftJoinExecutor.cpp
@@ -1,13 +1,8 @@
-/* Copyright (c) 2021 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #include "graph/executor/query/LeftJoinExecutor.h"
-
-#include "common/time/ScopedTimer.h"
-#include "graph/context/Iterator.h"
-#include "graph/context/QueryExpressionContext.h"
 #include "graph/planner/plan/Query.h"
 
 namespace nebula {
diff --git a/src/graph/executor/query/LeftJoinExecutor.h b/src/graph/executor/query/LeftJoinExecutor.h
index 224b7cca6c9..66185babd29 100644
--- a/src/graph/executor/query/LeftJoinExecutor.h
+++ b/src/graph/executor/query/LeftJoinExecutor.h
@@ -1,7 +1,6 @@
-/* Copyright (c) 2021 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #ifndef GRAPH_EXECUTOR_QUERY_LEFTJOINEXECUTOR_H_
 #define GRAPH_EXECUTOR_QUERY_LEFTJOINEXECUTOR_H_
@@ -42,10 +41,8 @@ class LeftJoinExecutor : public JoinExecutor {
   size_t rightColSize_{0};
 };
 
-/**
- * No diffrence with left join in processing data, but the dependencies would be executed in
- * paralell.
- */
+// No diffrence with left join in processing data, but the dependencies would be executed in
+// paralell.
 class BiLeftJoinExecutor final : public LeftJoinExecutor {
  public:
   BiLeftJoinExecutor(const PlanNode* node, QueryContext* qctx);
diff --git a/src/graph/executor/query/LimitExecutor.cpp b/src/graph/executor/query/LimitExecutor.cpp
index 61a13c42e43..e1ca1e000db 100644
--- a/src/graph/executor/query/LimitExecutor.cpp
+++ b/src/graph/executor/query/LimitExecutor.cpp
@@ -1,11 +1,8 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #include "graph/executor/query/LimitExecutor.h"
-
-#include "common/time/ScopedTimer.h"
 #include "graph/planner/plan/Query.h"
 
 namespace nebula {
diff --git a/src/graph/executor/query/LimitExecutor.h b/src/graph/executor/query/LimitExecutor.h
index b605e1bae8c..d3df67db22f 100644
--- a/src/graph/executor/query/LimitExecutor.h
+++ b/src/graph/executor/query/LimitExecutor.h
@@ -1,13 +1,11 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
-
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 #ifndef GRAPH_EXECUTOR_QUERY_LIMITEXECUTOR_H_
 #define GRAPH_EXECUTOR_QUERY_LIMITEXECUTOR_H_
 
 #include "graph/executor/Executor.h"
-
+// takes iterators of data with user-specified limits and save them to the result
 namespace nebula {
 namespace graph {
 
diff --git a/src/graph/executor/query/MinusExecutor.cpp b/src/graph/executor/query/MinusExecutor.cpp
index b362a8a98a3..2443084835f 100644
--- a/src/graph/executor/query/MinusExecutor.cpp
+++ b/src/graph/executor/query/MinusExecutor.cpp
@@ -1,13 +1,8 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #include "graph/executor/query/MinusExecutor.h"
-
-#include <unordered_set>
-
-#include "common/time/ScopedTimer.h"
 #include "graph/planner/plan/Query.h"
 
 namespace nebula {
diff --git a/src/graph/executor/query/MinusExecutor.h b/src/graph/executor/query/MinusExecutor.h
index 669a4d00794..e9aa5bf1f04 100644
--- a/src/graph/executor/query/MinusExecutor.h
+++ b/src/graph/executor/query/MinusExecutor.h
@@ -1,13 +1,12 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #ifndef GRAPH_EXECUTOR_QUERY_MINUSEXECUTOR_H_
 #define GRAPH_EXECUTOR_QUERY_MINUSEXECUTOR_H_
 
 #include "graph/executor/query/SetExecutor.h"
-
+// leftSet - rightSet
 namespace nebula {
 namespace graph {
 
diff --git a/src/graph/executor/query/ProjectExecutor.cpp b/src/graph/executor/query/ProjectExecutor.cpp
index 5734f1b1efe..29f208a7ed1 100644
--- a/src/graph/executor/query/ProjectExecutor.cpp
+++ b/src/graph/executor/query/ProjectExecutor.cpp
@@ -1,14 +1,9 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #include "graph/executor/query/ProjectExecutor.h"
-
-#include "common/time/ScopedTimer.h"
-#include "graph/context/QueryExpressionContext.h"
 #include "graph/planner/plan/Query.h"
-#include "parser/Clauses.h"
 
 namespace nebula {
 namespace graph {
diff --git a/src/graph/executor/query/ProjectExecutor.h b/src/graph/executor/query/ProjectExecutor.h
index 28ddf6d4353..738b91c420c 100644
--- a/src/graph/executor/query/ProjectExecutor.h
+++ b/src/graph/executor/query/ProjectExecutor.h
@@ -1,13 +1,12 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #ifndef GRAPH_EXECUTOR_QUERY_PROJECTEXECUTOR_H_
 #define GRAPH_EXECUTOR_QUERY_PROJECTEXECUTOR_H_
 
 #include "graph/executor/Executor.h"
-
+// select user-specified columns from a table
 namespace nebula {
 namespace graph {
 
diff --git a/src/graph/executor/query/SampleExecutor.cpp b/src/graph/executor/query/SampleExecutor.cpp
index 6625107bdaa..8243d8666a3 100644
--- a/src/graph/executor/query/SampleExecutor.cpp
+++ b/src/graph/executor/query/SampleExecutor.cpp
@@ -1,11 +1,8 @@
-/* Copyright (c) 2021 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #include "graph/executor/query/SampleExecutor.h"
-
-#include "common/time/ScopedTimer.h"
 #include "graph/planner/plan/Query.h"
 
 namespace nebula {
diff --git a/src/graph/executor/query/SampleExecutor.h b/src/graph/executor/query/SampleExecutor.h
index 3eef2569d3c..8457c421893 100644
--- a/src/graph/executor/query/SampleExecutor.h
+++ b/src/graph/executor/query/SampleExecutor.h
@@ -1,13 +1,12 @@
-/* Copyright (c) 2021 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #ifndef GRAPH_EXECUTOR_QUERY_SAMPLEEXECUTOR_H
 #define GRAPH_EXECUTOR_QUERY_SAMPLEEXECUTOR_H
 
 #include "graph/executor/Executor.h"
-
+// invoke the sampling algorithm to select the specified amount of data
 namespace nebula {
 namespace graph {
 
diff --git a/src/graph/executor/query/ScanEdgesExecutor.cpp b/src/graph/executor/query/ScanEdgesExecutor.cpp
index 7f07759a549..73c3841fcd0 100644
--- a/src/graph/executor/query/ScanEdgesExecutor.cpp
+++ b/src/graph/executor/query/ScanEdgesExecutor.cpp
@@ -1,12 +1,8 @@
-/* Copyright (c) 2021 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #include "graph/executor/query/ScanEdgesExecutor.h"
-
-#include "common/time/ScopedTimer.h"
-#include "graph/context/QueryContext.h"
 #include "graph/planner/plan/Query.h"
 #include "graph/util/SchemaUtil.h"
 
diff --git a/src/graph/executor/query/ScanEdgesExecutor.h b/src/graph/executor/query/ScanEdgesExecutor.h
index c2385182e29..66fddfee953 100644
--- a/src/graph/executor/query/ScanEdgesExecutor.h
+++ b/src/graph/executor/query/ScanEdgesExecutor.h
@@ -1,10 +1,8 @@
-/* Copyright (c) 2021 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #include "graph/executor/query/GetPropExecutor.h"
-
 namespace nebula {
 namespace graph {
 class ScanEdgesExecutor final : public GetPropExecutor {
diff --git a/src/graph/executor/query/ScanVerticesExecutor.cpp b/src/graph/executor/query/ScanVerticesExecutor.cpp
index 490990c29a2..b8fab0ef8be 100644
--- a/src/graph/executor/query/ScanVerticesExecutor.cpp
+++ b/src/graph/executor/query/ScanVerticesExecutor.cpp
@@ -1,12 +1,10 @@
-/* Copyright (c) 2021 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #include "graph/executor/query/ScanVerticesExecutor.h"
 
-#include "common/time/ScopedTimer.h"
-#include "graph/context/QueryContext.h"
+#include "graph/planner/plan/Query.h"
 #include "graph/util/SchemaUtil.h"
 
 using nebula::storage::StorageClient;
diff --git a/src/graph/executor/query/ScanVerticesExecutor.h b/src/graph/executor/query/ScanVerticesExecutor.h
index bbe6df30cd3..108d88e0bc3 100644
--- a/src/graph/executor/query/ScanVerticesExecutor.h
+++ b/src/graph/executor/query/ScanVerticesExecutor.h
@@ -1,14 +1,12 @@
-/* Copyright (c) 2021 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #ifndef GRAPH_EXECUTOR_QUERY_SCANVERTICESEXECUTOR_H
 #define GRAPH_EXECUTOR_QUERY_SCANVERTICESEXECUTOR_H
 
 #include "graph/executor/query/GetPropExecutor.h"
-#include "graph/planner/plan/Query.h"
-
+// full table scan vertices, but must have limit parameter
 namespace nebula {
 namespace graph {
 
diff --git a/src/graph/executor/query/SetExecutor.cpp b/src/graph/executor/query/SetExecutor.cpp
index 5b5eb716c73..b2b28b7cccf 100644
--- a/src/graph/executor/query/SetExecutor.cpp
+++ b/src/graph/executor/query/SetExecutor.cpp
@@ -1,14 +1,8 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #include "graph/executor/query/SetExecutor.h"
-
-#include <sstream>
-
-#include "common/datatypes/DataSet.h"
-#include "graph/context/ExecutionContext.h"
 #include "graph/planner/plan/Query.h"
 
 namespace nebula {
diff --git a/src/graph/executor/query/SetExecutor.h b/src/graph/executor/query/SetExecutor.h
index 2f6ae21ba53..f86212d04ad 100644
--- a/src/graph/executor/query/SetExecutor.h
+++ b/src/graph/executor/query/SetExecutor.h
@@ -1,21 +1,13 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #ifndef GRAPH_EXECUTOR_QUERY_SETEXECUTOR_H_
 #define GRAPH_EXECUTOR_QUERY_SETEXECUTOR_H_
-
-#include <memory>
-
 #include "graph/executor/Executor.h"
-
 namespace nebula {
-
 class Iterator;
-
 namespace graph {
-
 class SetExecutor : public Executor {
  public:
   Status checkInputDataSets();
diff --git a/src/graph/executor/query/SortExecutor.cpp b/src/graph/executor/query/SortExecutor.cpp
index a8cc53bfd35..18210cb00f1 100644
--- a/src/graph/executor/query/SortExecutor.cpp
+++ b/src/graph/executor/query/SortExecutor.cpp
@@ -1,11 +1,8 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #include "graph/executor/query/SortExecutor.h"
-
-#include "common/time/ScopedTimer.h"
 #include "graph/planner/plan/Query.h"
 
 namespace nebula {
diff --git a/src/graph/executor/query/SortExecutor.h b/src/graph/executor/query/SortExecutor.h
index f0c3767e248..7c3806e322c 100644
--- a/src/graph/executor/query/SortExecutor.h
+++ b/src/graph/executor/query/SortExecutor.h
@@ -1,7 +1,6 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #ifndef GRAPH_EXECUTOR_QUERY_SORTEXECUTOR_H_
 #define GRAPH_EXECUTOR_QUERY_SORTEXECUTOR_H_
@@ -10,7 +9,6 @@
 
 namespace nebula {
 namespace graph {
-
 class SortExecutor final : public Executor {
  public:
   SortExecutor(const PlanNode *node, QueryContext *qctx) : Executor("SortExecutor", node, qctx) {}
diff --git a/src/graph/executor/query/TopNExecutor.cpp b/src/graph/executor/query/TopNExecutor.cpp
index b2cc15d422d..5a017f0391e 100644
--- a/src/graph/executor/query/TopNExecutor.cpp
+++ b/src/graph/executor/query/TopNExecutor.cpp
@@ -1,11 +1,8 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #include "graph/executor/query/TopNExecutor.h"
-
-#include "common/time/ScopedTimer.h"
 #include "graph/planner/plan/Query.h"
 
 namespace nebula {
diff --git a/src/graph/executor/query/TopNExecutor.h b/src/graph/executor/query/TopNExecutor.h
index 22024846617..6af4218a835 100644
--- a/src/graph/executor/query/TopNExecutor.h
+++ b/src/graph/executor/query/TopNExecutor.h
@@ -1,13 +1,11 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #ifndef GRAPH_EXECUTOR_QUERY_TOPNEXECUTOR_H_
 #define GRAPH_EXECUTOR_QUERY_TOPNEXECUTOR_H_
 
 #include "graph/executor/Executor.h"
-
 namespace nebula {
 namespace graph {
 
diff --git a/src/graph/executor/query/TraverseExecutor.cpp b/src/graph/executor/query/TraverseExecutor.cpp
index 2a1ba9e3f35..22848ec95ab 100644
--- a/src/graph/executor/query/TraverseExecutor.cpp
+++ b/src/graph/executor/query/TraverseExecutor.cpp
@@ -1,17 +1,9 @@
-/* Copyright (c) 2021 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #include "graph/executor/query/TraverseExecutor.h"
-
-#include <sstream>
-
 #include "clients/storage/StorageClient.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/SchemaUtil.h"
 
diff --git a/src/graph/executor/query/TraverseExecutor.h b/src/graph/executor/query/TraverseExecutor.h
index 25ec9704ea9..63cb4931bee 100644
--- a/src/graph/executor/query/TraverseExecutor.h
+++ b/src/graph/executor/query/TraverseExecutor.h
@@ -1,21 +1,14 @@
-/* Copyright (c) 2021 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #ifndef EXECUTOR_QUERY_TRAVERSEEXECUTOR_H_
 #define EXECUTOR_QUERY_TRAVERSEEXECUTOR_H_
 
-#include <vector>
-
-#include "clients/storage/StorageClient.h"
-#include "common/base/StatusOr.h"
-#include "common/datatypes/Value.h"
-#include "common/datatypes/Vertex.h"
 #include "graph/executor/StorageAccessExecutor.h"
 #include "graph/planner/plan/Query.h"
 #include "interface/gen-cpp2/storage_types.h"
-
+// only used in match scenarios
 namespace nebula {
 namespace graph {
 
diff --git a/src/graph/executor/query/UnionAllVersionVarExecutor.cpp b/src/graph/executor/query/UnionAllVersionVarExecutor.cpp
index 856ba363bd0..724080082a7 100644
--- a/src/graph/executor/query/UnionAllVersionVarExecutor.cpp
+++ b/src/graph/executor/query/UnionAllVersionVarExecutor.cpp
@@ -1,11 +1,8 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #include "graph/executor/query/UnionAllVersionVarExecutor.h"
-
-#include "common/time/ScopedTimer.h"
 #include "graph/planner/plan/Query.h"
 
 namespace nebula {
diff --git a/src/graph/executor/query/UnionAllVersionVarExecutor.h b/src/graph/executor/query/UnionAllVersionVarExecutor.h
index f8f69955e66..555e93a1020 100644
--- a/src/graph/executor/query/UnionAllVersionVarExecutor.h
+++ b/src/graph/executor/query/UnionAllVersionVarExecutor.h
@@ -1,13 +1,12 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #ifndef GRAPH_EXECUTOR_QUERY_UNIONALLVERSIONVAREXECUTOR_H_
 #define GRAPH_EXECUTOR_QUERY_UNIONALLVERSIONVAREXECUTOR_H_
 
 #include "graph/executor/Executor.h"
-
+// leftSet + rightSet. column names must be the same
 namespace nebula {
 namespace graph {
 
diff --git a/src/graph/executor/query/UnionExecutor.cpp b/src/graph/executor/query/UnionExecutor.cpp
index ceb139d7b3c..8e2c3aebdea 100644
--- a/src/graph/executor/query/UnionExecutor.cpp
+++ b/src/graph/executor/query/UnionExecutor.cpp
@@ -1,12 +1,8 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #include "graph/executor/query/UnionExecutor.h"
-
-#include "common/time/ScopedTimer.h"
-#include "graph/context/ExecutionContext.h"
 #include "graph/planner/plan/Query.h"
 
 namespace nebula {
diff --git a/src/graph/executor/query/UnionExecutor.h b/src/graph/executor/query/UnionExecutor.h
index d1c13673803..2c690c74291 100644
--- a/src/graph/executor/query/UnionExecutor.h
+++ b/src/graph/executor/query/UnionExecutor.h
@@ -1,13 +1,13 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #ifndef GRAPH_EXECUTOR_QUERY_UNIONEXECUTOR_H_
 #define GRAPH_EXECUTOR_QUERY_UNIONEXECUTOR_H_
 
 #include "graph/executor/query/SetExecutor.h"
-
+// leftSet + rightSet. column names must be the same
+// the result set is not duplicated
 namespace nebula {
 namespace graph {
 
diff --git a/src/graph/executor/query/UnwindExecutor.cpp b/src/graph/executor/query/UnwindExecutor.cpp
index dcb11c9507d..ecf9fac29fa 100644
--- a/src/graph/executor/query/UnwindExecutor.cpp
+++ b/src/graph/executor/query/UnwindExecutor.cpp
@@ -1,14 +1,9 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #include "graph/executor/query/UnwindExecutor.h"
-
-#include "common/time/ScopedTimer.h"
-#include "graph/context/QueryExpressionContext.h"
 #include "graph/planner/plan/Query.h"
-#include "parser/Clauses.h"
 
 namespace nebula {
 namespace graph {
diff --git a/src/graph/executor/query/UnwindExecutor.h b/src/graph/executor/query/UnwindExecutor.h
index cdfb9ff669f..78e6d0c000a 100644
--- a/src/graph/executor/query/UnwindExecutor.h
+++ b/src/graph/executor/query/UnwindExecutor.h
@@ -1,13 +1,12 @@
-/* Copyright (c) 2020 vesoft inc. All rights reserved.
- *
- * This source code is licensed under Apache 2.0 License.
- */
+// Copyright (c) 2022 vesoft inc. All rights reserved.
+//
+// This source code is licensed under Apache 2.0 License.
 
 #ifndef GRAPH_EXECUTOR_QUERY_UNWINDEXECUTOR_H_
 #define GRAPH_EXECUTOR_QUERY_UNWINDEXECUTOR_H_
 
 #include "graph/executor/Executor.h"
-
+// expand multiple columns of data into one column
 namespace nebula {
 namespace graph {