github/spark-sql-perf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[SC-3547] Fix various typos in queries and bump version to 0.48

Browse Source
This commit is contained in:
Eric Liang 2016-06-14 12:27:24 -07:00 committed by Sameer Agarwal
parent cc50104194
commit 0d1e9043f1
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/scala/com/databricks/spark/sql/perf/tpcds/TPCDS_1_4_Queries.scala
View File

@ -1038,7 +1038,7 @@ trait Tpcds_1_4_Queries extends Benchmark {
| and ws_sold_date_sk = d_date_sk
| and ws_item_sk in (select item_sk from frequent_ss_items)
| and ws_bill_customer_sk in (select c_customer_sk from best_ss_customer))) y
| limit 100;
| limit 100
""".stripMargin),
("q23b", """
|
@ -1368,13 +1368,13 @@ trait Tpcds_1_4_Queries extends Benchmark {
| where
| i_manufact_id = 977
| and i_item_sk = cs_item_sk
| and d_date between '2000-01-27' and (cast('2000-01-27' as date) + 90 days)
| and d_date between '2000-01-27' and (cast('2000-01-27' as date) + interval 90 days)
| and d_date_sk = cs_sold_date_sk
| and cs_ext_discount_amt > (
| select 1.3 * avg(cs_ext_discount_amt)
| from catalog_sales, date_dim
| where cs_item_sk = i_item_sk
| and d_date between '2000-01-27]' and (cast('2000-01-27' as date) + 90 days)
| and d_date between '2000-01-27]' and (cast('2000-01-27' as date) + interval 90 days)
| and d_date_sk = cs_sold_date_sk)
|limit 100
""".stripMargin),
@ -3676,7 +3676,7 @@ trait Tpcds_1_4_Queries extends Benchmark {
// Modifications: "+ days" -> date_add
// Modifications: " -> `
("q92", """
| select sum(ws_ext_discount_amt) as `Excess Discount Amount"
| select sum(ws_ext_discount_amt) as `Excess Discount Amount`
| from web_sales, item, date_dim
| where i_manufact_id = 350
| and i_item_sk = ws_item_sk
@ -3743,9 +3743,9 @@ trait Tpcds_1_4_Queries extends Benchmark {
| where ws1.ws_order_number = ws2.ws_order_number
| and ws1.ws_warehouse_sk <> ws2.ws_warehouse_sk)
| select
| count(distinct ws_order_number) as `order count"
| ,sum(ws_ext_ship_cost) as `total shipping cost"
| ,sum(ws_net_profit) as `total net profit"
| count(distinct ws_order_number) as `order count`
| ,sum(ws_ext_ship_cost) as `total shipping cost`
| ,sum(ws_net_profit) as `total net profit`
| from
| web_sales ws1, date_dim, customer_address, web_site
| where
@ -3863,7 +3863,6 @@ trait Tpcds_1_4_Queries extends Benchmark {
}
val tpcds1_4QueriesMap = tpcds1_4Queries.map(q => q.name.split("-").get(0) -> q).toMap
// q72 slow on SC=1
val runnable: Seq[Query] = Seq(
"q1", "q2", "q3", "q4", "q5", "q7", "q8", "q9",
"q11", "q12", "q13", "q15", "q17", "q18", "q19",
@ -3875,4 +3874,6 @@ trait Tpcds_1_4_Queries extends Benchmark {
"q71", "q72", "q73", "q74", "q75", "q76", "q77", "q78", "q79",
"q80", "q82", "q84", "q85", "q86", "q87", "q88", "q89",
"q90", "q91", "q93", "q96", "q97", "q98", "q99", "qSsMax").map(tpcds1_4QueriesMap)
val all: Seq[Query] = tpcds1_4QueriesMap.values.toSeq
}

2
version.sbt
View File

@ -1 +1 @@
version in ThisBuild := "0.4.7-SNAPSHOT"
version in ThisBuild := "0.4.8-SNAPSHOT"