Dedupe qualified name for GroupByMetricSpecs

dbt-labs · May 2, 2024 · 37319ec · 37319ec
1 parent 78beac2
commit 37319ec
Show file tree

Hide file tree

Showing 22 changed files with 469 additions and 452 deletions.
diff --git a/metricflow-semantics/metricflow_semantics/specs/spec_classes.py b/metricflow-semantics/metricflow_semantics/specs/spec_classes.py
@@ -738,6 +738,23 @@ def metric_subquery_entity_spec(self) -> EntitySpec:
             entity_links=self.metric_subquery_entity_links[:-1],
         )
 
+    @property
+    def qualified_name(self) -> str:
+        """Element name prefixed with entity links.
+
+        If same entity links are used in inner & outer query, use standard qualified name (country__bookings).
+        Else, specify both sets of entity links (listing__country__user__country__bookings).
+        """
+        if self.entity_links == self.metric_subquery_entity_links:
+            entity_links = self.entity_links
+        else:
+            entity_links = self.entity_links + self.metric_subquery_entity_links
+
+        return StructuredLinkableSpecName(
+            entity_link_names=tuple(entity_link.element_name for entity_link in entity_links),
+            element_name=self.element_name,
+        ).qualified_name
+
     def __eq__(self, other: Any) -> bool:  # type: ignore[misc] # noqa: D105
         if not isinstance(other, GroupByMetricSpec):
             return False

diff --git a/...shots/test_linkable_spec_resolver.py/list/test_linkable_element_set_as_spec_set__set0.txt b/...shots/test_linkable_spec_resolver.py/list/test_linkable_element_set_as_spec_set__set0.txt
diff --git a/...emantic_model_container.py/tuple/test_linkable_elements_for_no_metrics_query__result0.txt b/...emantic_model_container.py/tuple/test_linkable_elements_for_no_metrics_query__result0.txt
diff --git a/.../test_dataflow_plan_builder.py/DataflowPlan/test_metric_in_metric_where_filter__dfp_0.xml b/.../test_dataflow_plan_builder.py/DataflowPlan/test_metric_in_metric_where_filter__dfp_0.xml
@@ -69,7 +69,7 @@
                                     </MetricTimeDimensionTransformNode>
                                 </FilterElementsNode>
                                 <FilterElementsNode>
-                                    <!-- description = "Pass Only Elements: ['listing', 'bookings']" -->
+                                    <!-- description = "Pass Only Elements: ['listing', 'listing__bookings']" -->
                                     <!-- node_id = NodeId(id_str='pfe_2') -->
                                     <!-- include_spec = LinklessEntitySpec(element_name='listing') -->
                                     <!-- include_spec =                                                               -->

diff --git a/...s/test_dataflow_plan_builder.py/DataflowPlan/test_metric_in_query_where_filter__dfp_0.xml b/...s/test_dataflow_plan_builder.py/DataflowPlan/test_metric_in_query_where_filter__dfp_0.xml
@@ -89,7 +89,7 @@
                                     </MetricTimeDimensionTransformNode>
                                 </FilterElementsNode>
                                 <FilterElementsNode>
-                                    <!-- description = "Pass Only Elements: ['listing', 'bookings']" -->
+                                    <!-- description = "Pass Only Elements: ['listing', 'listing__bookings']" -->
                                     <!-- node_id = NodeId(id_str='pfe_2') -->
                                     <!-- include_spec = LinklessEntitySpec(element_name='listing') -->
                                     <!-- include_spec =                                                               -->

diff --git a/...rendering.py/SqlQueryPlan/DuckDB/test_distinct_values_query_with_metric_filter__plan0.sql b/...rendering.py/SqlQueryPlan/DuckDB/test_distinct_values_query_with_metric_filter__plan0.sql
@@ -24,7 +24,7 @@ FROM (
       FROM ***************************.dim_lux_listing_id_mapping lux_listing_mapping_src_28000
     ) subq_4
     FULL OUTER JOIN (
-      -- Pass Only Elements: ['listing', 'bookings']
+      -- Pass Only Elements: ['listing', 'listing__bookings']
       SELECT
         subq_9.listing
         , subq_9.bookings

diff --git a/...py/SqlQueryPlan/DuckDB/test_distinct_values_query_with_metric_filter__plan0_optimized.sql b/...py/SqlQueryPlan/DuckDB/test_distinct_values_query_with_metric_filter__plan0_optimized.sql
@@ -11,7 +11,7 @@ FROM (
   FULL OUTER JOIN (
     -- Aggregate Measures
     -- Compute Metrics via Expressions
-    -- Pass Only Elements: ['listing', 'bookings']
+    -- Pass Only Elements: ['listing', 'listing__bookings']
     SELECT
       listing
       , SUM(bookings) AS bookings

diff --git a/...ueryPlan/DuckDB/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0.sql b/...ueryPlan/DuckDB/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0.sql
@@ -227,7 +227,7 @@ FROM (
             ) subq_5
           ) subq_6
           LEFT OUTER JOIN (
-            -- Pass Only Elements: ['guest', 'booking_value']
+            -- Pass Only Elements: ['guest', 'guest__booking_value']
             SELECT
               subq_11.guest
               , subq_11.booking_value

diff --git a/...uckDB/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0_optimized.sql b/...uckDB/test_filter_by_metric_in_same_semantic_model_as_queried_metric__plan0_optimized.sql
@@ -25,7 +25,7 @@ FROM (
     -- Pass Only Elements: ['booking_value', 'guest']
     -- Aggregate Measures
     -- Compute Metrics via Expressions
-    -- Pass Only Elements: ['guest', 'booking_value']
+    -- Pass Only Elements: ['guest', 'guest__booking_value']
     SELECT
       guest_id AS guest
       , SUM(booking_value) AS booking_value

diff --git a/..._metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_metric_filtered_by_itself__plan0.sql b/..._metric_filter_rendering.py/SqlQueryPlan/DuckDB/test_metric_filtered_by_itself__plan0.sql
@@ -227,7 +227,7 @@ FROM (
             ) subq_5
           ) subq_6
           LEFT OUTER JOIN (
-            -- Pass Only Elements: ['guest', 'bookers']
+            -- Pass Only Elements: ['guest', 'guest__bookers']
             SELECT
               subq_11.guest
               , subq_11.bookers

diff --git a/...lter_rendering.py/SqlQueryPlan/DuckDB/test_metric_filtered_by_itself__plan0_optimized.sql b/...lter_rendering.py/SqlQueryPlan/DuckDB/test_metric_filtered_by_itself__plan0_optimized.sql
@@ -25,7 +25,7 @@ FROM (
     -- Pass Only Elements: ['bookers', 'guest']
     -- Aggregate Measures
     -- Compute Metrics via Expressions
-    -- Pass Only Elements: ['guest', 'bookers']
+    -- Pass Only Elements: ['guest', 'guest__bookers']
     SELECT
       guest_id AS guest
       , COUNT(DISTINCT guest_id) AS bookers

diff --git a/...ilter_rendering.py/SqlQueryPlan/DuckDB/test_metric_with_metric_in_where_filter__plan0.sql b/...ilter_rendering.py/SqlQueryPlan/DuckDB/test_metric_with_metric_in_where_filter__plan0.sql
@@ -171,7 +171,7 @@ FROM (
             ) subq_5
           ) subq_6
           LEFT OUTER JOIN (
-            -- Pass Only Elements: ['listing', 'bookings']
+            -- Pass Only Elements: ['listing', 'listing__bookings']
             SELECT
               subq_11.listing
               , subq_11.bookings

diff --git a/...ering.py/SqlQueryPlan/DuckDB/test_metric_with_metric_in_where_filter__plan0_optimized.sql b/...ering.py/SqlQueryPlan/DuckDB/test_metric_with_metric_in_where_filter__plan0_optimized.sql
@@ -25,7 +25,7 @@ FROM (
   LEFT OUTER JOIN (
     -- Aggregate Measures
     -- Compute Metrics via Expressions
-    -- Pass Only Elements: ['listing', 'bookings']
+    -- Pass Only Elements: ['listing', 'listing__bookings']
     SELECT
       listing
       , SUM(bookings) AS bookings

diff --git a/...ering.py/SqlQueryPlan/DuckDB/test_query_with_cumulative_metric_in_where_filter__plan0.sql b/...ering.py/SqlQueryPlan/DuckDB/test_query_with_cumulative_metric_in_where_filter__plan0.sql
@@ -164,7 +164,7 @@ FROM (
             ) subq_5
           ) subq_6
           LEFT OUTER JOIN (
-            -- Pass Only Elements: ['user', 'revenue_all_time']
+            -- Pass Only Elements: ['user', 'user__revenue_all_time']
             SELECT
               subq_11.user
               , subq_11.revenue_all_time

diff --git a/...qlQueryPlan/DuckDB/test_query_with_cumulative_metric_in_where_filter__plan0_optimized.sql b/...qlQueryPlan/DuckDB/test_query_with_cumulative_metric_in_where_filter__plan0_optimized.sql
@@ -25,7 +25,7 @@ FROM (
     -- Pass Only Elements: ['txn_revenue', 'user']
     -- Aggregate Measures
     -- Compute Metrics via Expressions
-    -- Pass Only Elements: ['user', 'revenue_all_time']
+    -- Pass Only Elements: ['user', 'user__revenue_all_time']
     SELECT
       user_id AS user
       , SUM(revenue) AS revenue_all_time

diff --git a/...endering.py/SqlQueryPlan/DuckDB/test_query_with_derived_metric_in_where_filter__plan0.sql b/...endering.py/SqlQueryPlan/DuckDB/test_query_with_derived_metric_in_where_filter__plan0.sql
@@ -164,7 +164,7 @@ FROM (
             ) subq_12
           ) subq_13
           LEFT OUTER JOIN (
-            -- Pass Only Elements: ['listing', 'views_times_booking_value']
+            -- Pass Only Elements: ['listing', 'listing__views_times_booking_value']
             SELECT
               subq_25.listing
               , subq_25.views_times_booking_value

diff --git a/...y/SqlQueryPlan/DuckDB/test_query_with_derived_metric_in_where_filter__plan0_optimized.sql b/...y/SqlQueryPlan/DuckDB/test_query_with_derived_metric_in_where_filter__plan0_optimized.sql
@@ -21,7 +21,7 @@ FROM (
   ) subq_34
   LEFT OUTER JOIN (
     -- Compute Metrics via Expressions
-    -- Pass Only Elements: ['listing', 'views_times_booking_value']
+    -- Pass Only Elements: ['listing', 'listing__views_times_booking_value']
     SELECT
       listing
       , booking_value * views AS views_times_booking_value

diff --git a/...er_rendering.py/SqlQueryPlan/DuckDB/test_query_with_multiple_metrics_in_filter__plan0.sql b/...er_rendering.py/SqlQueryPlan/DuckDB/test_query_with_multiple_metrics_in_filter__plan0.sql
@@ -167,7 +167,7 @@ FROM (
             ) subq_9
           ) subq_10
           LEFT OUTER JOIN (
-            -- Pass Only Elements: ['listing', 'bookings']
+            -- Pass Only Elements: ['listing', 'listing__bookings']
             SELECT
               subq_15.listing
               , subq_15.bookings
@@ -390,7 +390,7 @@ FROM (
           ON
             subq_10.listing = subq_16.listing
           LEFT OUTER JOIN (
-            -- Pass Only Elements: ['listing', 'bookers']
+            -- Pass Only Elements: ['listing', 'listing__bookers']
             SELECT
               subq_21.listing
               , subq_21.bookers

diff --git a/...ng.py/SqlQueryPlan/DuckDB/test_query_with_multiple_metrics_in_filter__plan0_optimized.sql b/...ng.py/SqlQueryPlan/DuckDB/test_query_with_multiple_metrics_in_filter__plan0_optimized.sql
@@ -23,7 +23,7 @@ FROM (
   LEFT OUTER JOIN (
     -- Aggregate Measures
     -- Compute Metrics via Expressions
-    -- Pass Only Elements: ['listing', 'bookings']
+    -- Pass Only Elements: ['listing', 'listing__bookings']
     SELECT
       listing
       , SUM(bookings) AS bookings
@@ -47,7 +47,7 @@ FROM (
     -- Pass Only Elements: ['bookers', 'listing']
     -- Aggregate Measures
     -- Compute Metrics via Expressions
-    -- Pass Only Elements: ['listing', 'bookers']
+    -- Pass Only Elements: ['listing', 'listing__bookers']
     SELECT
       listing_id AS listing
       , COUNT(DISTINCT guest_id) AS bookers

diff --git a/..._rendering.py/SqlQueryPlan/DuckDB/test_query_with_ratio_metric_in_where_filter__plan0.sql b/..._rendering.py/SqlQueryPlan/DuckDB/test_query_with_ratio_metric_in_where_filter__plan0.sql
@@ -164,7 +164,7 @@ FROM (
             ) subq_12
           ) subq_13
           LEFT OUTER JOIN (
-            -- Pass Only Elements: ['listing', 'bookings_per_booker']
+            -- Pass Only Elements: ['listing', 'listing__bookings_per_booker']
             SELECT
               subq_25.listing
               , subq_25.bookings_per_booker

diff --git a/...rendering.py/SqlQueryPlan/DuckDB/test_query_with_simple_metric_in_where_filter__plan0.sql b/...rendering.py/SqlQueryPlan/DuckDB/test_query_with_simple_metric_in_where_filter__plan0.sql
@@ -164,7 +164,7 @@ FROM (
             ) subq_5
           ) subq_6
           LEFT OUTER JOIN (
-            -- Pass Only Elements: ['listing', 'bookings']
+            -- Pass Only Elements: ['listing', 'listing__bookings']
             SELECT
               subq_11.listing
               , subq_11.bookings

diff --git a/...py/SqlQueryPlan/DuckDB/test_query_with_simple_metric_in_where_filter__plan0_optimized.sql b/...py/SqlQueryPlan/DuckDB/test_query_with_simple_metric_in_where_filter__plan0_optimized.sql
@@ -22,7 +22,7 @@ FROM (
   LEFT OUTER JOIN (
     -- Aggregate Measures
     -- Compute Metrics via Expressions
-    -- Pass Only Elements: ['listing', 'bookings']
+    -- Pass Only Elements: ['listing', 'listing__bookings']
     SELECT
       listing
       , SUM(bookings) AS bookings