Add toString and test.

vesoft-inc · Jun 23, 2021 · 346d3f1 · 346d3f1
1 parent b7c4bdd
commit 346d3f1
Show file tree

Hide file tree

Showing 5 changed files with 79 additions and 9 deletions.
diff --git a/src/parser/AdminSentences.cpp b/src/parser/AdminSentences.cpp
@@ -369,4 +369,27 @@ std::string ShowSessionsSentence::toString() const {
     return "SHOW SESSIONS";
 }
 
+std::string ShowQueriesSentence::toString() const {
+    std::string buf = "SHOW";
+    if (isAll()) {
+        buf += " ALL";
+    }
+    buf += " QUERIES";
+    return buf;
+}
+
+std::string KillQuerySentence::toString() const {
+    std::string buf = "KILL QUERY (";
+    if  (sessionId() > 0) {
+        buf += "session=";
+        buf += folly::to<std::string>(sessionId());
+        buf += ", ";
+    }
+    if (epId() > 0) {
+        buf += "plan=";
+        buf += folly::to<std::string>(epId());
+    }
+    buf += ")";
+    return buf;
+}
 }   // namespace nebula
diff --git a/src/parser/AdminSentences.h b/src/parser/AdminSentences.h
@@ -731,10 +731,7 @@ class ShowQueriesSentence final : public Sentence {
         return topN_;
     }
 
-    std::string toString() const override {
-        // TODO
-        return "";
-    }
+    std::string toString() const override;
 
 private:
     bool isAll_{false};
@@ -776,10 +773,7 @@ class KillQuerySentence final : public Sentence {
         return identifier_->epId();
     }
 
-    std::string toString() const override {
-        // TODO
-        return "";
-    }
+    std::string toString() const override;
 
 private:
     std::unique_ptr<QueryUniqueIdentifier> identifier_;

diff --git a/src/parser/test/ParserTest.cpp b/src/parser/test/ParserTest.cpp
@@ -2766,6 +2766,10 @@ TEST(Parser, FullTextServiceTest) {
         auto result = parse(query);
         ASSERT_FALSE(result.ok());
     }
+}
+
+
+TEST(Parser, SessionTest) {
     {
         GQLParser parser;
         std::string query = "SHOW SESSIONS";
@@ -2807,4 +2811,42 @@ TEST(Parser, JobTest) {
     checkTest("REBUILD EDGE INDEX name_index, age_index",
             "REBUILD EDGE INDEX name_index,age_index");
 }
+
+TEST(Parser, ShowAndKillQueryTest) {
+    {
+        GQLParser parser;
+        std::string query = "SHOW QUERIES";
+        auto result = parser.parse(query);
+        ASSERT_TRUE(result.ok()) << result.status();
+        ASSERT_EQ(result.value()->toString(), "SHOW QUERIES");
+    }
+    {
+        GQLParser parser;
+        std::string query = "SHOW ALL QUERIES";
+        auto result = parser.parse(query);
+        ASSERT_TRUE(result.ok()) << result.status();
+        ASSERT_EQ(result.value()->toString(), "SHOW ALL QUERIES");
+    }
+    {
+        GQLParser parser;
+        std::string query = "KILL QUERY (plan=123)";
+        auto result = parser.parse(query);
+        ASSERT_TRUE(result.ok()) << result.status();
+        ASSERT_EQ(result.value()->toString(), "KILL QUERY (plan=123)");
+    }
+    {
+        GQLParser parser;
+        std::string query = "KILL QUERY (session=123, plan=123)";
+        auto result = parser.parse(query);
+        ASSERT_TRUE(result.ok()) << result.status();
+        ASSERT_EQ(result.value()->toString(), "KILL QUERY (session=123, plan=123)");
+    }
+    {
+        GQLParser parser;
+        std::string query = "KILL QUERY (plan=123, session=123)";
+        auto result = parser.parse(query);
+        ASSERT_TRUE(result.ok()) << result.status();
+        ASSERT_EQ(result.value()->toString(), "KILL QUERY (session=123, plan=123)");
+    }
+}
 }   // namespace nebula
diff --git a/src/parser/test/ScannerTest.cpp b/src/parser/test/ScannerTest.cpp
@@ -497,6 +497,18 @@ TEST(Scanner, Basic) {
         CHECK_SEMANTIC_TYPE("SESSION", TokenType::KW_SESSION),
         CHECK_SEMANTIC_TYPE("Session", TokenType::KW_SESSION),
         CHECK_SEMANTIC_TYPE("session", TokenType::KW_SESSION),
+        CHECK_SEMANTIC_TYPE("QUERY", TokenType::KW_QUERY),
+        CHECK_SEMANTIC_TYPE("Query", TokenType::KW_QUERY),
+        CHECK_SEMANTIC_TYPE("query", TokenType::KW_QUERY),
+        CHECK_SEMANTIC_TYPE("QUERIES", TokenType::KW_QUERIES),
+        CHECK_SEMANTIC_TYPE("Queries", TokenType::KW_QUERIES),
+        CHECK_SEMANTIC_TYPE("queries", TokenType::KW_QUERIES),
+        CHECK_SEMANTIC_TYPE("KILL", TokenType::KW_KILL),
+        CHECK_SEMANTIC_TYPE("Kill", TokenType::KW_KILL),
+        CHECK_SEMANTIC_TYPE("kill", TokenType::KW_KILL),
+        CHECK_SEMANTIC_TYPE("TOP", TokenType::KW_TOP),
+        CHECK_SEMANTIC_TYPE("Top", TokenType::KW_TOP),
+        CHECK_SEMANTIC_TYPE("top", TokenType::KW_TOP),
 
         CHECK_SEMANTIC_TYPE("_type", TokenType::TYPE_PROP),
         CHECK_SEMANTIC_TYPE("_id", TokenType::ID_PROP),

diff --git a/src/service/PermissionCheck.cpp b/src/service/PermissionCheck.cpp
@@ -206,7 +206,6 @@ Status PermissionCheck::permissionCheck(ClientSession *session,
         }
         case Sentence::Kind::kShowQueries:
         case Sentence::Kind::kKillQuery: {
-            // TODO
             return Status::OK();
         }
     }