Merge branch 'master' into memory_in_raft

vesoft-inc · Mar 17, 2022 · eba1a77 · eba1a77
2 parents 9c8da06 + b655df5
commit eba1a77
Show file tree

Hide file tree

Showing 13 changed files with 381 additions and 14 deletions.
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -36,11 +36,8 @@ jobs:
       - uses: actions/setup-go@v2
         with:
           go-version: '^1.16.7'
-      - name: Set github sha outputs
-        id: github_sha
-        run: echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
       - name: package
-        run: ./package/package.sh -v nightly-${{ steps.github_sha.outputs.sha_short }}
+        run: ./package/package.sh
       - name: output some vars
         id: vars
         env:

diff --git a/src/common/utils/MetaKeyUtils.cpp b/src/common/utils/MetaKeyUtils.cpp
@@ -560,6 +560,21 @@ SchemaVer MetaKeyUtils::parseEdgeVersion(folly::StringPiece key) {
          *reinterpret_cast<const SchemaVer*>(key.begin() + offset);
 }
 
+SchemaVer MetaKeyUtils::getLatestEdgeScheInfo(kvstore::KVIterator* iter, folly::StringPiece& val) {
+  SchemaVer maxVer = MetaKeyUtils::parseEdgeVersion(iter->key());
+  val = iter->val();
+  iter->next();
+  while (iter->valid()) {
+    SchemaVer curVer = MetaKeyUtils::parseEdgeVersion(iter->key());
+    if (curVer > maxVer) {
+      maxVer = curVer;
+      val = iter->val();
+    }
+    iter->next();
+  }
+  return maxVer;
+}
+
 GraphSpaceID MetaKeyUtils::parseEdgesKeySpaceID(folly::StringPiece key) {
   return *reinterpret_cast<const GraphSpaceID*>(key.data() + kEdgesTable.size());
 }
@@ -585,6 +600,21 @@ SchemaVer MetaKeyUtils::parseTagVersion(folly::StringPiece key) {
          *reinterpret_cast<const SchemaVer*>(key.begin() + offset);
 }
 
+SchemaVer MetaKeyUtils::getLatestTagScheInfo(kvstore::KVIterator* iter, folly::StringPiece& val) {
+  SchemaVer maxVer = MetaKeyUtils::parseTagVersion(iter->key());
+  val = iter->val();
+  iter->next();
+  while (iter->valid()) {
+    SchemaVer curVer = MetaKeyUtils::parseTagVersion(iter->key());
+    if (curVer > maxVer) {
+      maxVer = curVer;
+      val = iter->val();
+    }
+    iter->next();
+  }
+  return maxVer;
+}
+
 std::string MetaKeyUtils::schemaTagPrefix(GraphSpaceID spaceId, TagID tagId) {
   std::string key;
   key.reserve(kTagsTable.size() + sizeof(GraphSpaceID) + sizeof(TagID));

diff --git a/src/common/utils/MetaKeyUtils.h b/src/common/utils/MetaKeyUtils.h
@@ -10,6 +10,7 @@
 #include "common/base/Status.h"
 #include "common/datatypes/HostAddr.h"
 #include "interface/gen-cpp2/meta_types.h"
+#include "kvstore/KVStore.h"
 
 namespace nebula {
 
@@ -190,12 +191,16 @@ class MetaKeyUtils final {
 
   static SchemaVer parseEdgeVersion(folly::StringPiece key);
 
+  static SchemaVer getLatestEdgeScheInfo(kvstore::KVIterator* iter, folly::StringPiece& val);
+
   static std::string schemaTagKey(GraphSpaceID spaceId, TagID tagId, SchemaVer version);
 
   static TagID parseTagId(folly::StringPiece key);
 
   static SchemaVer parseTagVersion(folly::StringPiece key);
 
+  static SchemaVer getLatestTagScheInfo(kvstore::KVIterator* iter, folly::StringPiece& val);
+
   static std::string schemaTagPrefix(GraphSpaceID spaceId, TagID tagId);
 
   static std::string schemaTagsPrefix(GraphSpaceID spaceId);

diff --git a/src/graph/validator/GoValidator.cpp b/src/graph/validator/GoValidator.cpp
@@ -133,20 +133,22 @@ Status GoValidator::validateYield(YieldClause* yield) {
   auto& exprProps = goCtx_->exprProps;
 
   for (auto col : yield->columns()) {
+    const auto& colName = col->name();
     auto vertexExpr = ExpressionUtils::findAny(col->expr(), {Expression::Kind::kVertex});
     if (vertexExpr != nullptr &&
         static_cast<const VertexExpression*>(vertexExpr)->name() == "VERTEX") {
       return Status::SemanticError("`%s' is not support in go sentence.", col->toString().c_str());
     }
 
+    col->setExpr(rewriteVertexEdge2EdgeProp(col->expr()));
     col->setExpr(ExpressionUtils::rewriteLabelAttr2EdgeProp(col->expr()));
     NG_RETURN_IF_ERROR(ValidateUtil::invalidLabelIdentifiers(col->expr()));
 
     auto* colExpr = col->expr();
     auto typeStatus = deduceExprType(colExpr);
     NG_RETURN_IF_ERROR(typeStatus);
     auto type = typeStatus.value();
-    outputs_.emplace_back(col->name(), type);
+    outputs_.emplace_back(colName, type);
     NG_RETURN_IF_ERROR(deduceProps(colExpr, exprProps, &tagIds_, &goCtx_->over.edgeTypes));
   }
 
@@ -183,6 +185,24 @@ void GoValidator::extractPropExprs(const Expression* expr,
   const_cast<Expression*>(expr)->accept(&visitor);
 }
 
+Expression* GoValidator::rewriteVertexEdge2EdgeProp(const Expression* expr) {
+  auto pool = qctx_->objPool();
+  const auto& name = expr->toString();
+  if (name == "id($^)" || name == "src(edge)") {
+    return EdgeSrcIdExpression::make(pool, "*");
+  }
+  if (name == "id($$)" || name == "dst(edge)") {
+    return EdgeDstIdExpression::make(pool, "*");
+  }
+  if (name == "rank(edge)") {
+    return EdgeRankExpression::make(pool, "*");
+  }
+  if (name == "type(edge)") {
+    return EdgeTypeExpression::make(pool, "*");
+  }
+  return const_cast<Expression*>(expr);
+}
+
 // Rewrites the property expression to corresponding Variable/Input expression
 // which get related property from previous plan node.
 Expression* GoValidator::rewrite2VarProp(const Expression* expr) {

diff --git a/src/graph/validator/GoValidator.h b/src/graph/validator/GoValidator.h
@@ -40,6 +40,8 @@ class GoValidator final : public Validator {
 
   Expression* rewrite2VarProp(const Expression* expr);
 
+  Expression* rewriteVertexEdge2EdgeProp(const Expression* expr);
+
  private:
   std::unique_ptr<GoContext> goCtx_;
 

diff --git a/src/graph/validator/test/QueryValidatorTest.cpp b/src/graph/validator/test/QueryValidatorTest.cpp
@@ -185,6 +185,23 @@ TEST_F(QueryValidatorTest, GoWithPipe) {
                                             PK::kStart};
     EXPECT_TRUE(checkResult(query, expected));
   }
+  {
+    std::string query = "YIELD \"1\" AS id | GO FROM $-.id OVER like YIELD id($$) as id";
+    std::vector<PlanNode::Kind> expected = {PK::kProject,
+                                            PK::kInnerJoin,
+                                            PK::kProject,
+                                            PK::kGetNeighbors,
+                                            PK::kDedup,
+                                            PK::kProject,
+                                            PK::kProject,
+                                            PK::kStart};
+    EXPECT_TRUE(checkResult(query, expected));
+  }
+  {
+    std::string query = "GO FROM 'Tim' OVER * YIELD id($$) as id";
+    std::vector<PlanNode::Kind> expected = {PK::kProject, PK::kGetNeighbors, PK::kStart};
+    EXPECT_TRUE(checkResult(query, expected));
+  }
   {
     std::string query =
         "GO 1 STEPS FROM \"1\" OVER like YIELD like._dst AS "

diff --git a/src/graph/visitor/DeducePropsVisitor.cpp b/src/graph/visitor/DeducePropsVisitor.cpp
@@ -264,7 +264,14 @@ void DeducePropsVisitor::visit(EdgeExpression *expr) {
 }
 
 void DeducePropsVisitor::visitEdgePropExpr(PropertyExpression *expr) {
-  auto status = qctx_->schemaMng()->toEdgeType(space_, expr->sym());
+  const auto &edgeName = expr->sym();
+  if (edgeName == "*") {
+    for (const auto &edgeType : *edgeTypes_) {
+      exprProps_->insertEdgeProp(edgeType, expr->prop());
+    }
+    return;
+  }
+  auto status = qctx_->schemaMng()->toEdgeType(space_, edgeName);
   if (!status.ok()) {
     status_ = std::move(status).status();
     return;

diff --git a/src/meta/processors/schema/AlterEdgeProcessor.cpp b/src/meta/processors/schema/AlterEdgeProcessor.cpp
@@ -50,8 +50,9 @@ void AlterEdgeProcessor::process(const cpp2::AlterEdgeReq& req) {
   }
 
   // Parse version from edge type key
-  auto version = MetaKeyUtils::parseEdgeVersion(iter->key()) + 1;
-  auto schema = MetaKeyUtils::parseSchema(iter->val());
+  folly::StringPiece iterVal;
+  auto version = MetaKeyUtils::getLatestEdgeScheInfo(iter, iterVal) + 1;
+  auto schema = MetaKeyUtils::parseSchema(iterVal);
   auto columns = schema.get_columns();
   auto prop = schema.get_schema_prop();
 
@@ -148,7 +149,8 @@ void AlterEdgeProcessor::process(const cpp2::AlterEdgeReq& req) {
   schema.columns_ref() = std::move(columns);
 
   std::vector<kvstore::KV> data;
-  LOG(INFO) << "Alter edge " << edgeName << ", edgeType " << edgeType;
+  LOG(INFO) << "Alter edge " << edgeName << ", edgeType " << edgeType << ", new version "
+            << version;
   data.emplace_back(MetaKeyUtils::schemaEdgeKey(spaceId, edgeType, version),
                     MetaKeyUtils::schemaVal(edgeName, schema));
   resp_.id_ref() = to(edgeType, EntryType::EDGE);

diff --git a/src/meta/processors/schema/AlterTagProcessor.cpp b/src/meta/processors/schema/AlterTagProcessor.cpp
@@ -47,8 +47,9 @@ void AlterTagProcessor::process(const cpp2::AlterTagReq& req) {
     return;
   }
 
-  auto version = MetaKeyUtils::parseTagVersion(iter->key()) + 1;
-  auto schema = MetaKeyUtils::parseSchema(iter->val());
+  folly::StringPiece iterVal;
+  auto version = MetaKeyUtils::getLatestTagScheInfo(iter, iterVal) + 1;
+  auto schema = MetaKeyUtils::parseSchema(iterVal);
   auto columns = schema.get_columns();
   auto prop = schema.get_schema_prop();
 
@@ -143,7 +144,7 @@ void AlterTagProcessor::process(const cpp2::AlterTagReq& req) {
   schema.columns_ref() = std::move(columns);
 
   std::vector<kvstore::KV> data;
-  LOG(INFO) << "Alter Tag " << tagName << ", tagId " << tagId;
+  LOG(INFO) << "Alter Tag " << tagName << ", tagId " << tagId << ", new version " << version;
   data.emplace_back(MetaKeyUtils::schemaTagKey(spaceId, tagId, version),
                     MetaKeyUtils::schemaVal(tagName, schema));
   resp_.id_ref() = to(tagId, EntryType::TAG);

diff --git a/src/meta/processors/schema/GetEdgeProcessor.cpp b/src/meta/processors/schema/GetEdgeProcessor.cpp
@@ -45,7 +45,9 @@ void GetEdgeProcessor::process(const cpp2::GetEdgeReq& req) {
       onFinished();
       return;
     }
-    schemaValue = iter->val().str();
+    folly::StringPiece iterVal;
+    MetaKeyUtils::getLatestEdgeScheInfo(iter, iterVal);
+    schemaValue = iterVal.str();
   } else {  // Get given version
     auto edgeKey = MetaKeyUtils::schemaEdgeKey(spaceId, edgeType, ver);
     auto ret = doGet(edgeKey);

diff --git a/src/meta/processors/schema/GetTagProcessor.cpp b/src/meta/processors/schema/GetTagProcessor.cpp
@@ -44,7 +44,9 @@ void GetTagProcessor::process(const cpp2::GetTagReq& req) {
       onFinished();
       return;
     }
-    schemaValue = iter->val().str();
+    folly::StringPiece iterVal;
+    MetaKeyUtils::getLatestTagScheInfo(iter, iterVal);
+    schemaValue = iterVal.str();
   } else {
     auto tagKey = MetaKeyUtils::schemaTagKey(spaceId, tagId, ver);
     auto ret = doGet(tagKey);