fix issue 4765

src/graph/planner/ngql/GoPlanner.cpp

@@ -318,6 +318,7 @@ PlanNode* GoPlanner::lastStep(PlanNode* dep, PlanNode* join) {
     gd->setInputVar(goCtx_->vidsVar);
     gd->setColNames({goCtx_->dstIdColName});
     auto* dedup = Dedup::make(qctx, gd);
+    dedup->setColNames(gd->colNames());
     cur = dedup;
 
     if (goCtx_->joinDst) {
@@ -486,6 +487,7 @@ SubPlan GoPlanner::nStepsPlan(SubPlan& startVidPlan) {
     gd->setColNames({goCtx_->dstIdColName});
     auto* dedup = Dedup::make(qctx, gd);
     dedup->setOutputVar(goCtx_->vidsVar);
+    dedup->setColNames(gd->colNames());
     getDst = dedup;
 
     loopBody = getDst;

src/graph/util/ExpressionUtils.cpp

@@ -50,6 +50,30 @@ const Expression *ExpressionUtils::findAny(const Expression *self,
   return nullptr;
 }
 
+bool ExpressionUtils::findEdgeDstExpr(const Expression *expr) {
+  auto finder = [](const Expression *e) -> bool {
+    if (e->kind() == Expression::Kind::kEdgeDst) {
+      return true;
+    } else {
+      auto name = e->toString();
+      std::transform(name.begin(), name.end(), name.begin(), ::tolower);
+      if (name == "id($$)") {
+        return true;
+      }
+    }
+    return false;
+  };
+  if (finder(expr)) {
+    return true;
+  }
+  FindVisitor visitor(finder);
+  const_cast<Expression *>(expr)->accept(&visitor);
+  if (!visitor.results().empty()) {
+    return true;
+  }
+  return false;
+}
+
 // Finds all expressions fit the exprected list
 // Returns an empty vector if no expression found
 std::vector<const Expression *> ExpressionUtils::collectAll(

src/graph/util/ExpressionUtils.h

@@ -193,6 +193,9 @@ class ExpressionUtils {
   // Checks if expr contains function call expression that generate a random value
   static bool findInnerRandFunction(const Expression* expr);
 
+  // Checks if expr contains function EdgeDst expr or id($$) expr
+  static bool findEdgeDstExpr(const Expression* expr);
+
   // ** Loop node condition **
   // Generates an expression that is used as the condition of loop node:
   // ++loopSteps <= steps

src/graph/validator/GoValidator.cpp

@@ -99,8 +99,8 @@ Status GoValidator::validateWhere(WhereClause* where) {
     return Status::SemanticError(ss.str());
   }
 
-  goCtx_->filter = rewriteVertexEdge2EdgeProp(filter);
   NG_RETURN_IF_ERROR(deduceProps(filter, goCtx_->exprProps, &tagIds_, &goCtx_->over.edgeTypes));
+  goCtx_->filter = filter;
   return Status::OK();
 }
 
@@ -311,6 +311,15 @@ bool GoValidator::isSimpleCase() {
   }
   if (exprProps.hasInputVarProperty()) return false;
 
+  // Check filter clause
+  // Because GetDstBySrc doesn't support filter push down,
+  // so we don't optimize such case.
+  if (goCtx_->filter) {
+    if (ExpressionUtils::findEdgeDstExpr(goCtx_->filter)) {
+      return false;
+    }
+  }
+
   // Check yield clause
   if (!goCtx_->distinct) return false;
   bool atLeastOneDstId = false;