Skip to content

Commit cc41281

Browse files
committed
Fixes several styling issues
1 parent de7de28 commit cc41281

File tree

3 files changed

+12
-3
lines changed

3 files changed

+12
-3
lines changed

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/literals.scala

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@ object Literal {
4141
}
4242
}
4343

44+
/**
45+
* An extractor that matches non-null literal values
46+
*/
4447
object NonNullLiteral {
4548
def unapply(literal: Literal): Option[(Any, DataType)] = {
4649
Option(literal.value).map(_ => (literal.value, literal.dataType))

sql/core/src/main/scala/org/apache/spark/sql/parquet/ParquetFilters.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ private[sql] object ParquetFilters {
5050
(n: String, v: Any) => FilterApi.eq(floatColumn(n), v.asInstanceOf[java.lang.Float])
5151
case DoubleType =>
5252
(n: String, v: Any) => FilterApi.eq(doubleColumn(n), v.asInstanceOf[java.lang.Double])
53+
54+
// Binary.fromString and Binary.fromByteArray don't accept null values
5355
case StringType =>
5456
(n: String, v: Any) => FilterApi.eq(
5557
binaryColumn(n),

sql/core/src/test/scala/org/apache/spark/sql/parquet/ParquetQuerySuite.scala

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ case class NumericData(i: Int, d: Double)
8585
class ParquetQuerySuite extends QueryTest with FunSuiteLike with BeforeAndAfterAll {
8686
TestData // Load test data tables.
8787

88-
var testRDD: SchemaRDD = null
89-
var originalParquetFilterPushdownEnabled = TestSQLContext.parquetFilterPushDown
88+
private var testRDD: SchemaRDD = null
89+
private val originalParquetFilterPushdownEnabled = TestSQLContext.parquetFilterPushDown
9090

9191
override def beforeAll() {
9292
ParquetTestData.writeFile()
@@ -1043,6 +1043,10 @@ class ParquetQuerySuite extends QueryTest with FunSuiteLike with BeforeAndAfterA
10431043
Literal(null) >= 'a.int
10441044
)
10451045

1046-
predicates.foreach(p => assert(ParquetFilters.createFilter(p).isEmpty))
1046+
predicates.foreach { p =>
1047+
assert(
1048+
ParquetFilters.createFilter(p).isEmpty,
1049+
"Comparison predicate with null shouldn't be pushed down")
1050+
}
10471051
}
10481052
}

0 commit comments

Comments
 (0)