From 5007321997a48c68017f375c3343df6a446d251d Mon Sep 17 00:00:00 2001 From: Lantao Jin Date: Thu, 31 Oct 2024 18:33:45 +0800 Subject: [PATCH] fix data_add() Signed-off-by: Lantao Jin --- .../src/integration/resources/tpch/q1.ppl | 32 ++++---- .../src/integration/resources/tpch/q10.ppl | 54 ++++++------- .../src/integration/resources/tpch/q11.ppl | 44 +++++------ .../src/integration/resources/tpch/q12.ppl | 48 ++++++------ .../src/integration/resources/tpch/q13.ppl | 32 ++++---- .../src/integration/resources/tpch/q14.ppl | 22 +++--- .../src/integration/resources/tpch/q15.ppl | 54 ++++++------- .../src/integration/resources/tpch/q16.ppl | 50 ++++++------ .../src/integration/resources/tpch/q17.ppl | 28 +++---- .../src/integration/resources/tpch/q18.ppl | 54 ++++++------- .../src/integration/resources/tpch/q19.ppl | 76 +++++++++--------- .../src/integration/resources/tpch/q2.ppl | 78 +++++++++---------- .../src/integration/resources/tpch/q20.ppl | 68 ++++++++-------- .../src/integration/resources/tpch/q21.ppl | 72 ++++++++--------- .../src/integration/resources/tpch/q22.ppl | 68 ++++++++-------- .../src/integration/resources/tpch/q3.ppl | 34 ++++---- .../src/integration/resources/tpch/q4.ppl | 34 ++++---- .../src/integration/resources/tpch/q5.ppl | 40 +++++----- .../src/integration/resources/tpch/q6.ppl | 12 +-- .../src/integration/resources/tpch/q7.ppl | 70 ++++++++--------- .../src/integration/resources/tpch/q8.ppl | 66 ++++++++-------- .../src/integration/resources/tpch/q9.ppl | 56 ++++++------- 22 files changed, 546 insertions(+), 546 deletions(-) diff --git a/integ-test/src/integration/resources/tpch/q1.ppl b/integ-test/src/integration/resources/tpch/q1.ppl index 654e26d0f..885ce35c6 100644 --- a/integ-test/src/integration/resources/tpch/q1.ppl +++ b/integ-test/src/integration/resources/tpch/q1.ppl @@ -1,25 +1,25 @@ /* select - l_returnflag, - l_linestatus, - sum(l_quantity) as sum_qty, - sum(l_extendedprice) as sum_base_price, - sum(l_extendedprice * (1 - l_discount)) as sum_disc_price, - sum(l_extendedprice * (1 - l_discount) * (1 + l_tax)) as sum_charge, - avg(l_quantity) as avg_qty, - avg(l_extendedprice) as avg_price, - avg(l_discount) as avg_disc, - count(*) as count_order + l_returnflag, + l_linestatus, + sum(l_quantity) as sum_qty, + sum(l_extendedprice) as sum_base_price, + sum(l_extendedprice * (1 - l_discount)) as sum_disc_price, + sum(l_extendedprice * (1 - l_discount) * (1 + l_tax)) as sum_charge, + avg(l_quantity) as avg_qty, + avg(l_extendedprice) as avg_price, + avg(l_discount) as avg_disc, + count(*) as count_order from - lineitem + lineitem where - l_shipdate <= date '1998-12-01' - interval '90' day + l_shipdate <= date '1998-12-01' - interval '90' day group by - l_returnflag, - l_linestatus + l_returnflag, + l_linestatus order by - l_returnflag, - l_linestatus + l_returnflag, + l_linestatus */ source = lineitem diff --git a/integ-test/src/integration/resources/tpch/q10.ppl b/integ-test/src/integration/resources/tpch/q10.ppl index 502e31c49..a07618727 100644 --- a/integ-test/src/integration/resources/tpch/q10.ppl +++ b/integ-test/src/integration/resources/tpch/q10.ppl @@ -1,35 +1,35 @@ /* select - c_custkey, - c_name, - sum(l_extendedprice * (1 - l_discount)) as revenue, - c_acctbal, - n_name, - c_address, - c_phone, - c_comment + c_custkey, + c_name, + sum(l_extendedprice * (1 - l_discount)) as revenue, + c_acctbal, + n_name, + c_address, + c_phone, + c_comment from - customer, - orders, - lineitem, - nation + customer, + orders, + lineitem, + nation where - c_custkey = o_custkey - and l_orderkey = o_orderkey - and o_orderdate >= date '1993-10-01' - and o_orderdate < date '1993-10-01' + interval '3' month - and l_returnflag = 'R' - and c_nationkey = n_nationkey + c_custkey = o_custkey + and l_orderkey = o_orderkey + and o_orderdate >= date '1993-10-01' + and o_orderdate < date '1993-10-01' + interval '3' month + and l_returnflag = 'R' + and c_nationkey = n_nationkey group by - c_custkey, - c_name, - c_acctbal, - c_phone, - n_name, - c_address, - c_comment + c_custkey, + c_name, + c_acctbal, + c_phone, + n_name, + c_address, + c_comment order by - revenue desc + revenue desc limit 20 */ @@ -38,7 +38,7 @@ source = customer | join left = l right = r ON l_orderkey = o_orderkey lineitem | join left = l right = r ON c_nationkey = n_nationkey nation | where o_orderdate >= date('1993-10-01') - AND o_orderdate < adddate(date('1993-10-01'), 90) // change to dateadd + AND o_orderdate < date_add(date('1993-10-01'), interval 3 month) AND l_returnflag = 'R' | stats sum(l_extendedprice * (1 - l_discount)) as revenue by c_custkey, c_name, c_acctbal, c_phone, n_name, c_address, c_comment | sort - revenue diff --git a/integ-test/src/integration/resources/tpch/q11.ppl b/integ-test/src/integration/resources/tpch/q11.ppl index 5f7bddd74..db31f137c 100644 --- a/integ-test/src/integration/resources/tpch/q11.ppl +++ b/integ-test/src/integration/resources/tpch/q11.ppl @@ -1,31 +1,31 @@ /* select - ps_partkey, - sum(ps_supplycost * ps_availqty) as value + ps_partkey, + sum(ps_supplycost * ps_availqty) as value from - partsupp, - supplier, - nation + partsupp, + supplier, + nation where - ps_suppkey = s_suppkey - and s_nationkey = n_nationkey - and n_name = 'GERMANY' + ps_suppkey = s_suppkey + and s_nationkey = n_nationkey + and n_name = 'GERMANY' group by - ps_partkey having - sum(ps_supplycost * ps_availqty) > ( - select - sum(ps_supplycost * ps_availqty) * 0.0001000000 - from - partsupp, - supplier, - nation - where - ps_suppkey = s_suppkey - and s_nationkey = n_nationkey - and n_name = 'GERMANY' - ) + ps_partkey having + sum(ps_supplycost * ps_availqty) > ( + select + sum(ps_supplycost * ps_availqty) * 0.0001000000 + from + partsupp, + supplier, + nation + where + ps_suppkey = s_suppkey + and s_nationkey = n_nationkey + and n_name = 'GERMANY' + ) order by - value desc + value desc */ source = partsupp diff --git a/integ-test/src/integration/resources/tpch/q12.ppl b/integ-test/src/integration/resources/tpch/q12.ppl index 28d2f10f6..cdb56c210 100644 --- a/integ-test/src/integration/resources/tpch/q12.ppl +++ b/integ-test/src/integration/resources/tpch/q12.ppl @@ -1,32 +1,32 @@ /* select - l_shipmode, - sum(case - when o_orderpriority = '1-URGENT' - or o_orderpriority = '2-HIGH' - then 1 - else 0 - end) as high_line_count, - sum(case - when o_orderpriority <> '1-URGENT' - and o_orderpriority <> '2-HIGH' - then 1 - else 0 - end) as low_line_count + l_shipmode, + sum(case + when o_orderpriority = '1-URGENT' + or o_orderpriority = '2-HIGH' + then 1 + else 0 + end) as high_line_count, + sum(case + when o_orderpriority <> '1-URGENT' + and o_orderpriority <> '2-HIGH' + then 1 + else 0 + end) as low_line_count from - orders, - lineitem + orders, + lineitem where - o_orderkey = l_orderkey - and l_shipmode in ('MAIL', 'SHIP') - and l_commitdate < l_receiptdate - and l_shipdate < l_commitdate - and l_receiptdate >= date '1994-01-01' - and l_receiptdate < date '1994-01-01' + interval '1' year + o_orderkey = l_orderkey + and l_shipmode in ('MAIL', 'SHIP') + and l_commitdate < l_receiptdate + and l_shipdate < l_commitdate + and l_receiptdate >= date '1994-01-01' + and l_receiptdate < date '1994-01-01' + interval '1' year group by - l_shipmode + l_shipmode order by - l_shipmode + l_shipmode */ source = orders @@ -35,7 +35,7 @@ source = orders and l_shipdate < l_commitdate and l_shipmode in ('MAIL', 'SHIP') and l_receiptdate >= date('1994-01-01') - and l_receiptdate < adddate(date('1994-01-01'), 365) // change to dateadd + and l_receiptdate < date_add(date('1994-01-01'), interval 1 year) | stats sum(case(o_orderpriority = '1-URGENT' or o_orderpriority = '2-HIGH', 1 else 0)) as high_line_count, sum(case(o_orderpriority != '1-URGENT' and o_orderpriority != '2-HIGH', 1 else 0)) as low_line_countby by l_shipmode diff --git a/integ-test/src/integration/resources/tpch/q13.ppl b/integ-test/src/integration/resources/tpch/q13.ppl index 1cfec6b8b..59439e843 100644 --- a/integ-test/src/integration/resources/tpch/q13.ppl +++ b/integ-test/src/integration/resources/tpch/q13.ppl @@ -1,24 +1,24 @@ /* select - c_count, - count(*) as custdist + c_count, + count(*) as custdist from - ( - select - c_custkey, - count(o_orderkey) as c_count - from - customer left outer join orders on - c_custkey = o_custkey - and o_comment not like '%special%requests%' - group by - c_custkey - ) as c_orders + ( + select + c_custkey, + count(o_orderkey) as c_count + from + customer left outer join orders on + c_custkey = o_custkey + and o_comment not like '%special%requests%' + group by + c_custkey + ) as c_orders group by - c_count + c_count order by - custdist desc, - c_count desc + custdist desc, + c_count desc */ source = [ diff --git a/integ-test/src/integration/resources/tpch/q14.ppl b/integ-test/src/integration/resources/tpch/q14.ppl index 3c027c2d1..e2b37e818 100644 --- a/integ-test/src/integration/resources/tpch/q14.ppl +++ b/integ-test/src/integration/resources/tpch/q14.ppl @@ -1,23 +1,23 @@ /* select - 100.00 * sum(case - when p_type like 'PROMO%' - then l_extendedprice * (1 - l_discount) - else 0 - end) / sum(l_extendedprice * (1 - l_discount)) as promo_revenue + 100.00 * sum(case + when p_type like 'PROMO%' + then l_extendedprice * (1 - l_discount) + else 0 + end) / sum(l_extendedprice * (1 - l_discount)) as promo_revenue from - lineitem, - part + lineitem, + part where - l_partkey = p_partkey - and l_shipdate >= date '1995-09-01' - and l_shipdate < date '1995-09-01' + interval '1' month + l_partkey = p_partkey + and l_shipdate >= date '1995-09-01' + and l_shipdate < date '1995-09-01' + interval '1' month */ source = lineitem | join left = l right = r ON l_partkey = p_partkey AND l_shipdate >= date('1995-09-01') - AND l_shipdate < adddate(date('1995-09-01'), 30) // change to dateadd + AND l_shipdate < date_add(date('1995-09-01'), interval 1 month) part | stats sum(case(like(p_type, 'PROMO%'), l_extendedprice * (1 - l_discount) else 0)) as sum1, sum(l_extendedprice * (1 - l_discount)) as sum2 diff --git a/integ-test/src/integration/resources/tpch/q15.ppl b/integ-test/src/integration/resources/tpch/q15.ppl index 2405327ff..201199095 100644 --- a/integ-test/src/integration/resources/tpch/q15.ppl +++ b/integ-test/src/integration/resources/tpch/q15.ppl @@ -1,48 +1,48 @@ /* with revenue0 as - (select - l_suppkey as supplier_no, - sum(l_extendedprice * (1 - l_discount)) as total_revenue - from - lineitem - where - l_shipdate >= date '1996-01-01' - and l_shipdate < date '1996-01-01' + interval '3' month - group by - l_suppkey) + (select + l_suppkey as supplier_no, + sum(l_extendedprice * (1 - l_discount)) as total_revenue + from + lineitem + where + l_shipdate >= date '1996-01-01' + and l_shipdate < date '1996-01-01' + interval '3' month + group by + l_suppkey) select - s_suppkey, - s_name, - s_address, - s_phone, - total_revenue + s_suppkey, + s_name, + s_address, + s_phone, + total_revenue from - supplier, - revenue0 + supplier, + revenue0 where - s_suppkey = supplier_no - and total_revenue = ( - select - max(total_revenue) - from - revenue0 - ) + s_suppkey = supplier_no + and total_revenue = ( + select + max(total_revenue) + from + revenue0 + ) order by - s_suppkey + s_suppkey */ // CTE is unsupported in PPL source = supplier | join left = l right = revenue0 ON s_suppkey = supplier_no [ source = lineitem - | where l_shipdate >= date('1996-01-01') AND l_shipdate < adddate(date('1996-01-01'), 90) // change to dateadd + | where l_shipdate >= date('1996-01-01') AND l_shipdate < date_add(date('1996-01-01'), interval 3 month) | eval supplier_no = l_suppkey | stats sum(l_extendedprice * (1 - l_discount)) as total_revenue by supplier_no ] | where total_revenue = [ source = [ source = lineitem - | where l_shipdate >= date('1996-01-01') AND l_shipdate < adddate(date('1996-01-01'), 90) // change to dateadd + | where l_shipdate >= date('1996-01-01') AND l_shipdate < date_add(date('1996-01-01'), interval 3 month) | eval supplier_no = l_suppkey | stats sum(l_extendedprice * (1 - l_discount)) as total_revenue by supplier_no ] diff --git a/integ-test/src/integration/resources/tpch/q16.ppl b/integ-test/src/integration/resources/tpch/q16.ppl index 24e35fab8..0607bb79f 100644 --- a/integ-test/src/integration/resources/tpch/q16.ppl +++ b/integ-test/src/integration/resources/tpch/q16.ppl @@ -1,34 +1,34 @@ /* select - p_brand, - p_type, - p_size, - count(distinct ps_suppkey) as supplier_cnt + p_brand, + p_type, + p_size, + count(distinct ps_suppkey) as supplier_cnt from - partsupp, - part + partsupp, + part where - p_partkey = ps_partkey - and p_brand <> 'Brand#45' - and p_type not like 'MEDIUM POLISHED%' - and p_size in (49, 14, 23, 45, 19, 3, 36, 9) - and ps_suppkey not in ( - select - s_suppkey - from - supplier - where - s_comment like '%Customer%Complaints%' - ) + p_partkey = ps_partkey + and p_brand <> 'Brand#45' + and p_type not like 'MEDIUM POLISHED%' + and p_size in (49, 14, 23, 45, 19, 3, 36, 9) + and ps_suppkey not in ( + select + s_suppkey + from + supplier + where + s_comment like '%Customer%Complaints%' + ) group by - p_brand, - p_type, - p_size + p_brand, + p_type, + p_size order by - supplier_cnt desc, - p_brand, - p_type, - p_size + supplier_cnt desc, + p_brand, + p_type, + p_size */ source = partsupp diff --git a/integ-test/src/integration/resources/tpch/q17.ppl b/integ-test/src/integration/resources/tpch/q17.ppl index b8bfb55c1..fa7d63ca0 100644 --- a/integ-test/src/integration/resources/tpch/q17.ppl +++ b/integ-test/src/integration/resources/tpch/q17.ppl @@ -1,21 +1,21 @@ /* select - sum(l_extendedprice) / 7.0 as avg_yearly + sum(l_extendedprice) / 7.0 as avg_yearly from - lineitem, - part + lineitem, + part where - p_partkey = l_partkey - and p_brand = 'Brand#23' - and p_container = 'MED BOX' - and l_quantity < ( - select - 0.2 * avg(l_quantity) - from - lineitem - where - l_partkey = p_partkey - ) + p_partkey = l_partkey + and p_brand = 'Brand#23' + and p_container = 'MED BOX' + and l_quantity < ( + select + 0.2 * avg(l_quantity) + from + lineitem + where + l_partkey = p_partkey + ) */ source = lineitem diff --git a/integ-test/src/integration/resources/tpch/q18.ppl b/integ-test/src/integration/resources/tpch/q18.ppl index 64f156e44..9d540ee85 100644 --- a/integ-test/src/integration/resources/tpch/q18.ppl +++ b/integ-test/src/integration/resources/tpch/q18.ppl @@ -1,36 +1,36 @@ /* select - c_name, - c_custkey, - o_orderkey, - o_orderdate, - o_totalprice, - sum(l_quantity) + c_name, + c_custkey, + o_orderkey, + o_orderdate, + o_totalprice, + sum(l_quantity) from - customer, - orders, - lineitem + customer, + orders, + lineitem where - o_orderkey in ( - select - l_orderkey - from - lineitem - group by - l_orderkey having - sum(l_quantity) > 300 - ) - and c_custkey = o_custkey - and o_orderkey = l_orderkey + o_orderkey in ( + select + l_orderkey + from + lineitem + group by + l_orderkey having + sum(l_quantity) > 300 + ) + and c_custkey = o_custkey + and o_orderkey = l_orderkey group by - c_name, - c_custkey, - o_orderkey, - o_orderdate, - o_totalprice + c_name, + c_custkey, + o_orderkey, + o_orderdate, + o_totalprice order by - o_totalprice desc, - o_orderdate + o_totalprice desc, + o_orderdate limit 100 */ diff --git a/integ-test/src/integration/resources/tpch/q19.ppl b/integ-test/src/integration/resources/tpch/q19.ppl index 4cd3a12f0..97c1804cb 100644 --- a/integ-test/src/integration/resources/tpch/q19.ppl +++ b/integ-test/src/integration/resources/tpch/q19.ppl @@ -1,51 +1,51 @@ /* select - sum(l_extendedprice* (1 - l_discount)) as revenue + sum(l_extendedprice* (1 - l_discount)) as revenue from - lineitem, - part + lineitem, + part where - ( - p_partkey = l_partkey - and p_brand = 'Brand#12' - and p_container in ('SM CASE', 'SM BOX', 'SM PACK', 'SM PKG') - and l_quantity >= 1 and l_quantity <= 1 + 10 - and p_size between 1 and 5 - and l_shipmode in ('AIR', 'AIR REG') - and l_shipinstruct = 'DELIVER IN PERSON' - ) - or - ( - p_partkey = l_partkey - and p_brand = 'Brand#23' - and p_container in ('MED BAG', 'MED BOX', 'MED PKG', 'MED PACK') - and l_quantity >= 10 and l_quantity <= 10 + 10 - and p_size between 1 and 10 - and l_shipmode in ('AIR', 'AIR REG') - and l_shipinstruct = 'DELIVER IN PERSON' - ) - or - ( - p_partkey = l_partkey - and p_brand = 'Brand#34' - and p_container in ('LG CASE', 'LG BOX', 'LG PACK', 'LG PKG') - and l_quantity >= 20 and l_quantity <= 20 + 10 - and p_size between 1 and 15 - and l_shipmode in ('AIR', 'AIR REG') - and l_shipinstruct = 'DELIVER IN PERSON' - ) + ( + p_partkey = l_partkey + and p_brand = 'Brand#12' + and p_container in ('SM CASE', 'SM BOX', 'SM PACK', 'SM PKG') + and l_quantity >= 1 and l_quantity <= 1 + 10 + and p_size between 1 and 5 + and l_shipmode in ('AIR', 'AIR REG') + and l_shipinstruct = 'DELIVER IN PERSON' + ) + or + ( + p_partkey = l_partkey + and p_brand = 'Brand#23' + and p_container in ('MED BAG', 'MED BOX', 'MED PKG', 'MED PACK') + and l_quantity >= 10 and l_quantity <= 10 + 10 + and p_size between 1 and 10 + and l_shipmode in ('AIR', 'AIR REG') + and l_shipinstruct = 'DELIVER IN PERSON' + ) + or + ( + p_partkey = l_partkey + and p_brand = 'Brand#34' + and p_container in ('LG CASE', 'LG BOX', 'LG PACK', 'LG PKG') + and l_quantity >= 20 and l_quantity <= 20 + 10 + and p_size between 1 and 15 + and l_shipmode in ('AIR', 'AIR REG') + and l_shipinstruct = 'DELIVER IN PERSON' + ) */ source = lineitem | join left = l right = r ON p_partkey = l_partkey and p_brand = 'Brand#12' - and p_container in ('SM CASE', 'SM BOX', 'SM PACK', 'SM PKG') - and l_quantity >= 1 and l_quantity <= 1 + 10 - and p_size between 1 and 5 - and l_shipmode in ('AIR', 'AIR REG') - and l_shipinstruct = 'DELIVER IN PERSON' - OR p_partkey = l_partkey + and p_container in ('SM CASE', 'SM BOX', 'SM PACK', 'SM PKG') + and l_quantity >= 1 and l_quantity <= 1 + 10 + and p_size between 1 and 5 + and l_shipmode in ('AIR', 'AIR REG') + and l_shipinstruct = 'DELIVER IN PERSON' + OR p_partkey = l_partkey and p_brand = 'Brand#23' and p_container in ('MED BAG', 'MED BOX', 'MED PKG', 'MED PACK') and l_quantity >= 10 and l_quantity <= 10 + 10 diff --git a/integ-test/src/integration/resources/tpch/q2.ppl b/integ-test/src/integration/resources/tpch/q2.ppl index f69a98dd1..51c5f8e43 100644 --- a/integ-test/src/integration/resources/tpch/q2.ppl +++ b/integ-test/src/integration/resources/tpch/q2.ppl @@ -1,47 +1,47 @@ /* select - s_acctbal, - s_name, - n_name, - p_partkey, - p_mfgr, - s_address, - s_phone, - s_comment + s_acctbal, + s_name, + n_name, + p_partkey, + p_mfgr, + s_address, + s_phone, + s_comment from - part, - supplier, - partsupp, - nation, - region + part, + supplier, + partsupp, + nation, + region where - p_partkey = ps_partkey - and s_suppkey = ps_suppkey - and p_size = 15 - and p_type like '%BRASS' - and s_nationkey = n_nationkey - and n_regionkey = r_regionkey - and r_name = 'EUROPE' - and ps_supplycost = ( - select - min(ps_supplycost) - from - partsupp, - supplier, - nation, - region - where - p_partkey = ps_partkey - and s_suppkey = ps_suppkey - and s_nationkey = n_nationkey - and n_regionkey = r_regionkey - and r_name = 'EUROPE' - ) + p_partkey = ps_partkey + and s_suppkey = ps_suppkey + and p_size = 15 + and p_type like '%BRASS' + and s_nationkey = n_nationkey + and n_regionkey = r_regionkey + and r_name = 'EUROPE' + and ps_supplycost = ( + select + min(ps_supplycost) + from + partsupp, + supplier, + nation, + region + where + p_partkey = ps_partkey + and s_suppkey = ps_suppkey + and s_nationkey = n_nationkey + and n_regionkey = r_regionkey + and r_name = 'EUROPE' + ) order by - s_acctbal desc, - n_name, - s_name, - p_partkey + s_acctbal desc, + n_name, + s_name, + p_partkey limit 100 */ diff --git a/integ-test/src/integration/resources/tpch/q20.ppl b/integ-test/src/integration/resources/tpch/q20.ppl index 3ff20a22b..6456d44e0 100644 --- a/integ-test/src/integration/resources/tpch/q20.ppl +++ b/integ-test/src/integration/resources/tpch/q20.ppl @@ -1,41 +1,41 @@ /* select - s_name, - s_address + s_name, + s_address from - supplier, - nation + supplier, + nation where - s_suppkey in ( - select - ps_suppkey - from - partsupp - where - ps_partkey in ( - select - p_partkey - from - part - where - p_name like 'forest%' - ) - and ps_availqty > ( - select - 0.5 * sum(l_quantity) - from - lineitem - where - l_partkey = ps_partkey - and l_suppkey = ps_suppkey - and l_shipdate >= date '1994-01-01' - and l_shipdate < date '1994-01-01' + interval '1' year - ) - ) - and s_nationkey = n_nationkey - and n_name = 'CANADA' + s_suppkey in ( + select + ps_suppkey + from + partsupp + where + ps_partkey in ( + select + p_partkey + from + part + where + p_name like 'forest%' + ) + and ps_availqty > ( + select + 0.5 * sum(l_quantity) + from + lineitem + where + l_partkey = ps_partkey + and l_suppkey = ps_suppkey + and l_shipdate >= date '1994-01-01' + and l_shipdate < date '1994-01-01' + interval '1' year + ) + ) + and s_nationkey = n_nationkey + and n_name = 'CANADA' order by - s_name + s_name */ source = supplier @@ -53,7 +53,7 @@ source = supplier | where l_partkey = ps_partkey and l_suppkey = ps_suppkey and l_shipdate >= date('1994-01-01') - and l_shipdate < adddate(date('1994-01-01'), 365) // change to dateadd + and l_shipdate < date_add(date('1994-01-01'), interval 1 year) | stats sum(l_quantity) as sum_l_quantity | eval half_sum_l_quantity = 0.5 * sum_l_quantity // Stats and Eval commands can combine when issues/819 resolved | fields half_sum_l_quantity diff --git a/integ-test/src/integration/resources/tpch/q21.ppl b/integ-test/src/integration/resources/tpch/q21.ppl index fb2a2df9d..439903a37 100644 --- a/integ-test/src/integration/resources/tpch/q21.ppl +++ b/integ-test/src/integration/resources/tpch/q21.ppl @@ -1,48 +1,48 @@ /* select - s_name, - count(*) as numwait + s_name, + count(*) as numwait from - supplier, - lineitem l1, - orders, - nation + supplier, + lineitem l1, + orders, + nation where - s_suppkey = l1.l_suppkey - and o_orderkey = l1.l_orderkey - and o_orderstatus = 'F' - and l1.l_receiptdate > l1.l_commitdate - and exists ( - select - * - from - lineitem l2 - where - l2.l_orderkey = l1.l_orderkey - and l2.l_suppkey <> l1.l_suppkey - ) - and not exists ( - select - * - from - lineitem l3 - where - l3.l_orderkey = l1.l_orderkey - and l3.l_suppkey <> l1.l_suppkey - and l3.l_receiptdate > l3.l_commitdate - ) - and s_nationkey = n_nationkey - and n_name = 'SAUDI ARABIA' + s_suppkey = l1.l_suppkey + and o_orderkey = l1.l_orderkey + and o_orderstatus = 'F' + and l1.l_receiptdate > l1.l_commitdate + and exists ( + select + * + from + lineitem l2 + where + l2.l_orderkey = l1.l_orderkey + and l2.l_suppkey <> l1.l_suppkey + ) + and not exists ( + select + * + from + lineitem l3 + where + l3.l_orderkey = l1.l_orderkey + and l3.l_suppkey <> l1.l_suppkey + and l3.l_receiptdate > l3.l_commitdate + ) + and s_nationkey = n_nationkey + and n_name = 'SAUDI ARABIA' group by - s_name + s_name order by - numwait desc, - s_name + numwait desc, + s_name limit 100 */ -source = lineitem as l1 -| join left = l right = r ON s_suppkey = l_suppkey supplier +source = supplier +| join left = l right = l1 ON s_suppkey = l_suppkey lineitem | join left = l right = r ON o_orderkey = l_orderkey orders | join left = l right = r ON s_nationkey = n_nationkey nation | where o_orderstatus = 'F' diff --git a/integ-test/src/integration/resources/tpch/q22.ppl b/integ-test/src/integration/resources/tpch/q22.ppl index 22500709c..811308cb0 100644 --- a/integ-test/src/integration/resources/tpch/q22.ppl +++ b/integ-test/src/integration/resources/tpch/q22.ppl @@ -1,45 +1,45 @@ /* select - cntrycode, - count(*) as numcust, - sum(c_acctbal) as totacctbal + cntrycode, + count(*) as numcust, + sum(c_acctbal) as totacctbal from - ( - select - substring(c_phone, 1, 2) as cntrycode, - c_acctbal - from - customer - where - substring(c_phone, 1, 2) in - ('13', '31', '23', '29', '30', '18', '17') - and c_acctbal > ( - select - avg(c_acctbal) - from - customer - where - c_acctbal > 0.00 - and substring(c_phone, 1, 2) in - ('13', '31', '23', '29', '30', '18', '17') - ) - and not exists ( - select - * - from - orders - where - o_custkey = c_custkey - ) - ) as custsale + ( + select + substring(c_phone, 1, 2) as cntrycode, + c_acctbal + from + customer + where + substring(c_phone, 1, 2) in + ('13', '31', '23', '29', '30', '18', '17') + and c_acctbal > ( + select + avg(c_acctbal) + from + customer + where + c_acctbal > 0.00 + and substring(c_phone, 1, 2) in + ('13', '31', '23', '29', '30', '18', '17') + ) + and not exists ( + select + * + from + orders + where + o_custkey = c_custkey + ) + ) as custsale group by - cntrycode + cntrycode order by - cntrycode + cntrycode */ source = [ - source = customer + source = customer | where substring(c_phone, 1, 2) in ('13', '31', '23', '29', '30', '18', '17') and c_acctbal > [ source = customer diff --git a/integ-test/src/integration/resources/tpch/q3.ppl b/integ-test/src/integration/resources/tpch/q3.ppl index 30ce23ea7..18e5902ea 100644 --- a/integ-test/src/integration/resources/tpch/q3.ppl +++ b/integ-test/src/integration/resources/tpch/q3.ppl @@ -1,26 +1,26 @@ /* select - l_orderkey, - sum(l_extendedprice * (1 - l_discount)) as revenue, - o_orderdate, - o_shippriority + l_orderkey, + sum(l_extendedprice * (1 - l_discount)) as revenue, + o_orderdate, + o_shippriority from - customer, - orders, - lineitem + customer, + orders, + lineitem where - c_mktsegment = 'BUILDING' - and c_custkey = o_custkey - and l_orderkey = o_orderkey - and o_orderdate < date '1995-03-15' - and l_shipdate > date '1995-03-15' + c_mktsegment = 'BUILDING' + and c_custkey = o_custkey + and l_orderkey = o_orderkey + and o_orderdate < date '1995-03-15' + and l_shipdate > date '1995-03-15' group by - l_orderkey, - o_orderdate, - o_shippriority + l_orderkey, + o_orderdate, + o_shippriority order by - revenue desc, - o_orderdate + revenue desc, + o_orderdate limit 10 */ diff --git a/integ-test/src/integration/resources/tpch/q4.ppl b/integ-test/src/integration/resources/tpch/q4.ppl index 128e88837..cc01bda7d 100644 --- a/integ-test/src/integration/resources/tpch/q4.ppl +++ b/integ-test/src/integration/resources/tpch/q4.ppl @@ -1,30 +1,30 @@ /* select - o_orderpriority, - count(*) as order_count + o_orderpriority, + count(*) as order_count from - orders + orders where - o_orderdate >= date '1993-07-01' - and o_orderdate < date '1993-07-01' + interval '3' month - and exists ( - select - * - from - lineitem - where - l_orderkey = o_orderkey - and l_commitdate < l_receiptdate - ) + o_orderdate >= date '1993-07-01' + and o_orderdate < date '1993-07-01' + interval '3' month + and exists ( + select + * + from + lineitem + where + l_orderkey = o_orderkey + and l_commitdate < l_receiptdate + ) group by - o_orderpriority + o_orderpriority order by - o_orderpriority + o_orderpriority */ source = orders | where o_orderdate >= date('1993-07-01') - and o_orderdate < adddate(date('1993-07-01'), 90) // change to dateadd + and o_orderdate < date_add(date('1993-07-01'), interval 3 month) and exists [ source = lineitem | where l_orderkey = o_orderkey and l_commitdate < l_receiptdate diff --git a/integ-test/src/integration/resources/tpch/q5.ppl b/integ-test/src/integration/resources/tpch/q5.ppl index 1877d068b..110012613 100644 --- a/integ-test/src/integration/resources/tpch/q5.ppl +++ b/integ-test/src/integration/resources/tpch/q5.ppl @@ -1,28 +1,28 @@ /* select - n_name, - sum(l_extendedprice * (1 - l_discount)) as revenue + n_name, + sum(l_extendedprice * (1 - l_discount)) as revenue from - customer, - orders, - lineitem, - supplier, - nation, - region + customer, + orders, + lineitem, + supplier, + nation, + region where - c_custkey = o_custkey - and l_orderkey = o_orderkey - and l_suppkey = s_suppkey - and c_nationkey = s_nationkey - and s_nationkey = n_nationkey - and n_regionkey = r_regionkey - and r_name = 'ASIA' - and o_orderdate >= date '1994-01-01' - and o_orderdate < date '1994-01-01' + interval '1' year + c_custkey = o_custkey + and l_orderkey = o_orderkey + and l_suppkey = s_suppkey + and c_nationkey = s_nationkey + and s_nationkey = n_nationkey + and n_regionkey = r_regionkey + and r_name = 'ASIA' + and o_orderdate >= date '1994-01-01' + and o_orderdate < date '1994-01-01' + interval '1' year group by - n_name + n_name order by - revenue desc + revenue desc */ source = customer @@ -31,6 +31,6 @@ source = customer | join left = l right = r ON l_suppkey = s_suppkey AND c_nationkey = s_nationkey supplier | join left = l right = r ON s_nationkey = n_nationkey nation | join left = l right = r ON n_regionkey = r_regionkey region -| where r_name = 'ASIA' AND o_orderdate >= date('1994-01-01') AND o_orderdate < adddate(date('1994-01-01'), 365) // change to dateadd +| where r_name = 'ASIA' AND o_orderdate >= date('1994-01-01') AND o_orderdate < date_add(date('1994-01-01'), interval 1 year) | stats sum(l_extendedprice * (1 - l_discount)) as revenue by n_name | sort - revenue \ No newline at end of file diff --git a/integ-test/src/integration/resources/tpch/q6.ppl b/integ-test/src/integration/resources/tpch/q6.ppl index 1c542f060..6a77877c3 100644 --- a/integ-test/src/integration/resources/tpch/q6.ppl +++ b/integ-test/src/integration/resources/tpch/q6.ppl @@ -1,13 +1,13 @@ /* select - sum(l_extendedprice * l_discount) as revenue + sum(l_extendedprice * l_discount) as revenue from - lineitem + lineitem where - l_shipdate >= date '1994-01-01' - and l_shipdate < date '1994-01-01' + interval '1' year - and l_discount between .06 - 0.01 and .06 + 0.01 - and l_quantity < 24 + l_shipdate >= date '1994-01-01' + and l_shipdate < date '1994-01-01' + interval '1' year + and l_discount between .06 - 0.01 and .06 + 0.01 + and l_quantity < 24 */ source = lineitem diff --git a/integ-test/src/integration/resources/tpch/q7.ppl b/integ-test/src/integration/resources/tpch/q7.ppl index 165f6ee5d..8d92d5145 100644 --- a/integ-test/src/integration/resources/tpch/q7.ppl +++ b/integ-test/src/integration/resources/tpch/q7.ppl @@ -1,43 +1,43 @@ /* select - supp_nation, - cust_nation, - l_year, - sum(volume) as revenue + supp_nation, + cust_nation, + l_year, + sum(volume) as revenue from - ( - select - n1.n_name as supp_nation, - n2.n_name as cust_nation, - year(l_shipdate) as l_year, - l_extendedprice * (1 - l_discount) as volume - from - supplier, - lineitem, - orders, - customer, - nation n1, - nation n2 - where - s_suppkey = l_suppkey - and o_orderkey = l_orderkey - and c_custkey = o_custkey - and s_nationkey = n1.n_nationkey - and c_nationkey = n2.n_nationkey - and ( - (n1.n_name = 'FRANCE' and n2.n_name = 'GERMANY') - or (n1.n_name = 'GERMANY' and n2.n_name = 'FRANCE') - ) - and l_shipdate between date '1995-01-01' and date '1996-12-31' - ) as shipping + ( + select + n1.n_name as supp_nation, + n2.n_name as cust_nation, + year(l_shipdate) as l_year, + l_extendedprice * (1 - l_discount) as volume + from + supplier, + lineitem, + orders, + customer, + nation n1, + nation n2 + where + s_suppkey = l_suppkey + and o_orderkey = l_orderkey + and c_custkey = o_custkey + and s_nationkey = n1.n_nationkey + and c_nationkey = n2.n_nationkey + and ( + (n1.n_name = 'FRANCE' and n2.n_name = 'GERMANY') + or (n1.n_name = 'GERMANY' and n2.n_name = 'FRANCE') + ) + and l_shipdate between date '1995-01-01' and date '1996-12-31' + ) as shipping group by - supp_nation, - cust_nation, - l_year + supp_nation, + cust_nation, + l_year order by - supp_nation, - cust_nation, - l_year + supp_nation, + cust_nation, + l_year */ source = [ diff --git a/integ-test/src/integration/resources/tpch/q8.ppl b/integ-test/src/integration/resources/tpch/q8.ppl index adeae3281..d2cd84ece 100644 --- a/integ-test/src/integration/resources/tpch/q8.ppl +++ b/integ-test/src/integration/resources/tpch/q8.ppl @@ -1,41 +1,41 @@ /* select - o_year, - sum(case - when nation = 'BRAZIL' then volume - else 0 - end) / sum(volume) as mkt_share + o_year, + sum(case + when nation = 'BRAZIL' then volume + else 0 + end) / sum(volume) as mkt_share from - ( - select - year(o_orderdate) as o_year, - l_extendedprice * (1 - l_discount) as volume, - n2.n_name as nation - from - part, - supplier, - lineitem, - orders, - customer, - nation n1, - nation n2, - region - where - p_partkey = l_partkey - and s_suppkey = l_suppkey - and l_orderkey = o_orderkey - and o_custkey = c_custkey - and c_nationkey = n1.n_nationkey - and n1.n_regionkey = r_regionkey - and r_name = 'AMERICA' - and s_nationkey = n2.n_nationkey - and o_orderdate between date '1995-01-01' and date '1996-12-31' - and p_type = 'ECONOMY ANODIZED STEEL' - ) as all_nations + ( + select + year(o_orderdate) as o_year, + l_extendedprice * (1 - l_discount) as volume, + n2.n_name as nation + from + part, + supplier, + lineitem, + orders, + customer, + nation n1, + nation n2, + region + where + p_partkey = l_partkey + and s_suppkey = l_suppkey + and l_orderkey = o_orderkey + and o_custkey = c_custkey + and c_nationkey = n1.n_nationkey + and n1.n_regionkey = r_regionkey + and r_name = 'AMERICA' + and s_nationkey = n2.n_nationkey + and o_orderdate between date '1995-01-01' and date '1996-12-31' + and p_type = 'ECONOMY ANODIZED STEEL' + ) as all_nations group by - o_year + o_year order by - o_year + o_year */ source = [ diff --git a/integ-test/src/integration/resources/tpch/q9.ppl b/integ-test/src/integration/resources/tpch/q9.ppl index 3218a66a2..e3be2e3c3 100644 --- a/integ-test/src/integration/resources/tpch/q9.ppl +++ b/integ-test/src/integration/resources/tpch/q9.ppl @@ -1,36 +1,36 @@ /* select - nation, - o_year, - sum(amount) as sum_profit + nation, + o_year, + sum(amount) as sum_profit from - ( - select - n_name as nation, - year(o_orderdate) as o_year, - l_extendedprice * (1 - l_discount) - ps_supplycost * l_quantity as amount - from - part, - supplier, - lineitem, - partsupp, - orders, - nation - where - s_suppkey = l_suppkey - and ps_suppkey = l_suppkey - and ps_partkey = l_partkey - and p_partkey = l_partkey - and o_orderkey = l_orderkey - and s_nationkey = n_nationkey - and p_name like '%green%' - ) as profit + ( + select + n_name as nation, + year(o_orderdate) as o_year, + l_extendedprice * (1 - l_discount) - ps_supplycost * l_quantity as amount + from + part, + supplier, + lineitem, + partsupp, + orders, + nation + where + s_suppkey = l_suppkey + and ps_suppkey = l_suppkey + and ps_partkey = l_partkey + and p_partkey = l_partkey + and o_orderkey = l_orderkey + and s_nationkey = n_nationkey + and p_name like '%green%' + ) as profit group by - nation, - o_year + nation, + o_year order by - nation, - o_year desc + nation, + o_year desc */ source = [