Skip to content

Commit f64693d

Browse files
authored
fix build (apache#1924)
1 parent c31efea commit f64693d

1 file changed

Lines changed: 15 additions & 5 deletions

File tree

dev/diffs/3.4.3.diff

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1890,7 +1890,7 @@ index 07e2849ce6f..3e73645b638 100644
18901890
ParquetOutputFormat.WRITER_VERSION -> ParquetProperties.WriterVersion.PARQUET_2_0.toString
18911891
)
18921892
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/ParquetFilterSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/ParquetFilterSuite.scala
1893-
index 104b4e416cd..0bd2e24e387 100644
1893+
index 104b4e416cd..37ea65081e4 100644
18941894
--- a/sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/ParquetFilterSuite.scala
18951895
+++ b/sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/parquet/ParquetFilterSuite.scala
18961896
@@ -1096,7 +1096,11 @@ abstract class ParquetFilterSuite extends QueryTest with ParquetTest with Shared
@@ -1942,7 +1942,17 @@ index 104b4e416cd..0bd2e24e387 100644
19421942
}
19431943
}
19441944
}
1945-
@@ -1985,7 +1998,8 @@ abstract class ParquetFilterSuite extends QueryTest with ParquetTest with Shared
1945+
@@ -1744,7 +1757,8 @@ abstract class ParquetFilterSuite extends QueryTest with ParquetTest with Shared
1946+
}
1947+
}
1948+
1949+
- test("SPARK-17091: Convert IN predicate to Parquet filter push-down") {
1950+
+ test("SPARK-17091: Convert IN predicate to Parquet filter push-down",
1951+
+ IgnoreCometNativeScan("Comet has different push-down behavior")) {
1952+
val schema = StructType(Seq(
1953+
StructField("a", IntegerType, nullable = false)
1954+
))
1955+
@@ -1985,7 +1999,8 @@ abstract class ParquetFilterSuite extends QueryTest with ParquetTest with Shared
19461956
}
19471957
}
19481958

@@ -1952,7 +1962,7 @@ index 104b4e416cd..0bd2e24e387 100644
19521962
// block 1:
19531963
// null count min max
19541964
// page-0 0 0 99
1955-
@@ -2045,7 +2059,8 @@ abstract class ParquetFilterSuite extends QueryTest with ParquetTest with Shared
1965+
@@ -2045,7 +2060,8 @@ abstract class ParquetFilterSuite extends QueryTest with ParquetTest with Shared
19561966
}
19571967
}
19581968

@@ -1962,7 +1972,7 @@ index 104b4e416cd..0bd2e24e387 100644
19621972
withTempPath { dir =>
19631973
val path = dir.getCanonicalPath
19641974
spark.range(100).selectExpr("id * 2 AS id")
1965-
@@ -2277,7 +2292,11 @@ class ParquetV1FilterSuite extends ParquetFilterSuite {
1975+
@@ -2277,7 +2293,11 @@ class ParquetV1FilterSuite extends ParquetFilterSuite {
19661976
assert(pushedParquetFilters.exists(_.getClass === filterClass),
19671977
s"${pushedParquetFilters.map(_.getClass).toList} did not contain ${filterClass}.")
19681978

@@ -1975,7 +1985,7 @@ index 104b4e416cd..0bd2e24e387 100644
19751985
} else {
19761986
assert(selectedFilters.isEmpty, "There is filter pushed down")
19771987
}
1978-
@@ -2337,7 +2356,11 @@ class ParquetV2FilterSuite extends ParquetFilterSuite {
1988+
@@ -2337,7 +2357,11 @@ class ParquetV2FilterSuite extends ParquetFilterSuite {
19791989
assert(pushedParquetFilters.exists(_.getClass === filterClass),
19801990
s"${pushedParquetFilters.map(_.getClass).toList} did not contain ${filterClass}.")
19811991

0 commit comments

Comments
 (0)