diff --git a/builder/core/src/main/java/com/antgroup/openspg/builder/core/physical/process/SubGraphMappingProcessor.java b/builder/core/src/main/java/com/antgroup/openspg/builder/core/physical/process/SubGraphMappingProcessor.java index 75f04ff9..ee5137a8 100644 --- a/builder/core/src/main/java/com/antgroup/openspg/builder/core/physical/process/SubGraphMappingProcessor.java +++ b/builder/core/src/main/java/com/antgroup/openspg/builder/core/physical/process/SubGraphMappingProcessor.java @@ -60,9 +60,9 @@ public class SubGraphMappingProcessor extends BaseMappingProcessor fusedRecords = subGraphFusing.subGraphFusing(advancedRecord); recordPredicating.propertyPredicating(advancedRecord); - advancedRecords.add(advancedRecord); + advancedRecords.addAll(fusedRecords); } } return (List) subjectFusing.subjectFusing(advancedRecords); diff --git a/builder/core/src/main/java/com/antgroup/openspg/builder/core/strategy/fusing/SubGraphFusing.java b/builder/core/src/main/java/com/antgroup/openspg/builder/core/strategy/fusing/SubGraphFusing.java index 440ff265..48936582 100644 --- a/builder/core/src/main/java/com/antgroup/openspg/builder/core/strategy/fusing/SubGraphFusing.java +++ b/builder/core/src/main/java/com/antgroup/openspg/builder/core/strategy/fusing/SubGraphFusing.java @@ -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.FusingException; import com.antgroup.openspg.builder.model.record.BaseAdvancedRecord; -import com.antgroup.openspg.builder.model.record.BaseSPGRecord; import java.util.List; public interface SubGraphFusing { void init(BuilderContext context) throws BuilderException; - List subGraphFusing(BaseAdvancedRecord advancedRecord) throws FusingException; + List subGraphFusing(BaseAdvancedRecord advancedRecord) throws FusingException; } diff --git a/builder/core/src/main/java/com/antgroup/openspg/builder/core/strategy/fusing/SubGraphFusingImpl.java b/builder/core/src/main/java/com/antgroup/openspg/builder/core/strategy/fusing/SubGraphFusingImpl.java index 73491948..df119226 100644 --- a/builder/core/src/main/java/com/antgroup/openspg/builder/core/strategy/fusing/SubGraphFusingImpl.java +++ b/builder/core/src/main/java/com/antgroup/openspg/builder/core/strategy/fusing/SubGraphFusingImpl.java @@ -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.fusing.BaseFusingConfig; 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.cloudext.interfaces.graphstore.adapter.util.VertexRecordConvertor; import com.antgroup.openspg.common.util.CollectionsUtils; @@ -45,9 +44,9 @@ public class SubGraphFusingImpl implements SubGraphFusing { } @Override - public List subGraphFusing(BaseAdvancedRecord advancedRecord) + public List subGraphFusing(BaseAdvancedRecord advancedRecord) throws FusingException { - List results = new ArrayList<>(); + List results = new ArrayList<>(); for (BasePropertyRecord propertyRecord : advancedRecord.getProperties()) { if (propertyRecord.isSemanticProperty()) { EntityFusing entityFusing = semanticEntityFusing.get(propertyRecord.getName());