yujunjun/openspg
1
0
Fork 0
mirror of https://github.com/OpenSPG/openspg.git synced 2025-11-27 07:40:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix kggraph splt bug

Browse Source
This commit is contained in:
kejian 2024-03-07 16:38:13 +08:00
parent df86073bdb
commit 077d06ee75
2 changed files with 35 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
reasoner/runner/runner-common/src/main/java/com/antgroup/openspg/reasoner/kggraph/impl/KgGraphImpl.java
View File

@ -14,6 +14,8 @@
package com.antgroup.openspg.reasoner.kggraph.impl;
import com.alibaba.fastjson.JSON;
import com.antgroup.openspg.reasoner.common.Utils;
import com.antgroup.openspg.reasoner.common.exception.InvalidGraphException;
import com.antgroup.openspg.reasoner.common.exception.KGValueException;
import com.antgroup.openspg.reasoner.common.graph.edge.Direction;
@ -173,8 +175,32 @@ public class KgGraphImpl implements KgGraph<IVertexId>, Serializable {
Long limit) {
Set<String> vertexAliases = Sets.newHashSet(inputVertexAliases);
// remove alias that vertex set size is 1
vertexAliases.removeIf(vertexAlias -> 1 == this.alias2VertexMap.get(vertexAlias).size());
// remove alias that vertex set size is 1 and its related edge size is 1
Map<String, Set<String>> vertexAliasToEdgeAliasMap = new HashMap<>();
for (String key : JavaConversions.setAsJavaSet(schema.topology().keySet())) {
scala.collection.Iterator<Connection> it = schema.topology().get(key).get().iterator();
while (it.hasNext()) {
Connection connection = it.next();
Set<String> sourceVertexRelatedEdgeAliasSet = vertexAliasToEdgeAliasMap.computeIfAbsent(connection.source(),
k -> new HashSet<>());
sourceVertexRelatedEdgeAliasSet.add(connection.alias());
Set<String> targetVertexRelatedEdgeAliasSet = vertexAliasToEdgeAliasMap.computeIfAbsent(connection.target(),
k -> new HashSet<>());
targetVertexRelatedEdgeAliasSet.add(connection.alias());
}
}
vertexAliases.removeIf(vertexAlias -> {
Boolean isSingleVertex = 1 == this.alias2VertexMap.get(vertexAlias).size();
Set<String> relatedEdgeAliasSet = vertexAliasToEdgeAliasMap.get(vertexAlias);
Boolean isRelatedEdgeSingle = true;
for (String edgeAlias : relatedEdgeAliasSet) {
isRelatedEdgeSingle = 1 == this.alias2EdgeMap.get(edgeAlias).size();
if (!isRelatedEdgeSingle) {
break;
}
}
return isSingleVertex && isRelatedEdgeSingle;
});
if (vertexAliases.isEmpty()) {
// not need split
if (null != filter && !filter.test(this)) {
@ -201,8 +227,7 @@ public class KgGraphImpl implements KgGraph<IVertexId>, Serializable {
return resultList;
}
Map<Bytes, KgGraph<IVertexId>> resultMap = new HashMap<>();
List<String> vertexAliasList = Lists.newArrayList(vertexAliases);
List<KgGraph<IVertexId>> result = new ArrayList<>();
EdgeCombinationIterator it =
new EdgeCombinationIterator(
staticParameters.getEdgeIterateInfoList(),
@ -218,15 +243,13 @@ public class KgGraphImpl implements KgGraph<IVertexId>, Serializable {
if (null != filter && !filter.test(path)) {
continue;
}
Bytes key = getKgGraphKeyBySplitVertex(vertexAliasList, path);
KgGraph<IVertexId> kgGraph = resultMap.computeIfAbsent(key, k -> new KgGraphImpl());
kgGraph.merge(Lists.newArrayList(path), schema);
if (null != limit && resultMap.size() >= limit) {
result.add(path);
if (null != limit && result.size() >= limit) {
// reach max path limit
break;
}
}
return Lists.newArrayList(resultMap.values());
return result;
}
/**
@ -419,8 +442,7 @@ public class KgGraphImpl implements KgGraph<IVertexId>, Serializable {
alias2VertexMap,
alias2EdgeMap);
it.setScope(limit);
List<String> sortedVertexAliasList = Lists.newArrayList(vertexAliases);
Map<KgGraphKey, KgGraph<IVertexId>> result = new HashMap<>();
List<KgGraph<IVertexId>> result = new ArrayList<>();
long count = 0;
while (it.hasNext()) {
KgGraph<IVertexId> kgg = it.next();
@ -436,29 +458,12 @@ public class KgGraphImpl implements KgGraph<IVertexId>, Serializable {
if (kgGraph.checkDuplicateVertex()) {
continue;
}
KgGraphKey kgGraphKey = getKgGraphKey(kgGraph, sortedVertexAliasList);
KgGraph<IVertexId> oldKgGraph = result.get(kgGraphKey);
if (null == oldKgGraph) {
result.put(kgGraphKey, kgGraph);
} else {
oldKgGraph.merge(Lists.newArrayList(kgGraph), schema);
}
result.add(kgGraph);
if (null != limit && count >= limit) {
break;
}
}
return Lists.newArrayList(result.values());
}
private KgGraphKey getKgGraphKey(KgGraph<IVertexId> kgGraph, List<String> vertexAliases) {
IVertexId[] vertexIds = new IVertexId[vertexAliases.size()];
for (int i = 0; i < vertexAliases.size(); ++i) {
String alias = vertexAliases.get(i);
IVertexId vertexId = kgGraph.getVertex(alias).get(0).getId();
vertexIds[i] = vertexId;
}
return new KgGraphKey(vertexIds);
return result;
}
/**

39
reasoner/runner/runner-common/src/main/java/com/antgroup/openspg/reasoner/kggraph/impl/KgGraphKey.java
View File

@ -1,39 +0,0 @@
/*
* Copyright 2023 OpenSPG Authors
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
* in compliance with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied.
*/
package com.antgroup.openspg.reasoner.kggraph.impl;
import com.antgroup.openspg.reasoner.common.graph.vertex.IVertexId;
import java.util.Arrays;
public class KgGraphKey {
private final IVertexId[] vertexIds;
public KgGraphKey(IVertexId[] vertexIds) {
this.vertexIds = vertexIds;
}
@Override
public boolean equals(Object obj) {
if (!(obj instanceof KgGraphKey)) {
return false;
}
KgGraphKey other = (KgGraphKey) obj;
return Arrays.equals(this.vertexIds, other.vertexIds);
}
@Override
public int hashCode() {
return Arrays.hashCode(vertexIds);
}
}