Minor: fix entityType aggregation

open-metadata · Dec 6, 2023 · ce72fff · ce72fff
1 parent 1276547
commit ce72fff
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 3 deletions.
diff --git a/...vice/src/main/java/org/openmetadata/service/search/elasticsearch/ElasticSearchClient.java b/...vice/src/main/java/org/openmetadata/service/search/elasticsearch/ElasticSearchClient.java
@@ -918,8 +918,7 @@ private static SearchSourceBuilder addAggregation(SearchSourceBuilder builder) {
             AggregationBuilders.terms("service.displayName.keyword")
                 .field("service.displayName.keyword")
                 .size(MAX_AGGREGATE_SIZE))
-        .aggregation(
-            AggregationBuilders.terms("entityType.keyword").field("entityType.keyword").size(MAX_AGGREGATE_SIZE))
+        .aggregation(AggregationBuilders.terms("entityType").field("entityType").size(MAX_AGGREGATE_SIZE))
         .aggregation(AggregationBuilders.terms("tier.tagFQN").field("tier.tagFQN").size(MAX_AGGREGATE_SIZE))
         .aggregation(
             AggregationBuilders.terms(OWNER_DISPLAY_NAME_KEYWORD)

diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/glossary_term_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/en/glossary_term_index_mapping.json
@@ -417,6 +417,9 @@
       "status": {
         "type": "text"
       },
+      "entityType": {
+        "type": "keyword"
+      },
       "suggest": {
         "type": "completion",
         "contexts": [
@@ -429,4 +432,4 @@
       }
       }
     }
-  }s
+  }
diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/metadata_service_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/en/metadata_service_index_mapping.json
@@ -201,6 +201,9 @@
       },
       "provider" : {
         "type": "text"
+      },
+      "entityType": {
+        "type": "keyword"
       }
     }
   }

diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/tag_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/en/tag_index_mapping.json
@@ -100,6 +100,9 @@
       "disabled": {
         "type": "text"
       },
+      "entityType": {
+        "type": "keyword"
+      },
       "classification": {
         "properties": {
           "id": {

diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/glossary_term_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/jp/glossary_term_index_mapping.json
@@ -396,6 +396,9 @@
       "status": {
         "type": "text"
       },
+      "entityType": {
+        "type": "keyword"
+      },
       "suggest": {
         "type": "completion",
         "contexts": [

diff --git a/...ta-service/src/main/resources/elasticsearch/jp/metadata_service_search_index_mapping.json b/...ta-service/src/main/resources/elasticsearch/jp/metadata_service_search_index_mapping.json
@@ -211,6 +211,9 @@
       },
       "provider" : {
         "type": "text"
+      },
+      "entityType": {
+        "type": "keyword"
       }
     }
   }

diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/tag_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/jp/tag_index_mapping.json
@@ -145,6 +145,9 @@
               "path": "deleted"
             }
           ]
+      },
+      "entityType": {
+        "type": "keyword"
       }
     }
   }

diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/glossary_term_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/zh/glossary_term_index_mapping.json
@@ -324,6 +324,9 @@
       "usageCount": {
         "type": "integer"
       },
+      "entityType": {
+        "type": "keyword"
+      },
       "tags": {
         "properties": {
           "tagFQN": {

diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/metadata_service_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/zh/metadata_service_index_mapping.json
@@ -188,6 +188,9 @@
       },
       "provider" : {
         "type": "text"
+      },
+      "entityType": {
+        "type": "keyword"
       }
     }
   }

diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/tag_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/zh/tag_index_mapping.json
@@ -143,6 +143,9 @@
             "path": "deleted"
           }
         ]
+      },
+      "entityType": {
+        "type": "keyword"
       }
     }
   }