use "-- " as comment prefix (vesoft-inc#2115)

Co-authored-by: dutor <440396+dutor@users.noreply.github.com>
geekyin · May 11, 2020 · 85173fa · 85173fa
1 parent e6c5531
commit 85173fa
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 1 deletion.
diff --git a/src/graph/test/YieldTest.cpp b/src/graph/test/YieldTest.cpp
@@ -808,6 +808,29 @@ TEST_F(YieldTest, PipeYieldGo) {
         ASSERT_TRUE(verifyResult(resp, expected));
     }
 }
+
+TEST_F(YieldTest, WithComment) {
+    {
+        cpp2::ExecutionResponse resp;
+        auto code = client_->execute("YIELD 1--1", resp);
+        ASSERT_EQ(cpp2::ErrorCode::SUCCEEDED, code) << resp.get_error_msg();
+
+        std::vector<std::tuple<int64_t>> expected = {
+            {2},
+        };
+        ASSERT_TRUE(verifyResult(resp, expected));
+    }
+    {
+        cpp2::ExecutionResponse resp;
+        auto code = client_->execute("YIELD 1-- 1", resp);
+        ASSERT_EQ(cpp2::ErrorCode::SUCCEEDED, code) << resp.get_error_msg();
+
+        std::vector<std::tuple<int64_t>> expected = {
+            {1},
+        };
+        ASSERT_TRUE(verifyResult(resp, expected));
+    }
+}
 }   // namespace graph
 }   // namespace nebula
 
diff --git a/src/parser/scanner.lex b/src/parser/scanner.lex
@@ -543,7 +543,7 @@ RECOVER                     ([Rr][Ee][Cc][Oo][Vv][Ee][Rr])
                             }
 "#".*                       // Skip the annotation
 "//".*                      // Skip the annotation
-"--".*                      // Skip the annotation
+"-- ".*                     // Skip the annotation
 "/*"                        { BEGIN(COMMENT); }
 <COMMENT>"*/"               { BEGIN(INITIAL); }
 <COMMENT>([^*]|\n)+|.

diff --git a/src/parser/test/ParserTest.cpp b/src/parser/test/ParserTest.cpp
@@ -1398,6 +1398,13 @@ TEST(Parser, Annotation) {
         auto result = parser.parse(query);
         ASSERT_TRUE(result.status().isStatementEmpty());
     }
+    // need use space after "--"
+    {
+        GQLParser parser;
+        std::string query = "--test comment....";
+        auto result = parser.parse(query);
+        ASSERT_FALSE(result.ok());
+    }
     {
         GQLParser parser;
         std::string query = "-- test comment....";