benchbox 0.1.0__py3-none-any.whl → 0.1.1__py3-none-any.whl

benchbox/__init__.py

@@ -21,7 +21,7 @@ from benchbox.tsbs_devops import TSBSDevOps
 
 from . import platforms
 
-__version__ = "0.1.0"
+__version__ = "0.1.1"
 
 # Perform version consistency check on import (but don't fail - just warn)
 try:

benchbox/_binaries/tpc-ds/{darwin-arm64 → templates}/query_templates/query72.tpl

@@ -62,6 +62,6 @@ where d1.d_week_seq = d2.d_week_seq
   and d1.d_year = [YEAR]
   and cd_marital_status = '[MS]'
 group by i_item_desc,w_warehouse_name,d1.d_week_seq
-order by total_cnt desc, i_item_desc, w_warehouse_name, d_week_seq
+order by total_cnt desc, i_item_desc, w_warehouse_name, d1.d_week_seq
 [_LIMITC];
 

benchbox/_binaries/tpc-ds/{darwin-x86_64/query_templates/ansi.tpl → templates/query_templates/sqlserver.tpl}

@@ -31,7 +31,7 @@
 --     ADVANCE NOTICE OF THE POSSIBILITY OF SUCH DAMAGES. 
 -- 
 -- Contributors:
--- 
+--
 define __LIMITA = "";
 define __LIMITB = "top %d";
 define __LIMITC = "";

benchbox/_binaries/tpc-ds/templates/query_variants/README

@@ -0,0 +1,6 @@
+--
+-- README
+-- ====================
+-- this directory contains all of the query variants
+-- approved for TPC-DS. Base templates are located in query_templates/.
+--

benchbox/_binaries/tpc-ds/{linux-arm64/query_templates/query10.tpl → templates/query_variants/query10a.tpl}

@@ -64,18 +64,19 @@
                 ss_sold_date_sk = d_date_sk and
                 d_year = [YEAR] and
                 d_moy between [MONTH] and [MONTH]+3) and
-   (exists (select *
-            from web_sales,date_dim
-            where c.c_customer_sk = ws_bill_customer_sk and
-                  ws_sold_date_sk = d_date_sk and
-                  d_year = [YEAR] and
-                  d_moy between [MONTH] ANd [MONTH]+3) or 
-    exists (select * 
-            from catalog_sales,date_dim
-            where c.c_customer_sk = cs_ship_customer_sk and
-                  cs_sold_date_sk = d_date_sk and
-                  d_year = [YEAR] and
-                  d_moy between [MONTH] and [MONTH]+3))
+   exists (select *
+          from (
+             select ws_bill_customer_sk as customer_sk, d_year,d_moy
+             from web_sales, date_dim where ws_sold_date_sk = d_date_sk
+              and d_year = [YEAR] and
+                  d_moy between [MONTH] and [MONTH]+3
+             union all
+             select cs_ship_customer_sk as customer_sk, d_year, d_moy
+             from catalog_sales, date_dim where cs_sold_date_sk = d_date_sk
+              and d_year = [YEAR] and
+                  d_moy between [MONTH] and [MONTH]+3
+	     ) x
+            where c.c_customer_sk = customer_sk)
  group by cd_gender,
           cd_marital_status,
           cd_education_status,
@@ -93,6 +94,4 @@
           cd_dep_employed_count,
           cd_dep_college_count
 [_LIMITC];
- 
- 
 

benchbox/_binaries/tpc-ds/{darwin-x86_64/query_templates/query14.tpl → templates/query_variants/query14a.tpl}

@@ -35,7 +35,7 @@
  define YEAR= random(1998, 2000, uniform);
  define DAY = random(1,28,uniform);
  define _LIMIT=100; 
-
+ 
 with  cross_items as
  (select i_item_sk ss_item_sk
  from item,
@@ -47,7 +47,7 @@ with  cross_items as
      ,date_dim d1
  where ss_item_sk = iss.i_item_sk
    and ss_sold_date_sk = d1.d_date_sk
-   and d1.d_year between [YEAR] AND [YEAR] + 2
+   and d1.d_year between 1999 AND 1999 + 2
  intersect 
  select ics.i_brand_id
      ,ics.i_class_id
@@ -57,7 +57,7 @@ with  cross_items as
      ,date_dim d2
  where cs_item_sk = ics.i_item_sk
    and cs_sold_date_sk = d2.d_date_sk
-   and d2.d_year between [YEAR] AND [YEAR] + 2
+   and d2.d_year between 1999 AND 1999 + 2
  intersect
  select iws.i_brand_id
      ,iws.i_class_id
@@ -67,7 +67,7 @@ with  cross_items as
      ,date_dim d3
  where ws_item_sk = iws.i_item_sk
    and ws_sold_date_sk = d3.d_date_sk
-   and d3.d_year between [YEAR] AND [YEAR] + 2)
+   and d3.d_year between 1999 AND 1999 + 2) x
  where i_brand_id = brand_id
       and i_class_id = class_id
       and i_category_id = category_id
@@ -79,7 +79,7 @@ with  cross_items as
        from store_sales
            ,date_dim
        where ss_sold_date_sk = d_date_sk
-         and d_year between [YEAR] and [YEAR] + 2
+         and d_year between 1999 and 2001 
        union all 
        select cs_quantity quantity 
              ,cs_list_price list_price
@@ -94,8 +94,10 @@ with  cross_items as
            ,date_dim
        where ws_sold_date_sk = d_date_sk
          and d_year between [YEAR] and [YEAR] + 2) x)
- [_LIMITA] select [_LIMITB] channel, i_brand_id,i_class_id,i_category_id,sum(sales), sum(number_sales)
- from(
+,
+  results AS
+(select channel, i_brand_id, i_class_id, i_category_id, sum(sales) sum_sales, sum(number_sales) number_sales
+ from (
        select 'store' channel, i_brand_id,i_class_id
              ,i_category_id,sum(ss_quantity*ss_list_price) sales
              , count(*) number_sales
@@ -134,8 +136,23 @@ with  cross_items as
        group by i_brand_id,i_class_id,i_category_id
        having sum(ws_quantity*ws_list_price) > (select average_sales from avg_sales)
  ) y
- group by rollup (channel, i_brand_id,i_class_id,i_category_id)
- order by channel,i_brand_id,i_class_id,i_category_id
+ group by channel, i_brand_id,i_class_id,i_category_id)
+
+[_LIMITA] select [_LIMITB] channel, i_brand_id, i_class_id, i_category_id, sum_sales, number_sales
+from (
+      select channel, i_brand_id, i_class_id, i_category_id, sum_sales, number_sales from results
+      union
+      select channel, i_brand_id, i_class_id,  null as i_category_id, sum(sum_sales), sum(number_sales) from results
+      group by channel, i_brand_id, i_class_id
+      union
+      select channel, i_brand_id, null as i_class_id, null as i_category_id, sum(sum_sales), sum(number_sales) from results
+      group by channel, i_brand_id
+      union
+      select channel, null as i_brand_id, null as i_class_id, null as i_category_id, sum(sum_sales), sum(number_sales) from results
+      group by channel
+      union
+      select null as channel, null as i_brand_id, null as i_class_id, null as i_category_id, sum(sum_sales), sum(number_sales) from results) z
+order by channel, i_brand_id, i_class_id, i_category_id
  [_LIMITC];
  
  with  cross_items as
@@ -149,7 +166,7 @@ with  cross_items as
      ,date_dim d1
  where ss_item_sk = iss.i_item_sk
    and ss_sold_date_sk = d1.d_date_sk
-   and d1.d_year between [YEAR] AND [YEAR] + 2
+   and d1.d_year between 1999 AND 1999 + 2
  intersect
  select ics.i_brand_id
      ,ics.i_class_id
@@ -159,7 +176,7 @@ with  cross_items as
      ,date_dim d2
  where cs_item_sk = ics.i_item_sk
    and cs_sold_date_sk = d2.d_date_sk
-   and d2.d_year between [YEAR] AND [YEAR] + 2
+   and d2.d_year between 1999 AND 1999 + 2
  intersect
  select iws.i_brand_id
      ,iws.i_class_id
@@ -169,7 +186,7 @@ with  cross_items as
      ,date_dim d3
  where ws_item_sk = iws.i_item_sk
    and ws_sold_date_sk = d3.d_date_sk
-   and d3.d_year between [YEAR] AND [YEAR] + 2) x
+   and d3.d_year between 1999 AND 1999 + 2) x
  where i_brand_id = brand_id
       and i_class_id = class_id
       and i_category_id = category_id
@@ -196,19 +213,7 @@ with  cross_items as
            ,date_dim
        where ws_sold_date_sk = d_date_sk
          and d_year between [YEAR] and [YEAR] + 2) x)
- [_LIMITA] select [_LIMITB] this_year.channel ty_channel
-                           ,this_year.i_brand_id ty_brand
-                           ,this_year.i_class_id ty_class
-                           ,this_year.i_category_id ty_category
-                           ,this_year.sales ty_sales
-                           ,this_year.number_sales ty_number_sales
-                           ,last_year.channel ly_channel
-                           ,last_year.i_brand_id ly_brand
-                           ,last_year.i_class_id ly_class
-                           ,last_year.i_category_id ly_category
-                           ,last_year.sales ly_sales
-                           ,last_year.number_sales ly_number_sales 
- from
+ [_LIMITA] select [_LIMITB] * from
  (select 'store' channel, i_brand_id,i_class_id,i_category_id
         ,sum(ss_quantity*ss_list_price) sales, count(*) number_sales
  from store_sales 
@@ -244,4 +249,3 @@ with  cross_items as
    and this_year.i_category_id = last_year.i_category_id
  order by this_year.channel, this_year.i_brand_id, this_year.i_class_id, this_year.i_category_id
  [_LIMITC];
-

benchbox/_binaries/tpc-ds/{linux-arm64/query_templates/query18.tpl → templates/query_variants/query18a.tpl}

@@ -31,7 +31,7 @@
 --     ADVANCE NOTICE OF THE POSSIBILITY OF SUCH DAMAGES. 
 -- 
 -- Contributors:
--- 
+--
  define YEAR = random(1998, 2002, uniform);
  define GEN= dist(gender, 1, 1);
  define ES= dist(education, 1, 1);
@@ -39,19 +39,19 @@
  define MONTH=ulist(random(1,12,uniform),6);
  define _LIMIT=100;
  
- [_LIMITA] select [_LIMITB] i_item_id,
+ with results as
+ (select i_item_id,
         ca_country,
         ca_state, 
         ca_county,
-        avg( cast(cs_quantity as decimal(12,2))) agg1,
-        avg( cast(cs_list_price as decimal(12,2))) agg2,
-        avg( cast(cs_coupon_amt as decimal(12,2))) agg3,
-        avg( cast(cs_sales_price as decimal(12,2))) agg4,
-        avg( cast(cs_net_profit as decimal(12,2))) agg5,
-        avg( cast(c_birth_year as decimal(12,2))) agg6,
-        avg( cast(cd1.cd_dep_count as decimal(12,2))) agg7
- from catalog_sales, customer_demographics cd1, 
-      customer_demographics cd2, customer, customer_address, date_dim, item
+        cast(cs_quantity as decimal(12,2)) agg1,
+        cast(cs_list_price as decimal(12,2)) agg2,
+        cast(cs_coupon_amt as decimal(12,2)) agg3,
+        cast(cs_sales_price as decimal(12,2)) agg4,
+        cast(cs_net_profit as decimal(12,2)) agg5,
+        cast(c_birth_year as decimal(12,2)) agg6,
+        cast(cd1.cd_dep_count as decimal(12,2)) agg7
+ from catalog_sales, customer_demographics cd1, customer_demographics cd2, customer, customer_address, date_dim, item
  where cs_sold_date_sk = d_date_sk and
        cs_item_sk = i_item_sk and
        cs_bill_cdemo_sk = cd1.cd_demo_sk and
@@ -62,12 +62,33 @@
        c_current_addr_sk = ca_address_sk and
        c_birth_month in ([MONTH.1],[MONTH.2],[MONTH.3],[MONTH.4],[MONTH.5],[MONTH.6]) and
        d_year = [YEAR] and
-       ca_state in ('[STATE.1]','[STATE.2]','[STATE.3]'
-                   ,'[STATE.4]','[STATE.5]','[STATE.6]','[STATE.7]')
- group by rollup (i_item_id, ca_country, ca_state, ca_county)
- order by ca_country,
-        ca_state, 
-        ca_county,
-	i_item_id
+       ca_state in ('[STATE.1]','[STATE.2]','[STATE.3]','[STATE.4]','[STATE.5]','[STATE.6]','[STATE.7]')
+ )
+ [_LIMITA] select [_LIMITB] i_item_id, ca_country, ca_state, ca_county, agg1, agg2, agg3, agg4, agg5, agg6, agg7
+ from (
+ 	select i_item_id, ca_country, ca_state, ca_county, avg(agg1) agg1, 
+ 		avg(agg2) agg2, avg(agg3) agg3, avg(agg4) agg4, avg(agg5) agg5, avg(agg6) agg6, avg(agg7) agg7 
+ 	from results
+	group by i_item_id, ca_country, ca_state, ca_county
+ 	union all
+ 	select i_item_id, ca_country, ca_state, NULL as county, avg(agg1) agg1, avg(agg2) agg2, avg(agg3) agg3,
+		avg(agg4) agg4, avg(agg5) agg5, avg(agg6) agg6, avg(agg7) agg7 
+	from results
+	group by i_item_id, ca_country, ca_state
+ 	union all
+	select i_item_id, ca_country, NULL as ca_state, NULL as county, avg(agg1) agg1, avg(agg2) agg2, avg(agg3) agg3,
+		avg(agg4) agg4, avg(agg5) agg5, avg(agg6) agg6, avg(agg7) agg7 
+	from results
+ 	group by i_item_id, ca_country
+ 	union all
+ 	select i_item_id, NULL as ca_country, NULL as ca_state, NULL as county, avg(agg1) agg1, avg(agg2) agg2, avg(agg3) agg3,
+		avg(agg4) agg4, avg(agg5) agg5, avg(agg6) agg6, avg(agg7) agg7 
+	from results
+	group by i_item_id
+	union all
+	select NULL AS i_item_id, NULL as ca_country, NULL as ca_state, NULL as county, avg(agg1) agg1, avg(agg2) agg2, avg(agg3) agg3,
+		avg(agg4) agg4, avg(agg5) agg5, avg(agg6) agg6, avg(agg7) agg7 
+	from results
+ ) foo
+ order by ca_country, ca_state, ca_county, i_item_id
  [_LIMITC];
-

benchbox/_binaries/tpc-ds/{linux-arm64/query_templates/query22.tpl → templates/query_variants/query22a.tpl}

@@ -33,22 +33,44 @@
 -- Contributors:
 -- 
 
-define _LIMIT=100;
 define DMS = random(1176,1224,uniform); 
-[_LIMITA] select [_LIMITB] i_product_name
+define _LIMIT=100;
+
+with results as 
+(select  i_product_name
              ,i_brand
              ,i_class
              ,i_category
-             ,avg(inv_quantity_on_hand) qoh
+             ,inv_quantity_on_hand qoh
        from inventory
            ,date_dim
            ,item
-       where inv_date_sk=d_date_sk
+           ,warehouse
+       where  inv_date_sk=d_date_sk
               and inv_item_sk=i_item_sk
+              and inv_warehouse_sk = w_warehouse_sk
               and d_month_seq between [DMS] and [DMS] + 11
-       group by rollup(i_product_name
-                       ,i_brand
-                       ,i_class
-                       ,i_category)
-order by qoh, i_product_name, i_brand, i_class, i_category
+       group by i_product_name,i_brand,i_class,i_category),
+results_rollup as 
+(select i_product_name, i_brand, i_class, i_category,avg(qoh) qoh 
+from results 
+group by i_product_name,i_brand,i_class,i_category
+union all 
+select i_product_name, i_brand, i_class, null i_category,avg(qoh) qoh 
+from results
+group by i_product_name,i_brand,i_class
+union all 
+select i_product_name, i_brand, null i_class, null i_category,avg(qoh) qoh 
+from results
+group by i_product_name,i_brand
+union all 
+select i_product_name, null i_brand, null i_class, null i_category,avg(qoh)  qoh 
+from results
+group by i_product_name
+union all 
+select null i_product_name, null i_brand, null i_class, null i_category,avg(qoh) qoh 
+from results)
+[_LIMITA] select [_LIMITB] i_product_name, i_brand, i_class, i_category,qoh
+      from results_rollup
+      order by qoh, i_product_name, i_brand, i_class, i_category
 [_LIMITC];

benchbox/_binaries/tpc-ds/{darwin-x86_64/query_templates/query27.tpl → templates/query_variants/query27a.tpl}

@@ -45,12 +45,13 @@
  define STATE_F=distmember(fips_county,[STATENUMBER.6], 3);
  define _LIMIT=100;
 
- [_LIMITA] select [_LIMITB] i_item_id,
-        s_state, grouping(s_state) g_state,
-        avg(ss_quantity) agg1,
-        avg(ss_list_price) agg2,
-        avg(ss_coupon_amt) agg3,
-        avg(ss_sales_price) agg4
+with results as
+ (select i_item_id,
+        s_state, 0 as g_state,
+        ss_quantity agg1,
+        ss_list_price agg2,
+        ss_coupon_amt agg3,
+        ss_sales_price agg4
  from store_sales, customer_demographics, date_dim, store, item
  where ss_sold_date_sk = d_date_sk and
        ss_item_sk = i_item_sk and
@@ -61,8 +62,20 @@
        cd_education_status = '[ES]' and
        d_year = [YEAR] and
        s_state in ('[STATE_A]','[STATE_B]', '[STATE_C]', '[STATE_D]', '[STATE_E]', '[STATE_F]')
- group by rollup (i_item_id, s_state)
- order by i_item_id
-         ,s_state
- [_LIMITC];
+ )
 
+ [_LIMITA] select [_LIMITB] i_item_id,
+  s_state, g_state, agg1, agg2, agg3, agg4
+   from (
+        select i_item_id, s_state, 0 as g_state, avg(agg1) agg1, avg(agg2) agg2, avg(agg3) agg3, avg(agg4) agg4 from results
+        group by i_item_id, s_state
+         union all
+        select i_item_id, NULL AS s_state, 1 AS g_state, avg(agg1) agg1, avg(agg2) agg2, avg(agg3) agg3,
+         avg(agg4) agg4 from results
+        group by i_item_id
+         union all
+        select NULL AS i_item_id, NULL as s_state, 1 as g_state, avg(agg1) agg1, avg(agg2) agg2, avg(agg3) agg3,
+         avg(agg4) agg4 from results
+        ) foo
+  order by i_item_id, s_state
+ [_LIMITC]; 

benchbox/_binaries/tpc-ds/{linux-arm64/query_templates/query35.tpl → templates/query_variants/query35a.tpl}

@@ -69,18 +69,21 @@
                 ss_sold_date_sk = d_date_sk and
                 d_year = [YEAR] and
                 d_qoy < 4) and
-   (exists (select *
+   exists (select * from
+	   (select ws_bill_customer_sk customsk
             from web_sales,date_dim
-            where c.c_customer_sk = ws_bill_customer_sk and
+            where 
                   ws_sold_date_sk = d_date_sk and
                   d_year = [YEAR] and
-                  d_qoy < 4) or 
-    exists (select * 
+                  d_qoy < 4
+	    union all 
+    	    select cs_ship_customer_sk customsk
             from catalog_sales,date_dim
-            where c.c_customer_sk = cs_ship_customer_sk and
+            where 
                   cs_sold_date_sk = d_date_sk and
                   d_year = [YEAR] and
-                  d_qoy < 4))
+                  d_qoy < 4)x 
+           where x.customsk = c.c_customer_sk)
  group by ca_state,
           cd_gender,
           cd_marital_status,
@@ -94,5 +97,3 @@
           cd_dep_employed_count,
           cd_dep_college_count
  [_LIMITC];
- 
-

benchbox/_binaries/tpc-ds/{linux-arm64/query_templates/query36.tpl → templates/query_variants/query36a.tpl}

@@ -33,7 +33,7 @@
 -- Contributors:
 -- 
  define YEAR=random(1998,2002,uniform);
- define STATENUMBER=ulist(random(1, rowcount("active_states", "store"), uniform),8);
+ define STATENUMBER=list(random(1, rowcount("active_states", "store"), uniform),8);
  define STATE_A=distmember(fips_county,[STATENUMBER.1], 3);
  define STATE_B=distmember(fips_county,[STATENUMBER.2], 3);
  define STATE_C=distmember(fips_county,[STATENUMBER.3], 3);
@@ -44,15 +44,13 @@
  define STATE_H=distmember(fips_county,[STATENUMBER.8], 3);
  define _LIMIT=100;
  
- [_LIMITA] select [_LIMITB] 
+ with results as
+ (select 
+    sum(ss_net_profit) as ss_net_profit, sum(ss_ext_sales_price) as ss_ext_sales_price,
     sum(ss_net_profit)/sum(ss_ext_sales_price) as gross_margin
    ,i_category
    ,i_class
-   ,grouping(i_category)+grouping(i_class) as lochierarchy
-   ,rank() over (
- 	partition by grouping(i_category)+grouping(i_class),
- 	case when grouping(i_class) = 0 then i_category end 
- 	order by sum(ss_net_profit)/sum(ss_ext_sales_price) asc) as rank_within_parent
+   ,0 as g_category, 0 as g_class
  from
     store_sales
    ,date_dim       d1
@@ -60,12 +58,26 @@
    ,store
  where
     d1.d_year = [YEAR] 
- and d1.d_date_sk = ss_sold_date_sk
- and i_item_sk  = ss_item_sk 
- and s_store_sk  = ss_store_sk
- and s_state in ('[STATE_A]','[STATE_B]','[STATE_C]','[STATE_D]',
+    and d1.d_date_sk = ss_sold_date_sk
+    and i_item_sk  = ss_item_sk 
+    and s_store_sk  = ss_store_sk
+    and s_state in ('[STATE_A]','[STATE_B]','[STATE_C]','[STATE_D]',
                  '[STATE_E]','[STATE_F]','[STATE_G]','[STATE_H]')
- group by rollup(i_category,i_class)
+ group by i_category,i_class)
+ ,
+ results_rollup as
+ (select gross_margin ,i_category ,i_class,0 as t_category, 0 as t_class, 0 as lochierarchy from results
+ union
+ select sum(ss_net_profit)/sum(ss_ext_sales_price) as gross_margin,
+   i_category, NULL AS i_class, 0 as t_category, 1 as t_class, 1 as lochierarchy from results group by i_category
+ union
+ select sum(ss_net_profit)/sum(ss_ext_sales_price) as gross_margin,
+   NULL AS i_category ,NULL AS i_class, 1 as t_category, 1 as t_class, 2 as lochierarchy from results)
+ [_LIMITA] select [_LIMITB]
+  gross_margin ,i_category ,i_class, lochierarchy,rank() over (
+ 	partition by lochierarchy, case when t_class = 0 then i_category end 
+ 	order by gross_margin asc) as rank_within_parent
+ from results_rollup
  order by
    lochierarchy desc
   ,case when lochierarchy = 0 then i_category end

benchbox/_binaries/tpc-ds/{linux-arm64/query_templates/query51.tpl → templates/query_variants/query51a.tpl}

@@ -32,49 +32,66 @@
 -- 
 -- Contributors:
 -- 
-
 define DMS = random(1176,1224,uniform);
 define _LIMIT=100;
 
-WITH web_v1 as (
+WITH web_tv as (
 select
-  ws_item_sk item_sk, d_date,
-  sum(sum(ws_sales_price))
-      over (partition by ws_item_sk order by d_date rows between unbounded preceding and current row) cume_sales
+  ws_item_sk item_sk, d_date, sum(ws_sales_price) sumws,
+  row_number()
+      over (partition by ws_item_sk order by d_date) rk
 from web_sales
     ,date_dim
 where ws_sold_date_sk=d_date_sk
   and d_month_seq between [DMS] and [DMS]+11
   and ws_item_sk is not NULL
-group by ws_item_sk, d_date),
-store_v1 as (
+group by ws_item_sk, d_date
+),
+web_v1 as (
+select v1.item_sk, v1.d_date, v1.sumws, sum(v2.sumws) cume_sales
+from web_tv v1, web_tv v2
+where v1.item_sk = v2.item_sk and v1.rk >= v2.rk
+group by v1.item_sk, v1.d_date, v1.sumws
+),
+store_tv as (
 select
-  ss_item_sk item_sk, d_date,
-  sum(sum(ss_sales_price))
-      over (partition by ss_item_sk order by d_date rows between unbounded preceding and current row) cume_sales
+  ss_item_sk item_sk, d_date, sum(ss_sales_price) sumss,
+  row_number()
+      over (partition by ss_item_sk order by d_date) rk
 from store_sales
     ,date_dim
 where ss_sold_date_sk=d_date_sk
   and d_month_seq between [DMS] and [DMS]+11
   and ss_item_sk is not NULL
-group by ss_item_sk, d_date)
-[_LIMITA] select [_LIMITB] *
-from (select item_sk
+group by ss_item_sk, d_date
+),
+store_v1 as (
+select v1.item_sk, v1.d_date, v1.sumss, sum(v2.sumss) cume_sales
+from store_tv v1, store_tv v2
+where v1.item_sk = v2.item_sk and v1.rk >= v2.rk
+group by v1.item_sk, v1.d_date, v1.sumss
+),
+v as (
+select item_sk
      ,d_date
      ,web_sales
      ,store_sales
-     ,max(web_sales)
-         over (partition by item_sk order by d_date rows between unbounded preceding and current row) web_cumulative
-     ,max(store_sales)
-         over (partition by item_sk order by d_date rows between unbounded preceding and current row) store_cumulative
+     ,row_number() over (partition by item_sk order by d_date) rk
      from (select case when web.item_sk is not null then web.item_sk else store.item_sk end item_sk
                  ,case when web.d_date is not null then web.d_date else store.d_date end d_date
                  ,web.cume_sales web_sales
                  ,store.cume_sales store_sales
            from web_v1 web full outer join store_v1 store on (web.item_sk = store.item_sk
                                                           and web.d_date = store.d_date)
-          )x )y
+          )
+)
+[_LIMITA] select [_LIMITB] *
+from(
+        select v1.item_sk, v1.d_date, v1.web_sales, v1.store_sales, max(v2.web_sales) web_cumulative, max(v2.store_sales) store_cumulative
+        from v v1, v v2
+        where v1.item_sk = v2.item_sk and v1.rk >= v2.rk
+        group by v1.item_sk, v1.d_date, v1.web_sales, v1.store_sales
+)x
 where web_cumulative > store_cumulative
-order by item_sk
-        ,d_date
+order by item_sk, d_date
 [_LIMITC];

benchbox/_binaries/tpc-ds/{linux-arm64/query_templates/query5.tpl → templates/query_variants/query5a.tpl}

@@ -63,7 +63,7 @@
      store
  where date_sk = d_date_sk
        and d_date between cast('[SALES_DATE]' as date) 
-                  and (cast('[SALES_DATE]' as date) +  14 days)
+                  and (cast('[SALES_DATE]' as date) +  14 )
        and store_sk = s_store_sk
  group by s_store_id)
  ,
@@ -94,7 +94,7 @@
      catalog_page
  where date_sk = d_date_sk
        and d_date between cast('[SALES_DATE]' as date)
-                  and (cast('[SALES_DATE]' as date) +  14 days)
+                  and (cast('[SALES_DATE]' as date) +  14 )
        and page_sk = cp_catalog_page_sk
  group by cp_catalog_page_id)
  ,
@@ -127,10 +127,12 @@
      web_site
  where date_sk = d_date_sk
        and d_date between cast('[SALES_DATE]' as date)
-                  and (cast('[SALES_DATE]' as date) +  14 days)
+                  and (cast('[SALES_DATE]' as date) +  14 )
        and wsr_web_site_sk = web_site_sk
  group by web_site_id)
- [_LIMITA] select [_LIMITB] channel
+ ,
+ results as
+ (select channel
         , id
         , sum(sales) as sales
         , sum(returns) as returns
@@ -157,9 +159,12 @@
         , (profit - profit_loss) as profit
  from   wsr
  ) x
- group by rollup (channel, id)
- order by channel
-         ,id
- [_LIMITC];
- 
-
+ group by channel, id)
+[_LIMITA] select [_LIMITB] channel, id, sales, returns, profit from ( 
+  select channel, id, sales, returns, profit from results
+  union
+  select channel, null as id, sum(sales), sum(returns), sum(profit) from results group by channel
+  union
+  select null as channel, null as id, sum(sales), sum(returns), sum(profit) from results) foo
+order by channel, id
+[_LIMITC];