yujunjun/openspg
1
0
Fork 0
mirror of https://github.com/OpenSPG/openspg.git synced 2025-06-27 03:20:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(reasoner): fix PER_NODE_LIMIT (#368)

Browse Source 
Co-authored-by: peilong <peilong.zpl@antgroup.com>
This commit is contained in:
wenchengyao 2024-10-21 14:27:40 +08:00 committed by GitHub
parent 5dc03cb5ce
commit 8364df9c6a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
reasoner/runner/local-runner/src/test/java/com/antgroup/openspg/reasoner/runner/local/main/KgReasonerTopKFilmTest.java
View File

@ -457,4 +457,17 @@ public class KgReasonerTopKFilmTest {
Assert.assertEquals("root", result.get(0)[0]);
Assert.assertEquals("L1_1_star", result.get(0)[1]);
}
@Test
public void test15() {
FileMutex.runTestWithMutex(this::doTest15);
}
private void doTest15() {
String dsl =
"match (s:Film)-[p:starOfFilm|directOfFilm PER_NODE_LIMIT 1]->(o:FilmStar|FilmDirector) where s.id = 'root' return s.id, o.id";
List<String[]> result = runTestResult(dsl);
Assert.assertEquals(2, result.size());
Assert.assertEquals(2, result.get(0).length);
}
}

24
reasoner/runner/runner-common/src/main/java/com/antgroup/openspg/reasoner/pattern/PatternMatcher.java
View File

@ -256,9 +256,6 @@ public class PatternMatcher implements Serializable {
+ JSON.toJSONString(dstVertexRuleList));
}
}
if (patternConnection.limit() != null && patternConnection.limit() > 0) {
limit = new Long(patternConnection.limit());
}
List<IEdge<IVertexId, IProperty>> validEdges =
matchEdges(
vertexContext, willMatchEdgeList, patternConnection, pattern, edgeRuleMap, limit);
@ -299,10 +296,15 @@ public class PatternMatcher implements Serializable {
Connection patternConnection,
Pattern pattern,
Map<String, List<String>> edgeRuleMap,
Long limit) {
Long totalLimit) {
ArrayList<IEdge<IVertexId, IProperty>> result = new ArrayList<>();
long oneTypeEdgeCount = 0;
Map<String, Long> edgeTypeCountMap = new HashMap<>();
Long totalCount = 0L;
for (IEdge<IVertexId, IProperty> edge : edgeList) {
String edgeType = edge.getType();
if (!edgeTypeCountMap.containsKey(edgeType)) {
edgeTypeCountMap.put(edgeType, 0L);
}
if (!isEdgeMatch(
vertexContext,
edge,
@ -311,11 +313,17 @@ public class PatternMatcher implements Serializable {
edgeRuleMap.get(patternConnection.alias()))) {
continue;
}
oneTypeEdgeCount++;
if (null != limit && oneTypeEdgeCount > limit) {
// reach max path limit
totalCount = totalCount + 1;
if (null != totalLimit && totalCount > totalLimit) {
break;
}
long currentEdgeTypeCount = edgeTypeCountMap.get(edgeType) + 1;
edgeTypeCountMap.put(edgeType, currentEdgeTypeCount);
if (null != patternConnection.limit()
&& patternConnection.limit() > 0
&& currentEdgeTypeCount > patternConnection.limit()) {
continue;
}
result.add(edge);
}
result.trimToSize();