Skip to content
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

fix: add conversion for string for Field::TimestampMicros (#1372) #1373

Merged
merged 1 commit into from
May 17, 2023
Merged

fix: add conversion for string for Field::TimestampMicros (#1372) #1373

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
39 changes: 38 additions & 1 deletion rust/src/action/parquet_read/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,9 @@ fn primitive_parquet_field_to_json_value(field: &Field) -> Result<serde_json::Va
)),
_ => Err("Invalid type for min/max values."),
},
Field::TimestampMicros(timestamp) => Ok(serde_json::Value::String(
convert_timestamp_micros_to_string(*timestamp)?,
)),
Field::TimestampMillis(timestamp) => Ok(serde_json::Value::String(
convert_timestamp_millis_to_string(*timestamp)?,
)),
Expand All @@ -269,13 +272,27 @@ fn primitive_parquet_field_to_json_value(field: &Field) -> Result<serde_json::Va
}

fn convert_timestamp_millis_to_string(value: i64) -> Result<String, &'static str> {
let seconds = value / 1000;
let milliseconds = (value % 1000) as u32;

let dt = Utc
.timestamp_opt(value / 1000, ((value % 1000) * 1000000) as u32)
.timestamp_opt(seconds, milliseconds * 1_000_000)
.single()
.ok_or("Value out of bounds")?;
Ok(dt.to_rfc3339_opts(SecondsFormat::Millis, true))
}

fn convert_timestamp_micros_to_string(value: i64) -> Result<String, &'static str> {
let seconds = value / 1_000_000;
let microseconds = (value % 1_000_000) as u32;

let dt: chrono::DateTime<Utc> = Utc
.timestamp_opt(seconds, microseconds * 1_000)
.single()
.ok_or("Value out of bounds")?;
Ok(dt.to_rfc3339_opts(SecondsFormat::Micros, true))
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Do we want SecondsFormat::Micros here or match with Millisecond format as above?

Copy link
Collaborator

Choose a reason for hiding this comment

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

Seems like micros is fine. Spec specifically allows that one. https://github.com/delta-io/delta/blob/master/PROTOCOL.md#partition-value-serialization

}

fn convert_date_to_string(value: i32) -> Result<String, &'static str> {
static NUM_SECONDS_IN_DAY: i64 = 60 * 60 * 24;
let dt = Utc
Expand Down Expand Up @@ -618,4 +635,24 @@ mod tests {
assert_eq!(add_action.partition_values.len(), 0);
assert_eq!(add_action.stats, None);
}

#[test]
fn test_issue_1372_field_to_value_stat() {
let now = Utc::now();
let timestamp_milliseconds = Field::TimestampMillis(now.timestamp_millis());
let ts_millis = field_to_value_stat(&timestamp_milliseconds, "timestamp_millis");
assert!(ts_millis.is_some());
assert_eq!(
ColumnValueStat::Value(json!(now.to_rfc3339_opts(SecondsFormat::Millis, true))),
ts_millis.unwrap()
);

let timestamp_milliseconds = Field::TimestampMicros(now.timestamp_micros());
let ts_micros = field_to_value_stat(&timestamp_milliseconds, "timestamp_micros");
assert!(ts_micros.is_some());
assert_eq!(
ColumnValueStat::Value(json!(now.to_rfc3339_opts(SecondsFormat::Micros, true))),
ts_micros.unwrap()
);
}
}