Merge branch 'master' into balancer

vesoft-inc · Jun 28, 2019 · 4c4649d · 4c4649d
2 parents ead168d + 51e81a7
commit 4c4649d
Show file tree

Hide file tree

Showing 28 changed files with 1,132 additions and 278 deletions.
diff --git a/src/graph/AlterEdgeExecutor.cpp b/src/graph/AlterEdgeExecutor.cpp
@@ -6,6 +6,7 @@
 
 #include "base/Base.h"
 #include "graph/AlterEdgeExecutor.h"
+#include "graph/SchemaHelper.h"
 
 namespace nebula {
 namespace graph {
@@ -17,34 +18,25 @@ AlterEdgeExecutor::AlterEdgeExecutor(Sentence *sentence,
 
 
 Status AlterEdgeExecutor::prepare() {
-    return checkIfGraphSpaceChosen();
+    auto status = checkIfGraphSpaceChosen();
+
+    if (!status.ok()) {
+        return status;
+    }
+
+    const auto& schemaOpts = sentence_->getSchemaOpts();
+    const auto& schemaProps = sentence_->getSchemaProps();
+
+    return SchemaHelper::alterSchema(schemaOpts, schemaProps, options_, schemaProp_);
 }
 
 
 void AlterEdgeExecutor::execute() {
     auto *mc = ectx()->getMetaClient();
     auto *name = sentence_->name();
-    const auto& schemaOpts = sentence_->schemaOptList();
     auto spaceId = ectx()->rctx()->session()->space();
 
-    std::vector<nebula::meta::cpp2::AlterSchemaItem> schemaItems;
-    for (auto& schemaOpt : schemaOpts) {
-        nebula::meta::cpp2::AlterSchemaItem schemaItem;
-        auto opType = schemaOpt->toType();
-        schemaItem.set_op(std::move(opType));
-        const auto& specs = schemaOpt->columnSpecs();
-        nebula::cpp2::Schema schema;
-        for (auto& spec : specs) {
-            nebula::cpp2::ColumnDef column;
-            column.name = *spec->name();
-            column.type.type = columnTypeToSupportedType(spec->type());
-            schema.columns.emplace_back(std::move(column));
-        }
-        schemaItem.set_schema(std::move(schema));
-        schemaItems.emplace_back(std::move(schemaItem));
-    }
-
-    auto future = mc->alterEdgeSchema(spaceId, *name, std::move(schemaItems));
+    auto future = mc->alterEdgeSchema(spaceId, *name, std::move(options_), std::move(schemaProp_));
     auto *runner = ectx()->rctx()->runner();
     auto cb = [this] (auto &&resp) {
         if (!resp.ok()) {

diff --git a/src/graph/AlterEdgeExecutor.h b/src/graph/AlterEdgeExecutor.h
@@ -26,7 +26,9 @@ class AlterEdgeExecutor final : public Executor {
     void execute() override;
 
 private:
-    AlterEdgeSentence                          *sentence_{nullptr};
+    AlterEdgeSentence                                  *sentence_{nullptr};
+    std::vector<nebula::meta::cpp2::AlterSchemaItem>    options_;
+    nebula::cpp2::SchemaProp                            schemaProp_;
 };
 
 }   // namespace graph

diff --git a/src/graph/AlterTagExecutor.cpp b/src/graph/AlterTagExecutor.cpp
@@ -6,6 +6,7 @@
 
 #include "base/Base.h"
 #include "graph/AlterTagExecutor.h"
+#include "graph/SchemaHelper.h"
 
 namespace nebula {
 namespace graph {
@@ -15,34 +16,28 @@ AlterTagExecutor::AlterTagExecutor(Sentence *sentence,
     sentence_ = static_cast<AlterTagSentence*>(sentence);
 }
 
+
 Status AlterTagExecutor::prepare() {
-    return checkIfGraphSpaceChosen();
+    auto status = checkIfGraphSpaceChosen();
+
+    if (!status.ok()) {
+        return status;
+    }
+
+    const auto& schemaOpts = sentence_->getSchemaOpts();
+    const auto& schemaProps = sentence_->getSchemaProps();
+
+    return SchemaHelper::alterSchema(schemaOpts, schemaProps, options_, schemaProp_);
 }
 
+
 void AlterTagExecutor::execute() {
     auto *mc = ectx()->getMetaClient();
     auto *name = sentence_->name();
-    const auto& schemaOpts = sentence_->schemaOptList();
     auto spaceId = ectx()->rctx()->session()->space();
 
-    std::vector<nebula::meta::cpp2::AlterSchemaItem> schemaItems;
-    for (auto& schemaOpt : schemaOpts) {
-        nebula::meta::cpp2::AlterSchemaItem schemaItem;
-        auto opType = schemaOpt->toType();
-        schemaItem.set_op(std::move(opType));
-        const auto& specs = schemaOpt->columnSpecs();
-        nebula::cpp2::Schema schema;
-        for (auto& spec : specs) {
-            nebula::cpp2::ColumnDef column;
-            column.name = *spec->name();
-            column.type.type = columnTypeToSupportedType(spec->type());
-            schema.columns.emplace_back(std::move(column));
-        }
-        schemaItem.set_schema(std::move(schema));
-        schemaItems.emplace_back(std::move(schemaItem));
-    }
 
-    auto future = mc->alterTagSchema(spaceId, *name, std::move(schemaItems));
+    auto future = mc->alterTagSchema(spaceId, *name, std::move(options_), std::move(schemaProp_));
     auto *runner = ectx()->rctx()->runner();
     auto cb = [this] (auto &&resp) {
         if (!resp.ok()) {

diff --git a/src/graph/AlterTagExecutor.h b/src/graph/AlterTagExecutor.h
@@ -26,7 +26,9 @@ class AlterTagExecutor final : public Executor {
     void execute() override;
 
 private:
-    AlterTagSentence                           *sentence_{nullptr};
+    AlterTagSentence                                   *sentence_{nullptr};
+    std::vector<nebula::meta::cpp2::AlterSchemaItem>    options_;
+    nebula::cpp2::SchemaProp                            schemaProp_;
 };
 
 }   // namespace graph

diff --git a/src/graph/CMakeLists.txt b/src/graph/CMakeLists.txt
@@ -33,6 +33,7 @@ add_library(
     DescribeSpaceExecutor.cpp
     ShowExecutor.cpp
     YieldExecutor.cpp
+    SchemaHelper.cpp
 )
 add_dependencies(
     graph_obj

diff --git a/src/graph/CreateEdgeExecutor.cpp b/src/graph/CreateEdgeExecutor.cpp
@@ -7,6 +7,7 @@
 #include "base/Base.h"
 #include "graph/CreateEdgeExecutor.h"
 #include "dataman/ResultSchemaProvider.h"
+#include "graph/SchemaHelper.h"
 
 namespace nebula {
 namespace graph {
@@ -18,25 +19,25 @@ CreateEdgeExecutor::CreateEdgeExecutor(Sentence *sentence,
 
 
 Status CreateEdgeExecutor::prepare() {
-    return checkIfGraphSpaceChosen();
+    auto status = checkIfGraphSpaceChosen();
+
+    if (!status.ok()) {
+        return status;
+    }
+
+    const auto& specs = sentence_->columnSpecs();
+    const auto& schemaProps = sentence_->getSchemaProps();
+
+    return SchemaHelper::createSchema(specs, schemaProps, schema_);
 }
 
 
 void CreateEdgeExecutor::execute() {
     auto *mc = ectx()->getMetaClient();
     auto *name = sentence_->name();
-    const auto& specs = sentence_->columnSpecs();
     auto spaceId = ectx()->rctx()->session()->space();
 
-    nebula::cpp2::Schema schema;
-    for (auto& spec : specs) {
-        nebula::cpp2::ColumnDef column;
-        column.name = *spec->name();
-        column.type.type = columnTypeToSupportedType(spec->type());
-        schema.columns.emplace_back(std::move(column));
-    }
-
-    auto future = mc->createEdgeSchema(spaceId, *name, schema);
+    auto future = mc->createEdgeSchema(spaceId, *name, schema_);
     auto *runner = ectx()->rctx()->runner();
     auto cb = [this] (auto &&resp) {
         if (!resp.ok()) {

diff --git a/src/graph/CreateEdgeExecutor.h b/src/graph/CreateEdgeExecutor.h
@@ -27,6 +27,7 @@ class CreateEdgeExecutor final : public Executor {
 
 private:
     CreateEdgeSentence                         *sentence_{nullptr};
+    nebula::cpp2::Schema                        schema_;
 };
 
 }   // namespace graph

diff --git a/src/graph/CreateTagExecutor.cpp b/src/graph/CreateTagExecutor.cpp
@@ -7,6 +7,7 @@
 #include "base/Base.h"
 #include "graph/CreateTagExecutor.h"
 #include "dataman/ResultSchemaProvider.h"
+#include "graph/SchemaHelper.h"
 
 namespace nebula {
 namespace graph {
@@ -18,25 +19,25 @@ CreateTagExecutor::CreateTagExecutor(Sentence *sentence,
 
 
 Status CreateTagExecutor::prepare() {
-    return checkIfGraphSpaceChosen();
+    auto status = checkIfGraphSpaceChosen();
+
+    if (!status.ok()) {
+        return status;
+    }
+
+    const auto& specs = sentence_->columnSpecs();
+    const auto& schemaProps = sentence_->getSchemaProps();
+
+    return SchemaHelper::createSchema(specs, schemaProps, schema_);
 }
 
 
 void CreateTagExecutor::execute() {
     auto *mc = ectx()->getMetaClient();
     auto *name = sentence_->name();
-    const auto& specs = sentence_->columnSpecs();
     auto spaceId = ectx()->rctx()->session()->space();
 
-    nebula::cpp2::Schema schema;
-    for (auto& spec : specs) {
-        nebula::cpp2::ColumnDef column;
-        column.name = *spec->name();
-        column.type.type = columnTypeToSupportedType(spec->type());
-        schema.columns.emplace_back(std::move(column));
-    }
-
-    auto future = mc->createTagSchema(spaceId, *name, schema);
+    auto future = mc->createTagSchema(spaceId, *name, schema_);
     auto *runner = ectx()->rctx()->runner();
     auto cb = [this] (auto &&resp) {
         if (!resp.ok()) {

diff --git a/src/graph/CreateTagExecutor.h b/src/graph/CreateTagExecutor.h
@@ -27,6 +27,7 @@ class CreateTagExecutor final : public Executor {
 
 private:
     CreateTagSentence                          *sentence_{nullptr};
+    nebula::cpp2::Schema                        schema_;
 };
 
 }   // namespace graph

diff --git a/src/graph/Executor.cpp b/src/graph/Executor.cpp
@@ -129,23 +129,6 @@ std::string Executor::valueTypeToString(nebula::cpp2::ValueType type) {
     }
 }
 
-nebula::cpp2::SupportedType Executor::columnTypeToSupportedType(ColumnType type) {
-    switch (type) {
-        case BOOL:
-            return nebula::cpp2::SupportedType::BOOL;
-        case INT:
-            return nebula::cpp2::SupportedType::INT;
-        case DOUBLE:
-            return nebula::cpp2::SupportedType::DOUBLE;
-        case STRING:
-            return nebula::cpp2::SupportedType::STRING;
-        case TIMESTAMP:
-            return nebula::cpp2::SupportedType::TIMESTAMP;
-        default:
-            return nebula::cpp2::SupportedType::UNKNOWN;
-    }
-}
-
 void Executor::writeVariantType(RowWriter &writer, const VariantType &value) {
     switch (value.which()) {
         case 0:

diff --git a/src/graph/Executor.h b/src/graph/Executor.h
@@ -78,8 +78,6 @@ class Executor : public cpp::NonCopyable, public cpp::NonMovable {
 
     std::string valueTypeToString(nebula::cpp2::ValueType type);
 
-    nebula::cpp2::SupportedType columnTypeToSupportedType(ColumnType type);
-
     void writeVariantType(RowWriter &writer, const VariantType &value);
 
     bool checkValueType(const nebula::cpp2::ValueType &type, const VariantType &value);