yujunjun/OpenMetadata
1
0
Fork 0
mirror of https://github.com/open-metadata/OpenMetadata.git synced 2025-08-27 18:36:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

allow dropping off pipeline as node (#17020)

Browse Source 
* allow dropping off pipeline as node

* Return Pipeline Nodes in Response

* Fix pipeline as a node

---------

Co-authored-by: mohitdeuex <mohit.y@deuexsolutions.com>
This commit is contained in:
Karan Hotchandani 2024-07-26 15:54:38 +05:30 committed by GitHub
parent cb57941b5f
commit 3bcd481453
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
openmetadata-service/src/main/java/org/openmetadata/service/search/elasticsearch/ElasticSearchClient.java
View File

@ -803,14 +803,16 @@ public class ElasticSearchClient implements SearchClient {
es.org.elasticsearch.action.search.SearchRequest searchRequest = es.org.elasticsearch.action.search.SearchRequest searchRequest =
new es.org.elasticsearch.action.search.SearchRequest( new es.org.elasticsearch.action.search.SearchRequest(
Entity.getSearchRepository().getIndexOrAliasName(GLOBAL_SEARCH_ALIAS)); Entity.getSearchRepository().getIndexOrAliasName(GLOBAL_SEARCH_ALIAS));
SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder(); BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery();
searchSourceBuilder.query( boolQueryBuilder.should(
QueryBuilders.boolQuery() QueryBuilders.boolQuery()
.must(QueryBuilders.termQuery("lineage.pipeline.fullyQualifiedName.keyword", fqn))); .must(QueryBuilders.termQuery("lineage.pipeline.fullyQualifiedName.keyword", fqn)));
SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
searchSourceBuilder.query(boolQueryBuilder);
if (CommonUtil.nullOrEmpty(deleted)) { if (CommonUtil.nullOrEmpty(deleted)) {
searchSourceBuilder.query( searchSourceBuilder.query(
QueryBuilders.boolQuery() QueryBuilders.boolQuery()
.must(QueryBuilders.termQuery("lineage.pipeline.fullyQualifiedName.keyword", fqn)) .must(boolQueryBuilder)
.must(QueryBuilders.termQuery("deleted", deleted))); .must(QueryBuilders.termQuery("deleted", deleted)));
} }
if (!nullOrEmpty(queryFilter) && !queryFilter.equals("{}")) { if (!nullOrEmpty(queryFilter) && !queryFilter.equals("{}")) {
@ -860,6 +862,11 @@ public class ElasticSearchClient implements SearchClient {
} }
} }
} }
getLineage(
fqn, downstreamDepth, edges, nodes, queryFilter, "lineage.fromEntity.fqn.keyword", deleted);
getLineage(
fqn, upstreamDepth, edges, nodes, queryFilter, "lineage.toEntity.fqn.keyword", deleted);
// TODO: Fix this , this is hack // TODO: Fix this , this is hack
if (edges.isEmpty()) { if (edges.isEmpty()) {
es.org.elasticsearch.action.search.SearchRequest searchRequestForEntity = es.org.elasticsearch.action.search.SearchRequest searchRequestForEntity =

13
openmetadata-service/src/main/java/org/openmetadata/service/search/opensearch/OpenSearchClient.java
View File

@ -801,14 +801,16 @@ public class OpenSearchClient implements SearchClient {
os.org.opensearch.action.search.SearchRequest searchRequest = os.org.opensearch.action.search.SearchRequest searchRequest =
new os.org.opensearch.action.search.SearchRequest( new os.org.opensearch.action.search.SearchRequest(
Entity.getSearchRepository().getIndexOrAliasName(GLOBAL_SEARCH_ALIAS)); Entity.getSearchRepository().getIndexOrAliasName(GLOBAL_SEARCH_ALIAS));
SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder(); BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery();
searchSourceBuilder.query( boolQueryBuilder.should(
QueryBuilders.boolQuery() QueryBuilders.boolQuery()
.must(QueryBuilders.termQuery("lineage.pipeline.fullyQualifiedName.keyword", fqn))); .must(QueryBuilders.termQuery("lineage.pipeline.fullyQualifiedName.keyword", fqn)));
SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
searchSourceBuilder.query(boolQueryBuilder);
if (CommonUtil.nullOrEmpty(deleted)) { if (CommonUtil.nullOrEmpty(deleted)) {
searchSourceBuilder.query( searchSourceBuilder.query(
QueryBuilders.boolQuery() QueryBuilders.boolQuery()
.must(QueryBuilders.termQuery("lineage.pipeline.fullyQualifiedName.keyword", fqn)) .must(boolQueryBuilder)
.must(QueryBuilders.termQuery("deleted", deleted))); .must(QueryBuilders.termQuery("deleted", deleted)));
} }
if (!nullOrEmpty(queryFilter) && !queryFilter.equals("{}")) { if (!nullOrEmpty(queryFilter) && !queryFilter.equals("{}")) {
@ -858,6 +860,11 @@ public class OpenSearchClient implements SearchClient {
} }
} }
} }
getLineage(
fqn, downstreamDepth, edges, nodes, queryFilter, "lineage.fromEntity.fqn.keyword", deleted);
getLineage(
fqn, upstreamDepth, edges, nodes, queryFilter, "lineage.toEntity.fqn.keyword", deleted);
if (edges.isEmpty()) { if (edges.isEmpty()) {
os.org.opensearch.action.search.SearchRequest searchRequestForEntity = os.org.opensearch.action.search.SearchRequest searchRequestForEntity =
new os.org.opensearch.action.search.SearchRequest( new os.org.opensearch.action.search.SearchRequest(

4
openmetadata-ui/src/main/resources/ui/src/constants/Lineage.constants.ts
View File

@ -55,6 +55,10 @@ export const entityData = [
type: SearchIndex.CONTAINER, type: SearchIndex.CONTAINER,
label: t('label.container-plural'), label: t('label.container-plural'),
}, },
{
type: SearchIndex.PIPELINE,
label: t('label.pipeline-plural'),
},
{ {
type: SearchIndex.SEARCH_INDEX, type: SearchIndex.SEARCH_INDEX,
label: t('label.search-index-plural'), label: t('label.search-index-plural'),