diff options
| -rw-r--r-- | sql/core/src/main/scala/org/apache/spark/sql/parquet/ParquetFilters.scala | 8 | ||||
| -rw-r--r-- | sql/core/src/test/scala/org/apache/spark/sql/parquet/ParquetQuerySuite.scala | 12 |
2 files changed, 16 insertions, 4 deletions
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/parquet/ParquetFilters.scala b/sql/core/src/main/scala/org/apache/spark/sql/parquet/ParquetFilters.scala index 3a9e1499e2..6fb5f49b13 100644 --- a/sql/core/src/main/scala/org/apache/spark/sql/parquet/ParquetFilters.scala +++ b/sql/core/src/main/scala/org/apache/spark/sql/parquet/ParquetFilters.scala @@ -135,22 +135,22 @@ private[sql] object ParquetFilters { case LessThan(NamedExpression(name, _), Literal(value, dataType)) => makeLt.lift(dataType).map(_(name, value)) case LessThan(Literal(value, dataType), NamedExpression(name, _)) => - makeLt.lift(dataType).map(_(name, value)) + makeGt.lift(dataType).map(_(name, value)) case LessThanOrEqual(NamedExpression(name, _), Literal(value, dataType)) => makeLtEq.lift(dataType).map(_(name, value)) case LessThanOrEqual(Literal(value, dataType), NamedExpression(name, _)) => - makeLtEq.lift(dataType).map(_(name, value)) + makeGtEq.lift(dataType).map(_(name, value)) case GreaterThan(NamedExpression(name, _), Literal(value, dataType)) => makeGt.lift(dataType).map(_(name, value)) case GreaterThan(Literal(value, dataType), NamedExpression(name, _)) => - makeGt.lift(dataType).map(_(name, value)) + makeLt.lift(dataType).map(_(name, value)) case GreaterThanOrEqual(NamedExpression(name, _), Literal(value, dataType)) => makeGtEq.lift(dataType).map(_(name, value)) case GreaterThanOrEqual(Literal(value, dataType), NamedExpression(name, _)) => - makeGtEq.lift(dataType).map(_(name, value)) + makeLtEq.lift(dataType).map(_(name, value)) case And(lhs, rhs) => (createFilter(lhs) ++ createFilter(rhs)).reduceOption(FilterApi.and) diff --git a/sql/core/src/test/scala/org/apache/spark/sql/parquet/ParquetQuerySuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/parquet/ParquetQuerySuite.scala index d31a9d8418..7ee4f3c1e9 100644 --- a/sql/core/src/test/scala/org/apache/spark/sql/parquet/ParquetQuerySuite.scala +++ b/sql/core/src/test/scala/org/apache/spark/sql/parquet/ParquetQuerySuite.scala @@ -461,9 +461,21 @@ class ParquetQuerySuite extends QueryTest with FunSuiteLike with BeforeAndAfterA } checkFilter[Operators.Eq[Integer]]('a.int === 1) + checkFilter[Operators.Eq[Integer]](Literal(1) === 'a.int) + checkFilter[Operators.Lt[Integer]]('a.int < 4) + checkFilter[Operators.Lt[Integer]](Literal(4) > 'a.int) + checkFilter[Operators.LtEq[Integer]]('a.int <= 4) + checkFilter[Operators.LtEq[Integer]](Literal(4) >= 'a.int) + + checkFilter[Operators.Gt[Integer]]('a.int > 4) + checkFilter[Operators.Gt[Integer]](Literal(4) < 'a.int) + checkFilter[Operators.GtEq[Integer]]('a.int >= 4) + checkFilter[Operators.GtEq[Integer]](Literal(4) <= 'a.int) + checkFilter[Operators.And]('a.int === 1 && 'a.int < 4) checkFilter[Operators.Or]('a.int === 1 || 'a.int < 4) + checkFilter[Operators.Not](!('a.int === 1)) checkFilter('a.int > 'b.int, defined = false) checkFilter(('a.int > 'b.int) && ('a.int > 'b.int), defined = false) |