fixed expression check for invalid edge (#2235)

Co-authored-by: dangleptr <[email protected]>
vesoft-inc · Jul 21, 2020 · 93d11b3 · 93d11b3
1 parent b4378b0
commit 93d11b3
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/storage/query/QueryBaseProcessor.inl b/src/storage/query/QueryBaseProcessor.inl
@@ -544,7 +544,7 @@ kvstore::ResultCode QueryBaseProcessor<REQ, RESP>::collectEdgeProps(
                                 "Edge `%s' not found when call getters.", edgeName.c_str());
                     }
                     if (std::abs(edgeType) != edgeFound->second) {
-                        return Status::Error("Ignore this edge");
+                        return Status::Error("Ignore this edge : %s", edgeFound->first.c_str());
                     }
 
                     if (prop == _SRC) {
@@ -575,7 +575,7 @@ kvstore::ResultCode QueryBaseProcessor<REQ, RESP>::collectEdgeProps(
                                 "Edge `%s' not found when call getters.", edgeName.c_str());
                     }
                     if (std::abs(edgeType) != edgeFound->second) {
-                        return Status::Error("Ignore this edge");
+                        return Status::Error("Ignore this edge : %s", edgeFound->first.c_str());
                     }
                     return dstId;
                 };
@@ -590,6 +590,10 @@ kvstore::ResultCode QueryBaseProcessor<REQ, RESP>::collectEdgeProps(
                     return it->second;
                 };
                 auto value = exp_->eval(getters);
+                if (!value.ok()) {
+                    VLOG(3) << value.status();
+                    continue;
+                }
                 if (value.ok() && !Expression::asBool(value.value())) {
                     VLOG(1) << "Filter the edge "
                             << vId << "-> " << dstId << "@" << rank << ":" << edgeType;