From 913072868a6e6f537f7106d51a0016979e02af28 Mon Sep 17 00:00:00 2001 From: Mayur Singal <39544459+ulixius9@users.noreply.github.com> Date: Thu, 24 Oct 2024 11:12:50 +0530 Subject: [PATCH] MINOR: Not Include Soft Deleted Assets in DI (#18383) --- .../workflows/dataAssets/DataAssetsWorkflow.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/insights/workflows/dataAssets/DataAssetsWorkflow.java b/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/insights/workflows/dataAssets/DataAssetsWorkflow.java index 66af9769701..be3a181450b 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/insights/workflows/dataAssets/DataAssetsWorkflow.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/insights/workflows/dataAssets/DataAssetsWorkflow.java @@ -20,6 +20,7 @@ import org.openmetadata.schema.EntityInterface; import org.openmetadata.schema.service.configuration.elasticsearch.ElasticSearchConfiguration; import org.openmetadata.schema.system.IndexingError; import org.openmetadata.schema.system.StepStats; +import org.openmetadata.schema.type.Include; import org.openmetadata.service.apps.bundles.insights.DataInsightsApp; import org.openmetadata.service.apps.bundles.insights.utils.TimestampUtils; import org.openmetadata.service.apps.bundles.insights.workflows.WorkflowStats; @@ -28,6 +29,7 @@ import org.openmetadata.service.apps.bundles.insights.workflows.dataAssets.proce import org.openmetadata.service.apps.bundles.insights.workflows.dataAssets.processors.DataInsightsOpenSearchProcessor; import org.openmetadata.service.exception.SearchIndexException; import org.openmetadata.service.jdbi3.CollectionDAO; +import org.openmetadata.service.jdbi3.ListFilter; import org.openmetadata.service.search.SearchRepository; import org.openmetadata.service.search.elasticsearch.ElasticSearchIndexSink; import org.openmetadata.service.search.opensearch.OpenSearchIndexSink; @@ -100,8 +102,15 @@ public class DataAssetsWorkflow { entityTypes.forEach( entityType -> { List fields = List.of("*"); + ListFilter filter; + // data product does not support soft delete + if (!entityType.equals("dataProduct")) { + filter = new ListFilter(); + } else { + filter = new ListFilter(Include.ALL); + } PaginatedEntitiesSource source = - new PaginatedEntitiesSource(entityType, batchSize, fields) + new PaginatedEntitiesSource(entityType, batchSize, fields, filter) .withName(String.format("[DataAssetsWorkflow] %s", entityType)); sources.add(source); });