Skip to content

Commit a22320e

Browse files
author
lijie0203
committed
fix(server): kneigbor-api has unmatched edge type with server
1 parent d142d91 commit a22320e

File tree

1 file changed

+5
-10
lines changed
  • hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers

1 file changed

+5
-10
lines changed

hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/KneighborAPI.java

+5-10
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
import org.apache.hugegraph.util.E;
4343
import org.apache.hugegraph.util.Log;
4444
import org.apache.tinkerpop.gremlin.structure.Edge;
45+
import org.apache.tinkerpop.gremlin.structure.Vertex;
4546
import org.slf4j.Logger;
4647

4748
import com.codahale.metrics.annotation.Timed;
@@ -169,7 +170,7 @@ public String post(@Context GraphManager manager,
169170
QueryResults.emptyIterator());
170171
}
171172

172-
Iterator<?> iterVertex;
173+
Iterator<Vertex> iterVertex = Collections.emptyIterator();
173174
Set<Id> vertexIds = new HashSet<>(neighbors);
174175
if (request.withPath) {
175176
for (HugeTraverser.Path p : paths) {
@@ -179,18 +180,12 @@ public String post(@Context GraphManager manager,
179180
if (request.withVertex && !vertexIds.isEmpty()) {
180181
iterVertex = g.vertices(vertexIds.toArray());
181182
measure.addIterCount(vertexIds.size(), 0L);
182-
} else {
183-
iterVertex = vertexIds.iterator();
184183
}
185184

186-
Iterator<?> iterEdge = Collections.emptyIterator();
187-
if (request.withPath) {
185+
Iterator<Edge> iterEdge = Collections.emptyIterator();
186+
if (request.withPath && request.withEdge) {
188187
Set<Edge> edges = results.edgeResults().getEdges(paths);
189-
if (request.withEdge) {
190-
iterEdge = edges.iterator();
191-
} else {
192-
iterEdge = HugeTraverser.EdgeRecord.getEdgeIds(edges).iterator();
193-
}
188+
iterEdge = edges.iterator();
194189
}
195190

196191
return manager.serializer(g, measure.measures())

0 commit comments

Comments
 (0)