cloud-fan commented on a change in pull request #35768:
URL: https://github.com/apache/spark/pull/35768#discussion_r825978100
##########
File path:
sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/v2/DataSourceV2Strategy.scala
##########
@@ -609,20 +544,58 @@ private[sql] object DataSourceV2Strategy {
}
protected[sql] def rebuildExpressionFromFilter(
- filter: V2Filter,
- translatedFilterToExpr: mutable.HashMap[V2Filter, Expression]):
Expression = {
- filter match {
+ predicate: Predicate,
+ translatedFilterToExpr: mutable.HashMap[Predicate, Expression]):
Expression = {
+ predicate match {
case and: V2And =>
- expressions.And(rebuildExpressionFromFilter(and.left,
translatedFilterToExpr),
- rebuildExpressionFromFilter(and.right, translatedFilterToExpr))
+ expressions.And(
+ rebuildExpressionFromFilter(and.left(), translatedFilterToExpr),
+ rebuildExpressionFromFilter(and.right(), translatedFilterToExpr))
case or: V2Or =>
- expressions.Or(rebuildExpressionFromFilter(or.left,
translatedFilterToExpr),
- rebuildExpressionFromFilter(or.right, translatedFilterToExpr))
+ expressions.Or(
+ rebuildExpressionFromFilter(or.left(), translatedFilterToExpr),
+ rebuildExpressionFromFilter(or.right(), translatedFilterToExpr))
case not: V2Not =>
- expressions.Not(rebuildExpressionFromFilter(not.child,
translatedFilterToExpr))
- case other =>
- translatedFilterToExpr.getOrElse(other,
- throw new IllegalStateException("Failed to rebuild Expression for
filter: " + filter))
+ expressions.Not(rebuildExpressionFromFilter(not.child(),
translatedFilterToExpr))
+ case _ =>
+ translatedFilterToExpr.getOrElse(predicate,
+ throw new IllegalStateException("Failed to rebuild Expression for
filter: " + predicate))
+ }
+ }
+}
+
+abstract class PushablePredicateBase {
+ val nestedPredicatePushdownEnabled: Boolean
+ val pushableColumn: PushableColumnBase =
PushableColumn(nestedPredicatePushdownEnabled)
+
+ def unapply(e: Expression): Option[Predicate] = e match {
+ case col @ pushableColumn(name) if col.dataType.isInstanceOf[BooleanType]
=>
+ Some(new Predicate("=", Array(FieldReference(name), LiteralValue(true,
BooleanType))))
+ case _ =>
+ new V2ExpressionBuilder(e, nestedPredicatePushdownEnabled).build().map {
v =>
+ assert(v.isInstanceOf[Predicate])
+ v.asInstanceOf[Predicate]
+ }
+ }
+}
+
+object PushablePredicateWithNestedColumn extends PushablePredicateBase {
+ override val nestedPredicatePushdownEnabled = true
+}
+
+object PushablePredicateWithoutNestedColumn extends PushablePredicateBase {
+ override val nestedPredicatePushdownEnabled = false
+}
+
+/**
+ * Get the expression of DS V2 to represent catalyst predicate that can be
pushed down.
+ */
+object PushablePredicate {
Review comment:
Can we simplify this?
```
case class PushablePredicate(supportNestedCol: Boolean) {
private val pushableColumn: PushableColumnBase =
PushableColumn(nestedPredicatePushdownEnabled)
def unapply...
}
```
--
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.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
