Merge branch 'master' into yield_fetch

vesoft-inc · Oct 21, 2021 · 0c5b1e6 · 0c5b1e6
2 parents 6b486ee + 9f8802d
commit 0c5b1e6
Show file tree

Hide file tree

Showing 10 changed files with 67 additions and 168 deletions.
diff --git a/src/graph/context/ast/QueryAstContext.h b/src/graph/context/ast/QueryAstContext.h
@@ -113,7 +113,6 @@ struct LookupContext final : public AstContext {
   bool dedup{false};
   bool isEmptyResultSet{false};
   int32_t schemaId{-1};
-  int64_t limit{-1};
   Expression* filter{nullptr};
   YieldColumns* yieldExpr{nullptr};
   std::vector<std::string> idxReturnCols;

diff --git a/src/graph/planner/ngql/LookupPlanner.cpp b/src/graph/planner/ngql/LookupPlanner.cpp
@@ -38,10 +38,8 @@ StatusOr<SubPlan> LookupPlanner::transform(AstContext* astCtx) {
                                                       lookupCtx->idxReturnCols,
                                                       lookupCtx->schemaId,
                                                       lookupCtx->isEmptyResultSet);
-    if (lookupCtx->limit >= 0) {
-      edgeIndexFullScan->setLimit(lookupCtx->limit);
-    }
     plan.tail = edgeIndexFullScan;
+    plan.root = edgeIndexFullScan;
   } else {
     auto* tagIndexFullScan = TagIndexFullScan::make(qctx,
                                                     nullptr,
@@ -51,15 +49,11 @@ StatusOr<SubPlan> LookupPlanner::transform(AstContext* astCtx) {
                                                     lookupCtx->idxReturnCols,
                                                     lookupCtx->schemaId,
                                                     lookupCtx->isEmptyResultSet);
-    if (lookupCtx->limit >= 0) {
-      tagIndexFullScan->setLimit(lookupCtx->limit);
-    }
     plan.tail = tagIndexFullScan;
+    plan.root = tagIndexFullScan;
   }
   plan.tail->setColNames(lookupCtx->idxColNames);
 
-  plan.root = plan.tail;
-
   if (lookupCtx->filter) {
     plan.root = Filter::make(qctx, plan.root, lookupCtx->filter);
   }

diff --git a/src/graph/validator/LookupValidator.cpp b/src/graph/validator/LookupValidator.cpp
@@ -44,7 +44,6 @@ Status LookupValidator::validateImpl() {
   NG_RETURN_IF_ERROR(validateFrom());
   NG_RETURN_IF_ERROR(validateFilter());
   NG_RETURN_IF_ERROR(validateYield());
-  NG_RETURN_IF_ERROR(validateLimit());
   return Status::OK();
 }
 
@@ -230,18 +229,6 @@ Status LookupValidator::validateFilter() {
   return Status::OK();
 }
 
-Status LookupValidator::validateLimit() {
-  auto* limitClause = sentence()->limitClause();
-  if (limitClause == nullptr) {
-    return Status::OK();
-  }
-  if (limitClause->limit() < 0) {
-    return Status::SemanticError("Invalid negative limit number %ld.", limitClause->limit());
-  }
-  lookupCtx_->limit = limitClause->limit();
-  return Status::OK();
-}
-
 StatusOr<Expression*> LookupValidator::handleLogicalExprOperands(LogicalExpression* lExpr) {
   auto& operands = lExpr->operands();
   for (auto i = 0u; i < operands.size(); i++) {

diff --git a/src/graph/validator/LookupValidator.h b/src/graph/validator/LookupValidator.h
@@ -33,7 +33,6 @@ class LookupValidator final : public Validator {
   Status validateFilter();
   Status validateYieldTag();
   Status validateYieldEdge();
-  Status validateLimit();
 
   StatusOr<Expression*> checkFilter(Expression* expr);
   Status checkRelExpr(RelationalExpression* expr);

diff --git a/src/parser/Clauses.h b/src/parser/Clauses.h
@@ -382,21 +382,5 @@ class NameLabelList {
   std::vector<std::unique_ptr<std::string>> labels_;
 };
 
-class LimitClause {
- public:
-  explicit LimitClause(std::size_t limit) : limit_(limit) {}
-
-  int64_t limit() const { return limit_; }
-
-  std::string toString() const {
-    std::stringstream ss;
-    ss << "LIMIT " << limit_;
-    return ss.str();
-  }
-
- private:
-  int64_t limit_{0};
-};
-
 }  // namespace nebula
 #endif  // PARSER_CLAUSES_H_
diff --git a/src/parser/TraverseSentences.cpp b/src/parser/TraverseSentences.cpp
@@ -40,15 +40,11 @@ std::string GoSentence::toString() const {
   return buf;
 }
 
-LookupSentence::LookupSentence(std::string *from,
-                               WhereClause *where,
-                               YieldClause *yield,
-                               LimitClause *limit)
+LookupSentence::LookupSentence(std::string *from, WhereClause *where, YieldClause *yield)
     : Sentence(Kind::kLookup),
       from_(DCHECK_NOTNULL(from)),
       whereClause_(where),
-      yieldClause_(yield),
-      limitClause_(limit) {}
+      yieldClause_(yield) {}
 
 std::string LookupSentence::toString() const {
   std::string buf;
@@ -63,10 +59,6 @@ std::string LookupSentence::toString() const {
     buf += " ";
     buf += yieldClause_->toString();
   }
-  if (limitClause_ != nullptr) {
-    buf += " ";
-    buf += limitClause_->toString();
-  }
   return buf;
 }
 

diff --git a/src/parser/TraverseSentences.h b/src/parser/TraverseSentences.h
@@ -61,23 +61,20 @@ class GoSentence final : public Sentence {
 
 class LookupSentence final : public Sentence {
  public:
-  LookupSentence(std::string* from, WhereClause* where, YieldClause* yield, LimitClause* limit);
+  LookupSentence(std::string* from, WhereClause* where, YieldClause* yield);
 
   const std::string& from() const { return *from_; }
 
   const WhereClause* whereClause() const { return whereClause_.get(); }
 
   const YieldClause* yieldClause() const { return yieldClause_.get(); }
 
-  const LimitClause* limitClause() const { return limitClause_.get(); }
-
   std::string toString() const override;
 
  private:
   std::unique_ptr<std::string> from_;
   std::unique_ptr<WhereClause> whereClause_;
   std::unique_ptr<YieldClause> yieldClause_;
-  std::unique_ptr<LimitClause> limitClause_;
 };
 
 class UseSentence final : public Sentence {

diff --git a/src/parser/parser.yy b/src/parser/parser.yy
@@ -148,7 +148,6 @@ static constexpr size_t kCommentLengthLimit = 256;
     nebula::meta::cpp2::FTClient           *text_search_client_item;
     nebula::TSClientList                   *text_search_client_list;
     nebula::QueryUniqueIdentifier          *query_unique_identifier;
-    nebula::LimitClause                    *limit_clause;
 }
 
 /* destructors */
@@ -343,8 +342,6 @@ static constexpr size_t kCommentLengthLimit = 256;
 
 %type <query_unique_identifier> query_unique_identifier
 
-%type <limit_clause> limit_clause
-
 %type <sentence> maintain_sentence
 %type <sentence> create_space_sentence describe_space_sentence drop_space_sentence
 %type <sentence> create_tag_sentence create_edge_sentence
@@ -1932,14 +1929,9 @@ lookup_where_clause
     | KW_WHERE expression { $$ = new WhereClause($2); }
     ;
 
-limit_clause
-    : %empty { $$ = nullptr; }
-    | KW_LIMIT legal_integer { $$ = new LimitClause($2); }
-    ;
-
 lookup_sentence
-    : KW_LOOKUP KW_ON name_label lookup_where_clause yield_clause limit_clause {
-        $$ = new LookupSentence($3, $4, $5, $6);
+    : KW_LOOKUP KW_ON name_label lookup_where_clause yield_clause {
+        $$ = new LookupSentence($3, $4, $5);
     }
     ;
 

diff --git a/src/parser/test/ParserTest.cpp b/src/parser/test/ParserTest.cpp
@@ -1370,20 +1370,6 @@ TEST_F(ParserTest, Lookup) {
     auto result = parse(query);
     ASSERT_TRUE(result.ok()) << result.status();
   }
-  {
-    std::string query =
-        "LOOKUP ON transfer WHERE transfer.amount > 1000 YIELD transfer.amount,"
-        " transfer.test LIMIT 1";
-    auto result = parse(query);
-    EXPECT_TRUE(result.ok()) << result.status();
-  }
-  {
-    std::string query =
-        "LOOKUP ON transfer WHERE transfer.amount > 1000 YIELD transfer.amount,"
-        " transfer.test LIMIT -1";
-    auto result = parse(query);
-    EXPECT_FALSE(result.ok());
-  }
 }
 
 TEST_F(ParserTest, subgraph) {