Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

perf(elastic search graph service): improving perf of lineage query #5858

Merged
merged 2 commits into from
Sep 7, 2022
Merged

perf(elastic search graph service): improving perf of lineage query #5858

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c08dabd
improving perf of filter query
gabe-lyons Sep 7, 2022
f1b5dfe
Merge branch 'master' into gabe--improvingPerfOfElasticGraphQuery
gabe-lyons Sep 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 8 additions & 17 deletions metadata-io/src/main/java/com/linkedin/metadata/graph/elastic/ESGraphQueryDAO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,27 +269,24 @@ private List<LineageRelationship> extractRelationships(@Nonnull Set<Urn> entityU
return result;
}

BoolQueryBuilder getOutGoingEdgeQuery(List<Urn> urns, List<EdgeInfo> outgoingEdges) {
BoolQueryBuilder getOutGoingEdgeQuery(List<Urn> urns, List<EdgeInfo> outgoingEdges, GraphFilters graphFilters) {
BoolQueryBuilder outgoingEdgeQuery = QueryBuilders.boolQuery();
outgoingEdgeQuery.must(buildUrnFilters(urns, SOURCE));
outgoingEdgeQuery.must(buildEdgeFilters(outgoingEdges));
outgoingEdgeQuery.must(buildEntityTypesFilter(graphFilters.getAllowedEntityTypes(), SOURCE));
outgoingEdgeQuery.must(buildEntityTypesFilter(graphFilters.getAllowedEntityTypes(), DESTINATION));
return outgoingEdgeQuery;
}

BoolQueryBuilder getIncomingEdgeQuery(List<Urn> urns, List<EdgeInfo> incomingEdges) {
BoolQueryBuilder getIncomingEdgeQuery(List<Urn> urns, List<EdgeInfo> incomingEdges, GraphFilters graphFilters) {
BoolQueryBuilder incomingEdgeQuery = QueryBuilders.boolQuery();
incomingEdgeQuery.must(buildUrnFilters(urns, DESTINATION));
incomingEdgeQuery.must(buildEdgeFilters(incomingEdges));
incomingEdgeQuery.must(buildEntityTypesFilter(graphFilters.getAllowedEntityTypes(), SOURCE));
incomingEdgeQuery.must(buildEntityTypesFilter(graphFilters.getAllowedEntityTypes(), DESTINATION));
return incomingEdgeQuery;
}

BoolQueryBuilder getAllowedEntityTypesFilter(GraphFilters graphFilters) {
BoolQueryBuilder allowedEntityTypesFilter = QueryBuilders.boolQuery();
allowedEntityTypesFilter.must(buildEntityTypesFilter(graphFilters.getAllowedEntityTypes(), SOURCE));
allowedEntityTypesFilter.must(buildEntityTypesFilter(graphFilters.getAllowedEntityTypes(), DESTINATION));
return allowedEntityTypesFilter;
}

// Get search query for given list of edges and source urns
public QueryBuilder getQueryForLineage(List<Urn> urns, List<EdgeInfo> lineageEdges, GraphFilters graphFilters) {
BoolQueryBuilder query = QueryBuilders.boolQuery();
Expand All @@ -302,19 +299,13 @@ public QueryBuilder getQueryForLineage(List<Urn> urns, List<EdgeInfo> lineageEdg
List<EdgeInfo> outgoingEdges =
edgesByDirection.getOrDefault(RelationshipDirection.OUTGOING, Collections.emptyList());
if (!outgoingEdges.isEmpty()) {
query.should(getOutGoingEdgeQuery(urns, outgoingEdges));
query.should(getOutGoingEdgeQuery(urns, outgoingEdges, graphFilters));
}

List<EdgeInfo> incomingEdges =
edgesByDirection.getOrDefault(RelationshipDirection.INCOMING, Collections.emptyList());
if (!incomingEdges.isEmpty()) {
query.should(getIncomingEdgeQuery(urns, incomingEdges));
}

if (graphFilters != null) {
if (graphFilters.getAllowedEntityTypes() != null && !graphFilters.getAllowedEntityTypes().isEmpty()) {
query.must(getAllowedEntityTypesFilter(graphFilters));
}
query.should(getIncomingEdgeQuery(urns, incomingEdges, graphFilters));
}
return query;
}
Expand Down