szehon-ho commented on code in PR #54459:
URL: https://github.com/apache/spark/pull/54459#discussion_r2922359137
##########
sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/v2/PushDownUtils.scala:
##########
@@ -19,28 +19,82 @@ package org.apache.spark.sql.execution.datasources.v2
import scala.collection.mutable
-import org.apache.spark.sql.catalyst.expressions.{AttributeReference,
AttributeSet, Expression, NamedExpression, SchemaPruning}
+import org.apache.spark.SparkException
+import org.apache.spark.sql.catalyst.expressions.{AttributeReference,
AttributeSet, Expression, ExpressionSet, NamedExpression, PythonUDF,
SchemaPruning, SubqueryExpression, V2ExpressionUtils}
import org.apache.spark.sql.catalyst.types.DataTypeUtils.toAttributes
import org.apache.spark.sql.catalyst.util.CharVarcharUtils
+import org.apache.spark.sql.connector.expressions.IdentityTransform
import org.apache.spark.sql.connector.expressions.SortOrder
-import org.apache.spark.sql.connector.expressions.filter.Predicate
import org.apache.spark.sql.connector.read.{Scan, ScanBuilder,
SupportsPushDownFilters, SupportsPushDownLimit, SupportsPushDownOffset,
SupportsPushDownRequiredColumns, SupportsPushDownTableSample,
SupportsPushDownTopN, SupportsPushDownV2Filters}
-import org.apache.spark.sql.execution.datasources.DataSourceStrategy
+import org.apache.spark.sql.execution.datasources.{DataSourceStrategy,
DataSourceUtils}
import org.apache.spark.sql.internal.SQLConf
-import org.apache.spark.sql.internal.connector.SupportsPushDownCatalystFilters
+import org.apache.spark.sql.internal.connector.{PartitionPredicateImpl,
SupportsPushDownCatalystFilters}
import org.apache.spark.sql.sources
-import org.apache.spark.sql.types.StructType
+import org.apache.spark.sql.types.{StructField, StructType}
import org.apache.spark.util.ArrayImplicits._
import org.apache.spark.util.collection.Utils
object PushDownUtils {
+
Review Comment:
actually i thought about it and rewrote it, its much shorter now (at least
the second pass part), let me know
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/internal/connector/PartitionPredicateImpl.scala:
##########
@@ -0,0 +1,134 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.spark.sql.internal.connector
+
+import org.apache.spark.SparkException
+import org.apache.spark.internal.{Logging, LogKeys}
+import org.apache.spark.sql.catalyst.InternalRow
+import org.apache.spark.sql.catalyst.expressions.{AttributeReference,
BoundReference, Expression => CatalystExpression, Predicate =>
CatalystPredicate}
+import org.apache.spark.sql.connector.expressions.Expression
+import org.apache.spark.sql.connector.expressions.NamedReference
+import org.apache.spark.sql.connector.expressions.filter.PartitionPredicate
+
+/**
+ * An implementation for [[PartitionPredicate]] that wraps a Catalyst
Expression representing a
+ * partition filter.
+ * <p>
+ * Supporting data sources receive these via
+ *
[[org.apache.spark.sql.connector.read.SupportsPushDownV2Filters#pushPredicates]]
+ * and may use them for additional partition filtering.
+ */
+class PartitionPredicateImpl private (
+ private val catalystExpr: CatalystExpression,
+ private val partitionSchema: Seq[AttributeReference])
+ extends PartitionPredicate(Expression.EMPTY_EXPRESSION) with Logging {
+
+ /** The wrapped partition filter Catalyst Expression. */
+ def expression: CatalystExpression = catalystExpr
+
+ /** Bound predicate, computed once and reused for all partition rows. */
+ private lazy val boundPredicate: InternalRow => Boolean = {
+ // Column name matching is case-sensitive, consistent with DSV1 partition
filtering.
+ val boundExpr = catalystExpr.transform {
+ case a: AttributeReference =>
+ val index = partitionSchema.indexWhere(_.name == a.name)
+ require(index >= 0, s"Column ${a.name} not found in partition schema")
+ BoundReference(index, partitionSchema(index).dataType, nullable = true)
+ }
+ val predicate = CatalystPredicate.createInterpreted(boundExpr)
+ predicate.eval
+ }
+
+ override def eval(partitionValues: InternalRow): Boolean = {
+ if (partitionValues.numFields != partitionSchema.length) {
+ logWarning(
+ log"Cannot evaluate partition predicate " +
+ log"${MDC(LogKeys.EXPR, catalystExpr.sql)}: " +
+ log"partition value field count " +
+ log"(${MDC(LogKeys.COUNT, partitionValues.numFields)}) does not " +
+ log"match schema (${MDC(LogKeys.NUM_PARTITIONS,
partitionSchema.length)}), " +
+ log"including partition")
+ return true
+ }
+
+ try {
+ boundPredicate(partitionValues)
+ } catch {
+ case e: Exception =>
+ logWarning(
+ log"Failed to evaluate partition predicate " +
+ log"${MDC(LogKeys.EXPR, catalystExpr.sql)}, including partition",
+ e)
+ true
+ }
+ }
+
+ override def referencedPartitionColumnOrdinals(): Array[Int] = {
+ val partitionNames = partitionSchema.map(_.name)
+ // Case-sensitive column name matching, consistent with DSV1.
+ val ordinals = catalystExpr.references.flatMap { ref =>
+ val idx = partitionNames.indexWhere(_ == ref.name)
+ if (idx >= 0) {
+ Some(idx)
+ } else {
+ None
+ }
+ }
+ ordinals.toArray.sorted.distinct
+ }
+
+ override def references(): Array[NamedReference] = {
+ referencedPartitionColumnOrdinals().map { ord =>
+ PartitionColumnReferenceImpl(ord, Array(partitionSchema(ord).name))
+ }
+ }
+
+ override def equals(obj: Any): Boolean = obj match {
+ case other: PartitionPredicateImpl =>
+ catalystExpr.semanticEquals(other.catalystExpr) &&
+ partitionSchema == other.partitionSchema
+ case _ => false
+ }
+
+ override def hashCode(): Int = {
+ 31 * catalystExpr.semanticHash() + partitionSchema.hashCode()
+ }
+
+ override def toString(): String =
+ s"PartitionPredicate(${catalystExpr.sql})"
+}
+
+object PartitionPredicateImpl {
+
+ def apply(
+ catalystExpr: CatalystExpression,
+ partitionSchema: Seq[AttributeReference]): PartitionPredicateImpl = {
+ if (partitionSchema.isEmpty) {
+ throw SparkException.internalError(
+ s"Cannot evaluate partition predicate ${catalystExpr.sql}: partition
schema is empty")
+ }
+ val refNames = catalystExpr.references.map(_.name).toSet
+ val partitionNames = partitionSchema.map(_.name).toSet
Review Comment:
making this blocked for now
--
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]
