From 71a67d6bbe48e2a9289dc6a11e9e26cf7b35c48b Mon Sep 17 00:00:00 2001 From: Mayur Singal <39544459+ulixius9@users.noreply.github.com> Date: Fri, 10 Nov 2023 15:50:37 +0530 Subject: [PATCH] Fix ES search during lineage ingestion (#13932) --- .../src/metadata/ingestion/lineage/sql_lineage.py | 7 +++++++ .../ingestion/ometa/mixins/lineage_mixin.py | 13 +++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/ingestion/src/metadata/ingestion/lineage/sql_lineage.py b/ingestion/src/metadata/ingestion/lineage/sql_lineage.py index 4cae5a53948..38d1c28530a 100644 --- a/ingestion/src/metadata/ingestion/lineage/sql_lineage.py +++ b/ingestion/src/metadata/ingestion/lineage/sql_lineage.py @@ -34,6 +34,7 @@ from metadata.utils.lru_cache import LRUCache logger = utils_logger() LRU_CACHE_SIZE = 4096 +DEFAULT_SCHEMA_NAME = "" def get_column_fqn(table_entity: Table, column: str) -> Optional[str]: @@ -145,6 +146,12 @@ def get_table_fqn_from_query_name( empty_list * (3 - len(split_table)) ) + split_table + if schema_query == DEFAULT_SCHEMA_NAME: + schema_query = None + + if database_query == DEFAULT_SCHEMA_NAME: + database_query = None + return database_query, schema_query, table diff --git a/ingestion/src/metadata/ingestion/ometa/mixins/lineage_mixin.py b/ingestion/src/metadata/ingestion/ometa/mixins/lineage_mixin.py index d6c0b8d052a..b0ac257b36f 100644 --- a/ingestion/src/metadata/ingestion/ometa/mixins/lineage_mixin.py +++ b/ingestion/src/metadata/ingestion/ometa/mixins/lineage_mixin.py @@ -177,9 +177,10 @@ class OMetaLineageMixin(Generic[T]): timeout_seconds=timeout, ) for lineage_request in add_lineage_request or []: - resp = self.add_lineage(lineage_request) - entity_name = resp.get("entity", {}).get("name") - for node in resp.get("nodes", []): - logger.info( - f"added lineage between table {node.get('name')} and {entity_name} " - ) + if lineage_request.right: + resp = self.add_lineage(lineage_request.right) + entity_name = resp.get("entity", {}).get("name") + for node in resp.get("nodes", []): + logger.info( + f"added lineage between table {node.get('name')} and {entity_name} " + )