yujunjun/datahub
2
0
Fork 0
mirror of https://github.com/datahub-project/datahub.git synced 2025-12-27 09:58:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(ingestProposal): fix/handle no-op ingestion (#10126)

Browse Source
This commit is contained in:
david-leifker 2024-03-25 18:12:28 -05:00 committed by GitHub
parent fc03a1c3ee
commit 45f6c2a21e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
metadata-io/src/main/java/com/linkedin/metadata/client/JavaEntityClient.java
View File

@ -747,10 +747,12 @@ public class JavaEntityClient implements EntityClient {
.mcps(List.of(metadataChangeProposal), auditStamp, entityService)
.build();
IngestResult one = entityService.ingestProposal(batch, async).stream().findFirst().get();
Optional<IngestResult> one = entityService.ingestProposal(batch, async).stream().findFirst();
Urn urn = one.getUrn();
tryIndexRunId(urn, metadataChangeProposal.getSystemMetadata());
Urn urn = one.map(IngestResult::getUrn).orElse(metadataChangeProposal.getEntityUrn());
if (one.isPresent()) {
tryIndexRunId(urn, metadataChangeProposal.getSystemMetadata());
}
return urn.toString();
}

6
metadata-service/restli-servlet-impl/src/main/java/com/linkedin/metadata/resources/entity/AspectResource.java
View File

@ -253,11 +253,11 @@ public class AspectResource extends CollectionResourceTaskTemplate<String, Versi
Set<IngestResult> results =
_entityService.ingestProposal(batch, asyncBool);
IngestResult one = results.stream().findFirst().get();
java.util.Optional<IngestResult> one = results.stream().findFirst();
// Update runIds, only works for existing documents, so ES document must exist
Urn resultUrn = one.getUrn();
if (one.isProcessedMCL() || one.isUpdate()) {
Urn resultUrn = one.map(IngestResult::getUrn).orElse(metadataChangeProposal.getEntityUrn());
if (one.map(result -> result.isProcessedMCL() || result.isUpdate()).orElse(false)) {
tryIndexRunId(
resultUrn, metadataChangeProposal.getSystemMetadata(), entitySearchService);
}