Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(api-core): support label & property filtering for both edge and vertex & support kout dfs mode #2295

Merged
merged 19 commits into from
Sep 10, 2023
Merged

feat(api-core): support label & property filtering for both edge and vertex & support kout dfs mode #2295

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
040a128
Add Steps to track both edge and vertex labels && properties
DanGuge Aug 10, 2023
45886af
Add VESteps to serialize json parameter in request
DanGuge Aug 10, 2023
5582cde
format TraversalUtil.java, GraphTransaction.java, Query.java
DanGuge Aug 10, 2023
0e74170
change Step(only with edge info) to Steps(with both edge and vertex i…
DanGuge Aug 10, 2023
07e86e4
* change Step(only with edge info) to Steps(with both edge and vertex…
DanGuge Aug 10, 2023
c188653
fix: remove unused method & rename variable names
DanGuge Aug 12, 2023
5f42209
fix: name style & code style
DanGuge Aug 17, 2023
338f272
fix: Kout dfs vertex counter
DanGuge Aug 25, 2023
96c3329
fix: modify Kout Post and Kneighbor Post tests
DanGuge Aug 25, 2023
28e09a5
fix: update Steps.java license
DanGuge Aug 25, 2023
68ce908
fix: format code
DanGuge Aug 31, 2023
f887005
fix: format code
DanGuge Aug 31, 2023
bec5d79
fix: rollback code style
DanGuge Aug 31, 2023
be72db5
fix: format code style
DanGuge Aug 31, 2023
360b96d
fix: format code & change name style
DanGuge Sep 9, 2023
e403442
fix: Apply suggestions from code review
DanGuge Sep 9, 2023
8ed4b07
fix: format code
DanGuge Sep 9, 2023
3e340ca
fix: rename 'algorithm' to 'traverse_mode'
DanGuge Sep 10, 2023
bcae6b8
fix: rename 'traverse_mode' to 'traverseMode'
DanGuge Sep 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/KoutAPI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ public String post(@Context GraphManager manager,
E.checkArgument(!request.withVertex && !request.withPath && !request.withEdge,
"Can't return vertex, edge or path when count only");
}
HugeTraverser.checkTraverseMode(request.algorithm);
HugeTraverser.checkTraverseMode(request.traverse_mode);

LOG.debug("Graph [{}] get customized kout from source vertex '{}', " +
"with steps '{}', max_depth '{}', nearest '{}', " +
Expand All @@ -151,7 +151,7 @@ public String post(@Context GraphManager manager,
Steps steps = steps(g, request.steps);
KoutRecords results;
try (KoutTraverser traverser = new KoutTraverser(g)) {
if (HugeTraverser.isTraverseModeDFS(request.algorithm)) {
if (HugeTraverser.isTraverseModeDFS(request.traverse_mode)) {
results = traverser.dfsKout(sourceId, steps,
request.maxDepth,
request.nearest,
Expand Down Expand Up @@ -237,19 +237,19 @@ private static class Request {
public boolean withPath = false;
@JsonProperty("with_edge")
public boolean withEdge = false;
@JsonProperty("algorithm")
public String algorithm = HugeTraverser.TRAVERSE_MODE_BFS;
@JsonProperty("traverse_mode")
public String traverse_mode = HugeTraverser.TRAVERSE_MODE_BFS;
DanGuge marked this conversation as resolved.
Show resolved Hide resolved

@Override
public String toString() {
return String.format("KoutRequest{source=%s,steps=%s,maxDepth=%s" +
"nearest=%s,countOnly=%s,capacity=%s," +
"limit=%s,withVertex=%s,withPath=%s," +
"withEdge=%s,algorithm=%s}", this.source,
"withEdge=%s,traverse_mode=%s}", this.source,
DanGuge marked this conversation as resolved.
Show resolved Hide resolved
this.steps, this.maxDepth, this.nearest,
this.countOnly, this.capacity, this.limit,
this.withVertex, this.withPath, this.withEdge,
this.algorithm);
this.traverse_mode);
}
}
}
6 changes: 3 additions & 3 deletions hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/HugeTraverser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public class HugeTraverser {
// Empirical value of scan limit, with which results can be returned in 3s
public static final String DEFAULT_PAGE_LIMIT = "100000";
public static final long NO_LIMIT = -1L;
// kout traverse mode algorithms: bfs and dfs
// traverse mode of kout algorithm: bfs and dfs
public static final String TRAVERSE_MODE_BFS = "breadth_first_search";
public static final String TRAVERSE_MODE_DFS = "depth_first_search";
protected static final Logger LOG = Log.logger(HugeTraverser.class);
Expand Down Expand Up @@ -178,8 +178,8 @@ public static void checkTraverseMode(String traverseMode) {
TRAVERSE_MODE_BFS, TRAVERSE_MODE_DFS, traverseMode);
}

public static boolean isTraverseModeDFS(String algorithm) {
return algorithm.compareToIgnoreCase(TRAVERSE_MODE_DFS) == 0;
public static boolean isTraverseModeDFS(String traverse_mode) {
DanGuge marked this conversation as resolved.
Show resolved Hide resolved
return traverse_mode.compareToIgnoreCase(TRAVERSE_MODE_DFS) == 0;
}

public static <K, V extends Comparable<? super V>> Map<K, V> topN(
Expand Down