rebase TTL_schema

src/dataman/ResultSchemaProvider.cpp

@@ -46,8 +46,7 @@ bool ResultSchemaProvider::ResultSchemaField::isValid() const {
  *
  **********************************/
 ResultSchemaProvider::ResultSchemaProvider(Schema schema)
-        : columns_(std::move(schema.get_columns())),
-          schemaProp_(std::move(schema.get_schema_prop())) {
+        : columns_(std::move(schema.get_columns())) {
     for (int64_t i = 0; i < static_cast<int64_t>(columns_.size()); i++) {
         const std::string& name = columns_[i].get_name();
         nameIndex_.emplace(std::make_pair(SpookyHashV2::Hash64(name.data(), name.size(), 0), i));
@@ -114,10 +113,5 @@ std::shared_ptr<const meta::SchemaProviderIf::Field> ResultSchemaProvider::field
     return std::make_shared<ResultSchemaField>(&(columns_[index]));
 }
 
-
-const cpp2::SchemaProp ResultSchemaProvider::getProp() const {
-    return schemaProp_;
-}
-
 }  // namespace nebula
 

src/dataman/ResultSchemaProvider.h

@@ -50,8 +50,6 @@ class ResultSchemaProvider : public meta::SchemaProviderIf {
     std::shared_ptr<const meta::SchemaProviderIf::Field> field(
         const folly::StringPiece name) const override;
 
-    const cpp2::SchemaProp getProp() const override;
-
 protected:
     SchemaVer schemaVer_{0};
 
@@ -61,8 +59,6 @@ class ResultSchemaProvider : public meta::SchemaProviderIf {
 
     // Default constructor, only used by SchemaWriter
     explicit ResultSchemaProvider(SchemaVer ver = 0) : schemaVer_(ver) {}
-
-    cpp2::SchemaProp                schemaProp_;
 };
 
 }  // namespace nebula

src/graph/CMakeLists.txt

@@ -21,8 +21,6 @@ add_library(
     DropEdgeExecutor.cpp
     DescribeTagExecutor.cpp
     DescribeEdgeExecutor.cpp
-    ShowCreateTagExecutor.cpp
-    ShowCreateEdgeExecutor.cpp
     InsertVertexExecutor.cpp
     InsertEdgeExecutor.cpp
     AssignmentExecutor.cpp
@@ -33,7 +31,6 @@ add_library(
     CreateSpaceExecutor.cpp
     DropSpaceExecutor.cpp
     DescribeSpaceExecutor.cpp
-    ShowCreateSpaceExecutor.cpp
     ShowExecutor.cpp
     YieldExecutor.cpp
     SchemaHelper.cpp

src/graph/CreateEdgeExecutor.h

@@ -25,10 +25,6 @@ class CreateEdgeExecutor final : public Executor {
 
     void execute() override;
 
-    Status setTTLDuration(SchemaPropItem* schemaProp);
-
-    Status setTTLCol(SchemaPropItem* schemaProp);
-
 private:
     CreateEdgeSentence                         *sentence_{nullptr};
     nebula::cpp2::Schema                        schema_;

src/graph/CreateTagExecutor.h

@@ -25,10 +25,6 @@ class CreateTagExecutor final : public Executor {
 
     void execute() override;
 
-    Status setTTLDuration(SchemaPropItem* schemaProp);
-
-    Status setTTLCol(SchemaPropItem* schemaProp);
-
 private:
     CreateTagSentence                          *sentence_{nullptr};
     nebula::cpp2::Schema                        schema_;

src/graph/Executor.cpp

@@ -21,8 +21,6 @@
 #include "graph/DropEdgeExecutor.h"
 #include "graph/DescribeTagExecutor.h"
 #include "graph/DescribeEdgeExecutor.h"
-#include "graph/ShowCreateTagExecutor.h"
-#include "graph/ShowCreateEdgeExecutor.h"
 #include "graph/InsertVertexExecutor.h"
 #include "graph/InsertEdgeExecutor.h"
 #include "graph/AssignmentExecutor.h"
@@ -31,7 +29,6 @@
 #include "graph/RemoveHostsExecutor.h"
 #include "graph/CreateSpaceExecutor.h"
 #include "graph/DescribeSpaceExecutor.h"
-#include "graph/ShowCreateSpaceExecutor.h"
 #include "graph/DropSpaceExecutor.h"
 #include "graph/YieldExecutor.h"
 
@@ -69,12 +66,6 @@ std::unique_ptr<Executor> Executor::makeExecutor(Sentence *sentence) {
         case Sentence::Kind::kDescribeEdge:
             executor = std::make_unique<DescribeEdgeExecutor>(sentence, ectx());
             break;
-        case Sentence::Kind::kShowCreateTag:
-            executor = std::make_unique<ShowCreateTagExecutor>(sentence, ectx());
-            break;
-        case Sentence::Kind::kShowCreateEdge:
-            executor = std::make_unique<ShowCreateEdgeExecutor>(sentence, ectx());
-            break;
         case Sentence::Kind::kDropTag:
              executor = std::make_unique<DropTagExecutor>(sentence, ectx());
              break;
@@ -108,9 +99,6 @@ std::unique_ptr<Executor> Executor::makeExecutor(Sentence *sentence) {
         case Sentence::Kind::kDescribeSpace:
             executor = std::make_unique<DescribeSpaceExecutor>(sentence, ectx());
             break;
-        case Sentence::Kind::kShowCreateSpace:
-            executor = std::make_unique<ShowCreateSpaceExecutor>(sentence, ectx());
-            break;
         case Sentence::Kind::kYield:
             executor = std::make_unique<YieldExecutor>(sentence, ectx());
             break;