Numerics in beetween (#8004)

Author: resetius

ydb/library/benchmarks/queries/tpcds/pg/q13.sql

@@ -16,37 +16,37 @@ select avg(ss_quantity) avg_ss_q
   and cd_demo_sk = ss_cdemo_sk
   and cd_marital_status = 'U'
   and cd_education_status = 'Secondary'
-  and ss_sales_price between 100.00 and 150.00
+  and ss_sales_price between 100.00::numeric and 150.00::numeric
   and hd_dep_count = 3
      )or
      (ss_hdemo_sk=hd_demo_sk
   and cd_demo_sk = ss_cdemo_sk
   and cd_marital_status = 'W'
   and cd_education_status = 'College'
-  and ss_sales_price between 50.00 and 100.00
+  and ss_sales_price between 50.00::numeric and 100.00::numeric
   and hd_dep_count = 1
      ) or
      (ss_hdemo_sk=hd_demo_sk
   and cd_demo_sk = ss_cdemo_sk
   and cd_marital_status = 'D'
   and cd_education_status = 'Primary'
-  and ss_sales_price between 150.00 and 200.00
+  and ss_sales_price between 150.00::numeric and 200.00::numeric
   and hd_dep_count = 1
      ))
  and((ss_addr_sk = ca_address_sk
   and ca_country = 'United States'
   and ca_state in ('TX', 'OK', 'MI')
-  and ss_net_profit between 100 and 200
+  and ss_net_profit between 100::numeric and 200::numeric
      ) or
      (ss_addr_sk = ca_address_sk
   and ca_country = 'United States'
   and ca_state in ('WA', 'NC', 'OH')
-  and ss_net_profit between 150 and 300
+  and ss_net_profit between 150::numeric and 300::numeric
      ) or
      (ss_addr_sk = ca_address_sk
   and ca_country = 'United States'
   and ca_state in ('MT', 'FL', 'GA')
-  and ss_net_profit between 50 and 250
+  and ss_net_profit between 50::numeric and 250::numeric
      ))
 ;
 

ydb/library/benchmarks/queries/tpcds/pg/q21.sql

@@ -13,7 +13,7 @@ select  *
        ,{{warehouse}}
        ,{{item}}
        ,{{date_dim}}
-   where i_current_price between 0.99 and 1.49
+   where i_current_price between 0.99::numeric and 1.49::numeric
      and i_item_sk          = inv_item_sk
      and inv_warehouse_sk   = w_warehouse_sk
      and inv_date_sk    = d_date_sk
@@ -23,7 +23,7 @@ select  *
  where (case when inv_before > 0
              then inv_after / inv_before
              else null
-             end) between (2.0/3.0) and (3.0/2.0)
+             end) between (2.0/3.0)::numeric and (3.0/2.0)::numeric
  order by w_warehouse_name
          ,i_item_id
  limit 100;

ydb/library/benchmarks/queries/tpcds/pg/q28.sql

@@ -6,49 +6,49 @@ from (select avg(ss_list_price) B1_LP
             ,count(distinct ss_list_price) B1_CNTD
       from {{store_sales}}
       where ss_quantity between 0 and 5
-        and (ss_list_price between 73 and (73+10)
-             or ss_coupon_amt between 7826 and (7826+1000)
-             or ss_wholesale_cost between 70 and (70+20))) B1,
+        and (ss_list_price between 73::numeric and (73+10)::numeric
+             or ss_coupon_amt between 7826::numeric and (7826+1000)::numeric
+             or ss_wholesale_cost between 70::numeric and (70+20)::numeric)) B1,
      (select avg(ss_list_price) B2_LP
             ,count(ss_list_price) B2_CNT
             ,count(distinct ss_list_price) B2_CNTD
       from {{store_sales}}
       where ss_quantity between 6 and 10
-        and (ss_list_price between 152 and (152+10)
-          or ss_coupon_amt between 2196 and (2196+1000)
-          or ss_wholesale_cost between 56 and (56+20))) B2,
+        and (ss_list_price between 152::numeric and (152+10)::numeric
+          or ss_coupon_amt between 2196::numeric and (2196+1000)::numeric
+          or ss_wholesale_cost between 56::numeric and (56+20)::numeric)) B2,
      (select avg(ss_list_price) B3_LP
             ,count(ss_list_price) B3_CNT
             ,count(distinct ss_list_price) B3_CNTD
       from {{store_sales}}
       where ss_quantity between 11 and 15
-        and (ss_list_price between 53 and (53+10)
-          or ss_coupon_amt between 3430 and (3430+1000)
-          or ss_wholesale_cost between 13 and (13+20))) B3,
+        and (ss_list_price between 53::numeric and (53+10)::numeric
+          or ss_coupon_amt between 3430::numeric and (3430+1000)::numeric
+          or ss_wholesale_cost between 13::numeric and (13+20)::numeric)) B3,
      (select avg(ss_list_price) B4_LP
             ,count(ss_list_price) B4_CNT
             ,count(distinct ss_list_price) B4_CNTD
       from {{store_sales}}
       where ss_quantity between 16 and 20
-        and (ss_list_price between 186 and (186+10)
-          or ss_coupon_amt between 3262 and (3262+1000)
-          or ss_wholesale_cost between 20 and (20+20))) B4,
+        and (ss_list_price between 186::numeric and (186+10)::numeric
+          or ss_coupon_amt between 3262::numeric and (3262+1000)::numeric
+          or ss_wholesale_cost between 20::numeric and (20+20)::numeric)) B4,
      (select avg(ss_list_price) B5_LP
             ,count(ss_list_price) B5_CNT
             ,count(distinct ss_list_price) B5_CNTD
       from {{store_sales}}
       where ss_quantity between 21 and 25
-        and (ss_list_price between 85 and (85+10)
-          or ss_coupon_amt between 3310 and (3310+1000)
-          or ss_wholesale_cost between 37 and (37+20))) B5,
+        and (ss_list_price between 85::numeric and (85+10)::numeric
+          or ss_coupon_amt between 3310::numeric and (3310+1000)::numeric
+          or ss_wholesale_cost between 37::numeric and (37+20)::numeric)) B5,
      (select avg(ss_list_price) B6_LP
             ,count(ss_list_price) B6_CNT
             ,count(distinct ss_list_price) B6_CNTD
       from {{store_sales}}
       where ss_quantity between 26 and 30
-        and (ss_list_price between 180 and (180+10)
-          or ss_coupon_amt between 12592 and (12592+1000)
-          or ss_wholesale_cost between 22 and (22+20))) B6
+        and (ss_list_price between 180::numeric and (180+10)::numeric
+          or ss_coupon_amt between 12592::numeric and (12592+1000)::numeric
+          or ss_wholesale_cost between 22::numeric and (22+20)::numeric)) B6
 limit 100;
 
 -- end query 1 in stream 0 using template ../query_templates/query28.tpl

ydb/library/benchmarks/queries/tpcds/pg/q37.sql

@@ -4,7 +4,7 @@ select  i_item_id
        ,i_item_desc
        ,i_current_price
  from {{item}}, {{inventory}}, {{date_dim}}, {{catalog_sales}}
- where i_current_price between 39 and (39 + 30)
+ where i_current_price between 39::numeric and (39 + 30)::numeric
  and inv_item_sk = i_item_sk
  and d_date_sk=inv_date_sk
  and d_date between cast('2001-01-16' as date) and (cast('2001-01-16' as date) + interval '60' day)::date

ydb/library/benchmarks/queries/tpcds/pg/q40.sql

@@ -15,7 +15,7 @@ select
   ,{{item}}
   ,{{date_dim}}
  where
-     i_current_price between 0.99 and 1.49
+     i_current_price between 0.99::numeric and 1.49::numeric
  and i_item_sk          = cs_item_sk
  and cs_warehouse_sk    = w_warehouse_sk
  and cs_sold_date_sk    = d_date_sk

ydb/library/benchmarks/queries/tpcds/pg/q48.sql

@@ -13,7 +13,7 @@ select sum (ss_quantity)
    and
    cd_education_status = 'Unknown'
    and
-   ss_sales_price between 100.00 and 150.00
+   ss_sales_price between 100.00::numeric and 150.00::numeric
    )
  or
   (
@@ -23,7 +23,7 @@ select sum (ss_quantity)
    and
    cd_education_status = 'College'
    and
-   ss_sales_price between 50.00 and 100.00
+   ss_sales_price between 50.00::numeric and 100.00::numeric
   )
  or
  (
@@ -33,7 +33,7 @@ select sum (ss_quantity)
    and
    cd_education_status = 'Primary'
    and
-   ss_sales_price between 150.00 and 200.00
+   ss_sales_price between 150.00::numeric and 200.00::numeric
  )
  )
  and
@@ -44,23 +44,23 @@ select sum (ss_quantity)
   ca_country = 'United States'
   and
   ca_state in ('MI', 'GA', 'NH')
-  and ss_net_profit between 0 and 2000
+  and ss_net_profit between 0::numeric and 2000::numeric
   )
  or
   (ss_addr_sk = ca_address_sk
   and
   ca_country = 'United States'
   and
   ca_state in ('TX', 'KY', 'SD')
-  and ss_net_profit between 150 and 3000
+  and ss_net_profit between 150::numeric and 3000::numeric
   )
  or
   (ss_addr_sk = ca_address_sk
   and
   ca_country = 'United States'
   and
   ca_state in ('NY', 'OH', 'FL')
-  and ss_net_profit between 50 and 25000
+  and ss_net_profit between 50::numeric and 25000::numeric
   )
  )
 ;

ydb/library/benchmarks/queries/tpcds/pg/q58.sql

@@ -53,12 +53,12 @@ with ss_items as
  from ss_items,cs_items,ws_items
  where ss_items.item_id=cs_items.item_id
    and ss_items.item_id=ws_items.item_id
-   and ss_item_rev between 0.9 * cs_item_rev and 1.1 * cs_item_rev
-   and ss_item_rev between 0.9 * ws_item_rev and 1.1 * ws_item_rev
-   and cs_item_rev between 0.9 * ss_item_rev and 1.1 * ss_item_rev
-   and cs_item_rev between 0.9 * ws_item_rev and 1.1 * ws_item_rev
-   and ws_item_rev between 0.9 * ss_item_rev and 1.1 * ss_item_rev
-   and ws_item_rev between 0.9 * cs_item_rev and 1.1 * cs_item_rev
+   and ss_item_rev between 0.9::numeric * cs_item_rev and 1.1::numeric * cs_item_rev
+   and ss_item_rev between 0.9::numeric * ws_item_rev and 1.1::numeric * ws_item_rev
+   and cs_item_rev between 0.9::numeric * ss_item_rev and 1.1::numeric * ss_item_rev
+   and cs_item_rev between 0.9::numeric * ws_item_rev and 1.1::numeric * ws_item_rev
+   and ws_item_rev between 0.9::numeric * ss_item_rev and 1.1::numeric * ss_item_rev
+   and ws_item_rev between 0.9::numeric * cs_item_rev and 1.1::numeric * cs_item_rev
  order by item_id
          ,ss_item_rev
  limit 100;

ydb/library/benchmarks/queries/tpcds/pg/q64.sql

@@ -67,8 +67,8 @@ cross_sales as
          hd2.hd_income_band_sk = ib2.ib_income_band_sk and
          cd1.cd_marital_status <> cd2.cd_marital_status and
          i_color in ('azure','gainsboro','misty','blush','hot','lemon') and
-         i_current_price between 80 and (80 + 10) and
-         i_current_price between (80 + 1) and (80 + 15)
+         i_current_price between 80::numeric and (80 + 10)::numeric and
+         i_current_price between (80 + 1)::numeric and (80 + 15)::numeric
 group by i_product_name
        ,i_item_sk
        ,s_store_name

ydb/library/benchmarks/queries/tpcds/pg/q82.sql

@@ -4,7 +4,7 @@ select  i_item_id
        ,i_item_desc
        ,i_current_price
  from {{item}}, {{inventory}}, {{date_dim}}, {{store_sales}}
- where i_current_price between 49 and (49+30)
+ where i_current_price between 49::numeric and (49+30)::numeric
  and inv_item_sk = i_item_sk
  and d_date_sk=inv_date_sk
  and d_date between cast('2001-01-28' as date) and (cast('2001-01-28' as date) + interval '60' day)::date

ydb/library/benchmarks/queries/tpcds/pg/q85.sql

@@ -25,7 +25,7 @@ select  substr(r_reason_desc,1,20) reason
      and
      cd1.cd_education_status = cd2.cd_education_status
      and
-     ws_sales_price between 100.00 and 150.00
+     ws_sales_price between 100.00::numeric and 150.00::numeric
     )
    or
     (
@@ -37,7 +37,7 @@ select  substr(r_reason_desc,1,20) reason
      and
      cd1.cd_education_status = cd2.cd_education_status
      and
-     ws_sales_price between 50.00 and 100.00
+     ws_sales_price between 50.00::numeric and 100.00::numeric
     )
    or
     (
@@ -49,7 +49,7 @@ select  substr(r_reason_desc,1,20) reason
      and
      cd1.cd_education_status = cd2.cd_education_status
      and
-     ws_sales_price between 150.00 and 200.00
+     ws_sales_price between 150.00::numeric and 200.00::numeric
     )
    )
    and
@@ -58,21 +58,21 @@ select  substr(r_reason_desc,1,20) reason
      ca_country = 'United States'
      and
      ca_state in ('TX', 'VA', 'CA')
-     and ws_net_profit between 100 and 200
+     and ws_net_profit between 100::numeric and 200::numeric
     )
     or
     (
      ca_country = 'United States'
      and
      ca_state in ('AR', 'NE', 'MO')
-     and ws_net_profit between 150 and 300
+     and ws_net_profit between 150::numeric and 300::numeric
     )
     or
     (
      ca_country = 'United States'
      and
      ca_state in ('IA', 'MS', 'WA')
-     and ws_net_profit between 50 and 250
+     and ws_net_profit between 50::numeric and 250::numeric
     )
    )
 group by r_reason_desc