fix q14

apache · Nov 17, 2023 · f44f392 · f44f392
1 parent 765cdaa
commit f44f392
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 18 deletions.
diff --git a/extensions/spark/kyuubi-spark-connector-tpch/src/main/resources/kyuubi/tpch/q14.sql b/extensions/spark/kyuubi-spark-connector-tpch/src/main/resources/kyuubi/tpch/q14.sql
@@ -17,11 +17,11 @@
 -- using default substitutions
 
 select
-    100.00 * sum(case
+    round(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
+    end) / sum(l_extendedprice * (1 - l_discount)),2) as promo_revenue
 from
     lineitem,
     part

diff --git a/...connector-tpch/src/test/scala/org/apache/kyuubi/spark/connector/tpch/TPCHQuerySuite.scala b/...connector-tpch/src/test/scala/org/apache/kyuubi/spark/connector/tpch/TPCHQuerySuite.scala
@@ -31,12 +31,12 @@ import org.apache.kyuubi.spark.connector.common.LocalSparkSession.withSparkSessi
 /**
  * To run this test suite:
  * {{{
- *   KYUUBI_UPDATE=0 dev/gen/gen_tpcdh_queries.sh
+ *   KYUUBI_UPDATE=0 dev/gen/gen_tpch_queries.sh
  * }}}
  *
  * To re-generate golden files for this suite:
  * {{{
- *   dev/gen/gen_tpcdh_queries.sh
+ *   dev/gen/gen_tpch_queries.sh
  * }}}
  */
 @Slow
@@ -59,20 +59,15 @@ class TPCHQuerySuite extends KyuubiFunSuite {
         in.close()
         queryName -> queryContent
       }.foreach { case (name, sql) =>
-        try {
-          val result = spark.sql(sql).collect()
-          val schema = spark.sql(sql).schema
-          val schemaDDL = LICENSE_HEADER + schema.toDDL + "\n"
-          spark.createDataFrame(result.toList.asJava, schema).createTempView(s"$name$viewSuffix")
-          val sumHashResult = LICENSE_HEADER + spark.sql(
-            s"select sum(hash(*)) from $name$viewSuffix").collect().head.get(0) + "\n"
-          val tuple = generateGoldenFiles("kyuubi/tpch", name, schemaDDL, sumHashResult)
-          assert(schemaDDL == tuple._1)
-          assert(sumHashResult == tuple._2)
-        } catch {
-          case cause: Throwable =>
-            fail(name, cause)
-        }
+        val result = spark.sql(sql).collect()
+        val schema = spark.sql(sql).schema
+        val schemaDDL = LICENSE_HEADER + schema.toDDL + "\n"
+        spark.createDataFrame(result.toList.asJava, schema).createTempView(s"$name$viewSuffix")
+        val sumHashResult = LICENSE_HEADER + spark.sql(
+          s"select sum(hash(*)) from $name$viewSuffix").collect().head.get(0) + "\n"
+        val tuple = generateGoldenFiles("kyuubi/tpch", name, schemaDDL, sumHashResult)
+        assert(schemaDDL == tuple._1, s"query $name schema not match")
+        assert(sumHashResult == tuple._2, s"query $name result not match")
       }
     }
   }