From d2ceddff0bbea0151da6fba1840f15f436580621 Mon Sep 17 00:00:00 2001
From: jimingquan <mingquan.ji@vesoft.com>
Date: Wed, 8 Sep 2021 17:48:41 +0800
Subject: [PATCH] address comment

---
 conf/nebula-graphd.conf.default                 | 2 ++
 conf/nebula-graphd.conf.production              | 2 ++
 src/graph/validator/SequentialValidator.cpp     | 6 ------
 src/graph/validator/test/QueryValidatorTest.cpp | 2 +-
 src/parser/GQLParser.h                          | 9 +++++++--
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/conf/nebula-graphd.conf.default b/conf/nebula-graphd.conf.default
index adee924bd85..9951cf37896 100644
--- a/conf/nebula-graphd.conf.default
+++ b/conf/nebula-graphd.conf.default
@@ -33,6 +33,8 @@
 # Whether to treat partial success as an error.
 # This flag is only used for Read-only access, and Modify access always treats partial success as an error.
 --accept_partial_success=false
+# Maximum sentence length, unit byte
+--max_allowed_query_size=4194304
 
 ########## networking ##########
 # Comma separated Meta Server Addresses
diff --git a/conf/nebula-graphd.conf.production b/conf/nebula-graphd.conf.production
index 6c4eeb96405..b3eebaf8dbf 100644
--- a/conf/nebula-graphd.conf.production
+++ b/conf/nebula-graphd.conf.production
@@ -31,6 +31,8 @@
 # Whether to treat partial success as an error.
 # This flag is only used for Read-only access, and Modify access always treats partial success as an error.
 --accept_partial_success=false
+# Maximum sentence length, unit byte
+--max_allowed_query_size=4194304
 
 ########## networking ##########
 # Comma separated Meta Server Addresses
diff --git a/src/graph/validator/SequentialValidator.cpp b/src/graph/validator/SequentialValidator.cpp
index a31ad8b4de0..61c12573df7 100644
--- a/src/graph/validator/SequentialValidator.cpp
+++ b/src/graph/validator/SequentialValidator.cpp
@@ -13,7 +13,6 @@
 #include "graph/service/PermissionCheck.h"
 
 DECLARE_uint32(max_allowed_statements);
-DECLARE_uint32(max_allowed_query_size);
 
 namespace nebula {
 namespace graph {
@@ -25,11 +24,6 @@ Status SequentialValidator::validateImpl() {
         "given.",
         static_cast<int64_t>(sentence_->kind()));
   }
-  size_t querySize = sentence_->toString().size();
-  size_t maxAllowedQuerySize = static_cast<size_t>(FLAGS_max_allowed_query_size);
-  if (querySize > maxAllowedQuerySize) {
-    return Status::SemanticError("Query is too large (%ld > %ld).", querySize, maxAllowedQuerySize);
-  }
   auto seqSentence = static_cast<SequentialSentences*>(sentence_);
   auto sentences = seqSentence->sentences();
 
diff --git a/src/graph/validator/test/QueryValidatorTest.cpp b/src/graph/validator/test/QueryValidatorTest.cpp
index 05463568e2b..025e3475f5a 100644
--- a/src/graph/validator/test/QueryValidatorTest.cpp
+++ b/src/graph/validator/test/QueryValidatorTest.cpp
@@ -1135,7 +1135,7 @@ TEST_F(QueryValidatorTest, TestMaxAllowedQuerySize) {
   query.append(",\"person_2\":(\"person_2\", 2);");
   auto result = checkResult(query);
   EXPECT_FALSE(result);
-  EXPECT_EQ(std::string(result.message()), "SemanticError: Query is too large (271 > 256).");
+  EXPECT_EQ(std::string(result.message()), "SyntaxError: Query is too large (282 > 256).");
   FLAGS_max_allowed_query_size = 4194304;
 }
 
diff --git a/src/parser/GQLParser.h b/src/parser/GQLParser.h
index 10d1432d44c..d050fd71d27 100644
--- a/src/parser/GQLParser.h
+++ b/src/parser/GQLParser.h
@@ -11,6 +11,7 @@
 #include "parser/GraphParser.hpp"
 #include "parser/GraphScanner.h"
 
+DECLARE_uint32(max_allowed_query_size);
 namespace nebula {
 
 class GQLParser {
@@ -39,8 +40,12 @@ class GQLParser {
   }
 
   StatusOr<std::unique_ptr<Sentence>> parse(std::string query) {
-    // Since GraphScanner needs a writable buffer, we have to copy the query
-    // string
+    // Since GraphScanner needs a writable buffer, we have to copy the query string
+    size_t querySize = query.size();
+    size_t maxAllowedQuerySize = static_cast<size_t>(FLAGS_max_allowed_query_size);
+    if (querySize > maxAllowedQuerySize) {
+      return Status::SyntaxError("Query is too large (%ld > %ld).", querySize, maxAllowedQuerySize);
+    }
     buffer_ = std::move(query);
     pos_ = &buffer_[0];
     end_ = pos_ + buffer_.size();