address comment

vesoft-inc · Oct 18, 2021 · 3484b36 · 3484b36
1 parent 2bfc459
commit 3484b36
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/src/graph/context/ast/QueryAstContext.h b/src/graph/context/ast/QueryAstContext.h
@@ -157,12 +157,12 @@ struct FetchEdgesContext final : public AstContext {
   std::string inputVarName;
 };
 
-struct AlterContext final : public AstContext {
+struct AlterSchemaContext final : public AstContext {
   std::vector<meta::cpp2::AlterSchemaItem> schemaItems;
   meta::cpp2::SchemaProp schemaProps;
 };
 
-struct CreateContext final : public AstContext {
+struct CreateSchemaContext final : public AstContext {
   bool ifNotExist{false};
   std::string name;
   meta::cpp2::Schema schema;

diff --git a/src/graph/planner/ngql/MaintainPlanner.cpp b/src/graph/planner/ngql/MaintainPlanner.cpp
@@ -13,7 +13,7 @@ namespace nebula {
 namespace graph {
 
 StatusOr<SubPlan> CreateTagPlanner::transform(AstContext* astCtx) {
-  auto createCtx = static_cast<CreateContext*>(astCtx);
+  auto createCtx = static_cast<CreateSchemaContext*>(astCtx);
   SubPlan plan;
   plan.root = plan.tail = CreateTag::make(createCtx->qctx,
                                           nullptr,
@@ -24,7 +24,7 @@ StatusOr<SubPlan> CreateTagPlanner::transform(AstContext* astCtx) {
 }
 
 StatusOr<SubPlan> CreateEdgePlanner::transform(AstContext* astCtx) {
-  auto createCtx = static_cast<CreateContext*>(astCtx);
+  auto createCtx = static_cast<CreateSchemaContext*>(astCtx);
   SubPlan plan;
   plan.root = plan.tail = CreateEdge::make(createCtx->qctx,
                                            nullptr,
@@ -35,7 +35,7 @@ StatusOr<SubPlan> CreateEdgePlanner::transform(AstContext* astCtx) {
 }
 
 StatusOr<SubPlan> AlterTagPlanner::transform(AstContext* astCtx) {
-  auto alterCtx = static_cast<AlterContext*>(astCtx);
+  auto alterCtx = static_cast<AlterSchemaContext*>(astCtx);
   auto qctx = alterCtx->qctx;
   auto name = *static_cast<const AlterTagSentence*>(alterCtx->sentence)->name();
   SubPlan plan;
@@ -49,7 +49,7 @@ StatusOr<SubPlan> AlterTagPlanner::transform(AstContext* astCtx) {
 }
 
 StatusOr<SubPlan> AlterEdgePlanner::transform(AstContext* astCtx) {
-  auto alterCtx = static_cast<AlterContext*>(astCtx);
+  auto alterCtx = static_cast<AlterSchemaContext*>(astCtx);
   auto qctx = alterCtx->qctx;
   auto name = *static_cast<const AlterEdgeSentence*>(alterCtx->sentence)->name();
   SubPlan plan;

diff --git a/src/graph/validator/MaintainValidator.cpp b/src/graph/validator/MaintainValidator.cpp
@@ -142,7 +142,7 @@ static Status checkColName(const std::vector<ColumnSpecification *> specs) {
 }
 
 Status CreateTagValidator::validateImpl() {
-  createCtx_ = getContext<CreateContext>();
+  createCtx_ = getContext<CreateSchemaContext>();
   auto sentence = static_cast<CreateTagSentence *>(sentence_);
   createCtx_->ifNotExist = sentence->isIfNotExist();
   auto name = *sentence->name();
@@ -165,7 +165,7 @@ Status CreateTagValidator::validateImpl() {
 }
 
 Status CreateEdgeValidator::validateImpl() {
-  createCtx_ = getContext<CreateContext>();
+  createCtx_ = getContext<CreateSchemaContext>();
   auto sentence = static_cast<CreateEdgeSentence *>(sentence_);
   createCtx_->ifNotExist = sentence->isIfNotExist();
   auto name = *sentence->name();
@@ -210,7 +210,7 @@ Status DescEdgeValidator::toPlan() {
 }
 
 Status AlterTagValidator::validateImpl() {
-  alterCtx_ = getContext<AlterContext>();
+  alterCtx_ = getContext<AlterSchemaContext>();
   auto sentence = static_cast<AlterTagSentence *>(sentence_);
   auto schemaItems = validateSchemaOpts(sentence->getSchemaOpts());
   NG_RETURN_IF_ERROR(schemaItems);
@@ -222,7 +222,7 @@ Status AlterTagValidator::validateImpl() {
 }
 
 Status AlterEdgeValidator::validateImpl() {
-  alterCtx_ = getContext<AlterContext>();
+  alterCtx_ = getContext<AlterSchemaContext>();
   auto sentence = static_cast<AlterEdgeSentence *>(sentence_);
   auto schemaItems = validateSchemaOpts(sentence->getSchemaOpts());
   NG_RETURN_IF_ERROR(schemaItems);

diff --git a/src/graph/validator/MaintainValidator.h b/src/graph/validator/MaintainValidator.h
@@ -24,7 +24,7 @@ class CreateTagValidator final : public Validator {
  private:
   Status validateImpl() override;
 
-  std::unique_ptr<CreateContext> createCtx_;
+  std::unique_ptr<CreateSchemaContext> createCtx_;
 };
 
 class CreateEdgeValidator final : public Validator {
@@ -36,7 +36,7 @@ class CreateEdgeValidator final : public Validator {
  private:
   Status validateImpl() override;
 
-  std::unique_ptr<CreateContext> createCtx_;
+  std::unique_ptr<CreateSchemaContext> createCtx_;
 };
 
 class DescTagValidator final : public Validator {
@@ -90,7 +90,7 @@ class AlterTagValidator final : public Validator {
  private:
   Status validateImpl() override;
 
-  std::unique_ptr<AlterContext> alterCtx_;
+  std::unique_ptr<AlterSchemaContext> alterCtx_;
 };
 
 class AlterEdgeValidator final : public Validator {
@@ -102,7 +102,7 @@ class AlterEdgeValidator final : public Validator {
  private:
   Status validateImpl() override;
 
-  std::unique_ptr<AlterContext> alterCtx_;
+  std::unique_ptr<AlterSchemaContext> alterCtx_;
 };
 
 class ShowTagsValidator final : public Validator {