Fix #3051: Glossary-term suggest api has fqdn same as name

open-metadata · Mar 1, 2022 · a5b6de4 · a5b6de4
1 parent c65cdbb
commit a5b6de4
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 3 deletions.
diff --git a/...ce/src/main/java/org/openmetadata/catalog/elasticsearch/ElasticSearchIndexDefinition.java b/...ce/src/main/java/org/openmetadata/catalog/elasticsearch/ElasticSearchIndexDefinition.java
@@ -876,7 +876,7 @@ public static GlossaryTermESIndexBuilder builder(GlossaryTerm glossaryTerm, Even
         .name(glossaryTerm.getName())
         .displayName(displayName)
         .description(description)
-        .fqdn(glossaryTerm.getName())
+        .fqdn(glossaryTerm.getFullyQualifiedName())
         .glossaryId(glossaryTerm.getGlossary().getId().toString())
         .glossaryName(glossaryTerm.getGlossary().getName())
         .lastUpdatedTimestamp(updatedTimestamp)

diff --git a/catalog-rest-service/src/main/resources/elasticsearch/glossary_index_mapping.json b/catalog-rest-service/src/main/resources/elasticsearch/glossary_index_mapping.json
@@ -9,6 +9,9 @@
     "owner": {
       "type": "keyword"
     },
+    "fqdn": {
+      "type": "keyword"
+    },
     "last_updated_timestamp": {
       "type": "date",
       "format": "epoch_second"

diff --git a/ingestion/src/metadata/ingestion/models/table_metadata.py b/ingestion/src/metadata/ingestion/models/table_metadata.py
@@ -197,6 +197,7 @@ class GlossaryTermESDocument(BaseModel):
     entity_type: str = "glossaryTerm"
     name: str
     display_name: str
+    fqdn: str
     description: str
     glossary_name: str
     glossary_id: str

diff --git a/ingestion/src/metadata/ingestion/sink/elasticsearch.py b/ingestion/src/metadata/ingestion/sink/elasticsearch.py
@@ -12,12 +12,10 @@
 import json
 import logging
 import ssl
-import time
 import traceback
 from datetime import datetime
 from typing import List, Optional
 
-from dateutil import parser
 from elasticsearch import Elasticsearch
 from elasticsearch.connection import create_ssl_context
 
@@ -578,6 +576,7 @@ def _create_glossary_term_es_doc(self, glossary_term: GlossaryTerm):
             deleted=glossary_term.deleted,
             name=glossary_term.name.__root__,
             display_name=glossary_term.displayName,
+            fqdn=glossary_term.fullyQualifiedName,
             description=glossary_term.description,
             glossary_id=str(glossary_term.glossary.id.__root__),
             glossary_name=glossary_term.glossary.name,

diff --git a/ingestion/src/metadata/ingestion/sink/elasticsearch_constants.py b/ingestion/src/metadata/ingestion/sink/elasticsearch_constants.py
@@ -477,6 +477,9 @@
           "display_name": {
             "type": "text"
           },
+           "fqdn": {
+              "type": "keyword"
+            },
           "owner": {
             "type": "keyword"
           },