fix the bug create space on group v2

vesoft-inc · Jun 23, 2021 · 938c04e · 938c04e
2 parents 034922b + d3508a9
commit 938c04e
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 11 deletions.
diff --git a/src/parser/AdminSentences.h b/src/parser/AdminSentences.h
@@ -336,14 +336,6 @@ class CreateSpaceSentence final : public CreateSentence {
         groupName_.reset(name);
     }
 
-    const std::string* groupName() const {
-        return groupName_.get();
-    }
-
-    const SpaceOptList* spaceOpts() const {
-        return spaceOpts_.get();
-    }
-
     void setComment(std::string *name) {
         comment_.reset(name);
     }

diff --git a/src/validator/AdminValidator.cpp b/src/validator/AdminValidator.cpp
@@ -106,7 +106,6 @@ Status CreateSpaceValidator::validateImpl() {
             }
         }
     }
-<<<<<<< HEAD
     // check comment
     if (sentence->comment() != nullptr) {
         spaceDesc_.set_comment(*sentence->comment());
@@ -116,8 +115,6 @@ Status CreateSpaceValidator::validateImpl() {
         return Status::SemanticError("Group default conflict");
     }
 
-=======
->>>>>>> fix create space on group
     // if charset and collate are not specified, set default value
     if (!(*spaceDesc_.charset_name_ref()).empty() && !(*spaceDesc_.collate_name_ref()).empty()) {
         NG_RETURN_IF_ERROR(charsetInfo->charsetAndCollateMatch(*spaceDesc_.charset_name_ref(),