Skip to content

feat: Partition predicate fix for Databricks runtime support #14059

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+16 −4
Open

feat: Partition predicate fix for Databricks runtime support #14059

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
24775c0
Fixed Databricks error for InterpretedPredicate constructor
ad1happy2go Sep 5, 2025
43b5324
Fixed the issue
ad1happy2go Oct 7, 2025
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
20 changes: 16 additions & 4 deletions ...tasource/hudi-spark-common/src/main/scala/org/apache/hudi/SparkHoodieTableFileIndex.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ import org.apache.spark.api.java.JavaSparkContext
import org.apache.spark.internal.Logging
import org.apache.spark.sql.SparkSession
import org.apache.spark.sql.catalyst.{expressions, InternalRow}
import org.apache.spark.sql.catalyst.expressions.{AttributeReference, BoundReference, EmptyRow, EqualTo, Expression, InterpretedPredicate, Literal}
import org.apache.spark.sql.catalyst.expressions.{AttributeReference, BasePredicate, BoundReference, EmptyRow, EqualTo, Expression, InterpretedPredicate, Literal}
import org.apache.spark.sql.catalyst.util.DateTimeUtils
import org.apache.spark.sql.execution.datasources.{FileStatusCache, NoopCache}
import org.apache.spark.sql.internal.SQLConf
Expand Down Expand Up @@ -248,12 +248,24 @@ class SparkHoodieTableFileIndex(spark: SparkSession,
// the whole table
if (haveProperPartitionValues(partitionPaths.toSeq) && partitionSchema.nonEmpty) {
val predicate = partitionPruningPredicates.reduce(expressions.And)
val boundPredicate = InterpretedPredicate(predicate.transform {
val transformedPredicate = predicate.transform {
case a: AttributeReference =>
val index = partitionSchema.indexWhere(a.name == _.name)
BoundReference(index, partitionSchema(index).dataType, nullable = true)
})

}
val boundPredicate: BasePredicate = try {
// Try using 1-arg constructor via reflection
val clazz = Class.forName("org.apache.spark.sql.catalyst.expressions.InterpretedPredicate")
val ctor = clazz.getConstructor(classOf[Expression])
ctor.newInstance(transformedPredicate).asInstanceOf[BasePredicate]
} catch {
case _: NoSuchMethodException | _: IllegalArgumentException =>
// Fallback: Try using 2-arg constructor
val clazz = Class.forName("org.apache.spark.sql.catalyst.expressions.InterpretedPredicate")
val ctor = clazz.getConstructor(classOf[Expression], classOf[Boolean])
ctor.newInstance(transformedPredicate, java.lang.Boolean.FALSE)
.asInstanceOf[BasePredicate]
Comment on lines +266 to +267
Copy link
Contributor

Choose a reason for hiding this comment

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

nit: add docs on what the second argument represents?

}
val prunedPartitionPaths = partitionPaths.filter {
partitionPath => boundPredicate.eval(InternalRow.fromSeq(partitionPath.values))
}.toSeq
Expand Down
Loading