fix data_add()

Signed-off-by: Lantao Jin <[email protected]>

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

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

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

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

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 = [

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

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
       ]