@@ -28,7 +28,6 @@ import org.apache.spark.sql.catalyst.trees.TreeNodeTag
2828import org .apache .spark .sql .delta .{DeltaColumnMapping , DeltaParquetFileFormat , NoMapping }
2929import org .apache .spark .sql .execution .{FileSourceScanExec , FilterExec , ProjectExec , SparkPlan }
3030import org .apache .spark .sql .execution .datasources .FileFormat
31- import org .apache .spark .sql .execution .datasources .parquet .ParquetFileFormat
3231import org .apache .spark .sql .types .StructType
3332
3433import scala .collection .mutable .ListBuffer
@@ -43,11 +42,13 @@ object DeltaPostTransformRules {
4342
4443 private val deletionVectorDeletedRowColumnName = " __delta_internal_is_row_deleted"
4544 private val deletionVectorRowIndexColumnName = " __delta_internal_row_index"
45+ // Spark 3.5+ exposes this as ParquetFileFormat.ROW_INDEX_TEMPORARY_COLUMN_NAME.
46+ private val parquetTemporaryRowIndexColumnName = " _tmp_metadata_row_index"
4647 private val deletionVectorRowIndexColumnNames =
4748 Set (
4849 deletionVectorRowIndexColumnName,
4950 DeltaParquetFileFormat .ROW_INDEX_COLUMN_NAME ,
50- ParquetFileFormat . ROW_INDEX_TEMPORARY_COLUMN_NAME )
51+ parquetTemporaryRowIndexColumnName )
5152 private val deletionVectorInternalColumnNames =
5253 Set (deletionVectorDeletedRowColumnName, deletionVectorRowIndexColumnName)
5354 private val deletionVectorPredicateColumnNames =
0 commit comments