This is an automated email from the ASF dual-hosted git repository. taiyang-li pushed a commit to branch fake_add_bolt_backend in repository https://gitbox.apache.org/repos/asf/gluten.git
commit 9b1f9f828fdb2179aed63ee0129138d5b26b31ba Author: liyang.127 <[email protected]> AuthorDate: Tue Jun 30 15:26:07 2026 +0800 [GLUTEN][CORE] Share JVM test input resources Move duplicated Velox test input data into gluten-substrait test resources and switch the remaining Velox suites to load TPCH parquet data from the shared classpath location. --- .../org/apache/gluten/execution/VeloxTPCHDeltaSuite.scala | 2 +- .../org/apache/gluten/execution/VeloxTPCHHudiSuite.scala | 2 +- .../gluten/execution/TestTPCHStoragePartitionedJoins.java | 4 +--- .../org/apache/gluten/execution/VeloxTPCHIcebergSuite.scala | 2 +- ...f401debc-29d1-47b6-82c2-051bd0e12df1-c000.snappy.parquet | Bin ...000-e084aa04-c639-40f9-a85f-4b8b10dae1b4-c000.snappy.orc | Bin ...f401debc-29d1-47b6-82c2-051bd0e12df1-c000.snappy.parquet | Bin ...000-e084aa04-c639-40f9-a85f-4b8b10dae1b4-c000.snappy.orc | Bin .../src/test/resources/datasource/csv/student.csv | 0 .../src/test/resources/datasource/csv/student_option.csv | 0 .../test/resources/datasource/csv/student_option_schema.csv | 0 .../test/resources/datasource/csv/student_option_str.csv | 0 .../test/resources/parquet-for-read/test-append_1.parquet | Bin .../test/resources/parquet-for-read/test-append_2.parquet | Bin .../parquet-for-read/test-empty-row-group_1.parquet | Bin .../parquet-for-read/test-empty-row-group_2.parquet | Bin .../parquet-for-read/test-empty-row-group_3.parquet | Bin .../test-file-with-no-column-indexes-1.parquet | Bin ...a1a42661-7a85-42da-b831-f489a5545d61-c000.snappy.parquet | Bin ...6c374e0a-7d76-401b-8458-a8e31f8ab704-c000.snappy.parquet | Bin ...8a852c7b-da96-4425-9ce8-d188f97f3afe-c000.snappy.parquet | Bin ...41cc94ee-a98d-4103-83b1-0b5bcebe03eb-c000.snappy.parquet | Bin ...e664e655-0ada-4e0b-a8aa-213d1e4c3797-c000.snappy.parquet | Bin ...2c7e524c-3f91-4228-b003-64ad2c8059a1-c000.snappy.parquet | Bin ...90d7c5d9-46eb-4bf3-8f00-6eee7436761d-c000.snappy.parquet | Bin ...0a763951-8a7b-4d7f-a34a-c97e9b4859f0-c000.snappy.parquet | Bin 26 files changed, 4 insertions(+), 6 deletions(-) diff --git a/backends-velox/src-delta/test/scala/org/apache/gluten/execution/VeloxTPCHDeltaSuite.scala b/backends-velox/src-delta/test/scala/org/apache/gluten/execution/VeloxTPCHDeltaSuite.scala index 238f5ca56f..036080a347 100644 --- a/backends-velox/src-delta/test/scala/org/apache/gluten/execution/VeloxTPCHDeltaSuite.scala +++ b/backends-velox/src-delta/test/scala/org/apache/gluten/execution/VeloxTPCHDeltaSuite.scala @@ -25,7 +25,7 @@ class VeloxTPCHDeltaSuite extends VeloxTPCHSuite { getClass.getResource("/").getPath + "../../../src/test/resources" override protected val resourcePath: String = - new File(tpchBasePath, "tpch-data-parquet").getCanonicalPath + getClass.getResource("/tpch-data-parquet").getFile override protected val queriesResults: String = new File(tpchBasePath, "queries-output").getCanonicalPath diff --git a/backends-velox/src-hudi/test/scala/org/apache/gluten/execution/VeloxTPCHHudiSuite.scala b/backends-velox/src-hudi/test/scala/org/apache/gluten/execution/VeloxTPCHHudiSuite.scala index b5680a9c2c..734ff5606e 100644 --- a/backends-velox/src-hudi/test/scala/org/apache/gluten/execution/VeloxTPCHHudiSuite.scala +++ b/backends-velox/src-hudi/test/scala/org/apache/gluten/execution/VeloxTPCHHudiSuite.scala @@ -25,7 +25,7 @@ class VeloxTPCHHudiSuite extends VeloxTPCHSuite { getClass.getResource("/").getPath + "../../../src/test/resources" override protected val resourcePath: String = - new File(tpchBasePath, "tpch-data-parquet").getCanonicalPath + getClass.getResource("/tpch-data-parquet").getFile override protected val queriesResults: String = new File(tpchBasePath, "queries-output").getCanonicalPath diff --git a/backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/execution/TestTPCHStoragePartitionedJoins.java b/backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/execution/TestTPCHStoragePartitionedJoins.java index d2edc28fc8..cdab374053 100644 --- a/backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/execution/TestTPCHStoragePartitionedJoins.java +++ b/backends-velox/src-iceberg-spark34/test/java/org/apache/gluten/execution/TestTPCHStoragePartitionedJoins.java @@ -79,11 +79,9 @@ public class TestTPCHStoragePartitionedJoins extends SparkTestBaseWithCatalog { // we don't need to test the catalog, so only test the testhadoop catalog @Before public void createTPCHNotNullTables() { + final String tableDir = this.getClass().getResource("/tpch-data-parquet").getFile(); tableNames.forEach( table -> { - String tableDir = tpchBasePath + "/tpch-data-parquet"; - // String tableDir = - // "/Users/chengchengjin/code/gluten/backends-velox/src/test/resources/tpch-data-parquet"; String tablePath = new File(tableDir, table).getAbsolutePath(); Dataset<Row> tableDF = spark.read().format("parquet").load(tablePath); tableDF.createOrReplaceTempView(PARQUET_TABLE_PREFIX + table); diff --git a/backends-velox/src-iceberg/test/scala/org/apache/gluten/execution/VeloxTPCHIcebergSuite.scala b/backends-velox/src-iceberg/test/scala/org/apache/gluten/execution/VeloxTPCHIcebergSuite.scala index 5456e0ba89..66d16a50a2 100644 --- a/backends-velox/src-iceberg/test/scala/org/apache/gluten/execution/VeloxTPCHIcebergSuite.scala +++ b/backends-velox/src-iceberg/test/scala/org/apache/gluten/execution/VeloxTPCHIcebergSuite.scala @@ -28,7 +28,7 @@ class VeloxTPCHIcebergSuite extends VeloxTPCHSuite { getClass.getResource("/").getPath + "../../../src/test/resources" override protected val resourcePath: String = - new File(tpchBasePath, "tpch-data-parquet").getCanonicalPath + getClass.getResource("/tpch-data-parquet").getFile // FIXME: Unused. override protected val queriesResults: String = diff --git a/backends-velox/src/test/resources/data-type-validation-data/type1/part-00000-f401debc-29d1-47b6-82c2-051bd0e12df1-c000.snappy.parquet b/gluten-substrait/src/test/resources/data-type-validation-data/type1/part-00000-f401debc-29d1-47b6-82c2-051bd0e12df1-c000.snappy.parquet similarity index 100% rename from backends-velox/src/test/resources/data-type-validation-data/type1/part-00000-f401debc-29d1-47b6-82c2-051bd0e12df1-c000.snappy.parquet rename to gluten-substrait/src/test/resources/data-type-validation-data/type1/part-00000-f401debc-29d1-47b6-82c2-051bd0e12df1-c000.snappy.parquet diff --git a/backends-velox/src/test/resources/data-type-validation-data/type1_orc/part-00000-e084aa04-c639-40f9-a85f-4b8b10dae1b4-c000.snappy.orc b/gluten-substrait/src/test/resources/data-type-validation-data/type1_orc/part-00000-e084aa04-c639-40f9-a85f-4b8b10dae1b4-c000.snappy.orc similarity index 100% rename from backends-velox/src/test/resources/data-type-validation-data/type1_orc/part-00000-e084aa04-c639-40f9-a85f-4b8b10dae1b4-c000.snappy.orc rename to gluten-substrait/src/test/resources/data-type-validation-data/type1_orc/part-00000-e084aa04-c639-40f9-a85f-4b8b10dae1b4-c000.snappy.orc diff --git a/backends-velox/src/test/resources/data-type-validation-data/type2/part-00000-f401debc-29d1-47b6-82c2-051bd0e12df1-c000.snappy.parquet b/gluten-substrait/src/test/resources/data-type-validation-data/type2/part-00000-f401debc-29d1-47b6-82c2-051bd0e12df1-c000.snappy.parquet similarity index 100% rename from backends-velox/src/test/resources/data-type-validation-data/type2/part-00000-f401debc-29d1-47b6-82c2-051bd0e12df1-c000.snappy.parquet rename to gluten-substrait/src/test/resources/data-type-validation-data/type2/part-00000-f401debc-29d1-47b6-82c2-051bd0e12df1-c000.snappy.parquet diff --git a/backends-velox/src/test/resources/data-type-validation-data/type2_orc/part-00000-e084aa04-c639-40f9-a85f-4b8b10dae1b4-c000.snappy.orc b/gluten-substrait/src/test/resources/data-type-validation-data/type2_orc/part-00000-e084aa04-c639-40f9-a85f-4b8b10dae1b4-c000.snappy.orc similarity index 100% rename from backends-velox/src/test/resources/data-type-validation-data/type2_orc/part-00000-e084aa04-c639-40f9-a85f-4b8b10dae1b4-c000.snappy.orc rename to gluten-substrait/src/test/resources/data-type-validation-data/type2_orc/part-00000-e084aa04-c639-40f9-a85f-4b8b10dae1b4-c000.snappy.orc diff --git a/backends-velox/src/test/resources/datasource/csv/student.csv b/gluten-substrait/src/test/resources/datasource/csv/student.csv similarity index 100% rename from backends-velox/src/test/resources/datasource/csv/student.csv rename to gluten-substrait/src/test/resources/datasource/csv/student.csv diff --git a/backends-velox/src/test/resources/datasource/csv/student_option.csv b/gluten-substrait/src/test/resources/datasource/csv/student_option.csv similarity index 100% rename from backends-velox/src/test/resources/datasource/csv/student_option.csv rename to gluten-substrait/src/test/resources/datasource/csv/student_option.csv diff --git a/backends-velox/src/test/resources/datasource/csv/student_option_schema.csv b/gluten-substrait/src/test/resources/datasource/csv/student_option_schema.csv similarity index 100% rename from backends-velox/src/test/resources/datasource/csv/student_option_schema.csv rename to gluten-substrait/src/test/resources/datasource/csv/student_option_schema.csv diff --git a/backends-velox/src/test/resources/datasource/csv/student_option_str.csv b/gluten-substrait/src/test/resources/datasource/csv/student_option_str.csv similarity index 100% rename from backends-velox/src/test/resources/datasource/csv/student_option_str.csv rename to gluten-substrait/src/test/resources/datasource/csv/student_option_str.csv diff --git a/backends-velox/src/test/resources/parquet-for-read/test-append_1.parquet b/gluten-substrait/src/test/resources/parquet-for-read/test-append_1.parquet similarity index 100% rename from backends-velox/src/test/resources/parquet-for-read/test-append_1.parquet rename to gluten-substrait/src/test/resources/parquet-for-read/test-append_1.parquet diff --git a/backends-velox/src/test/resources/parquet-for-read/test-append_2.parquet b/gluten-substrait/src/test/resources/parquet-for-read/test-append_2.parquet similarity index 100% rename from backends-velox/src/test/resources/parquet-for-read/test-append_2.parquet rename to gluten-substrait/src/test/resources/parquet-for-read/test-append_2.parquet diff --git a/backends-velox/src/test/resources/parquet-for-read/test-empty-row-group_1.parquet b/gluten-substrait/src/test/resources/parquet-for-read/test-empty-row-group_1.parquet similarity index 100% rename from backends-velox/src/test/resources/parquet-for-read/test-empty-row-group_1.parquet rename to gluten-substrait/src/test/resources/parquet-for-read/test-empty-row-group_1.parquet diff --git a/backends-velox/src/test/resources/parquet-for-read/test-empty-row-group_2.parquet b/gluten-substrait/src/test/resources/parquet-for-read/test-empty-row-group_2.parquet similarity index 100% rename from backends-velox/src/test/resources/parquet-for-read/test-empty-row-group_2.parquet rename to gluten-substrait/src/test/resources/parquet-for-read/test-empty-row-group_2.parquet diff --git a/backends-velox/src/test/resources/parquet-for-read/test-empty-row-group_3.parquet b/gluten-substrait/src/test/resources/parquet-for-read/test-empty-row-group_3.parquet similarity index 100% rename from backends-velox/src/test/resources/parquet-for-read/test-empty-row-group_3.parquet rename to gluten-substrait/src/test/resources/parquet-for-read/test-empty-row-group_3.parquet diff --git a/backends-velox/src/test/resources/parquet-for-read/test-file-with-no-column-indexes-1.parquet b/gluten-substrait/src/test/resources/parquet-for-read/test-file-with-no-column-indexes-1.parquet similarity index 100% rename from backends-velox/src/test/resources/parquet-for-read/test-file-with-no-column-indexes-1.parquet rename to gluten-substrait/src/test/resources/parquet-for-read/test-file-with-no-column-indexes-1.parquet diff --git a/backends-velox/src/test/resources/tpch-data-parquet/customer/part-00000-a1a42661-7a85-42da-b831-f489a5545d61-c000.snappy.parquet b/gluten-substrait/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/customer/part-00000-a1a42661-7a85-42da-b831-f489a5545d61-c000.snappy.parquet rename to gluten-substrait/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/lineitem/part-00000-6c374e0a-7d76-401b-8458-a8e31f8ab704-c000.snappy.parquet b/gluten-substrait/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/lineitem/part-00000-6c374e0a-7d76-401b-8458-a8e31f8ab704-c000.snappy.parquet rename to gluten-substrait/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/nation/part-00000-8a852c7b-da96-4425-9ce8-d188f97f3afe-c000.snappy.parquet b/gluten-substrait/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/nation/part-00000-8a852c7b-da96-4425-9ce8-d188f97f3afe-c000.snappy.parquet rename to gluten-substrait/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/orders/part-00000-41cc94ee-a98d-4103-83b1-0b5bcebe03eb-c000.snappy.parquet b/gluten-substrait/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/orders/part-00000-41cc94ee-a98d-4103-83b1-0b5bcebe03eb-c000.snappy.parquet rename to gluten-substrait/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/part/part-00000-e664e655-0ada-4e0b-a8aa-213d1e4c3797-c000.snappy.parquet b/gluten-substrait/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/part/part-00000-e664e655-0ada-4e0b-a8aa-213d1e4c3797-c000.snappy.parquet rename to gluten-substrait/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/partsupp/part-00000-2c7e524c-3f91-4228-b003-64ad2c8059a1-c000.snappy.parquet b/gluten-substrait/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/partsupp/part-00000-2c7e524c-3f91-4228-b003-64ad2c8059a1-c000.snappy.parquet rename to gluten-substrait/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/region/part-00000-90d7c5d9-46eb-4bf3-8f00-6eee7436761d-c000.snappy.parquet b/gluten-substrait/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/region/part-00000-90d7c5d9-46eb-4bf3-8f00-6eee7436761d-c000.snappy.parquet rename to gluten-substrait/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/supplier/part-00000-0a763951-8a7b-4d7f-a34a-c97e9b4859f0-c000.snappy.parquet b/gluten-substrait/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/supplier/part-00000-0a763951-8a7b-4d7f-a34a-c97e9b4859f0-c000.snappy.parquet rename to gluten-substrait/src/test/resources/tpch-data-parquet/supplier/part-00000-0a763951-8a7b-4d7f-a34a-c97e9b4859f0-c000.snappy.parquet --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
