fix

Author: Z-HUANT

hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/backend/query/ConditionQuery.java

@@ -553,7 +553,7 @@ public Condition.Relation copyRelationAndUpdateQuery(Object key) {
                 }
             }
         }
-        E.checkArgument(copyRes != null, "Copying Condition.Relation failed. key:%s", key);
+        E.checkArgument(copyRes != null, "Failed to copy Condition.Relation: %s", key);
         return copyRes;
     }
 

hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/backend/tx/GraphTransaction.java

@@ -1460,7 +1460,7 @@ private Query optimizeQuery(ConditionQuery query) {
                 List<Id> filterVertexList = vertexIdList.stream().filter(vertexId -> {
                     Vertex vertex = this.graph().vertex(vertexId);
                     VertexLabel vertexLabel = graph().vertexLabel(vertex.label());
-                    return edgeLabel.linkWithLabel(vertexLabel.id(), dir.type());
+                    return edgeLabel.linkWithVertexLabel(vertexLabel.id(), dir);
                 }).collect(Collectors.toList());
                 if (CollectionUtils.isEmpty(filterVertexList)) {
                     // Return empty query to skip storage query
@@ -1477,7 +1477,7 @@ private Query optimizeQuery(ConditionQuery query) {
                 Vertex vertex = QueryResults.one(iter);
                 if (vertex != null) {
                     VertexLabel vertexLabel = graph().vertexLabel(vertex.label());
-                    if (!edgeLabel.linkWithLabel(vertexLabel.id(), dir.type())) {
+                    if (!edgeLabel.linkWithVertexLabel(vertexLabel.id(), dir)) {
                         // Return empty query to skip storage query
                         return new Query(query.resultType());
                     }

hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/schema/EdgeLabel.java

@@ -27,6 +27,7 @@
 import org.apache.hugegraph.backend.id.Id;
 import org.apache.hugegraph.schema.builder.SchemaBuilder;
 import org.apache.hugegraph.type.HugeType;
+import org.apache.hugegraph.type.define.Directions;
 import org.apache.hugegraph.type.define.Frequency;
 import org.apache.hugegraph.util.E;
 
@@ -99,11 +100,13 @@ public boolean linkWithLabel(Id id) {
         return this.sourceLabel.equals(id) || this.targetLabel.equals(id);
     }
 
-    public boolean linkWithLabel(Id id, HugeType type) {
-        if (type.equals(HugeType.EDGE_IN)) {
-            return this.targetLabel.equals(id);
-        } else if (type.equals(HugeType.EDGE_OUT)) {
-            return this.sourceLabel.equals(id);
+    public boolean linkWithVertexLabel(Id label, Directions dir) {
+        if (dir.equals(Directions.IN)) {
+            return this.targetLabel.equals(label);
+        } else if (dir.equals(Directions.OUT)) {
+            return this.sourceLabel.equals(label);
+        } else if (dir.equals(Directions.BOTH)) {
+            return this.targetLabel.equals(label) || this.sourceLabel.equals(label);
         }
         return false;
     }