HyukjinKwon commented on a change in pull request #27778: [SPARK-31027] [SQL]
Refactor DataSourceStrategy to be more extendable
URL: https://github.com/apache/spark/pull/27778#discussion_r387510058
##########
File path:
sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/DataSourceStrategy.scala
##########
@@ -438,60 +438,66 @@ object DataSourceStrategy {
}
private def translateLeafNodeFilter(predicate: Expression): Option[Filter] =
predicate match {
- case expressions.EqualTo(a: Attribute, Literal(v, t)) =>
- Some(sources.EqualTo(a.name, convertToScala(v, t)))
- case expressions.EqualTo(Literal(v, t), a: Attribute) =>
- Some(sources.EqualTo(a.name, convertToScala(v, t)))
-
- case expressions.EqualNullSafe(a: Attribute, Literal(v, t)) =>
- Some(sources.EqualNullSafe(a.name, convertToScala(v, t)))
- case expressions.EqualNullSafe(Literal(v, t), a: Attribute) =>
- Some(sources.EqualNullSafe(a.name, convertToScala(v, t)))
-
- case expressions.GreaterThan(a: Attribute, Literal(v, t)) =>
- Some(sources.GreaterThan(a.name, convertToScala(v, t)))
- case expressions.GreaterThan(Literal(v, t), a: Attribute) =>
- Some(sources.LessThan(a.name, convertToScala(v, t)))
-
- case expressions.LessThan(a: Attribute, Literal(v, t)) =>
- Some(sources.LessThan(a.name, convertToScala(v, t)))
- case expressions.LessThan(Literal(v, t), a: Attribute) =>
- Some(sources.GreaterThan(a.name, convertToScala(v, t)))
-
- case expressions.GreaterThanOrEqual(a: Attribute, Literal(v, t)) =>
- Some(sources.GreaterThanOrEqual(a.name, convertToScala(v, t)))
- case expressions.GreaterThanOrEqual(Literal(v, t), a: Attribute) =>
- Some(sources.LessThanOrEqual(a.name, convertToScala(v, t)))
-
- case expressions.LessThanOrEqual(a: Attribute, Literal(v, t)) =>
- Some(sources.LessThanOrEqual(a.name, convertToScala(v, t)))
- case expressions.LessThanOrEqual(Literal(v, t), a: Attribute) =>
- Some(sources.GreaterThanOrEqual(a.name, convertToScala(v, t)))
-
- case expressions.InSet(a: Attribute, set) =>
- val toScala = CatalystTypeConverters.createToScalaConverter(a.dataType)
- Some(sources.In(a.name, set.toArray.map(toScala)))
+ case expressions.EqualTo(PushableColumn(name), Literal(v, t)) =>
+ Some(sources.EqualTo(name, convertToScala(v, t)))
+ case expressions.EqualTo(Literal(v, t), PushableColumn(name)) =>
+ Some(sources.EqualTo(name, convertToScala(v, t)))
+
+ case expressions.EqualNullSafe(PushableColumn(name), Literal(v, t)) =>
+ Some(sources.EqualNullSafe(name, convertToScala(v, t)))
+ case expressions.EqualNullSafe(Literal(v, t), PushableColumn(name)) =>
+ Some(sources.EqualNullSafe(name, convertToScala(v, t)))
+
+ case expressions.GreaterThan(PushableColumn(name), Literal(v, t)) =>
+ Some(sources.GreaterThan(name, convertToScala(v, t)))
+ case expressions.GreaterThan(Literal(v, t), PushableColumn(name)) =>
+ Some(sources.LessThan(name, convertToScala(v, t)))
+
+ case expressions.LessThan(PushableColumn(name), Literal(v, t)) =>
+ Some(sources.LessThan(name, convertToScala(v, t)))
+ case expressions.LessThan(Literal(v, t), PushableColumn(name)) =>
+ Some(sources.GreaterThan(name, convertToScala(v, t)))
+
+ case expressions.GreaterThanOrEqual(PushableColumn(name), Literal(v, t)) =>
+ Some(sources.GreaterThanOrEqual(name, convertToScala(v, t)))
+ case expressions.GreaterThanOrEqual(Literal(v, t), PushableColumn(name)) =>
+ Some(sources.LessThanOrEqual(name, convertToScala(v, t)))
+
+ case expressions.LessThanOrEqual(PushableColumn(name), Literal(v, t)) =>
+ Some(sources.LessThanOrEqual(name, convertToScala(v, t)))
+ case expressions.LessThanOrEqual(Literal(v, t), PushableColumn(name)) =>
+ Some(sources.GreaterThanOrEqual(name, convertToScala(v, t)))
+
+ case expressions.InSet(e: Expression, set) => e match {
+ case PushableColumn(name) =>
+ val toScala = CatalystTypeConverters.createToScalaConverter(e.dataType)
+ Some(sources.In(name, set.toArray.map(toScala)))
+ case _ => None
+ }
// Because we only convert In to InSet in Optimizer when there are more
than certain
// items. So it is possible we still get an In expression here that needs
to be pushed
// down.
- case expressions.In(a: Attribute, list) if
list.forall(_.isInstanceOf[Literal]) =>
- val hSet = list.map(_.eval(EmptyRow))
- val toScala = CatalystTypeConverters.createToScalaConverter(a.dataType)
- Some(sources.In(a.name, hSet.toArray.map(toScala)))
+ case expressions.In(e, list) => e match {
Review comment:
Nice, +1
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
