Skip to content

Commit 75e1699

Browse files
committed
fix q14
1 parent 765cdaa commit 75e1699

File tree

2 files changed

+13
-18
lines changed
  • extensions/spark/kyuubi-spark-connector-tpch/src

2 files changed

+13
-18
lines changed

extensions/spark/kyuubi-spark-connector-tpch/src/main/resources/kyuubi/tpch/q14.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
-- using default substitutions
1818

1919
select
20-
100.00 * sum(case
20+
round(100.00 * sum(case
2121
when p_type like 'PROMO%'
2222
then l_extendedprice * (1 - l_discount)
2323
else 0
24-
end) / sum(l_extendedprice * (1 - l_discount)) as promo_revenue
24+
end) / sum(l_extendedprice * (1 - l_discount)), 2) as promo_revenue
2525
from
2626
lineitem,
2727
part

extensions/spark/kyuubi-spark-connector-tpch/src/test/scala/org/apache/kyuubi/spark/connector/tpch/TPCHQuerySuite.scala

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ import org.apache.kyuubi.spark.connector.common.LocalSparkSession.withSparkSessi
3131
/**
3232
* To run this test suite:
3333
* {{{
34-
* KYUUBI_UPDATE=0 dev/gen/gen_tpcdh_queries.sh
34+
* KYUUBI_UPDATE=0 dev/gen/gen_tpch_queries.sh
3535
* }}}
3636
*
3737
* To re-generate golden files for this suite:
3838
* {{{
39-
* dev/gen/gen_tpcdh_queries.sh
39+
* dev/gen/gen_tpch_queries.sh
4040
* }}}
4141
*/
4242
@Slow
@@ -59,20 +59,15 @@ class TPCHQuerySuite extends KyuubiFunSuite {
5959
in.close()
6060
queryName -> queryContent
6161
}.foreach { case (name, sql) =>
62-
try {
63-
val result = spark.sql(sql).collect()
64-
val schema = spark.sql(sql).schema
65-
val schemaDDL = LICENSE_HEADER + schema.toDDL + "\n"
66-
spark.createDataFrame(result.toList.asJava, schema).createTempView(s"$name$viewSuffix")
67-
val sumHashResult = LICENSE_HEADER + spark.sql(
68-
s"select sum(hash(*)) from $name$viewSuffix").collect().head.get(0) + "\n"
69-
val tuple = generateGoldenFiles("kyuubi/tpch", name, schemaDDL, sumHashResult)
70-
assert(schemaDDL == tuple._1)
71-
assert(sumHashResult == tuple._2)
72-
} catch {
73-
case cause: Throwable =>
74-
fail(name, cause)
75-
}
62+
val result = spark.sql(sql).collect()
63+
val schema = spark.sql(sql).schema
64+
val schemaDDL = LICENSE_HEADER + schema.toDDL + "\n"
65+
spark.createDataFrame(result.toList.asJava, schema).createTempView(s"$name$viewSuffix")
66+
val sumHashResult = LICENSE_HEADER + spark.sql(
67+
s"select sum(hash(*)) from $name$viewSuffix").collect().head.get(0) + "\n"
68+
val tuple = generateGoldenFiles("kyuubi/tpch", name, schemaDDL, sumHashResult)
69+
assert(schemaDDL == tuple._1, s"query $name schema not match")
70+
assert(sumHashResult == tuple._2, s"query $name result not match")
7671
}
7772
}
7873
}

0 commit comments

Comments
 (0)