This is an automated email from the ASF dual-hosted git repository.
marong pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-gluten.git
The following commit(s) were added to refs/heads/main by this push:
new eca61bd4fe [GLUTEN-7665] Remove tpch-queries-velox (#7705)
eca61bd4fe is described below
commit eca61bd4fe54ab43e1f5e04baf28bc49383fdfc1
Author: Rong Ma <[email protected]>
AuthorDate: Tue Oct 29 09:03:01 2024 +0800
[GLUTEN-7665] Remove tpch-queries-velox (#7705)
---
...7a85-42da-b831-f489a5545d61-c000.snappy.parquet | Bin
...7d76-401b-8458-a8e31f8ab704-c000.snappy.parquet | Bin
...da96-4425-9ce8-d188f97f3afe-c000.snappy.parquet | Bin
...a98d-4103-83b1-0b5bcebe03eb-c000.snappy.parquet | Bin
...0ada-4e0b-a8aa-213d1e4c3797-c000.snappy.parquet | Bin
...3f91-4228-b003-64ad2c8059a1-c000.snappy.parquet | Bin
...46eb-4bf3-8f00-6eee7436761d-c000.snappy.parquet | Bin
...8a7b-4d7f-a34a-c97e9b4859f0-c000.snappy.parquet | Bin
.../src/test/resources/tpch-queries-velox/q1.sql | 24 ----------
.../src/test/resources/tpch-queries-velox/q10.sql | 35 --------------
.../src/test/resources/tpch-queries-velox/q11.sql | 30 ------------
.../src/test/resources/tpch-queries-velox/q12.sql | 31 -------------
.../src/test/resources/tpch-queries-velox/q13.sql | 23 ----------
.../src/test/resources/tpch-queries-velox/q14.sql | 16 -------
.../src/test/resources/tpch-queries-velox/q15.sql | 35 --------------
.../src/test/resources/tpch-queries-velox/q16.sql | 33 -------------
.../src/test/resources/tpch-queries-velox/q17.sql | 20 --------
.../src/test/resources/tpch-queries-velox/q18.sql | 36 ---------------
.../src/test/resources/tpch-queries-velox/q19.sql | 38 ---------------
.../src/test/resources/tpch-queries-velox/q2.sql | 47 -------------------
.../src/test/resources/tpch-queries-velox/q20.sql | 40 ----------------
.../src/test/resources/tpch-queries-velox/q21.sql | 43 -----------------
.../src/test/resources/tpch-queries-velox/q22.sql | 40 ----------------
.../src/test/resources/tpch-queries-velox/q3.sql | 26 -----------
.../src/test/resources/tpch-queries-velox/q4.sql | 24 ----------
.../src/test/resources/tpch-queries-velox/q5.sql | 27 -----------
.../src/test/resources/tpch-queries-velox/q6.sql | 12 -----
.../src/test/resources/tpch-queries-velox/q7.sql | 42 -----------------
.../src/test/resources/tpch-queries-velox/q8.sql | 40 ----------------
.../src/test/resources/tpch-queries-velox/q9.sql | 35 --------------
.../benchmarks/NativeBenchmarkPlanGenerator.scala | 2 +-
.../execution/DynamicOffHeapSizingSuite.scala | 2 +-
.../apache/gluten/execution/FallbackSuite.scala | 2 +-
.../gluten/execution/FunctionsValidateSuite.scala | 2 +-
.../gluten/execution/MiscOperatorSuite.scala | 2 +-
.../execution/VeloxAggregateFunctionsSuite.scala | 2 +-
.../gluten/execution/VeloxColumnarCacheSuite.scala | 2 +-
.../gluten/execution/VeloxHashJoinSuite.scala | 2 +-
.../gluten/execution/VeloxMetricsSuite.scala | 2 +-
.../execution/VeloxRoughCostModelSuite.scala | 2 +-
.../apache/gluten/execution/VeloxScanSuite.scala | 14 ++----
.../execution/VeloxStringFunctionsSuite.scala | 2 +-
.../apache/gluten/execution/VeloxTPCHSuite.scala | 51 ++++++++++-----------
.../execution/VeloxWindowExpressionSuite.scala | 2 +-
.../python/ArrowEvalPythonExecSuite.scala | 2 +-
.../gluten/expression/UDFPartialProjectSuite.scala | 2 +-
.../org/apache/gluten/fuzzer/FuzzerBase.scala | 2 +-
.../sql/execution/VeloxParquetWriteSuite.scala | 2 +-
docs/developers/HowTo.md | 4 +-
.../apache/gluten/execution/VeloxDeltaSuite.scala | 2 +-
.../gluten/execution/VeloxTPCHDeltaSuite.scala | 5 +-
.../apache/gluten/execution/VeloxHudiSuite.scala | 2 +-
.../gluten/execution/VeloxTPCHHudiSuite.scala | 5 +-
.../gluten/execution/VeloxIcebergSuite.scala | 2 +-
.../gluten/execution/VeloxTPCHIcebergSuite.scala | 5 +-
.../sql/hive/execution/GlutenHiveUDFSuite.scala | 2 +-
56 files changed, 55 insertions(+), 766 deletions(-)
diff --git
a/backends-velox/src/test/resources/tpch-data-parquet-velox/customer/part-00000-a1a42661-7a85-42da-b831-f489a5545d61-c000.snappy.parquet
b/backends-velox/src/test/resources/tpch-data-parquet/customer/part-00000-a1a42661-7a85-42da-b831-f489a5545d61-c000.snappy.parquet
similarity index 100%
rename from
backends-velox/src/test/resources/tpch-data-parquet-velox/customer/part-00000-a1a42661-7a85-42da-b831-f489a5545d61-c000.snappy.parquet
rename to
backends-velox/src/test/resources/tpch-data-parquet/customer/part-00000-a1a42661-7a85-42da-b831-f489a5545d61-c000.snappy.parquet
diff --git
a/backends-velox/src/test/resources/tpch-data-parquet-velox/lineitem/part-00000-6c374e0a-7d76-401b-8458-a8e31f8ab704-c000.snappy.parquet
b/backends-velox/src/test/resources/tpch-data-parquet/lineitem/part-00000-6c374e0a-7d76-401b-8458-a8e31f8ab704-c000.snappy.parquet
similarity index 100%
rename from
backends-velox/src/test/resources/tpch-data-parquet-velox/lineitem/part-00000-6c374e0a-7d76-401b-8458-a8e31f8ab704-c000.snappy.parquet
rename to
backends-velox/src/test/resources/tpch-data-parquet/lineitem/part-00000-6c374e0a-7d76-401b-8458-a8e31f8ab704-c000.snappy.parquet
diff --git
a/backends-velox/src/test/resources/tpch-data-parquet-velox/nation/part-00000-8a852c7b-da96-4425-9ce8-d188f97f3afe-c000.snappy.parquet
b/backends-velox/src/test/resources/tpch-data-parquet/nation/part-00000-8a852c7b-da96-4425-9ce8-d188f97f3afe-c000.snappy.parquet
similarity index 100%
rename from
backends-velox/src/test/resources/tpch-data-parquet-velox/nation/part-00000-8a852c7b-da96-4425-9ce8-d188f97f3afe-c000.snappy.parquet
rename to
backends-velox/src/test/resources/tpch-data-parquet/nation/part-00000-8a852c7b-da96-4425-9ce8-d188f97f3afe-c000.snappy.parquet
diff --git
a/backends-velox/src/test/resources/tpch-data-parquet-velox/orders/part-00000-41cc94ee-a98d-4103-83b1-0b5bcebe03eb-c000.snappy.parquet
b/backends-velox/src/test/resources/tpch-data-parquet/orders/part-00000-41cc94ee-a98d-4103-83b1-0b5bcebe03eb-c000.snappy.parquet
similarity index 100%
rename from
backends-velox/src/test/resources/tpch-data-parquet-velox/orders/part-00000-41cc94ee-a98d-4103-83b1-0b5bcebe03eb-c000.snappy.parquet
rename to
backends-velox/src/test/resources/tpch-data-parquet/orders/part-00000-41cc94ee-a98d-4103-83b1-0b5bcebe03eb-c000.snappy.parquet
diff --git
a/backends-velox/src/test/resources/tpch-data-parquet-velox/part/part-00000-e664e655-0ada-4e0b-a8aa-213d1e4c3797-c000.snappy.parquet
b/backends-velox/src/test/resources/tpch-data-parquet/part/part-00000-e664e655-0ada-4e0b-a8aa-213d1e4c3797-c000.snappy.parquet
similarity index 100%
rename from
backends-velox/src/test/resources/tpch-data-parquet-velox/part/part-00000-e664e655-0ada-4e0b-a8aa-213d1e4c3797-c000.snappy.parquet
rename to
backends-velox/src/test/resources/tpch-data-parquet/part/part-00000-e664e655-0ada-4e0b-a8aa-213d1e4c3797-c000.snappy.parquet
diff --git
a/backends-velox/src/test/resources/tpch-data-parquet-velox/partsupp/part-00000-2c7e524c-3f91-4228-b003-64ad2c8059a1-c000.snappy.parquet
b/backends-velox/src/test/resources/tpch-data-parquet/partsupp/part-00000-2c7e524c-3f91-4228-b003-64ad2c8059a1-c000.snappy.parquet
similarity index 100%
rename from
backends-velox/src/test/resources/tpch-data-parquet-velox/partsupp/part-00000-2c7e524c-3f91-4228-b003-64ad2c8059a1-c000.snappy.parquet
rename to
backends-velox/src/test/resources/tpch-data-parquet/partsupp/part-00000-2c7e524c-3f91-4228-b003-64ad2c8059a1-c000.snappy.parquet
diff --git
a/backends-velox/src/test/resources/tpch-data-parquet-velox/region/part-00000-90d7c5d9-46eb-4bf3-8f00-6eee7436761d-c000.snappy.parquet
b/backends-velox/src/test/resources/tpch-data-parquet/region/part-00000-90d7c5d9-46eb-4bf3-8f00-6eee7436761d-c000.snappy.parquet
similarity index 100%
rename from
backends-velox/src/test/resources/tpch-data-parquet-velox/region/part-00000-90d7c5d9-46eb-4bf3-8f00-6eee7436761d-c000.snappy.parquet
rename to
backends-velox/src/test/resources/tpch-data-parquet/region/part-00000-90d7c5d9-46eb-4bf3-8f00-6eee7436761d-c000.snappy.parquet
diff --git
a/backends-velox/src/test/resources/tpch-data-parquet-velox/supplier/part-00000-0a763951-8a7b-4d7f-a34a-c97e9b4859f0-c000.snappy.parquet
b/backends-velox/src/test/resources/tpch-data-parquet/supplier/part-00000-0a763951-8a7b-4d7f-a34a-c97e9b4859f0-c000.snappy.parquet
similarity index 100%
rename from
backends-velox/src/test/resources/tpch-data-parquet-velox/supplier/part-00000-0a763951-8a7b-4d7f-a34a-c97e9b4859f0-c000.snappy.parquet
rename to
backends-velox/src/test/resources/tpch-data-parquet/supplier/part-00000-0a763951-8a7b-4d7f-a34a-c97e9b4859f0-c000.snappy.parquet
diff --git a/backends-velox/src/test/resources/tpch-queries-velox/q1.sql
b/backends-velox/src/test/resources/tpch-queries-velox/q1.sql
deleted file mode 100644
index 0c77db75ae..0000000000
--- a/backends-velox/src/test/resources/tpch-queries-velox/q1.sql
+++ /dev/null
@@ -1,24 +0,0 @@
--- using default substitutions
-
-
-select
- l_returnflag,
- l_linestatus,
- sum(l_quantity) as sum_qty,
- sum(l_extendedprice) as sum_base_price,
- sum(l_extendedprice * (1 - l_discount)) as sum_disc_price,
- sum(l_extendedprice * (1 - l_discount) * (1 + l_tax)) as sum_charge,
- avg(l_quantity) as avg_qty,
- avg(l_extendedprice) as avg_price,
- avg(l_discount) as avg_disc,
- count(*) as count_order
-from
- lineitem
-where
- l_shipdate <= date '1998-12-01' - interval '90' day
-group by
- l_returnflag,
- l_linestatus
-order by
- l_returnflag,
- l_linestatus
diff --git a/backends-velox/src/test/resources/tpch-queries-velox/q10.sql
b/backends-velox/src/test/resources/tpch-queries-velox/q10.sql
deleted file mode 100644
index b8437039b7..0000000000
--- a/backends-velox/src/test/resources/tpch-queries-velox/q10.sql
+++ /dev/null
@@ -1,35 +0,0 @@
--- using default substitutions
-
-
-select
- c_custkey,
- c_name,
- sum(l_extendedprice * (1 - l_discount)) as revenue,
- c_acctbal,
- n_name,
- c_address,
- c_phone,
- c_comment
-from
- customer,
- orders,
- lineitem,
- nation
-where
- c_custkey = o_custkey
- and l_orderkey = o_orderkey
- and o_orderdate >= date '1993-10-01'
- and o_orderdate < date '1993-10-01' + interval '3' month
- and l_returnflag = 'R'
- and c_nationkey = n_nationkey
-group by
- c_custkey,
- c_name,
- c_acctbal,
- c_phone,
- n_name,
- c_address,
- c_comment
-order by
- revenue desc
-limit 20
diff --git a/backends-velox/src/test/resources/tpch-queries-velox/q11.sql
b/backends-velox/src/test/resources/tpch-queries-velox/q11.sql
deleted file mode 100644
index a85be271f8..0000000000
--- a/backends-velox/src/test/resources/tpch-queries-velox/q11.sql
+++ /dev/null
@@ -1,30 +0,0 @@
--- using default substitutions
-
-
-select
- ps_partkey,
- sum(ps_supplycost * ps_availqty) as value
-from
- partsupp,
- supplier,
- nation
-where
- ps_suppkey = s_suppkey
- and s_nationkey = n_nationkey
- and n_name = 'GERMANY'
-group by
- ps_partkey having
- sum(ps_supplycost * ps_availqty) > (
- select
- sum(ps_supplycost * ps_availqty) * 0.0001000000
- from
- partsupp,
- supplier,
- nation
- where
- ps_suppkey = s_suppkey
- and s_nationkey = n_nationkey
- and n_name = 'GERMANY'
- )
-order by
- value desc
diff --git a/backends-velox/src/test/resources/tpch-queries-velox/q12.sql
b/backends-velox/src/test/resources/tpch-queries-velox/q12.sql
deleted file mode 100644
index 810cc56d4d..0000000000
--- a/backends-velox/src/test/resources/tpch-queries-velox/q12.sql
+++ /dev/null
@@ -1,31 +0,0 @@
--- using default substitutions
-
-
-select
- l_shipmode,
- sum(case
- when o_orderpriority = '1-URGENT'
- or o_orderpriority = '2-HIGH'
- then 1
- else 0
- end) as high_line_count,
- sum(case
- when o_orderpriority <> '1-URGENT'
- and o_orderpriority <> '2-HIGH'
- then 1
- else 0
- end) as low_line_count
-from
- orders,
- lineitem
-where
- o_orderkey = l_orderkey
- and l_shipmode in ('MAIL', 'SHIP')
- and l_commitdate < l_receiptdate
- and l_shipdate < l_commitdate
- and l_receiptdate >= date '1994-01-01'
- and l_receiptdate < date '1994-01-01' + interval '1' year
-group by
- l_shipmode
-order by
- l_shipmode
diff --git a/backends-velox/src/test/resources/tpch-queries-velox/q13.sql
b/backends-velox/src/test/resources/tpch-queries-velox/q13.sql
deleted file mode 100644
index b3fdbcb640..0000000000
--- a/backends-velox/src/test/resources/tpch-queries-velox/q13.sql
+++ /dev/null
@@ -1,23 +0,0 @@
--- using default substitutions
-
-
-select
- c_count,
- count(*) as custdist
-from
- (
- select
- c_custkey,
- count(o_orderkey) as c_count
- from
- customer left outer join orders on
- c_custkey = o_custkey
- and o_comment not like '%special%requests%'
- group by
- c_custkey
- ) as c_orders
-group by
- c_count
-order by
- custdist desc,
- c_count desc
diff --git a/backends-velox/src/test/resources/tpch-queries-velox/q14.sql
b/backends-velox/src/test/resources/tpch-queries-velox/q14.sql
deleted file mode 100644
index 0ad826f3dd..0000000000
--- a/backends-velox/src/test/resources/tpch-queries-velox/q14.sql
+++ /dev/null
@@ -1,16 +0,0 @@
--- using default substitutions
-
-
-select
- 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
-from
- lineitem,
- part
-where
- l_partkey = p_partkey
- and l_shipdate >= date '1995-09-01'
- and l_shipdate < date '1995-09-01' + interval '1' month
diff --git a/backends-velox/src/test/resources/tpch-queries-velox/q15.sql
b/backends-velox/src/test/resources/tpch-queries-velox/q15.sql
deleted file mode 100644
index 64d0b48ec0..0000000000
--- a/backends-velox/src/test/resources/tpch-queries-velox/q15.sql
+++ /dev/null
@@ -1,35 +0,0 @@
--- using default substitutions
-
-with revenue0 as
- (select
- l_suppkey as supplier_no,
- sum(l_extendedprice * (1 - l_discount)) as total_revenue
- from
- lineitem
- where
- l_shipdate >= date '1996-01-01'
- and l_shipdate < date '1996-01-01' + interval '3' month
- group by
- l_suppkey)
-
-
-select
- s_suppkey,
- s_name,
- s_address,
- s_phone,
- total_revenue
-from
- supplier,
- revenue0
-where
- s_suppkey = supplier_no
- and total_revenue = (
- select
- max(total_revenue)
- from
- revenue0
- )
-order by
- s_suppkey
-
diff --git a/backends-velox/src/test/resources/tpch-queries-velox/q16.sql
b/backends-velox/src/test/resources/tpch-queries-velox/q16.sql
deleted file mode 100644
index f155702fc0..0000000000
--- a/backends-velox/src/test/resources/tpch-queries-velox/q16.sql
+++ /dev/null
@@ -1,33 +0,0 @@
--- using default substitutions
-
-
-select
- p_brand,
- p_type,
- p_size,
- count(distinct ps_suppkey) as supplier_cnt
-from
- partsupp,
- part
-where
- p_partkey = ps_partkey
- and p_brand <> 'Brand#45'
- and p_type not like 'MEDIUM POLISHED%'
- and p_size in (49, 14, 23, 45, 19, 3, 36, 9)
- and ps_suppkey not in (
- select
- s_suppkey
- from
- supplier
- where
- s_comment like '%Customer%Complaints%'
- )
-group by
- p_brand,
- p_type,
- p_size
-order by
- supplier_cnt desc,
- p_brand,
- p_type,
- p_size
diff --git a/backends-velox/src/test/resources/tpch-queries-velox/q17.sql
b/backends-velox/src/test/resources/tpch-queries-velox/q17.sql
deleted file mode 100644
index fcc60d27d1..0000000000
--- a/backends-velox/src/test/resources/tpch-queries-velox/q17.sql
+++ /dev/null
@@ -1,20 +0,0 @@
--- using default substitutions
-
-
-select
- sum(l_extendedprice) / 7.0 as avg_yearly
-from
- lineitem,
- part
-where
- p_partkey = l_partkey
- and p_brand = 'Brand#23'
- and p_container = 'MED BOX'
- and l_quantity < (
- select
- 0.2 * avg(l_quantity)
- from
- lineitem
- where
- l_partkey = p_partkey
- )
diff --git a/backends-velox/src/test/resources/tpch-queries-velox/q18.sql
b/backends-velox/src/test/resources/tpch-queries-velox/q18.sql
deleted file mode 100644
index a74f3168ba..0000000000
--- a/backends-velox/src/test/resources/tpch-queries-velox/q18.sql
+++ /dev/null
@@ -1,36 +0,0 @@
--- using default substitutions
-
-
-select
- c_name,
- c_custkey,
- o_orderkey,
- o_orderdate,
- o_totalprice,
- sum(l_quantity)
-from
- customer,
- orders,
- lineitem
-where
- o_orderkey in (
- select
- l_orderkey
- from
- lineitem
- group by
- l_orderkey having
- sum(l_quantity) > 300
- )
- and c_custkey = o_custkey
- and o_orderkey = l_orderkey
-group by
- c_name,
- c_custkey,
- o_orderkey,
- o_orderdate,
- o_totalprice
-order by
- o_totalprice desc,
- o_orderdate
-limit 100
diff --git a/backends-velox/src/test/resources/tpch-queries-velox/q19.sql
b/backends-velox/src/test/resources/tpch-queries-velox/q19.sql
deleted file mode 100644
index 0163e1555d..0000000000
--- a/backends-velox/src/test/resources/tpch-queries-velox/q19.sql
+++ /dev/null
@@ -1,38 +0,0 @@
--- using default substitutions
-
-
-select
- sum(l_extendedprice* (1 - l_discount)) as revenue
-from
- lineitem,
- part
-where
- (
- p_partkey = l_partkey
- and p_brand = 'Brand#12'
- and p_container in ('SM CASE', 'SM BOX', 'SM PACK', 'SM PKG')
- and l_quantity >= 1 and l_quantity <= 1 + 10
- and p_size between 1 and 5
- and l_shipmode in ('AIR', 'AIR REG')
- and l_shipinstruct = 'DELIVER IN PERSON'
- )
- or
- (
- p_partkey = l_partkey
- and p_brand = 'Brand#23'
- and p_container in ('MED BAG', 'MED BOX', 'MED PKG', 'MED PACK')
- and l_quantity >= 10 and l_quantity <= 10 + 10
- and p_size between 1 and 10
- and l_shipmode in ('AIR', 'AIR REG')
- and l_shipinstruct = 'DELIVER IN PERSON'
- )
- or
- (
- p_partkey = l_partkey
- and p_brand = 'Brand#34'
- and p_container in ('LG CASE', 'LG BOX', 'LG PACK', 'LG PKG')
- and l_quantity >= 20 and l_quantity <= 20 + 10
- and p_size between 1 and 15
- and l_shipmode in ('AIR', 'AIR REG')
- and l_shipinstruct = 'DELIVER IN PERSON'
- )
diff --git a/backends-velox/src/test/resources/tpch-queries-velox/q2.sql
b/backends-velox/src/test/resources/tpch-queries-velox/q2.sql
deleted file mode 100644
index 2cf1165620..0000000000
--- a/backends-velox/src/test/resources/tpch-queries-velox/q2.sql
+++ /dev/null
@@ -1,47 +0,0 @@
--- using default substitutions
-
-
-select
- s_acctbal,
- s_name,
- n_name,
- p_partkey,
- p_mfgr,
- s_address,
- s_phone,
- s_comment
-from
- part,
- supplier,
- partsupp,
- nation,
- region
-where
- p_partkey = ps_partkey
- and s_suppkey = ps_suppkey
- and p_size = 15
- and p_type like '%BRASS'
- and s_nationkey = n_nationkey
- and n_regionkey = r_regionkey
- and r_name = 'EUROPE'
- and ps_supplycost = (
- select
- min(ps_supplycost)
- from
- partsupp,
- supplier,
- nation,
- region
- where
- p_partkey = ps_partkey
- and s_suppkey = ps_suppkey
- and s_nationkey = n_nationkey
- and n_regionkey = r_regionkey
- and r_name = 'EUROPE'
- )
-order by
- s_acctbal desc,
- n_name,
- s_name,
- p_partkey
-limit 100
diff --git a/backends-velox/src/test/resources/tpch-queries-velox/q20.sql
b/backends-velox/src/test/resources/tpch-queries-velox/q20.sql
deleted file mode 100644
index a7b8706b40..0000000000
--- a/backends-velox/src/test/resources/tpch-queries-velox/q20.sql
+++ /dev/null
@@ -1,40 +0,0 @@
--- using default substitutions
-
-
-select
- s_name,
- s_address
-from
- supplier,
- nation
-where
- s_suppkey in (
- select
- ps_suppkey
- from
- partsupp
- where
- ps_partkey in (
- select
- p_partkey
- from
- part
- where
- p_name like 'forest%'
- )
- and ps_availqty > (
- select
- 0.5 * sum(l_quantity)
- from
- lineitem
- where
- l_partkey = ps_partkey
- and l_suppkey = ps_suppkey
- and l_shipdate >= date '1994-01-01'
- and l_shipdate < date '1994-01-01' +
interval '1' year
- )
- )
- and s_nationkey = n_nationkey
- and n_name = 'CANADA'
-order by
- s_name
diff --git a/backends-velox/src/test/resources/tpch-queries-velox/q21.sql
b/backends-velox/src/test/resources/tpch-queries-velox/q21.sql
deleted file mode 100644
index 7a39f25332..0000000000
--- a/backends-velox/src/test/resources/tpch-queries-velox/q21.sql
+++ /dev/null
@@ -1,43 +0,0 @@
--- using default substitutions
-
-
-select
- s_name,
- count(*) as numwait
-from
- supplier,
- lineitem l1,
- orders,
- nation
-where
- s_suppkey = l1.l_suppkey
- and o_orderkey = l1.l_orderkey
- and o_orderstatus = 'F'
- and l1.l_receiptdate > l1.l_commitdate
- and exists (
- select
- *
- from
- lineitem l2
- where
- l2.l_orderkey = l1.l_orderkey
- and l2.l_suppkey <> l1.l_suppkey
- )
- and not exists (
- select
- *
- from
- lineitem l3
- where
- l3.l_orderkey = l1.l_orderkey
- and l3.l_suppkey <> l1.l_suppkey
- and l3.l_receiptdate > l3.l_commitdate
- )
- and s_nationkey = n_nationkey
- and n_name = 'SAUDI ARABIA'
-group by
- s_name
-order by
- numwait desc,
- s_name
-limit 100
diff --git a/backends-velox/src/test/resources/tpch-queries-velox/q22.sql
b/backends-velox/src/test/resources/tpch-queries-velox/q22.sql
deleted file mode 100644
index 5c76407095..0000000000
--- a/backends-velox/src/test/resources/tpch-queries-velox/q22.sql
+++ /dev/null
@@ -1,40 +0,0 @@
--- using default substitutions
-
-
-select
- cntrycode,
- count(*) as numcust,
- sum(c_acctbal) as totacctbal
-from
- (
- select
- substring(c_phone, 1, 2) as cntrycode,
- c_acctbal
- from
- customer
- where
- substring(c_phone, 1, 2) in
- ('13', '31', '23', '29', '30', '18', '17')
- and c_acctbal > (
- select
- avg(c_acctbal)
- from
- customer
- where
- c_acctbal > 0.00
- and substring(c_phone, 1, 2) in
- ('13', '31', '23', '29', '30',
'18', '17')
- )
- and not exists (
- select
- *
- from
- orders
- where
- o_custkey = c_custkey
- )
- ) as custsale
-group by
- cntrycode
-order by
- cntrycode
diff --git a/backends-velox/src/test/resources/tpch-queries-velox/q3.sql
b/backends-velox/src/test/resources/tpch-queries-velox/q3.sql
deleted file mode 100644
index c30c5280ea..0000000000
--- a/backends-velox/src/test/resources/tpch-queries-velox/q3.sql
+++ /dev/null
@@ -1,26 +0,0 @@
--- using default substitutions
-
-
-select
- l_orderkey,
- sum(l_extendedprice * (1 - l_discount)) as revenue,
- o_orderdate,
- o_shippriority
-from
- customer,
- orders,
- lineitem
-where
- c_mktsegment = 'BUILDING'
- and c_custkey = o_custkey
- and l_orderkey = o_orderkey
- and o_orderdate < date '1995-03-15'
- and l_shipdate > date '1995-03-15'
-group by
- l_orderkey,
- o_orderdate,
- o_shippriority
-order by
- revenue desc,
- o_orderdate
-limit 10
diff --git a/backends-velox/src/test/resources/tpch-queries-velox/q4.sql
b/backends-velox/src/test/resources/tpch-queries-velox/q4.sql
deleted file mode 100644
index 659f6f5d6e..0000000000
--- a/backends-velox/src/test/resources/tpch-queries-velox/q4.sql
+++ /dev/null
@@ -1,24 +0,0 @@
--- using default substitutions
-
-
-select
- o_orderpriority,
- count(*) as order_count
-from
- orders
-where
- o_orderdate >= date '1993-07-01'
- and o_orderdate < date '1993-07-01' + interval '3' month
- and exists (
- select
- *
- from
- lineitem
- where
- l_orderkey = o_orderkey
- and l_commitdate < l_receiptdate
- )
-group by
- o_orderpriority
-order by
- o_orderpriority
diff --git a/backends-velox/src/test/resources/tpch-queries-velox/q5.sql
b/backends-velox/src/test/resources/tpch-queries-velox/q5.sql
deleted file mode 100644
index bc6fece255..0000000000
--- a/backends-velox/src/test/resources/tpch-queries-velox/q5.sql
+++ /dev/null
@@ -1,27 +0,0 @@
--- using default substitutions
-
-
-select
- n_name,
- sum(l_extendedprice * (1 - l_discount)) as revenue
-from
- customer,
- orders,
- lineitem,
- supplier,
- nation,
- region
-where
- c_custkey = o_custkey
- and l_orderkey = o_orderkey
- and l_suppkey = s_suppkey
- and c_nationkey = s_nationkey
- and s_nationkey = n_nationkey
- and n_regionkey = r_regionkey
- and r_name = 'ASIA'
- and o_orderdate >= date '1994-01-01'
- and o_orderdate < date '1994-01-01' + interval '1' year
-group by
- n_name
-order by
- revenue desc
diff --git a/backends-velox/src/test/resources/tpch-queries-velox/q6.sql
b/backends-velox/src/test/resources/tpch-queries-velox/q6.sql
deleted file mode 100644
index 92496dac4f..0000000000
--- a/backends-velox/src/test/resources/tpch-queries-velox/q6.sql
+++ /dev/null
@@ -1,12 +0,0 @@
--- using default substitutions
-
-
-select
- sum(l_extendedprice * l_discount) as revenue
-from
- lineitem
-where
- l_shipdate >= date '1994-01-01'
- and l_shipdate < date '1994-01-01' + interval '1' year
- and l_discount between .06 - 0.01 and .06 + 0.01
- and l_quantity < 24
diff --git a/backends-velox/src/test/resources/tpch-queries-velox/q7.sql
b/backends-velox/src/test/resources/tpch-queries-velox/q7.sql
deleted file mode 100644
index eb3c51c9ba..0000000000
--- a/backends-velox/src/test/resources/tpch-queries-velox/q7.sql
+++ /dev/null
@@ -1,42 +0,0 @@
--- using default substitutions
-
-
-select
- supp_nation,
- cust_nation,
- l_year,
- sum(volume) as revenue
-from
- (
- select
- n1.n_name as supp_nation,
- n2.n_name as cust_nation,
- year(l_shipdate) as l_year,
- l_extendedprice * (1 - l_discount) as volume
- from
- supplier,
- lineitem,
- orders,
- customer,
- nation n1,
- nation n2
- where
- s_suppkey = l_suppkey
- and o_orderkey = l_orderkey
- and c_custkey = o_custkey
- and s_nationkey = n1.n_nationkey
- and c_nationkey = n2.n_nationkey
- and (
- (n1.n_name = 'FRANCE' and n2.n_name = 'GERMANY')
- or (n1.n_name = 'GERMANY' and n2.n_name =
'FRANCE')
- )
- and l_shipdate between date '1995-01-01' and date
'1996-12-31'
- ) as shipping
-group by
- supp_nation,
- cust_nation,
- l_year
-order by
- supp_nation,
- cust_nation,
- l_year
diff --git a/backends-velox/src/test/resources/tpch-queries-velox/q8.sql
b/backends-velox/src/test/resources/tpch-queries-velox/q8.sql
deleted file mode 100644
index ca15ebf0bf..0000000000
--- a/backends-velox/src/test/resources/tpch-queries-velox/q8.sql
+++ /dev/null
@@ -1,40 +0,0 @@
--- using default substitutions
-
-
-select
- o_year,
- sum(case
- when nation = 'BRAZIL' then volume
- else 0
- end) / sum(volume) as mkt_share
-from
- (
- select
- year(o_orderdate) as o_year,
- l_extendedprice * (1 - l_discount) as volume,
- n2.n_name as nation
- from
- part,
- supplier,
- lineitem,
- orders,
- customer,
- nation n1,
- nation n2,
- region
- where
- p_partkey = l_partkey
- and s_suppkey = l_suppkey
- and l_orderkey = o_orderkey
- and o_custkey = c_custkey
- and c_nationkey = n1.n_nationkey
- and n1.n_regionkey = r_regionkey
- and r_name = 'AMERICA'
- and s_nationkey = n2.n_nationkey
- and o_orderdate between date '1995-01-01' and date
'1996-12-31'
- and p_type = 'ECONOMY ANODIZED STEEL'
- ) as all_nations
-group by
- o_year
-order by
- o_year
diff --git a/backends-velox/src/test/resources/tpch-queries-velox/q9.sql
b/backends-velox/src/test/resources/tpch-queries-velox/q9.sql
deleted file mode 100644
index 9925b18424..0000000000
--- a/backends-velox/src/test/resources/tpch-queries-velox/q9.sql
+++ /dev/null
@@ -1,35 +0,0 @@
--- using default substitutions
-
-
-select
- nation,
- o_year,
- sum(amount) as sum_profit
-from
- (
- select
- n_name as nation,
- year(o_orderdate) as o_year,
- l_extendedprice * (1 - l_discount) - ps_supplycost *
l_quantity as amount
- from
- part,
- supplier,
- lineitem,
- partsupp,
- orders,
- nation
- where
- s_suppkey = l_suppkey
- and ps_suppkey = l_suppkey
- and ps_partkey = l_partkey
- and p_partkey = l_partkey
- and o_orderkey = l_orderkey
- and s_nationkey = n_nationkey
- and p_name like '%green%'
- ) as profit
-group by
- nation,
- o_year
-order by
- nation,
- o_year desc
diff --git
a/backends-velox/src/test/scala/org/apache/gluten/benchmarks/NativeBenchmarkPlanGenerator.scala
b/backends-velox/src/test/scala/org/apache/gluten/benchmarks/NativeBenchmarkPlanGenerator.scala
index e19fe035f5..57fbca1744 100644
---
a/backends-velox/src/test/scala/org/apache/gluten/benchmarks/NativeBenchmarkPlanGenerator.scala
+++
b/backends-velox/src/test/scala/org/apache/gluten/benchmarks/NativeBenchmarkPlanGenerator.scala
@@ -35,7 +35,7 @@ import scala.collection.JavaConverters._
object GenerateExample extends Tag("org.apache.gluten.tags.GenerateExample")
class NativeBenchmarkPlanGenerator extends VeloxWholeStageTransformerSuite {
- override protected val resourcePath: String = "/tpch-data-parquet-velox"
+ override protected val resourcePath: String = "/tpch-data-parquet"
override protected val fileFormat: String = "parquet"
val generatedPlanDir = getClass.getResource("/").getPath +
"../../../generated-native-benchmark/"
val outputFileFormat = "parquet"
diff --git
a/backends-velox/src/test/scala/org/apache/gluten/execution/DynamicOffHeapSizingSuite.scala
b/backends-velox/src/test/scala/org/apache/gluten/execution/DynamicOffHeapSizingSuite.scala
index 51d06110ed..8ada8d1c81 100644
---
a/backends-velox/src/test/scala/org/apache/gluten/execution/DynamicOffHeapSizingSuite.scala
+++
b/backends-velox/src/test/scala/org/apache/gluten/execution/DynamicOffHeapSizingSuite.scala
@@ -23,7 +23,7 @@ import org.apache.spark.SparkConf
@SkipTestTags
class DynamicOffHeapSizingSuite extends VeloxWholeStageTransformerSuite {
- override protected val resourcePath: String = "/tpch-data-parquet-velox"
+ override protected val resourcePath: String = "/tpch-data-parquet"
override protected val fileFormat: String = "parquet"
private val dataGenerator =
RandomParquetDataGenerator(System.currentTimeMillis())
diff --git
a/backends-velox/src/test/scala/org/apache/gluten/execution/FallbackSuite.scala
b/backends-velox/src/test/scala/org/apache/gluten/execution/FallbackSuite.scala
index 0f12569232..2680ea4101 100644
---
a/backends-velox/src/test/scala/org/apache/gluten/execution/FallbackSuite.scala
+++
b/backends-velox/src/test/scala/org/apache/gluten/execution/FallbackSuite.scala
@@ -27,7 +27,7 @@ import
org.apache.spark.sql.execution.joins.{BroadcastHashJoinExec, SortMergeJoi
class FallbackSuite extends VeloxWholeStageTransformerSuite with
AdaptiveSparkPlanHelper {
protected val rootPath: String = getClass.getResource("/").getPath
- override protected val resourcePath: String = "/tpch-data-parquet-velox"
+ override protected val resourcePath: String = "/tpch-data-parquet"
override protected val fileFormat: String = "parquet"
override protected def sparkConf: SparkConf = {
diff --git
a/backends-velox/src/test/scala/org/apache/gluten/execution/FunctionsValidateSuite.scala
b/backends-velox/src/test/scala/org/apache/gluten/execution/FunctionsValidateSuite.scala
index a9c5cf70da..a723721ab9 100644
---
a/backends-velox/src/test/scala/org/apache/gluten/execution/FunctionsValidateSuite.scala
+++
b/backends-velox/src/test/scala/org/apache/gluten/execution/FunctionsValidateSuite.scala
@@ -26,7 +26,7 @@ import java.nio.file.Files
import scala.collection.JavaConverters._
class FunctionsValidateSuite extends WholeStageTransformerSuite {
- override protected val resourcePath: String = "/tpch-data-parquet-velox"
+ override protected val resourcePath: String = "/tpch-data-parquet"
override protected val fileFormat: String = "parquet"
private var parquetPath: String = _
diff --git
a/backends-velox/src/test/scala/org/apache/gluten/execution/MiscOperatorSuite.scala
b/backends-velox/src/test/scala/org/apache/gluten/execution/MiscOperatorSuite.scala
index 7ddab8769f..7e9b48e96c 100644
---
a/backends-velox/src/test/scala/org/apache/gluten/execution/MiscOperatorSuite.scala
+++
b/backends-velox/src/test/scala/org/apache/gluten/execution/MiscOperatorSuite.scala
@@ -36,7 +36,7 @@ import scala.collection.JavaConverters
class MiscOperatorSuite extends VeloxWholeStageTransformerSuite with
AdaptiveSparkPlanHelper {
protected val rootPath: String = getClass.getResource("/").getPath
- override protected val resourcePath: String = "/tpch-data-parquet-velox"
+ override protected val resourcePath: String = "/tpch-data-parquet"
override protected val fileFormat: String = "parquet"
import testImplicits._
diff --git
a/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxAggregateFunctionsSuite.scala
b/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxAggregateFunctionsSuite.scala
index dc488d4467..84d1fe8db9 100644
---
a/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxAggregateFunctionsSuite.scala
+++
b/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxAggregateFunctionsSuite.scala
@@ -30,7 +30,7 @@ import java.sql.Timestamp
abstract class VeloxAggregateFunctionsSuite extends
VeloxWholeStageTransformerSuite {
protected val rootPath: String = getClass.getResource("/").getPath
- override protected val resourcePath: String = "/tpch-data-parquet-velox"
+ override protected val resourcePath: String = "/tpch-data-parquet"
override protected val fileFormat: String = "parquet"
import testImplicits._
diff --git
a/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxColumnarCacheSuite.scala
b/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxColumnarCacheSuite.scala
index a25f1b9c5f..6786a47a4e 100644
---
a/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxColumnarCacheSuite.scala
+++
b/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxColumnarCacheSuite.scala
@@ -27,7 +27,7 @@ import
org.apache.spark.sql.execution.columnar.InMemoryTableScanExec
import org.apache.spark.storage.StorageLevel
class VeloxColumnarCacheSuite extends VeloxWholeStageTransformerSuite with
AdaptiveSparkPlanHelper {
- override protected val resourcePath: String = "/tpch-data-parquet-velox"
+ override protected val resourcePath: String = "/tpch-data-parquet"
override protected val fileFormat: String = "parquet"
override def beforeAll(): Unit = {
diff --git
a/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxHashJoinSuite.scala
b/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxHashJoinSuite.scala
index 4c1baf856c..49678189bd 100644
---
a/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxHashJoinSuite.scala
+++
b/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxHashJoinSuite.scala
@@ -24,7 +24,7 @@ import
org.apache.spark.sql.execution.{ColumnarBroadcastExchangeExec, InputItera
import org.apache.spark.sql.execution.exchange.{BroadcastExchangeExec,
ReusedExchangeExec}
class VeloxHashJoinSuite extends VeloxWholeStageTransformerSuite {
- override protected val resourcePath: String = "/tpch-data-parquet-velox"
+ override protected val resourcePath: String = "/tpch-data-parquet"
override protected val fileFormat: String = "parquet"
override def beforeAll(): Unit = {
diff --git
a/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxMetricsSuite.scala
b/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxMetricsSuite.scala
index ac85892b7a..4a25144984 100644
---
a/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxMetricsSuite.scala
+++
b/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxMetricsSuite.scala
@@ -27,7 +27,7 @@ import
org.apache.spark.sql.execution.adaptive.AdaptiveSparkPlanHelper
import org.apache.spark.sql.internal.SQLConf
class VeloxMetricsSuite extends VeloxWholeStageTransformerSuite with
AdaptiveSparkPlanHelper {
- override protected val resourcePath: String = "/tpch-data-parquet-velox"
+ override protected val resourcePath: String = "/tpch-data-parquet"
override protected val fileFormat: String = "parquet"
override def beforeAll(): Unit = {
diff --git
a/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxRoughCostModelSuite.scala
b/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxRoughCostModelSuite.scala
index 180a8febb6..86566dd0cd 100644
---
a/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxRoughCostModelSuite.scala
+++
b/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxRoughCostModelSuite.scala
@@ -22,7 +22,7 @@ import org.apache.spark.SparkConf
import org.apache.spark.sql.execution.ProjectExec
class VeloxRoughCostModelSuite extends VeloxWholeStageTransformerSuite {
- override protected val resourcePath: String = "/tpch-data-parquet-velox"
+ override protected val resourcePath: String = "/tpch-data-parquet"
override protected val fileFormat: String = "parquet"
override def beforeAll(): Unit = {
diff --git
a/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxScanSuite.scala
b/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxScanSuite.scala
index 852a1f4fbc..a50bffa3ed 100644
---
a/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxScanSuite.scala
+++
b/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxScanSuite.scala
@@ -26,10 +26,11 @@ import org.apache.spark.sql.execution.ScalarSubquery
class VeloxScanSuite extends VeloxWholeStageTransformerSuite {
protected val rootPath: String = getClass.getResource("/").getPath
- override protected val resourcePath: String = "/tpch-data-parquet-velox"
+ override protected val resourcePath: String = "/tpch-data-parquet"
override protected val fileFormat: String = "parquet"
- protected val veloxTPCHQueries: String = rootPath + "/tpch-queries-velox"
+ protected val tpchQueries: String =
+ rootPath +
"../../../../tools/gluten-it/common/src/main/resources/tpch-queries"
protected val queriesResults: String = rootPath + "queries-output"
override protected def sparkConf: SparkConf = super.sparkConf
@@ -41,7 +42,7 @@ class VeloxScanSuite extends VeloxWholeStageTransformerSuite {
test("tpch q22 subquery filter pushdown - v1") {
createTPCHNotNullTables()
- runTPCHQuery(22, veloxTPCHQueries, queriesResults, compareResult = false,
noFallBack = false) {
+ runTPCHQuery(22, tpchQueries, queriesResults, compareResult = false,
noFallBack = false) {
df =>
val plan = df.queryExecution.executedPlan
val exist = plan.collect { case scan: FileSourceScanExecTransformer =>
scan }.exists {
@@ -59,12 +60,7 @@ class VeloxScanSuite extends VeloxWholeStageTransformerSuite
{
withSQLConf("spark.sql.sources.useV1SourceList" -> "") {
// Tables must be created here, otherwise v2 scan will not be used.
createTPCHNotNullTables()
- runTPCHQuery(
- 22,
- veloxTPCHQueries,
- queriesResults,
- compareResult = false,
- noFallBack = false) {
+ runTPCHQuery(22, tpchQueries, queriesResults, compareResult = false,
noFallBack = false) {
df =>
val plan = df.queryExecution.executedPlan
val exist = plan.collect { case scan: BatchScanExecTransformer =>
scan }.exists {
diff --git
a/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxStringFunctionsSuite.scala
b/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxStringFunctionsSuite.scala
index 9357bc754d..1bef5f991f 100644
---
a/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxStringFunctionsSuite.scala
+++
b/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxStringFunctionsSuite.scala
@@ -26,7 +26,7 @@ import org.apache.spark.sql.types.StringType
class VeloxStringFunctionsSuite extends VeloxWholeStageTransformerSuite {
protected val rootPath: String = getClass.getResource("/").getPath
- override protected val resourcePath: String = "/tpch-data-parquet-velox"
+ override protected val resourcePath: String = "/tpch-data-parquet"
override protected val fileFormat: String = "parquet"
final val NULL_STR_COL: String = "nullStringColumn"
diff --git
a/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxTPCHSuite.scala
b/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxTPCHSuite.scala
index 0e94c242c1..44ffae45ad 100644
---
a/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxTPCHSuite.scala
+++
b/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxTPCHSuite.scala
@@ -29,12 +29,11 @@ import java.nio.charset.StandardCharsets
abstract class VeloxTPCHTableSupport extends VeloxWholeStageTransformerSuite {
protected val rootPath: String = getClass.getResource("/").getPath
- override protected val resourcePath: String = "/tpch-data-parquet-velox"
+ override protected val resourcePath: String = "/tpch-data-parquet"
override protected val fileFormat: String = "parquet"
- // TODO: the tpch query was changed a bit. Because date was converted into
string in the test
- // dataset, the queries were changed accordingly.
- protected val veloxTPCHQueries: String = rootPath + "/tpch-queries-velox"
+ protected val tpchQueries: String =
+ rootPath +
"../../../../tools/gluten-it/common/src/main/resources/tpch-queries"
// TODO: result comparison is not supported currently.
protected val queriesResults: String = rootPath + "queries-output"
@@ -118,133 +117,133 @@ abstract class VeloxTPCHSuite extends
VeloxTPCHTableSupport {
}
test("TPC-H q1") {
- runTPCHQuery(1, veloxTPCHQueries, queriesResults, compareResult = false,
noFallBack = false) {
+ runTPCHQuery(1, tpchQueries, queriesResults, compareResult = false,
noFallBack = false) {
checkGoldenFile(_, 1)
}
}
test("TPC-H q2") {
- runTPCHQuery(2, veloxTPCHQueries, queriesResults, compareResult = false,
noFallBack = false) {
+ runTPCHQuery(2, tpchQueries, queriesResults, compareResult = false,
noFallBack = false) {
_ => // due to tpc-h q2 will generate multiple plans, skip checking
golden file for now
}
}
test("TPC-H q3") {
- runTPCHQuery(3, veloxTPCHQueries, queriesResults, compareResult = false,
noFallBack = false) {
+ runTPCHQuery(3, tpchQueries, queriesResults, compareResult = false,
noFallBack = false) {
checkGoldenFile(_, 3)
}
}
test("TPC-H q4") {
- runTPCHQuery(4, veloxTPCHQueries, queriesResults, compareResult = false,
noFallBack = false) {
+ runTPCHQuery(4, tpchQueries, queriesResults, compareResult = false,
noFallBack = false) {
checkGoldenFile(_, 4)
}
}
test("TPC-H q5") {
- runTPCHQuery(5, veloxTPCHQueries, queriesResults, compareResult = false,
noFallBack = false) {
+ runTPCHQuery(5, tpchQueries, queriesResults, compareResult = false,
noFallBack = false) {
checkGoldenFile(_, 5)
}
}
test("TPC-H q6") {
- runTPCHQuery(6, veloxTPCHQueries, queriesResults, compareResult = false,
noFallBack = false) {
+ runTPCHQuery(6, tpchQueries, queriesResults, compareResult = false,
noFallBack = false) {
checkGoldenFile(_, 6)
}
}
test("TPC-H q7") {
- runTPCHQuery(7, veloxTPCHQueries, queriesResults, compareResult = false,
noFallBack = false) {
+ runTPCHQuery(7, tpchQueries, queriesResults, compareResult = false,
noFallBack = false) {
checkGoldenFile(_, 7)
}
}
test("TPC-H q8") {
- runTPCHQuery(8, veloxTPCHQueries, queriesResults, compareResult = false,
noFallBack = false) {
+ runTPCHQuery(8, tpchQueries, queriesResults, compareResult = false,
noFallBack = false) {
checkGoldenFile(_, 8)
}
}
test("TPC-H q9") {
- runTPCHQuery(9, veloxTPCHQueries, queriesResults, compareResult = false,
noFallBack = false) {
+ runTPCHQuery(9, tpchQueries, queriesResults, compareResult = false,
noFallBack = false) {
checkGoldenFile(_, 9)
}
}
test("TPC-H q10") {
- runTPCHQuery(10, veloxTPCHQueries, queriesResults, compareResult = false,
noFallBack = false) {
+ runTPCHQuery(10, tpchQueries, queriesResults, compareResult = false,
noFallBack = false) {
checkGoldenFile(_, 10)
}
}
test("TPC-H q11") {
- runTPCHQuery(11, veloxTPCHQueries, queriesResults, compareResult = false,
noFallBack = false) {
+ runTPCHQuery(11, tpchQueries, queriesResults, compareResult = false,
noFallBack = false) {
checkGoldenFile(_, 11)
}
}
test("TPC-H q12") {
- runTPCHQuery(12, veloxTPCHQueries, queriesResults, compareResult = false,
noFallBack = false) {
+ runTPCHQuery(12, tpchQueries, queriesResults, compareResult = false,
noFallBack = false) {
checkGoldenFile(_, 12)
}
}
test("TPC-H q13") {
- runTPCHQuery(13, veloxTPCHQueries, queriesResults, compareResult = false,
noFallBack = false) {
+ runTPCHQuery(13, tpchQueries, queriesResults, compareResult = false,
noFallBack = false) {
checkGoldenFile(_, 13)
}
}
test("TPC-H q14") {
- runTPCHQuery(14, veloxTPCHQueries, queriesResults, compareResult = false,
noFallBack = false) {
+ runTPCHQuery(14, tpchQueries, queriesResults, compareResult = false,
noFallBack = false) {
checkGoldenFile(_, 14)
}
}
test("TPC-H q15") {
- runTPCHQuery(15, veloxTPCHQueries, queriesResults, compareResult = false,
noFallBack = false) {
+ runTPCHQuery(15, tpchQueries, queriesResults, compareResult = false,
noFallBack = false) {
checkGoldenFile(_, 15)
}
}
test("TPC-H q16") {
- runTPCHQuery(16, veloxTPCHQueries, queriesResults, compareResult = false,
noFallBack = false) {
+ runTPCHQuery(16, tpchQueries, queriesResults, compareResult = false,
noFallBack = false) {
checkGoldenFile(_, 16)
}
}
test("TPC-H q17") {
- runTPCHQuery(17, veloxTPCHQueries, queriesResults, compareResult = false,
noFallBack = false) {
+ runTPCHQuery(17, tpchQueries, queriesResults, compareResult = false,
noFallBack = false) {
checkGoldenFile(_, 17)
}
}
test("TPC-H q18") {
- runTPCHQuery(18, veloxTPCHQueries, queriesResults, compareResult = false,
noFallBack = false) {
+ runTPCHQuery(18, tpchQueries, queriesResults, compareResult = false,
noFallBack = false) {
checkGoldenFile(_, 18)
}
}
test("TPC-H q19") {
- runTPCHQuery(19, veloxTPCHQueries, queriesResults, compareResult = false,
noFallBack = false) {
+ runTPCHQuery(19, tpchQueries, queriesResults, compareResult = false,
noFallBack = false) {
checkGoldenFile(_, 19)
}
}
test("TPC-H q20") {
- runTPCHQuery(20, veloxTPCHQueries, queriesResults, compareResult = false,
noFallBack = false) {
+ runTPCHQuery(20, tpchQueries, queriesResults, compareResult = false,
noFallBack = false) {
checkGoldenFile(_, 20)
}
}
test("TPC-H q21") {
- runTPCHQuery(21, veloxTPCHQueries, queriesResults, compareResult = false,
noFallBack = false) {
+ runTPCHQuery(21, tpchQueries, queriesResults, compareResult = false,
noFallBack = false) {
checkGoldenFile(_, 21)
}
}
test("TPC-H q22") {
- runTPCHQuery(22, veloxTPCHQueries, queriesResults, compareResult = false,
noFallBack = false) {
+ runTPCHQuery(22, tpchQueries, queriesResults, compareResult = false,
noFallBack = false) {
checkGoldenFile(_, 22)
}
}
diff --git
a/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxWindowExpressionSuite.scala
b/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxWindowExpressionSuite.scala
index 7af17c4cd1..6ae7f392a7 100644
---
a/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxWindowExpressionSuite.scala
+++
b/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxWindowExpressionSuite.scala
@@ -24,7 +24,7 @@ import org.apache.spark.sql.types._
class VeloxWindowExpressionSuite extends WholeStageTransformerSuite {
protected val rootPath: String = getClass.getResource("/").getPath
- override protected val resourcePath: String = "/tpch-data-parquet-velox"
+ override protected val resourcePath: String = "/tpch-data-parquet"
override protected val fileFormat: String = "parquet"
override def beforeAll(): Unit = {
diff --git
a/backends-velox/src/test/scala/org/apache/gluten/execution/python/ArrowEvalPythonExecSuite.scala
b/backends-velox/src/test/scala/org/apache/gluten/execution/python/ArrowEvalPythonExecSuite.scala
index 1c3e33262c..c2a191a20d 100644
---
a/backends-velox/src/test/scala/org/apache/gluten/execution/python/ArrowEvalPythonExecSuite.scala
+++
b/backends-velox/src/test/scala/org/apache/gluten/execution/python/ArrowEvalPythonExecSuite.scala
@@ -28,7 +28,7 @@ class ArrowEvalPythonExecSuite extends
WholeStageTransformerSuite {
import testImplicits.localSeqToDatasetHolder
import testImplicits.newProductEncoder
- override protected val resourcePath: String = "/tpch-data-parquet-velox"
+ override protected val resourcePath: String = "/tpch-data-parquet"
override protected val fileFormat: String = "parquet"
val pyarrowTestUDF = TestScalarPandasUDF(name = "pyarrowUDF")
diff --git
a/backends-velox/src/test/scala/org/apache/gluten/expression/UDFPartialProjectSuite.scala
b/backends-velox/src/test/scala/org/apache/gluten/expression/UDFPartialProjectSuite.scala
index 4aaa722c68..30b8cb0f69 100644
---
a/backends-velox/src/test/scala/org/apache/gluten/expression/UDFPartialProjectSuite.scala
+++
b/backends-velox/src/test/scala/org/apache/gluten/expression/UDFPartialProjectSuite.scala
@@ -40,7 +40,7 @@ class UDFPartialProjectSuiteRasOn extends
UDFPartialProjectSuite {
abstract class UDFPartialProjectSuite extends WholeStageTransformerSuite {
disableFallbackCheck
- override protected val resourcePath: String = "/tpch-data-parquet-velox"
+ override protected val resourcePath: String = "/tpch-data-parquet"
override protected val fileFormat: String = "parquet"
override protected def sparkConf: SparkConf = {
diff --git
a/backends-velox/src/test/scala/org/apache/gluten/fuzzer/FuzzerBase.scala
b/backends-velox/src/test/scala/org/apache/gluten/fuzzer/FuzzerBase.scala
index 07996bc4b2..95c9e60409 100644
--- a/backends-velox/src/test/scala/org/apache/gluten/fuzzer/FuzzerBase.scala
+++ b/backends-velox/src/test/scala/org/apache/gluten/fuzzer/FuzzerBase.scala
@@ -25,7 +25,7 @@ import org.apache.spark.SparkConf
abstract class FuzzerBase extends VeloxWholeStageTransformerSuite {
- override protected val resourcePath: String = "/tpch-data-parquet-velox"
+ override protected val resourcePath: String = "/tpch-data-parquet"
override protected val fileFormat: String = "parquet"
protected val dataGenerator =
RandomParquetDataGenerator(System.currentTimeMillis())
diff --git
a/backends-velox/src/test/scala/org/apache/spark/sql/execution/VeloxParquetWriteSuite.scala
b/backends-velox/src/test/scala/org/apache/spark/sql/execution/VeloxParquetWriteSuite.scala
index 2e4436a59f..ce3b0852f6 100644
---
a/backends-velox/src/test/scala/org/apache/spark/sql/execution/VeloxParquetWriteSuite.scala
+++
b/backends-velox/src/test/scala/org/apache/spark/sql/execution/VeloxParquetWriteSuite.scala
@@ -24,7 +24,7 @@ import org.apache.spark.SparkConf
import org.junit.Assert
class VeloxParquetWriteSuite extends VeloxWholeStageTransformerSuite {
- override protected val resourcePath: String = "/tpch-data-parquet-velox"
+ override protected val resourcePath: String = "/tpch-data-parquet"
override protected val fileFormat: String = "parquet"
override def beforeAll(): Unit = {
diff --git a/docs/developers/HowTo.md b/docs/developers/HowTo.md
index ff9d34d3ba..c4b1a03a36 100644
--- a/docs/developers/HowTo.md
+++ b/docs/developers/HowTo.md
@@ -133,14 +133,14 @@ Here we will explain how to run TPC-H on Velox backend
with the Parquet file for
1. First, prepare the datasets, you have two choices.
- One way, generate Parquet datasets using the script under
`${GLUTEN_HOME}/backends-velox/workload/tpch/gen_data/parquet_dataset`, you can
get help from the above
-mentioned `README.md`.
- - The other way, using the small dataset under
`${GLUTEN_HOME}/backends-velox/src/test/resources/tpch-data-parquet-velox`
directly, if you just want to make simple
+ - The other way, using the small dataset under
`${GLUTEN_HOME}/backends-velox/src/test/resources/tpch-data-parquet` directly,
if you just want to make simple
TPC-H testing, this dataset is a good choice.
2. Second, run TPC-H on Velox backend testing.
- Modify
`${GLUTEN_HOME}/backends-velox/workload/tpch/run_tpch/tpch_parquet.scala`.
- Set `var parquet_file_path` to correct directory. If using the small
dataset directly in the step one, then modify it as below:
```scala
- var parquet_file_path =
"gluten_home/backends-velox/src/test/resources/tpch-data-parquet-velox"
+ var parquet_file_path =
"gluten_home/backends-velox/src/test/resources/tpch-data-parquet"
```
- Set `var gluten_root` to correct directory. If `${GLUTEN_HOME}` is the
directory of `/home/gluten`, then modify it as below
diff --git
a/gluten-delta/src/test/scala/org/apache/gluten/execution/VeloxDeltaSuite.scala
b/gluten-delta/src/test/scala/org/apache/gluten/execution/VeloxDeltaSuite.scala
index 70b5ffc688..9b2f193422 100644
---
a/gluten-delta/src/test/scala/org/apache/gluten/execution/VeloxDeltaSuite.scala
+++
b/gluten-delta/src/test/scala/org/apache/gluten/execution/VeloxDeltaSuite.scala
@@ -25,7 +25,7 @@ import scala.collection.JavaConverters._
class VeloxDeltaSuite extends WholeStageTransformerSuite {
protected val rootPath: String = getClass.getResource("/").getPath
- override protected val resourcePath: String = "/tpch-data-parquet-velox"
+ override protected val resourcePath: String = "/tpch-data-parquet"
override protected val fileFormat: String = "parquet"
override protected def sparkConf: SparkConf = {
diff --git
a/gluten-delta/src/test/scala/org/apache/gluten/execution/VeloxTPCHDeltaSuite.scala
b/gluten-delta/src/test/scala/org/apache/gluten/execution/VeloxTPCHDeltaSuite.scala
index 12b0333337..dff1746664 100644
---
a/gluten-delta/src/test/scala/org/apache/gluten/execution/VeloxTPCHDeltaSuite.scala
+++
b/gluten-delta/src/test/scala/org/apache/gluten/execution/VeloxTPCHDeltaSuite.scala
@@ -26,10 +26,7 @@ class VeloxTPCHDeltaSuite extends VeloxTPCHSuite {
"../backends-velox/src/test/resources").getAbsolutePath
override protected val resourcePath: String =
- new File(tpchBasePath, "tpch-data-parquet-velox").getCanonicalPath
-
- override protected val veloxTPCHQueries: String =
- new File(tpchBasePath, "tpch-queries-velox").getCanonicalPath
+ new File(tpchBasePath, "tpch-data-parquet").getCanonicalPath
override protected val queriesResults: String =
new File(tpchBasePath, "queries-output").getCanonicalPath
diff --git
a/gluten-hudi/src/test/scala/org/apache/gluten/execution/VeloxHudiSuite.scala
b/gluten-hudi/src/test/scala/org/apache/gluten/execution/VeloxHudiSuite.scala
index 4f9bd896c2..b760ec5565 100644
---
a/gluten-hudi/src/test/scala/org/apache/gluten/execution/VeloxHudiSuite.scala
+++
b/gluten-hudi/src/test/scala/org/apache/gluten/execution/VeloxHudiSuite.scala
@@ -22,7 +22,7 @@ import org.apache.spark.sql.Row
class VeloxHudiSuite extends WholeStageTransformerSuite {
protected val rootPath: String = getClass.getResource("/").getPath
- override protected val resourcePath: String = "/tpch-data-parquet-velox"
+ override protected val resourcePath: String = "/tpch-data-parquet"
override protected val fileFormat: String = "parquet"
override protected def sparkConf: SparkConf = {
diff --git
a/gluten-hudi/src/test/scala/org/apache/gluten/execution/VeloxTPCHHudiSuite.scala
b/gluten-hudi/src/test/scala/org/apache/gluten/execution/VeloxTPCHHudiSuite.scala
index ce6ec9bbcf..a4e10269c2 100644
---
a/gluten-hudi/src/test/scala/org/apache/gluten/execution/VeloxTPCHHudiSuite.scala
+++
b/gluten-hudi/src/test/scala/org/apache/gluten/execution/VeloxTPCHHudiSuite.scala
@@ -26,10 +26,7 @@ class VeloxTPCHHudiSuite extends VeloxTPCHSuite {
"../backends-velox/src/test/resources").getAbsolutePath
override protected val resourcePath: String =
- new File(tpchBasePath, "tpch-data-parquet-velox").getCanonicalPath
-
- override protected val veloxTPCHQueries: String =
- new File(tpchBasePath, "tpch-queries-velox").getCanonicalPath
+ new File(tpchBasePath, "tpch-data-parquet").getCanonicalPath
override protected val queriesResults: String =
new File(tpchBasePath, "queries-output").getCanonicalPath
diff --git
a/gluten-iceberg/src/test/scala/org/apache/gluten/execution/VeloxIcebergSuite.scala
b/gluten-iceberg/src/test/scala/org/apache/gluten/execution/VeloxIcebergSuite.scala
index 0d063d22f8..7f399ce629 100644
---
a/gluten-iceberg/src/test/scala/org/apache/gluten/execution/VeloxIcebergSuite.scala
+++
b/gluten-iceberg/src/test/scala/org/apache/gluten/execution/VeloxIcebergSuite.scala
@@ -24,7 +24,7 @@ import org.apache.spark.sql.Row
class VeloxIcebergSuite extends WholeStageTransformerSuite {
protected val rootPath: String = getClass.getResource("/").getPath
- override protected val resourcePath: String = "/tpch-data-parquet-velox"
+ override protected val resourcePath: String = "/tpch-data-parquet"
override protected val fileFormat: String = "parquet"
override protected def sparkConf: SparkConf = {
diff --git
a/gluten-iceberg/src/test/scala/org/apache/gluten/execution/VeloxTPCHIcebergSuite.scala
b/gluten-iceberg/src/test/scala/org/apache/gluten/execution/VeloxTPCHIcebergSuite.scala
index 22a5b6b70b..857cbcb410 100644
---
a/gluten-iceberg/src/test/scala/org/apache/gluten/execution/VeloxTPCHIcebergSuite.scala
+++
b/gluten-iceberg/src/test/scala/org/apache/gluten/execution/VeloxTPCHIcebergSuite.scala
@@ -29,10 +29,7 @@ class VeloxTPCHIcebergSuite extends VeloxTPCHSuite {
"../backends-velox/src/test/resources").getAbsolutePath
override protected val resourcePath: String =
- new File(tpchBasePath, "tpch-data-parquet-velox").getCanonicalPath
-
- override protected val veloxTPCHQueries: String =
- new File(tpchBasePath, "tpch-queries-velox").getCanonicalPath
+ new File(tpchBasePath, "tpch-data-parquet").getCanonicalPath
override protected val queriesResults: String =
new File(tpchBasePath, "queries-output").getCanonicalPath
diff --git
a/gluten-ut/spark35/src/test/scala/org/apache/spark/sql/hive/execution/GlutenHiveUDFSuite.scala
b/gluten-ut/spark35/src/test/scala/org/apache/spark/sql/hive/execution/GlutenHiveUDFSuite.scala
index cc9f6f1d89..6365305140 100644
---
a/gluten-ut/spark35/src/test/scala/org/apache/spark/sql/hive/execution/GlutenHiveUDFSuite.scala
+++
b/gluten-ut/spark35/src/test/scala/org/apache/spark/sql/hive/execution/GlutenHiveUDFSuite.scala
@@ -91,7 +91,7 @@ class GlutenHiveUDFSuite
val table = "lineitem"
val tableDir =
getClass.getResource("").getPath + "/../../../../../../../../../../../" +
- "/backends-velox/src/test/resources/tpch-data-parquet-velox/"
+ "/backends-velox/src/test/resources/tpch-data-parquet/"
val tablePath = new File(tableDir, table).getAbsolutePath
val tableDF = spark.read.format("parquet").load(tablePath)
tableDF.createOrReplaceTempView(table)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
