fix unionAllEdgeIndexScanRule (#1259)

Co-authored-by: Yee <2520865+yixinglu@users.noreply.github.com>
vesoft-inc · Jul 15, 2021 · 7c8c878 · 7c8c878
1 parent 62010cf
commit 7c8c878
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/optimizer/OptimizerUtils.cpp b/src/optimizer/OptimizerUtils.cpp
@@ -912,6 +912,7 @@ void OptimizerUtils::copyIndexScanData(const nebula::graph::IndexScan* from,
     to->setEmptyResultSet(from->isEmptyResultSet());
     to->setSpace(from->space());
     to->setReturnCols(from->returnColumns());
+    to->setIsEdge(from->isEdge());
     to->setSchemaId(from->schemaId());
     to->setDedup(from->dedup());
     to->setOrderBy(from->orderBy());

diff --git a/src/optimizer/rule/UnionAllIndexScanBaseRule.cpp b/src/optimizer/rule/UnionAllIndexScanBaseRule.cpp
@@ -58,10 +58,16 @@ bool UnionAllIndexScanBaseRule::match(OptContext* ctx, const MatchedResult& matc
 StatusOr<TransformResult> UnionAllIndexScanBaseRule::transform(OptContext* ctx,
                                                                const MatchedResult& matched) const {
     auto filter = static_cast<const Filter*>(matched.planNode());
-    auto scan = static_cast<const TagIndexFullScan*>(matched.planNode({0, 0}));
+    auto node = matched.planNode({0, 0});
+    auto scan = static_cast<const IndexScan*>(node);
 
     auto metaClient = ctx->qctx()->getMetaClient();
-    auto status = metaClient->getTagIndexesFromCache(scan->space());
+    StatusOr<std::vector<std::shared_ptr<meta::cpp2::IndexItem>>> status;
+    if (node->kind() == graph::PlanNode::Kind::kTagIndexFullScan) {
+        status = metaClient->getTagIndexesFromCache(scan->space());
+    } else {
+        status = metaClient->getEdgeIndexesFromCache(scan->space());
+    }
     NG_RETURN_IF_ERROR(status);
     auto indexItems = std::move(status).value();