Skip to content

fix: [df52] route timestamp timezone mismatches through spark_parquet_convert #3494

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

Merged
andygrove merged 1 commit into from
Feb 12, 2026
Merged

fix: [df52] route timestamp timezone mismatches through spark_parquet_convert #3494

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 12 additions & 3 deletions native/core/src/parquet/schema_adapter.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,14 +194,23 @@ impl SparkPhysicalExprAdapter {
let physical_type = cast.input_field().data_type();
let target_type = cast.target_field().data_type();

// For complex nested types (Struct, List, Map), use CometCastColumnExpr
// with spark_parquet_convert which handles field-name-based selection,
// reordering, and nested type casting correctly.
// For complex nested types (Struct, List, Map) and Timestamp timezone
// mismatches, use CometCastColumnExpr with spark_parquet_convert which
// handles field-name-based selection, reordering, nested type casting,
// and metadata-only timestamp timezone relabeling correctly.
//
// Timestamp mismatches (e.g., Timestamp(us, None) -> Timestamp(us, Some("UTC")))
// occur when INT96 Parquet timestamps are coerced to Timestamp(us, None) by
// DataFusion but the logical schema expects Timestamp(us, Some("UTC")).
// Using Spark's Cast here would incorrectly treat the None-timezone values as
// local time (TimestampNTZ) and apply a timezone conversion, but the values are
// already in UTC. spark_parquet_convert handles this as a metadata-only change.
if matches!(
(physical_type, target_type),
(DataType::Struct(_), DataType::Struct(_))
| (DataType::List(_), DataType::List(_))
| (DataType::Map(_, _), DataType::Map(_, _))
| (DataType::Timestamp(_, _), DataType::Timestamp(_, _))
) {
let comet_cast: Arc<dyn PhysicalExpr> = Arc::new(
CometCastColumnExpr::new(
Expand Down
Loading