Changeset: 42ec61bff56d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/42ec61bff56d
Modified Files:
sql/benchmarks/tpcds/Tests/q18a.test
sql/benchmarks/tpcds/Tests/q22a.test
sql/benchmarks/tpcds/Tests/q23-2.test
sql/benchmarks/tpcds/Tests/q24-1.test
sql/benchmarks/tpcds/Tests/q24-2.test
sql/benchmarks/tpcds/Tests/q70a.test
Branch: default
Log Message:
small cleanup of queries
diffs (93 lines):
diff --git a/sql/benchmarks/tpcds/Tests/q18a.test
b/sql/benchmarks/tpcds/Tests/q18a.test
--- a/sql/benchmarks/tpcds/Tests/q18a.test
+++ b/sql/benchmarks/tpcds/Tests/q18a.test
@@ -12,7 +12,8 @@ with results as
cast(cs_net_profit as decimal(12,2)) agg5,
cast(c_birth_year as decimal(12,2)) agg6,
cast(cd1.cd_dep_count as decimal(12,2)) agg7
- from catalog_sales, customer_demographics cd1, customer_demographics cd2,
customer, customer_address, date_dim, item
+ from catalog_sales, customer_demographics cd1,
+ customer_demographics cd2, customer, customer_address, date_dim, item
where cs_sold_date_sk = d_date_sk and
cs_item_sk = i_item_sk and
cs_bill_cdemo_sk = cd1.cd_demo_sk and
diff --git a/sql/benchmarks/tpcds/Tests/q22a.test
b/sql/benchmarks/tpcds/Tests/q22a.test
--- a/sql/benchmarks/tpcds/Tests/q22a.test
+++ b/sql/benchmarks/tpcds/Tests/q22a.test
@@ -9,10 +9,8 @@ with results as
from inventory
,date_dim
,item
- ,warehouse
where inv_date_sk=d_date_sk
and inv_item_sk=i_item_sk
- and inv_warehouse_sk = w_warehouse_sk
and d_month_seq between 1200 and 1200 + 11),
results_rollup as
(select i_product_name, i_brand, i_class, i_category,avg(qoh) qoh
diff --git a/sql/benchmarks/tpcds/Tests/q23-2.test
b/sql/benchmarks/tpcds/Tests/q23-2.test
--- a/sql/benchmarks/tpcds/Tests/q23-2.test
+++ b/sql/benchmarks/tpcds/Tests/q23-2.test
@@ -7,7 +7,7 @@ query TTD rowsort
,item
where ss_sold_date_sk = d_date_sk
and ss_item_sk = i_item_sk
- and d_year in (2000,2000 + 1,2000 + 2,2000 + 3)
+ and d_year in (2000,2000+1,2000+2,2000+3)
group by substr(i_item_desc,1,30),i_item_sk,d_date
having count(*) >4),
max_store_sales as
diff --git a/sql/benchmarks/tpcds/Tests/q24-1.test
b/sql/benchmarks/tpcds/Tests/q24-1.test
--- a/sql/benchmarks/tpcds/Tests/q24-1.test
+++ b/sql/benchmarks/tpcds/Tests/q24-1.test
@@ -26,7 +26,7 @@ where ss_ticket_number = sr_ticket_numbe
and c_current_addr_sk = ca_address_sk
and c_birth_country <> upper(ca_country)
and s_zip = ca_zip
-and s_market_id=8
+ and s_market_id=8
group by c_last_name
,c_first_name
,s_store_name
@@ -47,7 +47,7 @@ group by c_last_name
,c_first_name
,s_store_name
having sum(netpaid) > (select 0.05*avg(netpaid)
- from ssales)
+ from ssales)
order by c_last_name
,c_first_name
,s_store_name
diff --git a/sql/benchmarks/tpcds/Tests/q24-2.test
b/sql/benchmarks/tpcds/Tests/q24-2.test
--- a/sql/benchmarks/tpcds/Tests/q24-2.test
+++ b/sql/benchmarks/tpcds/Tests/q24-2.test
@@ -26,7 +26,7 @@ where ss_ticket_number = sr_ticket_numbe
and c_current_addr_sk = ca_address_sk
and c_birth_country <> upper(ca_country)
and s_zip = ca_zip
- and s_market_id = 8
+ and s_market_id=8
group by c_last_name
,c_first_name
,s_store_name
diff --git a/sql/benchmarks/tpcds/Tests/q70a.test
b/sql/benchmarks/tpcds/Tests/q70a.test
--- a/sql/benchmarks/tpcds/Tests/q70a.test
+++ b/sql/benchmarks/tpcds/Tests/q70a.test
@@ -8,7 +8,7 @@ with results as
,date_dim d1
,store
where
- d1.d_month_seq between 1200 and 1200 + 11
+ d1.d_month_seq between 1200 and 1200+11
and d1.d_date_sk = ss_sold_date_sk
and s_store_sk = ss_store_sk
and s_state in
@@ -16,7 +16,7 @@ with results as
from (select s_state as s_state,
rank() over ( partition by s_state order by
sum(ss_net_profit) desc) as ranking
from store_sales, store, date_dim
- where d_month_seq between 1200 and 1200 + 11
+ where d_month_seq between 1200 and 1200+11
and d_date_sk = ss_sold_date_sk
and s_store_sk = ss_store_sk
group by s_state
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
