Rename some non-standard types

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();

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,

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) {

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;
 }
 

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_));

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");

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 {

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

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());
       });
 }
 

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());
       });
 }
 

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

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());
       });
 }
 

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());
       });
 }
 

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());
       });
 }
 

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

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

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());
       });
 }
 

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

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,

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,

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) {

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