Skip to content

[SPARK-39784][SQL] Put Literal values on the right side of the data source filter after translating Catalyst Expression to data source filter #37197

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 8 commits into from
Closed

[SPARK-39784][SQL] Put Literal values on the right side of the data source filter after translating Catalyst Expression to data source filter #37197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f742b20
Literal values should be on the right side of the data source filter
huaxingao Jul 14, 2022
fa4d57a
normalize V2 attr cmp lit in V2ExpressionBuilder
huaxingao Jul 21, 2022
a708ad6
fix test failure
huaxingao Jul 21, 2022
47e30c4
remove extra space
huaxingao Jul 22, 2022
1e94c53
address comments
huaxingao Jul 22, 2022
324dd87
fix test failure
huaxingao Jul 22, 2022
99b6c45
4 space indentation for breaking a line
huaxingao Jul 22, 2022
a4e8170
address comments
huaxingao Jul 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions sql/core/src/main/scala/org/apache/spark/sql/catalyst/util/V2ExpressionBuilder.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,10 @@ class V2ExpressionBuilder(e: Expression, isPredicate: Boolean = false) {
val r = generateExpression(b.right)
if (l.isDefined && r.isDefined) {
b match {
case _: Predicate if isBinaryComparisonOperator(b.sqlOperator) &&
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: we can just use type check BinaryComparison

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will submit a follow up to fix this. Thanks.

l.get.isInstanceOf[LiteralValue[_]] && r.get.isInstanceOf[FieldReference] =>
Some(new V2Predicate(flipComparisonOperatorName(b.sqlOperator),
Array[V2Expression](r.get, l.get)))
case _: Predicate =>
Some(new V2Predicate(b.sqlOperator, Array[V2Expression](l.get, r.get)))
case _ =>
Expand Down Expand Up @@ -408,6 +412,23 @@ class V2ExpressionBuilder(e: Expression, isPredicate: Boolean = false) {
}
case _ => None
}

private def isBinaryComparisonOperator(operatorName: String): Boolean = {
operatorName match {
case ">" | "<" | ">=" | "<=" | "=" | "<=>" => true
case _ => false
}
}

private def flipComparisonOperatorName(operatorName: String): String = {
operatorName match {
case ">" => "<"
case "<" => ">"
case ">=" => "<="
case "<=" => ">="
case _ => operatorName
}
}
}

object ColumnOrField {
Expand Down
67 changes: 65 additions & 2 deletions .../test/scala/org/apache/spark/sql/execution/datasources/v2/DataSourceV2StrategySuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,77 @@
package org.apache.spark.sql.execution.datasources.v2

import org.apache.spark.sql.catalyst.dsl.expressions._
import org.apache.spark.sql.catalyst.expressions.Expression
import org.apache.spark.sql.catalyst.expressions._
import org.apache.spark.sql.catalyst.plans.PlanTest
import org.apache.spark.sql.connector.expressions.{FieldReference, LiteralValue}
import org.apache.spark.sql.connector.expressions.filter.Predicate
import org.apache.spark.sql.test.SharedSparkSession
import org.apache.spark.sql.types.BooleanType
import org.apache.spark.sql.types.{BooleanType, IntegerType, StringType, StructField, StructType}

class DataSourceV2StrategySuite extends PlanTest with SharedSparkSession {
val attrInts = Seq(
$"cint".int,
$"c.int".int,
GetStructField($"a".struct(StructType(
StructField("cstr", StringType, nullable = true) ::
StructField("cint", IntegerType, nullable = true) :: Nil)), 1, None),
GetStructField($"a".struct(StructType(
StructField("c.int", IntegerType, nullable = true) ::
StructField("cstr", StringType, nullable = true) :: Nil)), 0, None),
GetStructField($"a.b".struct(StructType(
StructField("cstr1", StringType, nullable = true) ::
StructField("cstr2", StringType, nullable = true) ::
StructField("cint", IntegerType, nullable = true) :: Nil)), 2, None),
GetStructField($"a.b".struct(StructType(
StructField("c.int", IntegerType, nullable = true) :: Nil)), 0, None),
GetStructField(GetStructField($"a".struct(StructType(
StructField("cstr1", StringType, nullable = true) ::
StructField("b", StructType(StructField("cint", IntegerType, nullable = true) ::
StructField("cstr2", StringType, nullable = true) :: Nil)) :: Nil)), 1, None), 0, None)
).zip(Seq(
"cint",
"`c.int`", // single level field that contains `dot` in name
"a.cint", // two level nested field
"a.`c.int`", // two level nested field, and nested level contains `dot`
"`a.b`.cint", // two level nested field, and top level contains `dot`
"`a.b`.`c.int`", // two level nested field, and both levels contain `dot`
"a.b.cint" // three level nested field
))

test("SPARK-39784: translate binary expression") { attrInts
.foreach { case (attrInt, intColName) =>
testTranslateFilter(EqualTo(attrInt, 1),
Some(new Predicate("=", Array(FieldReference(intColName), LiteralValue(1, IntegerType)))))
testTranslateFilter(EqualTo(1, attrInt),
Some(new Predicate("=", Array(FieldReference(intColName), LiteralValue(1, IntegerType)))))

testTranslateFilter(EqualNullSafe(attrInt, 1),
Some(new Predicate("<=>", Array(FieldReference(intColName), LiteralValue(1, IntegerType)))))
testTranslateFilter(EqualNullSafe(1, attrInt),
Some(new Predicate("<=>", Array(FieldReference(intColName), LiteralValue(1, IntegerType)))))

testTranslateFilter(GreaterThan(attrInt, 1),
Some(new Predicate(">", Array(FieldReference(intColName), LiteralValue(1, IntegerType)))))
testTranslateFilter(GreaterThan(1, attrInt),
Some(new Predicate("<", Array(FieldReference(intColName), LiteralValue(1, IntegerType)))))

testTranslateFilter(LessThan(attrInt, 1),
Some(new Predicate("<", Array(FieldReference(intColName), LiteralValue(1, IntegerType)))))
testTranslateFilter(LessThan(1, attrInt),
Some(new Predicate(">", Array(FieldReference(intColName), LiteralValue(1, IntegerType)))))

testTranslateFilter(GreaterThanOrEqual(attrInt, 1),
Some(new Predicate(">=", Array(FieldReference(intColName), LiteralValue(1, IntegerType)))))
testTranslateFilter(GreaterThanOrEqual(1, attrInt),
Some(new Predicate("<=", Array(FieldReference(intColName), LiteralValue(1, IntegerType)))))

testTranslateFilter(LessThanOrEqual(attrInt, 1),
Some(new Predicate("<=", Array(FieldReference(intColName), LiteralValue(1, IntegerType)))))
testTranslateFilter(LessThanOrEqual(1, attrInt),
Some(new Predicate(">=", Array(FieldReference(intColName), LiteralValue(1, IntegerType)))))
}
}

test("SPARK-36644: Push down boolean column filter") {
testTranslateFilter($"col".boolean,
Some(new Predicate("=", Array(FieldReference("col"), LiteralValue(true, BooleanType)))))
Expand Down