Skip to content

Commit 45f6c2a

Browse files
fix(ingestProposal): fix/handle no-op ingestion (#10126)
1 parent fc03a1c commit 45f6c2a

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

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

+5-3
Original file line numberDiff line numberDiff line change
@@ -747,10 +747,12 @@ public String ingestProposal(
747747
.mcps(List.of(metadataChangeProposal), auditStamp, entityService)
748748
.build();
749749

750-
IngestResult one = entityService.ingestProposal(batch, async).stream().findFirst().get();
750+
Optional<IngestResult> one = entityService.ingestProposal(batch, async).stream().findFirst();
751751

752-
Urn urn = one.getUrn();
753-
tryIndexRunId(urn, metadataChangeProposal.getSystemMetadata());
752+
Urn urn = one.map(IngestResult::getUrn).orElse(metadataChangeProposal.getEntityUrn());
753+
if (one.isPresent()) {
754+
tryIndexRunId(urn, metadataChangeProposal.getSystemMetadata());
755+
}
754756
return urn.toString();
755757
}
756758

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -253,11 +253,11 @@ public Task<String> ingestProposal(
253253
Set<IngestResult> results =
254254
_entityService.ingestProposal(batch, asyncBool);
255255

256-
IngestResult one = results.stream().findFirst().get();
256+
java.util.Optional<IngestResult> one = results.stream().findFirst();
257257

258258
// Update runIds, only works for existing documents, so ES document must exist
259-
Urn resultUrn = one.getUrn();
260-
if (one.isProcessedMCL() || one.isUpdate()) {
259+
Urn resultUrn = one.map(IngestResult::getUrn).orElse(metadataChangeProposal.getEntityUrn());
260+
if (one.map(result -> result.isProcessedMCL() || result.isUpdate()).orElse(false)) {
261261
tryIndexRunId(
262262
resultUrn, metadataChangeProposal.getSystemMetadata(), entitySearchService);
263263
}

0 commit comments

Comments
 (0)