Add version for show hosts (#3702)

* version * tck * pytest * pytest Co-authored-by: cpw <[email protected]>
vesoft-inc · Jan 22, 2022 · 8352799 · 8352799
1 parent db7a5a3
commit 8352799
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/src/graph/executor/admin/ShowHostsExecutor.cpp b/src/graph/executor/admin/ShowHostsExecutor.cpp
@@ -30,7 +30,8 @@ folly::Future<Status> ShowHostsExecutor::showHosts() {
                "Status",
                "Leader count",
                "Leader distribution",
-               "Partition distribution"});
+               "Partition distribution",
+               "Version"});
 
     std::map<std::string, int64_t> leaderPartsCount;
     std::map<std::string, int64_t> allPartsCount;
@@ -82,6 +83,7 @@ folly::Future<Status> ShowHostsExecutor::showHosts() {
       r.emplace_back(leaderCount);
       r.emplace_back(leaders.str());
       r.emplace_back(parts.str());
+      r.emplace_back(host.version_ref().has_value() ? Value(*host.version_ref()) : Value());
       v.emplace_back(std::move(r));
     }  // row loop
     {
@@ -148,7 +150,7 @@ folly::Future<Status> ShowHostsExecutor::showHosts() {
           LOG(ERROR) << resp.status();
           return resp.status();
         }
-        auto value = std::move(resp).value();
+        auto value = std::forward<decltype(resp)>(resp).value();
         if (type == meta::cpp2::ListHostType::ALLOC) {
           return finish(makeTraditionalResult(value));
         }

diff --git a/tests/admin/test_show_hosts.py b/tests/admin/test_show_hosts.py
@@ -26,13 +26,15 @@ def test_show_hosts(self):
                                  'Status',
                                  'Leader count',
                                  'Leader distribution',
-                                 'Partition distribution']
+                                 'Partition distribution',
+                                 'Version']
         expected_result_format = [[re.compile(r'\S+'),
                                    re.compile(r'\d+'),
                                    re.compile(r'ONLINE|OFFLINE'),
                                    re.compile(r'\d+'),
                                    re.compile(r'No valid partition|(\S+:\d+, )*\S+:\d+'),
-                                   re.compile(r'No valid partition|(\S+:\d+, )*\S+:\d+')]]
+                                   re.compile(r'No valid partition|(\S+:\d+, )*\S+:\d+'),
+                                   re.compile(r'(^$)|(v\d+\.\d+\.\d+)')]]
         resp = self.execute(query)
         self.check_resp_succeeded(resp)
         self.check_column_names(resp, expected_column_names)

diff --git a/tests/tck/features/admin/Hosts.feature b/tests/tck/features/admin/Hosts.feature
@@ -9,8 +9,8 @@ Feature: Admin hosts
       SHOW HOSTS;
       """
     Then the result should contain:
-      | Host  | Port  | Status   | Leader count | Leader distribution | Partition distribution |
-      | /\w+/ | /\d+/ | "ONLINE" | /\d+/        | /.*/                | /.*/                   |
+      | Host  | Port  | Status   | Leader count | Leader distribution | Partition distribution | Version |
+      | /\w+/ | /\d+/ | "ONLINE" | /\d+/        | /.*/                | /.*/                   | /.*/    |
     When executing query:
       """
       SHOW HOSTS GRAPH;

diff --git a/tests/tck/features/parser/Example.feature b/tests/tck/features/parser/Example.feature
@@ -24,8 +24,8 @@ Feature: Feature examples
       SHOW HOSTS
       """
     Then the result should contain:
-      | Host  | Port  | Status   | Leader count | Leader distribution | Partition distribution |
-      | /\w+/ | /\d+/ | "ONLINE" | /\d+/        | /.*/                | /.*/                   |
+      | Host  | Port  | Status   | Leader count | Leader distribution | Partition distribution | Version |
+      | /\w+/ | /\d+/ | "ONLINE" | /\d+/        | /.*/                | /.*/                   | /.*/    |
     When executing query:
       """
       SHOW HOSTS