Skip to content

Commit 3b64854

Browse files
courtneyholcombcourtneyholcomb
committed
Update SQL engine snapshots
1 parent 32495cd commit 3b64854

File tree

24 files changed

+264
-384
lines changed

24 files changed

+264
-384
lines changed

‎tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_custom_offset_window__plan0.sql‎

Lines changed: 12 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -137,28 +137,18 @@ FROM (
137137
WITH cte_2 AS (
138138
-- Get Custom Granularity Bounds
139139
SELECT
140-
time_spine_src_28006.ds AS ds__day
141-
, DATETIME_TRUNC(time_spine_src_28006.ds, isoweek) AS ds__week
142-
, DATETIME_TRUNC(time_spine_src_28006.ds, month) AS ds__month
143-
, DATETIME_TRUNC(time_spine_src_28006.ds, quarter) AS ds__quarter
144-
, DATETIME_TRUNC(time_spine_src_28006.ds, year) AS ds__year
145-
, EXTRACT(year FROM time_spine_src_28006.ds) AS ds__extract_year
146-
, EXTRACT(quarter FROM time_spine_src_28006.ds) AS ds__extract_quarter
147-
, EXTRACT(month FROM time_spine_src_28006.ds) AS ds__extract_month
148-
, EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
149-
, IF(EXTRACT(dayofweek FROM time_spine_src_28006.ds) = 1, 7, EXTRACT(dayofweek FROM time_spine_src_28006.ds) - 1) AS ds__extract_dow
150-
, EXTRACT(dayofyear FROM time_spine_src_28006.ds) AS ds__extract_doy
151-
, time_spine_src_28006.alien_day AS ds__alien_day
140+
subq_6.ds__day
141+
, subq_6.ds__alien_day
152142
, FIRST_VALUE(subq_6.ds__day) OVER (
153143
PARTITION BY subq_6.ds__alien_day
154144
ORDER BY subq_6.ds__day
155145
ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
156-
) AS ds__alien_day__first_value
146+
) AS ds__day__first_value
157147
, LAST_VALUE(subq_6.ds__day) OVER (
158148
PARTITION BY subq_6.ds__alien_day
159149
ORDER BY subq_6.ds__day
160150
ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
161-
) AS ds__alien_day__last_value
151+
) AS ds__day__last_value
162152
, ROW_NUMBER() OVER (
163153
PARTITION BY subq_6.ds__alien_day
164154
ORDER BY subq_6.ds__day
@@ -185,28 +175,28 @@ FROM (
185175
SELECT
186176
cte_2.ds__day AS ds__day
187177
, CASE
188-
WHEN DATE_ADD(CAST(subq_8.ds__alien_day__first_value__lead AS DATETIME), INTERVAL cte_2.ds__day__row_number - 1 day) <= subq_8.ds__alien_day__last_value__lead
189-
THEN DATE_ADD(CAST(subq_8.ds__alien_day__first_value__lead AS DATETIME), INTERVAL cte_2.ds__day__row_number - 1 day)
178+
WHEN DATE_ADD(CAST(subq_8.ds__day__first_value__lead AS DATETIME), INTERVAL cte_2.ds__day__row_number - 1 day) <= subq_8.ds__day__last_value__lead
179+
THEN DATE_ADD(CAST(subq_8.ds__day__first_value__lead AS DATETIME), INTERVAL cte_2.ds__day__row_number - 1 day)
190180
ELSE NULL
191181
END AS ds__day__lead
192182
FROM cte_2 cte_2
193183
INNER JOIN (
194184
-- Offset Custom Granularity Bounds
195185
SELECT
196186
subq_7.ds__alien_day
197-
, LEAD(subq_7.ds__alien_day__first_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__alien_day__first_value__lead
198-
, LEAD(subq_7.ds__alien_day__last_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__alien_day__last_value__lead
187+
, LEAD(subq_7.ds__day__first_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__day__first_value__lead
188+
, LEAD(subq_7.ds__day__last_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__day__last_value__lead
199189
FROM (
200190
-- Get Unique Rows for Custom Granularity Bounds
201191
SELECT
202192
cte_2.ds__alien_day
203-
, cte_2.ds__alien_day__first_value
204-
, cte_2.ds__alien_day__last_value
193+
, cte_2.ds__day__first_value
194+
, cte_2.ds__day__last_value
205195
FROM cte_2 cte_2
206196
GROUP BY
207197
ds__alien_day
208-
, ds__alien_day__first_value
209-
, ds__alien_day__last_value
198+
, ds__day__first_value
199+
, ds__day__last_value
210200
) subq_7
211201
) subq_8
212202
ON

‎tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_custom_offset_window__plan0_optimized.sql‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ FROM (
2626
PARTITION BY alien_day
2727
ORDER BY ds
2828
ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
29-
) AS ds__alien_day__first_value
29+
) AS ds__day__first_value
3030
, LAST_VALUE(ds) OVER (
3131
PARTITION BY alien_day
3232
ORDER BY ds
3333
ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
34-
) AS ds__alien_day__last_value
34+
) AS ds__day__last_value
3535
, ROW_NUMBER() OVER (
3636
PARTITION BY alien_day
3737
ORDER BY ds
@@ -42,28 +42,28 @@ FROM (
4242
SELECT
4343
cte_6.ds__day AS ds__day
4444
, CASE
45-
WHEN DATE_ADD(CAST(subq_24.ds__alien_day__first_value__lead AS DATETIME), INTERVAL cte_6.ds__day__row_number - 1 day) <= subq_24.ds__alien_day__last_value__lead
46-
THEN DATE_ADD(CAST(subq_24.ds__alien_day__first_value__lead AS DATETIME), INTERVAL cte_6.ds__day__row_number - 1 day)
45+
WHEN DATE_ADD(CAST(subq_24.ds__day__first_value__lead AS DATETIME), INTERVAL cte_6.ds__day__row_number - 1 day) <= subq_24.ds__day__last_value__lead
46+
THEN DATE_ADD(CAST(subq_24.ds__day__first_value__lead AS DATETIME), INTERVAL cte_6.ds__day__row_number - 1 day)
4747
ELSE NULL
4848
END AS ds__day__lead
4949
FROM cte_6 cte_6
5050
INNER JOIN (
5151
-- Offset Custom Granularity Bounds
5252
SELECT
5353
ds__alien_day
54-
, LEAD(ds__alien_day__first_value, 1) OVER (ORDER BY ds__alien_day) AS ds__alien_day__first_value__lead
55-
, LEAD(ds__alien_day__last_value, 1) OVER (ORDER BY ds__alien_day) AS ds__alien_day__last_value__lead
54+
, LEAD(ds__day__first_value, 1) OVER (ORDER BY ds__alien_day) AS ds__day__first_value__lead
55+
, LEAD(ds__day__last_value, 1) OVER (ORDER BY ds__alien_day) AS ds__day__last_value__lead
5656
FROM (
5757
-- Get Unique Rows for Custom Granularity Bounds
5858
SELECT
5959
ds__alien_day
60-
, ds__alien_day__first_value
61-
, ds__alien_day__last_value
60+
, ds__day__first_value
61+
, ds__day__last_value
6262
FROM cte_6 cte_6
6363
GROUP BY
6464
ds__alien_day
65-
, ds__alien_day__first_value
66-
, ds__alien_day__last_value
65+
, ds__day__first_value
66+
, ds__day__last_value
6767
) subq_23
6868
) subq_24
6969
ON

‎tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_custom_offset_window_with_granularity_and_date_part__plan0.sql‎

Lines changed: 12 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -151,28 +151,18 @@ FROM (
151151
WITH cte_2 AS (
152152
-- Get Custom Granularity Bounds
153153
SELECT
154-
time_spine_src_28006.ds AS ds__day
155-
, DATETIME_TRUNC(time_spine_src_28006.ds, isoweek) AS ds__week
156-
, DATETIME_TRUNC(time_spine_src_28006.ds, month) AS ds__month
157-
, DATETIME_TRUNC(time_spine_src_28006.ds, quarter) AS ds__quarter
158-
, DATETIME_TRUNC(time_spine_src_28006.ds, year) AS ds__year
159-
, EXTRACT(year FROM time_spine_src_28006.ds) AS ds__extract_year
160-
, EXTRACT(quarter FROM time_spine_src_28006.ds) AS ds__extract_quarter
161-
, EXTRACT(month FROM time_spine_src_28006.ds) AS ds__extract_month
162-
, EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
163-
, IF(EXTRACT(dayofweek FROM time_spine_src_28006.ds) = 1, 7, EXTRACT(dayofweek FROM time_spine_src_28006.ds) - 1) AS ds__extract_dow
164-
, EXTRACT(dayofyear FROM time_spine_src_28006.ds) AS ds__extract_doy
165-
, time_spine_src_28006.alien_day AS ds__alien_day
154+
subq_6.ds__day
155+
, subq_6.ds__alien_day
166156
, FIRST_VALUE(subq_6.ds__day) OVER (
167157
PARTITION BY subq_6.ds__alien_day
168158
ORDER BY subq_6.ds__day
169159
ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
170-
) AS ds__alien_day__first_value
160+
) AS ds__day__first_value
171161
, LAST_VALUE(subq_6.ds__day) OVER (
172162
PARTITION BY subq_6.ds__alien_day
173163
ORDER BY subq_6.ds__day
174164
ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
175-
) AS ds__alien_day__last_value
165+
) AS ds__day__last_value
176166
, ROW_NUMBER() OVER (
177167
PARTITION BY subq_6.ds__alien_day
178168
ORDER BY subq_6.ds__day
@@ -199,28 +189,28 @@ FROM (
199189
SELECT
200190
cte_2.ds__day AS ds__day
201191
, CASE
202-
WHEN DATE_ADD(CAST(subq_8.ds__alien_day__first_value__lead AS DATETIME), INTERVAL cte_2.ds__day__row_number - 1 day) <= subq_8.ds__alien_day__last_value__lead
203-
THEN DATE_ADD(CAST(subq_8.ds__alien_day__first_value__lead AS DATETIME), INTERVAL cte_2.ds__day__row_number - 1 day)
192+
WHEN DATE_ADD(CAST(subq_8.ds__day__first_value__lead AS DATETIME), INTERVAL cte_2.ds__day__row_number - 1 day) <= subq_8.ds__day__last_value__lead
193+
THEN DATE_ADD(CAST(subq_8.ds__day__first_value__lead AS DATETIME), INTERVAL cte_2.ds__day__row_number - 1 day)
204194
ELSE NULL
205195
END AS ds__day__lead
206196
FROM cte_2 cte_2
207197
INNER JOIN (
208198
-- Offset Custom Granularity Bounds
209199
SELECT
210200
subq_7.ds__alien_day
211-
, LEAD(subq_7.ds__alien_day__first_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__alien_day__first_value__lead
212-
, LEAD(subq_7.ds__alien_day__last_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__alien_day__last_value__lead
201+
, LEAD(subq_7.ds__day__first_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__day__first_value__lead
202+
, LEAD(subq_7.ds__day__last_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__day__last_value__lead
213203
FROM (
214204
-- Get Unique Rows for Custom Granularity Bounds
215205
SELECT
216206
cte_2.ds__alien_day
217-
, cte_2.ds__alien_day__first_value
218-
, cte_2.ds__alien_day__last_value
207+
, cte_2.ds__day__first_value
208+
, cte_2.ds__day__last_value
219209
FROM cte_2 cte_2
220210
GROUP BY
221211
ds__alien_day
222-
, ds__alien_day__first_value
223-
, ds__alien_day__last_value
212+
, ds__day__first_value
213+
, ds__day__last_value
224214
) subq_7
225215
) subq_8
226216
ON

‎tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/BigQuery/test_custom_offset_window_with_granularity_and_date_part__plan0_optimized.sql‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ FROM (
3131
PARTITION BY alien_day
3232
ORDER BY ds
3333
ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
34-
) AS ds__alien_day__first_value
34+
) AS ds__day__first_value
3535
, LAST_VALUE(ds) OVER (
3636
PARTITION BY alien_day
3737
ORDER BY ds
3838
ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
39-
) AS ds__alien_day__last_value
39+
) AS ds__day__last_value
4040
, ROW_NUMBER() OVER (
4141
PARTITION BY alien_day
4242
ORDER BY ds
@@ -47,28 +47,28 @@ FROM (
4747
SELECT
4848
cte_6.ds__day AS ds__day
4949
, CASE
50-
WHEN DATE_ADD(CAST(subq_25.ds__alien_day__first_value__lead AS DATETIME), INTERVAL cte_6.ds__day__row_number - 1 day) <= subq_25.ds__alien_day__last_value__lead
51-
THEN DATE_ADD(CAST(subq_25.ds__alien_day__first_value__lead AS DATETIME), INTERVAL cte_6.ds__day__row_number - 1 day)
50+
WHEN DATE_ADD(CAST(subq_25.ds__day__first_value__lead AS DATETIME), INTERVAL cte_6.ds__day__row_number - 1 day) <= subq_25.ds__day__last_value__lead
51+
THEN DATE_ADD(CAST(subq_25.ds__day__first_value__lead AS DATETIME), INTERVAL cte_6.ds__day__row_number - 1 day)
5252
ELSE NULL
5353
END AS ds__day__lead
5454
FROM cte_6 cte_6
5555
INNER JOIN (
5656
-- Offset Custom Granularity Bounds
5757
SELECT
5858
ds__alien_day
59-
, LEAD(ds__alien_day__first_value, 1) OVER (ORDER BY ds__alien_day) AS ds__alien_day__first_value__lead
60-
, LEAD(ds__alien_day__last_value, 1) OVER (ORDER BY ds__alien_day) AS ds__alien_day__last_value__lead
59+
, LEAD(ds__day__first_value, 1) OVER (ORDER BY ds__alien_day) AS ds__day__first_value__lead
60+
, LEAD(ds__day__last_value, 1) OVER (ORDER BY ds__alien_day) AS ds__day__last_value__lead
6161
FROM (
6262
-- Get Unique Rows for Custom Granularity Bounds
6363
SELECT
6464
ds__alien_day
65-
, ds__alien_day__first_value
66-
, ds__alien_day__last_value
65+
, ds__day__first_value
66+
, ds__day__last_value
6767
FROM cte_6 cte_6
6868
GROUP BY
6969
ds__alien_day
70-
, ds__alien_day__first_value
71-
, ds__alien_day__last_value
70+
, ds__day__first_value
71+
, ds__day__last_value
7272
) subq_24
7373
) subq_25
7474
ON

‎tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_custom_offset_window__plan0.sql‎

Lines changed: 12 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -137,28 +137,18 @@ FROM (
137137
WITH cte_2 AS (
138138
-- Get Custom Granularity Bounds
139139
SELECT
140-
time_spine_src_28006.ds AS ds__day
141-
, DATE_TRUNC('week', time_spine_src_28006.ds) AS ds__week
142-
, DATE_TRUNC('month', time_spine_src_28006.ds) AS ds__month
143-
, DATE_TRUNC('quarter', time_spine_src_28006.ds) AS ds__quarter
144-
, DATE_TRUNC('year', time_spine_src_28006.ds) AS ds__year
145-
, EXTRACT(year FROM time_spine_src_28006.ds) AS ds__extract_year
146-
, EXTRACT(quarter FROM time_spine_src_28006.ds) AS ds__extract_quarter
147-
, EXTRACT(month FROM time_spine_src_28006.ds) AS ds__extract_month
148-
, EXTRACT(day FROM time_spine_src_28006.ds) AS ds__extract_day
149-
, EXTRACT(DAYOFWEEK_ISO FROM time_spine_src_28006.ds) AS ds__extract_dow
150-
, EXTRACT(doy FROM time_spine_src_28006.ds) AS ds__extract_doy
151-
, time_spine_src_28006.alien_day AS ds__alien_day
140+
subq_6.ds__day
141+
, subq_6.ds__alien_day
152142
, FIRST_VALUE(subq_6.ds__day) OVER (
153143
PARTITION BY subq_6.ds__alien_day
154144
ORDER BY subq_6.ds__day
155145
ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
156-
) AS ds__alien_day__first_value
146+
) AS ds__day__first_value
157147
, LAST_VALUE(subq_6.ds__day) OVER (
158148
PARTITION BY subq_6.ds__alien_day
159149
ORDER BY subq_6.ds__day
160150
ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
161-
) AS ds__alien_day__last_value
151+
) AS ds__day__last_value
162152
, ROW_NUMBER() OVER (
163153
PARTITION BY subq_6.ds__alien_day
164154
ORDER BY subq_6.ds__day
@@ -185,28 +175,28 @@ FROM (
185175
SELECT
186176
cte_2.ds__day AS ds__day
187177
, CASE
188-
WHEN DATEADD(day, (cte_2.ds__day__row_number - 1), subq_8.ds__alien_day__first_value__lead) <= subq_8.ds__alien_day__last_value__lead
189-
THEN DATEADD(day, (cte_2.ds__day__row_number - 1), subq_8.ds__alien_day__first_value__lead)
178+
WHEN DATEADD(day, (cte_2.ds__day__row_number - 1), subq_8.ds__day__first_value__lead) <= subq_8.ds__day__last_value__lead
179+
THEN DATEADD(day, (cte_2.ds__day__row_number - 1), subq_8.ds__day__first_value__lead)
190180
ELSE NULL
191181
END AS ds__day__lead
192182
FROM cte_2 cte_2
193183
INNER JOIN (
194184
-- Offset Custom Granularity Bounds
195185
SELECT
196186
subq_7.ds__alien_day
197-
, LEAD(subq_7.ds__alien_day__first_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__alien_day__first_value__lead
198-
, LEAD(subq_7.ds__alien_day__last_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__alien_day__last_value__lead
187+
, LEAD(subq_7.ds__day__first_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__day__first_value__lead
188+
, LEAD(subq_7.ds__day__last_value, 1) OVER (ORDER BY subq_7.ds__alien_day) AS ds__day__last_value__lead
199189
FROM (
200190
-- Get Unique Rows for Custom Granularity Bounds
201191
SELECT
202192
cte_2.ds__alien_day
203-
, cte_2.ds__alien_day__first_value
204-
, cte_2.ds__alien_day__last_value
193+
, cte_2.ds__day__first_value
194+
, cte_2.ds__day__last_value
205195
FROM cte_2 cte_2
206196
GROUP BY
207197
cte_2.ds__alien_day
208-
, cte_2.ds__alien_day__first_value
209-
, cte_2.ds__alien_day__last_value
198+
, cte_2.ds__day__first_value
199+
, cte_2.ds__day__last_value
210200
) subq_7
211201
) subq_8
212202
ON

‎tests_metricflow/snapshots/test_custom_granularity.py/SqlPlan/Databricks/test_custom_offset_window__plan0_optimized.sql‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ FROM (
2626
PARTITION BY alien_day
2727
ORDER BY ds
2828
ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
29-
) AS ds__alien_day__first_value
29+
) AS ds__day__first_value
3030
, LAST_VALUE(ds) OVER (
3131
PARTITION BY alien_day
3232
ORDER BY ds
3333
ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
34-
) AS ds__alien_day__last_value
34+
) AS ds__day__last_value
3535
, ROW_NUMBER() OVER (
3636
PARTITION BY alien_day
3737
ORDER BY ds
@@ -42,28 +42,28 @@ FROM (
4242
SELECT
4343
cte_6.ds__day AS ds__day
4444
, CASE
45-
WHEN DATEADD(day, (cte_6.ds__day__row_number - 1), subq_24.ds__alien_day__first_value__lead) <= subq_24.ds__alien_day__last_value__lead
46-
THEN DATEADD(day, (cte_6.ds__day__row_number - 1), subq_24.ds__alien_day__first_value__lead)
45+
WHEN DATEADD(day, (cte_6.ds__day__row_number - 1), subq_24.ds__day__first_value__lead) <= subq_24.ds__day__last_value__lead
46+
THEN DATEADD(day, (cte_6.ds__day__row_number - 1), subq_24.ds__day__first_value__lead)
4747
ELSE NULL
4848
END AS ds__day__lead
4949
FROM cte_6 cte_6
5050
INNER JOIN (
5151
-- Offset Custom Granularity Bounds
5252
SELECT
5353
ds__alien_day
54-
, LEAD(ds__alien_day__first_value, 1) OVER (ORDER BY ds__alien_day) AS ds__alien_day__first_value__lead
55-
, LEAD(ds__alien_day__last_value, 1) OVER (ORDER BY ds__alien_day) AS ds__alien_day__last_value__lead
54+
, LEAD(ds__day__first_value, 1) OVER (ORDER BY ds__alien_day) AS ds__day__first_value__lead
55+
, LEAD(ds__day__last_value, 1) OVER (ORDER BY ds__alien_day) AS ds__day__last_value__lead
5656
FROM (
5757
-- Get Unique Rows for Custom Granularity Bounds
5858
SELECT
5959
ds__alien_day
60-
, ds__alien_day__first_value
61-
, ds__alien_day__last_value
60+
, ds__day__first_value
61+
, ds__day__last_value
6262
FROM cte_6 cte_6
6363
GROUP BY
6464
ds__alien_day
65-
, ds__alien_day__first_value
66-
, ds__alien_day__last_value
65+
, ds__day__first_value
66+
, ds__day__last_value
6767
) subq_23
6868
) subq_24
6969
ON

0 commit comments

Comments
 (0)