yujunjun/openspg
1
0
Fork 0
mirror of https://github.com/OpenSPG/openspg.git synced 2025-12-24 05:35:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

bugfix

Browse Source
This commit is contained in:
baifuyu 2023-12-27 22:11:14 +08:00
parent 9fdfe91e97
commit 1a5bd17709
5 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
builder/core/src/main/java/com/antgroup/openspg/builder/core/physical/process/SPGTypeMappingProcessor.java
View File

@ -78,10 +78,11 @@ public class SPGTypeMappingProcessor extends BaseMappingProcessor<SPGTypeMapping
if (advancedRecord != null) {
recordLinking.linking(advancedRecord);
recordPredicting.predicting(advancedRecord);
advancedRecords.add(advancedRecord);
List<BaseAdvancedRecord> subjectFusedRecord = subjectFusing.fusing(advancedRecord);
advancedRecords.addAll(subjectFusedRecord);
}
}
return (List) subjectFusing.fusing(advancedRecords);
return (List) advancedRecords;
}
@Override

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

@ -69,13 +69,17 @@ public class SubGraphMappingProcessor extends BaseMappingProcessor<SubGraphMappi
BuilderRecord mappedRecord = mapping(record, config.getMappingConfigs());
BaseAdvancedRecord advancedRecord = toSPGRecord(mappedRecord, spgType);
if (advancedRecord != null) {
List<BaseAdvancedRecord> fusedRecords = subGraphFusing.subGraphFusing(advancedRecord);
fusedRecords.forEach(r -> recordLinking.linking(r));
List<BaseAdvancedRecord> objectFusedRecords = subGraphFusing.subGraphFusing(advancedRecord);
objectFusedRecords.forEach(r -> recordLinking.linking(r));
advancedRecords.addAll(objectFusedRecords);
recordLinking.linking(advancedRecord);
recordPredicating.predicting(advancedRecord);
advancedRecords.addAll(fusedRecords);
List<BaseAdvancedRecord> subjectFusedRecord = subjectFusing.fusing(advancedRecord);
advancedRecords.addAll(subjectFusedRecord);
}
}
return (List) subjectFusing.fusing(advancedRecords);
return (List) advancedRecords;
}
@Override

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

@ -64,7 +64,6 @@ public class SubGraphFusingImpl implements SubGraphFusing {
results.addAll(fusedRecords);
}
}
results.add(advancedRecord);
return results;
}

2
builder/core/src/main/java/com/antgroup/openspg/builder/core/strategy/fusing/SubjectFusing.java
View File

@ -10,5 +10,5 @@ public interface SubjectFusing {
void init(BuilderContext context) throws BuilderException;
List<BaseAdvancedRecord> fusing(List<BaseAdvancedRecord> advancedRecords) throws FusingException;
List<BaseAdvancedRecord> fusing(BaseAdvancedRecord advancedRecord) throws FusingException;
}

8
builder/core/src/main/java/com/antgroup/openspg/builder/core/strategy/fusing/SubjectFusingImpl.java
View File

@ -5,6 +5,7 @@ import com.antgroup.openspg.builder.model.exception.BuilderException;
import com.antgroup.openspg.builder.model.exception.FusingException;
import com.antgroup.openspg.builder.model.pipeline.config.fusing.BaseFusingConfig;
import com.antgroup.openspg.builder.model.record.BaseAdvancedRecord;
import java.util.ArrayList;
import java.util.List;
public class SubjectFusingImpl implements SubjectFusing {
@ -21,8 +22,9 @@ public class SubjectFusingImpl implements SubjectFusing {
}
@Override
public List<BaseAdvancedRecord> fusing(List<BaseAdvancedRecord> advancedRecords)
throws FusingException {
return entityFusing.fusing(advancedRecords);
public List<BaseAdvancedRecord> fusing(BaseAdvancedRecord advancedRecord) throws FusingException {
List<BaseAdvancedRecord> records = new ArrayList<>(1);
records.add(advancedRecord);
return entityFusing.fusing(records);
}
}