yujunjun/openspg
1
0
Fork 0
mirror of https://github.com/OpenSPG/openspg.git synced 2025-09-21 22:47:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

bugfix

Browse Source
This commit is contained in:
baifuyu 2023-12-21 21:02:30 +08:00
parent 093e78415e
commit 60d9099ac5
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builder/core/src/main/java/com/antgroup/openspg/builder/core/physical/process/SubGraphMappingProcessor.java
View File

@ -60,9 +60,9 @@ public class SubGraphMappingProcessor extends BaseMappingProcessor<SubGraphMappi
BuilderRecord mappedRecord = mapping(record, config.getMappingConfigs()); BuilderRecord mappedRecord = mapping(record, config.getMappingConfigs());
BaseAdvancedRecord advancedRecord = toSPGRecord(mappedRecord, spgType); BaseAdvancedRecord advancedRecord = toSPGRecord(mappedRecord, spgType);
if (advancedRecord != null) { if (advancedRecord != null) {
subGraphFusing.subGraphFusing(advancedRecord); List<BaseAdvancedRecord> fusedRecords = subGraphFusing.subGraphFusing(advancedRecord);
recordPredicating.propertyPredicating(advancedRecord); recordPredicating.propertyPredicating(advancedRecord);
advancedRecords.add(advancedRecord); advancedRecords.addAll(fusedRecords);
} }
} }
return (List) subjectFusing.subjectFusing(advancedRecords); return (List) subjectFusing.subjectFusing(advancedRecords);

3
builder/core/src/main/java/com/antgroup/openspg/builder/core/strategy/fusing/SubGraphFusing.java
View File

@ -4,12 +4,11 @@ import com.antgroup.openspg.builder.core.runtime.BuilderContext;
import com.antgroup.openspg.builder.model.exception.BuilderException; import com.antgroup.openspg.builder.model.exception.BuilderException;
import com.antgroup.openspg.builder.model.exception.FusingException; import com.antgroup.openspg.builder.model.exception.FusingException;
import com.antgroup.openspg.builder.model.record.BaseAdvancedRecord; import com.antgroup.openspg.builder.model.record.BaseAdvancedRecord;
import com.antgroup.openspg.builder.model.record.BaseSPGRecord;
import java.util.List; import java.util.List;
public interface SubGraphFusing { public interface SubGraphFusing {
void init(BuilderContext context) throws BuilderException; void init(BuilderContext context) throws BuilderException;
List<BaseSPGRecord> subGraphFusing(BaseAdvancedRecord advancedRecord) throws FusingException; List<BaseAdvancedRecord> subGraphFusing(BaseAdvancedRecord advancedRecord) throws FusingException;
} }

5
builder/core/src/main/java/com/antgroup/openspg/builder/core/strategy/fusing/SubGraphFusingImpl.java
View File

@ -6,7 +6,6 @@ import com.antgroup.openspg.builder.model.exception.FusingException;
import com.antgroup.openspg.builder.model.pipeline.config.BaseMappingNodeConfig; import com.antgroup.openspg.builder.model.pipeline.config.BaseMappingNodeConfig;
import com.antgroup.openspg.builder.model.pipeline.config.fusing.BaseFusingConfig; import com.antgroup.openspg.builder.model.pipeline.config.fusing.BaseFusingConfig;
import com.antgroup.openspg.builder.model.record.BaseAdvancedRecord; import com.antgroup.openspg.builder.model.record.BaseAdvancedRecord;
import com.antgroup.openspg.builder.model.record.BaseSPGRecord;
import com.antgroup.openspg.builder.model.record.property.BasePropertyRecord; import com.antgroup.openspg.builder.model.record.property.BasePropertyRecord;
import com.antgroup.openspg.cloudext.interfaces.graphstore.adapter.util.VertexRecordConvertor; import com.antgroup.openspg.cloudext.interfaces.graphstore.adapter.util.VertexRecordConvertor;
import com.antgroup.openspg.common.util.CollectionsUtils; import com.antgroup.openspg.common.util.CollectionsUtils;
@ -45,9 +44,9 @@ public class SubGraphFusingImpl implements SubGraphFusing {
} }
@Override @Override
public List<BaseSPGRecord> subGraphFusing(BaseAdvancedRecord advancedRecord) public List<BaseAdvancedRecord> subGraphFusing(BaseAdvancedRecord advancedRecord)
throws FusingException { throws FusingException {
List<BaseSPGRecord> results = new ArrayList<>(); List<BaseAdvancedRecord> results = new ArrayList<>();
for (BasePropertyRecord propertyRecord : advancedRecord.getProperties()) { for (BasePropertyRecord propertyRecord : advancedRecord.getProperties()) {
if (propertyRecord.isSemanticProperty()) { if (propertyRecord.isSemanticProperty()) {
EntityFusing entityFusing = semanticEntityFusing.get(propertyRecord.getName()); EntityFusing entityFusing = semanticEntityFusing.get(propertyRecord.getName());