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

fix(api): correct the vertex id in the edge-existence api #2380

Merged
merged 25 commits into from
Dec 8, 2023
Merged

fix(api): correct the vertex id in the edge-existence api #2380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
3559ace
refact: move dirs into hugegraph-server
VGalaxies Aug 1, 2023
9068cef
refact: create dirs for hugegraph-pd and hugegraph-store
VGalaxies Aug 2, 2023
fd161f2
refact: init root pom for all modules
VGalaxies Aug 4, 2023
49a1acf
fix: fix parent of submodules in hugegraph-server
VGalaxies Aug 4, 2023
fca91b2
fix: path
msgui Aug 13, 2023
8465927
fix: conf path
msgui Aug 13, 2023
3b791ee
fix: 1.10 -> 1.11
msgui Aug 13, 2023
ae90ba6
Revert "fix: 1.10 -> 1.11"
msgui Aug 14, 2023
ce5ddbf
fix: version 1.0.0 -> 1.5.0
msgui Aug 14, 2023
8a7ed6a
fix:
msgui Aug 14, 2023
242786b
check
msgui Aug 16, 2023
2e401de
fix: SERVER_DIR
msgui Aug 16, 2023
67de746
fix
msgui Aug 16, 2023
edb77ef
fix
msgui Aug 16, 2023
764dd89
fix: SERVER_DIR
msgui Aug 16, 2023
9a2f2e6
Merge pull request #5 from msgui/fix_CI
msgui Aug 17, 2023
4f68641
test
msgui Sep 9, 2023
d582a51
Merge pull request #14 from msgui/new-fix-depedency-review
msgui Sep 9, 2023
80cf036
Merge branch 'master' of https://github.com/msgui/incubator-hugegraph
msgui Sep 13, 2023
2b241dd
Merge branch 'master' of https://github.com/msgui/incubator-hugegraph
msgui Oct 12, 2023
5b5560f
Merge branch 'master' of https://github.com/msgui/incubator-hugegraph
msgui Nov 28, 2023
016d451
Merge branch 'apache:master' into master
msgui Dec 5, 2023
c7d7c93
chore
msgui Dec 5, 2023
644e15e
Merge branch 'apache:master' into master
msgui Dec 7, 2023
d7ffa14
fix
msgui Dec 7, 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
5 changes: 3 additions & 2 deletions ...ver/hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/EdgeExistenceAPI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import java.util.Iterator;

import org.apache.hugegraph.HugeGraph;
import org.apache.hugegraph.api.graph.VertexAPI;
import org.apache.hugegraph.backend.id.Id;
import org.apache.hugegraph.core.GraphManager;
import org.apache.hugegraph.structure.HugeVertex;
Expand Down Expand Up @@ -72,8 +73,8 @@
E.checkArgumentNotNull(source, "The source can't be null");
E.checkArgumentNotNull(target, "The target can't be null");

Id sourceId = HugeVertex.getIdValue(source);
Id targetId = HugeVertex.getIdValue(target);
Id sourceId = VertexAPI.checkAndParseVertexId(source);
Id targetId = VertexAPI.checkAndParseVertexId(target);

Check warning on line 77 in hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/EdgeExistenceAPI.java

View check run for this annotation

Codecov / codecov/patch

hugegraph-server/hugegraph-api/src/main/java/org/apache/hugegraph/api/traversers/EdgeExistenceAPI.java#L76-L77 

Added lines #L76 - L77 were not covered by tests
HugeGraph hugegraph = graph(manager, graph);
EdgeExistenceTraverser traverser = new EdgeExistenceTraverser(hugegraph);
Iterator<Edge> edges = traverser.queryEdgeExistence(sourceId, targetId, edgeLabel,
Expand Down
7 changes: 3 additions & 4 deletions ...h-core/src/main/java/org/apache/hugegraph/traversal/algorithm/EdgeExistenceTraverser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,16 +42,15 @@
return queryByNeighbors(sourceId, targetId, limit);
}

Id edgeLabelId = getEdgeLabelId(label);
EdgeLabel edgeLabel = graph().edgeLabel(edgeLabelId);
EdgeLabel edgeLabel = graph().edgeLabel(label);

Check warning on line 45 in hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/EdgeExistenceTraverser.java

View check run for this annotation

Codecov / codecov/patch

hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/EdgeExistenceTraverser.java#L45 

Added line #L45 was not covered by tests
ConditionQuery conditionQuery = new ConditionQuery(HugeType.EDGE);
conditionQuery.eq(HugeKeys.OWNER_VERTEX, sourceId);
conditionQuery.eq(HugeKeys.OTHER_VERTEX, targetId);
conditionQuery.eq(HugeKeys.LABEL, edgeLabelId);
conditionQuery.eq(HugeKeys.LABEL, edgeLabel.id());

Check warning on line 49 in hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/EdgeExistenceTraverser.java

View check run for this annotation

Codecov / codecov/patch

hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/algorithm/EdgeExistenceTraverser.java#L49 

Added line #L49 was not covered by tests
conditionQuery.eq(HugeKeys.DIRECTION, Directions.OUT);
conditionQuery.limit(limit);

if (edgeLabel.existSortKeys()) {
if (edgeLabel.existSortKeys() && !sortValues.isEmpty()) {
conditionQuery.eq(HugeKeys.SORT_VALUES, sortValues);
} else {
conditionQuery.eq(HugeKeys.SORT_VALUES, "");
Expand Down
Loading