Update SQL engine snapshots - group by removal

dbt-labs · Oct 10, 2024 · bf8755d · bf8755d
1 parent fcd305c
commit bf8755d
Show file tree

Hide file tree

Showing 120 changed files with 421 additions and 1,195 deletions.
diff --git a/...endering.py/SqlQueryPlan/BigQuery/test_all_time_metric_with_non_default_grains__plan0.sql b/...endering.py/SqlQueryPlan/BigQuery/test_all_time_metric_with_non_default_grains__plan0.sql
@@ -82,10 +82,6 @@ FROM (
               , DATETIME_TRUNC(subq_3.ds, isoweek) AS metric_time__week
               , DATETIME_TRUNC(subq_3.ds, quarter) AS metric_time__quarter
             FROM ***************************.mf_time_spine subq_3
-            GROUP BY
-              metric_time__day
-              , metric_time__week
-              , metric_time__quarter
           ) subq_2
           INNER JOIN (
             -- Metric Time Dimension 'ds'

diff --git a/...y/SqlQueryPlan/BigQuery/test_all_time_metric_with_non_default_grains__plan0_optimized.sql b/...y/SqlQueryPlan/BigQuery/test_all_time_metric_with_non_default_grains__plan0_optimized.sql
@@ -21,27 +21,16 @@ FROM (
     -- Aggregate Measures
     -- Compute Metrics via Expressions
     SELECT
-      subq_11.metric_time__day AS metric_time__day
-      , subq_11.metric_time__week AS metric_time__week
-      , subq_11.metric_time__quarter AS metric_time__quarter
+      subq_12.ds AS metric_time__day
+      , DATETIME_TRUNC(subq_12.ds, isoweek) AS metric_time__week
+      , DATETIME_TRUNC(subq_12.ds, quarter) AS metric_time__quarter
       , SUM(revenue_src_28000.revenue) AS revenue_all_time
-    FROM (
-      -- Time Spine
-      SELECT
-        ds AS metric_time__day
-        , DATETIME_TRUNC(ds, isoweek) AS metric_time__week
-        , DATETIME_TRUNC(ds, quarter) AS metric_time__quarter
-      FROM ***************************.mf_time_spine subq_12
-      GROUP BY
-        metric_time__day
-        , metric_time__week
-        , metric_time__quarter
-    ) subq_11
+    FROM ***************************.mf_time_spine subq_12
     INNER JOIN
       ***************************.fct_revenue revenue_src_28000
     ON
       (
-        DATETIME_TRUNC(revenue_src_28000.created_at, day) <= subq_11.metric_time__day
+        DATETIME_TRUNC(revenue_src_28000.created_at, day) <= subq_12.ds
       )
     GROUP BY
       metric_time__day

diff --git a/....py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_agg_time_and_metric_time__plan0.sql b/....py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_agg_time_and_metric_time__plan0.sql
@@ -60,9 +60,6 @@ FROM (
           DATETIME_TRUNC(subq_3.ds, month) AS revenue_instance__ds__month
           , subq_3.ds AS metric_time__day
         FROM ***************************.mf_time_spine subq_3
-        GROUP BY
-          revenue_instance__ds__month
-          , metric_time__day
       ) subq_2
       INNER JOIN (
         -- Metric Time Dimension 'ds'

diff --git a/...ryPlan/BigQuery/test_cumulative_metric_with_agg_time_and_metric_time__plan0_optimized.sql b/...ryPlan/BigQuery/test_cumulative_metric_with_agg_time_and_metric_time__plan0_optimized.sql
@@ -3,26 +3,17 @@
 -- Aggregate Measures
 -- Compute Metrics via Expressions
 SELECT
-  subq_9.revenue_instance__ds__month AS revenue_instance__ds__month
-  , subq_9.metric_time__day AS metric_time__day
+  DATETIME_TRUNC(subq_10.ds, month) AS revenue_instance__ds__month
+  , subq_10.ds AS metric_time__day
   , SUM(revenue_src_28000.revenue) AS trailing_2_months_revenue
-FROM (
-  -- Time Spine
-  SELECT
-    DATETIME_TRUNC(ds, month) AS revenue_instance__ds__month
-    , ds AS metric_time__day
-  FROM ***************************.mf_time_spine subq_10
-  GROUP BY
-    revenue_instance__ds__month
-    , metric_time__day
-) subq_9
+FROM ***************************.mf_time_spine subq_10
 INNER JOIN
   ***************************.fct_revenue revenue_src_28000
 ON
   (
-    DATETIME_TRUNC(revenue_src_28000.created_at, day) <= subq_9.metric_time__day
+    DATETIME_TRUNC(revenue_src_28000.created_at, day) <= subq_10.ds
   ) AND (
-    DATETIME_TRUNC(revenue_src_28000.created_at, day) > DATE_SUB(CAST(subq_9.metric_time__day AS DATETIME), INTERVAL 2 month)
+    DATETIME_TRUNC(revenue_src_28000.created_at, day) > DATE_SUB(CAST(subq_10.ds AS DATETIME), INTERVAL 2 month)
   )
 GROUP BY
   revenue_instance__ds__month

diff --git a/...SqlQueryPlan/BigQuery/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0.sql b/...SqlQueryPlan/BigQuery/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0.sql
@@ -60,9 +60,6 @@ FROM (
           subq_3.ds AS revenue_instance__ds__day
           , DATETIME_TRUNC(subq_3.ds, month) AS revenue_instance__ds__month
         FROM ***************************.mf_time_spine subq_3
-        GROUP BY
-          revenue_instance__ds__day
-          , revenue_instance__ds__month
       ) subq_2
       INNER JOIN (
         -- Metric Time Dimension 'ds'

diff --git a/...an/BigQuery/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0_optimized.sql b/...an/BigQuery/test_cumulative_metric_with_multiple_agg_time_dimensions__plan0_optimized.sql
@@ -3,26 +3,17 @@
 -- Aggregate Measures
 -- Compute Metrics via Expressions
 SELECT
-  subq_9.revenue_instance__ds__day AS revenue_instance__ds__day
-  , subq_9.revenue_instance__ds__month AS revenue_instance__ds__month
+  subq_10.ds AS revenue_instance__ds__day
+  , DATETIME_TRUNC(subq_10.ds, month) AS revenue_instance__ds__month
   , SUM(revenue_src_28000.revenue) AS trailing_2_months_revenue
-FROM (
-  -- Time Spine
-  SELECT
-    ds AS revenue_instance__ds__day
-    , DATETIME_TRUNC(ds, month) AS revenue_instance__ds__month
-  FROM ***************************.mf_time_spine subq_10
-  GROUP BY
-    revenue_instance__ds__day
-    , revenue_instance__ds__month
-) subq_9
+FROM ***************************.mf_time_spine subq_10
 INNER JOIN
   ***************************.fct_revenue revenue_src_28000
 ON
   (
-    DATETIME_TRUNC(revenue_src_28000.created_at, day) <= subq_9.revenue_instance__ds__day
+    DATETIME_TRUNC(revenue_src_28000.created_at, day) <= subq_10.ds
   ) AND (
-    DATETIME_TRUNC(revenue_src_28000.created_at, day) > DATE_SUB(CAST(subq_9.revenue_instance__ds__day AS DATETIME), INTERVAL 2 month)
+    DATETIME_TRUNC(revenue_src_28000.created_at, day) > DATE_SUB(CAST(subq_10.ds AS DATETIME), INTERVAL 2 month)
   )
 GROUP BY
   revenue_instance__ds__day

diff --git a/...QueryPlan/BigQuery/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0.sql b/...QueryPlan/BigQuery/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0.sql
@@ -60,9 +60,6 @@ FROM (
           subq_3.ds AS metric_time__day
           , DATETIME_TRUNC(subq_3.ds, month) AS metric_time__month
         FROM ***************************.mf_time_spine subq_3
-        GROUP BY
-          metric_time__day
-          , metric_time__month
       ) subq_2
       INNER JOIN (
         -- Metric Time Dimension 'ds'

diff --git a/...BigQuery/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0_optimized.sql b/...BigQuery/test_cumulative_metric_with_multiple_metric_time_dimensions__plan0_optimized.sql
@@ -3,26 +3,17 @@
 -- Aggregate Measures
 -- Compute Metrics via Expressions
 SELECT
-  subq_9.metric_time__day AS metric_time__day
-  , subq_9.metric_time__month AS metric_time__month
+  subq_10.ds AS metric_time__day
+  , DATETIME_TRUNC(subq_10.ds, month) AS metric_time__month
   , SUM(revenue_src_28000.revenue) AS trailing_2_months_revenue
-FROM (
-  -- Time Spine
-  SELECT
-    ds AS metric_time__day
-    , DATETIME_TRUNC(ds, month) AS metric_time__month
-  FROM ***************************.mf_time_spine subq_10
-  GROUP BY
-    metric_time__day
-    , metric_time__month
-) subq_9
+FROM ***************************.mf_time_spine subq_10
 INNER JOIN
   ***************************.fct_revenue revenue_src_28000
 ON
   (
-    DATETIME_TRUNC(revenue_src_28000.created_at, day) <= subq_9.metric_time__day
+    DATETIME_TRUNC(revenue_src_28000.created_at, day) <= subq_10.ds
   ) AND (
-    DATETIME_TRUNC(revenue_src_28000.created_at, day) > DATE_SUB(CAST(subq_9.metric_time__day AS DATETIME), INTERVAL 2 month)
+    DATETIME_TRUNC(revenue_src_28000.created_at, day) > DATE_SUB(CAST(subq_10.ds AS DATETIME), INTERVAL 2 month)
   )
 GROUP BY
   metric_time__day

diff --git a/...ndering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_non_default_grain__plan0.sql b/...ndering.py/SqlQueryPlan/BigQuery/test_cumulative_metric_with_non_default_grain__plan0.sql
@@ -74,9 +74,6 @@ FROM (
               subq_3.ds AS metric_time__day
               , DATETIME_TRUNC(subq_3.ds, isoweek) AS metric_time__week
             FROM ***************************.mf_time_spine subq_3
-            GROUP BY
-              metric_time__day
-              , metric_time__week
           ) subq_2
           INNER JOIN (
             -- Metric Time Dimension 'ds'

diff --git a/.../SqlQueryPlan/BigQuery/test_cumulative_metric_with_non_default_grain__plan0_optimized.sql b/.../SqlQueryPlan/BigQuery/test_cumulative_metric_with_non_default_grain__plan0_optimized.sql
@@ -17,24 +17,15 @@ FROM (
     -- Aggregate Measures
     -- Compute Metrics via Expressions
     SELECT
-      subq_11.metric_time__day AS metric_time__day
-      , subq_11.metric_time__week AS metric_time__week
+      subq_12.ds AS metric_time__day
+      , DATETIME_TRUNC(subq_12.ds, isoweek) AS metric_time__week
       , SUM(revenue_src_28000.revenue) AS revenue_all_time
-    FROM (
-      -- Time Spine
-      SELECT
-        ds AS metric_time__day
-        , DATETIME_TRUNC(ds, isoweek) AS metric_time__week
-      FROM ***************************.mf_time_spine subq_12
-      GROUP BY
-        metric_time__day
-        , metric_time__week
-    ) subq_11
+    FROM ***************************.mf_time_spine subq_12
     INNER JOIN
       ***************************.fct_revenue revenue_src_28000
     ON
       (
-        DATETIME_TRUNC(revenue_src_28000.created_at, day) <= subq_11.metric_time__day
+        DATETIME_TRUNC(revenue_src_28000.created_at, day) <= subq_12.ds
       )
     GROUP BY
       metric_time__day

diff --git a/...y/SqlQueryPlan/BigQuery/test_derived_cumulative_metric_with_non_default_grains__plan0.sql b/...y/SqlQueryPlan/BigQuery/test_derived_cumulative_metric_with_non_default_grains__plan0.sql
@@ -75,9 +75,6 @@ FROM (
                 subq_3.ds AS metric_time__day
                 , DATETIME_TRUNC(subq_3.ds, isoweek) AS metric_time__week
               FROM ***************************.mf_time_spine subq_3
-              GROUP BY
-                metric_time__day
-                , metric_time__week
             ) subq_2
             INNER JOIN (
               -- Metric Time Dimension 'ds'

diff --git a/...Plan/BigQuery/test_derived_cumulative_metric_with_non_default_grains__plan0_optimized.sql b/...Plan/BigQuery/test_derived_cumulative_metric_with_non_default_grains__plan0_optimized.sql
@@ -18,26 +18,17 @@ FROM (
       -- Pass Only Elements: ['txn_revenue', 'metric_time__week', 'metric_time__day']
       -- Aggregate Measures
       SELECT
-        subq_12.metric_time__day AS metric_time__day
-        , subq_12.metric_time__week AS metric_time__week
+        subq_13.ds AS metric_time__day
+        , DATETIME_TRUNC(subq_13.ds, isoweek) AS metric_time__week
         , SUM(revenue_src_28000.revenue) AS txn_revenue
-      FROM (
-        -- Time Spine
-        SELECT
-          ds AS metric_time__day
-          , DATETIME_TRUNC(ds, isoweek) AS metric_time__week
-        FROM ***************************.mf_time_spine subq_13
-        GROUP BY
-          metric_time__day
-          , metric_time__week
-      ) subq_12
+      FROM ***************************.mf_time_spine subq_13
       INNER JOIN
         ***************************.fct_revenue revenue_src_28000
       ON
         (
-          DATETIME_TRUNC(revenue_src_28000.created_at, day) <= subq_12.metric_time__day
+          DATETIME_TRUNC(revenue_src_28000.created_at, day) <= subq_13.ds
         ) AND (
-          DATETIME_TRUNC(revenue_src_28000.created_at, day) > DATE_SUB(CAST(subq_12.metric_time__day AS DATETIME), INTERVAL 2 month)
+          DATETIME_TRUNC(revenue_src_28000.created_at, day) > DATE_SUB(CAST(subq_13.ds AS DATETIME), INTERVAL 2 month)
         )
       GROUP BY
         metric_time__day

diff --git a/...ring.py/SqlQueryPlan/BigQuery/test_grain_to_date_metric_with_non_default_grain__plan0.sql b/...ring.py/SqlQueryPlan/BigQuery/test_grain_to_date_metric_with_non_default_grain__plan0.sql
@@ -74,9 +74,6 @@ FROM (
               subq_3.ds AS metric_time__day
               , DATETIME_TRUNC(subq_3.ds, month) AS metric_time__month
             FROM ***************************.mf_time_spine subq_3
-            GROUP BY
-              metric_time__day
-              , metric_time__month
           ) subq_2
           INNER JOIN (
             -- Metric Time Dimension 'ds'

diff --git a/...lQueryPlan/BigQuery/test_grain_to_date_metric_with_non_default_grain__plan0_optimized.sql b/...lQueryPlan/BigQuery/test_grain_to_date_metric_with_non_default_grain__plan0_optimized.sql
@@ -17,26 +17,17 @@ FROM (
     -- Aggregate Measures
     -- Compute Metrics via Expressions
     SELECT
-      subq_11.metric_time__day AS metric_time__day
-      , subq_11.metric_time__month AS metric_time__month
+      subq_12.ds AS metric_time__day
+      , DATETIME_TRUNC(subq_12.ds, month) AS metric_time__month
       , SUM(revenue_src_28000.revenue) AS revenue_mtd
-    FROM (
-      -- Time Spine
-      SELECT
-        ds AS metric_time__day
-        , DATETIME_TRUNC(ds, month) AS metric_time__month
-      FROM ***************************.mf_time_spine subq_12
-      GROUP BY
-        metric_time__day
-        , metric_time__month
-    ) subq_11
+    FROM ***************************.mf_time_spine subq_12
     INNER JOIN
       ***************************.fct_revenue revenue_src_28000
     ON
       (
-        DATETIME_TRUNC(revenue_src_28000.created_at, day) <= subq_11.metric_time__day
+        DATETIME_TRUNC(revenue_src_28000.created_at, day) <= subq_12.ds
       ) AND (
-        DATETIME_TRUNC(revenue_src_28000.created_at, day) >= DATETIME_TRUNC(subq_11.metric_time__day, month)
+        DATETIME_TRUNC(revenue_src_28000.created_at, day) >= DATETIME_TRUNC(subq_12.ds, month)
       )
     GROUP BY
       metric_time__day

diff --git a/...ing.py/SqlQueryPlan/BigQuery/test_grain_to_date_metric_with_non_default_grains__plan0.sql b/...ing.py/SqlQueryPlan/BigQuery/test_grain_to_date_metric_with_non_default_grains__plan0.sql
@@ -82,10 +82,6 @@ FROM (
               , DATETIME_TRUNC(subq_3.ds, year) AS revenue_instance__ds__year
               , subq_3.ds AS metric_time__day
             FROM ***************************.mf_time_spine subq_3
-            GROUP BY
-              revenue_instance__ds__quarter
-              , revenue_instance__ds__year
-              , metric_time__day
           ) subq_2
           INNER JOIN (
             -- Metric Time Dimension 'ds'

diff --git a/...QueryPlan/BigQuery/test_grain_to_date_metric_with_non_default_grains__plan0_optimized.sql b/...QueryPlan/BigQuery/test_grain_to_date_metric_with_non_default_grains__plan0_optimized.sql
@@ -21,29 +21,18 @@ FROM (
     -- Aggregate Measures
     -- Compute Metrics via Expressions
     SELECT
-      subq_11.revenue_instance__ds__quarter AS revenue_instance__ds__quarter
-      , subq_11.revenue_instance__ds__year AS revenue_instance__ds__year
-      , subq_11.metric_time__day AS metric_time__day
+      DATETIME_TRUNC(subq_12.ds, quarter) AS revenue_instance__ds__quarter
+      , DATETIME_TRUNC(subq_12.ds, year) AS revenue_instance__ds__year
+      , subq_12.ds AS metric_time__day
       , SUM(revenue_src_28000.revenue) AS revenue_mtd
-    FROM (
-      -- Time Spine
-      SELECT
-        DATETIME_TRUNC(ds, quarter) AS revenue_instance__ds__quarter
-        , DATETIME_TRUNC(ds, year) AS revenue_instance__ds__year
-        , ds AS metric_time__day
-      FROM ***************************.mf_time_spine subq_12
-      GROUP BY
-        revenue_instance__ds__quarter
-        , revenue_instance__ds__year
-        , metric_time__day
-    ) subq_11
+    FROM ***************************.mf_time_spine subq_12
     INNER JOIN
       ***************************.fct_revenue revenue_src_28000
     ON
       (
-        DATETIME_TRUNC(revenue_src_28000.created_at, day) <= subq_11.metric_time__day
+        DATETIME_TRUNC(revenue_src_28000.created_at, day) <= subq_12.ds
       ) AND (
-        DATETIME_TRUNC(revenue_src_28000.created_at, day) >= DATETIME_TRUNC(subq_11.metric_time__day, month)
+        DATETIME_TRUNC(revenue_src_28000.created_at, day) >= DATETIME_TRUNC(subq_12.ds, month)
       )
     GROUP BY
       revenue_instance__ds__quarter

diff --git a/...c_rendering.py/SqlQueryPlan/BigQuery/test_window_metric_with_non_default_grain__plan0.sql b/...c_rendering.py/SqlQueryPlan/BigQuery/test_window_metric_with_non_default_grain__plan0.sql
@@ -70,9 +70,6 @@ FROM (
               subq_3.ds AS metric_time__day
               , DATETIME_TRUNC(subq_3.ds, year) AS metric_time__year
             FROM ***************************.mf_time_spine subq_3
-            GROUP BY
-              metric_time__day
-              , metric_time__year
           ) subq_2
           INNER JOIN (
             -- Metric Time Dimension 'ds'

diff --git a/...g.py/SqlQueryPlan/BigQuery/test_window_metric_with_non_default_grain__plan0_optimized.sql b/...g.py/SqlQueryPlan/BigQuery/test_window_metric_with_non_default_grain__plan0_optimized.sql
@@ -13,26 +13,17 @@ FROM (
     -- Pass Only Elements: ['txn_revenue', 'metric_time__year', 'metric_time__day']
     -- Aggregate Measures
     SELECT
-      subq_11.metric_time__day AS metric_time__day
-      , subq_11.metric_time__year AS metric_time__year
+      subq_12.ds AS metric_time__day
+      , DATETIME_TRUNC(subq_12.ds, year) AS metric_time__year
       , SUM(revenue_src_28000.revenue) AS txn_revenue
-    FROM (
-      -- Time Spine
-      SELECT
-        ds AS metric_time__day
-        , DATETIME_TRUNC(ds, year) AS metric_time__year
-      FROM ***************************.mf_time_spine subq_12
-      GROUP BY
-        metric_time__day
-        , metric_time__year
-    ) subq_11
+    FROM ***************************.mf_time_spine subq_12
     INNER JOIN
       ***************************.fct_revenue revenue_src_28000
     ON
       (
-        DATETIME_TRUNC(revenue_src_28000.created_at, day) <= subq_11.metric_time__day
+        DATETIME_TRUNC(revenue_src_28000.created_at, day) <= subq_12.ds
       ) AND (
-        DATETIME_TRUNC(revenue_src_28000.created_at, day) > DATE_SUB(CAST(subq_11.metric_time__day AS DATETIME), INTERVAL 2 month)
+        DATETIME_TRUNC(revenue_src_28000.created_at, day) > DATE_SUB(CAST(subq_12.ds AS DATETIME), INTERVAL 2 month)
       )
     GROUP BY
       metric_time__day

diff --git a/..._rendering.py/SqlQueryPlan/BigQuery/test_window_metric_with_non_default_grains__plan0.sql b/..._rendering.py/SqlQueryPlan/BigQuery/test_window_metric_with_non_default_grains__plan0.sql
@@ -157,10 +157,6 @@ FROM (
                 , subq_3.ds AS metric_time__day
                 , DATETIME_TRUNC(subq_3.ds, isoweek) AS metric_time__week
               FROM ***************************.mf_time_spine subq_3
-              GROUP BY
-                booking__ds__month
-                , metric_time__day
-                , metric_time__week
             ) subq_2
             INNER JOIN (
               -- Metric Time Dimension 'ds'