From 64a448f2adca2f8fab3ee9dd1bf4e5738d2dd32e Mon Sep 17 00:00:00 2001 From: Hongze Zhang Date: Tue, 10 Sep 2024 13:14:34 +0800 Subject: [PATCH] fixup --- .../org/apache/gluten/utils/velox/VeloxTestSettings.scala | 4 ++++ .../datasources/parquet/GlutenParquetFilterSuite.scala | 6 +++--- .../org/apache/gluten/utils/velox/VeloxTestSettings.scala | 4 ++++ .../datasources/parquet/GlutenParquetFilterSuite.scala | 6 +++--- .../org/apache/gluten/utils/velox/VeloxTestSettings.scala | 4 ++++ .../datasources/parquet/GlutenParquetFilterSuite.scala | 6 +++--- .../org/apache/gluten/utils/velox/VeloxTestSettings.scala | 4 ++++ .../datasources/parquet/GlutenParquetFilterSuite.scala | 6 +++--- 8 files changed, 28 insertions(+), 12 deletions(-) diff --git a/gluten-ut/spark32/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala b/gluten-ut/spark32/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala index e064f2afc9d7..337aa5025ff9 100644 --- a/gluten-ut/spark32/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala +++ b/gluten-ut/spark32/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala @@ -871,6 +871,8 @@ class VeloxTestSettings extends BackendTestSettings { .exclude("SPARK-17091: Convert IN predicate to Parquet filter push-down") .exclude("Support Parquet column index") .exclude("SPARK-34562: Bloom filter push down") + // https://github.com/apache/incubator-gluten/issues/7174 + .excludeGlutenTest("Filter applied on merged Parquet schema with new column should work") enableSuite[GlutenParquetV2FilterSuite] // Rewrite. .exclude("Filter applied on merged Parquet schema with new column should work") @@ -887,6 +889,8 @@ class VeloxTestSettings extends BackendTestSettings { .exclude("SPARK-17091: Convert IN predicate to Parquet filter push-down") .exclude("Support Parquet column index") .exclude("SPARK-34562: Bloom filter push down") + // https://github.com/apache/incubator-gluten/issues/7174 + .excludeGlutenTest("Filter applied on merged Parquet schema with new column should work") enableSuite[GlutenParquetInteroperabilitySuite] .exclude("parquet timestamp conversion") enableSuite[GlutenParquetIOSuite] diff --git a/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/GlutenParquetFilterSuite.scala b/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/GlutenParquetFilterSuite.scala index 4d190f9d59bb..51204b0777d6 100644 --- a/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/GlutenParquetFilterSuite.scala +++ b/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/GlutenParquetFilterSuite.scala @@ -48,7 +48,7 @@ import java.time.LocalDate import scala.reflect.ClassTag import scala.reflect.runtime.universe.TypeTag -abstract class GltuenParquetFilterSuite extends ParquetFilterSuite with GlutenSQLTestsBaseTrait { +abstract class GlutenParquetFilterSuite extends ParquetFilterSuite with GlutenSQLTestsBaseTrait { protected def checkFilterPredicate( predicate: Predicate, filterClass: Class[_ <: FilterPredicate], @@ -357,7 +357,7 @@ abstract class GltuenParquetFilterSuite extends ParquetFilterSuite with GlutenSQ } @ExtendedSQLTest -class GlutenParquetV1FilterSuite extends GltuenParquetFilterSuite with GlutenSQLTestsBaseTrait { +class GlutenParquetV1FilterSuite extends GlutenParquetFilterSuite with GlutenSQLTestsBaseTrait { // TODO: enable Parquet V2 write path after file source V2 writers are workable. override def sparkConf: SparkConf = super.sparkConf @@ -445,7 +445,7 @@ class GlutenParquetV1FilterSuite extends GltuenParquetFilterSuite with GlutenSQL } @ExtendedSQLTest -class GlutenParquetV2FilterSuite extends GltuenParquetFilterSuite with GlutenSQLTestsBaseTrait { +class GlutenParquetV2FilterSuite extends GlutenParquetFilterSuite with GlutenSQLTestsBaseTrait { // TODO: enable Parquet V2 write path after file source V2 writers are workable. override def sparkConf: SparkConf = super.sparkConf diff --git a/gluten-ut/spark33/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala b/gluten-ut/spark33/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala index 6c21fc7cc2ba..caa91891cf02 100644 --- a/gluten-ut/spark33/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala +++ b/gluten-ut/spark33/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala @@ -679,6 +679,8 @@ class VeloxTestSettings extends BackendTestSettings { .exclude("Support Parquet column index") .exclude("SPARK-34562: Bloom filter push down") .exclude("SPARK-16371 Do not push down filters when inner name and outer name are the same") + // https://github.com/apache/incubator-gluten/issues/7174 + .excludeGlutenTest("Filter applied on merged Parquet schema with new column should work") enableSuite[GlutenParquetV2FilterSuite] // Rewrite. .exclude("Filter applied on merged Parquet schema with new column should work") @@ -697,6 +699,8 @@ class VeloxTestSettings extends BackendTestSettings { .exclude("Support Parquet column index") .exclude("SPARK-34562: Bloom filter push down") .exclude("SPARK-16371 Do not push down filters when inner name and outer name are the same") + // https://github.com/apache/incubator-gluten/issues/7174 + .excludeGlutenTest("Filter applied on merged Parquet schema with new column should work") enableSuite[GlutenParquetInteroperabilitySuite] .exclude("parquet timestamp conversion") enableSuite[GlutenParquetIOSuite] diff --git a/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/GlutenParquetFilterSuite.scala b/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/GlutenParquetFilterSuite.scala index 20f5f8aed69f..a1163f9525b4 100644 --- a/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/GlutenParquetFilterSuite.scala +++ b/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/GlutenParquetFilterSuite.scala @@ -48,7 +48,7 @@ import java.time.LocalDate import scala.reflect.ClassTag import scala.reflect.runtime.universe.TypeTag -abstract class GltuenParquetFilterSuite extends ParquetFilterSuite with GlutenSQLTestsBaseTrait { +abstract class GlutenParquetFilterSuite extends ParquetFilterSuite with GlutenSQLTestsBaseTrait { protected def checkFilterPredicate( predicate: Predicate, filterClass: Class[_ <: FilterPredicate], @@ -328,7 +328,7 @@ abstract class GltuenParquetFilterSuite extends ParquetFilterSuite with GlutenSQ } @ExtendedSQLTest -class GlutenParquetV1FilterSuite extends GltuenParquetFilterSuite with GlutenSQLTestsBaseTrait { +class GlutenParquetV1FilterSuite extends GlutenParquetFilterSuite with GlutenSQLTestsBaseTrait { // TODO: enable Parquet V2 write path after file source V2 writers are workable. override def sparkConf: SparkConf = super.sparkConf @@ -416,7 +416,7 @@ class GlutenParquetV1FilterSuite extends GltuenParquetFilterSuite with GlutenSQL } @ExtendedSQLTest -class GlutenParquetV2FilterSuite extends GltuenParquetFilterSuite with GlutenSQLTestsBaseTrait { +class GlutenParquetV2FilterSuite extends GlutenParquetFilterSuite with GlutenSQLTestsBaseTrait { // TODO: enable Parquet V2 write path after file source V2 writers are workable. override def sparkConf: SparkConf = super.sparkConf diff --git a/gluten-ut/spark34/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala b/gluten-ut/spark34/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala index 722b087ddd96..963fb79a3504 100644 --- a/gluten-ut/spark34/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala +++ b/gluten-ut/spark34/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala @@ -660,6 +660,8 @@ class VeloxTestSettings extends BackendTestSettings { .exclude("SPARK-34562: Bloom filter push down") .exclude("SPARK-16371 Do not push down filters when inner name and outer name are the same") .exclude("filter pushdown - StringPredicate") + // https://github.com/apache/incubator-gluten/issues/7174 + .excludeGlutenTest("Filter applied on merged Parquet schema with new column should work") enableSuite[GlutenParquetV2FilterSuite] // Rewrite. .exclude("Filter applied on merged Parquet schema with new column should work") @@ -678,6 +680,8 @@ class VeloxTestSettings extends BackendTestSettings { .exclude("SPARK-34562: Bloom filter push down") .exclude("SPARK-16371 Do not push down filters when inner name and outer name are the same") .exclude("filter pushdown - StringPredicate") + // https://github.com/apache/incubator-gluten/issues/7174 + .excludeGlutenTest("Filter applied on merged Parquet schema with new column should work") enableSuite[GlutenParquetInteroperabilitySuite] .exclude("parquet timestamp conversion") enableSuite[GlutenParquetIOSuite] diff --git a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/GlutenParquetFilterSuite.scala b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/GlutenParquetFilterSuite.scala index ec326088af3a..b4a4b6017b67 100644 --- a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/GlutenParquetFilterSuite.scala +++ b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/GlutenParquetFilterSuite.scala @@ -47,7 +47,7 @@ import java.time.LocalDate import scala.reflect.ClassTag import scala.reflect.runtime.universe.TypeTag -abstract class GltuenParquetFilterSuite extends ParquetFilterSuite with GlutenSQLTestsBaseTrait { +abstract class GlutenParquetFilterSuite extends ParquetFilterSuite with GlutenSQLTestsBaseTrait { protected def checkFilterPredicate( predicate: Predicate, filterClass: Class[_ <: FilterPredicate], @@ -328,7 +328,7 @@ abstract class GltuenParquetFilterSuite extends ParquetFilterSuite with GlutenSQ } @ExtendedSQLTest -class GlutenParquetV1FilterSuite extends GltuenParquetFilterSuite with GlutenSQLTestsBaseTrait { +class GlutenParquetV1FilterSuite extends GlutenParquetFilterSuite with GlutenSQLTestsBaseTrait { // TODO: enable Parquet V2 write path after file source V2 writers are workable. override def sparkConf: SparkConf = super.sparkConf @@ -416,7 +416,7 @@ class GlutenParquetV1FilterSuite extends GltuenParquetFilterSuite with GlutenSQL } @ExtendedSQLTest -class GlutenParquetV2FilterSuite extends GltuenParquetFilterSuite with GlutenSQLTestsBaseTrait { +class GlutenParquetV2FilterSuite extends GlutenParquetFilterSuite with GlutenSQLTestsBaseTrait { // TODO: enable Parquet V2 write path after file source V2 writers are workable. override def sparkConf: SparkConf = super.sparkConf diff --git a/gluten-ut/spark35/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala b/gluten-ut/spark35/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala index e8d8730e9366..baabff3f7872 100644 --- a/gluten-ut/spark35/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala +++ b/gluten-ut/spark35/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala @@ -665,6 +665,8 @@ class VeloxTestSettings extends BackendTestSettings { .exclude("SPARK-34562: Bloom filter push down") .exclude("SPARK-16371 Do not push down filters when inner name and outer name are the same") .exclude("filter pushdown - StringPredicate") + // https://github.com/apache/incubator-gluten/issues/7174 + .excludeGlutenTest("Filter applied on merged Parquet schema with new column should work") enableSuite[GlutenParquetV2FilterSuite] // Rewrite. .exclude("Filter applied on merged Parquet schema with new column should work") @@ -683,6 +685,8 @@ class VeloxTestSettings extends BackendTestSettings { .exclude("SPARK-34562: Bloom filter push down") .exclude("SPARK-16371 Do not push down filters when inner name and outer name are the same") .exclude("filter pushdown - StringPredicate") + // https://github.com/apache/incubator-gluten/issues/7174 + .excludeGlutenTest("Filter applied on merged Parquet schema with new column should work") enableSuite[GlutenParquetInteroperabilitySuite] .exclude("parquet timestamp conversion") enableSuite[GlutenParquetIOSuite] diff --git a/gluten-ut/spark35/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/GlutenParquetFilterSuite.scala b/gluten-ut/spark35/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/GlutenParquetFilterSuite.scala index 4141acee3170..063b424e0d13 100644 --- a/gluten-ut/spark35/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/GlutenParquetFilterSuite.scala +++ b/gluten-ut/spark35/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/GlutenParquetFilterSuite.scala @@ -47,7 +47,7 @@ import java.time.LocalDate import scala.reflect.ClassTag import scala.reflect.runtime.universe.TypeTag -abstract class GltuenParquetFilterSuite extends ParquetFilterSuite with GlutenSQLTestsBaseTrait { +abstract class GlutenParquetFilterSuite extends ParquetFilterSuite with GlutenSQLTestsBaseTrait { protected def checkFilterPredicate( predicate: Predicate, filterClass: Class[_ <: FilterPredicate], @@ -328,7 +328,7 @@ abstract class GltuenParquetFilterSuite extends ParquetFilterSuite with GlutenSQ } @ExtendedSQLTest -class GlutenParquetV1FilterSuite extends GltuenParquetFilterSuite with GlutenSQLTestsBaseTrait { +class GlutenParquetV1FilterSuite extends GlutenParquetFilterSuite with GlutenSQLTestsBaseTrait { // TODO: enable Parquet V2 write path after file source V2 writers are workable. override def sparkConf: SparkConf = super.sparkConf @@ -416,7 +416,7 @@ class GlutenParquetV1FilterSuite extends GltuenParquetFilterSuite with GlutenSQL } @ExtendedSQLTest -class GlutenParquetV2FilterSuite extends GltuenParquetFilterSuite with GlutenSQLTestsBaseTrait { +class GlutenParquetV2FilterSuite extends GlutenParquetFilterSuite with GlutenSQLTestsBaseTrait { // TODO: enable Parquet V2 write path after file source V2 writers are workable. override def sparkConf: SparkConf = super.sparkConf