This is an automated email from the ASF dual-hosted git repository.
jin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-hugegraph.git
The following commit(s) were added to refs/heads/master by this push:
new a369ef1f4 fix(server): kneigbor-api has unmatched edge type with
server (#2699)
a369ef1f4 is described below
commit a369ef1f4ae55f51634ef91b6f84632119b1dafb
Author: LiJie20190102 <[email protected]>
AuthorDate: Fri Dec 20 16:09:53 2024 +0800
fix(server): kneigbor-api has unmatched edge type with server (#2699)
Co-authored-by: lijie0203 <[email protected]>
Co-authored-by: imbajin <[email protected]>
---
.../org/apache/hugegraph/api/traversers/KneighborAPI.java | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git
a/hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/KneighborAPI.java
b/hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/KneighborAPI.java
index 212de2c88..2652dcb54 100644
---
a/hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/KneighborAPI.java
+++
b/hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/KneighborAPI.java
@@ -42,6 +42,7 @@ import org.apache.hugegraph.type.define.Directions;
import org.apache.hugegraph.util.E;
import org.apache.hugegraph.util.Log;
import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.slf4j.Logger;
import com.codahale.metrics.annotation.Timed;
@@ -169,7 +170,7 @@ public class KneighborAPI extends TraverserAPI {
QueryResults.emptyIterator());
}
- Iterator<?> iterVertex;
+ Iterator<Vertex> iterVertex = Collections.emptyIterator();
Set<Id> vertexIds = new HashSet<>(neighbors);
if (request.withPath) {
for (HugeTraverser.Path p : paths) {
@@ -179,18 +180,12 @@ public class KneighborAPI extends TraverserAPI {
if (request.withVertex && !vertexIds.isEmpty()) {
iterVertex = g.vertices(vertexIds.toArray());
measure.addIterCount(vertexIds.size(), 0L);
- } else {
- iterVertex = vertexIds.iterator();
}
- Iterator<?> iterEdge = Collections.emptyIterator();
- if (request.withPath) {
+ Iterator<Edge> iterEdge = Collections.emptyIterator();
+ if (request.withPath && request.withEdge) {
Set<Edge> edges = results.edgeResults().getEdges(paths);
- if (request.withEdge) {
- iterEdge = edges.iterator();
- } else {
- iterEdge =
HugeTraverser.EdgeRecord.getEdgeIds(edges).iterator();
- }
+ iterEdge = edges.iterator();
}
return manager.serializer(g, measure.measures())
