fix(search): Handle .keyword properly in the entity type query to ind… (

datahub-project#7957) Co-authored-by: Indy Prentice <[email protected]>
tejbloke · May 4, 2023 · 27c7c40 · 27c7c40
1 parent abeda11
commit 27c7c40
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/ResolverUtils.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/ResolverUtils.java
@@ -31,7 +31,8 @@
 public class ResolverUtils {
 
     private static final Set<String> KEYWORD_EXCLUDED_FILTERS = ImmutableSet.of(
-        "runId"
+        "runId",
+        "_entityType"
     );
     private static final ObjectMapper MAPPER = new ObjectMapper();
 

diff --git a/metadata-io/src/main/java/com/linkedin/metadata/search/elasticsearch/query/ESSearchDAO.java b/metadata-io/src/main/java/com/linkedin/metadata/search/elasticsearch/query/ESSearchDAO.java
@@ -296,7 +296,7 @@ private static ConjunctiveCriterion transformConjunctiveCriterion(ConjunctiveCri
       IndexConvention indexConvention) {
     return new ConjunctiveCriterion().setAnd(
         conjunctiveCriterion.getAnd().stream().map(
-                criterion -> criterion.getField().equals("_entityType")
+                criterion -> criterion.getField().equalsIgnoreCase("_entityType")
                     ? transformEntityTypeCriterion(criterion, indexConvention)
                     : criterion)
             .collect(Collectors.toCollection(CriterionArray::new)));

diff --git a/...main/java/com/linkedin/metadata/search/elasticsearch/query/request/SearchFieldConfig.java b/...main/java/com/linkedin/metadata/search/elasticsearch/query/request/SearchFieldConfig.java
@@ -21,7 +21,7 @@
 public class SearchFieldConfig {
     public static final float DEFAULT_BOOST = 1.0f;
 
-    public static final Set<String> KEYWORD_FIELDS = Set.of("urn", "runId");
+    public static final Set<String> KEYWORD_FIELDS = Set.of("urn", "runId", "_index");
 
     // These should not be used directly since there is a specific
     // order in which these rules need to be evaluated for exceptions to