diff --git a/src/clients/meta/MetaClient.cpp b/src/clients/meta/MetaClient.cpp
index 7398d92a9a2..1839f3c1740 100644
--- a/src/clients/meta/MetaClient.cpp
+++ b/src/clients/meta/MetaClient.cpp
@@ -3151,15 +3151,15 @@ folly::Future<StatusOr<std::vector<cpp2::Group>>> MetaClient::listGroups() {
   return future;
 }
 
-folly::Future<StatusOr<cpp2::StatisItem>> MetaClient::getStatis(GraphSpaceID spaceId) {
-  cpp2::GetStatisReq req;
+folly::Future<StatusOr<cpp2::StatsItem>> MetaClient::getStats(GraphSpaceID spaceId) {
+  cpp2::GetStatsReq req;
   req.set_space_id(spaceId);
-  folly::Promise<StatusOr<cpp2::StatisItem>> promise;
+  folly::Promise<StatusOr<cpp2::StatsItem>> promise;
   auto future = promise.getFuture();
   getResponse(
       std::move(req),
-      [](auto client, auto request) { return client->future_getStatis(request); },
-      [](cpp2::GetStatisResp&& resp) -> cpp2::StatisItem { return std::move(resp).get_statis(); },
+      [](auto client, auto request) { return client->future_getStats(request); },
+      [](cpp2::GetStatsResp&& resp) -> cpp2::StatsItem { return std::move(resp).get_stats(); },
       std::move(promise),
       true);
   return future;
@@ -3169,13 +3169,13 @@ folly::Future<StatusOr<nebula::cpp2::ErrorCode>> MetaClient::reportTaskFinish(
     int32_t jobId,
     int32_t taskId,
     nebula::cpp2::ErrorCode taskErrCode,
-    cpp2::StatisItem* statisticItem) {
+    cpp2::StatsItem* statisticItem) {
   cpp2::ReportTaskReq req;
   req.set_code(taskErrCode);
   req.set_job_id(jobId);
   req.set_task_id(taskId);
   if (statisticItem) {
-    req.set_statis(*statisticItem);
+    req.set_stats(*statisticItem);
   }
   folly::Promise<StatusOr<nebula::cpp2::ErrorCode>> pro;
   auto fut = pro.getFuture();
diff --git a/src/clients/meta/MetaClient.h b/src/clients/meta/MetaClient.h
index 4407108fa93..5c9642d0590 100644
--- a/src/clients/meta/MetaClient.h
+++ b/src/clients/meta/MetaClient.h
@@ -584,13 +584,13 @@ class MetaClient {
 
   Status refreshCache();
 
-  folly::Future<StatusOr<cpp2::StatisItem>> getStatis(GraphSpaceID spaceId);
+  folly::Future<StatusOr<cpp2::StatsItem>> getStats(GraphSpaceID spaceId);
 
   folly::Future<StatusOr<nebula::cpp2::ErrorCode>> reportTaskFinish(
       int32_t jobId,
       int32_t taskId,
       nebula::cpp2::ErrorCode taskErrCode,
-      cpp2::StatisItem* statisticItem);
+      cpp2::StatsItem* statisticItem);
 
   folly::Future<StatusOr<bool>> download(const std::string& hdfsHost,
                                          int32_t hdfsPort,
diff --git a/src/graph/context/ExecutionContext.cpp b/src/graph/context/ExecutionContext.cpp
index 1d88d39164c..39ef92a6ee4 100644
--- a/src/graph/context/ExecutionContext.cpp
+++ b/src/graph/context/ExecutionContext.cpp
@@ -15,7 +15,7 @@ constexpr int64_t ExecutionContext::kPreviousOneVersion;
 void ExecutionContext::setValue(const std::string& name, Value&& val) {
   ResultBuilder builder;
   builder.value(std::move(val)).iter(Iterator::Kind::kDefault);
-  setResult(name, builder.finish());
+  setResult(name, builder.build());
 }
 
 void ExecutionContext::setResult(const std::string& name, Result&& result) {
diff --git a/src/graph/context/Result.cpp b/src/graph/context/Result.cpp
index cd6af97ca17..f90df637057 100644
--- a/src/graph/context/Result.cpp
+++ b/src/graph/context/Result.cpp
@@ -11,7 +11,7 @@ namespace graph {
 
 const Result& Result::EmptyResult() {
   static Result kEmptyResult =
-      ResultBuilder().value(Value()).iter(Iterator::Kind::kDefault).finish();
+      ResultBuilder().value(Value()).iter(Iterator::Kind::kDefault).build();
   return kEmptyResult;
 }
 
diff --git a/src/graph/context/Result.h b/src/graph/context/Result.h
index ce238903c62..47bab014286 100644
--- a/src/graph/context/Result.h
+++ b/src/graph/context/Result.h
@@ -80,7 +80,7 @@ class ResultBuilder final {
  public:
   ResultBuilder() { core_.state = Result::State::kSuccess; }
 
-  Result finish() {
+  Result build() {
     if (!core_.iter) iter(Iterator::Kind::kSequential);
     if (!core_.value && core_.iter) value(core_.iter->valuePtr());
     return Result(std::move(core_));
diff --git a/src/graph/context/test/ExecutionContextTest.cpp b/src/graph/context/test/ExecutionContextTest.cpp
index 8b0a97ec06e..74f0d30266f 100644
--- a/src/graph/context/test/ExecutionContextTest.cpp
+++ b/src/graph/context/test/ExecutionContextTest.cpp
@@ -52,7 +52,7 @@ TEST(ExecutionContext, HistoryTest) {
 TEST(ExecutionContextTest, TestResult) {
   DataSet ds;
   auto expected =
-      ResultBuilder().value(Value(std::move(ds))).iter(Iterator::Kind::kDefault).finish();
+      ResultBuilder().value(Value(std::move(ds))).iter(Iterator::Kind::kDefault).build();
   ExecutionContext ctx;
   ctx.setResult("ds", std::move(expected));
   auto& result = ctx.getResult("ds");
diff --git a/src/graph/executor/Executor.cpp b/src/graph/executor/Executor.cpp
index e5d5b338212..81e07d33d35 100644
--- a/src/graph/executor/Executor.cpp
+++ b/src/graph/executor/Executor.cpp
@@ -613,7 +613,7 @@ Status Executor::finish(Result &&result) {
 }
 
 Status Executor::finish(Value &&value) {
-  return finish(ResultBuilder().value(std::move(value)).iter(Iterator::Kind::kDefault).finish());
+  return finish(ResultBuilder().value(std::move(value)).iter(Iterator::Kind::kDefault).build());
 }
 
 folly::Executor *Executor::runner() const {
diff --git a/src/graph/executor/admin/CharsetExecutor.cpp b/src/graph/executor/admin/CharsetExecutor.cpp
index aaf2be0a500..874dbc203fd 100644
--- a/src/graph/executor/admin/CharsetExecutor.cpp
+++ b/src/graph/executor/admin/CharsetExecutor.cpp
@@ -28,7 +28,7 @@ folly::Future<Status> ShowCharsetExecutor::execute() {
     dataSet.emplace_back(std::move(row));
   }
 
-  return finish(ResultBuilder().value(Value(std::move(dataSet))).finish());
+  return finish(ResultBuilder().value(Value(std::move(dataSet))).build());
 }
 
 folly::Future<Status> ShowCollationExecutor::execute() {
@@ -48,7 +48,7 @@ folly::Future<Status> ShowCollationExecutor::execute() {
     }
   }
 
-  return finish(ResultBuilder().value(Value(std::move(dataSet))).finish());
+  return finish(ResultBuilder().value(Value(std::move(dataSet))).build());
 }
 }  // namespace graph
 }  // namespace nebula
diff --git a/src/graph/executor/admin/ConfigExecutor.cpp b/src/graph/executor/admin/ConfigExecutor.cpp
index 2b7706fc2a3..aa402439f62 100644
--- a/src/graph/executor/admin/ConfigExecutor.cpp
+++ b/src/graph/executor/admin/ConfigExecutor.cpp
@@ -56,7 +56,7 @@ folly::Future<Status> ShowConfigsExecutor::execute() {
         }
 
         auto result = generateResult(resp.value());
-        return finish(ResultBuilder().value(Value(std::move(result))).finish());
+        return finish(ResultBuilder().value(Value(std::move(result))).build());
       });
 }
 
@@ -95,7 +95,7 @@ folly::Future<Status> GetConfigExecutor::execute() {
                                resp.status().toString().c_str());
         }
         auto result = generateResult(resp.value());
-        return finish(ResultBuilder().value(Value(std::move(result))).finish());
+        return finish(ResultBuilder().value(Value(std::move(result))).build());
       });
 }
 
diff --git a/src/graph/executor/admin/GroupExecutor.cpp b/src/graph/executor/admin/GroupExecutor.cpp
index dcd67634105..37187c1fa61 100644
--- a/src/graph/executor/admin/GroupExecutor.cpp
+++ b/src/graph/executor/admin/GroupExecutor.cpp
@@ -66,7 +66,7 @@ folly::Future<Status> DescribeGroupExecutor::execute() {
         return finish(ResultBuilder()
                           .value(Value(std::move(dataSet)))
                           .iter(Iterator::Kind::kDefault)
-                          .finish());
+                          .build());
       });
 }
 
@@ -122,7 +122,7 @@ folly::Future<Status> ListGroupsExecutor::execute() {
         return finish(ResultBuilder()
                           .value(Value(std::move(dataSet)))
                           .iter(Iterator::Kind::kDefault)
-                          .finish());
+                          .build());
       });
 }
 
diff --git a/src/graph/executor/admin/PartExecutor.cpp b/src/graph/executor/admin/PartExecutor.cpp
index 0b6cf376ab2..0b2eb37fa5e 100644
--- a/src/graph/executor/admin/PartExecutor.cpp
+++ b/src/graph/executor/admin/PartExecutor.cpp
@@ -53,7 +53,7 @@ folly::Future<Status> ShowPartsExecutor::execute() {
         return finish(ResultBuilder()
                           .value(Value(std::move(dataSet)))
                           .iter(Iterator::Kind::kDefault)
-                          .finish());
+                          .build());
       });
 }
 }  // namespace graph
diff --git a/src/graph/executor/admin/SessionExecutor.cpp b/src/graph/executor/admin/SessionExecutor.cpp
index cd22f89a7a4..41f32ef041f 100644
--- a/src/graph/executor/admin/SessionExecutor.cpp
+++ b/src/graph/executor/admin/SessionExecutor.cpp
@@ -52,7 +52,7 @@ folly::Future<Status> ShowSessionsExecutor::listSessions() {
           row.emplace_back(session.get_client_ip());
           result.emplace_back(std::move(row));
         }
-        return finish(ResultBuilder().value(Value(std::move(result))).finish());
+        return finish(ResultBuilder().value(Value(std::move(result))).build());
       });
 }
 
@@ -75,7 +75,7 @@ folly::Future<Status> ShowSessionsExecutor::getSession(SessionID sessionId) {
             Row({"GraphAddr", network::NetworkUtils::toHostsStr({session.get_graph_addr()})}));
         result.emplace_back(Row({"Timezone", session.get_timezone()}));
         result.emplace_back(Row({"ClientIp", session.get_client_ip()}));
-        return finish(ResultBuilder().value(Value(std::move(result))).finish());
+        return finish(ResultBuilder().value(Value(std::move(result))).build());
       });
 }
 
diff --git a/src/graph/executor/admin/ShowQueriesExecutor.cpp b/src/graph/executor/admin/ShowQueriesExecutor.cpp
index 1ff2835bb3b..19b0aacca55 100644
--- a/src/graph/executor/admin/ShowQueriesExecutor.cpp
+++ b/src/graph/executor/admin/ShowQueriesExecutor.cpp
@@ -42,7 +42,7 @@ folly::Future<Status> ShowQueriesExecutor::showCurrentSessionQueries() {
 
   addQueries(sessionInMeta, dataSet);
   return finish(
-      ResultBuilder().value(Value(std::move(dataSet))).iter(Iterator::Kind::kSequential).finish());
+      ResultBuilder().value(Value(std::move(dataSet))).iter(Iterator::Kind::kSequential).build());
 }
 
 // The queries might not sync to meta completely.
@@ -68,7 +68,7 @@ folly::Future<Status> ShowQueriesExecutor::showAllSessionQueries() {
         return finish(ResultBuilder()
                           .value(Value(std::move(dataSet)))
                           .iter(Iterator::Kind::kSequential)
-                          .finish());
+                          .build());
       });
 }
 
diff --git a/src/graph/executor/admin/ShowStatsExecutor.cpp b/src/graph/executor/admin/ShowStatsExecutor.cpp
index 6945c1c0a59..7821194bba6 100644
--- a/src/graph/executor/admin/ShowStatsExecutor.cpp
+++ b/src/graph/executor/admin/ShowStatsExecutor.cpp
@@ -19,22 +19,22 @@ folly::Future<Status> ShowStatsExecutor::execute() {
   SCOPED_TIMER(&execTime_);
 
   auto spaceId = qctx()->rctx()->session()->space().id;
-  return qctx()->getMetaClient()->getStatis(spaceId).via(runner()).thenValue(
-      [this, spaceId](StatusOr<meta::cpp2::StatisItem> resp) {
+  return qctx()->getMetaClient()->getStats(spaceId).via(runner()).thenValue(
+      [this, spaceId](StatusOr<meta::cpp2::StatsItem> resp) {
         if (!resp.ok()) {
           LOG(ERROR) << "SpaceId: " << spaceId << ", Show staus failed: " << resp.status();
           return resp.status();
         }
-        auto statisItem = std::move(resp).value();
+        auto statsItem = std::move(resp).value();
 
         DataSet dataSet({"Type", "Name", "Count"});
         std::vector<std::pair<std::string, int64_t>> tagCount;
         std::vector<std::pair<std::string, int64_t>> edgeCount;
 
-        for (auto& tag : statisItem.get_tag_vertices()) {
+        for (auto& tag : statsItem.get_tag_vertices()) {
           tagCount.emplace_back(std::make_pair(tag.first, tag.second));
         }
-        for (auto& edge : statisItem.get_edges()) {
+        for (auto& edge : statsItem.get_edges()) {
           edgeCount.emplace_back(std::make_pair(edge.first, edge.second));
         }
 
@@ -64,19 +64,19 @@ folly::Future<Status> ShowStatsExecutor::execute() {
         Row verticeRow;
         verticeRow.values.emplace_back("Space");
         verticeRow.values.emplace_back("vertices");
-        verticeRow.values.emplace_back(*statisItem.space_vertices_ref());
+        verticeRow.values.emplace_back(*statsItem.space_vertices_ref());
         dataSet.rows.emplace_back(std::move(verticeRow));
 
         Row edgeRow;
         edgeRow.values.emplace_back("Space");
         edgeRow.values.emplace_back("edges");
-        edgeRow.values.emplace_back(*statisItem.space_edges_ref());
+        edgeRow.values.emplace_back(*statsItem.space_edges_ref());
         dataSet.rows.emplace_back(std::move(edgeRow));
 
         return finish(ResultBuilder()
                           .value(Value(std::move(dataSet)))
                           .iter(Iterator::Kind::kDefault)
-                          .finish());
+                          .build());
       });
 }
 
diff --git a/src/graph/executor/admin/SnapshotExecutor.cpp b/src/graph/executor/admin/SnapshotExecutor.cpp
index efc26ec3a71..18bcdfdeddf 100644
--- a/src/graph/executor/admin/SnapshotExecutor.cpp
+++ b/src/graph/executor/admin/SnapshotExecutor.cpp
@@ -67,7 +67,7 @@ folly::Future<Status> ShowSnapshotsExecutor::execute() {
         return finish(ResultBuilder()
                           .value(Value(std::move(dataSet)))
                           .iter(Iterator::Kind::kDefault)
-                          .finish());
+                          .build());
       });
 }
 }  // namespace graph
diff --git a/src/graph/executor/admin/SpaceExecutor.cpp b/src/graph/executor/admin/SpaceExecutor.cpp
index f90103d5e88..52f89905a43 100644
--- a/src/graph/executor/admin/SpaceExecutor.cpp
+++ b/src/graph/executor/admin/SpaceExecutor.cpp
@@ -92,7 +92,7 @@ folly::Future<Status> DescSpaceExecutor::execute() {
         return finish(ResultBuilder()
                           .value(Value(std::move(dataSet)))
                           .iter(Iterator::Kind::kDefault)
-                          .finish());
+                          .build());
       });
 }
 
@@ -173,7 +173,7 @@ folly::Future<Status> ShowSpacesExecutor::execute() {
         return finish(ResultBuilder()
                           .value(Value(std::move(dataSet)))
                           .iter(Iterator::Kind::kDefault)
-                          .finish());
+                          .build());
       });
 }
 
@@ -238,7 +238,7 @@ folly::Future<Status> ShowCreateSpaceExecutor::execute() {
         return finish(ResultBuilder()
                           .value(Value(std::move(dataSet)))
                           .iter(Iterator::Kind::kDefault)
-                          .finish());
+                          .build());
       });
 }
 }  // namespace graph
diff --git a/src/graph/executor/admin/ZoneExecutor.cpp b/src/graph/executor/admin/ZoneExecutor.cpp
index 952e71845e1..acf13a8eba9 100644
--- a/src/graph/executor/admin/ZoneExecutor.cpp
+++ b/src/graph/executor/admin/ZoneExecutor.cpp
@@ -67,7 +67,7 @@ folly::Future<Status> DescribeZoneExecutor::execute() {
         return finish(ResultBuilder()
                           .value(Value(std::move(dataSet)))
                           .iter(Iterator::Kind::kDefault)
-                          .finish());
+                          .build());
       });
 }
 
@@ -124,7 +124,7 @@ folly::Future<Status> ListZonesExecutor::execute() {
         return finish(ResultBuilder()
                           .value(Value(std::move(dataSet)))
                           .iter(Iterator::Kind::kDefault)
-                          .finish());
+                          .build());
       });
 }
 
diff --git a/src/graph/executor/algo/BFSShortestPathExecutor.cpp b/src/graph/executor/algo/BFSShortestPathExecutor.cpp
index a860b9d4e7b..75de3dc2ce5 100644
--- a/src/graph/executor/algo/BFSShortestPathExecutor.cpp
+++ b/src/graph/executor/algo/BFSShortestPathExecutor.cpp
@@ -47,7 +47,7 @@ folly::Future<Status> BFSShortestPathExecutor::execute() {
     ds.rows.emplace_back(std::move(row));
     visited_.emplace(dst);
   }
-  return finish(ResultBuilder().value(Value(std::move(ds))).finish());
+  return finish(ResultBuilder().value(Value(std::move(ds))).build());
 }
 }  // namespace graph
 }  // namespace nebula
diff --git a/src/graph/executor/algo/CartesianProductExecutor.cpp b/src/graph/executor/algo/CartesianProductExecutor.cpp
index deb23623cdf..daf122f6ba6 100644
--- a/src/graph/executor/algo/CartesianProductExecutor.cpp
+++ b/src/graph/executor/algo/CartesianProductExecutor.cpp
@@ -35,7 +35,7 @@ folly::Future<Status> CartesianProductExecutor::execute() {
                            std::make_move_iterator(cols.end()));
   }
   VLOG(1) << "Cartesian Product is : " << result;
-  return finish(ResultBuilder().value(Value(std::move(result))).finish());
+  return finish(ResultBuilder().value(Value(std::move(result))).build());
 }
 
 void CartesianProductExecutor::doCartesianProduct(const DataSet& lds,
diff --git a/src/graph/executor/algo/ConjunctPathExecutor.cpp b/src/graph/executor/algo/ConjunctPathExecutor.cpp
index 07e25ad489e..f3e14e7be74 100644
--- a/src/graph/executor/algo/ConjunctPathExecutor.cpp
+++ b/src/graph/executor/algo/ConjunctPathExecutor.cpp
@@ -61,7 +61,7 @@ folly::Future<Status> ConjunctPathExecutor::bfsShortestPath() {
     if (!rows.empty()) {
       VLOG(1) << "Meet odd length path.";
       ds.rows = std::move(rows);
-      return finish(ResultBuilder().value(Value(std::move(ds))).finish());
+      return finish(ResultBuilder().value(Value(std::move(ds))).build());
     }
   }
 
@@ -76,7 +76,7 @@ folly::Future<Status> ConjunctPathExecutor::bfsShortestPath() {
       ds.rows = std::move(rows);
     }
   }
-  return finish(ResultBuilder().value(Value(std::move(ds))).finish());
+  return finish(ResultBuilder().value(Value(std::move(ds))).build());
 }
 
 std::vector<Row> ConjunctPathExecutor::findBfsShortestPath(
@@ -213,7 +213,7 @@ folly::Future<Status> ConjunctPathExecutor::floydShortestPath() {
     findPath(latest.get(), forwardCostPathMap, ds);
   }
 
-  return finish(ResultBuilder().value(Value(std::move(ds))).finish());
+  return finish(ResultBuilder().value(Value(std::move(ds))).build());
 }
 
 Status ConjunctPathExecutor::conjunctPath(const List& forwardPaths,
@@ -339,7 +339,7 @@ folly::Future<Status> ConjunctPathExecutor::allPaths() {
     findAllPaths(latest.get(), table, ds);
   }
 
-  return finish(ResultBuilder().value(Value(std::move(ds))).finish());
+  return finish(ResultBuilder().value(Value(std::move(ds))).build());
 }
 
 bool ConjunctPathExecutor::findAllPaths(Iterator* backwardPathsIter,
diff --git a/src/graph/executor/algo/ProduceAllPathsExecutor.cpp b/src/graph/executor/algo/ProduceAllPathsExecutor.cpp
index a456356c2bc..fb6c4010dec 100644
--- a/src/graph/executor/algo/ProduceAllPathsExecutor.cpp
+++ b/src/graph/executor/algo/ProduceAllPathsExecutor.cpp
@@ -52,7 +52,7 @@ folly::Future<Status> ProduceAllPathsExecutor::execute() {
     }
   }
   count_++;
-  return finish(ResultBuilder().value(Value(std::move(ds))).finish());
+  return finish(ResultBuilder().value(Value(std::move(ds))).build());
 }
 
 void ProduceAllPathsExecutor::createPaths(const Edge& edge, Interims& interims) {
diff --git a/src/graph/executor/algo/ProduceSemiShortestPathExecutor.cpp b/src/graph/executor/algo/ProduceSemiShortestPathExecutor.cpp
index a79926e3660..b76836f22ec 100644
--- a/src/graph/executor/algo/ProduceSemiShortestPathExecutor.cpp
+++ b/src/graph/executor/algo/ProduceSemiShortestPathExecutor.cpp
@@ -263,7 +263,7 @@ folly::Future<Status> ProduceSemiShortestPathExecutor::execute() {
     }
   }
   VLOG(2) << "SemiShortPath : " << ds;
-  return finish(ResultBuilder().value(Value(std::move(ds))).finish());
+  return finish(ResultBuilder().value(Value(std::move(ds))).build());
 }
 
 }  // namespace graph
diff --git a/src/graph/executor/algo/SubgraphExecutor.cpp b/src/graph/executor/algo/SubgraphExecutor.cpp
index 9931b876f3a..44efd9e0d5b 100644
--- a/src/graph/executor/algo/SubgraphExecutor.cpp
+++ b/src/graph/executor/algo/SubgraphExecutor.cpp
@@ -25,7 +25,7 @@ folly::Future<Status> SubgraphExecutor::execute() {
 
   if (currentStep == steps) {
     oneMoreStep();
-    return finish(ResultBuilder().value(Value(std::move(ds))).finish());
+    return finish(ResultBuilder().value(Value(std::move(ds))).build());
   }
 
   VLOG(1) << "input: " << subgraph->inputVar() << " output: " << node()->outputVar();
@@ -49,7 +49,7 @@ folly::Future<Status> SubgraphExecutor::execute() {
   }
 
   VLOG(1) << "Next step vid is : " << ds;
-  return finish(ResultBuilder().value(Value(std::move(ds))).finish());
+  return finish(ResultBuilder().value(Value(std::move(ds))).build());
 }
 
 void SubgraphExecutor::oneMoreStep() {
@@ -71,7 +71,7 @@ void SubgraphExecutor::oneMoreStep() {
   }
   iter->reset();
   builder.iter(std::move(iter));
-  ectx_->setResult(output, builder.finish());
+  ectx_->setResult(output, builder.build());
 }
 
 }  // namespace graph
diff --git a/src/graph/executor/logic/LoopExecutor.cpp b/src/graph/executor/logic/LoopExecutor.cpp
index 2b490310b7b..ae04213341a 100644
--- a/src/graph/executor/logic/LoopExecutor.cpp
+++ b/src/graph/executor/logic/LoopExecutor.cpp
@@ -32,7 +32,7 @@ folly::Future<Status> LoopExecutor::execute() {
   auto value = expr->eval(ctx);
   VLOG(1) << "Loop condition: " << expr->toString() << " val: " << value;
   DCHECK(value.isBool());
-  return finish(ResultBuilder().value(std::move(value)).iter(Iterator::Kind::kDefault).finish());
+  return finish(ResultBuilder().value(std::move(value)).iter(Iterator::Kind::kDefault).build());
 }
 
 }  // namespace graph
diff --git a/src/graph/executor/logic/PassThroughExecutor.cpp b/src/graph/executor/logic/PassThroughExecutor.cpp
index 79e31f9d812..5e68cbf8052 100644
--- a/src/graph/executor/logic/PassThroughExecutor.cpp
+++ b/src/graph/executor/logic/PassThroughExecutor.cpp
@@ -24,7 +24,7 @@ folly::Future<Status> PassThroughExecutor::execute() {
 
   DataSet ds;
   ds.colNames = node()->colNames();
-  return finish(ResultBuilder().value(Value(std::move(ds))).finish());
+  return finish(ResultBuilder().value(Value(std::move(ds))).build());
 }
 
 }  // namespace graph
diff --git a/src/graph/executor/logic/SelectExecutor.cpp b/src/graph/executor/logic/SelectExecutor.cpp
index 6f61c12e705..4c4ed03abb7 100644
--- a/src/graph/executor/logic/SelectExecutor.cpp
+++ b/src/graph/executor/logic/SelectExecutor.cpp
@@ -25,7 +25,7 @@ folly::Future<Status> SelectExecutor::execute() {
   QueryExpressionContext ctx(ectx_);
   auto value = expr->eval(ctx);
   DCHECK(value.isBool());
-  return finish(ResultBuilder().value(std::move(value)).iter(Iterator::Kind::kDefault).finish());
+  return finish(ResultBuilder().value(std::move(value)).iter(Iterator::Kind::kDefault).build());
 }
 
 }  // namespace graph
diff --git a/src/graph/executor/maintain/EdgeExecutor.cpp b/src/graph/executor/maintain/EdgeExecutor.cpp
index 09038e1cd99..a169edc0455 100644
--- a/src/graph/executor/maintain/EdgeExecutor.cpp
+++ b/src/graph/executor/maintain/EdgeExecutor.cpp
@@ -56,7 +56,7 @@ folly::Future<Status> DescEdgeExecutor::execute() {
         return finish(ResultBuilder()
                           .value(Value(std::move(ret).value()))
                           .iter(Iterator::Kind::kDefault)
-                          .finish());
+                          .build());
       });
 }
 
@@ -105,7 +105,7 @@ folly::Future<Status> ShowEdgesExecutor::execute() {
         return finish(ResultBuilder()
                           .value(Value(std::move(dataSet)))
                           .iter(Iterator::Kind::kDefault)
-                          .finish());
+                          .build());
       });
 }
 
@@ -130,7 +130,7 @@ folly::Future<Status> ShowCreateEdgeExecutor::execute() {
           return ret.status();
         }
         return finish(
-            ResultBuilder().value(std::move(ret).value()).iter(Iterator::Kind::kDefault).finish());
+            ResultBuilder().value(std::move(ret).value()).iter(Iterator::Kind::kDefault).build());
       });
 }
 
@@ -149,7 +149,7 @@ folly::Future<Status> AlterEdgeExecutor::execute() {
                      << "' failed: " << resp.status();
           return resp.status();
         }
-        return finish(ResultBuilder().value(Value()).iter(Iterator::Kind::kDefault).finish());
+        return finish(ResultBuilder().value(Value()).iter(Iterator::Kind::kDefault).build());
       });
 }
 }  // namespace graph
diff --git a/src/graph/executor/maintain/EdgeIndexExecutor.cpp b/src/graph/executor/maintain/EdgeIndexExecutor.cpp
index 92758bd06e1..930ca20c0ca 100644
--- a/src/graph/executor/maintain/EdgeIndexExecutor.cpp
+++ b/src/graph/executor/maintain/EdgeIndexExecutor.cpp
@@ -77,7 +77,7 @@ folly::Future<Status> DescEdgeIndexExecutor::execute() {
           return ret.status();
         }
         return finish(
-            ResultBuilder().value(std::move(ret).value()).iter(Iterator::Kind::kDefault).finish());
+            ResultBuilder().value(std::move(ret).value()).iter(Iterator::Kind::kDefault).build());
       });
 }
 
@@ -102,7 +102,7 @@ folly::Future<Status> ShowCreateEdgeIndexExecutor::execute() {
           return ret.status();
         }
         return finish(
-            ResultBuilder().value(std::move(ret).value()).iter(Iterator::Kind::kDefault).finish());
+            ResultBuilder().value(std::move(ret).value()).iter(Iterator::Kind::kDefault).build());
       });
 }
 
@@ -155,7 +155,7 @@ folly::Future<Status> ShowEdgeIndexesExecutor::execute() {
         return finish(ResultBuilder()
                           .value(Value(std::move(dataSet)))
                           .iter(Iterator::Kind::kDefault)
-                          .finish());
+                          .build());
       });
 }
 
@@ -184,7 +184,7 @@ folly::Future<Status> ShowEdgeIndexStatusExecutor::execute() {
         return finish(ResultBuilder()
                           .value(Value(std::move(dataSet)))
                           .iter(Iterator::Kind::kDefault)
-                          .finish());
+                          .build());
       });
 }
 
diff --git a/src/graph/executor/maintain/FTIndexExecutor.cpp b/src/graph/executor/maintain/FTIndexExecutor.cpp
index 73f0d6edcc3..83d2449e362 100644
--- a/src/graph/executor/maintain/FTIndexExecutor.cpp
+++ b/src/graph/executor/maintain/FTIndexExecutor.cpp
@@ -95,7 +95,7 @@ folly::Future<Status> ShowFTIndexesExecutor::execute() {
         return finish(ResultBuilder()
                           .value(Value(std::move(dataSet)))
                           .iter(Iterator::Kind::kDefault)
-                          .finish());
+                          .build());
       });
 }
 
diff --git a/src/graph/executor/maintain/TagExecutor.cpp b/src/graph/executor/maintain/TagExecutor.cpp
index 6be42c62f24..af4ead79a77 100644
--- a/src/graph/executor/maintain/TagExecutor.cpp
+++ b/src/graph/executor/maintain/TagExecutor.cpp
@@ -54,7 +54,7 @@ folly::Future<Status> DescTagExecutor::execute() {
           return ret.status();
         }
         return finish(
-            ResultBuilder().value(std::move(ret).value()).iter(Iterator::Kind::kDefault).finish());
+            ResultBuilder().value(std::move(ret).value()).iter(Iterator::Kind::kDefault).build());
       });
 }
 
@@ -103,7 +103,7 @@ folly::Future<Status> ShowTagsExecutor::execute() {
         return finish(ResultBuilder()
                           .value(Value(std::move(dataSet)))
                           .iter(Iterator::Kind::kDefault)
-                          .finish());
+                          .build());
       });
 }
 
@@ -128,7 +128,7 @@ folly::Future<Status> ShowCreateTagExecutor::execute() {
           return ret.status();
         }
         return finish(
-            ResultBuilder().value(std::move(ret).value()).iter(Iterator::Kind::kDefault).finish());
+            ResultBuilder().value(std::move(ret).value()).iter(Iterator::Kind::kDefault).build());
       });
 }
 
diff --git a/src/graph/executor/maintain/TagIndexExecutor.cpp b/src/graph/executor/maintain/TagIndexExecutor.cpp
index 782f19b65cd..4dcce1a738a 100644
--- a/src/graph/executor/maintain/TagIndexExecutor.cpp
+++ b/src/graph/executor/maintain/TagIndexExecutor.cpp
@@ -77,7 +77,7 @@ folly::Future<Status> DescTagIndexExecutor::execute() {
           return ret.status();
         }
         return finish(
-            ResultBuilder().value(std::move(ret).value()).iter(Iterator::Kind::kDefault).finish());
+            ResultBuilder().value(std::move(ret).value()).iter(Iterator::Kind::kDefault).build());
       });
 }
 
@@ -102,7 +102,7 @@ folly::Future<Status> ShowCreateTagIndexExecutor::execute() {
           return ret.status();
         }
         return finish(
-            ResultBuilder().value(std::move(ret).value()).iter(Iterator::Kind::kDefault).finish());
+            ResultBuilder().value(std::move(ret).value()).iter(Iterator::Kind::kDefault).build());
       });
 }
 
@@ -156,7 +156,7 @@ folly::Future<Status> ShowTagIndexesExecutor::execute() {
         return finish(ResultBuilder()
                           .value(Value(std::move(dataSet)))
                           .iter(Iterator::Kind::kDefault)
-                          .finish());
+                          .build());
       });
 }
 
@@ -184,7 +184,7 @@ folly::Future<Status> ShowTagIndexStatusExecutor::execute() {
         return finish(ResultBuilder()
                           .value(Value(std::move(dataSet)))
                           .iter(Iterator::Kind::kDefault)
-                          .finish());
+                          .build());
       });
 }
 
diff --git a/src/graph/executor/mutate/UpdateExecutor.cpp b/src/graph/executor/mutate/UpdateExecutor.cpp
index a1cbace96d7..4fc7870ac1a 100644
--- a/src/graph/executor/mutate/UpdateExecutor.cpp
+++ b/src/graph/executor/mutate/UpdateExecutor.cpp
@@ -76,7 +76,7 @@ folly::Future<Status> UpdateVertexExecutor::execute() {
           return finish(ResultBuilder()
                             .value(std::move(status).value())
                             .iter(Iterator::Kind::kDefault)
-                            .finish());
+                            .build());
         }
         return Status::OK();
       });
@@ -123,7 +123,7 @@ folly::Future<Status> UpdateEdgeExecutor::execute() {
           return finish(ResultBuilder()
                             .value(std::move(status).value())
                             .iter(Iterator::Kind::kDefault)
-                            .finish());
+                            .build());
         }
         return Status::OK();
       });
diff --git a/src/graph/executor/query/AggregateExecutor.cpp b/src/graph/executor/query/AggregateExecutor.cpp
index 307b2b63a32..cf9be4fadce 100644
--- a/src/graph/executor/query/AggregateExecutor.cpp
+++ b/src/graph/executor/query/AggregateExecutor.cpp
@@ -91,7 +91,7 @@ folly::Future<Status> AggregateExecutor::execute() {
     }
     ds.rows.emplace_back(std::move(row));
   }
-  return finish(ResultBuilder().value(Value(std::move(ds))).finish());
+  return finish(ResultBuilder().value(Value(std::move(ds))).build());
 }
 
 }  // namespace graph
diff --git a/src/graph/executor/query/AssignExecutor.cpp b/src/graph/executor/query/AssignExecutor.cpp
index 91221502009..f15a25c702d 100644
--- a/src/graph/executor/query/AssignExecutor.cpp
+++ b/src/graph/executor/query/AssignExecutor.cpp
@@ -23,7 +23,7 @@ folly::Future<Status> AssignExecutor::execute() {
     auto value = valueExpr->eval(ctx);
     VLOG(1) << "VarName is: " << varName << " value is : " << value;
     if (value.isDataSet()) {
-      ectx_->setResult(varName, ResultBuilder().value(std::move(value)).finish());
+      ectx_->setResult(varName, ResultBuilder().value(std::move(value)).build());
     } else {
       ectx_->setValue(varName, std::move(value));
     }
diff --git a/src/graph/executor/query/DataCollectExecutor.cpp b/src/graph/executor/query/DataCollectExecutor.cpp
index 727535c46ff..47277a2c386 100644
--- a/src/graph/executor/query/DataCollectExecutor.cpp
+++ b/src/graph/executor/query/DataCollectExecutor.cpp
@@ -58,7 +58,7 @@ folly::Future<Status> DataCollectExecutor::doCollect() {
   }
   ResultBuilder builder;
   builder.value(Value(std::move(result_))).iter(Iterator::Kind::kSequential);
-  return finish(builder.finish());
+  return finish(builder.build());
 }
 
 Status DataCollectExecutor::collectSubgraph(const std::vector<std::string>& vars) {
diff --git a/src/graph/executor/query/FilterExecutor.cpp b/src/graph/executor/query/FilterExecutor.cpp
index 723e38a359a..cbd1a58879a 100644
--- a/src/graph/executor/query/FilterExecutor.cpp
+++ b/src/graph/executor/query/FilterExecutor.cpp
@@ -51,7 +51,7 @@ folly::Future<Status> FilterExecutor::execute() {
 
   iter->reset();
   builder.iter(std::move(result).iter());
-  return finish(builder.finish());
+  return finish(builder.build());
 }
 
 }  // namespace graph
diff --git a/src/graph/executor/query/GetEdgesExecutor.cpp b/src/graph/executor/query/GetEdgesExecutor.cpp
index a21c901b582..b3a559601d0 100644
--- a/src/graph/executor/query/GetEdgesExecutor.cpp
+++ b/src/graph/executor/query/GetEdgesExecutor.cpp
@@ -63,7 +63,7 @@ folly::Future<Status> GetEdgesExecutor::getEdges() {
   if (edges.rows.empty()) {
     // TODO: add test for empty input.
     return finish(
-        ResultBuilder().value(Value(DataSet(ge->colNames()))).iter(Iterator::Kind::kProp).finish());
+        ResultBuilder().value(Value(DataSet(ge->colNames()))).iter(Iterator::Kind::kProp).build());
   }
 
   time::Duration getPropsTime;
diff --git a/src/graph/executor/query/GetNeighborsExecutor.cpp b/src/graph/executor/query/GetNeighborsExecutor.cpp
index 2b5b66d9971..d7ace30770c 100644
--- a/src/graph/executor/query/GetNeighborsExecutor.cpp
+++ b/src/graph/executor/query/GetNeighborsExecutor.cpp
@@ -37,7 +37,7 @@ folly::Future<Status> GetNeighborsExecutor::execute() {
     return finish(ResultBuilder()
                       .value(Value(std::move(emptyResult)))
                       .iter(Iterator::Kind::kGetNeighbors)
-                      .finish());
+                      .build());
   }
 
   time::Duration getNbrTime;
@@ -102,7 +102,7 @@ Status GetNeighborsExecutor::handleResponse(RpcResponse& resps) {
     list.values.emplace_back(std::move(*dataset));
   }
   builder.value(Value(std::move(list)));
-  return finish(builder.iter(Iterator::Kind::kGetNeighbors).finish());
+  return finish(builder.iter(Iterator::Kind::kGetNeighbors).build());
 }
 
 }  // namespace graph
diff --git a/src/graph/executor/query/GetPropExecutor.h b/src/graph/executor/query/GetPropExecutor.h
index 0352ba11414..5e4e8959542 100644
--- a/src/graph/executor/query/GetPropExecutor.h
+++ b/src/graph/executor/query/GetPropExecutor.h
@@ -43,7 +43,7 @@ class GetPropExecutor : public StorageAccessExecutor {
     }
     VLOG(2) << "Dataset in get props: \n" << v << "\n";
     return finish(
-        ResultBuilder().value(std::move(v)).iter(Iterator::Kind::kProp).state(state).finish());
+        ResultBuilder().value(std::move(v)).iter(Iterator::Kind::kProp).state(state).build());
   }
 };
 
diff --git a/src/graph/executor/query/GetVerticesExecutor.cpp b/src/graph/executor/query/GetVerticesExecutor.cpp
index b8bca47b8af..c3605f7eb8c 100644
--- a/src/graph/executor/query/GetVerticesExecutor.cpp
+++ b/src/graph/executor/query/GetVerticesExecutor.cpp
@@ -30,7 +30,7 @@ folly::Future<Status> GetVerticesExecutor::getVertices() {
   if (vertices.rows.empty()) {
     // TODO: add test for empty input.
     return finish(
-        ResultBuilder().value(Value(DataSet(gv->colNames()))).iter(Iterator::Kind::kProp).finish());
+        ResultBuilder().value(Value(DataSet(gv->colNames()))).iter(Iterator::Kind::kProp).build());
   }
 
   time::Duration getPropsTime;
diff --git a/src/graph/executor/query/IndexScanExecutor.cpp b/src/graph/executor/query/IndexScanExecutor.cpp
index ef738367765..94a33158020 100644
--- a/src/graph/executor/query/IndexScanExecutor.cpp
+++ b/src/graph/executor/query/IndexScanExecutor.cpp
@@ -26,7 +26,7 @@ folly::Future<Status> IndexScanExecutor::indexScan() {
   auto *lookup = asNode<IndexScan>(node());
   if (lookup->isEmptyResultSet()) {
     DataSet dataSet({"dummy"});
-    return finish(ResultBuilder().value(Value(std::move(dataSet))).finish());
+    return finish(ResultBuilder().value(Value(std::move(dataSet))).build());
   }
 
   const auto &ictxs = lookup->queryContext();
@@ -72,7 +72,7 @@ Status IndexScanExecutor::handleResp(storage::StorageRpcResponse<Resp> &&rpcResp
   }
   VLOG(2) << "Dataset produced by IndexScan: \n" << v << "\n";
   return finish(
-      ResultBuilder().value(std::move(v)).iter(Iterator::Kind::kProp).state(state).finish());
+      ResultBuilder().value(std::move(v)).iter(Iterator::Kind::kProp).state(state).build());
 }
 
 }  // namespace graph
diff --git a/src/graph/executor/query/InnerJoinExecutor.cpp b/src/graph/executor/query/InnerJoinExecutor.cpp
index b715ffb8dd2..f13de9cac6a 100644
--- a/src/graph/executor/query/InnerJoinExecutor.cpp
+++ b/src/graph/executor/query/InnerJoinExecutor.cpp
@@ -35,7 +35,7 @@ folly::Future<Status> InnerJoinExecutor::join() {
 
   if (lhsIter_->empty() || rhsIter_->empty()) {
     result.colNames = join->colNames();
-    return finish(ResultBuilder().value(Value(std::move(result))).finish());
+    return finish(ResultBuilder().value(Value(std::move(result))).build());
   }
 
   if (hashKeys.size() == 1 && probeKeys.size() == 1) {
@@ -62,7 +62,7 @@ folly::Future<Status> InnerJoinExecutor::join() {
     }
   }
   result.colNames = join->colNames();
-  return finish(ResultBuilder().value(Value(std::move(result))).finish());
+  return finish(ResultBuilder().value(Value(std::move(result))).build());
 }
 
 DataSet InnerJoinExecutor::probe(
diff --git a/src/graph/executor/query/IntersectExecutor.cpp b/src/graph/executor/query/IntersectExecutor.cpp
index b526c9e6468..34471ca2f02 100644
--- a/src/graph/executor/query/IntersectExecutor.cpp
+++ b/src/graph/executor/query/IntersectExecutor.cpp
@@ -36,7 +36,7 @@ folly::Future<Status> IntersectExecutor::execute() {
     DataSet ds;
     ds.colNames = value->getDataSet().colNames;
     builder.value(Value(std::move(ds))).iter(Iterator::Kind::kSequential);
-    return finish(builder.finish());
+    return finish(builder.build());
   }
 
   while (lIter->valid()) {
@@ -49,7 +49,7 @@ folly::Future<Status> IntersectExecutor::execute() {
   }
 
   builder.value(left.valuePtr()).iter(std::move(left).iter());
-  return finish(builder.finish());
+  return finish(builder.build());
 }
 
 }  // namespace graph
diff --git a/src/graph/executor/query/LeftJoinExecutor.cpp b/src/graph/executor/query/LeftJoinExecutor.cpp
index b2a8942f099..516569f27bc 100644
--- a/src/graph/executor/query/LeftJoinExecutor.cpp
+++ b/src/graph/executor/query/LeftJoinExecutor.cpp
@@ -49,7 +49,7 @@ folly::Future<Status> LeftJoinExecutor::join() {
 
   result.colNames = join->colNames();
   VLOG(2) << node_->toString() << ", result: " << result;
-  return finish(ResultBuilder().value(Value(std::move(result))).finish());
+  return finish(ResultBuilder().value(Value(std::move(result))).build());
 }
 
 DataSet LeftJoinExecutor::probe(
diff --git a/src/graph/executor/query/LimitExecutor.cpp b/src/graph/executor/query/LimitExecutor.cpp
index 14b9feef5a9..9aafe590c37 100644
--- a/src/graph/executor/query/LimitExecutor.cpp
+++ b/src/graph/executor/query/LimitExecutor.cpp
@@ -32,7 +32,7 @@ folly::Future<Status> LimitExecutor::execute() {
     iter->eraseRange(0, offset);
   }
   builder.iter(std::move(result).iter());
-  return finish(builder.finish());
+  return finish(builder.build());
 }
 
 }  // namespace graph
diff --git a/src/graph/executor/query/MinusExecutor.cpp b/src/graph/executor/query/MinusExecutor.cpp
index 9fba84b037b..483dcb7d8d9 100644
--- a/src/graph/executor/query/MinusExecutor.cpp
+++ b/src/graph/executor/query/MinusExecutor.cpp
@@ -42,7 +42,7 @@ folly::Future<Status> MinusExecutor::execute() {
 
   ResultBuilder builder;
   builder.value(left.valuePtr()).iter(std::move(left).iter());
-  return finish(builder.finish());
+  return finish(builder.build());
 }
 
 }  // namespace graph
diff --git a/src/graph/executor/query/ProjectExecutor.cpp b/src/graph/executor/query/ProjectExecutor.cpp
index bd74918545e..c2c04b13bda 100644
--- a/src/graph/executor/query/ProjectExecutor.cpp
+++ b/src/graph/executor/query/ProjectExecutor.cpp
@@ -35,7 +35,7 @@ folly::Future<Status> ProjectExecutor::execute() {
     ds.rows.emplace_back(std::move(row));
   }
   VLOG(1) << node()->outputVar() << ":" << ds;
-  return finish(ResultBuilder().value(Value(std::move(ds))).finish());
+  return finish(ResultBuilder().value(Value(std::move(ds))).build());
 }
 
 }  // namespace graph
diff --git a/src/graph/executor/query/SortExecutor.cpp b/src/graph/executor/query/SortExecutor.cpp
index d5941fd689b..88b6e8ac233 100644
--- a/src/graph/executor/query/SortExecutor.cpp
+++ b/src/graph/executor/query/SortExecutor.cpp
@@ -48,7 +48,7 @@ folly::Future<Status> SortExecutor::execute() {
 
   auto seqIter = static_cast<SequentialIter *>(iter);
   std::sort(seqIter->begin(), seqIter->end(), comparator);
-  return finish(ResultBuilder().value(result.valuePtr()).iter(std::move(result).iter()).finish());
+  return finish(ResultBuilder().value(result.valuePtr()).iter(std::move(result).iter()).build());
 }
 
 }  // namespace graph
diff --git a/src/graph/executor/query/TopNExecutor.cpp b/src/graph/executor/query/TopNExecutor.cpp
index fed0ab8e494..af09aa6fada 100644
--- a/src/graph/executor/query/TopNExecutor.cpp
+++ b/src/graph/executor/query/TopNExecutor.cpp
@@ -60,12 +60,12 @@ folly::Future<Status> TopNExecutor::execute() {
   }
   if (heapSize_ == 0) {
     iter->clear();
-    return finish(ResultBuilder().value(result.valuePtr()).iter(std::move(result).iter()).finish());
+    return finish(ResultBuilder().value(result.valuePtr()).iter(std::move(result).iter()).build());
   }
 
   executeTopN<SequentialIter>(iter);
   iter->eraseRange(maxCount_, size);
-  return finish(ResultBuilder().value(result.valuePtr()).iter(std::move(result).iter()).finish());
+  return finish(ResultBuilder().value(result.valuePtr()).iter(std::move(result).iter()).build());
 }
 
 template <typename U>
diff --git a/src/graph/executor/query/UnionAllVersionVarExecutor.cpp b/src/graph/executor/query/UnionAllVersionVarExecutor.cpp
index 9ba31fc8626..fb885ccd44e 100644
--- a/src/graph/executor/query/UnionAllVersionVarExecutor.cpp
+++ b/src/graph/executor/query/UnionAllVersionVarExecutor.cpp
@@ -41,7 +41,7 @@ folly::Future<Status> UnionAllVersionVarExecutor::execute() {
 
   auto value = results[0].iter()->valuePtr();
   auto iter = std::make_unique<SequentialIter>(std::move(inputList));
-  return finish(ResultBuilder().value(value).iter(std::move(iter)).finish());
+  return finish(ResultBuilder().value(value).iter(std::move(iter)).build());
 }
 
 }  // namespace graph
diff --git a/src/graph/executor/query/UnionExecutor.cpp b/src/graph/executor/query/UnionExecutor.cpp
index 901e591cbb2..68d8d465725 100644
--- a/src/graph/executor/query/UnionExecutor.cpp
+++ b/src/graph/executor/query/UnionExecutor.cpp
@@ -35,7 +35,7 @@ folly::Future<Status> UnionExecutor::execute() {
                  std::make_move_iterator(rightIter->begin()),
                  std::make_move_iterator(rightIter->end()));
 
-  return finish(ResultBuilder().value(Value(std::move(ds))).finish());
+  return finish(ResultBuilder().value(Value(std::move(ds))).build());
 }
 
 }  // namespace graph
diff --git a/src/graph/executor/query/UnwindExecutor.cpp b/src/graph/executor/query/UnwindExecutor.cpp
index 000feda5713..8841c957b1a 100644
--- a/src/graph/executor/query/UnwindExecutor.cpp
+++ b/src/graph/executor/query/UnwindExecutor.cpp
@@ -39,7 +39,7 @@ folly::Future<Status> UnwindExecutor::execute() {
     }
   }
   VLOG(1) << "Unwind result is: " << ds;
-  return finish(ResultBuilder().value(Value(std::move(ds))).finish());
+  return finish(ResultBuilder().value(Value(std::move(ds))).build());
 }
 
 std::vector<Value> UnwindExecutor::extractList(const Value &val) {
diff --git a/src/graph/executor/test/AggregateTest.cpp b/src/graph/executor/test/AggregateTest.cpp
index c5da2386809..306ebcd81b7 100644
--- a/src/graph/executor/test/AggregateTest.cpp
+++ b/src/graph/executor/test/AggregateTest.cpp
@@ -60,7 +60,7 @@ class AggregateTest : public testing::Test {
     ds.rows.emplace_back(std::move(row));
 
     qctx_->symTable()->newVariable(*input_);
-    qctx_->ectx()->setResult(*input_, ResultBuilder().value(Value(ds)).finish());
+    qctx_->ectx()->setResult(*input_, ResultBuilder().value(Value(ds)).build());
   }
 
  protected:
diff --git a/src/graph/executor/test/BFSShortestTest.cpp b/src/graph/executor/test/BFSShortestTest.cpp
index f736e3ff37a..6c297215b92 100644
--- a/src/graph/executor/test/BFSShortestTest.cpp
+++ b/src/graph/executor/test/BFSShortestTest.cpp
@@ -100,7 +100,7 @@ class BFSShortestTest : public testing::Test {
       qctx_->symTable()->newVariable("empty_get_neighbors");
       qctx_->ectx()->setResult(
           "empty_get_neighbors",
-          ResultBuilder().value(Value(std::move(ds))).iter(Iterator::Kind::kGetNeighbors).finish());
+          ResultBuilder().value(Value(std::move(ds))).iter(Iterator::Kind::kGetNeighbors).build());
     }
   }
 
@@ -124,7 +124,7 @@ TEST_F(BFSShortestTest, BFSShortest) {
     List datasets;
     datasets.values.emplace_back(std::move(firstStepResult_));
     builder.value(std::move(datasets)).iter(Iterator::Kind::kGetNeighbors);
-    qctx_->ectx()->setResult("input", builder.finish());
+    qctx_->ectx()->setResult("input", builder.build());
 
     auto future = bfsExe->execute();
     auto status = std::move(future).get();
@@ -157,7 +157,7 @@ TEST_F(BFSShortestTest, BFSShortest) {
     List datasets;
     datasets.values.emplace_back(std::move(secondStepResult_));
     builder.value(std::move(datasets)).iter(Iterator::Kind::kGetNeighbors);
-    qctx_->ectx()->setResult("input", builder.finish());
+    qctx_->ectx()->setResult("input", builder.build());
 
     auto future = bfsExe->execute();
     auto status = std::move(future).get();
diff --git a/src/graph/executor/test/CartesianProductTest.cpp b/src/graph/executor/test/CartesianProductTest.cpp
index 4ba706d5f1a..d5cf994f83f 100644
--- a/src/graph/executor/test/CartesianProductTest.cpp
+++ b/src/graph/executor/test/CartesianProductTest.cpp
@@ -28,7 +28,7 @@ class CartesianProductTest : public testing::Test {
       var1->colNames = ds1.colNames;
       qctx_->ectx()->setResult(
           "ds1",
-          ResultBuilder().value(Value(std::move(ds1))).iter(Iterator::Kind::kSequential).finish());
+          ResultBuilder().value(Value(std::move(ds1))).iter(Iterator::Kind::kSequential).build());
 
       DataSet ds2;
       ds2.colNames = {kDst};
@@ -41,7 +41,7 @@ class CartesianProductTest : public testing::Test {
       var2->colNames = ds2.colNames;
       qctx_->ectx()->setResult(
           "ds2",
-          ResultBuilder().value(Value(std::move(ds2))).iter(Iterator::Kind::kSequential).finish());
+          ResultBuilder().value(Value(std::move(ds2))).iter(Iterator::Kind::kSequential).build());
 
       DataSet ds3;
       ds3.colNames = {"col1", "col2"};
@@ -55,7 +55,7 @@ class CartesianProductTest : public testing::Test {
       var3->colNames = ds3.colNames;
       qctx_->ectx()->setResult(
           "ds3",
-          ResultBuilder().value(Value(std::move(ds3))).iter(Iterator::Kind::kSequential).finish());
+          ResultBuilder().value(Value(std::move(ds3))).iter(Iterator::Kind::kSequential).build());
     }
   }
 
diff --git a/src/graph/executor/test/ConjunctPathTest.cpp b/src/graph/executor/test/ConjunctPathTest.cpp
index c1ab4af5544..18a0955363a 100644
--- a/src/graph/executor/test/ConjunctPathTest.cpp
+++ b/src/graph/executor/test/ConjunctPathTest.cpp
@@ -60,7 +60,7 @@ class ConjunctPathTest : public testing::Test {
           ds.rows.emplace_back(std::move(row));
         }
       }
-      qctx_->ectx()->setResult("conditionalVar", ResultBuilder().value(ds).finish());
+      qctx_->ectx()->setResult("conditionalVar", ResultBuilder().value(ds).build());
     }
     {
       DataSet ds;
@@ -131,7 +131,7 @@ class ConjunctPathTest : public testing::Test {
         row.values.emplace_back(std::move(paths));
         ds.rows.emplace_back(std::move(row));
       }
-      qctx_->ectx()->setResult("forwardPath1", ResultBuilder().value(ds).finish());
+      qctx_->ectx()->setResult("forwardPath1", ResultBuilder().value(ds).build());
     }
     {
       DataSet ds;
@@ -203,7 +203,7 @@ class ConjunctPathTest : public testing::Test {
         row.values.emplace_back(std::move(paths));
         ds.rows.emplace_back(std::move(row));
       }
-      qctx_->ectx()->setResult("forwardPath2", ResultBuilder().value(ds).finish());
+      qctx_->ectx()->setResult("forwardPath2", ResultBuilder().value(ds).build());
     }
     {
       DataSet ds;
@@ -299,7 +299,7 @@ class ConjunctPathTest : public testing::Test {
         row.values.emplace_back(std::move(paths));
         ds.rows.emplace_back(std::move(row));
       }
-      qctx_->ectx()->setResult("forwardPath3", ResultBuilder().value(ds).finish());
+      qctx_->ectx()->setResult("forwardPath3", ResultBuilder().value(ds).build());
     }
     // backward endVid {9, 12}
     {
@@ -315,7 +315,7 @@ class ConjunctPathTest : public testing::Test {
         row.values = {"12", Value::kEmpty, 0, Value::kEmpty};
         ds.rows.emplace_back(std::move(row));
       }
-      qctx_->ectx()->setResult("backwardPath1", ResultBuilder().value(ds).finish());
+      qctx_->ectx()->setResult("backwardPath1", ResultBuilder().value(ds).build());
 
       DataSet ds1;
       auto cost = 1;
@@ -346,8 +346,8 @@ class ConjunctPathTest : public testing::Test {
         row.values.emplace_back(std::move(paths));
         ds1.rows.emplace_back(std::move(row));
       }
-      qctx_->ectx()->setResult("backwardPath1", ResultBuilder().value(ds1).finish());
-      qctx_->ectx()->setResult("backwardPath2", ResultBuilder().value(ds1).finish());
+      qctx_->ectx()->setResult("backwardPath1", ResultBuilder().value(ds1).build());
+      qctx_->ectx()->setResult("backwardPath2", ResultBuilder().value(ds1).build());
     }
     {
       DataSet ds;
@@ -379,8 +379,8 @@ class ConjunctPathTest : public testing::Test {
         row.values.emplace_back(std::move(paths));
         ds.rows.emplace_back(std::move(row));
       }
-      qctx_->ectx()->setResult("backwardPath2", ResultBuilder().value(ds).finish());
-      qctx_->ectx()->setResult("backwardPath3", ResultBuilder().value(ds).finish());
+      qctx_->ectx()->setResult("backwardPath2", ResultBuilder().value(ds).build());
+      qctx_->ectx()->setResult("backwardPath3", ResultBuilder().value(ds).build());
     }
     {
       DataSet ds;
@@ -413,7 +413,7 @@ class ConjunctPathTest : public testing::Test {
         row.values.emplace_back(std::move(paths));
         ds.rows.emplace_back(std::move(row));
       }
-      qctx_->ectx()->setResult("backwardPath3", ResultBuilder().value(ds).finish());
+      qctx_->ectx()->setResult("backwardPath3", ResultBuilder().value(ds).build());
     }
   }
   void biBfsInit() {
@@ -432,7 +432,7 @@ class ConjunctPathTest : public testing::Test {
         row.values = {"1", Value::kEmpty};
         ds1.rows.emplace_back(std::move(row));
       }
-      qctx_->ectx()->setResult("forward1", ResultBuilder().value(ds1).finish());
+      qctx_->ectx()->setResult("forward1", ResultBuilder().value(ds1).build());
 
       DataSet ds2;
       ds2.colNames = {kVid, kEdgeStr};
@@ -446,7 +446,7 @@ class ConjunctPathTest : public testing::Test {
         row.values = {"3", Edge("1", "3", 1, "edge1", 0, {})};
         ds2.rows.emplace_back(std::move(row));
       }
-      qctx_->ectx()->setResult("forward1", ResultBuilder().value(ds2).finish());
+      qctx_->ectx()->setResult("forward1", ResultBuilder().value(ds2).build());
     }
     {
       // 4
@@ -457,11 +457,11 @@ class ConjunctPathTest : public testing::Test {
         row.values = {"4", Value::kEmpty};
         ds1.rows.emplace_back(std::move(row));
       }
-      qctx_->ectx()->setResult("backward1", ResultBuilder().value(ds1).finish());
+      qctx_->ectx()->setResult("backward1", ResultBuilder().value(ds1).build());
 
       DataSet ds2;
       ds2.colNames = {kVid, kEdgeStr};
-      qctx_->ectx()->setResult("backward1", ResultBuilder().value(ds2).finish());
+      qctx_->ectx()->setResult("backward1", ResultBuilder().value(ds2).build());
     }
     {
       // 2
@@ -472,11 +472,11 @@ class ConjunctPathTest : public testing::Test {
         row.values = {"2", Value::kEmpty};
         ds1.rows.emplace_back(std::move(row));
       }
-      qctx_->ectx()->setResult("backward2", ResultBuilder().value(ds1).finish());
+      qctx_->ectx()->setResult("backward2", ResultBuilder().value(ds1).build());
 
       DataSet ds2;
       ds2.colNames = {kVid, kEdgeStr};
-      qctx_->ectx()->setResult("backward2", ResultBuilder().value(ds2).finish());
+      qctx_->ectx()->setResult("backward2", ResultBuilder().value(ds2).build());
     }
     {
       // 4->3
@@ -487,7 +487,7 @@ class ConjunctPathTest : public testing::Test {
         row.values = {"4", Value::kEmpty};
         ds1.rows.emplace_back(std::move(row));
       }
-      qctx_->ectx()->setResult("backward3", ResultBuilder().value(ds1).finish());
+      qctx_->ectx()->setResult("backward3", ResultBuilder().value(ds1).build());
 
       DataSet ds2;
       ds2.colNames = {kVid, kEdgeStr};
@@ -496,7 +496,7 @@ class ConjunctPathTest : public testing::Test {
         row.values = {"3", Edge("4", "3", -1, "edge1", 0, {})};
         ds2.rows.emplace_back(std::move(row));
       }
-      qctx_->ectx()->setResult("backward3", ResultBuilder().value(ds2).finish());
+      qctx_->ectx()->setResult("backward3", ResultBuilder().value(ds2).build());
     }
     {
       // 5->4
@@ -507,7 +507,7 @@ class ConjunctPathTest : public testing::Test {
         row.values = {"5", Value::kEmpty};
         ds1.rows.emplace_back(std::move(row));
       }
-      qctx_->ectx()->setResult("backward4", ResultBuilder().value(ds1).finish());
+      qctx_->ectx()->setResult("backward4", ResultBuilder().value(ds1).build());
 
       DataSet ds2;
       ds2.colNames = {kVid, kEdgeStr};
@@ -516,7 +516,7 @@ class ConjunctPathTest : public testing::Test {
         row.values = {"4", Edge("5", "4", -1, "edge1", 0, {})};
         ds2.rows.emplace_back(std::move(row));
       }
-      qctx_->ectx()->setResult("backward4", ResultBuilder().value(ds2).finish());
+      qctx_->ectx()->setResult("backward4", ResultBuilder().value(ds2).build());
     }
   }
 
@@ -547,7 +547,7 @@ class ConjunctPathTest : public testing::Test {
         row.values = {"3", std::move(paths)};
         ds.rows.emplace_back(std::move(row));
       }
-      qctx_->ectx()->setResult("all_paths_forward1", ResultBuilder().value(ds).finish());
+      qctx_->ectx()->setResult("all_paths_forward1", ResultBuilder().value(ds).build());
     }
     {
       // 4->7
@@ -561,7 +561,7 @@ class ConjunctPathTest : public testing::Test {
         row.values = {"7", std::move(paths)};
         ds2.rows.emplace_back(std::move(row));
       }
-      qctx_->ectx()->setResult("all_paths_backward1", ResultBuilder().value(ds2).finish());
+      qctx_->ectx()->setResult("all_paths_backward1", ResultBuilder().value(ds2).build());
     }
     {
       // 2
@@ -576,7 +576,7 @@ class ConjunctPathTest : public testing::Test {
         row.values = {"2", std::move(paths)};
         ds1.rows.emplace_back(std::move(row));
       }
-      qctx_->ectx()->setResult("all_paths_backward2", ResultBuilder().value(ds1).finish());
+      qctx_->ectx()->setResult("all_paths_backward2", ResultBuilder().value(ds1).build());
 
       // 2->7
       DataSet ds2;
@@ -589,7 +589,7 @@ class ConjunctPathTest : public testing::Test {
         row.values = {"7", std::move(paths)};
         ds2.rows.emplace_back(std::move(row));
       }
-      qctx_->ectx()->setResult("all_paths_backward2", ResultBuilder().value(ds2).finish());
+      qctx_->ectx()->setResult("all_paths_backward2", ResultBuilder().value(ds2).build());
     }
     {
       // 4->3
@@ -603,7 +603,7 @@ class ConjunctPathTest : public testing::Test {
         row.values = {"3", std::move(paths)};
         ds2.rows.emplace_back(std::move(row));
       }
-      qctx_->ectx()->setResult("all_paths_backward3", ResultBuilder().value(ds2).finish());
+      qctx_->ectx()->setResult("all_paths_backward3", ResultBuilder().value(ds2).build());
     }
     {
       // 5->4
@@ -617,7 +617,7 @@ class ConjunctPathTest : public testing::Test {
         row.values = {"4", std::move(paths)};
         ds.rows.emplace_back(std::move(row));
       }
-      qctx_->ectx()->setResult("all_paths_backward4", ResultBuilder().value(ds).finish());
+      qctx_->ectx()->setResult("all_paths_backward4", ResultBuilder().value(ds).build());
     }
   }
 
@@ -753,7 +753,7 @@ TEST_F(ConjunctPathTest, BiBFSThreeStepsPath) {
         row.values = {"4", Edge("2", "4", 1, "edge1", 1, {})};
         ds1.rows.emplace_back(std::move(row));
       }
-      qctx_->ectx()->setResult("forward1", ResultBuilder().value(ds1).finish());
+      qctx_->ectx()->setResult("forward1", ResultBuilder().value(ds1).build());
     }
     {
       // 4->6@0
@@ -764,7 +764,7 @@ TEST_F(ConjunctPathTest, BiBFSThreeStepsPath) {
         row.values = {"6", Edge("4", "6", -1, "edge1", 0, {})};
         ds1.rows.emplace_back(std::move(row));
       }
-      qctx_->ectx()->setResult("backward4", ResultBuilder().value(ds1).finish());
+      qctx_->ectx()->setResult("backward4", ResultBuilder().value(ds1).build());
     }
     auto future = conjunctExe->execute();
     auto status = std::move(future).get();
@@ -835,7 +835,7 @@ TEST_F(ConjunctPathTest, BiBFSFourStepsPath) {
         row.values = {"6", Edge("2", "6", 1, "edge1", 1, {})};
         ds1.rows.emplace_back(std::move(row));
       }
-      qctx_->ectx()->setResult("forward1", ResultBuilder().value(ds1).finish());
+      qctx_->ectx()->setResult("forward1", ResultBuilder().value(ds1).build());
     }
     {
       // 4->6@0
@@ -846,7 +846,7 @@ TEST_F(ConjunctPathTest, BiBFSFourStepsPath) {
         row.values = {"6", Edge("4", "6", -1, "edge1", 0, {})};
         ds1.rows.emplace_back(std::move(row));
       }
-      qctx_->ectx()->setResult("backward4", ResultBuilder().value(ds1).finish());
+      qctx_->ectx()->setResult("backward4", ResultBuilder().value(ds1).build());
     }
     auto future = conjunctExe->execute();
     auto status = std::move(future).get();
@@ -997,7 +997,7 @@ TEST_F(ConjunctPathTest, AllPathsThreeStepsPath) {
       }
       row.values = {"4", std::move(paths)};
       ds1.rows.emplace_back(std::move(row));
-      qctx_->ectx()->setResult("all_paths_forward1", ResultBuilder().value(ds1).finish());
+      qctx_->ectx()->setResult("all_paths_forward1", ResultBuilder().value(ds1).build());
     }
     auto future = conjunctExe->execute();
     auto status = std::move(future).get();
@@ -1074,7 +1074,7 @@ TEST_F(ConjunctPathTest, AllPathsFourStepsPath) {
       }
       row.values = {"6", std::move(paths)};
       ds1.rows.emplace_back(std::move(row));
-      qctx_->ectx()->setResult("all_paths_forward1", ResultBuilder().value(ds1).finish());
+      qctx_->ectx()->setResult("all_paths_forward1", ResultBuilder().value(ds1).build());
     }
     {
       // 5->4->6@0
@@ -1092,7 +1092,7 @@ TEST_F(ConjunctPathTest, AllPathsFourStepsPath) {
       }
       row.values = {"6", std::move(paths)};
       ds1.rows.emplace_back(std::move(row));
-      qctx_->ectx()->setResult("all_paths_backward4", ResultBuilder().value(ds1).finish());
+      qctx_->ectx()->setResult("all_paths_backward4", ResultBuilder().value(ds1).build());
     }
     auto future = conjunctExe->execute();
     auto status = std::move(future).get();
diff --git a/src/graph/executor/test/DataCollectTest.cpp b/src/graph/executor/test/DataCollectTest.cpp
index 10e0b638a14..fc5597a0c5c 100644
--- a/src/graph/executor/test/DataCollectTest.cpp
+++ b/src/graph/executor/test/DataCollectTest.cpp
@@ -85,12 +85,10 @@ class DataCollectTest : public testing::Test {
       ResultBuilder builder;
       builder.value(Value(std::move(datasets))).iter(Iterator::Kind::kGetNeighbors);
       qctx_->symTable()->newVariable("input_datasets");
-      qctx_->ectx()->setResult("input_datasets", builder.finish());
-      qctx_->ectx()->setResult("input_datasets",
-                               ResultBuilder()
-                                   .value(Value(std::move(ds2)))
-                                   .iter(Iterator::Kind::kGetNeighbors)
-                                   .finish());
+      qctx_->ectx()->setResult("input_datasets", builder.build());
+      qctx_->ectx()->setResult(
+          "input_datasets",
+          ResultBuilder().value(Value(std::move(ds2))).iter(Iterator::Kind::kGetNeighbors).build());
     }
     {
       DataSet ds;
@@ -103,7 +101,7 @@ class DataCollectTest : public testing::Test {
       }
       qctx_->symTable()->newVariable("input_sequential");
       qctx_->ectx()->setResult("input_sequential",
-                               ResultBuilder().value(Value(std::move(ds))).finish());
+                               ResultBuilder().value(Value(std::move(ds))).build());
     }
     {
       DataSet ds;
@@ -112,10 +110,10 @@ class DataCollectTest : public testing::Test {
       qctx_->symTable()->newVariable("empty_get_neighbors");
       qctx_->ectx()->setResult(
           "empty_get_neighbors",
-          ResultBuilder().value(Value(ds)).iter(Iterator::Kind::kGetNeighbors).finish());
+          ResultBuilder().value(Value(ds)).iter(Iterator::Kind::kGetNeighbors).build());
       qctx_->ectx()->setResult(
           "empty_get_neighbors",
-          ResultBuilder().value(Value(std::move(ds))).iter(Iterator::Kind::kGetNeighbors).finish());
+          ResultBuilder().value(Value(std::move(ds))).iter(Iterator::Kind::kGetNeighbors).build());
     }
     {
       // for path with prop
@@ -132,7 +130,7 @@ class DataCollectTest : public testing::Test {
       qctx_->symTable()->newVariable("vertices");
       qctx_->ectx()->setResult(
           "vertices",
-          ResultBuilder().value(Value(std::move(vertices))).iter(Iterator::Kind::kProp).finish());
+          ResultBuilder().value(Value(std::move(vertices))).iter(Iterator::Kind::kProp).build());
       DataSet edges;
       edges.colNames = {"like._src", "like._dst", "like._rank", "like._type", "like.likeness"};
       Row edge;
@@ -145,7 +143,7 @@ class DataCollectTest : public testing::Test {
       qctx_->symTable()->newVariable("edges");
       qctx_->ectx()->setResult(
           "edges",
-          ResultBuilder().value(Value(std::move(edges))).iter(Iterator::Kind::kProp).finish());
+          ResultBuilder().value(Value(std::move(edges))).iter(Iterator::Kind::kProp).build());
 
       DataSet paths;
       paths.colNames = {"paths"};
@@ -157,7 +155,7 @@ class DataCollectTest : public testing::Test {
       row.values.emplace_back(std::move(path));
       paths.rows.emplace_back(std::move(row));
       qctx_->symTable()->newVariable("paths");
-      qctx_->ectx()->setResult("paths", ResultBuilder().value(Value(std::move(paths))).finish());
+      qctx_->ectx()->setResult("paths", ResultBuilder().value(Value(std::move(paths))).build());
     }
   }
 
diff --git a/src/graph/executor/test/GetNeighborsTest.cpp b/src/graph/executor/test/GetNeighborsTest.cpp
index 0713b9ac31e..cf26ce1ce52 100644
--- a/src/graph/executor/test/GetNeighborsTest.cpp
+++ b/src/graph/executor/test/GetNeighborsTest.cpp
@@ -28,7 +28,7 @@ class GetNeighborsTest : public testing::Test {
       ResultBuilder builder;
       builder.value(Value(std::move(ds)));
       qctx_->symTable()->newVariable("input_gn");
-      qctx_->ectx()->setResult("input_gn", builder.finish());
+      qctx_->ectx()->setResult("input_gn", builder.build());
     }
 
     meta::cpp2::Session session;
diff --git a/src/graph/executor/test/JoinTest.cpp b/src/graph/executor/test/JoinTest.cpp
index b01a0f47e2f..3f8a69e30f3 100644
--- a/src/graph/executor/test/JoinTest.cpp
+++ b/src/graph/executor/test/JoinTest.cpp
@@ -34,7 +34,7 @@ class JoinTest : public QueryTestBase {
         ds.rows.emplace_back(std::move(row));
       }
       qctx_->symTable()->newVariable("var1");
-      qctx_->ectx()->setResult("var1", ResultBuilder().value(Value(std::move(ds))).finish());
+      qctx_->ectx()->setResult("var1", ResultBuilder().value(Value(std::move(ds))).build());
     }
     {
       DataSet ds;
@@ -46,7 +46,7 @@ class JoinTest : public QueryTestBase {
         ds.rows.emplace_back(std::move(row));
       }
       qctx_->symTable()->newVariable("var2");
-      qctx_->ectx()->setResult("var2", ResultBuilder().value(Value(std::move(ds))).finish());
+      qctx_->ectx()->setResult("var2", ResultBuilder().value(Value(std::move(ds))).build());
     }
     {
       DataSet ds;
@@ -55,19 +55,19 @@ class JoinTest : public QueryTestBase {
       row.values.emplace_back("11");
       ds.rows.emplace_back(std::move(row));
       qctx_->symTable()->newVariable("var3");
-      qctx_->ectx()->setResult("var3", ResultBuilder().value(Value(std::move(ds))).finish());
+      qctx_->ectx()->setResult("var3", ResultBuilder().value(Value(std::move(ds))).build());
     }
     {
       DataSet ds;
       ds.colNames = {kVid, "tag_prop", "edge_prop", kDst};
       qctx_->symTable()->newVariable("empty_var1");
-      qctx_->ectx()->setResult("empty_var1", ResultBuilder().value(Value(std::move(ds))).finish());
+      qctx_->ectx()->setResult("empty_var1", ResultBuilder().value(Value(std::move(ds))).build());
     }
     {
       DataSet ds;
       ds.colNames = {"src", "dst"};
       qctx_->symTable()->newVariable("empty_var2");
-      qctx_->ectx()->setResult("empty_var2", ResultBuilder().value(Value(std::move(ds))).finish());
+      qctx_->ectx()->setResult("empty_var2", ResultBuilder().value(Value(std::move(ds))).build());
     }
   }
 
diff --git a/src/graph/executor/test/ProduceAllPathsTest.cpp b/src/graph/executor/test/ProduceAllPathsTest.cpp
index b25bd6fe7a6..40b5a162b7d 100644
--- a/src/graph/executor/test/ProduceAllPathsTest.cpp
+++ b/src/graph/executor/test/ProduceAllPathsTest.cpp
@@ -213,7 +213,7 @@ class ProduceAllPathsTest : public testing::Test {
                                  ResultBuilder()
                                      .value(Value(std::move(ds)))
                                      .iter(Iterator::Kind::kGetNeighbors)
-                                     .finish());
+                                     .build());
       }
     }
   }
@@ -240,7 +240,7 @@ TEST_F(ProduceAllPathsTest, AllPath) {
     List datasets;
     datasets.values.emplace_back(std::move(firstStepResult_));
     builder.value(std::move(datasets)).iter(Iterator::Kind::kGetNeighbors);
-    qctx_->ectx()->setResult("input", builder.finish());
+    qctx_->ectx()->setResult("input", builder.build());
 
     auto future = allPathsExe->execute();
     auto status = std::move(future).get();
@@ -321,7 +321,7 @@ TEST_F(ProduceAllPathsTest, AllPath) {
     List datasets;
     datasets.values.emplace_back(std::move(secondStepResult_));
     builder.value(std::move(datasets)).iter(Iterator::Kind::kGetNeighbors);
-    qctx_->ectx()->setResult("input", builder.finish());
+    qctx_->ectx()->setResult("input", builder.build());
 
     auto future = allPathsExe->execute();
     auto status = std::move(future).get();
@@ -411,7 +411,7 @@ TEST_F(ProduceAllPathsTest, AllPath) {
     List datasets;
     datasets.values.emplace_back(std::move(thridStepResult_));
     builder.value(std::move(datasets)).iter(Iterator::Kind::kGetNeighbors);
-    qctx_->ectx()->setResult("input", builder.finish());
+    qctx_->ectx()->setResult("input", builder.build());
 
     auto future = allPathsExe->execute();
     auto status = std::move(future).get();
diff --git a/src/graph/executor/test/ProduceSemiShortestPathTest.cpp b/src/graph/executor/test/ProduceSemiShortestPathTest.cpp
index 1a7599cf4fd..d310544c001 100644
--- a/src/graph/executor/test/ProduceSemiShortestPathTest.cpp
+++ b/src/graph/executor/test/ProduceSemiShortestPathTest.cpp
@@ -207,7 +207,7 @@ class ProduceSemiShortestPathTest : public testing::Test {
                                  ResultBuilder()
                                      .value(Value(std::move(ds)))
                                      .iter(Iterator::Kind::kGetNeighbors)
-                                     .finish());
+                                     .build());
       }
     }
   }
@@ -233,7 +233,7 @@ TEST_F(ProduceSemiShortestPathTest, ShortestPath) {
     List datasets;
     datasets.values.emplace_back(std::move(firstStepResult_));
     builder.value(std::move(datasets)).iter(Iterator::Kind::kGetNeighbors);
-    qctx_->ectx()->setResult("input", builder.finish());
+    qctx_->ectx()->setResult("input", builder.build());
 
     auto future = psspExe->execute();
     auto status = std::move(future).get();
@@ -332,7 +332,7 @@ TEST_F(ProduceSemiShortestPathTest, ShortestPath) {
     List datasets;
     datasets.values.emplace_back(std::move(secondStepResult_));
     builder.value(std::move(datasets)).iter(Iterator::Kind::kGetNeighbors);
-    qctx_->ectx()->setResult("input", builder.finish());
+    qctx_->ectx()->setResult("input", builder.build());
 
     auto future = psspExe->execute();
     auto status = std::move(future).get();
@@ -444,7 +444,7 @@ TEST_F(ProduceSemiShortestPathTest, ShortestPath) {
     List datasets;
     datasets.values.emplace_back(std::move(thridStepResult_));
     builder.value(std::move(datasets)).iter(Iterator::Kind::kGetNeighbors);
-    qctx_->ectx()->setResult("input", builder.finish());
+    qctx_->ectx()->setResult("input", builder.build());
 
     auto future = psspExe->execute();
     auto status = std::move(future).get();
diff --git a/src/graph/executor/test/ProjectTest.cpp b/src/graph/executor/test/ProjectTest.cpp
index e5a59fb72d4..341873aa4fa 100644
--- a/src/graph/executor/test/ProjectTest.cpp
+++ b/src/graph/executor/test/ProjectTest.cpp
@@ -33,7 +33,7 @@ class ProjectTest : public QueryTestBase {
       ResultBuilder builder;
       builder.value(Value(std::move(ds)));
       qctx_->symTable()->newVariable("input_project");
-      qctx_->ectx()->setResult("input_project", builder.finish());
+      qctx_->ectx()->setResult("input_project", builder.build());
     }
     {
       DataSet ds;
@@ -41,7 +41,7 @@ class ProjectTest : public QueryTestBase {
       ResultBuilder builder;
       builder.value(Value(std::move(ds)));
       qctx_->symTable()->newVariable("empty");
-      qctx_->ectx()->setResult("empty", builder.finish());
+      qctx_->ectx()->setResult("empty", builder.build());
     }
   }
 
diff --git a/src/graph/executor/test/QueryTestBase.h b/src/graph/executor/test/QueryTestBase.h
index da1e9f4768c..ab3eed85825 100644
--- a/src/graph/executor/test/QueryTestBase.h
+++ b/src/graph/executor/test/QueryTestBase.h
@@ -77,7 +77,7 @@ class QueryTestBase : public testing::Test {
       List datasetList;
       datasetList.values.emplace_back(std::move(dataset));
       auto result =
-          ResultBuilder().value(Value(datasetList)).iter(Iterator::Kind::kGetNeighbors).finish();
+          ResultBuilder().value(Value(datasetList)).iter(Iterator::Kind::kGetNeighbors).build();
       qctx_->symTable()->newVariable("input_neighbor");
       qctx_->ectx()->setResult("input_neighbor", std::move(result));
     }
@@ -91,7 +91,7 @@ class QueryTestBase : public testing::Test {
       dataset.emplace_back(Row({"Ann", "Ann", 18, "School1", 2010, 2014}));
       dataset.emplace_back(Row({"Lily", "Lily", 20, "School2", 2009, 2012}));
       qctx_->symTable()->newVariable("input_sequential");
-      qctx_->ectx()->setResult("input_sequential", ResultBuilder().value(Value(dataset)).finish());
+      qctx_->ectx()->setResult("input_sequential", ResultBuilder().value(Value(dataset)).build());
     }
     // sequential init by two sequentialIters
     {
@@ -101,12 +101,12 @@ class QueryTestBase : public testing::Test {
       lds.emplace_back(Row({"Tom", "Tom", 20, "School2", 2008, 2012}));
       lds.emplace_back(Row({"Kate", "Kate", 19, "School2", 2009, 2013}));
       qctx_->symTable()->newVariable("left_neighbor");
-      qctx_->ectx()->setResult("left_sequential", ResultBuilder().value(Value(lds)).finish());
+      qctx_->ectx()->setResult("left_sequential", ResultBuilder().value(Value(lds)).build());
 
       DataSet rds({"vid", "v_name", "v_age", "v_dst", "e_start_year", "e_end_year"});
       rds.emplace_back(Row({"Ann", "Ann", 18, "School1", 2010, 2014}));
       rds.emplace_back(Row({"Lily", "Lily", 20, "School2", 2009, 2012}));
-      qctx_->ectx()->setResult("right_sequential", ResultBuilder().value(Value(rds)).finish());
+      qctx_->ectx()->setResult("right_sequential", ResultBuilder().value(Value(rds)).build());
 
       auto lIter = qctx_->ectx()->getResult("left_sequential").iter();
       auto rIter = qctx_->ectx()->getResult("right_sequential").iter();
@@ -114,7 +114,7 @@ class QueryTestBase : public testing::Test {
       builder.value(lIter->valuePtr())
           .iter(std::make_unique<SequentialIter>(std::move(lIter), std::move(rIter)));
       qctx_->symTable()->newVariable("union_sequential");
-      qctx_->ectx()->setResult("union_sequential", builder.finish());
+      qctx_->ectx()->setResult("union_sequential", builder.build());
     }
     // empty
     {
@@ -124,7 +124,7 @@ class QueryTestBase : public testing::Test {
                        "_edge:+study:_dst:start_year:end_year",
                        "_expr"});
       qctx_->symTable()->newVariable("empty");
-      qctx_->ectx()->setResult("empty", ResultBuilder().value(Value(dataset)).finish());
+      qctx_->ectx()->setResult("empty", ResultBuilder().value(Value(dataset)).build());
     }
   }
 
diff --git a/src/graph/executor/test/SetExecutorTest.cpp b/src/graph/executor/test/SetExecutorTest.cpp
index a007b67179b..16d90d08082 100644
--- a/src/graph/executor/test/SetExecutorTest.cpp
+++ b/src/graph/executor/test/SetExecutorTest.cpp
@@ -60,8 +60,8 @@ TEST_F(SetExecutorTest, TestUnionAll) {
     lb.value(Value(lds)).iter(Iterator::Kind::kSequential);
     rb.value(Value(rds)).iter(Iterator::Kind::kSequential);
     // Must save the values after constructing executors
-    qctx_->ectx()->setResult(left->outputVar(), lb.finish());
-    qctx_->ectx()->setResult(right->outputVar(), rb.finish());
+    qctx_->ectx()->setResult(left->outputVar(), lb.build());
+    qctx_->ectx()->setResult(right->outputVar(), rb.build());
     auto future = unionExecutor->execute();
     EXPECT_TRUE(std::move(future).get().ok());
 
@@ -176,8 +176,8 @@ TEST_F(SetExecutorTest, TestGetNeighobrsIterator) {
   ResultBuilder lrb, rrb;
   auto& lRes = lrb.value(Value(std::move(lds))).iter(Iterator::Kind::kGetNeighbors);
   auto& rRes = rrb.value(Value(std::move(rds)));
-  qctx_->ectx()->setResult(left->outputVar(), lRes.finish());
-  qctx_->ectx()->setResult(right->outputVar(), rRes.finish());
+  qctx_->ectx()->setResult(left->outputVar(), lRes.build());
+  qctx_->ectx()->setResult(right->outputVar(), rRes.build());
   auto future = unionExecutor->execute();
   auto status = std::move(future).get();
 
@@ -251,8 +251,8 @@ TEST_F(SetExecutorTest, TestIntersect) {
     lb.value(Value(lds)).iter(Iterator::Kind::kSequential);
     rb.value(Value(rds)).iter(Iterator::Kind::kSequential);
     auto executor = Executor::create(intersect, qctx_.get());
-    qctx_->ectx()->setResult(left->outputVar(), lb.finish());
-    qctx_->ectx()->setResult(right->outputVar(), rb.finish());
+    qctx_->ectx()->setResult(left->outputVar(), lb.build());
+    qctx_->ectx()->setResult(right->outputVar(), rb.build());
 
     auto fut = executor->execute();
     auto status = std::move(fut).get();
@@ -358,8 +358,8 @@ TEST_F(SetExecutorTest, TestMinus) {
     lb.value(Value(lds)).iter(Iterator::Kind::kSequential);
     rb.value(Value(rds)).iter(Iterator::Kind::kSequential);
     auto executor = Executor::create(minus, qctx_.get());
-    qctx_->ectx()->setResult(left->outputVar(), lb.finish());
-    qctx_->ectx()->setResult(right->outputVar(), rb.finish());
+    qctx_->ectx()->setResult(left->outputVar(), lb.build());
+    qctx_->ectx()->setResult(right->outputVar(), rb.build());
 
     auto fut = executor->execute();
     auto status = std::move(fut).get();
diff --git a/src/graph/planner/match/VertexIdSeek.cpp b/src/graph/planner/match/VertexIdSeek.cpp
index 07cd8b7110f..9ef83e9d431 100644
--- a/src/graph/planner/match/VertexIdSeek.cpp
+++ b/src/graph/planner/match/VertexIdSeek.cpp
@@ -63,7 +63,7 @@ std::pair<std::string, Expression *> VertexIdSeek::listToAnnoVarVid(QueryContext
     vids.emplace_back(Row({std::move(v)}));
   }
 
-  qctx->ectx()->setResult(input, ResultBuilder().value(Value(std::move(vids))).finish());
+  qctx->ectx()->setResult(input, ResultBuilder().value(Value(std::move(vids))).build());
 
   auto *pool = qctx->objPool();
   auto *src = VariablePropertyExpression::make(pool, input, kVid);
@@ -77,7 +77,7 @@ std::pair<std::string, Expression *> VertexIdSeek::constToAnnoVarVid(QueryContex
   QueryExpressionContext dummy;
   vids.emplace_back(Row({v}));
 
-  qctx->ectx()->setResult(input, ResultBuilder().value(Value(std::move(vids))).finish());
+  qctx->ectx()->setResult(input, ResultBuilder().value(Value(std::move(vids))).build());
 
   auto *pool = qctx->objPool();
   auto *src = VariablePropertyExpression::make(pool, input, kVid);
diff --git a/src/graph/planner/ngql/PathPlanner.cpp b/src/graph/planner/ngql/PathPlanner.cpp
index 3ddefc0171e..4509e20e4b8 100644
--- a/src/graph/planner/ngql/PathPlanner.cpp
+++ b/src/graph/planner/ngql/PathPlanner.cpp
@@ -254,7 +254,7 @@ PlanNode* PathPlanner::singlePairPath(PlanNode* dep, bool reverse) {
   row.values.emplace_back(starts.vids.front());
   row.values.emplace_back(Value::kEmpty);
   ds.rows.emplace_back(std::move(row));
-  qctx->ectx()->setResult(vidsVar, ResultBuilder().value(Value(std::move(ds))).finish());
+  qctx->ectx()->setResult(vidsVar, ResultBuilder().value(Value(std::move(ds))).build());
   return path;
 }
 
diff --git a/src/graph/util/QueryUtil.cpp b/src/graph/util/QueryUtil.cpp
index fa0ccfa5e9b..7c542aaa19a 100644
--- a/src/graph/util/QueryUtil.cpp
+++ b/src/graph/util/QueryUtil.cpp
@@ -26,7 +26,7 @@ void QueryUtil::buildConstantInput(QueryContext* qctx, Starts& starts, std::stri
     row.values.emplace_back(vid);
     ds.rows.emplace_back(std::move(row));
   }
-  qctx->ectx()->setResult(vidsVar, ResultBuilder().value(Value(std::move(ds))).finish());
+  qctx->ectx()->setResult(vidsVar, ResultBuilder().value(Value(std::move(ds))).build());
   auto* pool = qctx->objPool();
   // If possible, use column numbers in preference to column names,
   starts.src = ColumnExpression::make(pool, 0);
diff --git a/src/graph/validator/FetchEdgesValidator.cpp b/src/graph/validator/FetchEdgesValidator.cpp
index 01603434538..5909e1bbc4a 100644
--- a/src/graph/validator/FetchEdgesValidator.cpp
+++ b/src/graph/validator/FetchEdgesValidator.cpp
@@ -262,7 +262,7 @@ const Expression *FetchEdgesValidator::findInvalidYieldExpression(const Expressi
 std::string FetchEdgesValidator::buildConstantInput() {
   auto pool = qctx_->objPool();
   auto input = vctx_->anonVarGen()->getVar();
-  qctx_->ectx()->setResult(input, ResultBuilder().value(Value(std::move(edgeKeys_))).finish());
+  qctx_->ectx()->setResult(input, ResultBuilder().value(Value(std::move(edgeKeys_))).build());
 
   src_ = VariablePropertyExpression::make(pool, input, kSrc);
   type_ = ConstantExpression::make(pool, edgeType_);
diff --git a/src/graph/validator/FetchVerticesValidator.cpp b/src/graph/validator/FetchVerticesValidator.cpp
index 0625f88c7fc..fc72408d85c 100644
--- a/src/graph/validator/FetchVerticesValidator.cpp
+++ b/src/graph/validator/FetchVerticesValidator.cpp
@@ -238,7 +238,7 @@ Status FetchVerticesValidator::preparePropertiesWithoutYield() {
 // TODO(shylock) optimize dedup input when distinct given
 std::string FetchVerticesValidator::buildConstantInput() {
   auto input = vctx_->anonVarGen()->getVar();
-  qctx_->ectx()->setResult(input, ResultBuilder().value(Value(std::move(srcVids_))).finish());
+  qctx_->ectx()->setResult(input, ResultBuilder().value(Value(std::move(srcVids_))).build());
 
   auto *pool = qctx_->objPool();
   src_ = VariablePropertyExpression::make(pool, input, kVid);
diff --git a/src/graph/validator/MutateValidator.cpp b/src/graph/validator/MutateValidator.cpp
index e98701f29fa..a99edceadb5 100644
--- a/src/graph/validator/MutateValidator.cpp
+++ b/src/graph/validator/MutateValidator.cpp
@@ -299,7 +299,7 @@ std::string DeleteVerticesValidator::buildVIds() {
     row.values.emplace_back(vid);
     ds.rows.emplace_back(std::move(row));
   }
-  qctx_->ectx()->setResult(input, ResultBuilder().value(Value(std::move(ds))).finish());
+  qctx_->ectx()->setResult(input, ResultBuilder().value(Value(std::move(ds))).build());
   auto *pool = qctx_->objPool();
   auto *vIds = VariablePropertyExpression::make(pool, input, kVid);
   vidRef_ = vIds;
@@ -436,7 +436,7 @@ std::string DeleteTagsValidator::buildVIds() {
     row.values.emplace_back(vid);
     ds.rows.emplace_back(std::move(row));
   }
-  qctx_->ectx()->setResult(input, ResultBuilder().value(Value(std::move(ds))).finish());
+  qctx_->ectx()->setResult(input, ResultBuilder().value(Value(std::move(ds))).build());
   auto *pool = qctx_->objPool();
   auto *vIds = VariablePropertyExpression::make(pool, input, kVid);
   vidRef_ = vIds;
@@ -499,7 +499,7 @@ Status DeleteEdgesValidator::buildEdgeKeyRef(const std::vector<EdgeKey *> &edgeK
     row.emplace_back(std::move(dstId));
     ds.emplace_back(std::move(row));
   }
-  qctx_->ectx()->setResult(edgeKeyVar_, ResultBuilder().value(Value(std::move(ds))).finish());
+  qctx_->ectx()->setResult(edgeKeyVar_, ResultBuilder().value(Value(std::move(ds))).build());
   auto *pool = qctx_->objPool();
   auto *srcIdExpr = InputPropertyExpression::make(pool, kSrc);
   auto *typeExpr = InputPropertyExpression::make(pool, kType);
diff --git a/src/interface/meta.thrift b/src/interface/meta.thrift
index 72306179167..c6a6b82c505 100644
--- a/src/interface/meta.thrift
+++ b/src/interface/meta.thrift
@@ -305,7 +305,7 @@ struct Correlativity {
     2: double             proportion,
 }
 
-struct StatisItem {
+struct StatsItem {
     // The number of vertices of tagName
     1: map<binary, i64>
         (cpp.template = "std::unordered_map") tag_vertices,
@@ -959,15 +959,15 @@ struct ListListenerResp {
     3: list<ListenerInfo>      listeners,
 }
 
-struct GetStatisReq {
+struct GetStatsReq {
     1: common.GraphSpaceID     space_id,
 }
 
-struct GetStatisResp {
+struct GetStatsResp {
     1: common.ErrorCode code,
     // Valid if ret equals E_LEADER_CHANGED.
     2: common.HostAddr  leader,
-    3: StatisItem       statis,
+    3: StatsItem        stats,
 }
 
 struct BackupInfo {
@@ -1148,7 +1148,7 @@ struct ReportTaskReq {
     1: common.ErrorCode     code,
     2: i32                  job_id,
     3: i32                  task_id,
-    4: optional StatisItem  statis
+    4: optional StatsItem   stats
 }
 
 struct ListClusterInfoResp {
@@ -1257,7 +1257,7 @@ service MetaService {
     ExecResp       removeListener(1: RemoveListenerReq req);
     ListListenerResp listListener(1: ListListenerReq req);
 
-    GetStatisResp  getStatis(1: GetStatisReq req);
+    GetStatsResp  getStats(1: GetStatsReq req);
     ExecResp signInFTService(1: SignInFTServiceReq req);
     ExecResp signOutFTService(1: SignOutFTServiceReq req);
     ListFTClientsResp listFTClients(1: ListFTClientsReq req);
diff --git a/src/interface/storage.thrift b/src/interface/storage.thrift
index a32586f0bd3..7e70531f369 100644
--- a/src/interface/storage.thrift
+++ b/src/interface/storage.thrift
@@ -655,7 +655,7 @@ service GraphStorageService {
 // Common response for admin methods
 struct AdminExecResp {
     1: required ResponseCommon   result,
-    2: optional meta.StatisItem  statis,
+    2: optional meta.StatsItem  stats,
 }
 
 
diff --git a/src/meta/CMakeLists.txt b/src/meta/CMakeLists.txt
index 5870f0c12af..a52603be180 100644
--- a/src/meta/CMakeLists.txt
+++ b/src/meta/CMakeLists.txt
@@ -78,8 +78,8 @@ nebula_add_library(
     processors/job/RebuildTagJobExecutor.cpp
     processors/job/RebuildEdgeJobExecutor.cpp
     processors/job/RebuildFTJobExecutor.cpp
-    processors/job/StatisJobExecutor.cpp
-    processors/job/GetStatisProcessor.cpp
+    processors/job/StatsJobExecutor.cpp
+    processors/job/GetStatsProcessor.cpp
     processors/job/ListTagIndexStatusProcessor.cpp
     processors/job/ListEdgeIndexStatusProcessor.cpp
     processors/zone/AddZoneProcessor.cpp
diff --git a/src/meta/MetaServiceHandler.cpp b/src/meta/MetaServiceHandler.cpp
index 85f1fb5ad84..2ceec503ded 100644
--- a/src/meta/MetaServiceHandler.cpp
+++ b/src/meta/MetaServiceHandler.cpp
@@ -32,7 +32,7 @@
 #include "meta/processors/index/ListEdgeIndexesProcessor.h"
 #include "meta/processors/index/ListTagIndexesProcessor.h"
 #include "meta/processors/job/AdminJobProcessor.h"
-#include "meta/processors/job/GetStatisProcessor.h"
+#include "meta/processors/job/GetStatsProcessor.h"
 #include "meta/processors/job/ListEdgeIndexStatusProcessor.h"
 #include "meta/processors/job/ListTagIndexStatusProcessor.h"
 #include "meta/processors/job/ReportTaskProcessor.h"
@@ -519,9 +519,9 @@ folly::Future<cpp2::ExecResp> MetaServiceHandler::future_restoreMeta(
   RETURN_FUTURE(processor);
 }
 
-folly::Future<cpp2::GetStatisResp> MetaServiceHandler::future_getStatis(
-    const cpp2::GetStatisReq& req) {
-  auto* processor = GetStatisProcessor::instance(kvstore_);
+folly::Future<cpp2::GetStatsResp> MetaServiceHandler::future_getStats(
+    const cpp2::GetStatsReq& req) {
+  auto* processor = GetStatsProcessor::instance(kvstore_);
   RETURN_FUTURE(processor);
 }
 
diff --git a/src/meta/MetaServiceHandler.h b/src/meta/MetaServiceHandler.h
index 1d798c2c8fa..2a6919e99b1 100644
--- a/src/meta/MetaServiceHandler.h
+++ b/src/meta/MetaServiceHandler.h
@@ -217,7 +217,7 @@ class MetaServiceHandler final : public cpp2::MetaServiceSvIf {
 
   folly::Future<cpp2::ExecResp> future_restoreMeta(const cpp2::RestoreMetaReq& req) override;
 
-  folly::Future<cpp2::GetStatisResp> future_getStatis(const cpp2::GetStatisReq& req) override;
+  folly::Future<cpp2::GetStatsResp> future_getStats(const cpp2::GetStatsReq& req) override;
 
   folly::Future<cpp2::ExecResp> future_reportTaskFinish(const cpp2::ReportTaskReq& req) override;
 
diff --git a/src/meta/MetaServiceUtils.cpp b/src/meta/MetaServiceUtils.cpp
index 6221b889260..6f85d621099 100644
--- a/src/meta/MetaServiceUtils.cpp
+++ b/src/meta/MetaServiceUtils.cpp
@@ -31,8 +31,7 @@ static const std::unordered_map<std::string, std::pair<std::string, bool>> syste
     {"sessions", {"__sessions__", true}},
     {"id", {"__id__", true}}};
 
-// name => {prefix, parseSpaceid}, nullptr means that the backup should be
-// skipped.
+// name => {prefix, parseSpaceid}, nullptr means that the backup should be skipped.
 static const std::unordered_map<
     std::string,
     std::pair<std::string, std::function<decltype(MetaServiceUtils::spaceId)>>>
@@ -50,7 +49,7 @@ static const std::unordered_map<
         {"leaders", {"__leaders__", nullptr}},
         {"leader_terms", {"__leader_terms__", nullptr}},
         {"listener", {"__listener__", nullptr}},
-        {"statis", {"__statis__", MetaServiceUtils::parseStatisSpace}},
+        {"stats", {"__stats__", MetaServiceUtils::parseStatsSpace}},
         {"balance_task", {"__balance_task__", nullptr}},
         {"balance_plan", {"__balance_plan__", nullptr}},
         {"ft_index", {"__ft_index__", nullptr}}};
@@ -78,7 +77,7 @@ static const std::string kListenerTable       = tableMaps.at("listener").first;
 // Used to record the number of vertices and edges in the space
 // The number of vertices of each tag in the space
 // The number of edges of each edgetype in the space
-static const std::string kStatisTable         = tableMaps.at("statis").first;           // NOLINT
+static const std::string kStatsTable          = tableMaps.at("stats").first;            // NOLINT
 static const std::string kBalanceTaskTable    = tableMaps.at("balance_task").first;     // NOLINT
 static const std::string kBalancePlanTable    = tableMaps.at("balance_plan").first;     // NOLINT
 
@@ -1302,32 +1301,32 @@ PartitionID MetaServiceUtils::parseListenerPart(folly::StringPiece rawData) {
   return *reinterpret_cast<const PartitionID*>(rawData.data() + offset);
 }
 
-std::string MetaServiceUtils::statisKey(GraphSpaceID spaceId) {
+std::string MetaServiceUtils::statsKey(GraphSpaceID spaceId) {
   std::string key;
-  key.reserve(kStatisTable.size() + sizeof(GraphSpaceID));
-  key.append(kStatisTable.data(), kStatisTable.size())
+  key.reserve(kStatsTable.size() + sizeof(GraphSpaceID));
+  key.append(kStatsTable.data(), kStatsTable.size())
       .append(reinterpret_cast<const char*>(&spaceId), sizeof(GraphSpaceID));
   return key;
 }
 
-std::string MetaServiceUtils::statisVal(const cpp2::StatisItem& statisItem) {
+std::string MetaServiceUtils::statsVal(const cpp2::StatsItem& statsItem) {
   std::string val;
-  apache::thrift::CompactSerializer::serialize(statisItem, &val);
+  apache::thrift::CompactSerializer::serialize(statsItem, &val);
   return val;
 }
 
-cpp2::StatisItem MetaServiceUtils::parseStatisVal(folly::StringPiece rawData) {
-  cpp2::StatisItem statisItem;
-  apache::thrift::CompactSerializer::deserialize(rawData, statisItem);
-  return statisItem;
+cpp2::StatsItem MetaServiceUtils::parseStatsVal(folly::StringPiece rawData) {
+  cpp2::StatsItem statsItem;
+  apache::thrift::CompactSerializer::deserialize(rawData, statsItem);
+  return statsItem;
 }
 
-GraphSpaceID MetaServiceUtils::parseStatisSpace(folly::StringPiece rawData) {
-  auto offset = kStatisTable.size();
+GraphSpaceID MetaServiceUtils::parseStatsSpace(folly::StringPiece rawData) {
+  auto offset = kStatsTable.size();
   return *reinterpret_cast<const GraphSpaceID*>(rawData.data() + offset);
 }
 
-const std::string& MetaServiceUtils::statisKeyPrefix() { return kStatisTable; }
+const std::string& MetaServiceUtils::statsKeyPrefix() { return kStatsTable; }
 
 std::string MetaServiceUtils::fulltextServiceKey() {
   std::string key;
diff --git a/src/meta/MetaServiceUtils.h b/src/meta/MetaServiceUtils.h
index 024244005ac..063cd20059b 100644
--- a/src/meta/MetaServiceUtils.h
+++ b/src/meta/MetaServiceUtils.h
@@ -299,15 +299,15 @@ class MetaServiceUtils final {
 
   static PartitionID parseListenerPart(folly::StringPiece rawData);
 
-  static std::string statisKey(GraphSpaceID spaceId);
+  static std::string statsKey(GraphSpaceID spaceId);
 
-  static std::string statisVal(const cpp2::StatisItem& statisItem);
+  static std::string statsVal(const cpp2::StatsItem& statsItem);
 
-  static cpp2::StatisItem parseStatisVal(folly::StringPiece rawData);
+  static cpp2::StatsItem parseStatsVal(folly::StringPiece rawData);
 
-  static const std::string& statisKeyPrefix();
+  static const std::string& statsKeyPrefix();
 
-  static GraphSpaceID parseStatisSpace(folly::StringPiece rawData);
+  static GraphSpaceID parseStatsSpace(folly::StringPiece rawData);
 
   static std::string fulltextServiceKey();
 
diff --git a/src/meta/processors/admin/AdminClient.cpp b/src/meta/processors/admin/AdminClient.cpp
index fc10bc1f7b2..704a1e896f4 100644
--- a/src/meta/processors/admin/AdminClient.cpp
+++ b/src/meta/processors/admin/AdminClient.cpp
@@ -704,7 +704,7 @@ folly::Future<Status> AdminClient::addTask(cpp2::AdminCmd cmd,
                                            const std::vector<std::string>& taskSpecficParas,
                                            std::vector<PartitionID> parts,
                                            int concurrency,
-                                           cpp2::StatisItem* statisResult) {
+                                           cpp2::StatsItem* statsResult) {
   folly::Promise<Status> pro;
   auto f = pro.getFuture();
   std::vector<HostAddr> hosts;
@@ -733,9 +733,9 @@ folly::Future<Status> AdminClient::addTask(cpp2::AdminCmd cmd,
   req.set_para(std::move(para));
 
   std::function<void(storage::cpp2::AdminExecResp && resp)> respGen =
-      [statisResult](storage::cpp2::AdminExecResp&& resp) -> void {
-    if (statisResult && resp.statis_ref().has_value()) {
-      *statisResult = *resp.statis_ref();
+      [statsResult](storage::cpp2::AdminExecResp&& resp) -> void {
+    if (statsResult && resp.stats_ref().has_value()) {
+      *statsResult = *resp.stats_ref();
     }
   };
 
diff --git a/src/meta/processors/admin/AdminClient.h b/src/meta/processors/admin/AdminClient.h
index 946f4d11c37..c1a3a1bef8a 100644
--- a/src/meta/processors/admin/AdminClient.h
+++ b/src/meta/processors/admin/AdminClient.h
@@ -100,7 +100,7 @@ class AdminClient {
                                         const std::vector<std::string>& taskSpecficParas,
                                         std::vector<PartitionID> parts,
                                         int concurrency,
-                                        cpp2::StatisItem* statisResult = nullptr);
+                                        cpp2::StatsItem* statsResult = nullptr);
 
   virtual folly::Future<Status> stopTask(const std::vector<HostAddr>& target,
                                          int32_t jobId,
diff --git a/src/meta/processors/job/GetStatisProcessor.cpp b/src/meta/processors/job/GetStatsProcessor.cpp
similarity index 62%
rename from src/meta/processors/job/GetStatisProcessor.cpp
rename to src/meta/processors/job/GetStatsProcessor.cpp
index 09a3899a30d..176a726794d 100644
--- a/src/meta/processors/job/GetStatisProcessor.cpp
+++ b/src/meta/processors/job/GetStatsProcessor.cpp
@@ -4,38 +4,36 @@
  * attached with Common Clause Condition 1.0, found in the LICENSES directory.
  */
 
-#include "meta/processors/job/GetStatisProcessor.h"
+#include "meta/processors/job/GetStatsProcessor.h"
 
 namespace nebula {
 namespace meta {
 
-void GetStatisProcessor::process(const cpp2::GetStatisReq& req) {
+void GetStatsProcessor::process(const cpp2::GetStatsReq& req) {
   auto spaceId = req.get_space_id();
   CHECK_SPACE_ID_AND_RETURN(spaceId);
 
-  auto statisKey = MetaServiceUtils::statisKey(spaceId);
+  auto statsKey = MetaServiceUtils::statsKey(spaceId);
   std::string val;
-  auto ret = kvstore_->get(kDefaultSpaceId, kDefaultPartId, statisKey, &val);
+  auto ret = kvstore_->get(kDefaultSpaceId, kDefaultPartId, statsKey, &val);
 
   if (ret != nebula::cpp2::ErrorCode::SUCCEEDED) {
-    LOG(ERROR) << "SpaceId " << spaceId << " no statis data, "
-               << "please submit job statis under space.";
+    LOG(ERROR) << "SpaceId " << spaceId << " no statis data, please submit job statis under space.";
     handleErrorCode(ret);
     onFinished();
     return;
   }
-  auto statisItem = MetaServiceUtils::parseStatisVal(val);
-  auto statisJobStatus = statisItem.get_status();
+  auto statsItem = MetaServiceUtils::parseStatsVal(val);
+  auto statisJobStatus = statsItem.get_status();
   if (statisJobStatus != cpp2::JobStatus::FINISHED) {
-    LOG(ERROR) << "SpaceId " << spaceId << " statis job is running or failed, "
-               << "please show jobs.";
+    LOG(ERROR) << "SpaceId " << spaceId << " statis job is running or failed, please show jobs.";
     handleErrorCode(nebula::cpp2::ErrorCode::E_JOB_NOT_FINISHED);
     onFinished();
     return;
   }
 
   handleErrorCode(nebula::cpp2::ErrorCode::SUCCEEDED);
-  resp_.set_statis(std::move(statisItem));
+  resp_.set_stats(std::move(statsItem));
   onFinished();
 }
 
diff --git a/src/meta/processors/job/GetStatisProcessor.h b/src/meta/processors/job/GetStatsProcessor.h
similarity index 57%
rename from src/meta/processors/job/GetStatisProcessor.h
rename to src/meta/processors/job/GetStatsProcessor.h
index 2e59371bc95..f8c58b30fb5 100644
--- a/src/meta/processors/job/GetStatisProcessor.h
+++ b/src/meta/processors/job/GetStatsProcessor.h
@@ -12,17 +12,17 @@
 namespace nebula {
 namespace meta {
 
-class GetStatisProcessor : public BaseProcessor<cpp2::GetStatisResp> {
+class GetStatsProcessor : public BaseProcessor<cpp2::GetStatsResp> {
  public:
-  static GetStatisProcessor* instance(kvstore::KVStore* kvstore) {
-    return new GetStatisProcessor(kvstore);
+  static GetStatsProcessor* instance(kvstore::KVStore* kvstore) {
+    return new GetStatsProcessor(kvstore);
   }
 
-  void process(const cpp2::GetStatisReq& req);
+  void process(const cpp2::GetStatsReq& req);
 
  private:
-  explicit GetStatisProcessor(kvstore::KVStore* kvstore)
-      : BaseProcessor<cpp2::GetStatisResp>(kvstore) {}
+  explicit GetStatsProcessor(kvstore::KVStore* kvstore)
+      : BaseProcessor<cpp2::GetStatsResp>(kvstore) {}
 };
 
 }  // namespace meta
diff --git a/src/meta/processors/job/JobDescription.h b/src/meta/processors/job/JobDescription.h
index b50784605f3..b6f538b7ea1 100644
--- a/src/meta/processors/job/JobDescription.h
+++ b/src/meta/processors/job/JobDescription.h
@@ -23,15 +23,15 @@ class JobDescription {
   FRIEND_TEST(JobDescriptionTest, parseVal);
   FRIEND_TEST(JobManagerTest, buildJobDescription);
   FRIEND_TEST(JobManagerTest, addJob);
-  FRIEND_TEST(JobManagerTest, StatisJob);
+  FRIEND_TEST(JobManagerTest, StatsJob);
   FRIEND_TEST(JobManagerTest, loadJobDescription);
   FRIEND_TEST(JobManagerTest, showJobs);
   FRIEND_TEST(JobManagerTest, showJob);
   FRIEND_TEST(JobManagerTest, backupJob);
   FRIEND_TEST(JobManagerTest, recoverJob);
-  FRIEND_TEST(GetStatisTest, StatisJob);
-  FRIEND_TEST(GetStatisTest, MockSingleMachineTest);
-  FRIEND_TEST(GetStatisTest, MockMultiMachineTest);
+  FRIEND_TEST(GetStatsTest, StatsJob);
+  FRIEND_TEST(GetStatsTest, MockSingleMachineTest);
+  FRIEND_TEST(GetStatsTest, MockMultiMachineTest);
 
   using Status = cpp2::JobStatus;
 
diff --git a/src/meta/processors/job/JobManager.h b/src/meta/processors/job/JobManager.h
index c300a501714..378c8d01a5e 100644
--- a/src/meta/processors/job/JobManager.h
+++ b/src/meta/processors/job/JobManager.h
@@ -27,11 +27,11 @@ namespace meta {
 
 class JobManager : public nebula::cpp::NonCopyable, public nebula::cpp::NonMovable {
   friend class JobManagerTest;
-  friend class GetStatisTest;
+  friend class GetStatsTest;
   FRIEND_TEST(JobManagerTest, reserveJobId);
   FRIEND_TEST(JobManagerTest, buildJobDescription);
   FRIEND_TEST(JobManagerTest, addJob);
-  FRIEND_TEST(JobManagerTest, StatisJob);
+  FRIEND_TEST(JobManagerTest, StatsJob);
   FRIEND_TEST(JobManagerTest, JobPriority);
   FRIEND_TEST(JobManagerTest, JobDeduplication);
   FRIEND_TEST(JobManagerTest, loadJobDescription);
@@ -40,9 +40,9 @@ class JobManager : public nebula::cpp::NonCopyable, public nebula::cpp::NonMovab
   FRIEND_TEST(JobManagerTest, recoverJob);
   FRIEND_TEST(JobManagerTest, AddRebuildTagIndexJob);
   FRIEND_TEST(JobManagerTest, AddRebuildEdgeIndexJob);
-  FRIEND_TEST(GetStatisTest, StatisJob);
-  FRIEND_TEST(GetStatisTest, MockSingleMachineTest);
-  FRIEND_TEST(GetStatisTest, MockMultiMachineTest);
+  FRIEND_TEST(GetStatsTest, StatsJob);
+  FRIEND_TEST(GetStatsTest, MockSingleMachineTest);
+  FRIEND_TEST(GetStatsTest, MockMultiMachineTest);
 
  public:
   ~JobManager();
diff --git a/src/meta/processors/job/MetaJobExecutor.cpp b/src/meta/processors/job/MetaJobExecutor.cpp
index eaf0e0d5408..3bce88b57f3 100644
--- a/src/meta/processors/job/MetaJobExecutor.cpp
+++ b/src/meta/processors/job/MetaJobExecutor.cpp
@@ -19,7 +19,7 @@
 #include "meta/processors/job/RebuildEdgeJobExecutor.h"
 #include "meta/processors/job/RebuildFTJobExecutor.h"
 #include "meta/processors/job/RebuildTagJobExecutor.h"
-#include "meta/processors/job/StatisJobExecutor.h"
+#include "meta/processors/job/StatsJobExecutor.h"
 #include "meta/processors/job/TaskDescription.h"
 
 DECLARE_int32(heartbeat_interval_secs);
@@ -48,7 +48,7 @@ std::unique_ptr<MetaJobExecutor> MetaJobExecutorFactory::createMetaJobExecutor(
       ret.reset(new RebuildFTJobExecutor(jd.getJobId(), store, client, jd.getParas()));
       break;
     case cpp2::AdminCmd::STATS:
-      ret.reset(new StatisJobExecutor(jd.getJobId(), store, client, jd.getParas()));
+      ret.reset(new StatsJobExecutor(jd.getJobId(), store, client, jd.getParas()));
       break;
     default:
       break;
diff --git a/src/meta/processors/job/StatisJobExecutor.cpp b/src/meta/processors/job/StatsJobExecutor.cpp
similarity index 71%
rename from src/meta/processors/job/StatisJobExecutor.cpp
rename to src/meta/processors/job/StatsJobExecutor.cpp
index 4b1f0cda041..18ddbc745d5 100644
--- a/src/meta/processors/job/StatisJobExecutor.cpp
+++ b/src/meta/processors/job/StatsJobExecutor.cpp
@@ -4,7 +4,7 @@
  * attached with Common Clause Condition 1.0, found in the LICENSES directory.
  */
 
-#include "meta/processors/job/StatisJobExecutor.h"
+#include "meta/processors/job/StatsJobExecutor.h"
 
 #include "common/utils/Utils.h"
 #include "meta/MetaServiceUtils.h"
@@ -14,12 +14,12 @@
 namespace nebula {
 namespace meta {
 
-bool StatisJobExecutor::check() {
+bool StatsJobExecutor::check() {
   // Only one parameter, the current space name
   return paras_.size() == 1;
 }
 
-nebula::cpp2::ErrorCode StatisJobExecutor::save(const std::string& key, const std::string& val) {
+nebula::cpp2::ErrorCode StatsJobExecutor::save(const std::string& key, const std::string& val) {
   std::vector<kvstore::KV> data{std::make_pair(key, val)};
   folly::Baton<true, std::atomic> baton;
   auto rc = nebula::cpp2::ErrorCode::SUCCEEDED;
@@ -32,7 +32,7 @@ nebula::cpp2::ErrorCode StatisJobExecutor::save(const std::string& key, const st
   return rc;
 }
 
-nebula::cpp2::ErrorCode StatisJobExecutor::doRemove(const std::string& key) {
+nebula::cpp2::ErrorCode StatsJobExecutor::doRemove(const std::string& key) {
   folly::Baton<true, std::atomic> baton;
   auto rc = nebula::cpp2::ErrorCode::SUCCEEDED;
   kvstore_->asyncRemove(kDefaultSpaceId, kDefaultPartId, key, [&](nebula::cpp2::ErrorCode code) {
@@ -43,7 +43,7 @@ nebula::cpp2::ErrorCode StatisJobExecutor::doRemove(const std::string& key) {
   return rc;
 }
 
-nebula::cpp2::ErrorCode StatisJobExecutor::prepare() {
+nebula::cpp2::ErrorCode StatsJobExecutor::prepare() {
   auto spaceRet = getSpaceIdFromName(paras_[0]);
   if (!nebula::ok(spaceRet)) {
     LOG(ERROR) << "Can't find the space: " << paras_[0];
@@ -52,17 +52,17 @@ nebula::cpp2::ErrorCode StatisJobExecutor::prepare() {
   space_ = nebula::value(spaceRet);
 
   // Set the status of the statis job to running
-  cpp2::StatisItem statisItem;
-  statisItem.set_status(cpp2::JobStatus::RUNNING);
-  auto statisKey = MetaServiceUtils::statisKey(space_);
-  auto statisVal = MetaServiceUtils::statisVal(statisItem);
-  return save(statisKey, statisVal);
+  cpp2::StatsItem statsItem;
+  statsItem.set_status(cpp2::JobStatus::RUNNING);
+  auto statsKey = MetaServiceUtils::statsKey(space_);
+  auto statsVal = MetaServiceUtils::statsVal(statsItem);
+  return save(statsKey, statsVal);
 }
 
-folly::Future<Status> StatisJobExecutor::executeInternal(HostAddr&& address,
-                                                         std::vector<PartitionID>&& parts) {
-  cpp2::StatisItem item;
-  statisItem_.emplace(address, item);
+folly::Future<Status> StatsJobExecutor::executeInternal(HostAddr&& address,
+                                                        std::vector<PartitionID>&& parts) {
+  cpp2::StatsItem item;
+  statsItem_.emplace(address, item);
   return adminClient_->addTask(cpp2::AdminCmd::STATS,
                                jobId_,
                                taskId_++,
@@ -71,10 +71,10 @@ folly::Future<Status> StatisJobExecutor::executeInternal(HostAddr&& address,
                                {},
                                std::move(parts),
                                concurrency_,
-                               &(statisItem_[address]));
+                               &(statsItem_[address]));
 }
 
-void showStatisItem(const cpp2::StatisItem& item, const std::string& msg) {
+void showStatsItem(const cpp2::StatsItem& item, const std::string& msg) {
   std::stringstream oss;
   oss << msg << ": ";
   oss << "tag_vertices: ";
@@ -90,7 +90,7 @@ void showStatisItem(const cpp2::StatisItem& item, const std::string& msg) {
   LOG(INFO) << oss.str();
 }
 
-void StatisJobExecutor::addStatis(cpp2::StatisItem& lhs, const cpp2::StatisItem& rhs) {
+void StatsJobExecutor::addStats(cpp2::StatsItem& lhs, const cpp2::StatsItem& rhs) {
   for (auto& it : *rhs.tag_vertices_ref()) {
     (*lhs.tag_vertices_ref())[it.first] += it.second;
   }
@@ -113,12 +113,12 @@ void StatisJobExecutor::addStatis(cpp2::StatisItem& lhs, const cpp2::StatisItem&
 /**
  * @brief caller will guarantee there won't be any conflict read / write.
  */
-nebula::cpp2::ErrorCode StatisJobExecutor::saveSpecialTaskStatus(const cpp2::ReportTaskReq& req) {
-  if (!req.statis_ref().has_value()) {
+nebula::cpp2::ErrorCode StatsJobExecutor::saveSpecialTaskStatus(const cpp2::ReportTaskReq& req) {
+  if (!req.stats_ref().has_value()) {
     return nebula::cpp2::ErrorCode::SUCCEEDED;
   }
-  cpp2::StatisItem statisItem;
-  auto statisKey = MetaServiceUtils::statisKey(space_);
+  cpp2::StatsItem statsItem;
+  auto statsKey = MetaServiceUtils::statsKey(space_);
   auto tempKey = toTempKey(req.get_job_id());
   std::string val;
   auto ret = kvstore_->get(kDefaultSpaceId, kDefaultPartId, tempKey, &val);
@@ -127,17 +127,17 @@ nebula::cpp2::ErrorCode StatisJobExecutor::saveSpecialTaskStatus(const cpp2::Rep
     if (ret != nebula::cpp2::ErrorCode::E_KEY_NOT_FOUND) {
       return ret;
     }
-    ret = kvstore_->get(kDefaultSpaceId, kDefaultPartId, statisKey, &val);
+    ret = kvstore_->get(kDefaultSpaceId, kDefaultPartId, statsKey, &val);
   }
 
   if (ret != nebula::cpp2::ErrorCode::SUCCEEDED) {
     return ret;
   }
 
-  statisItem = MetaServiceUtils::parseStatisVal(val);
-  addStatis(statisItem, *req.statis_ref());
-  auto statisVal = MetaServiceUtils::statisVal(statisItem);
-  return save(tempKey, statisVal);
+  statsItem = MetaServiceUtils::parseStatsVal(val);
+  addStats(statsItem, *req.stats_ref());
+  auto statsVal = MetaServiceUtils::statsVal(statsItem);
+  return save(tempKey, statsVal);
 }
 
 /**
@@ -148,13 +148,13 @@ nebula::cpp2::ErrorCode StatisJobExecutor::saveSpecialTaskStatus(const cpp2::Rep
  *      so separate the partial result by job
  * @return std::string
  */
-std::string StatisJobExecutor::toTempKey(int32_t jobId) {
-  std::string key = MetaServiceUtils::statisKey(space_);
+std::string StatsJobExecutor::toTempKey(int32_t jobId) {
+  std::string key = MetaServiceUtils::statsKey(space_);
   return key.append(reinterpret_cast<const char*>(&jobId), sizeof(int32_t));
 }
 
-nebula::cpp2::ErrorCode StatisJobExecutor::finish(bool exeSuccessed) {
-  auto statisKey = MetaServiceUtils::statisKey(space_);
+nebula::cpp2::ErrorCode StatsJobExecutor::finish(bool exeSuccessed) {
+  auto statsKey = MetaServiceUtils::statsKey(space_);
   auto tempKey = toTempKey(jobId_);
   std::string val;
   auto ret = kvstore_->get(kDefaultSpaceId, kDefaultPartId, tempKey, &val);
@@ -162,14 +162,14 @@ nebula::cpp2::ErrorCode StatisJobExecutor::finish(bool exeSuccessed) {
     LOG(ERROR) << "Can't find the statis data, spaceId : " << space_;
     return ret;
   }
-  auto statisItem = MetaServiceUtils::parseStatisVal(val);
+  auto statsItem = MetaServiceUtils::parseStatsVal(val);
   if (exeSuccessed) {
-    statisItem.set_status(cpp2::JobStatus::FINISHED);
+    statsItem.set_status(cpp2::JobStatus::FINISHED);
   } else {
-    statisItem.set_status(cpp2::JobStatus::FAILED);
+    statsItem.set_status(cpp2::JobStatus::FAILED);
   }
-  auto statisVal = MetaServiceUtils::statisVal(statisItem);
-  auto retCode = save(statisKey, statisVal);
+  auto statsVal = MetaServiceUtils::statsVal(statsItem);
+  auto retCode = save(statsKey, statsVal);
   if (retCode != nebula::cpp2::ErrorCode::SUCCEEDED) {
     LOG(ERROR) << "Sace statis data failed, error " << apache::thrift::util::enumNameSafe(retCode);
     return retCode;
@@ -177,7 +177,7 @@ nebula::cpp2::ErrorCode StatisJobExecutor::finish(bool exeSuccessed) {
   return doRemove(tempKey);
 }
 
-nebula::cpp2::ErrorCode StatisJobExecutor::stop() {
+nebula::cpp2::ErrorCode StatsJobExecutor::stop() {
   auto errOrTargetHost = getTargetHost(space_);
   if (!nebula::ok(errOrTargetHost)) {
     LOG(ERROR) << "Get target host failed";
diff --git a/src/meta/processors/job/StatisJobExecutor.h b/src/meta/processors/job/StatsJobExecutor.h
similarity index 69%
rename from src/meta/processors/job/StatisJobExecutor.h
rename to src/meta/processors/job/StatsJobExecutor.h
index c5157553760..a4e9b44eb54 100644
--- a/src/meta/processors/job/StatisJobExecutor.h
+++ b/src/meta/processors/job/StatsJobExecutor.h
@@ -4,8 +4,8 @@
  * attached with Common Clause Condition 1.0, found in the LICENSES directory.
  */
 
-#ifndef META_STATISJOBEXECUTOR_H_
-#define META_STATISJOBEXECUTOR_H_
+#ifndef META_STATSJOBEXECUTOR_H_
+#define META_STATSJOBEXECUTOR_H_
 
 #include "interface/gen-cpp2/meta_types.h"
 #include "meta/processors/admin/AdminClient.h"
@@ -14,12 +14,12 @@
 namespace nebula {
 namespace meta {
 
-class StatisJobExecutor : public MetaJobExecutor {
+class StatsJobExecutor : public MetaJobExecutor {
  public:
-  StatisJobExecutor(JobID jobId,
-                    kvstore::KVStore* kvstore,
-                    AdminClient* adminClient,
-                    const std::vector<std::string>& paras)
+  StatsJobExecutor(JobID jobId,
+                   kvstore::KVStore* kvstore,
+                   AdminClient* adminClient,
+                   const std::vector<std::string>& paras)
       : MetaJobExecutor(jobId, kvstore, adminClient, paras) {
     toHost_ = TargetHosts::LEADER;
   }
@@ -33,29 +33,29 @@ class StatisJobExecutor : public MetaJobExecutor {
   folly::Future<Status> executeInternal(HostAddr&& address,
                                         std::vector<PartitionID>&& parts) override;
 
-  // Summarize the results of statisItem_
+  // Summarize the results of statsItem_
   nebula::cpp2::ErrorCode finish(bool exeSuccessed) override;
 
   nebula::cpp2::ErrorCode saveSpecialTaskStatus(const cpp2::ReportTaskReq& req) override;
 
  private:
-  // Statis job writes an additional data.
+  // Stats job writes an additional data.
   // The additional data is written when the statis job passes the check
   // function. Update this additional data when job finishes.
   nebula::cpp2::ErrorCode save(const std::string& key, const std::string& val);
 
-  void addStatis(cpp2::StatisItem& lhs, const cpp2::StatisItem& rhs);
+  void addStats(cpp2::StatsItem& lhs, const cpp2::StatsItem& rhs);
 
   std::string toTempKey(int32_t jobId);
 
   nebula::cpp2::ErrorCode doRemove(const std::string& key);
 
  private:
-  // Statis results
-  std::unordered_map<HostAddr, cpp2::StatisItem> statisItem_;
+  // Stats results
+  std::unordered_map<HostAddr, cpp2::StatsItem> statsItem_;
 };
 
 }  // namespace meta
 }  // namespace nebula
 
-#endif  // META_STATISJOBEXECUTOR_H_
+#endif  // META_STATSJOBEXECUTOR_H_
diff --git a/src/meta/processors/parts/DropSpaceProcessor.cpp b/src/meta/processors/parts/DropSpaceProcessor.cpp
index eb81fa5ec2f..80cda424017 100644
--- a/src/meta/processors/parts/DropSpaceProcessor.cpp
+++ b/src/meta/processors/parts/DropSpaceProcessor.cpp
@@ -96,7 +96,7 @@ void DropSpaceProcessor::process(const cpp2::DropSpaceReq& req) {
   }
 
   // 5. Delete related statis data
-  auto statiskey = MetaServiceUtils::statisKey(spaceId);
+  auto statiskey = MetaServiceUtils::statsKey(spaceId);
   deleteKeys.emplace_back(statiskey);
 
   // 6. Delte related fulltext index meta data
diff --git a/src/meta/test/CMakeLists.txt b/src/meta/test/CMakeLists.txt
index 35b2c929523..355d06cd468 100644
--- a/src/meta/test/CMakeLists.txt
+++ b/src/meta/test/CMakeLists.txt
@@ -206,9 +206,9 @@ nebula_add_test(
 
 nebula_add_test(
     NAME
-        get_statis_test
+        get_stats_test
     SOURCES
-        GetStatisTest.cpp
+        GetStatsTest.cpp
     OBJECTS
         ${meta_test_deps}
     LIBRARIES
diff --git a/src/meta/test/GetStatisTest.cpp b/src/meta/test/GetStatsTest.cpp
similarity index 74%
rename from src/meta/test/GetStatisTest.cpp
rename to src/meta/test/GetStatsTest.cpp
index 23d5166a965..d0565de00be 100644
--- a/src/meta/test/GetStatisTest.cpp
+++ b/src/meta/test/GetStatsTest.cpp
@@ -12,7 +12,7 @@
 #include "common/fs/TempDir.h"
 #include "interface/gen-cpp2/meta_types.h"
 #include "kvstore/Common.h"
-#include "meta/processors/job/GetStatisProcessor.h"
+#include "meta/processors/job/GetStatsProcessor.h"
 #include "meta/processors/job/JobManager.h"
 #include "meta/processors/job/JobUtils.h"
 #include "meta/test/MockAdminClient.h"
@@ -29,7 +29,7 @@ using ::testing::Return;
 using ::testing::SetArgPointee;
 
 std::string toTempKey(int32_t space, int32_t jobId) {
-  std::string key = MetaServiceUtils::statisKey(space);
+  std::string key = MetaServiceUtils::statsKey(space);
   return key.append(reinterpret_cast<const char*>(&jobId), sizeof(int32_t));
 }
 
@@ -48,9 +48,9 @@ void copyData(kvstore::KVStore* kv,
 }
 
 void genTempData(int32_t spaceId, int jobId, kvstore::KVStore* kv) {
-  auto statisKey = MetaServiceUtils::statisKey(spaceId);
+  auto statsKey = MetaServiceUtils::statsKey(spaceId);
   auto tempKey = toTempKey(spaceId, jobId);
-  copyData(kv, 0, 0, statisKey, tempKey);
+  copyData(kv, 0, 0, statsKey, tempKey);
 }
 
 struct JobCallBack {
@@ -63,12 +63,12 @@ struct JobCallBack {
     req.set_job_id(jobId_);
     req.set_task_id(taskId_);
 
-    cpp2::StatisItem item;
+    cpp2::StatsItem item;
     item.set_tag_vertices({{"t1", n_}, {"t2", n_}});
     item.set_edges({{"e1", n_}, {"e2", n_}});
     item.set_space_vertices(2 * n_);
     item.set_space_edges(2 * n_);
-    req.set_statis(item);
+    req.set_stats(item);
     jobMgr_->reportTaskFinish(req);
     return folly::Future<Status>(Status::OK());
   }
@@ -79,10 +79,10 @@ struct JobCallBack {
   int32_t n_{-1};
 };
 
-class GetStatisTest : public ::testing::Test {
+class GetStatsTest : public ::testing::Test {
  protected:
   void SetUp() override {
-    rootPath_ = std::make_unique<fs::TempDir>("/tmp/GetStatisTest.XXXXXX");
+    rootPath_ = std::make_unique<fs::TempDir>("/tmp/GetStatsTest.XXXXXX");
     mock::MockCluster cluster;
     kv_ = cluster.initMetaKV(rootPath_->path());
 
@@ -119,7 +119,7 @@ class GetStatisTest : public ::testing::Test {
   JobManager* jobMgr{nullptr};
 };
 
-TEST_F(GetStatisTest, StatisJob) {
+TEST_F(GetStatsTest, StatsJob) {
   ASSERT_TRUE(TestUtils::createSomeHosts(kv_.get()));
   TestUtils::assembleSpace(kv_.get(), 1, 1);
   GraphSpaceID spaceId = 1;
@@ -132,23 +132,23 @@ TEST_F(GetStatisTest, StatisJob) {
 
   {
     // Job is not executed, job status is QUEUE.
-    // Statis data does not exist.
+    // Stats data does not exist.
     auto job1Ret = JobDescription::loadJobDescription(statisJob.id_, kv_.get());
     ASSERT_TRUE(nebula::ok(job1Ret));
     auto job1 = nebula::value(job1Ret);
     ASSERT_EQ(statisJob.id_, job1.id_);
     ASSERT_EQ(cpp2::JobStatus::QUEUE, job1.status_);
 
-    cpp2::GetStatisReq req;
+    cpp2::GetStatsReq req;
     req.set_space_id(spaceId);
-    auto* processor = GetStatisProcessor::instance(kv_.get());
+    auto* processor = GetStatsProcessor::instance(kv_.get());
     auto f = processor->getFuture();
     processor->process(req);
     auto resp = std::move(f).get();
     ASSERT_NE(nebula::cpp2::ErrorCode::SUCCEEDED, resp.get_code());
 
     // Directly find statis data in kvstore, statis data does not exist.
-    auto key = MetaServiceUtils::statisKey(spaceId);
+    auto key = MetaServiceUtils::statsKey(spaceId);
     std::string val;
     auto ret = kv_->get(kDefaultSpaceId, kDefaultPartId, key, &val);
     ASSERT_NE(nebula::cpp2::ErrorCode::SUCCEEDED, ret);
@@ -170,10 +170,10 @@ TEST_F(GetStatisTest, StatisJob) {
   statisJob.setStatus(cpp2::JobStatus::FINISHED);
   jobMgr->save(statisJob.jobKey(), statisJob.jobVal());
   auto jobId = statisJob.getJobId();
-  auto statisKey = MetaServiceUtils::statisKey(spaceId);
+  auto statsKey = MetaServiceUtils::statsKey(spaceId);
   auto tempKey = toTempKey(spaceId, jobId);
 
-  copyData(kv_.get(), 0, 0, statisKey, tempKey);
+  copyData(kv_.get(), 0, 0, statsKey, tempKey);
   jobMgr->jobFinished(jobId, cpp2::JobStatus::FINISHED);
   {
     auto job2Ret = JobDescription::loadJobDescription(statisJob.id_, kv_.get());
@@ -182,9 +182,9 @@ TEST_F(GetStatisTest, StatisJob) {
     ASSERT_EQ(statisJob.id_, job2.id_);
     ASSERT_EQ(cpp2::JobStatus::FINISHED, job2.status_);
 
-    cpp2::GetStatisReq req;
+    cpp2::GetStatsReq req;
     req.set_space_id(spaceId);
-    auto* processor = GetStatisProcessor::instance(kv_.get());
+    auto* processor = GetStatsProcessor::instance(kv_.get());
     auto f = processor->getFuture();
     processor->process(req);
     auto resp = std::move(f).get();
@@ -193,25 +193,25 @@ TEST_F(GetStatisTest, StatisJob) {
     }
     ASSERT_EQ(nebula::cpp2::ErrorCode::SUCCEEDED, resp.get_code());
 
-    auto statisItem = resp.get_statis();
-    ASSERT_EQ(cpp2::JobStatus::FINISHED, statisItem.get_status());
-    ASSERT_EQ(0, statisItem.get_tag_vertices().size());
-    ASSERT_EQ(0, statisItem.get_edges().size());
-    ASSERT_EQ(0, statisItem.get_space_vertices());
-    ASSERT_EQ(0, statisItem.get_space_edges());
+    auto statsItem = resp.get_stats();
+    ASSERT_EQ(cpp2::JobStatus::FINISHED, statsItem.get_status());
+    ASSERT_EQ(0, statsItem.get_tag_vertices().size());
+    ASSERT_EQ(0, statsItem.get_edges().size());
+    ASSERT_EQ(0, statsItem.get_space_vertices());
+    ASSERT_EQ(0, statsItem.get_space_edges());
 
     // Directly find statis data in kvstore, statis data exists.
-    auto key = MetaServiceUtils::statisKey(spaceId);
+    auto key = MetaServiceUtils::statsKey(spaceId);
     std::string val;
     auto ret = kv_->get(kDefaultSpaceId, kDefaultPartId, key, &val);
     ASSERT_EQ(nebula::cpp2::ErrorCode::SUCCEEDED, ret);
 
-    auto statisItem1 = MetaServiceUtils::parseStatisVal(val);
-    ASSERT_EQ(cpp2::JobStatus::FINISHED, statisItem1.get_status());
-    ASSERT_EQ(0, statisItem1.get_tag_vertices().size());
-    ASSERT_EQ(0, statisItem1.get_edges().size());
-    ASSERT_EQ(0, statisItem1.get_space_vertices());
-    ASSERT_EQ(0, statisItem1.get_space_edges());
+    auto statsItem1 = MetaServiceUtils::parseStatsVal(val);
+    ASSERT_EQ(cpp2::JobStatus::FINISHED, statsItem1.get_status());
+    ASSERT_EQ(0, statsItem1.get_tag_vertices().size());
+    ASSERT_EQ(0, statsItem1.get_edges().size());
+    ASSERT_EQ(0, statsItem1.get_space_vertices());
+    ASSERT_EQ(0, statsItem1.get_space_edges());
   }
 
   // Execute new statis job in same space.
@@ -221,7 +221,7 @@ TEST_F(GetStatisTest, StatisJob) {
   ASSERT_EQ(rc2, nebula::cpp2::ErrorCode::SUCCEEDED);
   {
     // Job is not executed, job status is QUEUE.
-    // Statis data exists, but it is the result of the last statis job
+    // Stats data exists, but it is the result of the last stats job
     // execution.
     auto job1Ret = JobDescription::loadJobDescription(statisJob2.id_, kv_.get());
     ASSERT_TRUE(nebula::ok(job1Ret));
@@ -230,33 +230,33 @@ TEST_F(GetStatisTest, StatisJob) {
     ASSERT_EQ(cpp2::JobStatus::QUEUE, job1.status_);
 
     // Success,  but statis data is the result of the last statis job.
-    cpp2::GetStatisReq req;
+    cpp2::GetStatsReq req;
     req.set_space_id(spaceId);
-    auto* processor = GetStatisProcessor::instance(kv_.get());
+    auto* processor = GetStatsProcessor::instance(kv_.get());
     auto f = processor->getFuture();
     processor->process(req);
     auto resp = std::move(f).get();
     ASSERT_EQ(nebula::cpp2::ErrorCode::SUCCEEDED, resp.get_code());
 
-    auto statisItem = resp.get_statis();
-    ASSERT_EQ(cpp2::JobStatus::FINISHED, statisItem.get_status());
-    ASSERT_EQ(0, statisItem.get_tag_vertices().size());
-    ASSERT_EQ(0, statisItem.get_edges().size());
-    ASSERT_EQ(0, statisItem.get_space_vertices());
-    ASSERT_EQ(0, statisItem.get_space_edges());
+    auto statsItem = resp.get_stats();
+    ASSERT_EQ(cpp2::JobStatus::FINISHED, statsItem.get_status());
+    ASSERT_EQ(0, statsItem.get_tag_vertices().size());
+    ASSERT_EQ(0, statsItem.get_edges().size());
+    ASSERT_EQ(0, statsItem.get_space_vertices());
+    ASSERT_EQ(0, statsItem.get_space_edges());
 
     // Directly find statis data in kvstore, statis data exists.
-    auto key = MetaServiceUtils::statisKey(spaceId);
+    auto key = MetaServiceUtils::statsKey(spaceId);
     std::string val;
     auto ret = kv_->get(kDefaultSpaceId, kDefaultPartId, key, &val);
     ASSERT_EQ(nebula::cpp2::ErrorCode::SUCCEEDED, ret);
 
-    auto statisItem1 = MetaServiceUtils::parseStatisVal(val);
-    ASSERT_EQ(cpp2::JobStatus::FINISHED, statisItem1.get_status());
-    ASSERT_EQ(0, statisItem1.get_tag_vertices().size());
-    ASSERT_EQ(0, statisItem1.get_edges().size());
-    ASSERT_EQ(0, statisItem1.get_space_vertices());
-    ASSERT_EQ(0, statisItem1.get_space_edges());
+    auto statsItem1 = MetaServiceUtils::parseStatsVal(val);
+    ASSERT_EQ(cpp2::JobStatus::FINISHED, statsItem1.get_status());
+    ASSERT_EQ(0, statsItem1.get_tag_vertices().size());
+    ASSERT_EQ(0, statsItem1.get_edges().size());
+    ASSERT_EQ(0, statsItem1.get_space_vertices());
+    ASSERT_EQ(0, statsItem1.get_space_edges());
 
     auto res = job1.setStatus(cpp2::JobStatus::RUNNING);
     ASSERT_TRUE(res);
@@ -266,7 +266,7 @@ TEST_F(GetStatisTest, StatisJob) {
 
   // Remove statis data.
   {
-    auto key = MetaServiceUtils::statisKey(spaceId);
+    auto key = MetaServiceUtils::statsKey(spaceId);
     folly::Baton<true, std::atomic> baton;
     auto retCode = nebula::cpp2::ErrorCode::SUCCEEDED;
     kv_->asyncRemove(kDefaultSpaceId, kDefaultPartId, key, [&](nebula::cpp2::ErrorCode code) {
@@ -284,9 +284,9 @@ TEST_F(GetStatisTest, StatisJob) {
     auto ret = kv_->get(kDefaultSpaceId, kDefaultPartId, key, &val);
     ASSERT_NE(nebula::cpp2::ErrorCode::SUCCEEDED, ret);
 
-    cpp2::GetStatisReq req;
+    cpp2::GetStatsReq req;
     req.set_space_id(spaceId);
-    auto* processor = GetStatisProcessor::instance(kv_.get());
+    auto* processor = GetStatsProcessor::instance(kv_.get());
     auto f = processor->getFuture();
     processor->process(req);
     auto resp = std::move(f).get();
@@ -300,10 +300,10 @@ TEST_F(GetStatisTest, StatisJob) {
   auto result2 = jobMgr->runJobInternal(statisJob2);
 
   auto jobId2 = statisJob2.getJobId();
-  auto statisKey2 = MetaServiceUtils::statisKey(spaceId);
+  auto statsKey2 = MetaServiceUtils::statsKey(spaceId);
   auto tempKey2 = toTempKey(spaceId, jobId2);
 
-  copyData(kv_.get(), 0, 0, statisKey2, tempKey2);
+  copyData(kv_.get(), 0, 0, statsKey2, tempKey2);
   jobMgr->jobFinished(jobId2, cpp2::JobStatus::FINISHED);
 
   ASSERT_TRUE(result2);
@@ -319,37 +319,37 @@ TEST_F(GetStatisTest, StatisJob) {
     ASSERT_EQ(statisJob2.id_, job2.id_);
     ASSERT_EQ(cpp2::JobStatus::FINISHED, job2.status_);
 
-    cpp2::GetStatisReq req;
+    cpp2::GetStatsReq req;
     req.set_space_id(spaceId);
-    auto* processor = GetStatisProcessor::instance(kv_.get());
+    auto* processor = GetStatsProcessor::instance(kv_.get());
     auto f = processor->getFuture();
     processor->process(req);
     auto resp = std::move(f).get();
     ASSERT_EQ(nebula::cpp2::ErrorCode::SUCCEEDED, resp.get_code());
 
-    auto statisItem = resp.get_statis();
-    ASSERT_EQ(cpp2::JobStatus::FINISHED, statisItem.get_status());
-    ASSERT_EQ(0, statisItem.get_tag_vertices().size());
-    ASSERT_EQ(0, statisItem.get_edges().size());
-    ASSERT_EQ(0, statisItem.get_space_vertices());
-    ASSERT_EQ(0, statisItem.get_space_edges());
+    auto statsItem = resp.get_stats();
+    ASSERT_EQ(cpp2::JobStatus::FINISHED, statsItem.get_status());
+    ASSERT_EQ(0, statsItem.get_tag_vertices().size());
+    ASSERT_EQ(0, statsItem.get_edges().size());
+    ASSERT_EQ(0, statsItem.get_space_vertices());
+    ASSERT_EQ(0, statsItem.get_space_edges());
 
     // Directly find statis data in kvstore, statis data exists.
-    auto key = MetaServiceUtils::statisKey(spaceId);
+    auto key = MetaServiceUtils::statsKey(spaceId);
     std::string val;
     auto ret = kv_->get(kDefaultSpaceId, kDefaultPartId, key, &val);
     ASSERT_EQ(nebula::cpp2::ErrorCode::SUCCEEDED, ret);
 
-    auto statisItem1 = MetaServiceUtils::parseStatisVal(val);
-    ASSERT_EQ(cpp2::JobStatus::FINISHED, statisItem1.get_status());
-    ASSERT_EQ(0, statisItem1.get_tag_vertices().size());
-    ASSERT_EQ(0, statisItem1.get_edges().size());
-    ASSERT_EQ(0, statisItem1.get_space_vertices());
-    ASSERT_EQ(0, statisItem1.get_space_edges());
+    auto statsItem1 = MetaServiceUtils::parseStatsVal(val);
+    ASSERT_EQ(cpp2::JobStatus::FINISHED, statsItem1.get_status());
+    ASSERT_EQ(0, statsItem1.get_tag_vertices().size());
+    ASSERT_EQ(0, statsItem1.get_edges().size());
+    ASSERT_EQ(0, statsItem1.get_space_vertices());
+    ASSERT_EQ(0, statsItem1.get_space_edges());
   }
 }
 
-TEST_F(GetStatisTest, MockSingleMachineTest) {
+TEST_F(GetStatsTest, MockSingleMachineTest) {
   GraphSpaceID spaceId = 1;
   // // Because only send to leader, need to mock leader distribution
   std::map<HostAddr, ActiveHostsMan::AllLeaders> allStorage;
@@ -393,30 +393,30 @@ TEST_F(GetStatisTest, MockSingleMachineTest) {
     ASSERT_EQ(job1.id_, desc.id_);
     ASSERT_EQ(cpp2::JobStatus::FINISHED, desc.status_);
 
-    cpp2::GetStatisReq req;
+    cpp2::GetStatsReq req;
     req.set_space_id(spaceId);
-    auto* processor = GetStatisProcessor::instance(kv_.get());
+    auto* processor = GetStatsProcessor::instance(kv_.get());
     auto f = processor->getFuture();
     processor->process(req);
     auto resp = std::move(f).get();
     ASSERT_EQ(nebula::cpp2::ErrorCode::SUCCEEDED, resp.get_code());
 
-    auto statisItem = resp.get_statis();
-    ASSERT_EQ(cpp2::JobStatus::FINISHED, statisItem.get_status());
-    ASSERT_EQ(2, statisItem.get_tag_vertices().size());
+    auto statsItem = resp.get_stats();
+    ASSERT_EQ(cpp2::JobStatus::FINISHED, statsItem.get_status());
+    ASSERT_EQ(2, statsItem.get_tag_vertices().size());
     int64_t tagCount = 0;
-    for (const auto& entry : statisItem.get_tag_vertices()) {
+    for (const auto& entry : statsItem.get_tag_vertices()) {
       tagCount += entry.second;
     }
     ASSERT_EQ(200, tagCount);
-    ASSERT_EQ(2, statisItem.get_edges().size());
+    ASSERT_EQ(2, statsItem.get_edges().size());
     int64_t edgeCount = 0;
-    for (const auto& entry : statisItem.get_edges()) {
+    for (const auto& entry : statsItem.get_edges()) {
       edgeCount += entry.second;
     }
     ASSERT_EQ(200, edgeCount);
-    ASSERT_EQ(200, statisItem.get_space_vertices());
-    ASSERT_EQ(200, statisItem.get_space_edges());
+    ASSERT_EQ(200, statsItem.get_space_vertices());
+    ASSERT_EQ(200, statsItem.get_space_edges());
   }
 
   // add statis job2 of same space
@@ -433,34 +433,34 @@ TEST_F(GetStatisTest, MockSingleMachineTest) {
     ASSERT_EQ(job2.id_, desc.id_);
     ASSERT_EQ(cpp2::JobStatus::FINISHED, desc.status_);
 
-    cpp2::GetStatisReq req;
+    cpp2::GetStatsReq req;
     req.set_space_id(spaceId);
-    auto* processor = GetStatisProcessor::instance(kv_.get());
+    auto* processor = GetStatsProcessor::instance(kv_.get());
     auto f = processor->getFuture();
     processor->process(req);
     auto resp = std::move(f).get();
     ASSERT_EQ(nebula::cpp2::ErrorCode::SUCCEEDED, resp.get_code());
 
-    auto statisItem = resp.get_statis();
-    ASSERT_EQ(cpp2::JobStatus::FINISHED, statisItem.get_status());
-    ASSERT_EQ(2, statisItem.get_tag_vertices().size());
+    auto statsItem = resp.get_stats();
+    ASSERT_EQ(cpp2::JobStatus::FINISHED, statsItem.get_status());
+    ASSERT_EQ(2, statsItem.get_tag_vertices().size());
     int64_t tagCount = 0;
-    for (const auto& entry : statisItem.get_tag_vertices()) {
+    for (const auto& entry : statsItem.get_tag_vertices()) {
       tagCount += entry.second;
     }
     ASSERT_EQ(400, tagCount);
-    ASSERT_EQ(2, statisItem.get_edges().size());
+    ASSERT_EQ(2, statsItem.get_edges().size());
     int64_t edgeCount = 0;
-    for (const auto& entry : statisItem.get_edges()) {
+    for (const auto& entry : statsItem.get_edges()) {
       edgeCount += entry.second;
     }
     ASSERT_EQ(400, edgeCount);
-    ASSERT_EQ(400, statisItem.get_space_vertices());
-    ASSERT_EQ(400, statisItem.get_space_edges());
+    ASSERT_EQ(400, statsItem.get_space_vertices());
+    ASSERT_EQ(400, statsItem.get_space_edges());
   }
 }
 
-TEST_F(GetStatisTest, MockMultiMachineTest) {
+TEST_F(GetStatsTest, MockMultiMachineTest) {
   GraphSpaceID spaceId = 1;
   // Because only send to leader, need to mock leader distribution
   std::map<HostAddr, ActiveHostsMan::AllLeaders> allStorage;
@@ -510,30 +510,30 @@ TEST_F(GetStatisTest, MockMultiMachineTest) {
     ASSERT_EQ(job.id_, desc.id_);
     ASSERT_EQ(cpp2::JobStatus::FINISHED, desc.status_);
 
-    cpp2::GetStatisReq req;
+    cpp2::GetStatsReq req;
     req.set_space_id(spaceId);
-    auto* processor = GetStatisProcessor::instance(kv_.get());
+    auto* processor = GetStatsProcessor::instance(kv_.get());
     auto f = processor->getFuture();
     processor->process(req);
     auto resp = std::move(f).get();
     ASSERT_EQ(nebula::cpp2::ErrorCode::SUCCEEDED, resp.get_code());
 
-    auto statisItem = resp.get_statis();
-    ASSERT_EQ(cpp2::JobStatus::FINISHED, statisItem.get_status());
-    ASSERT_EQ(2, statisItem.get_tag_vertices().size());
+    auto statsItem = resp.get_stats();
+    ASSERT_EQ(cpp2::JobStatus::FINISHED, statsItem.get_status());
+    ASSERT_EQ(2, statsItem.get_tag_vertices().size());
     int64_t tagCount = 0;
-    for (const auto& entry : statisItem.get_tag_vertices()) {
+    for (const auto& entry : statsItem.get_tag_vertices()) {
       tagCount += entry.second;
     }
     ASSERT_EQ((100 + 200 + 300) * 2, tagCount);
-    ASSERT_EQ(2, statisItem.get_edges().size());
+    ASSERT_EQ(2, statsItem.get_edges().size());
     int64_t edgeCount = 0;
-    for (const auto& entry : statisItem.get_edges()) {
+    for (const auto& entry : statsItem.get_edges()) {
       edgeCount += entry.second;
     }
     ASSERT_EQ((100 + 200 + 300) * 2, edgeCount);
-    ASSERT_EQ((100 + 200 + 300) * 2, statisItem.get_space_vertices());
-    ASSERT_EQ((100 + 200 + 300) * 2, statisItem.get_space_edges());
+    ASSERT_EQ((100 + 200 + 300) * 2, statsItem.get_space_vertices());
+    ASSERT_EQ((100 + 200 + 300) * 2, statsItem.get_space_edges());
   }
 }
 
diff --git a/src/meta/test/JobManagerTest.cpp b/src/meta/test/JobManagerTest.cpp
index be27ee9d5f9..0364772c875 100644
--- a/src/meta/test/JobManagerTest.cpp
+++ b/src/meta/test/JobManagerTest.cpp
@@ -106,7 +106,7 @@ TEST_F(JobManagerTest, AddRebuildEdgeIndexJob) {
   ASSERT_TRUE(result);
 }
 
-TEST_F(JobManagerTest, StatisJob) {
+TEST_F(JobManagerTest, StatsJob) {
   // For preventting job schedule in JobManager
   jobMgr->status_ = JobManager::JbmgrStatus::STOPPED;
 
diff --git a/src/meta/test/MockAdminClient.h b/src/meta/test/MockAdminClient.h
index 059fed5e488..d31fe867850 100644
--- a/src/meta/test/MockAdminClient.h
+++ b/src/meta/test/MockAdminClient.h
@@ -46,7 +46,7 @@ class MockAdminClient : public AdminClient {
                                      const std::vector<std::string>&,
                                      std::vector<PartitionID>,
                                      int,
-                                     cpp2::StatisItem*));
+                                     cpp2::StatsItem*));
   MOCK_METHOD3(stopTask, folly::Future<Status>(const std::vector<HostAddr>&, int32_t, int32_t));
 };
 
diff --git a/src/storage/CMakeLists.txt b/src/storage/CMakeLists.txt
index 83ad4496ebd..8589e5e6a83 100644
--- a/src/storage/CMakeLists.txt
+++ b/src/storage/CMakeLists.txt
@@ -20,7 +20,7 @@ nebula_add_library(
     admin/RebuildTagIndexTask.cpp
     admin/RebuildEdgeIndexTask.cpp
     admin/RebuildFTIndexTask.cpp
-    admin/StatisTask.cpp
+    admin/StatsTask.cpp
     admin/ListClusterInfoProcessor.cpp
 )
 
diff --git a/src/storage/CommonUtils.h b/src/storage/CommonUtils.h
index 8d6ce11d603..d3d44c6ec2b 100644
--- a/src/storage/CommonUtils.h
+++ b/src/storage/CommonUtils.h
@@ -154,8 +154,8 @@ class PlanContext {
 // not all processor use all following fields, just list all of them here.
 // todo(doodle): after filter is pushed down, I believe all field will not be
 // changed anymore during process
-struct RunTimeContext {
-  explicit RunTimeContext(PlanContext* planContext) : planContext_(planContext) {}
+struct RuntimeContext {
+  explicit RuntimeContext(PlanContext* planContext) : planContext_(planContext) {}
 
   StorageEnv* env() const { return planContext_->env_; }
 
diff --git a/src/storage/admin/AdminTask.cpp b/src/storage/admin/AdminTask.cpp
index c4ad59fb682..e5ac9188602 100644
--- a/src/storage/admin/AdminTask.cpp
+++ b/src/storage/admin/AdminTask.cpp
@@ -11,7 +11,7 @@
 #include "storage/admin/RebuildEdgeIndexTask.h"
 #include "storage/admin/RebuildFTIndexTask.h"
 #include "storage/admin/RebuildTagIndexTask.h"
-#include "storage/admin/StatisTask.h"
+#include "storage/admin/StatsTask.h"
 
 namespace nebula {
 namespace storage {
@@ -36,7 +36,7 @@ std::shared_ptr<AdminTask> AdminTaskFactory::createAdminTask(StorageEnv* env, Ta
       ret = std::make_shared<RebuildFTIndexTask>(env, std::move(ctx));
       break;
     case meta::cpp2::AdminCmd::STATS:
-      ret = std::make_shared<StatisTask>(env, std::move(ctx));
+      ret = std::make_shared<StatsTask>(env, std::move(ctx));
       break;
     default:
       break;
diff --git a/src/storage/admin/AdminTask.h b/src/storage/admin/AdminTask.h
index 4dab74facea..6576ed5c0ad 100644
--- a/src/storage/admin/AdminTask.h
+++ b/src/storage/admin/AdminTask.h
@@ -35,7 +35,7 @@ class AdminSubTask {
 enum class TaskPriority : int8_t { LO, MID, HI };
 
 struct TaskContext {
-  using CallBack = std::function<void(nebula::cpp2::ErrorCode, nebula::meta::cpp2::StatisItem&)>;
+  using CallBack = std::function<void(nebula::cpp2::ErrorCode, nebula::meta::cpp2::StatsItem&)>;
 
   TaskContext() = default;
   TaskContext(const cpp2::AddAdminTaskRequest& req, CallBack cb)
@@ -55,7 +55,7 @@ struct TaskContext {
 };
 
 class AdminTask {
-  using TCallBack = std::function<void(nebula::cpp2::ErrorCode, nebula::meta::cpp2::StatisItem&)>;
+  using TCallBack = std::function<void(nebula::cpp2::ErrorCode, nebula::meta::cpp2::StatsItem&)>;
   using SubTaskQueue = folly::UnboundedBlockingQueue<AdminSubTask>;
 
  public:
@@ -78,8 +78,8 @@ class AdminTask {
               ctx_.jobId_,
               ctx_.taskId_,
               apache::thrift::util::enumNameSafe(rc).c_str());
-    nebula::meta::cpp2::StatisItem statisItem;
-    ctx_.onFinish_(rc, statisItem);
+    nebula::meta::cpp2::StatsItem statsItem;
+    ctx_.onFinish_(rc, statsItem);
   }
 
   virtual int getJobId() { return ctx_.jobId_; }
diff --git a/src/storage/admin/AdminTaskProcessor.cpp b/src/storage/admin/AdminTaskProcessor.cpp
index c37a6fc26c0..c408cc9029e 100644
--- a/src/storage/admin/AdminTaskProcessor.cpp
+++ b/src/storage/admin/AdminTaskProcessor.cpp
@@ -18,11 +18,11 @@ void AdminTaskProcessor::process(const cpp2::AddAdminTaskRequest& req) {
   auto taskManager = AdminTaskManager::instance();
 
   auto cb = [env = env_, jobId = req.get_job_id(), taskId = req.get_task_id()](
-                nebula::cpp2::ErrorCode errCode, nebula::meta::cpp2::StatisItem& result) {
-    meta::cpp2::StatisItem* pStatis = nullptr;
+                nebula::cpp2::ErrorCode errCode, nebula::meta::cpp2::StatsItem& result) {
+    meta::cpp2::StatsItem* pStats = nullptr;
     if (errCode == nebula::cpp2::ErrorCode::SUCCEEDED &&
         *result.status_ref() == nebula::meta::cpp2::JobStatus::FINISHED) {
-      pStatis = &result;
+      pStats = &result;
     }
 
     LOG(INFO) << folly::sformat("reportTaskFinish(), job={}, task={}, rc={}",
@@ -33,7 +33,7 @@ void AdminTaskProcessor::process(const cpp2::AddAdminTaskRequest& req) {
     auto retry = 0;
     while (retry++ < maxRetry) {
       auto rc = nebula::cpp2::ErrorCode::SUCCEEDED;
-      auto fut = env->metaClient_->reportTaskFinish(jobId, taskId, errCode, pStatis);
+      auto fut = env->metaClient_->reportTaskFinish(jobId, taskId, errCode, pStats);
       fut.wait();
       if (!fut.hasValue()) {
         LOG(INFO) << folly::sformat(
@@ -73,8 +73,8 @@ void AdminTaskProcessor::process(const cpp2::AddAdminTaskRequest& req) {
   onFinished();
 }
 
-void AdminTaskProcessor::onProcessFinished(nebula::meta::cpp2::StatisItem& result) {
-  resp_.set_statis(std::move(result));
+void AdminTaskProcessor::onProcessFinished(nebula::meta::cpp2::StatsItem& result) {
+  resp_.set_stats(std::move(result));
 }
 
 }  // namespace storage
diff --git a/src/storage/admin/AdminTaskProcessor.h b/src/storage/admin/AdminTaskProcessor.h
index ac3be21e030..9cc144a4a62 100644
--- a/src/storage/admin/AdminTaskProcessor.h
+++ b/src/storage/admin/AdminTaskProcessor.h
@@ -26,7 +26,7 @@ class AdminTaskProcessor : public BaseProcessor<cpp2::AdminExecResp> {
  private:
   explicit AdminTaskProcessor(StorageEnv* env) : BaseProcessor<cpp2::AdminExecResp>(env) {}
 
-  void onProcessFinished(nebula::meta::cpp2::StatisItem& result);
+  void onProcessFinished(nebula::meta::cpp2::StatsItem& result);
 };
 
 }  // namespace storage
diff --git a/src/storage/admin/StatisTask.cpp b/src/storage/admin/StatsTask.cpp
similarity index 88%
rename from src/storage/admin/StatisTask.cpp
rename to src/storage/admin/StatsTask.cpp
index e08181be2aa..cadde8d7efb 100644
--- a/src/storage/admin/StatisTask.cpp
+++ b/src/storage/admin/StatsTask.cpp
@@ -4,7 +4,7 @@
  * attached with Common Clause Condition 1.0, found in the LICENSES directory.
  */
 
-#include "storage/admin/StatisTask.h"
+#include "storage/admin/StatsTask.h"
 
 #include <thrift/lib/cpp/util/EnumUtils.h>
 
@@ -15,7 +15,7 @@
 namespace nebula {
 namespace storage {
 
-nebula::cpp2::ErrorCode StatisTask::getSchemas(GraphSpaceID spaceId) {
+nebula::cpp2::ErrorCode StatsTask::getSchemas(GraphSpaceID spaceId) {
   CHECK_NOTNULL(env_->schemaMan_);
   auto tags = env_->schemaMan_->getAllVerTagSchema(spaceId);
   if (!tags.ok()) {
@@ -49,7 +49,7 @@ nebula::cpp2::ErrorCode StatisTask::getSchemas(GraphSpaceID spaceId) {
   return nebula::cpp2::ErrorCode::SUCCEEDED;
 }
 
-ErrorOr<nebula::cpp2::ErrorCode, std::vector<AdminSubTask>> StatisTask::genSubTasks() {
+ErrorOr<nebula::cpp2::ErrorCode, std::vector<AdminSubTask>> StatsTask::genSubTasks() {
   spaceId_ = *ctx_.parameters_.space_id_ref();
   auto parts = *ctx_.parameters_.parts_ref();
   subTaskSize_ = parts.size();
@@ -63,17 +63,17 @@ ErrorOr<nebula::cpp2::ErrorCode, std::vector<AdminSubTask>> StatisTask::genSubTa
   std::vector<AdminSubTask> tasks;
   for (const auto& part : parts) {
     std::function<nebula::cpp2::ErrorCode()> task =
-        std::bind(&StatisTask::genSubTask, this, spaceId_, part, tags_, edges_);
+        std::bind(&StatsTask::genSubTask, this, spaceId_, part, tags_, edges_);
     tasks.emplace_back(std::move(task));
   }
   return tasks;
 }
 
-// Statis the specified tags and edges
-nebula::cpp2::ErrorCode StatisTask::genSubTask(GraphSpaceID spaceId,
-                                               PartitionID part,
-                                               std::unordered_map<TagID, std::string> tags,
-                                               std::unordered_map<EdgeType, std::string> edges) {
+// Stats the specified tags and edges
+nebula::cpp2::ErrorCode StatsTask::genSubTask(GraphSpaceID spaceId,
+                                              PartitionID part,
+                                              std::unordered_map<TagID, std::string> tags,
+                                              std::unordered_map<EdgeType, std::string> edges) {
   auto vIdLenRet = env_->schemaMan_->getSpaceVidLen(spaceId);
   if (!vIdLenRet.ok()) {
     LOG(ERROR) << "Get space vid length failed";
@@ -106,12 +106,12 @@ nebula::cpp2::ErrorCode StatisTask::genSubTask(GraphSpaceID spaceId,
   // follower instead of reporting an error.
   auto ret = env_->kvstore_->prefix(spaceId, part, vertexPrefix, &vertexIter, true);
   if (ret != nebula::cpp2::ErrorCode::SUCCEEDED) {
-    LOG(ERROR) << "Statis task failed";
+    LOG(ERROR) << "Stats task failed";
     return ret;
   }
   ret = env_->kvstore_->prefix(spaceId, part, edgePrefix, &edgeIter, true);
   if (ret != nebula::cpp2::ErrorCode::SUCCEEDED) {
-    LOG(ERROR) << "Statis task failed";
+    LOG(ERROR) << "Stats task failed";
     return ret;
   }
 
@@ -206,24 +206,24 @@ nebula::cpp2::ErrorCode StatisTask::genSubTask(GraphSpaceID spaceId,
     edgeIter->next();
   }
 
-  nebula::meta::cpp2::StatisItem statisItem;
+  nebula::meta::cpp2::StatsItem statsItem;
 
   // convert tagId/edgeType to tagName/edgeName
   for (auto& tagElem : tagsVertices) {
     auto iter = tags_.find(tagElem.first);
     if (iter != tags_.end()) {
-      (*statisItem.tag_vertices_ref()).emplace(iter->second, tagElem.second);
+      (*statsItem.tag_vertices_ref()).emplace(iter->second, tagElem.second);
     }
   }
   for (auto& edgeElem : edgetypeEdges) {
     auto iter = edges_.find(edgeElem.first);
     if (iter != edges_.end()) {
-      (*statisItem.edges_ref()).emplace(iter->second, edgeElem.second);
+      (*statsItem.edges_ref()).emplace(iter->second, edgeElem.second);
     }
   }
 
-  statisItem.set_space_vertices(spaceVertices);
-  statisItem.set_space_edges(spaceEdges);
+  statsItem.set_space_vertices(spaceVertices);
+  statsItem.set_space_edges(spaceEdges);
   using Correlativiyties = std::vector<nebula::meta::cpp2::Correlativity>;
   Correlativiyties positiveCorrelativity;
   for (const auto& entry : positiveRelevancy) {
@@ -255,23 +255,23 @@ nebula::cpp2::ErrorCode StatisTask::genSubTask(GraphSpaceID spaceId,
 
   std::unordered_map<PartitionID, Correlativiyties> positivePartCorrelativiyties;
   positivePartCorrelativiyties[part] = positiveCorrelativity;
-  statisItem.set_positive_part_correlativity(std::move(positivePartCorrelativiyties));
+  statsItem.set_positive_part_correlativity(std::move(positivePartCorrelativiyties));
 
   std::unordered_map<PartitionID, Correlativiyties> negativePartCorrelativiyties;
   negativePartCorrelativiyties[part] = negativeCorrelativity;
-  statisItem.set_negative_part_correlativity(std::move(negativePartCorrelativiyties));
+  statsItem.set_negative_part_correlativity(std::move(negativePartCorrelativiyties));
 
-  statistics_.emplace(part, std::move(statisItem));
-  LOG(INFO) << "Statis task finished";
+  statistics_.emplace(part, std::move(statsItem));
+  LOG(INFO) << "Stats task finished";
   return nebula::cpp2::ErrorCode::SUCCEEDED;
 }
 
-void StatisTask::finish(nebula::cpp2::ErrorCode rc) {
+void StatsTask::finish(nebula::cpp2::ErrorCode rc) {
   FLOG_INFO("task(%d, %d) finished, rc=[%s]",
             ctx_.jobId_,
             ctx_.taskId_,
             apache::thrift::util::enumNameSafe(rc).c_str());
-  nebula::meta::cpp2::StatisItem result;
+  nebula::meta::cpp2::StatsItem result;
   result.set_status(nebula::meta::cpp2::JobStatus::FAILED);
 
   if (rc == nebula::cpp2::ErrorCode::SUCCEEDED && statistics_.size() == subTaskSize_) {
diff --git a/src/storage/admin/StatisTask.h b/src/storage/admin/StatsTask.h
similarity index 82%
rename from src/storage/admin/StatisTask.h
rename to src/storage/admin/StatsTask.h
index 9ab8addcee4..43ee91bad2d 100644
--- a/src/storage/admin/StatisTask.h
+++ b/src/storage/admin/StatsTask.h
@@ -4,8 +4,8 @@
  * attached with Common Clause Condition 1.0, found in the LICENSES directory.
  */
 
-#ifndef STORAGE_ADMIN_STATISTASK_H_
-#define STORAGE_ADMIN_STATISTASK_H_
+#ifndef STORAGE_ADMIN_STATSTASK_H_
+#define STORAGE_ADMIN_STATSTASK_H_
 
 #include "common/thrift/ThriftTypes.h"
 #include "interface/gen-cpp2/meta_types.h"
@@ -16,12 +16,12 @@
 namespace nebula {
 namespace storage {
 
-class StatisTask : public AdminTask {
+class StatsTask : public AdminTask {
  public:
   using AdminTask::finish;
-  StatisTask(StorageEnv* env, TaskContext&& ctx) : AdminTask(env, std::move(ctx)) {}
+  StatsTask(StorageEnv* env, TaskContext&& ctx) : AdminTask(env, std::move(ctx)) {}
 
-  ~StatisTask() { LOG(INFO) << "Release Statis Task"; }
+  ~StatsTask() { LOG(INFO) << "Release Stats Task"; }
 
   ErrorOr<nebula::cpp2::ErrorCode, std::vector<AdminSubTask>> genSubTasks() override;
 
@@ -48,7 +48,7 @@ class StatisTask : public AdminTask {
   // All edgeTypes and edgeName of the spaceId
   std::unordered_map<EdgeType, std::string> edges_;
 
-  folly::ConcurrentHashMap<PartitionID, nebula::meta::cpp2::StatisItem> statistics_;
+  folly::ConcurrentHashMap<PartitionID, nebula::meta::cpp2::StatsItem> statistics_;
 
   // The number of subtasks equals to the number of parts in request
   size_t subTaskSize_{0};
@@ -57,4 +57,4 @@ class StatisTask : public AdminTask {
 }  // namespace storage
 }  // namespace nebula
 
-#endif  // STORAGE_ADMIN_STATISTASK_H_
+#endif  // STORAGE_ADMIN_STATSTASK_H_
diff --git a/src/storage/exec/AggregateNode.h b/src/storage/exec/AggregateNode.h
index 0ddf4f0029f..f90f224ff38 100644
--- a/src/storage/exec/AggregateNode.h
+++ b/src/storage/exec/AggregateNode.h
@@ -37,7 +37,7 @@ class AggregateNode : public IterateNode<T> {
  public:
   using RelNode<T>::execute;
 
-  AggregateNode(RunTimeContext* context, IterateNode<T>* upstream, EdgeContext* edgeContext)
+  AggregateNode(RuntimeContext* context, IterateNode<T>* upstream, EdgeContext* edgeContext)
       : IterateNode<T>(upstream), context_(context), edgeContext_(edgeContext) {}
 
   nebula::cpp2::ErrorCode execute(PartitionID partId, const T& input) override {
@@ -144,7 +144,7 @@ class AggregateNode : public IterateNode<T> {
   }
 
  private:
-  RunTimeContext* context_;
+  RuntimeContext* context_;
   EdgeContext* edgeContext_;
   std::vector<PropStat> stats_;
   nebula::DataSet* resultSet_;
diff --git a/src/storage/exec/EdgeNode.h b/src/storage/exec/EdgeNode.h
index 6f1d1b8fa81..a63285b9820 100644
--- a/src/storage/exec/EdgeNode.h
+++ b/src/storage/exec/EdgeNode.h
@@ -32,7 +32,7 @@ class EdgeNode : public IterateNode<T> {
   const std::string& getEdgeName() { return edgeName_; }
 
  protected:
-  EdgeNode(RunTimeContext* context,
+  EdgeNode(RuntimeContext* context,
            EdgeContext* edgeContext,
            EdgeType edgeType,
            const std::vector<PropContext>* props,
@@ -54,9 +54,9 @@ class EdgeNode : public IterateNode<T> {
     edgeName_ = edgeContext_->edgeNames_[edgeType_];
   }
 
-  EdgeNode(RunTimeContext* context, EdgeContext* ctx) : context_(context), edgeContext_(ctx) {}
+  EdgeNode(RuntimeContext* context, EdgeContext* ctx) : context_(context), edgeContext_(ctx) {}
 
-  RunTimeContext* context_;
+  RuntimeContext* context_;
   EdgeContext* edgeContext_;
   EdgeType edgeType_;
   const std::vector<PropContext>* props_;
@@ -73,7 +73,7 @@ class FetchEdgeNode final : public EdgeNode<cpp2::EdgeKey> {
  public:
   using RelNode::execute;
 
-  FetchEdgeNode(RunTimeContext* context,
+  FetchEdgeNode(RuntimeContext* context,
                 EdgeContext* edgeContext,
                 EdgeType edgeType,
                 const std::vector<PropContext>* props,
@@ -144,7 +144,7 @@ class FetchEdgeNode final : public EdgeNode<cpp2::EdgeKey> {
 class SingleEdgeNode final : public EdgeNode<VertexID> {
  public:
   using RelNode::execute;
-  SingleEdgeNode(RunTimeContext* context,
+  SingleEdgeNode(RuntimeContext* context,
                  EdgeContext* edgeContext,
                  EdgeType edgeType,
                  const std::vector<PropContext>* props,
diff --git a/src/storage/exec/FilterNode.h b/src/storage/exec/FilterNode.h
index ca8f20f7876..b1fbc5d06bb 100644
--- a/src/storage/exec/FilterNode.h
+++ b/src/storage/exec/FilterNode.h
@@ -32,7 +32,7 @@ class FilterNode : public IterateNode<T> {
  public:
   using RelNode<T>::execute;
 
-  FilterNode(RunTimeContext* context,
+  FilterNode(RuntimeContext* context,
              IterateNode<T>* upstream,
              StorageExpressionContext* expCtx = nullptr,
              Expression* exp = nullptr)
@@ -76,7 +76,7 @@ class FilterNode : public IterateNode<T> {
   }
 
  private:
-  RunTimeContext* context_;
+  RuntimeContext* context_;
   StorageExpressionContext* expCtx_;
   Expression* filterExp_;
 };
diff --git a/src/storage/exec/GetNeighborsNode.h b/src/storage/exec/GetNeighborsNode.h
index f4c86369dea..5f0b3e0eaf1 100644
--- a/src/storage/exec/GetNeighborsNode.h
+++ b/src/storage/exec/GetNeighborsNode.h
@@ -24,7 +24,7 @@ class GetNeighborsNode : public QueryNode<VertexID> {
  public:
   using RelNode::execute;
 
-  GetNeighborsNode(RunTimeContext* context,
+  GetNeighborsNode(RuntimeContext* context,
                    IterateNode<VertexID>* hashJoinNode,
                    IterateNode<VertexID>* upstream,
                    EdgeContext* edgeContext,
@@ -116,7 +116,7 @@ class GetNeighborsNode : public QueryNode<VertexID> {
     return nebula::cpp2::ErrorCode::SUCCEEDED;
   }
 
-  RunTimeContext* context_;
+  RuntimeContext* context_;
   IterateNode<VertexID>* hashJoinNode_;
   IterateNode<VertexID>* upstream_;
   EdgeContext* edgeContext_;
@@ -126,7 +126,7 @@ class GetNeighborsNode : public QueryNode<VertexID> {
 
 class GetNeighborsSampleNode : public GetNeighborsNode {
  public:
-  GetNeighborsSampleNode(RunTimeContext* context,
+  GetNeighborsSampleNode(RuntimeContext* context,
                          IterateNode<VertexID>* hashJoinNode,
                          IterateNode<VertexID>* upstream,
                          EdgeContext* edgeContext,
diff --git a/src/storage/exec/GetPropNode.h b/src/storage/exec/GetPropNode.h
index 6824703c0ea..275c6c02fa3 100644
--- a/src/storage/exec/GetPropNode.h
+++ b/src/storage/exec/GetPropNode.h
@@ -18,7 +18,7 @@ class GetTagPropNode : public QueryNode<VertexID> {
  public:
   using RelNode<VertexID>::execute;
 
-  explicit GetTagPropNode(RunTimeContext* context,
+  explicit GetTagPropNode(RuntimeContext* context,
                           std::vector<TagNode*> tagNodes,
                           nebula::DataSet* resultDataSet)
       : context_(context), tagNodes_(std::move(tagNodes)), resultDataSet_(resultDataSet) {}
@@ -73,7 +73,7 @@ class GetTagPropNode : public QueryNode<VertexID> {
   }
 
  private:
-  RunTimeContext* context_;
+  RuntimeContext* context_;
   std::vector<TagNode*> tagNodes_;
   nebula::DataSet* resultDataSet_;
 };
@@ -82,7 +82,7 @@ class GetEdgePropNode : public QueryNode<cpp2::EdgeKey> {
  public:
   using RelNode::execute;
 
-  GetEdgePropNode(RunTimeContext* context,
+  GetEdgePropNode(RuntimeContext* context,
                   std::vector<EdgeNode<cpp2::EdgeKey>*> edgeNodes,
                   nebula::DataSet* resultDataSet)
       : context_(context), edgeNodes_(std::move(edgeNodes)), resultDataSet_(resultDataSet) {}
@@ -124,7 +124,7 @@ class GetEdgePropNode : public QueryNode<cpp2::EdgeKey> {
   }
 
  private:
-  RunTimeContext* context_;
+  RuntimeContext* context_;
   std::vector<EdgeNode<cpp2::EdgeKey>*> edgeNodes_;
   nebula::DataSet* resultDataSet_;
 };
diff --git a/src/storage/exec/HashJoinNode.h b/src/storage/exec/HashJoinNode.h
index 13f86d618fd..545ee04697e 100644
--- a/src/storage/exec/HashJoinNode.h
+++ b/src/storage/exec/HashJoinNode.h
@@ -25,7 +25,7 @@ class HashJoinNode : public IterateNode<VertexID> {
  public:
   using RelNode::execute;
 
-  HashJoinNode(RunTimeContext* context,
+  HashJoinNode(RuntimeContext* context,
                const std::vector<TagNode*>& tagNodes,
                const std::vector<SingleEdgeNode*>& edgeNodes,
                TagContext* tagContext,
@@ -147,7 +147,7 @@ class HashJoinNode : public IterateNode<VertexID> {
   }
 
  private:
-  RunTimeContext* context_;
+  RuntimeContext* context_;
   std::vector<TagNode*> tagNodes_;
   std::vector<SingleEdgeNode*> edgeNodes_;
   TagContext* tagContext_;
diff --git a/src/storage/exec/IndexEdgeNode.h b/src/storage/exec/IndexEdgeNode.h
index 6b931d364f1..7759388da1d 100644
--- a/src/storage/exec/IndexEdgeNode.h
+++ b/src/storage/exec/IndexEdgeNode.h
@@ -18,7 +18,7 @@ class IndexEdgeNode final : public RelNode<T> {
  public:
   using RelNode<T>::execute;
 
-  IndexEdgeNode(RunTimeContext* context,
+  IndexEdgeNode(RuntimeContext* context,
                 IndexScanNode<T>* indexScanNode,
                 const std::vector<std::shared_ptr<const meta::NebulaSchemaProvider>>& schemas,
                 const std::string& schemaName)
@@ -84,7 +84,7 @@ class IndexEdgeNode final : public RelNode<T> {
   const std::string& getSchemaName() { return schemaName_; }
 
  private:
-  RunTimeContext* context_;
+  RuntimeContext* context_;
   IndexScanNode<T>* indexScanNode_;
   const std::vector<std::shared_ptr<const meta::NebulaSchemaProvider>>& schemas_;
   const std::string& schemaName_;
diff --git a/src/storage/exec/IndexOutputNode.h b/src/storage/exec/IndexOutputNode.h
index 9fd7d3a0435..0ada081bed5 100644
--- a/src/storage/exec/IndexOutputNode.h
+++ b/src/storage/exec/IndexOutputNode.h
@@ -33,7 +33,7 @@ class IndexOutputNode final : public RelNode<T> {
   };
 
   IndexOutputNode(nebula::DataSet* result,
-                  RunTimeContext* context,
+                  RuntimeContext* context,
                   IndexScanNode<T>* indexScanNode,
                   bool hasNullableCol,
                   const std::vector<meta::cpp2::ColumnDef>& fields)
@@ -46,20 +46,20 @@ class IndexOutputNode final : public RelNode<T> {
                                : IndexResultType::kVertexFromIndexScan;
   }
 
-  IndexOutputNode(nebula::DataSet* result, RunTimeContext* context, IndexEdgeNode<T>* indexEdgeNode)
+  IndexOutputNode(nebula::DataSet* result, RuntimeContext* context, IndexEdgeNode<T>* indexEdgeNode)
       : result_(result), context_(context), indexEdgeNode_(indexEdgeNode) {
     type_ = IndexResultType::kEdgeFromDataScan;
   }
 
   IndexOutputNode(nebula::DataSet* result,
-                  RunTimeContext* context,
+                  RuntimeContext* context,
                   IndexVertexNode<T>* indexVertexNode)
       : result_(result), context_(context), indexVertexNode_(indexVertexNode) {
     type_ = IndexResultType::kVertexFromDataScan;
   }
 
   IndexOutputNode(nebula::DataSet* result,
-                  RunTimeContext* context,
+                  RuntimeContext* context,
                   IndexFilterNode<T>* indexFilterNode,
                   bool indexFilter = false)
       : result_(result), context_(context), indexFilterNode_(indexFilterNode) {
@@ -334,7 +334,7 @@ class IndexOutputNode final : public RelNode<T> {
 
  private:
   nebula::DataSet* result_;
-  RunTimeContext* context_;
+  RuntimeContext* context_;
   IndexResultType type_;
   IndexScanNode<T>* indexScanNode_{nullptr};
   IndexEdgeNode<T>* indexEdgeNode_{nullptr};
diff --git a/src/storage/exec/IndexScanNode.h b/src/storage/exec/IndexScanNode.h
index 7279db6c5bf..c6baacb9fd5 100644
--- a/src/storage/exec/IndexScanNode.h
+++ b/src/storage/exec/IndexScanNode.h
@@ -18,7 +18,7 @@ class IndexScanNode : public RelNode<T> {
  public:
   using RelNode<T>::execute;
 
-  IndexScanNode(RunTimeContext* context,
+  IndexScanNode(RuntimeContext* context,
                 IndexID indexId,
                 std::vector<cpp2::IndexColumnHint> columnHints)
       : context_(context), indexId_(indexId), columnHints_(std::move(columnHints)) {
@@ -162,7 +162,7 @@ class IndexScanNode : public RelNode<T> {
   }
 
  private:
-  RunTimeContext* context_;
+  RuntimeContext* context_;
   IndexID indexId_;
   bool isRangeScan_{false};
   std::unique_ptr<IndexIterator> iter_;
diff --git a/src/storage/exec/IndexVertexNode.h b/src/storage/exec/IndexVertexNode.h
index c067d80e8c5..a44b4def21b 100644
--- a/src/storage/exec/IndexVertexNode.h
+++ b/src/storage/exec/IndexVertexNode.h
@@ -18,7 +18,7 @@ class IndexVertexNode final : public RelNode<T> {
  public:
   using RelNode<T>::execute;
 
-  IndexVertexNode(RunTimeContext* context,
+  IndexVertexNode(RuntimeContext* context,
                   IndexScanNode<T>* indexScanNode,
                   const std::vector<std::shared_ptr<const meta::NebulaSchemaProvider>>& schemas,
                   const std::string& schemaName)
@@ -75,7 +75,7 @@ class IndexVertexNode final : public RelNode<T> {
   const std::string& getSchemaName() { return schemaName_; }
 
  private:
-  RunTimeContext* context_;
+  RuntimeContext* context_;
   IndexScanNode<T>* indexScanNode_;
   const std::vector<std::shared_ptr<const meta::NebulaSchemaProvider>>& schemas_;
   const std::string& schemaName_;
diff --git a/src/storage/exec/StorageIterator.h b/src/storage/exec/StorageIterator.h
index 71c29b653d9..e5d281f1d20 100644
--- a/src/storage/exec/StorageIterator.h
+++ b/src/storage/exec/StorageIterator.h
@@ -36,7 +36,7 @@ class StorageIterator {
 class SingleEdgeIterator : public StorageIterator {
  public:
   SingleEdgeIterator() = default;
-  SingleEdgeIterator(RunTimeContext* context,
+  SingleEdgeIterator(RuntimeContext* context,
                      std::unique_ptr<kvstore::KVIterator> iter,
                      EdgeType edgeType,
                      const std::vector<std::shared_ptr<const meta::NebulaSchemaProvider>>* schemas,
@@ -91,7 +91,7 @@ class SingleEdgeIterator : public StorageIterator {
     return true;
   }
 
-  RunTimeContext* context_;
+  RuntimeContext* context_;
   std::unique_ptr<kvstore::KVIterator> iter_;
   EdgeType edgeType_;
   const std::vector<std::shared_ptr<const meta::NebulaSchemaProvider>>* schemas_ = nullptr;
diff --git a/src/storage/exec/TagNode.h b/src/storage/exec/TagNode.h
index 3ebdb0e0da7..20ef21a78f8 100644
--- a/src/storage/exec/TagNode.h
+++ b/src/storage/exec/TagNode.h
@@ -19,7 +19,7 @@ class TagNode final : public IterateNode<VertexID> {
  public:
   using RelNode::execute;
 
-  TagNode(RunTimeContext* context,
+  TagNode(RuntimeContext* context,
           TagContext* ctx,
           TagID tagId,
           const std::vector<PropContext>* props,
@@ -98,7 +98,7 @@ class TagNode final : public IterateNode<VertexID> {
     valid_ = true;
   }
 
-  RunTimeContext* context_;
+  RuntimeContext* context_;
   TagContext* tagContext_;
   TagID tagId_;
   const std::vector<PropContext>* props_;
diff --git a/src/storage/exec/UpdateNode.h b/src/storage/exec/UpdateNode.h
index b49cf4db947..05e56ab5cdc 100644
--- a/src/storage/exec/UpdateNode.h
+++ b/src/storage/exec/UpdateNode.h
@@ -22,7 +22,7 @@ namespace storage {
 template <typename T>
 class UpdateNode : public RelNode<T> {
  public:
-  UpdateNode(RunTimeContext* context,
+  UpdateNode(RuntimeContext* context,
              std::vector<std::shared_ptr<nebula::meta::cpp2::IndexItem>> indexes,
              std::vector<storage::cpp2::UpdatedProp>& updatedProps,
              FilterNode<T>* filterNode,
@@ -120,7 +120,7 @@ class UpdateNode : public RelNode<T> {
  protected:
   // ============================ input
   // =====================================================
-  RunTimeContext* context_;
+  RuntimeContext* context_;
   std::vector<std::shared_ptr<nebula::meta::cpp2::IndexItem>> indexes_;
   // update <prop name, new value expression>
   std::vector<storage::cpp2::UpdatedProp> updatedProps_;
@@ -153,7 +153,7 @@ class UpdateTagNode : public UpdateNode<VertexID> {
  public:
   using RelNode<VertexID>::execute;
 
-  UpdateTagNode(RunTimeContext* context,
+  UpdateTagNode(RuntimeContext* context,
                 std::vector<std::shared_ptr<nebula::meta::cpp2::IndexItem>> indexes,
                 std::vector<storage::cpp2::UpdatedProp>& updatedProps,
                 FilterNode<VertexID>* filterNode,
@@ -430,7 +430,7 @@ class UpdateEdgeNode : public UpdateNode<cpp2::EdgeKey> {
  public:
   using RelNode<cpp2::EdgeKey>::execute;
 
-  UpdateEdgeNode(RunTimeContext* context,
+  UpdateEdgeNode(RuntimeContext* context,
                  std::vector<std::shared_ptr<nebula::meta::cpp2::IndexItem>> indexes,
                  std::vector<storage::cpp2::UpdatedProp>& updatedProps,
                  FilterNode<cpp2::EdgeKey>* filterNode,
diff --git a/src/storage/exec/UpdateResultNode.h b/src/storage/exec/UpdateResultNode.h
index d163d0e3fdc..0fd6f14fcc4 100644
--- a/src/storage/exec/UpdateResultNode.h
+++ b/src/storage/exec/UpdateResultNode.h
@@ -19,7 +19,7 @@ class UpdateResNode : public RelNode<T> {
  public:
   using RelNode<T>::execute;
 
-  UpdateResNode(RunTimeContext* context,
+  UpdateResNode(RuntimeContext* context,
                 RelNode<T>* updateNode,
                 std::vector<Expression*> returnPropsExp,
                 StorageExpressionContext* expCtx,
@@ -60,7 +60,7 @@ class UpdateResNode : public RelNode<T> {
   }
 
  private:
-  RunTimeContext* context_;
+  RuntimeContext* context_;
   RelNode<T>* updateNode_;
   std::vector<Expression*> returnPropsExp_;
   StorageExpressionContext* expCtx_;
diff --git a/src/storage/index/LookupBaseProcessor-inl.h b/src/storage/index/LookupBaseProcessor-inl.h
index 0888b0c4afe..069bd9bd52e 100644
--- a/src/storage/index/LookupBaseProcessor-inl.h
+++ b/src/storage/index/LookupBaseProcessor-inl.h
@@ -23,7 +23,7 @@ nebula::cpp2::ErrorCode LookupBaseProcessor<REQ, RESP>::requestCheck(
       std::make_unique<PlanContext>(this->env_, spaceId_, this->spaceVidLen_, this->isIntId_);
   const auto& indices = req.get_indices();
   this->planContext_->isEdge_ = indices.get_is_edge();
-  this->context_ = std::make_unique<RunTimeContext>(this->planContext_.get());
+  this->context_ = std::make_unique<RuntimeContext>(this->planContext_.get());
   if (context_->isEdge()) {
     context_->edgeType_ = indices.get_tag_or_edge_id();
     auto edgeName = this->env_->schemaMan_->toEdgeName(spaceId_, context_->edgeType_);
diff --git a/src/storage/index/LookupBaseProcessor.h b/src/storage/index/LookupBaseProcessor.h
index 8d8042e64b4..967b4752d7c 100644
--- a/src/storage/index/LookupBaseProcessor.h
+++ b/src/storage/index/LookupBaseProcessor.h
@@ -71,7 +71,7 @@ class LookupBaseProcessor : public BaseProcessor<RESP> {
  protected:
   GraphSpaceID spaceId_;
   std::unique_ptr<PlanContext> planContext_;
-  std::unique_ptr<RunTimeContext> context_;
+  std::unique_ptr<RuntimeContext> context_;
   folly::Executor* executor_{nullptr};
   nebula::DataSet resultDataSet_;
   std::vector<nebula::DataSet> partResults_;
diff --git a/src/storage/mutate/UpdateEdgeProcessor.cpp b/src/storage/mutate/UpdateEdgeProcessor.cpp
index 0ebf36f84bb..e4f1010a428 100644
--- a/src/storage/mutate/UpdateEdgeProcessor.cpp
+++ b/src/storage/mutate/UpdateEdgeProcessor.cpp
@@ -53,7 +53,7 @@ void UpdateEdgeProcessor::doProcess(const cpp2::UpdateEdgeRequest& req) {
   }
 
   planContext_ = std::make_unique<PlanContext>(env_, spaceId_, spaceVidLen_, isIntId_);
-  context_ = std::make_unique<RunTimeContext>(planContext_.get());
+  context_ = std::make_unique<RuntimeContext>(planContext_.get());
   if (env_->txnMan_ && env_->txnMan_->enableToss(spaceId_)) {
     planContext_->defaultEdgeVer_ = 1L;
   }
diff --git a/src/storage/mutate/UpdateEdgeProcessor.h b/src/storage/mutate/UpdateEdgeProcessor.h
index aaf41fdbc66..6976e0209d9 100644
--- a/src/storage/mutate/UpdateEdgeProcessor.h
+++ b/src/storage/mutate/UpdateEdgeProcessor.h
@@ -59,7 +59,7 @@ class UpdateEdgeProcessor
   }
 
  private:
-  std::unique_ptr<RunTimeContext> context_;
+  std::unique_ptr<RuntimeContext> context_;
   bool insertable_{false};
 
   cpp2::EdgeKey edgeKey_;
diff --git a/src/storage/mutate/UpdateVertexProcessor.cpp b/src/storage/mutate/UpdateVertexProcessor.cpp
index e5f6aa983be..49ddd043273 100644
--- a/src/storage/mutate/UpdateVertexProcessor.cpp
+++ b/src/storage/mutate/UpdateVertexProcessor.cpp
@@ -51,7 +51,7 @@ void UpdateVertexProcessor::doProcess(const cpp2::UpdateVertexRequest& req) {
     return;
   }
   planContext_ = std::make_unique<PlanContext>(env_, spaceId_, spaceVidLen_, isIntId_);
-  context_ = std::make_unique<RunTimeContext>(planContext_.get());
+  context_ = std::make_unique<RuntimeContext>(planContext_.get());
 
   retCode = checkAndBuildContexts(req);
   if (retCode != nebula::cpp2::ErrorCode::SUCCEEDED) {
diff --git a/src/storage/mutate/UpdateVertexProcessor.h b/src/storage/mutate/UpdateVertexProcessor.h
index 7d47984f221..c74d26efa3b 100644
--- a/src/storage/mutate/UpdateVertexProcessor.h
+++ b/src/storage/mutate/UpdateVertexProcessor.h
@@ -60,7 +60,7 @@ class UpdateVertexProcessor
   }
 
  private:
-  std::unique_ptr<RunTimeContext> context_;
+  std::unique_ptr<RuntimeContext> context_;
   bool insertable_{false};
 
   // update tagId
diff --git a/src/storage/query/GetNeighborsProcessor.cpp b/src/storage/query/GetNeighborsProcessor.cpp
index 158cce6bf93..5c6380d3a9d 100644
--- a/src/storage/query/GetNeighborsProcessor.cpp
+++ b/src/storage/query/GetNeighborsProcessor.cpp
@@ -71,7 +71,7 @@ void GetNeighborsProcessor::doProcess(const cpp2::GetNeighborsRequest& req) {
 void GetNeighborsProcessor::runInSingleThread(const cpp2::GetNeighborsRequest& req,
                                               int64_t limit,
                                               bool random) {
-  contexts_.emplace_back(RunTimeContext(planContext_.get()));
+  contexts_.emplace_back(RuntimeContext(planContext_.get()));
   expCtxs_.emplace_back(StorageExpressionContext(spaceVidLen_, isIntId_));
   auto plan = buildPlan(&contexts_.front(), &expCtxs_.front(), &resultDataSet_, limit, random);
   std::unordered_set<PartitionID> failedParts;
@@ -109,7 +109,7 @@ void GetNeighborsProcessor::runInMultipleThread(const cpp2::GetNeighborsRequest&
   for (size_t i = 0; i < req.get_parts().size(); i++) {
     nebula::DataSet result = resultDataSet_;
     results_.emplace_back(std::move(result));
-    contexts_.emplace_back(RunTimeContext(planContext_.get()));
+    contexts_.emplace_back(RuntimeContext(planContext_.get()));
     expCtxs_.emplace_back(StorageExpressionContext(spaceVidLen_, isIntId_));
   }
   size_t i = 0;
@@ -138,7 +138,7 @@ void GetNeighborsProcessor::runInMultipleThread(const cpp2::GetNeighborsRequest&
 }
 
 folly::Future<std::pair<nebula::cpp2::ErrorCode, PartitionID>> GetNeighborsProcessor::runInExecutor(
-    RunTimeContext* context,
+    RuntimeContext* context,
     StorageExpressionContext* expCtx,
     nebula::DataSet* result,
     PartitionID partId,
@@ -168,7 +168,7 @@ folly::Future<std::pair<nebula::cpp2::ErrorCode, PartitionID>> GetNeighborsProce
       });
 }
 
-StoragePlan<VertexID> GetNeighborsProcessor::buildPlan(RunTimeContext* context,
+StoragePlan<VertexID> GetNeighborsProcessor::buildPlan(RuntimeContext* context,
                                                        StorageExpressionContext* expCtx,
                                                        nebula::DataSet* result,
                                                        int64_t limit,
diff --git a/src/storage/query/GetNeighborsProcessor.h b/src/storage/query/GetNeighborsProcessor.h
index 3a3a55d162f..cb085722561 100644
--- a/src/storage/query/GetNeighborsProcessor.h
+++ b/src/storage/query/GetNeighborsProcessor.h
@@ -38,7 +38,7 @@ class GetNeighborsProcessor
       : QueryBaseProcessor<cpp2::GetNeighborsRequest, cpp2::GetNeighborsResponse>(
             env, counters, executor) {}
 
-  StoragePlan<VertexID> buildPlan(RunTimeContext* context,
+  StoragePlan<VertexID> buildPlan(RuntimeContext* context,
                                   StorageExpressionContext* expCtx,
                                   nebula::DataSet* result,
                                   int64_t limit = 0,
@@ -68,7 +68,7 @@ class GetNeighborsProcessor
   void runInMultipleThread(const cpp2::GetNeighborsRequest& req, int64_t limit, bool random);
 
   folly::Future<std::pair<nebula::cpp2::ErrorCode, PartitionID>> runInExecutor(
-      RunTimeContext* context,
+      RuntimeContext* context,
       StorageExpressionContext* expCtx,
       nebula::DataSet* result,
       PartitionID partId,
@@ -77,7 +77,7 @@ class GetNeighborsProcessor
       bool random);
 
  private:
-  std::vector<RunTimeContext> contexts_;
+  std::vector<RuntimeContext> contexts_;
   std::vector<StorageExpressionContext> expCtxs_;
   std::vector<nebula::DataSet> results_;
 };
diff --git a/src/storage/query/GetPropProcessor.cpp b/src/storage/query/GetPropProcessor.cpp
index f8db6230f64..7ee111cd773 100644
--- a/src/storage/query/GetPropProcessor.cpp
+++ b/src/storage/query/GetPropProcessor.cpp
@@ -51,7 +51,7 @@ void GetPropProcessor::doProcess(const cpp2::GetPropRequest& req) {
 }
 
 void GetPropProcessor::runInSingleThread(const cpp2::GetPropRequest& req) {
-  contexts_.emplace_back(RunTimeContext(planContext_.get()));
+  contexts_.emplace_back(RuntimeContext(planContext_.get()));
   std::unordered_set<PartitionID> failedParts;
   if (!isEdge_) {
     auto plan = buildTagPlan(&contexts_.front(), &resultDataSet_);
@@ -114,7 +114,7 @@ void GetPropProcessor::runInMultipleThread(const cpp2::GetPropRequest& req) {
   for (size_t i = 0; i < req.get_parts().size(); i++) {
     nebula::DataSet result = resultDataSet_;
     results_.emplace_back(std::move(result));
-    contexts_.emplace_back(RunTimeContext(planContext_.get()));
+    contexts_.emplace_back(RuntimeContext(planContext_.get()));
   }
   size_t i = 0;
   std::vector<folly::Future<std::pair<nebula::cpp2::ErrorCode, PartitionID>>> futures;
@@ -141,7 +141,7 @@ void GetPropProcessor::runInMultipleThread(const cpp2::GetPropRequest& req) {
 }
 
 folly::Future<std::pair<nebula::cpp2::ErrorCode, PartitionID>> GetPropProcessor::runInExecutor(
-    RunTimeContext* context,
+    RuntimeContext* context,
     nebula::DataSet* result,
     PartitionID partId,
     const std::vector<nebula::Row>& rows) {
@@ -190,7 +190,7 @@ folly::Future<std::pair<nebula::cpp2::ErrorCode, PartitionID>> GetPropProcessor:
   });
 }
 
-StoragePlan<VertexID> GetPropProcessor::buildTagPlan(RunTimeContext* context,
+StoragePlan<VertexID> GetPropProcessor::buildTagPlan(RuntimeContext* context,
                                                      nebula::DataSet* result) {
   StoragePlan<VertexID> plan;
   std::vector<TagNode*> tags;
@@ -207,7 +207,7 @@ StoragePlan<VertexID> GetPropProcessor::buildTagPlan(RunTimeContext* context,
   return plan;
 }
 
-StoragePlan<cpp2::EdgeKey> GetPropProcessor::buildEdgePlan(RunTimeContext* context,
+StoragePlan<cpp2::EdgeKey> GetPropProcessor::buildEdgePlan(RuntimeContext* context,
                                                            nebula::DataSet* result) {
   StoragePlan<cpp2::EdgeKey> plan;
   std::vector<EdgeNode<cpp2::EdgeKey>*> edges;
diff --git a/src/storage/query/GetPropProcessor.h b/src/storage/query/GetPropProcessor.h
index 0a6dcfceb41..b0ff090ef5e 100644
--- a/src/storage/query/GetPropProcessor.h
+++ b/src/storage/query/GetPropProcessor.h
@@ -35,9 +35,9 @@ class GetPropProcessor : public QueryBaseProcessor<cpp2::GetPropRequest, cpp2::G
       : QueryBaseProcessor<cpp2::GetPropRequest, cpp2::GetPropResponse>(env, counters, executor) {}
 
  private:
-  StoragePlan<VertexID> buildTagPlan(RunTimeContext* context, nebula::DataSet* result);
+  StoragePlan<VertexID> buildTagPlan(RuntimeContext* context, nebula::DataSet* result);
 
-  StoragePlan<cpp2::EdgeKey> buildEdgePlan(RunTimeContext* context, nebula::DataSet* result);
+  StoragePlan<cpp2::EdgeKey> buildEdgePlan(RuntimeContext* context, nebula::DataSet* result);
 
   void onProcessFinished() override;
 
@@ -57,13 +57,13 @@ class GetPropProcessor : public QueryBaseProcessor<cpp2::GetPropRequest, cpp2::G
   void runInMultipleThread(const cpp2::GetPropRequest& req);
 
   folly::Future<std::pair<nebula::cpp2::ErrorCode, PartitionID>> runInExecutor(
-      RunTimeContext* context,
+      RuntimeContext* context,
       nebula::DataSet* result,
       PartitionID partId,
       const std::vector<nebula::Row>& rows);
 
  private:
-  std::vector<RunTimeContext> contexts_;
+  std::vector<RuntimeContext> contexts_;
   std::vector<nebula::DataSet> results_;
   bool isEdge_ = false;  // true for edge, false for tag
 };
diff --git a/src/storage/test/AdminTaskManagerTest.cpp b/src/storage/test/AdminTaskManagerTest.cpp
index 30c18c3aeae..eb017750b6b 100644
--- a/src/storage/test/AdminTaskManagerTest.cpp
+++ b/src/storage/test/AdminTaskManagerTest.cpp
@@ -204,7 +204,7 @@ TEST(TaskManagerTest, happy_path_task1_sub1) {
 
   auto fTaskFini = pTaskFini.getFuture();
 
-  auto taskCallback = [&](nebula::cpp2::ErrorCode ret, nebula::meta::cpp2::StatisItem&) {
+  auto taskCallback = [&](nebula::cpp2::ErrorCode ret, nebula::meta::cpp2::StatsItem&) {
     LOG(INFO) << "taskCallback";
     pTaskFini.setValue(ret);
   };
@@ -244,7 +244,7 @@ TEST(TaskManagerTest, run_a_medium_task_before_a_huge_task) {
     folly::Promise<nebula::cpp2::ErrorCode> pro;
     folly::Future<nebula::cpp2::ErrorCode> fut = pro.getFuture();
 
-    auto taskCallback = [&](nebula::cpp2::ErrorCode ret, nebula::meta::cpp2::StatisItem&) {
+    auto taskCallback = [&](nebula::cpp2::ErrorCode ret, nebula::meta::cpp2::StatsItem&) {
       pro.setValue(ret);
     };
     mockTask->setCallback(taskCallback);
@@ -277,7 +277,7 @@ TEST(TaskManagerTest, happy_path) {
     folly::Promise<nebula::cpp2::ErrorCode> pro;
     folly::Future<nebula::cpp2::ErrorCode> fut = pro.getFuture();
 
-    auto taskCallback = [&](nebula::cpp2::ErrorCode ret, nebula::meta::cpp2::StatisItem&) {
+    auto taskCallback = [&](nebula::cpp2::ErrorCode ret, nebula::meta::cpp2::StatsItem&) {
       pro.setValue(ret);
     };
     mockTask->setCallback(taskCallback);
@@ -306,7 +306,7 @@ TEST(TaskManagerTest, happy_path) {
     folly::Promise<nebula::cpp2::ErrorCode> pro;
     folly::Future<nebula::cpp2::ErrorCode> fut = pro.getFuture();
 
-    auto taskCallback = [&](nebula::cpp2::ErrorCode ret, nebula::meta::cpp2::StatisItem&) {
+    auto taskCallback = [&](nebula::cpp2::ErrorCode ret, nebula::meta::cpp2::StatsItem&) {
       pro.setValue(ret);
     };
     mockTask->setCallback(taskCallback);
@@ -335,7 +335,7 @@ TEST(TaskManagerTest, happy_path) {
     mockTask->setJobId(jobId);
     mockTask->setTaskId(jobId);
 
-    auto taskCallback = [&](nebula::cpp2::ErrorCode ret, nebula::meta::cpp2::StatisItem&) {
+    auto taskCallback = [&](nebula::cpp2::ErrorCode ret, nebula::meta::cpp2::StatsItem&) {
       pro.setValue(ret);
     };
     mockTask->setCallback(taskCallback);
@@ -364,7 +364,7 @@ TEST(TaskManagerTest, happy_path) {
     folly::Promise<nebula::cpp2::ErrorCode> pro;
     folly::Future<nebula::cpp2::ErrorCode> fut = pro.getFuture();
 
-    auto taskCallback = [&](nebula::cpp2::ErrorCode ret, nebula::meta::cpp2::StatisItem&) {
+    auto taskCallback = [&](nebula::cpp2::ErrorCode ret, nebula::meta::cpp2::StatsItem&) {
       pro.setValue(ret);
     };
     mockTask->setCallback(taskCallback);
@@ -392,7 +392,7 @@ TEST(TaskManagerTest, happy_path) {
     folly::Promise<nebula::cpp2::ErrorCode> pro;
     folly::Future<nebula::cpp2::ErrorCode> fut = pro.getFuture();
 
-    auto taskCallback = [&](nebula::cpp2::ErrorCode ret, nebula::meta::cpp2::StatisItem&) {
+    auto taskCallback = [&](nebula::cpp2::ErrorCode ret, nebula::meta::cpp2::StatsItem&) {
       pro.setValue(ret);
     };
     mockTask->setCallback(taskCallback);
@@ -420,7 +420,7 @@ TEST(TaskManagerTest, happy_path) {
     folly::Promise<nebula::cpp2::ErrorCode> pro;
     folly::Future<nebula::cpp2::ErrorCode> fut = pro.getFuture();
 
-    auto taskCallback = [&](nebula::cpp2::ErrorCode ret, nebula::meta::cpp2::StatisItem&) {
+    auto taskCallback = [&](nebula::cpp2::ErrorCode ret, nebula::meta::cpp2::StatsItem&) {
       pro.setValue(ret);
     };
     mockTask->setCallback(taskCallback);
@@ -449,7 +449,7 @@ TEST(TaskManagerTest, happy_path) {
     folly::Promise<nebula::cpp2::ErrorCode> pro;
     folly::Future<nebula::cpp2::ErrorCode> fut = pro.getFuture();
 
-    auto taskCallback = [&](nebula::cpp2::ErrorCode ret, nebula::meta::cpp2::StatisItem&) {
+    auto taskCallback = [&](nebula::cpp2::ErrorCode ret, nebula::meta::cpp2::StatsItem&) {
       pro.setValue(ret);
     };
     mockTask->setCallback(taskCallback);
@@ -481,7 +481,7 @@ TEST(TaskManagerTest, gen_sub_task_failed) {
     folly::Promise<nebula::cpp2::ErrorCode> pro;
     folly::Future<nebula::cpp2::ErrorCode> fut = pro.getFuture();
 
-    auto cb = [&](nebula::cpp2::ErrorCode ret, nebula::meta::cpp2::StatisItem&) {
+    auto cb = [&](nebula::cpp2::ErrorCode ret, nebula::meta::cpp2::StatsItem&) {
       pro.setValue(ret);
     };
 
@@ -526,7 +526,7 @@ TEST(TaskManagerTest, some_subtask_failed) {
       });
     }
     mockTask->setCallback(
-        [&](nebula::cpp2::ErrorCode ret, nebula::meta::cpp2::StatisItem&) { pro.setValue(ret); });
+        [&](nebula::cpp2::ErrorCode ret, nebula::meta::cpp2::StatsItem&) { pro.setValue(ret); });
     taskMgr->addAsyncTask(task);
     fut.wait();
 
@@ -563,7 +563,7 @@ TEST(TaskManagerTest, cancel_a_running_task_with_only_1_sub_task) {
     return suc;
   });
 
-  mockTask->setCallback([&](nebula::cpp2::ErrorCode ret, nebula::meta::cpp2::StatisItem&) {
+  mockTask->setCallback([&](nebula::cpp2::ErrorCode ret, nebula::meta::cpp2::StatsItem&) {
     LOG(INFO) << "task finish()";
     pFinish.setValue(ret);
   });
@@ -611,7 +611,7 @@ TEST(TaskManagerTest, cancel_1_task_in_a_2_tasks_queue) {
   };
 
   task1->addSubTask([&]() { return suc; });
-  task1->setCallback([&](nebula::cpp2::ErrorCode ret, nebula::meta::cpp2::StatisItem&) {
+  task1->setCallback([&](nebula::cpp2::ErrorCode ret, nebula::meta::cpp2::StatsItem&) {
     LOG(INFO) << "finish task1()";
     pTask1.setValue(ret);
   });
@@ -621,7 +621,7 @@ TEST(TaskManagerTest, cancel_1_task_in_a_2_tasks_queue) {
   task2->setJobId(jobId2);
 
   task2->addSubTask([&]() { return suc; });
-  task2->setCallback([&](nebula::cpp2::ErrorCode ret, nebula::meta::cpp2::StatisItem&) {
+  task2->setCallback([&](nebula::cpp2::ErrorCode ret, nebula::meta::cpp2::StatsItem&) {
     LOG(INFO) << "finish task2()";
     pTask2.setValue(ret);
   });
@@ -671,7 +671,7 @@ TEST(TaskManagerTest, cancel_a_task_before_all_sub_task_running) {
     return suc;
   });
 
-  task0->setCallback([&](nebula::cpp2::ErrorCode ret, nebula::meta::cpp2::StatisItem&) {
+  task0->setCallback([&](nebula::cpp2::ErrorCode ret, nebula::meta::cpp2::StatsItem&) {
     pFiniTask0.setValue(ret);
   });
 
@@ -717,7 +717,7 @@ TEST(TaskManagerTest, task_run_after_a_gen_sub_task_failed) {
     LOG(INFO) << "after f1.wait()";
     return nebula::cpp2::ErrorCode::E_INVALID_TASK_PARA;
   };
-  task1->setCallback([&](nebula::cpp2::ErrorCode, nebula::meta::cpp2::StatisItem&) {
+  task1->setCallback([&](nebula::cpp2::ErrorCode, nebula::meta::cpp2::StatsItem&) {
     LOG(INFO) << "before p2.setValue()";
     p2.setValue(1);
     LOG(INFO) << "after p2.setValue()";
@@ -728,7 +728,7 @@ TEST(TaskManagerTest, task_run_after_a_gen_sub_task_failed) {
     LOG(INFO) << "after f2.wait()";
     return nebula::cpp2::ErrorCode::SUCCEEDED;
   });
-  task2->setCallback([&](nebula::cpp2::ErrorCode, nebula::meta::cpp2::StatisItem&) {
+  task2->setCallback([&](nebula::cpp2::ErrorCode, nebula::meta::cpp2::StatsItem&) {
     LOG(INFO) << "before p0.setValue()";
     p0.setValue(1);
     LOG(INFO) << "after p0.setValue()";
@@ -778,7 +778,7 @@ TEST(TaskManagerTest, cancel_a_task_while_some_sub_task_running) {
   });
 
   task1->setCallback(
-      [&](nebula::cpp2::ErrorCode ret, nebula::meta::cpp2::StatisItem&) { task1_p.setValue(ret); });
+      [&](nebula::cpp2::ErrorCode ret, nebula::meta::cpp2::StatsItem&) { task1_p.setValue(ret); });
 
   taskMgr->addAsyncTask(vtask0);
 
diff --git a/src/storage/test/CMakeLists.txt b/src/storage/test/CMakeLists.txt
index 8590de90e3f..fb756f7ab84 100644
--- a/src/storage/test/CMakeLists.txt
+++ b/src/storage/test/CMakeLists.txt
@@ -80,7 +80,7 @@ nebula_add_test(
     NAME
         statis_task_test
     SOURCES
-        StatisTaskTest.cpp
+        StatsTaskTest.cpp
     OBJECTS
         ${storage_test_deps}
     LIBRARIES
diff --git a/src/storage/test/GetNeighborsBenchmark.cpp b/src/storage/test/GetNeighborsBenchmark.cpp
index 5f038241fd9..585dcd32e51 100644
--- a/src/storage/test/GetNeighborsBenchmark.cpp
+++ b/src/storage/test/GetNeighborsBenchmark.cpp
@@ -57,14 +57,14 @@ std::string encode(const nebula::storage::cpp2::GetNeighborsResponse& resp) {
 }
 
 void initContext(std::unique_ptr<nebula::storage::PlanContext>& planCtx,
-                 std::unique_ptr<nebula::storage::RunTimeContext>& context,
+                 std::unique_ptr<nebula::storage::RuntimeContext>& context,
                  nebula::storage::EdgeContext& edgeContext,
                  const std::vector<std::string>& serveProps) {
   nebula::GraphSpaceID spaceId = 1;
   auto* env = gCluster->storageEnv_.get();
   auto vIdLen = env->schemaMan_->getSpaceVidLen(spaceId).value();
   planCtx = std::make_unique<nebula::storage::PlanContext>(env, spaceId, vIdLen, false);
-  context = std::make_unique<nebula::storage::RunTimeContext>(planCtx.get());
+  context = std::make_unique<nebula::storage::RuntimeContext>(planCtx.get());
 
   nebula::EdgeType serve = 101;
   edgeContext.schemas_ = std::move(env->schemaMan_->getAllVerEdgeSchema(spaceId)).value();
@@ -158,7 +158,7 @@ void goEdgeNode(int32_t iters,
                 const std::vector<std::string>& serveProps) {
   UNUSED(playerProps);
   std::unique_ptr<nebula::storage::PlanContext> planCtx;
-  std::unique_ptr<nebula::storage::RunTimeContext> context;
+  std::unique_ptr<nebula::storage::RuntimeContext> context;
   std::unique_ptr<nebula::storage::SingleEdgeNode> edgeNode;
   nebula::storage::EdgeContext edgeContext;
   BENCHMARK_SUSPEND {
@@ -213,7 +213,7 @@ void prefix(int32_t iters,
             const std::vector<std::string>& playerProps,
             const std::vector<std::string>& serveProps) {
   std::unique_ptr<nebula::storage::PlanContext> planCtx;
-  std::unique_ptr<nebula::storage::RunTimeContext> context;
+  std::unique_ptr<nebula::storage::RuntimeContext> context;
   nebula::storage::EdgeContext edgeContext;
   BENCHMARK_SUSPEND { initContext(planCtx, context, edgeContext, serveProps); }
   for (decltype(iters) i = 0; i < iters; i++) {
diff --git a/src/storage/test/IndexWithTTLTest.cpp b/src/storage/test/IndexWithTTLTest.cpp
index 7177f064044..babd7157074 100644
--- a/src/storage/test/IndexWithTTLTest.cpp
+++ b/src/storage/test/IndexWithTTLTest.cpp
@@ -433,7 +433,7 @@ TEST(IndexWithTTLTest, RebuildTagIndexWithTTL) {
   request.set_task_id(13);
   request.set_para(std::move(parameter));
 
-  auto callback = [](nebula::cpp2::ErrorCode, nebula::meta::cpp2::StatisItem&) {};
+  auto callback = [](nebula::cpp2::ErrorCode, nebula::meta::cpp2::StatsItem&) {};
   TaskContext context(request, callback);
 
   auto task = std::make_shared<RebuildTagIndexTask>(env, std::move(context));
@@ -502,7 +502,7 @@ TEST(IndexWithTTLTest, RebuildEdgeIndexWithTTL) {
   request.set_task_id(13);
   request.set_para(std::move(parameter));
 
-  auto callback = [](nebula::cpp2::ErrorCode, nebula::meta::cpp2::StatisItem&) {};
+  auto callback = [](nebula::cpp2::ErrorCode, nebula::meta::cpp2::StatsItem&) {};
   TaskContext context(request, callback);
 
   auto task = std::make_shared<RebuildEdgeIndexTask>(env, std::move(context));
@@ -573,7 +573,7 @@ TEST(IndexWithTTLTest, RebuildTagIndexWithTTLExpired) {
   request.set_task_id(13);
   request.set_para(std::move(parameter));
 
-  auto callback = [](nebula::cpp2::ErrorCode, nebula::meta::cpp2::StatisItem&) {};
+  auto callback = [](nebula::cpp2::ErrorCode, nebula::meta::cpp2::StatsItem&) {};
   TaskContext context(request, callback);
 
   auto task = std::make_shared<RebuildTagIndexTask>(env, std::move(context));
@@ -644,7 +644,7 @@ TEST(IndexWithTTLTest, RebuildEdgeIndexWithTTLExpired) {
   request.set_task_id(15);
   request.set_para(std::move(parameter));
 
-  auto callback = [](nebula::cpp2::ErrorCode, nebula::meta::cpp2::StatisItem&) {};
+  auto callback = [](nebula::cpp2::ErrorCode, nebula::meta::cpp2::StatsItem&) {};
   TaskContext context(request, callback);
 
   auto task = std::make_shared<RebuildEdgeIndexTask>(env, std::move(context));
diff --git a/src/storage/test/LookupIndexTest.cpp b/src/storage/test/LookupIndexTest.cpp
index ee88c31cd10..4354be9bf91 100644
--- a/src/storage/test/LookupIndexTest.cpp
+++ b/src/storage/test/LookupIndexTest.cpp
@@ -1089,8 +1089,8 @@ TEST_P(LookupIndexTest, EdgeIndexWithDataTest) {
 }
 
 // Tag has prop, statistics vertices
-TEST_P(LookupIndexTest, TagWithPropStatisVerticesIndexTest) {
-  fs::TempDir rootPath("/tmp/TagWithPropStatisVerticesIndexTest.XXXXXX");
+TEST_P(LookupIndexTest, TagWithPropStatsVerticesIndexTest) {
+  fs::TempDir rootPath("/tmp/TagWithPropStatsVerticesIndexTest.XXXXXX");
   mock::MockCluster cluster;
   cluster.initStorageKV(rootPath.path());
   auto* env = cluster.storageEnv_.get();
@@ -1161,8 +1161,8 @@ TEST_P(LookupIndexTest, TagWithPropStatisVerticesIndexTest) {
 }
 
 // Tag no prop, statistics vertices
-TEST_P(LookupIndexTest, TagWithoutPropStatisVerticesIndexTest) {
-  fs::TempDir rootPath("/tmp/TagWithoutPropStatisVerticesIndexTest.XXXXXX");
+TEST_P(LookupIndexTest, TagWithoutPropStatsVerticesIndexTest) {
+  fs::TempDir rootPath("/tmp/TagWithoutPropStatsVerticesIndexTest.XXXXXX");
   mock::MockCluster cluster;
   cluster.initStorageKV(rootPath.path(), HostAddr("", 0), 1, false);
   auto* env = cluster.storageEnv_.get();
@@ -1233,8 +1233,8 @@ TEST_P(LookupIndexTest, TagWithoutPropStatisVerticesIndexTest) {
 }
 
 // Edge has prop, statistics edges
-TEST_P(LookupIndexTest, EdgeWithPropStatisVerticesIndexTest) {
-  fs::TempDir rootPath("/tmp/EdgeWithPropStatisVerticesIndexTest.XXXXXX");
+TEST_P(LookupIndexTest, EdgeWithPropStatsVerticesIndexTest) {
+  fs::TempDir rootPath("/tmp/EdgeWithPropStatsVerticesIndexTest.XXXXXX");
   mock::MockCluster cluster;
   cluster.initStorageKV(rootPath.path());
   auto* env = cluster.storageEnv_.get();
@@ -1315,8 +1315,8 @@ TEST_P(LookupIndexTest, EdgeWithPropStatisVerticesIndexTest) {
 }
 
 // Edge no prop, statistics edges
-TEST_P(LookupIndexTest, EdgeWithoutPropStatisVerticesIndexTest) {
-  fs::TempDir rootPath("/tmp/EdgeWithoutPropStatisVerticesIndexTest.XXXXXX");
+TEST_P(LookupIndexTest, EdgeWithoutPropStatsVerticesIndexTest) {
+  fs::TempDir rootPath("/tmp/EdgeWithoutPropStatsVerticesIndexTest.XXXXXX");
   mock::MockCluster cluster;
   cluster.initStorageKV(rootPath.path(), HostAddr("", 0), 1, false);
   auto* env = cluster.storageEnv_.get();
diff --git a/src/storage/test/RebuildIndexTest.cpp b/src/storage/test/RebuildIndexTest.cpp
index 9617df6c9a7..81ddafabbcd 100644
--- a/src/storage/test/RebuildIndexTest.cpp
+++ b/src/storage/test/RebuildIndexTest.cpp
@@ -84,7 +84,7 @@ TEST_F(RebuildIndexTest, RebuildTagIndexCheckALLData) {
   request.set_task_id(13);
   request.set_para(std::move(parameter));
 
-  auto callback = [](nebula::cpp2::ErrorCode, nebula::meta::cpp2::StatisItem&) {};
+  auto callback = [](nebula::cpp2::ErrorCode, nebula::meta::cpp2::StatsItem&) {};
   TaskContext context(request, callback);
 
   auto task = std::make_shared<RebuildTagIndexTask>(RebuildIndexTest::env_, std::move(context));
@@ -171,7 +171,7 @@ TEST_F(RebuildIndexTest, RebuildEdgeIndexCheckALLData) {
   request.set_task_id(16);
   request.set_para(std::move(parameter));
 
-  auto callback = [](nebula::cpp2::ErrorCode, nebula::meta::cpp2::StatisItem&) {};
+  auto callback = [](nebula::cpp2::ErrorCode, nebula::meta::cpp2::StatsItem&) {};
   TaskContext context(request, callback);
   auto task = std::make_shared<RebuildEdgeIndexTask>(RebuildIndexTest::env_, std::move(context));
   manager_->addAsyncTask(task);
@@ -268,7 +268,7 @@ TEST_F(RebuildIndexTest, RebuildTagIndexWithDelete) {
   request.set_task_id(11);
   request.set_para(std::move(parameter));
 
-  auto callback = [](nebula::cpp2::ErrorCode, nebula::meta::cpp2::StatisItem&) {};
+  auto callback = [](nebula::cpp2::ErrorCode, nebula::meta::cpp2::StatsItem&) {};
   TaskContext context(request, callback);
 
   writer->addTask(deleteVertices).get();
@@ -329,7 +329,7 @@ TEST_F(RebuildIndexTest, RebuildTagIndexWithAppend) {
   request.set_task_id(12);
   request.set_para(std::move(parameter));
 
-  auto callback = [](nebula::cpp2::ErrorCode, nebula::meta::cpp2::StatisItem&) {};
+  auto callback = [](nebula::cpp2::ErrorCode, nebula::meta::cpp2::StatsItem&) {};
   TaskContext context(request, callback);
 
   auto task = std::make_shared<RebuildTagIndexTask>(RebuildIndexTest::env_, std::move(context));
@@ -374,7 +374,7 @@ TEST_F(RebuildIndexTest, RebuildTagIndex) {
   parameter.set_task_specfic_paras({"4", "5"});
   request.set_para(std::move(parameter));
 
-  auto callback = [](nebula::cpp2::ErrorCode, nebula::meta::cpp2::StatisItem&) {};
+  auto callback = [](nebula::cpp2::ErrorCode, nebula::meta::cpp2::StatsItem&) {};
   TaskContext context(request, callback);
 
   auto task = std::make_shared<RebuildTagIndexTask>(RebuildIndexTest::env_, std::move(context));
@@ -429,7 +429,7 @@ TEST_F(RebuildIndexTest, RebuildEdgeIndexWithDelete) {
   request.set_task_id(14);
   request.set_para(std::move(parameter));
 
-  auto callback = [](nebula::cpp2::ErrorCode, nebula::meta::cpp2::StatisItem&) {};
+  auto callback = [](nebula::cpp2::ErrorCode, nebula::meta::cpp2::StatsItem&) {};
   TaskContext context(request, callback);
 
   writer->addTask(deleteEdges).get();
@@ -491,7 +491,7 @@ TEST_F(RebuildIndexTest, RebuildEdgeIndexWithAppend) {
   request.set_task_id(15);
   request.set_para(std::move(parameter));
 
-  auto callback = [](nebula::cpp2::ErrorCode, nebula::meta::cpp2::StatisItem&) {};
+  auto callback = [](nebula::cpp2::ErrorCode, nebula::meta::cpp2::StatsItem&) {};
   TaskContext context(request, callback);
   auto task = std::make_shared<RebuildEdgeIndexTask>(RebuildIndexTest::env_, std::move(context));
   manager_->addAsyncTask(task);
@@ -535,7 +535,7 @@ TEST_F(RebuildIndexTest, RebuildEdgeIndex) {
   request.set_task_id(16);
   request.set_para(std::move(parameter));
 
-  auto callback = [](nebula::cpp2::ErrorCode, nebula::meta::cpp2::StatisItem&) {};
+  auto callback = [](nebula::cpp2::ErrorCode, nebula::meta::cpp2::StatsItem&) {};
   TaskContext context(request, callback);
   auto task = std::make_shared<RebuildEdgeIndexTask>(RebuildIndexTest::env_, std::move(context));
   manager_->addAsyncTask(task);
diff --git a/src/storage/test/StatisTaskTest.cpp b/src/storage/test/StatsTaskTest.cpp
similarity index 75%
rename from src/storage/test/StatisTaskTest.cpp
rename to src/storage/test/StatsTaskTest.cpp
index e2424da0548..6862c2c4fa4 100644
--- a/src/storage/test/StatisTaskTest.cpp
+++ b/src/storage/test/StatsTaskTest.cpp
@@ -12,7 +12,7 @@
 #include "mock/MockCluster.h"
 #include "mock/MockData.h"
 #include "storage/admin/AdminTaskManager.h"
-#include "storage/admin/StatisTask.h"
+#include "storage/admin/StatsTask.h"
 #include "storage/mutate/AddEdgesProcessor.h"
 #include "storage/mutate/AddVerticesProcessor.h"
 #include "storage/test/TestUtils.h"
@@ -20,11 +20,11 @@
 namespace nebula {
 namespace storage {
 
-class StatisTaskTest : public ::testing::Test {
+class StatsTaskTest : public ::testing::Test {
  protected:
   static void SetUpTestCase() {
-    LOG(INFO) << "SetUp StatisTaskTest TestCase";
-    rootPath_ = std::make_unique<fs::TempDir>("/tmp/StatisTaskTest.XXXXXX");
+    LOG(INFO) << "SetUp StatsTaskTest TestCase";
+    rootPath_ = std::make_unique<fs::TempDir>("/tmp/StatsTaskTest.XXXXXX");
     cluster_ = std::make_unique<nebula::mock::MockCluster>();
     cluster_->initStorageKV(rootPath_->path());
     env_ = cluster_->storageEnv_.get();
@@ -33,7 +33,7 @@ class StatisTaskTest : public ::testing::Test {
   }
 
   static void TearDownTestCase() {
-    LOG(INFO) << "TearDown StatisTaskTest TestCase";
+    LOG(INFO) << "TearDown StatsTaskTest TestCase";
     manager_->shutdown();
     cluster_.reset();
     rootPath_.reset();
@@ -51,13 +51,13 @@ class StatisTaskTest : public ::testing::Test {
   static std::unique_ptr<nebula::mock::MockCluster> cluster_;
 };
 
-StorageEnv* StatisTaskTest::env_{nullptr};
-AdminTaskManager* StatisTaskTest::manager_{nullptr};
-std::unique_ptr<fs::TempDir> StatisTaskTest::rootPath_{nullptr};
-std::unique_ptr<nebula::mock::MockCluster> StatisTaskTest::cluster_{nullptr};
+StorageEnv* StatsTaskTest::env_{nullptr};
+AdminTaskManager* StatsTaskTest::manager_{nullptr};
+std::unique_ptr<fs::TempDir> StatsTaskTest::rootPath_{nullptr};
+std::unique_ptr<nebula::mock::MockCluster> StatsTaskTest::cluster_{nullptr};
 
-// Statis data
-TEST_F(StatisTaskTest, StatisTagAndEdgeData) {
+// Stats data
+TEST_F(StatsTaskTest, StatsTagAndEdgeData) {
   // Empty data
   GraphSpaceID spaceId = 1;
   std::vector<PartitionID> parts = {1, 2, 3, 4, 5, 6};
@@ -73,20 +73,20 @@ TEST_F(StatisTaskTest, StatisTagAndEdgeData) {
     request.set_task_id(13);
     request.set_para(std::move(parameter));
 
-    nebula::meta::cpp2::StatisItem statisItem;
-    auto callback = [&](nebula::cpp2::ErrorCode ret, nebula::meta::cpp2::StatisItem& result) {
+    nebula::meta::cpp2::StatsItem statsItem;
+    auto callback = [&](nebula::cpp2::ErrorCode ret, nebula::meta::cpp2::StatsItem& result) {
       if (ret != nebula::cpp2::ErrorCode::SUCCEEDED) {
         // Do nothing
       } else {
         if (result.get_status() == nebula::meta::cpp2::JobStatus::FINISHED) {
-          statisItem = std::move(result);
+          statsItem = std::move(result);
         }
       }
     };
 
     TaskContext context(request, callback);
 
-    auto task = std::make_shared<StatisTask>(StatisTaskTest::env_, std::move(context));
+    auto task = std::make_shared<StatsTask>(StatsTaskTest::env_, std::move(context));
     manager_->addAsyncTask(task);
 
     // Wait for the task finished
@@ -94,34 +94,34 @@ TEST_F(StatisTaskTest, StatisTagAndEdgeData) {
       usleep(50);
     } while (!manager_->isFinished(context.jobId_, context.taskId_));
 
-    // Ensure that StatisTask::finish is called.
+    // Ensure that StatsTask::finish is called.
     for (int i = 0; i < 50; i++) {
       sleep(1);
-      if (statisItem.get_status() == nebula::meta::cpp2::JobStatus::FINISHED) {
+      if (statsItem.get_status() == nebula::meta::cpp2::JobStatus::FINISHED) {
         break;
       }
     }
 
     // Check statis result
-    ASSERT_EQ(nebula::meta::cpp2::JobStatus::FINISHED, statisItem.get_status());
+    ASSERT_EQ(nebula::meta::cpp2::JobStatus::FINISHED, statsItem.get_status());
     // Three tags
-    ASSERT_EQ(3, (*statisItem.tag_vertices_ref()).size());
-    for (auto& e : *statisItem.tag_vertices_ref()) {
+    ASSERT_EQ(3, (*statsItem.tag_vertices_ref()).size());
+    for (auto& e : *statsItem.tag_vertices_ref()) {
       ASSERT_EQ(0, e.second);
     }
 
     // Two edgetypes
-    ASSERT_EQ(2, (*statisItem.edges_ref()).size());
-    for (auto& edge : *statisItem.edges_ref()) {
+    ASSERT_EQ(2, (*statsItem.edges_ref()).size());
+    for (auto& edge : *statsItem.edges_ref()) {
       ASSERT_EQ(0, edge.second);
     }
-    ASSERT_EQ(0, *statisItem.space_vertices_ref());
-    ASSERT_EQ(0, *statisItem.space_edges_ref());
+    ASSERT_EQ(0, *statsItem.space_vertices_ref());
+    ASSERT_EQ(0, *statsItem.space_edges_ref());
   }
 
   // Add Vertices
   {
-    auto* processor = AddVerticesProcessor::instance(StatisTaskTest::env_, nullptr);
+    auto* processor = AddVerticesProcessor::instance(StatsTaskTest::env_, nullptr);
     cpp2::AddVerticesRequest req = mock::MockData::mockAddVerticesReq();
     auto fut = processor->getFuture();
     processor->process(req);
@@ -138,20 +138,20 @@ TEST_F(StatisTaskTest, StatisTagAndEdgeData) {
     request.set_task_id(14);
     request.set_para(std::move(parameter));
 
-    nebula::meta::cpp2::StatisItem statisItem;
-    auto callback = [&](nebula::cpp2::ErrorCode ret, nebula::meta::cpp2::StatisItem& result) {
+    nebula::meta::cpp2::StatsItem statsItem;
+    auto callback = [&](nebula::cpp2::ErrorCode ret, nebula::meta::cpp2::StatsItem& result) {
       if (ret != nebula::cpp2::ErrorCode::SUCCEEDED) {
         // Do nothing
       } else {
         if (result.get_status() == nebula::meta::cpp2::JobStatus::FINISHED) {
-          statisItem = std::move(result);
+          statsItem = std::move(result);
         }
       }
     };
 
     TaskContext context(request, callback);
 
-    auto task = std::make_shared<StatisTask>(StatisTaskTest::env_, std::move(context));
+    auto task = std::make_shared<StatsTask>(StatsTaskTest::env_, std::move(context));
     manager_->addAsyncTask(task);
 
     // Wait for the task finished
@@ -159,19 +159,19 @@ TEST_F(StatisTaskTest, StatisTagAndEdgeData) {
       usleep(50);
     } while (!manager_->isFinished(context.jobId_, context.taskId_));
 
-    // Ensure that StatisTask::finish is called.
+    // Ensure that StatsTask::finish is called.
     for (int i = 0; i < 50; i++) {
       sleep(1);
-      if (statisItem.get_status() == nebula::meta::cpp2::JobStatus::FINISHED) {
+      if (statsItem.get_status() == nebula::meta::cpp2::JobStatus::FINISHED) {
         break;
       }
     }
 
     // Check statis result
-    ASSERT_EQ(nebula::meta::cpp2::JobStatus::FINISHED, statisItem.get_status());
+    ASSERT_EQ(nebula::meta::cpp2::JobStatus::FINISHED, statsItem.get_status());
     // Three tags
-    ASSERT_EQ(3, (*statisItem.tag_vertices_ref()).size());
-    for (auto& e : *statisItem.tag_vertices_ref()) {
+    ASSERT_EQ(3, (*statsItem.tag_vertices_ref()).size());
+    for (auto& e : *statsItem.tag_vertices_ref()) {
       if (e.first == "1") {
         ASSERT_EQ(51, e.second);
       } else if (e.first == "2") {
@@ -181,18 +181,18 @@ TEST_F(StatisTaskTest, StatisTagAndEdgeData) {
       }
     }
     // Two edgetypes
-    ASSERT_EQ(2, (*statisItem.edges_ref()).size());
-    for (auto& edge : *statisItem.edges_ref()) {
+    ASSERT_EQ(2, (*statsItem.edges_ref()).size());
+    for (auto& edge : *statsItem.edges_ref()) {
       ASSERT_EQ(0, edge.second);
     }
 
-    ASSERT_EQ(81, *statisItem.space_vertices_ref());
-    ASSERT_EQ(0, *statisItem.space_edges_ref());
+    ASSERT_EQ(81, *statsItem.space_vertices_ref());
+    ASSERT_EQ(0, *statsItem.space_edges_ref());
   }
 
   // Add Edges
   {
-    auto* processor = AddEdgesProcessor::instance(StatisTaskTest::env_, nullptr);
+    auto* processor = AddEdgesProcessor::instance(StatsTaskTest::env_, nullptr);
     cpp2::AddEdgesRequest req = mock::MockData::mockAddEdgesReq();
     auto fut = processor->getFuture();
     processor->process(req);
@@ -209,20 +209,20 @@ TEST_F(StatisTaskTest, StatisTagAndEdgeData) {
     request.set_task_id(15);
     request.set_para(std::move(parameter));
 
-    nebula::meta::cpp2::StatisItem statisItem;
-    auto callback = [&](nebula::cpp2::ErrorCode ret, nebula::meta::cpp2::StatisItem& result) {
+    nebula::meta::cpp2::StatsItem statsItem;
+    auto callback = [&](nebula::cpp2::ErrorCode ret, nebula::meta::cpp2::StatsItem& result) {
       if (ret != nebula::cpp2::ErrorCode::SUCCEEDED) {
         // Do nothing
       } else {
         if (result.get_status() == nebula::meta::cpp2::JobStatus::FINISHED) {
-          statisItem = std::move(result);
+          statsItem = std::move(result);
         }
       }
     };
 
     TaskContext context(request, callback);
 
-    auto task = std::make_shared<StatisTask>(StatisTaskTest::env_, std::move(context));
+    auto task = std::make_shared<StatsTask>(StatsTaskTest::env_, std::move(context));
     manager_->addAsyncTask(task);
 
     // Wait for the task finished
@@ -230,20 +230,20 @@ TEST_F(StatisTaskTest, StatisTagAndEdgeData) {
       usleep(50);
     } while (!manager_->isFinished(context.jobId_, context.taskId_));
 
-    // Ensure that StatisTask::finish is called.
+    // Ensure that StatsTask::finish is called.
     for (int i = 0; i < 50; i++) {
       sleep(1);
-      if (statisItem.get_status() == nebula::meta::cpp2::JobStatus::FINISHED) {
+      if (statsItem.get_status() == nebula::meta::cpp2::JobStatus::FINISHED) {
         break;
       }
     }
 
     // Check statis result
-    ASSERT_EQ(nebula::meta::cpp2::JobStatus::FINISHED, statisItem.get_status());
+    ASSERT_EQ(nebula::meta::cpp2::JobStatus::FINISHED, statsItem.get_status());
     // Three tags
-    ASSERT_EQ(3, (*statisItem.tag_vertices_ref()).size());
+    ASSERT_EQ(3, (*statsItem.tag_vertices_ref()).size());
 
-    for (auto& e : *statisItem.tag_vertices_ref()) {
+    for (auto& e : *statsItem.tag_vertices_ref()) {
       if (e.first == "1") {
         ASSERT_EQ(51, e.second);
       } else if (e.first == "2") {
@@ -254,8 +254,8 @@ TEST_F(StatisTaskTest, StatisTagAndEdgeData) {
     }
 
     // Two edgetypes
-    ASSERT_EQ(2, (*statisItem.edges_ref()).size());
-    for (auto& edge : *statisItem.edges_ref()) {
+    ASSERT_EQ(2, (*statsItem.edges_ref()).size());
+    for (auto& edge : *statsItem.edges_ref()) {
       if (edge.first == "101") {
         // Do not contain reverse edge datas.
         ASSERT_EQ(167, edge.second);
@@ -263,13 +263,13 @@ TEST_F(StatisTaskTest, StatisTagAndEdgeData) {
         ASSERT_EQ(0, edge.second);
       }
     }
-    ASSERT_EQ(81, *statisItem.space_vertices_ref());
-    ASSERT_EQ(167, *statisItem.space_edges_ref());
+    ASSERT_EQ(81, *statsItem.space_vertices_ref());
+    ASSERT_EQ(167, *statsItem.space_edges_ref());
   }
 
   // Check the data count
   LOG(INFO) << "Check data in kv store...";
-  auto spaceVidLenRet = StatisTaskTest::env_->schemaMan_->getSpaceVidLen(spaceId);
+  auto spaceVidLenRet = StatsTaskTest::env_->schemaMan_->getSpaceVidLen(spaceId);
   EXPECT_TRUE(spaceVidLenRet.ok());
   auto spaceVidLen = spaceVidLenRet.value();
 
diff --git a/src/storage/transaction/TossEdgeIterator.h b/src/storage/transaction/TossEdgeIterator.h
index 578e814af1b..5c64de13701 100644
--- a/src/storage/transaction/TossEdgeIterator.h
+++ b/src/storage/transaction/TossEdgeIterator.h
@@ -22,7 +22,7 @@ namespace storage {
 
 class TossEdgeIterator : public SingleEdgeIterator {
  public:
-  TossEdgeIterator(RunTimeContext* context,
+  TossEdgeIterator(RuntimeContext* context,
                    std::unique_ptr<kvstore::KVIterator> iter,
                    EdgeType edgeType,
                    const std::vector<std::shared_ptr<const meta::NebulaSchemaProvider>>* schemas,