Merge branch 'master' into master+ing-467-unique-hive-metastore-urn

mayurinehate · Jan 16, 2024 · bf8cd3e · bf8cd3e
2 parents 7a91f6c + d69ed9a
commit bf8cd3e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/metadata-ingestion/src/datahub/ingestion/source/dbt/dbt_common.py b/metadata-ingestion/src/datahub/ingestion/source/dbt/dbt_common.py
@@ -902,6 +902,7 @@ def _infer_schemas_and_update_cll(self, all_nodes_map: Dict[str, DBTNode]) -> No
             ),
         ):
             node = all_nodes_map[dbt_name]
+            logger.debug(f"Processing CLL/schemas for {node.dbt_name}")
 
             target_node_urn = None
             should_fetch_target_node_schema = False

diff --git a/metadata-ingestion/src/datahub/utilities/sqlglot_lineage.py b/metadata-ingestion/src/datahub/utilities/sqlglot_lineage.py
@@ -51,9 +51,14 @@
 
 RULES_BEFORE_TYPE_ANNOTATION: tuple = tuple(
     filter(
-        # Skip pushdown_predicates because it sometimes throws exceptions, and we
-        # don't actually need it for anything.
-        lambda func: func.__name__ not in {"pushdown_predicates"},
+        lambda func: func.__name__
+        not in {
+            # Skip pushdown_predicates because it sometimes throws exceptions, and we
+            # don't actually need it for anything.
+            "pushdown_predicates",
+            # Skip normalize because it can sometimes be expensive.
+            "normalize",
+        },
         itertools.takewhile(
             lambda func: func != sqlglot.optimizer.annotate_types.annotate_types,
             sqlglot.optimizer.optimizer.RULES,

diff --git a/smoke-test/tests/cypress/cypress/e2e/search/query_and_filter_search.js b/smoke-test/tests/cypress/cypress/e2e/search/query_and_filter_search.js
@@ -33,7 +33,7 @@ describe("auto-complete dropdown, filter plus query search test", () => {
     cy.visit('/');
   });
 
-  it.skip("Verify the 'filter by type' section + query", () => {
+  it("Verify the 'filter by type' section + query", () => {
 
     //Dashboard
     searchToExecute("*");
@@ -48,8 +48,7 @@ describe("auto-complete dropdown, filter plus query search test", () => {
     //Piplines
     searchToExecute("*");
     selectFilteredEntity("Type", "Pipelines", "filter__entityType");
-    clickAndVerifyEntity('Pipeline');
-
+    clickAndVerifyEntity('Pipeline');  
   });
 
   it("Verify the 'filter by Glossary term' section + query", () => {
@@ -58,7 +57,6 @@ describe("auto-complete dropdown, filter plus query search test", () => {
   searchToExecute("*");
   selectFilteredEntity("Type", "Glossary Terms", "filter__entityType");
   clickAndVerifyEntity('Glossary Term')
-
 });
 
   it("Verify the 'filter by platform' section + query", () => {