From fdb24d8f1ee88555fd90a2152ffd707b89a1070e Mon Sep 17 00:00:00 2001 From: Mohit Yadav <105265192+mohityadav766@users.noreply.github.com> Date: Fri, 17 Oct 2025 18:07:24 +0530 Subject: [PATCH] Fix Lineage Service Issue (#23915) * Fix Lineage Service Issue * Revert "Fix Lineage Service Issue" This reverts commit f74512a5eed8013bc22b2ee1ea1247e9ec3c19e4. * Use Data asset for lineage --- .../elasticsearch/ESLineageGraphBuilder.java | 18 +++++++++--------- .../opensearch/OSLineageGraphBuilder.java | 18 +++++++++--------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/elasticsearch/ESLineageGraphBuilder.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/elasticsearch/ESLineageGraphBuilder.java index 9b096fcde47..211a0fe16bb 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/search/elasticsearch/ESLineageGraphBuilder.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/elasticsearch/ESLineageGraphBuilder.java @@ -3,8 +3,8 @@ package org.openmetadata.service.search.elasticsearch; import static org.openmetadata.common.utils.CommonUtil.collectionOrEmpty; import static org.openmetadata.common.utils.CommonUtil.nullOrEmpty; import static org.openmetadata.service.Entity.FIELD_FULLY_QUALIFIED_NAME_HASH_KEYWORD; +import static org.openmetadata.service.search.SearchClient.DATA_ASSET_SEARCH_ALIAS; import static org.openmetadata.service.search.SearchClient.FQN_FIELD; -import static org.openmetadata.service.search.SearchClient.GLOBAL_SEARCH_ALIAS; import static org.openmetadata.service.search.SearchUtils.GRAPH_AGGREGATION; import static org.openmetadata.service.search.SearchUtils.buildDirectionToFqnSet; import static org.openmetadata.service.search.SearchUtils.getLineageDirection; @@ -129,7 +129,7 @@ public class ESLineageGraphBuilder { es.org.elasticsearch.action.search.SearchRequest searchRequest = getSearchRequest( lineageRequest.getDirection(), - GLOBAL_SEARCH_ALIAS, + DATA_ASSET_SEARCH_ALIAS, lineageRequest.getUpstreamDepth() == remainingDepth ? null : lineageRequest.getQueryFilter(), @@ -216,7 +216,7 @@ public class ESLineageGraphBuilder { es.org.elasticsearch.action.search.SearchRequest searchRequest = getSearchRequest( lineageRequest.getDirection(), - GLOBAL_SEARCH_ALIAS, + DATA_ASSET_SEARCH_ALIAS, lineageRequest.getQueryFilter(), GRAPH_AGGREGATION, directionKeyAndValues, @@ -395,7 +395,7 @@ public class ESLineageGraphBuilder { Map rootEntityMap = EsUtils.searchEntityByKey( null, - GLOBAL_SEARCH_ALIAS, + DATA_ASSET_SEARCH_ALIAS, FIELD_FULLY_QUALIFIED_NAME_HASH_KEYWORD, Pair.of(FullyQualifiedName.buildHash(lineageRequest.getFqn()), lineageRequest.getFqn()), SOURCE_FIELDS_TO_EXCLUDE); @@ -423,7 +423,7 @@ public class ESLineageGraphBuilder { es.org.elasticsearch.action.search.SearchRequest searchRequest = getSearchRequest( LineageDirection.DOWNSTREAM, - GLOBAL_SEARCH_ALIAS, + DATA_ASSET_SEARCH_ALIAS, lineageRequest.getQueryFilter(), GRAPH_AGGREGATION, directionKeyAndValues, @@ -612,7 +612,7 @@ public class ESLineageGraphBuilder { SearchRequest searchRequest = EsUtils.getSearchRequest( direction, - GLOBAL_SEARCH_ALIAS, + DATA_ASSET_SEARCH_ALIAS, depth == 0 ? null : queryFilter, GRAPH_AGGREGATION, directionKeyAndValues, @@ -681,7 +681,7 @@ public class ESLineageGraphBuilder { SearchRequest searchRequest = EsUtils.getSearchRequest( direction, - GLOBAL_SEARCH_ALIAS, + DATA_ASSET_SEARCH_ALIAS, queryFilter, GRAPH_AGGREGATION, directionKeyAndValues, @@ -728,7 +728,7 @@ public class ESLineageGraphBuilder { Map entityDoc = EsUtils.searchEntityByKey( null, - GLOBAL_SEARCH_ALIAS, + DATA_ASSET_SEARCH_ALIAS, FIELD_FULLY_QUALIFIED_NAME_HASH_KEYWORD, Pair.of(FullyQualifiedName.buildHash(entityFqn), entityFqn), SOURCE_FIELDS_TO_EXCLUDE); @@ -828,7 +828,7 @@ public class ESLineageGraphBuilder { SearchRequest searchRequest = EsUtils.getSearchRequest( request.getDirection(), - GLOBAL_SEARCH_ALIAS, + DATA_ASSET_SEARCH_ALIAS, depth == 0 ? null : request.getQueryFilter(), GRAPH_AGGREGATION, directionKeyAndValues, diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/search/opensearch/OSLineageGraphBuilder.java b/openmetadata-service/src/main/java/org/openmetadata/service/search/opensearch/OSLineageGraphBuilder.java index 0c8d6038bfd..5e3fd31c62f 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/search/opensearch/OSLineageGraphBuilder.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/search/opensearch/OSLineageGraphBuilder.java @@ -3,8 +3,8 @@ package org.openmetadata.service.search.opensearch; import static org.openmetadata.common.utils.CommonUtil.collectionOrEmpty; import static org.openmetadata.common.utils.CommonUtil.nullOrEmpty; import static org.openmetadata.service.Entity.FIELD_FULLY_QUALIFIED_NAME_HASH_KEYWORD; +import static org.openmetadata.service.search.SearchClient.DATA_ASSET_SEARCH_ALIAS; import static org.openmetadata.service.search.SearchClient.FQN_FIELD; -import static org.openmetadata.service.search.SearchClient.GLOBAL_SEARCH_ALIAS; import static org.openmetadata.service.search.SearchUtils.GRAPH_AGGREGATION; import static org.openmetadata.service.search.SearchUtils.buildDirectionToFqnSet; import static org.openmetadata.service.search.SearchUtils.getLineageDirection; @@ -131,7 +131,7 @@ public class OSLineageGraphBuilder { os.org.opensearch.action.search.SearchRequest searchRequest = getSearchRequest( lineageRequest.getDirection(), - GLOBAL_SEARCH_ALIAS, + DATA_ASSET_SEARCH_ALIAS, lineageRequest.getUpstreamDepth() == remainingDepth ? null : lineageRequest.getQueryFilter(), @@ -218,7 +218,7 @@ public class OSLineageGraphBuilder { os.org.opensearch.action.search.SearchRequest searchRequest = getSearchRequest( lineageRequest.getDirection(), - GLOBAL_SEARCH_ALIAS, + DATA_ASSET_SEARCH_ALIAS, lineageRequest.getQueryFilter(), GRAPH_AGGREGATION, directionKeyAndValues, @@ -399,7 +399,7 @@ public class OSLineageGraphBuilder { Map rootEntityMap = OsUtils.searchEntityByKey( null, - GLOBAL_SEARCH_ALIAS, + DATA_ASSET_SEARCH_ALIAS, FIELD_FULLY_QUALIFIED_NAME_HASH_KEYWORD, Pair.of(FullyQualifiedName.buildHash(lineageRequest.getFqn()), lineageRequest.getFqn()), SOURCE_FIELDS_TO_EXCLUDE); @@ -428,7 +428,7 @@ public class OSLineageGraphBuilder { os.org.opensearch.action.search.SearchRequest searchRequest = getSearchRequest( LineageDirection.DOWNSTREAM, - GLOBAL_SEARCH_ALIAS, + DATA_ASSET_SEARCH_ALIAS, lineageRequest.getQueryFilter(), GRAPH_AGGREGATION, directionKeyAndValues, @@ -619,7 +619,7 @@ public class OSLineageGraphBuilder { os.org.opensearch.action.search.SearchRequest searchRequest = getSearchRequest( direction, - GLOBAL_SEARCH_ALIAS, + DATA_ASSET_SEARCH_ALIAS, depth == 0 ? null : queryFilter, GRAPH_AGGREGATION, directionKeyAndValues, @@ -688,7 +688,7 @@ public class OSLineageGraphBuilder { os.org.opensearch.action.search.SearchRequest searchRequest = getSearchRequest( direction, - GLOBAL_SEARCH_ALIAS, + DATA_ASSET_SEARCH_ALIAS, queryFilter, GRAPH_AGGREGATION, directionKeyAndValues, @@ -735,7 +735,7 @@ public class OSLineageGraphBuilder { Map entityDoc = OsUtils.searchEntityByKey( null, - GLOBAL_SEARCH_ALIAS, + DATA_ASSET_SEARCH_ALIAS, FIELD_FULLY_QUALIFIED_NAME_HASH_KEYWORD, Pair.of(FullyQualifiedName.buildHash(entityFqn), entityFqn), SOURCE_FIELDS_TO_EXCLUDE); @@ -836,7 +836,7 @@ public class OSLineageGraphBuilder { SearchRequest searchRequest = getSearchRequest( request.getDirection(), - GLOBAL_SEARCH_ALIAS, + DATA_ASSET_SEARCH_ALIAS, depth == 0 ? null : request.getQueryFilter(), GRAPH_AGGREGATION, directionKeyAndValues,