http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1596/query-ASTERIXDB-1596.1.ddl.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1596/query-ASTERIXDB-1596.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1596/query-ASTERIXDB-1596.1.ddl.sqlpp index 7c75aec..04b10cc 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1596/query-ASTERIXDB-1596.1.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1596/query-ASTERIXDB-1596.1.ddl.sqlpp @@ -23,25 +23,25 @@ create dataverse tpcds; use tpcds; create type tpcds.catalog_sales_type as closed { - cs_sold_date_sk: int64?, - cs_sold_time_sk: int64?, - cs_ship_date_sk: int64?, - cs_bill_customer_sk: int64?, - cs_bill_cdemo_sk: int64?, - cs_bill_hdemo_sk: int64?, - cs_bill_addr_sk: int64?, - cs_ship_customer_sk: int64?, - cs_ship_cdemo_sk: int64?, - cs_ship_hdemo_sk: int64?, - cs_ship_addr_sk: int64?, - cs_call_center_sk: int64?, - cs_catalog_page_sk: int64?, - cs_ship_mode_sk: int64?, - cs_warehouse_sk: int64?, - cs_item_sk: int64, - cs_promo_sk: int64?, - cs_order_number: int64, - cs_quantity: int64?, + cs_sold_date_sk: bigint?, + cs_sold_time_sk: bigint?, + cs_ship_date_sk: bigint?, + cs_bill_customer_sk: bigint?, + cs_bill_cdemo_sk: bigint?, + cs_bill_hdemo_sk: bigint?, + cs_bill_addr_sk: bigint?, + cs_ship_customer_sk: bigint?, + cs_ship_cdemo_sk: bigint?, + cs_ship_hdemo_sk: bigint?, + cs_ship_addr_sk: bigint?, + cs_call_center_sk: bigint?, + cs_catalog_page_sk: bigint?, + cs_ship_mode_sk: bigint?, + cs_warehouse_sk: bigint?, + cs_item_sk: bigint, + cs_promo_sk: bigint?, + cs_order_number: bigint, + cs_quantity: bigint?, cs_wholesale_cost: double?, cs_list_price: double?, cs_sales_price: double?, @@ -60,24 +60,24 @@ create type tpcds.catalog_sales_type as closed { } create type tpcds.catalog_returns_type as closed { - cr_returned_date_sk: int64?, - cr_returned_time_sk: int64?, - cr_item_sk: int64, - cr_refunded_customer_sk: int64?, - cr_refunded_cdemo_sk: int64?, - cr_refunded_hdemo_sk: int64?, - cr_refunded_addr_sk: int64?, - cr_returning_customer_sk: int64?, - cr_returning_cdemo_sk: int64?, - cr_returning_hdemo_sk: int64?, - cr_returning_addr_sk: int64?, - cr_call_center_sk: int64?, - cr_catalog_page_sk: int64?, - cr_ship_mode_sk: int64?, - cr_warehouse_sk: int64?, - cr_reason_sk: int64?, - cr_order_number: int64, - cr_return_quantity: int64?, + cr_returned_date_sk: bigint?, + cr_returned_time_sk: bigint?, + cr_item_sk: bigint, + cr_refunded_customer_sk: bigint?, + cr_refunded_cdemo_sk: bigint?, + cr_refunded_hdemo_sk: bigint?, + cr_refunded_addr_sk: bigint?, + cr_returning_customer_sk: bigint?, + cr_returning_cdemo_sk: bigint?, + cr_returning_hdemo_sk: bigint?, + cr_returning_addr_sk: bigint?, + cr_call_center_sk: bigint?, + cr_catalog_page_sk: bigint?, + cr_ship_mode_sk: bigint?, + cr_warehouse_sk: bigint?, + cr_reason_sk: bigint?, + cr_order_number: bigint, + cr_return_quantity: bigint?, cr_return_amount: double?, cr_return_tax: double?, cr_return_amt_inc_tax: double?, @@ -90,27 +90,27 @@ create type tpcds.catalog_returns_type as closed { } create type tpcds.item_type as closed { - i_item_sk: int64, + i_item_sk: bigint, i_item_id: string, i_rec_start_date: string?, i_rec_end_date: string?, i_item_desc: string?, i_current_price: double?, i_wholesale_cost: double?, - i_brand_id: int64? , + i_brand_id: bigint? , i_brand: string?, - i_class_id: int64? , + i_class_id: bigint? , i_class: string?, - i_category_id: int64? , + i_category_id: bigint? , i_category: string?, - i_manufact_id: int64? , + i_manufact_id: bigint? , i_manufact: string?, i_size: string?, i_formulation: string?, i_color: string?, i_units: string?, i_container: string?, - i_manager_id: int64?, + i_manager_id: bigint?, i_product_name: string? }
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1602/query-ASTERIXDB-1602.1.ddl.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1602/query-ASTERIXDB-1602.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1602/query-ASTERIXDB-1602.1.ddl.sqlpp index 94814ce..63808f7 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1602/query-ASTERIXDB-1602.1.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1602/query-ASTERIXDB-1602.1.ddl.sqlpp @@ -23,29 +23,29 @@ create dataverse tpcds; use tpcds; create type tpcds.date_dim_type as closed { - d_date_sk: int64, + d_date_sk: bigint, d_date_id: string, d_date: string? , - d_month_seq: int64?, - d_week_seq: int64?, - d_quarter_seq: int64?, - d_year: int64?, - d_dow: int64?, - d_moy: int64?, - d_dom: int64?, - d_qoy: int64?, - d_fy_year: int64?, - d_fy_quarter_seq: int64?, - d_fy_week_seq: int64?, + d_month_seq: bigint?, + d_week_seq: bigint?, + d_quarter_seq: bigint?, + d_year: bigint?, + d_dow: bigint?, + d_moy: bigint?, + d_dom: bigint?, + d_qoy: bigint?, + d_fy_year: bigint?, + d_fy_quarter_seq: bigint?, + d_fy_week_seq: bigint?, d_day_name: string?, d_quarter_name: string?, d_holiday: string?, d_weekend: string?, d_following_holiday: string?, - d_first_dom: int64?, - d_last_dom: int64?, - d_same_day_ly: int64?, - d_same_day_lq: int64?, + d_first_dom: bigint?, + d_last_dom: bigint?, + d_same_day_ly: bigint?, + d_same_day_lq: bigint?, d_current_day: string?, d_current_week: string?, d_current_month: string?, @@ -54,27 +54,27 @@ create type tpcds.date_dim_type as closed { } create type tpcds.item_type as closed { - i_item_sk: int64, + i_item_sk: bigint, i_item_id: string, i_rec_start_date: string?, i_rec_end_date: string?, i_item_desc: string?, i_current_price: double?, i_wholesale_cost: double?, - i_brand_id: int64? , + i_brand_id: bigint? , i_brand: string?, - i_class_id: int64? , + i_class_id: bigint? , i_class: string?, - i_category_id: int64? , + i_category_id: bigint? , i_category: string?, - i_manufact_id: int64? , + i_manufact_id: bigint? , i_manufact: string?, i_size: string?, i_formulation: string?, i_color: string?, i_units: string?, i_container: string?, - i_manager_id: int64?, + i_manager_id: bigint?, i_product_name: string? } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1602/query-ASTERIXDB-1602.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1602/query-ASTERIXDB-1602.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1602/query-ASTERIXDB-1602.3.query.sqlpp index 95889bc..6e220cd 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1602/query-ASTERIXDB-1602.3.query.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpcds/query-ASTERIXDB-1602/query-ASTERIXDB-1602.3.query.sqlpp @@ -36,7 +36,7 @@ with tab as group by i_item_id ) -select coll_count(( +select array_count(( select * from tab t1, tab t2 )); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.1.ddl.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.1.ddl.sqlpp index af93de1..dce9f5e 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.1.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.1.ddl.sqlpp @@ -25,10 +25,10 @@ use tpch; create type tpch.LineItemType as closed { - l_orderkey : int64, - l_partkey : int64, - l_suppkey : int64, - l_linenumber : int64, + l_orderkey : bigint, + l_partkey : bigint, + l_suppkey : bigint, + l_linenumber : bigint, l_quantity : double, l_extendedprice : double, l_discount : double, http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.3.query.sqlpp index ae276b5..19b11b2 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.3.query.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.3.query.sqlpp @@ -22,25 +22,25 @@ use tpch; set `import-private-functions` `true`; -select element {'l_returnflag':l_returnflag,'l_linestatus':l_linestatus,'sum_qty':tpch.coll_sum(( +select element {'l_returnflag':l_returnflag,'l_linestatus':l_linestatus,'sum_qty':tpch.array_sum(( select element i.l_quantity from l as i - )),'sum_base_price':tpch.coll_sum(( + )),'sum_base_price':tpch.array_sum(( select element i.l_extendedprice from l as i - )),'sum_disc_price':tpch.coll_sum(( + )),'sum_disc_price':tpch.array_sum(( select element (i.l_extendedprice * (1 - i.l_discount)) from l as i - )),'sum_charge':tpch.coll_sum(( + )),'sum_charge':tpch.array_sum(( select element (i.l_extendedprice * (1 - i.l_discount) * (1 + i.l_tax)) from l as i - )),'ave_qty':tpch.coll_avg(( + )),'ave_qty':tpch.array_avg(( select element i.l_quantity from l as i - )),'ave_price':tpch.coll_avg(( + )),'ave_price':tpch.array_avg(( select element i.l_extendedprice from l as i - )),'ave_disc':tpch.coll_avg(( + )),'ave_disc':tpch.array_avg(( select element i.l_discount from l as i )),'count_order':tpch.count(l)} http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q02_minimum_cost_supplier/q02_minimum_cost_supplier.1.ddl.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q02_minimum_cost_supplier/q02_minimum_cost_supplier.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q02_minimum_cost_supplier/q02_minimum_cost_supplier.1.ddl.sqlpp index bf4e637..b055e7c 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q02_minimum_cost_supplier/q02_minimum_cost_supplier.1.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q02_minimum_cost_supplier/q02_minimum_cost_supplier.1.ddl.sqlpp @@ -25,11 +25,11 @@ use tpch; create type tpch.LineItemType as closed { - l_orderkey : int64, - l_partkey : int64, - l_suppkey : int64, - l_linenumber : int64, - l_quantity : int64, + l_orderkey : bigint, + l_partkey : bigint, + l_suppkey : bigint, + l_linenumber : bigint, + l_quantity : bigint, l_extendedprice : double, l_discount : double, l_tax : double, @@ -45,23 +45,23 @@ create type tpch.LineItemType as create type tpch.OrderType as closed { - o_orderkey : int64, - o_custkey : int64, + o_orderkey : bigint, + o_custkey : bigint, o_orderstatus : string, o_totalprice : double, o_orderdate : string, o_orderpriority : string, o_clerk : string, - o_shippriority : int64, + o_shippriority : bigint, o_comment : string } create type tpch.CustomerType as closed { - c_custkey : int64, + c_custkey : bigint, c_name : string, c_address : string, - c_nationkey : int64, + c_nationkey : bigint, c_phone : string, c_acctbal : double, c_mktsegment : string, @@ -70,10 +70,10 @@ create type tpch.CustomerType as create type tpch.SupplierType as closed { - s_suppkey : int64, + s_suppkey : bigint, s_name : string, s_address : string, - s_nationkey : int64, + s_nationkey : bigint, s_phone : string, s_acctbal : double, s_comment : string @@ -81,27 +81,27 @@ create type tpch.SupplierType as create type tpch.NationType as closed { - n_nationkey : int64, + n_nationkey : bigint, n_name : string, - n_regionkey : int64, + n_regionkey : bigint, n_comment : string } create type tpch.RegionType as closed { - r_regionkey : int64, + r_regionkey : bigint, r_name : string, r_comment : string } create type tpch.PartType as closed { - p_partkey : int64, + p_partkey : bigint, p_name : string, p_mfgr : string, p_brand : string, p_type : string, - p_size : int64, + p_size : bigint, p_container : string, p_retailprice : double, p_comment : string @@ -109,9 +109,9 @@ create type tpch.PartType as create type tpch.PartSuppType as closed { - ps_partkey : int64, - ps_suppkey : int64, - ps_availqty : int64, + ps_partkey : bigint, + ps_suppkey : bigint, + ps_availqty : bigint, ps_supplycost : double, ps_comment : string } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q02_minimum_cost_supplier/q02_minimum_cost_supplier.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q02_minimum_cost_supplier/q02_minimum_cost_supplier.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q02_minimum_cost_supplier/q02_minimum_cost_supplier.3.query.sqlpp index cbb55c4..de20af3 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q02_minimum_cost_supplier/q02_minimum_cost_supplier.3.query.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q02_minimum_cost_supplier/q02_minimum_cost_supplier.3.query.sqlpp @@ -45,7 +45,7 @@ declare function tmp1() { }; declare function tmp2() { ( - select element {'p_partkey':p_partkey,'ps_min_supplycost':tpch.coll_min(( + select element {'p_partkey':p_partkey,'ps_min_supplycost':tpch.array_min(( select element i.ps_supplycost from pssrn as i ))} http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q03_shipping_priority_nt/q03_shipping_priority_nt.1.ddl.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q03_shipping_priority_nt/q03_shipping_priority_nt.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q03_shipping_priority_nt/q03_shipping_priority_nt.1.ddl.sqlpp index bf4e637..b055e7c 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q03_shipping_priority_nt/q03_shipping_priority_nt.1.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q03_shipping_priority_nt/q03_shipping_priority_nt.1.ddl.sqlpp @@ -25,11 +25,11 @@ use tpch; create type tpch.LineItemType as closed { - l_orderkey : int64, - l_partkey : int64, - l_suppkey : int64, - l_linenumber : int64, - l_quantity : int64, + l_orderkey : bigint, + l_partkey : bigint, + l_suppkey : bigint, + l_linenumber : bigint, + l_quantity : bigint, l_extendedprice : double, l_discount : double, l_tax : double, @@ -45,23 +45,23 @@ create type tpch.LineItemType as create type tpch.OrderType as closed { - o_orderkey : int64, - o_custkey : int64, + o_orderkey : bigint, + o_custkey : bigint, o_orderstatus : string, o_totalprice : double, o_orderdate : string, o_orderpriority : string, o_clerk : string, - o_shippriority : int64, + o_shippriority : bigint, o_comment : string } create type tpch.CustomerType as closed { - c_custkey : int64, + c_custkey : bigint, c_name : string, c_address : string, - c_nationkey : int64, + c_nationkey : bigint, c_phone : string, c_acctbal : double, c_mktsegment : string, @@ -70,10 +70,10 @@ create type tpch.CustomerType as create type tpch.SupplierType as closed { - s_suppkey : int64, + s_suppkey : bigint, s_name : string, s_address : string, - s_nationkey : int64, + s_nationkey : bigint, s_phone : string, s_acctbal : double, s_comment : string @@ -81,27 +81,27 @@ create type tpch.SupplierType as create type tpch.NationType as closed { - n_nationkey : int64, + n_nationkey : bigint, n_name : string, - n_regionkey : int64, + n_regionkey : bigint, n_comment : string } create type tpch.RegionType as closed { - r_regionkey : int64, + r_regionkey : bigint, r_name : string, r_comment : string } create type tpch.PartType as closed { - p_partkey : int64, + p_partkey : bigint, p_name : string, p_mfgr : string, p_brand : string, p_type : string, - p_size : int64, + p_size : bigint, p_container : string, p_retailprice : double, p_comment : string @@ -109,9 +109,9 @@ create type tpch.PartType as create type tpch.PartSuppType as closed { - ps_partkey : int64, - ps_suppkey : int64, - ps_availqty : int64, + ps_partkey : bigint, + ps_suppkey : bigint, + ps_availqty : bigint, ps_supplycost : double, ps_comment : string } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q03_shipping_priority_nt/q03_shipping_priority_nt.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q03_shipping_priority_nt/q03_shipping_priority_nt.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q03_shipping_priority_nt/q03_shipping_priority_nt.3.query.sqlpp index bddbb53..5b9b5b0 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q03_shipping_priority_nt/q03_shipping_priority_nt.3.query.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q03_shipping_priority_nt/q03_shipping_priority_nt.3.query.sqlpp @@ -27,7 +27,7 @@ from Customer as c, where (((c.c_mktsegment = 'BUILDING') and (c.c_custkey = o.o_custkey)) and ((l.l_orderkey = o.o_orderkey) and (o.o_orderdate < '1995-03-15') and (l.l_shipdate > '1995-03-15'))) /* +hash */ group by l.l_orderkey as l_orderkey,o.o_orderdate as o_orderdate,o.o_shippriority as o_shippriority -with revenue as tpch.coll_sum(( +with revenue as tpch.array_sum(( select element (i.l_extendedprice * (1 - i.l_discount)) from l as i )) http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q04_order_priority/q04_order_priority.1.ddl.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q04_order_priority/q04_order_priority.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q04_order_priority/q04_order_priority.1.ddl.sqlpp index bf4e637..b055e7c 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q04_order_priority/q04_order_priority.1.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q04_order_priority/q04_order_priority.1.ddl.sqlpp @@ -25,11 +25,11 @@ use tpch; create type tpch.LineItemType as closed { - l_orderkey : int64, - l_partkey : int64, - l_suppkey : int64, - l_linenumber : int64, - l_quantity : int64, + l_orderkey : bigint, + l_partkey : bigint, + l_suppkey : bigint, + l_linenumber : bigint, + l_quantity : bigint, l_extendedprice : double, l_discount : double, l_tax : double, @@ -45,23 +45,23 @@ create type tpch.LineItemType as create type tpch.OrderType as closed { - o_orderkey : int64, - o_custkey : int64, + o_orderkey : bigint, + o_custkey : bigint, o_orderstatus : string, o_totalprice : double, o_orderdate : string, o_orderpriority : string, o_clerk : string, - o_shippriority : int64, + o_shippriority : bigint, o_comment : string } create type tpch.CustomerType as closed { - c_custkey : int64, + c_custkey : bigint, c_name : string, c_address : string, - c_nationkey : int64, + c_nationkey : bigint, c_phone : string, c_acctbal : double, c_mktsegment : string, @@ -70,10 +70,10 @@ create type tpch.CustomerType as create type tpch.SupplierType as closed { - s_suppkey : int64, + s_suppkey : bigint, s_name : string, s_address : string, - s_nationkey : int64, + s_nationkey : bigint, s_phone : string, s_acctbal : double, s_comment : string @@ -81,27 +81,27 @@ create type tpch.SupplierType as create type tpch.NationType as closed { - n_nationkey : int64, + n_nationkey : bigint, n_name : string, - n_regionkey : int64, + n_regionkey : bigint, n_comment : string } create type tpch.RegionType as closed { - r_regionkey : int64, + r_regionkey : bigint, r_name : string, r_comment : string } create type tpch.PartType as closed { - p_partkey : int64, + p_partkey : bigint, p_name : string, p_mfgr : string, p_brand : string, p_type : string, - p_size : int64, + p_size : bigint, p_container : string, p_retailprice : double, p_comment : string @@ -109,9 +109,9 @@ create type tpch.PartType as create type tpch.PartSuppType as closed { - ps_partkey : int64, - ps_suppkey : int64, - ps_availqty : int64, + ps_partkey : bigint, + ps_suppkey : bigint, + ps_availqty : bigint, ps_supplycost : double, ps_comment : string } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q04_order_priority/q04_order_priority.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q04_order_priority/q04_order_priority.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q04_order_priority/q04_order_priority.3.query.sqlpp index 5293499..8003a08 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q04_order_priority/q04_order_priority.3.query.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q04_order_priority/q04_order_priority.3.query.sqlpp @@ -27,7 +27,7 @@ declare function tmp() { where (l.l_commitdate < l.l_receiptdate) ) }; -select element {'order_priority':o_orderpriority,'count':COLL_COUNT(o)} +select element {'order_priority':o_orderpriority,'count':ARRAY_COUNT(o)} from Orders as o, tpch.tmp() as t where ((o.o_orderkey = t.o_orderkey) and (o.o_orderdate >= '1993-07-01') and (o.o_orderdate < '1993-10-01')) http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q05_local_supplier_volume/q05_local_supplier_volume.1.ddl.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q05_local_supplier_volume/q05_local_supplier_volume.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q05_local_supplier_volume/q05_local_supplier_volume.1.ddl.sqlpp index bf4e637..b055e7c 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q05_local_supplier_volume/q05_local_supplier_volume.1.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q05_local_supplier_volume/q05_local_supplier_volume.1.ddl.sqlpp @@ -25,11 +25,11 @@ use tpch; create type tpch.LineItemType as closed { - l_orderkey : int64, - l_partkey : int64, - l_suppkey : int64, - l_linenumber : int64, - l_quantity : int64, + l_orderkey : bigint, + l_partkey : bigint, + l_suppkey : bigint, + l_linenumber : bigint, + l_quantity : bigint, l_extendedprice : double, l_discount : double, l_tax : double, @@ -45,23 +45,23 @@ create type tpch.LineItemType as create type tpch.OrderType as closed { - o_orderkey : int64, - o_custkey : int64, + o_orderkey : bigint, + o_custkey : bigint, o_orderstatus : string, o_totalprice : double, o_orderdate : string, o_orderpriority : string, o_clerk : string, - o_shippriority : int64, + o_shippriority : bigint, o_comment : string } create type tpch.CustomerType as closed { - c_custkey : int64, + c_custkey : bigint, c_name : string, c_address : string, - c_nationkey : int64, + c_nationkey : bigint, c_phone : string, c_acctbal : double, c_mktsegment : string, @@ -70,10 +70,10 @@ create type tpch.CustomerType as create type tpch.SupplierType as closed { - s_suppkey : int64, + s_suppkey : bigint, s_name : string, s_address : string, - s_nationkey : int64, + s_nationkey : bigint, s_phone : string, s_acctbal : double, s_comment : string @@ -81,27 +81,27 @@ create type tpch.SupplierType as create type tpch.NationType as closed { - n_nationkey : int64, + n_nationkey : bigint, n_name : string, - n_regionkey : int64, + n_regionkey : bigint, n_comment : string } create type tpch.RegionType as closed { - r_regionkey : int64, + r_regionkey : bigint, r_name : string, r_comment : string } create type tpch.PartType as closed { - p_partkey : int64, + p_partkey : bigint, p_name : string, p_mfgr : string, p_brand : string, p_type : string, - p_size : int64, + p_size : bigint, p_container : string, p_retailprice : double, p_comment : string @@ -109,9 +109,9 @@ create type tpch.PartType as create type tpch.PartSuppType as closed { - ps_partkey : int64, - ps_suppkey : int64, - ps_availqty : int64, + ps_partkey : bigint, + ps_suppkey : bigint, + ps_availqty : bigint, ps_supplycost : double, ps_comment : string } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q05_local_supplier_volume/q05_local_supplier_volume.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q05_local_supplier_volume/q05_local_supplier_volume.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q05_local_supplier_volume/q05_local_supplier_volume.3.query.sqlpp index 9050001..91c8445 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q05_local_supplier_volume/q05_local_supplier_volume.3.query.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q05_local_supplier_volume/q05_local_supplier_volume.3.query.sqlpp @@ -46,7 +46,7 @@ from Customer as c, where ((c.c_nationkey = o1.s_nationkey) and (c.c_custkey = o1.o_custkey)) /* +hash */ group by o1.n_name as n_name -with revenue as tpch.coll_sum(( +with revenue as tpch.array_sum(( select element (i.l_extendedprice * (1 - i.l_discount)) from o1 as i )) http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q06_forecast_revenue_change/q06_forecast_revenue_change.1.ddl.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q06_forecast_revenue_change/q06_forecast_revenue_change.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q06_forecast_revenue_change/q06_forecast_revenue_change.1.ddl.sqlpp index bf4e637..b055e7c 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q06_forecast_revenue_change/q06_forecast_revenue_change.1.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q06_forecast_revenue_change/q06_forecast_revenue_change.1.ddl.sqlpp @@ -25,11 +25,11 @@ use tpch; create type tpch.LineItemType as closed { - l_orderkey : int64, - l_partkey : int64, - l_suppkey : int64, - l_linenumber : int64, - l_quantity : int64, + l_orderkey : bigint, + l_partkey : bigint, + l_suppkey : bigint, + l_linenumber : bigint, + l_quantity : bigint, l_extendedprice : double, l_discount : double, l_tax : double, @@ -45,23 +45,23 @@ create type tpch.LineItemType as create type tpch.OrderType as closed { - o_orderkey : int64, - o_custkey : int64, + o_orderkey : bigint, + o_custkey : bigint, o_orderstatus : string, o_totalprice : double, o_orderdate : string, o_orderpriority : string, o_clerk : string, - o_shippriority : int64, + o_shippriority : bigint, o_comment : string } create type tpch.CustomerType as closed { - c_custkey : int64, + c_custkey : bigint, c_name : string, c_address : string, - c_nationkey : int64, + c_nationkey : bigint, c_phone : string, c_acctbal : double, c_mktsegment : string, @@ -70,10 +70,10 @@ create type tpch.CustomerType as create type tpch.SupplierType as closed { - s_suppkey : int64, + s_suppkey : bigint, s_name : string, s_address : string, - s_nationkey : int64, + s_nationkey : bigint, s_phone : string, s_acctbal : double, s_comment : string @@ -81,27 +81,27 @@ create type tpch.SupplierType as create type tpch.NationType as closed { - n_nationkey : int64, + n_nationkey : bigint, n_name : string, - n_regionkey : int64, + n_regionkey : bigint, n_comment : string } create type tpch.RegionType as closed { - r_regionkey : int64, + r_regionkey : bigint, r_name : string, r_comment : string } create type tpch.PartType as closed { - p_partkey : int64, + p_partkey : bigint, p_name : string, p_mfgr : string, p_brand : string, p_type : string, - p_size : int64, + p_size : bigint, p_container : string, p_retailprice : double, p_comment : string @@ -109,9 +109,9 @@ create type tpch.PartType as create type tpch.PartSuppType as closed { - ps_partkey : int64, - ps_suppkey : int64, - ps_availqty : int64, + ps_partkey : bigint, + ps_suppkey : bigint, + ps_availqty : bigint, ps_supplycost : double, ps_comment : string } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q07_volume_shipping/q07_volume_shipping.1.ddl.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q07_volume_shipping/q07_volume_shipping.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q07_volume_shipping/q07_volume_shipping.1.ddl.sqlpp index bf4e637..b055e7c 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q07_volume_shipping/q07_volume_shipping.1.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q07_volume_shipping/q07_volume_shipping.1.ddl.sqlpp @@ -25,11 +25,11 @@ use tpch; create type tpch.LineItemType as closed { - l_orderkey : int64, - l_partkey : int64, - l_suppkey : int64, - l_linenumber : int64, - l_quantity : int64, + l_orderkey : bigint, + l_partkey : bigint, + l_suppkey : bigint, + l_linenumber : bigint, + l_quantity : bigint, l_extendedprice : double, l_discount : double, l_tax : double, @@ -45,23 +45,23 @@ create type tpch.LineItemType as create type tpch.OrderType as closed { - o_orderkey : int64, - o_custkey : int64, + o_orderkey : bigint, + o_custkey : bigint, o_orderstatus : string, o_totalprice : double, o_orderdate : string, o_orderpriority : string, o_clerk : string, - o_shippriority : int64, + o_shippriority : bigint, o_comment : string } create type tpch.CustomerType as closed { - c_custkey : int64, + c_custkey : bigint, c_name : string, c_address : string, - c_nationkey : int64, + c_nationkey : bigint, c_phone : string, c_acctbal : double, c_mktsegment : string, @@ -70,10 +70,10 @@ create type tpch.CustomerType as create type tpch.SupplierType as closed { - s_suppkey : int64, + s_suppkey : bigint, s_name : string, s_address : string, - s_nationkey : int64, + s_nationkey : bigint, s_phone : string, s_acctbal : double, s_comment : string @@ -81,27 +81,27 @@ create type tpch.SupplierType as create type tpch.NationType as closed { - n_nationkey : int64, + n_nationkey : bigint, n_name : string, - n_regionkey : int64, + n_regionkey : bigint, n_comment : string } create type tpch.RegionType as closed { - r_regionkey : int64, + r_regionkey : bigint, r_name : string, r_comment : string } create type tpch.PartType as closed { - p_partkey : int64, + p_partkey : bigint, p_name : string, p_mfgr : string, p_brand : string, p_type : string, - p_size : int64, + p_size : bigint, p_container : string, p_retailprice : double, p_comment : string @@ -109,9 +109,9 @@ create type tpch.PartType as create type tpch.PartSuppType as closed { - ps_partkey : int64, - ps_suppkey : int64, - ps_availqty : int64, + ps_partkey : bigint, + ps_suppkey : bigint, + ps_availqty : bigint, ps_supplycost : double, ps_comment : string } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q07_volume_shipping/q07_volume_shipping.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q07_volume_shipping/q07_volume_shipping.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q07_volume_shipping/q07_volume_shipping.3.query.sqlpp index deeec6b..04c3d23 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q07_volume_shipping/q07_volume_shipping.3.query.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q07_volume_shipping/q07_volume_shipping.3.query.sqlpp @@ -49,7 +49,7 @@ from ( with l_year0 as tpch.`get-year`(locs.l_shipdate) where ((locs.c_nationkey = t.c_nationkey) and (locs.s_nationkey = t.s_nationkey)) group by t.supp_nation as supp_nation,t.cust_nation as cust_nation,l_year0 as l_year -with revenue as tpch.coll_sum(( +with revenue as tpch.array_sum(( select element (i.l_extendedprice * (1 - i.l_discount)) from locs as i )) http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q08_national_market_share/q08_national_market_share.1.ddl.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q08_national_market_share/q08_national_market_share.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q08_national_market_share/q08_national_market_share.1.ddl.sqlpp index bf4e637..b055e7c 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q08_national_market_share/q08_national_market_share.1.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q08_national_market_share/q08_national_market_share.1.ddl.sqlpp @@ -25,11 +25,11 @@ use tpch; create type tpch.LineItemType as closed { - l_orderkey : int64, - l_partkey : int64, - l_suppkey : int64, - l_linenumber : int64, - l_quantity : int64, + l_orderkey : bigint, + l_partkey : bigint, + l_suppkey : bigint, + l_linenumber : bigint, + l_quantity : bigint, l_extendedprice : double, l_discount : double, l_tax : double, @@ -45,23 +45,23 @@ create type tpch.LineItemType as create type tpch.OrderType as closed { - o_orderkey : int64, - o_custkey : int64, + o_orderkey : bigint, + o_custkey : bigint, o_orderstatus : string, o_totalprice : double, o_orderdate : string, o_orderpriority : string, o_clerk : string, - o_shippriority : int64, + o_shippriority : bigint, o_comment : string } create type tpch.CustomerType as closed { - c_custkey : int64, + c_custkey : bigint, c_name : string, c_address : string, - c_nationkey : int64, + c_nationkey : bigint, c_phone : string, c_acctbal : double, c_mktsegment : string, @@ -70,10 +70,10 @@ create type tpch.CustomerType as create type tpch.SupplierType as closed { - s_suppkey : int64, + s_suppkey : bigint, s_name : string, s_address : string, - s_nationkey : int64, + s_nationkey : bigint, s_phone : string, s_acctbal : double, s_comment : string @@ -81,27 +81,27 @@ create type tpch.SupplierType as create type tpch.NationType as closed { - n_nationkey : int64, + n_nationkey : bigint, n_name : string, - n_regionkey : int64, + n_regionkey : bigint, n_comment : string } create type tpch.RegionType as closed { - r_regionkey : int64, + r_regionkey : bigint, r_name : string, r_comment : string } create type tpch.PartType as closed { - p_partkey : int64, + p_partkey : bigint, p_name : string, p_mfgr : string, p_brand : string, p_type : string, - p_size : int64, + p_size : bigint, p_container : string, p_retailprice : double, p_comment : string @@ -109,9 +109,9 @@ create type tpch.PartType as create type tpch.PartSuppType as closed { - ps_partkey : int64, - ps_suppkey : int64, - ps_availqty : int64, + ps_partkey : bigint, + ps_suppkey : bigint, + ps_availqty : bigint, ps_supplycost : double, ps_comment : string } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q08_national_market_share/q08_national_market_share.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q08_national_market_share/q08_national_market_share.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q08_national_market_share/q08_national_market_share.3.query.sqlpp index a8b4bac..eb46a0e 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q08_national_market_share/q08_national_market_share.3.query.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q08_national_market_share/q08_national_market_share.3.query.sqlpp @@ -20,10 +20,10 @@ use tpch; -select element {'year':year,'mkt_share':(tpch.coll_sum(( +select element {'year':year,'mkt_share':(tpch.array_sum(( select element case when i.s_name = 'BRAZIL' then i.revenue else 0.0 end from t as i - )) / tpch.coll_sum(( + )) / tpch.array_sum(( select element i.revenue from t as i )))} http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q09_product_type_profit_nt/q09_product_type_profit_nt.1.ddl.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q09_product_type_profit_nt/q09_product_type_profit_nt.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q09_product_type_profit_nt/q09_product_type_profit_nt.1.ddl.sqlpp index bf4e637..b055e7c 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q09_product_type_profit_nt/q09_product_type_profit_nt.1.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q09_product_type_profit_nt/q09_product_type_profit_nt.1.ddl.sqlpp @@ -25,11 +25,11 @@ use tpch; create type tpch.LineItemType as closed { - l_orderkey : int64, - l_partkey : int64, - l_suppkey : int64, - l_linenumber : int64, - l_quantity : int64, + l_orderkey : bigint, + l_partkey : bigint, + l_suppkey : bigint, + l_linenumber : bigint, + l_quantity : bigint, l_extendedprice : double, l_discount : double, l_tax : double, @@ -45,23 +45,23 @@ create type tpch.LineItemType as create type tpch.OrderType as closed { - o_orderkey : int64, - o_custkey : int64, + o_orderkey : bigint, + o_custkey : bigint, o_orderstatus : string, o_totalprice : double, o_orderdate : string, o_orderpriority : string, o_clerk : string, - o_shippriority : int64, + o_shippriority : bigint, o_comment : string } create type tpch.CustomerType as closed { - c_custkey : int64, + c_custkey : bigint, c_name : string, c_address : string, - c_nationkey : int64, + c_nationkey : bigint, c_phone : string, c_acctbal : double, c_mktsegment : string, @@ -70,10 +70,10 @@ create type tpch.CustomerType as create type tpch.SupplierType as closed { - s_suppkey : int64, + s_suppkey : bigint, s_name : string, s_address : string, - s_nationkey : int64, + s_nationkey : bigint, s_phone : string, s_acctbal : double, s_comment : string @@ -81,27 +81,27 @@ create type tpch.SupplierType as create type tpch.NationType as closed { - n_nationkey : int64, + n_nationkey : bigint, n_name : string, - n_regionkey : int64, + n_regionkey : bigint, n_comment : string } create type tpch.RegionType as closed { - r_regionkey : int64, + r_regionkey : bigint, r_name : string, r_comment : string } create type tpch.PartType as closed { - p_partkey : int64, + p_partkey : bigint, p_name : string, p_mfgr : string, p_brand : string, p_type : string, - p_size : int64, + p_size : bigint, p_container : string, p_retailprice : double, p_comment : string @@ -109,9 +109,9 @@ create type tpch.PartType as create type tpch.PartSuppType as closed { - ps_partkey : int64, - ps_suppkey : int64, - ps_availqty : int64, + ps_partkey : bigint, + ps_suppkey : bigint, + ps_availqty : bigint, ps_supplycost : double, ps_comment : string } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q09_product_type_profit_nt/q09_product_type_profit_nt.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q09_product_type_profit_nt/q09_product_type_profit_nt.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q09_product_type_profit_nt/q09_product_type_profit_nt.3.query.sqlpp index aa5ccf7..f0dbf1a 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q09_product_type_profit_nt/q09_product_type_profit_nt.3.query.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q09_product_type_profit_nt/q09_product_type_profit_nt.3.query.sqlpp @@ -20,7 +20,7 @@ use tpch; -select element {'nation':nation,'o_year':o_year,'sum_profit':COLL_SUM(( +select element {'nation':nation,'o_year':o_year,'sum_profit':ARRAY_SUM(( select element pr.amount from profit as pr ))} http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q10_returned_item/q10_returned_item.1.ddl.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q10_returned_item/q10_returned_item.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q10_returned_item/q10_returned_item.1.ddl.sqlpp index f21c5bd..921898b 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q10_returned_item/q10_returned_item.1.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q10_returned_item/q10_returned_item.1.ddl.sqlpp @@ -25,11 +25,11 @@ use tpch; create type tpch.LineItemType as closed { - l_orderkey : int32, - l_partkey : int32, - l_suppkey : int32, - l_linenumber : int32, - l_quantity : int32, + l_orderkey : integer, + l_partkey : integer, + l_suppkey : integer, + l_linenumber : integer, + l_quantity : integer, l_extendedprice : double, l_discount : double, l_tax : double, @@ -45,23 +45,23 @@ create type tpch.LineItemType as create type tpch.OrderType as closed { - o_orderkey : int32, - o_custkey : int32, + o_orderkey : integer, + o_custkey : integer, o_orderstatus : string, o_totalprice : double, o_orderdate : string, o_orderpriority : string, o_clerk : string, - o_shippriority : int32, + o_shippriority : integer, o_comment : string } create type tpch.CustomerType as closed { - c_custkey : int32, + c_custkey : integer, c_name : string, c_address : string, - c_nationkey : int32, + c_nationkey : integer, c_phone : string, c_acctbal : double, c_mktsegment : string, @@ -70,10 +70,10 @@ create type tpch.CustomerType as create type tpch.SupplierType as closed { - s_suppkey : int32, + s_suppkey : integer, s_name : string, s_address : string, - s_nationkey : int32, + s_nationkey : integer, s_phone : string, s_acctbal : double, s_comment : string @@ -81,27 +81,27 @@ create type tpch.SupplierType as create type tpch.NationType as closed { - n_nationkey : int32, + n_nationkey : integer, n_name : string, - n_regionkey : int32, + n_regionkey : integer, n_comment : string } create type tpch.RegionType as closed { - r_regionkey : int32, + r_regionkey : integer, r_name : string, r_comment : string } create type tpch.PartType as closed { - p_partkey : int32, + p_partkey : integer, p_name : string, p_mfgr : string, p_brand : string, p_type : string, - p_size : int32, + p_size : integer, p_container : string, p_retailprice : double, p_comment : string @@ -109,9 +109,9 @@ create type tpch.PartType as create type tpch.PartSuppType as closed { - ps_partkey : int32, - ps_suppkey : int32, - ps_availqty : int32, + ps_partkey : integer, + ps_suppkey : integer, + ps_availqty : integer, ps_supplycost : double, ps_comment : string } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q10_returned_item/q10_returned_item.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q10_returned_item/q10_returned_item.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q10_returned_item/q10_returned_item.3.query.sqlpp index cce248c..0732821 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q10_returned_item/q10_returned_item.3.query.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q10_returned_item/q10_returned_item.3.query.sqlpp @@ -34,7 +34,7 @@ from ( where ((l.l_orderkey = ocn.o_orderkey) and (l.l_selectflag = 'R')) ) as locn group by locn.c_custkey as c_custkey,locn.c_name as c_name,locn.c_acctbal as c_acctbal,locn.c_phone as c_phone,locn.n_name as n_name,locn.c_address as c_address,locn.c_comment as c_comment -with revenue as COLL_SUM(( +with revenue as ARRAY_SUM(( select element (i.l_extendedprice * (1 - i.l_discount)) from locn as i )) http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q10_returned_item_int64/q10_returned_item_int64.1.ddl.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q10_returned_item_int64/q10_returned_item_int64.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q10_returned_item_int64/q10_returned_item_int64.1.ddl.sqlpp index bf4e637..b055e7c 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q10_returned_item_int64/q10_returned_item_int64.1.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q10_returned_item_int64/q10_returned_item_int64.1.ddl.sqlpp @@ -25,11 +25,11 @@ use tpch; create type tpch.LineItemType as closed { - l_orderkey : int64, - l_partkey : int64, - l_suppkey : int64, - l_linenumber : int64, - l_quantity : int64, + l_orderkey : bigint, + l_partkey : bigint, + l_suppkey : bigint, + l_linenumber : bigint, + l_quantity : bigint, l_extendedprice : double, l_discount : double, l_tax : double, @@ -45,23 +45,23 @@ create type tpch.LineItemType as create type tpch.OrderType as closed { - o_orderkey : int64, - o_custkey : int64, + o_orderkey : bigint, + o_custkey : bigint, o_orderstatus : string, o_totalprice : double, o_orderdate : string, o_orderpriority : string, o_clerk : string, - o_shippriority : int64, + o_shippriority : bigint, o_comment : string } create type tpch.CustomerType as closed { - c_custkey : int64, + c_custkey : bigint, c_name : string, c_address : string, - c_nationkey : int64, + c_nationkey : bigint, c_phone : string, c_acctbal : double, c_mktsegment : string, @@ -70,10 +70,10 @@ create type tpch.CustomerType as create type tpch.SupplierType as closed { - s_suppkey : int64, + s_suppkey : bigint, s_name : string, s_address : string, - s_nationkey : int64, + s_nationkey : bigint, s_phone : string, s_acctbal : double, s_comment : string @@ -81,27 +81,27 @@ create type tpch.SupplierType as create type tpch.NationType as closed { - n_nationkey : int64, + n_nationkey : bigint, n_name : string, - n_regionkey : int64, + n_regionkey : bigint, n_comment : string } create type tpch.RegionType as closed { - r_regionkey : int64, + r_regionkey : bigint, r_name : string, r_comment : string } create type tpch.PartType as closed { - p_partkey : int64, + p_partkey : bigint, p_name : string, p_mfgr : string, p_brand : string, p_type : string, - p_size : int64, + p_size : bigint, p_container : string, p_retailprice : double, p_comment : string @@ -109,9 +109,9 @@ create type tpch.PartType as create type tpch.PartSuppType as closed { - ps_partkey : int64, - ps_suppkey : int64, - ps_availqty : int64, + ps_partkey : bigint, + ps_suppkey : bigint, + ps_availqty : bigint, ps_supplycost : double, ps_comment : string } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q10_returned_item_int64/q10_returned_item_int64.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q10_returned_item_int64/q10_returned_item_int64.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q10_returned_item_int64/q10_returned_item_int64.3.query.sqlpp index cce248c..0732821 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q10_returned_item_int64/q10_returned_item_int64.3.query.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q10_returned_item_int64/q10_returned_item_int64.3.query.sqlpp @@ -34,7 +34,7 @@ from ( where ((l.l_orderkey = ocn.o_orderkey) and (l.l_selectflag = 'R')) ) as locn group by locn.c_custkey as c_custkey,locn.c_name as c_name,locn.c_acctbal as c_acctbal,locn.c_phone as c_phone,locn.n_name as n_name,locn.c_address as c_address,locn.c_comment as c_comment -with revenue as COLL_SUM(( +with revenue as ARRAY_SUM(( select element (i.l_extendedprice * (1 - i.l_discount)) from locn as i )) http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q11_important_stock/q11_important_stock.1.ddl.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q11_important_stock/q11_important_stock.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q11_important_stock/q11_important_stock.1.ddl.sqlpp index bf4e637..b055e7c 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q11_important_stock/q11_important_stock.1.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q11_important_stock/q11_important_stock.1.ddl.sqlpp @@ -25,11 +25,11 @@ use tpch; create type tpch.LineItemType as closed { - l_orderkey : int64, - l_partkey : int64, - l_suppkey : int64, - l_linenumber : int64, - l_quantity : int64, + l_orderkey : bigint, + l_partkey : bigint, + l_suppkey : bigint, + l_linenumber : bigint, + l_quantity : bigint, l_extendedprice : double, l_discount : double, l_tax : double, @@ -45,23 +45,23 @@ create type tpch.LineItemType as create type tpch.OrderType as closed { - o_orderkey : int64, - o_custkey : int64, + o_orderkey : bigint, + o_custkey : bigint, o_orderstatus : string, o_totalprice : double, o_orderdate : string, o_orderpriority : string, o_clerk : string, - o_shippriority : int64, + o_shippriority : bigint, o_comment : string } create type tpch.CustomerType as closed { - c_custkey : int64, + c_custkey : bigint, c_name : string, c_address : string, - c_nationkey : int64, + c_nationkey : bigint, c_phone : string, c_acctbal : double, c_mktsegment : string, @@ -70,10 +70,10 @@ create type tpch.CustomerType as create type tpch.SupplierType as closed { - s_suppkey : int64, + s_suppkey : bigint, s_name : string, s_address : string, - s_nationkey : int64, + s_nationkey : bigint, s_phone : string, s_acctbal : double, s_comment : string @@ -81,27 +81,27 @@ create type tpch.SupplierType as create type tpch.NationType as closed { - n_nationkey : int64, + n_nationkey : bigint, n_name : string, - n_regionkey : int64, + n_regionkey : bigint, n_comment : string } create type tpch.RegionType as closed { - r_regionkey : int64, + r_regionkey : bigint, r_name : string, r_comment : string } create type tpch.PartType as closed { - p_partkey : int64, + p_partkey : bigint, p_name : string, p_mfgr : string, p_brand : string, p_type : string, - p_size : int64, + p_size : bigint, p_container : string, p_retailprice : double, p_comment : string @@ -109,9 +109,9 @@ create type tpch.PartType as create type tpch.PartSuppType as closed { - ps_partkey : int64, - ps_suppkey : int64, - ps_availqty : int64, + ps_partkey : bigint, + ps_suppkey : bigint, + ps_availqty : bigint, ps_supplycost : double, ps_comment : string } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q11_important_stock/q11_important_stock.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q11_important_stock/q11_important_stock.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q11_important_stock/q11_important_stock.3.query.sqlpp index 073835c..866c67e 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q11_important_stock/q11_important_stock.3.query.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q11_important_stock/q11_important_stock.3.query.sqlpp @@ -20,7 +20,7 @@ use tpch; -with sum as tpch.coll_sum(( +with sum as tpch.array_sum(( select element (ps.ps_supplycost * ps.ps_availqty) from Partsupp as ps, ( @@ -33,7 +33,7 @@ with sum as tpch.coll_sum(( )) select element {'partkey':t1.ps_partkey,'part_value':t1.part_value} from ( - select element {'ps_partkey':ps_partkey,'part_value':tpch.coll_sum(( + select element {'ps_partkey':ps_partkey,'part_value':tpch.array_sum(( select element (i.ps_supplycost * i.ps_availqty) from ps as i ))} http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q12_shipping/q12_shipping.1.ddl.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q12_shipping/q12_shipping.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q12_shipping/q12_shipping.1.ddl.sqlpp index bf4e637..b055e7c 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q12_shipping/q12_shipping.1.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q12_shipping/q12_shipping.1.ddl.sqlpp @@ -25,11 +25,11 @@ use tpch; create type tpch.LineItemType as closed { - l_orderkey : int64, - l_partkey : int64, - l_suppkey : int64, - l_linenumber : int64, - l_quantity : int64, + l_orderkey : bigint, + l_partkey : bigint, + l_suppkey : bigint, + l_linenumber : bigint, + l_quantity : bigint, l_extendedprice : double, l_discount : double, l_tax : double, @@ -45,23 +45,23 @@ create type tpch.LineItemType as create type tpch.OrderType as closed { - o_orderkey : int64, - o_custkey : int64, + o_orderkey : bigint, + o_custkey : bigint, o_orderstatus : string, o_totalprice : double, o_orderdate : string, o_orderpriority : string, o_clerk : string, - o_shippriority : int64, + o_shippriority : bigint, o_comment : string } create type tpch.CustomerType as closed { - c_custkey : int64, + c_custkey : bigint, c_name : string, c_address : string, - c_nationkey : int64, + c_nationkey : bigint, c_phone : string, c_acctbal : double, c_mktsegment : string, @@ -70,10 +70,10 @@ create type tpch.CustomerType as create type tpch.SupplierType as closed { - s_suppkey : int64, + s_suppkey : bigint, s_name : string, s_address : string, - s_nationkey : int64, + s_nationkey : bigint, s_phone : string, s_acctbal : double, s_comment : string @@ -81,27 +81,27 @@ create type tpch.SupplierType as create type tpch.NationType as closed { - n_nationkey : int64, + n_nationkey : bigint, n_name : string, - n_regionkey : int64, + n_regionkey : bigint, n_comment : string } create type tpch.RegionType as closed { - r_regionkey : int64, + r_regionkey : bigint, r_name : string, r_comment : string } create type tpch.PartType as closed { - p_partkey : int64, + p_partkey : bigint, p_name : string, p_mfgr : string, p_brand : string, p_type : string, - p_size : int64, + p_size : bigint, p_container : string, p_retailprice : double, p_comment : string @@ -109,9 +109,9 @@ create type tpch.PartType as create type tpch.PartSuppType as closed { - ps_partkey : int64, - ps_suppkey : int64, - ps_availqty : int64, + ps_partkey : bigint, + ps_suppkey : bigint, + ps_availqty : bigint, ps_supplycost : double, ps_comment : string } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q12_shipping/q12_shipping.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q12_shipping/q12_shipping.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q12_shipping/q12_shipping.3.query.sqlpp index c576c6c..6e9befc 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q12_shipping/q12_shipping.3.query.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q12_shipping/q12_shipping.3.query.sqlpp @@ -20,13 +20,13 @@ use tpch; -select element {'l_shipmode':l_shipmode,'high_line_count':tpch.coll_sum(( +select element {'l_shipmode':l_shipmode,'high_line_count':tpch.array_sum(( select element case i.o_orderpriority = '1-URGENT' or i.o_orderpriority = '2-HIGH' when true then 1 when false then 0 end from o as i - )),'low_line_count':tpch.coll_sum(( + )),'low_line_count':tpch.array_sum(( select element case i.o_orderpriority = '1-URGENT' or i.o_orderpriority = '2-HIGH' when true then 0 when false then 1 http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q13_customer_distribution/q13_customer_distribution.1.ddl.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q13_customer_distribution/q13_customer_distribution.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q13_customer_distribution/q13_customer_distribution.1.ddl.sqlpp index bf4e637..b055e7c 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q13_customer_distribution/q13_customer_distribution.1.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q13_customer_distribution/q13_customer_distribution.1.ddl.sqlpp @@ -25,11 +25,11 @@ use tpch; create type tpch.LineItemType as closed { - l_orderkey : int64, - l_partkey : int64, - l_suppkey : int64, - l_linenumber : int64, - l_quantity : int64, + l_orderkey : bigint, + l_partkey : bigint, + l_suppkey : bigint, + l_linenumber : bigint, + l_quantity : bigint, l_extendedprice : double, l_discount : double, l_tax : double, @@ -45,23 +45,23 @@ create type tpch.LineItemType as create type tpch.OrderType as closed { - o_orderkey : int64, - o_custkey : int64, + o_orderkey : bigint, + o_custkey : bigint, o_orderstatus : string, o_totalprice : double, o_orderdate : string, o_orderpriority : string, o_clerk : string, - o_shippriority : int64, + o_shippriority : bigint, o_comment : string } create type tpch.CustomerType as closed { - c_custkey : int64, + c_custkey : bigint, c_name : string, c_address : string, - c_nationkey : int64, + c_nationkey : bigint, c_phone : string, c_acctbal : double, c_mktsegment : string, @@ -70,10 +70,10 @@ create type tpch.CustomerType as create type tpch.SupplierType as closed { - s_suppkey : int64, + s_suppkey : bigint, s_name : string, s_address : string, - s_nationkey : int64, + s_nationkey : bigint, s_phone : string, s_acctbal : double, s_comment : string @@ -81,27 +81,27 @@ create type tpch.SupplierType as create type tpch.NationType as closed { - n_nationkey : int64, + n_nationkey : bigint, n_name : string, - n_regionkey : int64, + n_regionkey : bigint, n_comment : string } create type tpch.RegionType as closed { - r_regionkey : int64, + r_regionkey : bigint, r_name : string, r_comment : string } create type tpch.PartType as closed { - p_partkey : int64, + p_partkey : bigint, p_name : string, p_mfgr : string, p_brand : string, p_type : string, - p_size : int64, + p_size : bigint, p_container : string, p_retailprice : double, p_comment : string @@ -109,9 +109,9 @@ create type tpch.PartType as create type tpch.PartSuppType as closed { - ps_partkey : int64, - ps_suppkey : int64, - ps_availqty : int64, + ps_partkey : bigint, + ps_suppkey : bigint, + ps_availqty : bigint, ps_supplycost : double, ps_comment : string } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q13_customer_distribution/q13_customer_distribution.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q13_customer_distribution/q13_customer_distribution.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q13_customer_distribution/q13_customer_distribution.3.query.sqlpp index 24f4f46..8c2d04b 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q13_customer_distribution/q13_customer_distribution.3.query.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q13_customer_distribution/q13_customer_distribution.3.query.sqlpp @@ -24,12 +24,12 @@ set `import-private-functions` `true`; select element {'c_count':c_count,'custdist':custdist} from ( - select element {'c_custkey':c_custkey,'c_count':tpch.coll_sum(( + select element {'c_custkey':c_custkey,'c_count':tpch.array_sum(( select element i.o_orderkey_count from co as i ))} from ( - select element {'c_custkey':c.c_custkey,'o_orderkey_count':coll_count(( + select element {'c_custkey':c.c_custkey,'o_orderkey_count':array_count(( select element o.o_orderkey from Orders as o where c.c_custkey = o.o_custkey and o.o_comment not like '%special%requests%' http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q14_promotion_effect/q14_promotion_effect.1.ddl.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q14_promotion_effect/q14_promotion_effect.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q14_promotion_effect/q14_promotion_effect.1.ddl.sqlpp index bf4e637..b055e7c 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q14_promotion_effect/q14_promotion_effect.1.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q14_promotion_effect/q14_promotion_effect.1.ddl.sqlpp @@ -25,11 +25,11 @@ use tpch; create type tpch.LineItemType as closed { - l_orderkey : int64, - l_partkey : int64, - l_suppkey : int64, - l_linenumber : int64, - l_quantity : int64, + l_orderkey : bigint, + l_partkey : bigint, + l_suppkey : bigint, + l_linenumber : bigint, + l_quantity : bigint, l_extendedprice : double, l_discount : double, l_tax : double, @@ -45,23 +45,23 @@ create type tpch.LineItemType as create type tpch.OrderType as closed { - o_orderkey : int64, - o_custkey : int64, + o_orderkey : bigint, + o_custkey : bigint, o_orderstatus : string, o_totalprice : double, o_orderdate : string, o_orderpriority : string, o_clerk : string, - o_shippriority : int64, + o_shippriority : bigint, o_comment : string } create type tpch.CustomerType as closed { - c_custkey : int64, + c_custkey : bigint, c_name : string, c_address : string, - c_nationkey : int64, + c_nationkey : bigint, c_phone : string, c_acctbal : double, c_mktsegment : string, @@ -70,10 +70,10 @@ create type tpch.CustomerType as create type tpch.SupplierType as closed { - s_suppkey : int64, + s_suppkey : bigint, s_name : string, s_address : string, - s_nationkey : int64, + s_nationkey : bigint, s_phone : string, s_acctbal : double, s_comment : string @@ -81,27 +81,27 @@ create type tpch.SupplierType as create type tpch.NationType as closed { - n_nationkey : int64, + n_nationkey : bigint, n_name : string, - n_regionkey : int64, + n_regionkey : bigint, n_comment : string } create type tpch.RegionType as closed { - r_regionkey : int64, + r_regionkey : bigint, r_name : string, r_comment : string } create type tpch.PartType as closed { - p_partkey : int64, + p_partkey : bigint, p_name : string, p_mfgr : string, p_brand : string, p_type : string, - p_size : int64, + p_size : bigint, p_container : string, p_retailprice : double, p_comment : string @@ -109,9 +109,9 @@ create type tpch.PartType as create type tpch.PartSuppType as closed { - ps_partkey : int64, - ps_suppkey : int64, - ps_availqty : int64, + ps_partkey : bigint, + ps_suppkey : bigint, + ps_availqty : bigint, ps_supplycost : double, ps_comment : string } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q14_promotion_effect/q14_promotion_effect.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q14_promotion_effect/q14_promotion_effect.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q14_promotion_effect/q14_promotion_effect.3.query.sqlpp index 445da07..0616226 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q14_promotion_effect/q14_promotion_effect.3.query.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q14_promotion_effect/q14_promotion_effect.3.query.sqlpp @@ -20,13 +20,13 @@ use tpch; -select element (100.0 * tpch.coll_sum(( +select element (100.0 * tpch.array_sum(( select element case i.p_type like 'PROMO%' when true then i.l_extendedprice * (1 - i.l_discount) when false then 0.0 end from lp as i - )) / tpch.coll_sum(( + )) / tpch.array_sum(( select element (i.l_extendedprice * (1 - i.l_discount)) from lp as i ))) http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q15_top_supplier/q15_top_supplier.1.ddl.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q15_top_supplier/q15_top_supplier.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q15_top_supplier/q15_top_supplier.1.ddl.sqlpp index bf4e637..b055e7c 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q15_top_supplier/q15_top_supplier.1.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q15_top_supplier/q15_top_supplier.1.ddl.sqlpp @@ -25,11 +25,11 @@ use tpch; create type tpch.LineItemType as closed { - l_orderkey : int64, - l_partkey : int64, - l_suppkey : int64, - l_linenumber : int64, - l_quantity : int64, + l_orderkey : bigint, + l_partkey : bigint, + l_suppkey : bigint, + l_linenumber : bigint, + l_quantity : bigint, l_extendedprice : double, l_discount : double, l_tax : double, @@ -45,23 +45,23 @@ create type tpch.LineItemType as create type tpch.OrderType as closed { - o_orderkey : int64, - o_custkey : int64, + o_orderkey : bigint, + o_custkey : bigint, o_orderstatus : string, o_totalprice : double, o_orderdate : string, o_orderpriority : string, o_clerk : string, - o_shippriority : int64, + o_shippriority : bigint, o_comment : string } create type tpch.CustomerType as closed { - c_custkey : int64, + c_custkey : bigint, c_name : string, c_address : string, - c_nationkey : int64, + c_nationkey : bigint, c_phone : string, c_acctbal : double, c_mktsegment : string, @@ -70,10 +70,10 @@ create type tpch.CustomerType as create type tpch.SupplierType as closed { - s_suppkey : int64, + s_suppkey : bigint, s_name : string, s_address : string, - s_nationkey : int64, + s_nationkey : bigint, s_phone : string, s_acctbal : double, s_comment : string @@ -81,27 +81,27 @@ create type tpch.SupplierType as create type tpch.NationType as closed { - n_nationkey : int64, + n_nationkey : bigint, n_name : string, - n_regionkey : int64, + n_regionkey : bigint, n_comment : string } create type tpch.RegionType as closed { - r_regionkey : int64, + r_regionkey : bigint, r_name : string, r_comment : string } create type tpch.PartType as closed { - p_partkey : int64, + p_partkey : bigint, p_name : string, p_mfgr : string, p_brand : string, p_type : string, - p_size : int64, + p_size : bigint, p_container : string, p_retailprice : double, p_comment : string @@ -109,9 +109,9 @@ create type tpch.PartType as create type tpch.PartSuppType as closed { - ps_partkey : int64, - ps_suppkey : int64, - ps_availqty : int64, + ps_partkey : bigint, + ps_suppkey : bigint, + ps_availqty : bigint, ps_supplycost : double, ps_comment : string } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q15_top_supplier/q15_top_supplier.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q15_top_supplier/q15_top_supplier.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q15_top_supplier/q15_top_supplier.3.query.sqlpp index fdc4fcc..c1b03bc 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q15_top_supplier/q15_top_supplier.3.query.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q15_top_supplier/q15_top_supplier.3.query.sqlpp @@ -22,7 +22,7 @@ use tpch; declare function revenue() { ( - select element {'supplier_no':l_suppkey,'total_revenue':tpch.coll_sum(( + select element {'supplier_no':l_suppkey,'total_revenue':tpch.array_sum(( select element (i.l_extendedprice * (1 - i.l_discount)) from l as i ))} @@ -31,7 +31,7 @@ declare function revenue() { group by l.l_suppkey as l_suppkey ) }; -with m as tpch.coll_max(( +with m as tpch.array_max(( select element r2.total_revenue from tpch.revenue() as r2 )) http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q16_parts_supplier_relationship/q16_parts_supplier_relationship.1.ddl.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q16_parts_supplier_relationship/q16_parts_supplier_relationship.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q16_parts_supplier_relationship/q16_parts_supplier_relationship.1.ddl.sqlpp index bf4e637..b055e7c 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q16_parts_supplier_relationship/q16_parts_supplier_relationship.1.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q16_parts_supplier_relationship/q16_parts_supplier_relationship.1.ddl.sqlpp @@ -25,11 +25,11 @@ use tpch; create type tpch.LineItemType as closed { - l_orderkey : int64, - l_partkey : int64, - l_suppkey : int64, - l_linenumber : int64, - l_quantity : int64, + l_orderkey : bigint, + l_partkey : bigint, + l_suppkey : bigint, + l_linenumber : bigint, + l_quantity : bigint, l_extendedprice : double, l_discount : double, l_tax : double, @@ -45,23 +45,23 @@ create type tpch.LineItemType as create type tpch.OrderType as closed { - o_orderkey : int64, - o_custkey : int64, + o_orderkey : bigint, + o_custkey : bigint, o_orderstatus : string, o_totalprice : double, o_orderdate : string, o_orderpriority : string, o_clerk : string, - o_shippriority : int64, + o_shippriority : bigint, o_comment : string } create type tpch.CustomerType as closed { - c_custkey : int64, + c_custkey : bigint, c_name : string, c_address : string, - c_nationkey : int64, + c_nationkey : bigint, c_phone : string, c_acctbal : double, c_mktsegment : string, @@ -70,10 +70,10 @@ create type tpch.CustomerType as create type tpch.SupplierType as closed { - s_suppkey : int64, + s_suppkey : bigint, s_name : string, s_address : string, - s_nationkey : int64, + s_nationkey : bigint, s_phone : string, s_acctbal : double, s_comment : string @@ -81,27 +81,27 @@ create type tpch.SupplierType as create type tpch.NationType as closed { - n_nationkey : int64, + n_nationkey : bigint, n_name : string, - n_regionkey : int64, + n_regionkey : bigint, n_comment : string } create type tpch.RegionType as closed { - r_regionkey : int64, + r_regionkey : bigint, r_name : string, r_comment : string } create type tpch.PartType as closed { - p_partkey : int64, + p_partkey : bigint, p_name : string, p_mfgr : string, p_brand : string, p_type : string, - p_size : int64, + p_size : bigint, p_container : string, p_retailprice : double, p_comment : string @@ -109,9 +109,9 @@ create type tpch.PartType as create type tpch.PartSuppType as closed { - ps_partkey : int64, - ps_suppkey : int64, - ps_availqty : int64, + ps_partkey : bigint, + ps_suppkey : bigint, + ps_availqty : bigint, ps_supplycost : double, ps_comment : string } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q16_parts_supplier_relationship/q16_parts_supplier_relationship.3.query.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q16_parts_supplier_relationship/q16_parts_supplier_relationship.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q16_parts_supplier_relationship/q16_parts_supplier_relationship.3.query.sqlpp index 131c8a0..2c64a98 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q16_parts_supplier_relationship/q16_parts_supplier_relationship.3.query.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q16_parts_supplier_relationship/q16_parts_supplier_relationship.3.query.sqlpp @@ -41,7 +41,7 @@ from ( group by t.p_brand as p_brand1,t.p_type as p_type1,t.p_size as p_size1,t.ps_suppkey as ps_suppkey1 ) as t2 group by t2.p_brand as p_brand,t2.p_type as p_type,t2.p_size as p_size -with supplier_cnt as coll_count(( +with supplier_cnt as array_count(( select element i.ps_suppkey from t2 as i )) http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q17_large_gby_variant/q17_large_gby_variant.1.ddl.sqlpp ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q17_large_gby_variant/q17_large_gby_variant.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q17_large_gby_variant/q17_large_gby_variant.1.ddl.sqlpp index bf4e637..b055e7c 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q17_large_gby_variant/q17_large_gby_variant.1.ddl.sqlpp +++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/tpch-sql-like/q17_large_gby_variant/q17_large_gby_variant.1.ddl.sqlpp @@ -25,11 +25,11 @@ use tpch; create type tpch.LineItemType as closed { - l_orderkey : int64, - l_partkey : int64, - l_suppkey : int64, - l_linenumber : int64, - l_quantity : int64, + l_orderkey : bigint, + l_partkey : bigint, + l_suppkey : bigint, + l_linenumber : bigint, + l_quantity : bigint, l_extendedprice : double, l_discount : double, l_tax : double, @@ -45,23 +45,23 @@ create type tpch.LineItemType as create type tpch.OrderType as closed { - o_orderkey : int64, - o_custkey : int64, + o_orderkey : bigint, + o_custkey : bigint, o_orderstatus : string, o_totalprice : double, o_orderdate : string, o_orderpriority : string, o_clerk : string, - o_shippriority : int64, + o_shippriority : bigint, o_comment : string } create type tpch.CustomerType as closed { - c_custkey : int64, + c_custkey : bigint, c_name : string, c_address : string, - c_nationkey : int64, + c_nationkey : bigint, c_phone : string, c_acctbal : double, c_mktsegment : string, @@ -70,10 +70,10 @@ create type tpch.CustomerType as create type tpch.SupplierType as closed { - s_suppkey : int64, + s_suppkey : bigint, s_name : string, s_address : string, - s_nationkey : int64, + s_nationkey : bigint, s_phone : string, s_acctbal : double, s_comment : string @@ -81,27 +81,27 @@ create type tpch.SupplierType as create type tpch.NationType as closed { - n_nationkey : int64, + n_nationkey : bigint, n_name : string, - n_regionkey : int64, + n_regionkey : bigint, n_comment : string } create type tpch.RegionType as closed { - r_regionkey : int64, + r_regionkey : bigint, r_name : string, r_comment : string } create type tpch.PartType as closed { - p_partkey : int64, + p_partkey : bigint, p_name : string, p_mfgr : string, p_brand : string, p_type : string, - p_size : int64, + p_size : bigint, p_container : string, p_retailprice : double, p_comment : string @@ -109,9 +109,9 @@ create type tpch.PartType as create type tpch.PartSuppType as closed { - ps_partkey : int64, - ps_suppkey : int64, - ps_availqty : int64, + ps_partkey : bigint, + ps_suppkey : bigint, + ps_availqty : bigint, ps_supplycost : double, ps_comment : string }
