Skip to content

Commit 559bff1

Browse files
DanGugeDanGuge
committed
fix: name style & code style
* rename edgeRecord to edgeResults * fix Request class code style in SameNeighborsAPI.java
1 parent 92ba7c8 commit 559bff1

File tree

11 files changed

+55
-58
lines changed

11 files changed

+55
-58
lines changed

‎hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/CustomizedCrosspointsAPI.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ public String post(@Context GraphManager manager,
133133

134134
Iterator<?> iterEdge = Collections.emptyIterator();
135135
if (request.withPath) {
136-
Set<Edge> edges = traverser.getEdgeRecord().getEdges(paths.paths());
136+
Set<Edge> edges = traverser.edgeResults().getEdges(paths.paths());
137137
if (request.withEdge) {
138138
iterEdge = edges.iterator();
139139
} else {

‎hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/SameNeighborsAPI.java‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141

4242
import com.codahale.metrics.annotation.Timed;
4343
import com.fasterxml.jackson.annotation.JsonProperty;
44-
import com.fasterxml.jackson.databind.ObjectMapper;
4544
import com.google.common.collect.ImmutableMap;
4645

4746
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -139,6 +138,7 @@ public String sameNeighbors(@Context GraphManager manager,
139138
}
140139

141140
private static class Request {
141+
142142
@JsonProperty("max_degree")
143143
public long maxDegree = Long.parseLong(DEFAULT_MAX_DEGREE);
144144
@JsonProperty("limit")
@@ -154,16 +154,11 @@ private static class Request {
154154

155155
@Override
156156
public String toString() {
157-
ObjectMapper om = new ObjectMapper();
158-
String vertexStr;
159-
try {
160-
vertexStr = om.writeValueAsString(this.vertexList);
161-
} catch (Exception e) {
162-
throw new RuntimeException(e);
163-
}
164-
return String.format("SameNeighborsBatchRequest{vertex=%s,direction=%s,label=%s," +
165-
"max_degree=%d,limit=%d,with_vertex=%s", vertexStr, this.direction,
166-
this.labels, this.maxDegree, this.limit, this.withVertex);
157+
return String.format("SameNeighborsBatchRequest{vertex_list=%s," +
158+
"direction=%s,label=%s,max_degree=%d," +
159+
"limit=%d,with_vertex=%s",
160+
this.vertexList, this.direction, this.labels,
161+
this.maxDegree, this.limit, this.withVertex);
167162
}
168163
}
169164
}

‎hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/CollectionPathsTraverser.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,14 +84,14 @@ public WrappedPathCollection paths(Iterator<Vertex> sources,
8484
traverser.forward();
8585
if (traverser.finished()) {
8686
Collection<Path> paths = traverser.paths();
87-
return new WrappedPathCollection(paths, traverser.edgeRecord.getEdges(paths));
87+
return new WrappedPathCollection(paths, traverser.edgeResults.getEdges(paths));
8888
}
8989

9090
// Backward
9191
traverser.backward();
9292
if (traverser.finished()) {
9393
Collection<Path> paths = traverser.paths();
94-
return new WrappedPathCollection(paths, traverser.edgeRecord.getEdges(paths));
94+
return new WrappedPathCollection(paths, traverser.edgeResults.getEdges(paths));
9595
}
9696
} while (true);
9797
}

‎hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/CustomizePathsTraverser.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,12 @@
3838
import jakarta.ws.rs.core.MultivaluedMap;
3939

4040
public class CustomizePathsTraverser extends HugeTraverser {
41-
private final EdgeRecord edgeRecord;
41+
42+
private final EdgeRecord edgeResults;
4243

4344
public CustomizePathsTraverser(HugeGraph graph) {
4445
super(graph);
45-
this.edgeRecord = new EdgeRecord(false);
46+
this.edgeResults = new EdgeRecord(false);
4647
}
4748

4849
public static List<Path> topNPath(List<Path> paths,
@@ -108,7 +109,7 @@ public List<Path> customizedPaths(Iterator<Vertex> vertices,
108109
this.edgeIterCounter.addAndGet(1L);
109110
Id target = edge.id().otherVertexId();
110111

111-
this.edgeRecord.addEdge(entry.getKey(), target, edge);
112+
this.edgeResults.addEdge(entry.getKey(), target, edge);
112113

113114
for (Node n : entry.getValue()) {
114115
// If have loop, skip target
@@ -171,8 +172,8 @@ public List<Path> customizedPaths(Iterator<Vertex> vertices,
171172
return paths;
172173
}
173174

174-
public EdgeRecord getEdgeRecord() {
175-
return edgeRecord;
175+
public EdgeRecord edgeResults() {
176+
return edgeResults;
176177
}
177178

178179
public static class WeightNode extends Node {

‎hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/CustomizedCrosspointsTraverser.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@
4242

4343
public class CustomizedCrosspointsTraverser extends HugeTraverser {
4444

45-
private final EdgeRecord edgeRecord;
45+
private final EdgeRecord edgeResults;
4646

4747
public CustomizedCrosspointsTraverser(HugeGraph graph) {
4848
super(graph);
49-
this.edgeRecord = new EdgeRecord(false);
49+
this.edgeResults = new EdgeRecord(false);
5050
}
5151

5252
private static CrosspointsPaths intersectionPaths(List<HugeVertex> sources,
@@ -98,8 +98,8 @@ private static CrosspointsPaths intersectionPaths(List<HugeVertex> sources,
9898
return new CrosspointsPaths(newSet(intersection), results);
9999
}
100100

101-
public EdgeRecord getEdgeRecord() {
102-
return edgeRecord;
101+
public EdgeRecord edgeResults() {
102+
return edgeResults;
103103
}
104104

105105
public CrosspointsPaths crosspointsPaths(Iterator<Vertex> vertices,
@@ -143,7 +143,7 @@ public CrosspointsPaths crosspointsPaths(Iterator<Vertex> vertices,
143143
edgeCount += 1;
144144
Id target = edge.id().otherVertexId();
145145

146-
this.edgeRecord.addEdge(entry.getKey(), target, edge);
146+
this.edgeResults.addEdge(entry.getKey(), target, edge);
147147

148148
for (Node n : entry.getValue()) {
149149
// If have loop, skip target

‎hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/KneighborTraverser.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public KneighborRecords customizedKneighbor(Id source, EdgeStep step,
9292
Id target = edge.id().otherVertexId();
9393
records.addPath(v, target);
9494

95-
records.getEdgeIdRecord().addEdge(v, target, edge);
95+
records.edgeResults().addEdge(v, target, edge);
9696

9797
this.edgeIterCounter.addAndGet(1L);
9898
}

‎hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/KoutTraverser.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ public KoutRecords customizedKout(Id source, EdgeStep step,
124124
records.addPath(v, target);
125125
this.checkCapacity(capacity, records.accessed(), depth[0]);
126126

127-
records.getEdgeIdRecord().addEdge(v, target, edge);
127+
records.edgeResults().addEdge(v, target, edge);
128128

129129
this.edgeIterCounter.addAndGet(1L);
130130
}

‎hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/PathTraverser.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828

2929
import org.apache.hugegraph.backend.id.Id;
3030
import org.apache.hugegraph.structure.HugeEdge;
31+
import org.apache.hugegraph.traversal.algorithm.HugeTraverser.EdgeRecord;
3132
import org.apache.hugegraph.traversal.algorithm.steps.EdgeStep;
3233
import org.apache.hugegraph.traversal.algorithm.strategy.TraverseStrategy;
3334
import org.apache.tinkerpop.gremlin.structure.Edge;
@@ -50,7 +51,7 @@ public abstract class PathTraverser {
5051
protected Set<HugeTraverser.Path> paths;
5152

5253
protected TraverseStrategy traverseStrategy;
53-
protected HugeTraverser.EdgeRecord edgeRecord;
54+
protected EdgeRecord edgeResults;
5455

5556
public PathTraverser(HugeTraverser traverser, TraverseStrategy strategy,
5657
Collection<Id> sources, Collection<Id> targets,
@@ -79,7 +80,7 @@ public PathTraverser(HugeTraverser traverser, TraverseStrategy strategy,
7980

8081
this.paths = this.newPathSet();
8182

82-
this.edgeRecord = new HugeTraverser.EdgeRecord(concurrent);
83+
this.edgeResults = new EdgeRecord(concurrent);
8384
}
8485

8586
public void forward() {
@@ -148,7 +149,7 @@ private void traverseOne(Id v, EdgeStep step, boolean forward) {
148149
Id target = edge.id().otherVertexId();
149150
this.traverser.edgeIterCounter.addAndGet(1L);
150151

151-
this.edgeRecord.addEdge(v, target, edge);
152+
this.edgeResults.addEdge(v, target, edge);
152153

153154
this.processOne(v, target, forward);
154155
}

‎hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/ShortestPathTraverser.java‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,11 @@ public Path shortestPath(Id sourceV, Id targetV, Directions dir,
8484
}
8585

8686
this.vertexIterCounter.addAndGet(traverser.vertexCount);
87-
this.edgeIterCounter.addAndGet(traverser.record.accessed());
87+
this.edgeIterCounter.addAndGet(traverser.pathResults.accessed());
8888

8989
Path path = paths.isEmpty() ? Path.EMPTY : paths.iterator().next();
9090

91-
Set<Edge> edges = traverser.edgeRecord.getEdges(path);
91+
Set<Edge> edges = traverser.edgeResults.getEdges(path);
9292
path.setEdges(edges);
9393
return path;
9494
}
@@ -137,16 +137,16 @@ public PathSet allShortestPaths(Id sourceV, Id targetV, Directions dir,
137137
}
138138

139139
this.vertexIterCounter.addAndGet(traverser.vertexCount);
140-
this.edgeIterCounter.addAndGet(traverser.record.accessed());
140+
this.edgeIterCounter.addAndGet(traverser.pathResults.accessed());
141141

142-
paths.setEdges(traverser.edgeRecord.getEdges(paths));
142+
paths.setEdges(traverser.edgeResults.getEdges(paths));
143143
return paths;
144144
}
145145

146146
private class Traverser {
147147

148-
private final ShortestPathRecords record;
149-
private final EdgeRecord edgeRecord;
148+
private final ShortestPathRecords pathResults;
149+
private final EdgeRecord edgeResults;
150150
private final Directions direction;
151151
private final Map<Id, String> labels;
152152
private final long degree;
@@ -157,8 +157,8 @@ private class Traverser {
157157
public Traverser(Id sourceV, Id targetV, Directions dir,
158158
Map<Id, String> labels, long degree,
159159
long skipDegree, long capacity) {
160-
this.record = new ShortestPathRecords(sourceV, targetV);
161-
this.edgeRecord = new EdgeRecord(false);
160+
this.pathResults = new ShortestPathRecords(sourceV, targetV);
161+
this.edgeResults = new EdgeRecord(false);
162162
this.direction = dir;
163163
this.labels = labels;
164164
this.degree = degree;
@@ -168,7 +168,7 @@ public Traverser(Id sourceV, Id targetV, Directions dir,
168168
}
169169

170170
public PathSet traverse(boolean all) {
171-
return this.record.sourcesLessThanTargets() ?
171+
return this.pathResults.sourcesLessThanTargets() ?
172172
this.forward(all) : this.backward(all);
173173
}
174174

@@ -180,9 +180,9 @@ public PathSet forward(boolean all) {
180180
PathSet results = new PathSet();
181181
long degree = this.skipDegree > 0L ? this.skipDegree : this.degree;
182182

183-
this.record.startOneLayer(true);
184-
while (this.record.hasNextKey()) {
185-
Id source = this.record.nextKey();
183+
this.pathResults.startOneLayer(true);
184+
while (this.pathResults.hasNextKey()) {
185+
Id source = this.pathResults.nextKey();
186186

187187
Iterator<Edge> edges = edgesOfVertex(source, this.direction,
188188
this.labels, degree);
@@ -195,9 +195,9 @@ public PathSet forward(boolean all) {
195195
HugeEdge edge = (HugeEdge) edges.next();
196196
Id target = edge.id().otherVertexId();
197197

198-
this.edgeRecord.addEdge(source, target, edge);
198+
this.edgeResults.addEdge(source, target, edge);
199199

200-
PathSet paths = this.record.findPath(target,
200+
PathSet paths = this.pathResults.findPath(target,
201201
t -> !this.superNode(t, this.direction),
202202
all, false);
203203

@@ -212,7 +212,7 @@ public PathSet forward(boolean all) {
212212

213213
}
214214

215-
this.record.finishOneLayer();
215+
this.pathResults.finishOneLayer();
216216

217217
return results;
218218
}
@@ -226,9 +226,9 @@ public PathSet backward(boolean all) {
226226
long degree = this.skipDegree > 0L ? this.skipDegree : this.degree;
227227
Directions opposite = this.direction.opposite();
228228

229-
this.record.startOneLayer(false);
230-
while (this.record.hasNextKey()) {
231-
Id source = this.record.nextKey();
229+
this.pathResults.startOneLayer(false);
230+
while (this.pathResults.hasNextKey()) {
231+
Id source = this.pathResults.nextKey();
232232

233233
Iterator<Edge> edges = edgesOfVertex(source, opposite,
234234
this.labels, degree);
@@ -241,9 +241,9 @@ public PathSet backward(boolean all) {
241241
HugeEdge edge = (HugeEdge) edges.next();
242242
Id target = edge.id().otherVertexId();
243243

244-
this.edgeRecord.addEdge(source, target, edge);
244+
this.edgeResults.addEdge(source, target, edge);
245245

246-
PathSet paths = this.record.findPath(target,
246+
PathSet paths = this.pathResults.findPath(target,
247247
t -> !this.superNode(t, opposite),
248248
all, false);
249249

@@ -258,7 +258,7 @@ public PathSet backward(boolean all) {
258258
}
259259

260260
// Re-init targets
261-
this.record.finishOneLayer();
261+
this.pathResults.finishOneLayer();
262262

263263
return results;
264264
}
@@ -273,7 +273,7 @@ private boolean superNode(Id vertex, Directions direction) {
273273
}
274274

275275
private long accessed() {
276-
return this.record.accessed();
276+
return this.pathResults.accessed();
277277
}
278278
}
279279
}

‎hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/TemplatePathsTraverser.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,14 +80,14 @@ public WrappedPathSet templatePaths(Iterator<Vertex> sources,
8080
traverser.forward();
8181
if (traverser.finished()) {
8282
Set<Path> paths = traverser.paths();
83-
return new WrappedPathSet(paths, traverser.edgeRecord.getEdges(paths));
83+
return new WrappedPathSet(paths, traverser.edgeResults.getEdges(paths));
8484
}
8585

8686
// Backward
8787
traverser.backward();
8888
if (traverser.finished()) {
8989
Set<Path> paths = traverser.paths();
90-
return new WrappedPathSet(paths, traverser.edgeRecord.getEdges(paths));
90+
return new WrappedPathSet(paths, traverser.edgeResults.getEdges(paths));
9191
}
9292
} while (true);
9393
}

0 commit comments

Comments
 (0)