fix(graphql) Fix entity type filter clash with legacy filters (datahu…

…b-project#10362)
sleeperdeep · Jun 25, 2024 · 001df01 · 001df01
1 parent d7177ee
commit 001df01
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 8 deletions.
diff --git a/...n/java/com/linkedin/datahub/graphql/resolvers/search/AggregateAcrossEntitiesResolver.java b/...n/java/com/linkedin/datahub/graphql/resolvers/search/AggregateAcrossEntitiesResolver.java
@@ -20,6 +20,7 @@
 import com.linkedin.view.DataHubViewInfo;
 import graphql.schema.DataFetcher;
 import graphql.schema.DataFetchingEnvironment;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
@@ -68,15 +69,21 @@ public CompletableFuture<AggregateResults> get(DataFetchingEnvironment environme
           final List<String> facets =
               input.getFacets() != null && input.getFacets().size() > 0 ? input.getFacets() : null;
 
+          List<String> finalEntities =
+              maybeResolvedView != null
+                  ? SearchUtils.intersectEntityTypes(
+                      entityNames, maybeResolvedView.getDefinition().getEntityTypes())
+                  : entityNames;
+          if (finalEntities.size() == 0) {
+            return createEmptyAggregateResults();
+          }
+
           try {
             return mapAggregateResults(
                 context,
                 _entityClient.searchAcrossEntities(
                     context.getOperationContext().withSearchFlags(flags -> searchFlags),
-                    maybeResolvedView != null
-                        ? SearchUtils.intersectEntityTypes(
-                            entityNames, maybeResolvedView.getDefinition().getEntityTypes())
-                        : entityNames,
+                    finalEntities,
                     sanitizedQuery,
                     maybeResolvedView != null
                         ? SearchUtils.combineFilters(
@@ -112,4 +119,10 @@ static AggregateResults mapAggregateResults(
 
     return results;
   }
+
+  AggregateResults createEmptyAggregateResults() {
+    final AggregateResults result = new AggregateResults();
+    result.setFacets(new ArrayList<>());
+    return result;
+  }
 }
diff --git a/...main/java/com/linkedin/datahub/graphql/resolvers/search/SearchAcrossEntitiesResolver.java b/...main/java/com/linkedin/datahub/graphql/resolvers/search/SearchAcrossEntitiesResolver.java
@@ -75,14 +75,20 @@ public CompletableFuture<SearchResults> get(DataFetchingEnvironment environment)
                 start,
                 count);
 
+            List<String> finalEntities =
+                maybeResolvedView != null
+                    ? SearchUtils.intersectEntityTypes(
+                        entityNames, maybeResolvedView.getDefinition().getEntityTypes())
+                    : entityNames;
+            if (finalEntities.size() == 0) {
+              return SearchUtils.createEmptySearchResults(start, count);
+            }
+
             return UrnSearchResultsMapper.map(
                 context,
                 _entityClient.searchAcrossEntities(
                     context.getOperationContext().withSearchFlags(flags -> searchFlags),
-                    maybeResolvedView != null
-                        ? SearchUtils.intersectEntityTypes(
-                            entityNames, maybeResolvedView.getDefinition().getEntityTypes())
-                        : entityNames,
+                    finalEntities,
                     sanitizedQuery,
                     maybeResolvedView != null
                         ? SearchUtils.combineFilters(

diff --git a/...graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/search/SearchUtils.java b/...graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/search/SearchUtils.java
@@ -21,6 +21,7 @@
 import com.linkedin.datahub.graphql.QueryContext;
 import com.linkedin.datahub.graphql.generated.EntityType;
 import com.linkedin.datahub.graphql.generated.FacetFilterInput;
+import com.linkedin.datahub.graphql.generated.SearchResults;
 import com.linkedin.datahub.graphql.types.common.mappers.SearchFlagsInputMapper;
 import com.linkedin.datahub.graphql.types.entitytype.EntityTypeMapper;
 import com.linkedin.metadata.query.SearchFlags;
@@ -314,4 +315,15 @@ public static List<String> getEntityNames(List<EntityType> inputTypes) {
         (inputTypes == null || inputTypes.isEmpty()) ? SEARCHABLE_ENTITY_TYPES : inputTypes;
     return entityTypes.stream().map(EntityTypeMapper::getName).collect(Collectors.toList());
   }
+
+  public static SearchResults createEmptySearchResults(final int start, final int count) {
+    final SearchResults result = new SearchResults();
+    result.setStart(start);
+    result.setCount(count);
+    result.setTotal(0);
+    result.setSearchResults(new ArrayList<>());
+    result.setSuggestions(new ArrayList<>());
+    result.setFacets(new ArrayList<>());
+    return result;
+  }
 }