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

Serialize unix timestamps as integers #4

Merged
merged 1 commit into from
Apr 30, 2024
Merged

Serialize unix timestamps as integers #4

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
22 changes: 9 additions & 13 deletions arrow-json/src/writer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ impl<'a> TimeFormatter<'a> {
TimeFormatter::UnixMillisTimestampSeconds(a) => a.value(idx) as f64 * 1000.0,
};

Value::Number(Number::from_f64(millis).unwrap_or(0.into()))
Value::Number(Number::from(millis as u64))
}
}

Expand Down Expand Up @@ -903,23 +903,19 @@ where

/// Convert the `RecordBatch` into JSON rows, and write them to the output
pub fn write(&mut self, batch: &RecordBatch) -> Result<(), ArrowError> {
for row in record_batches_to_json_rows_opts(
&[batch],
self.explicit_nulls,
self.timestamp_format,
)? {
for row in
record_batches_to_json_rows_opts(&[batch], self.explicit_nulls, self.timestamp_format)?
{
self.write_row(&Value::Object(row))?;
}
Ok(())
}

/// Convert the [`RecordBatch`] into JSON rows, and write them to the output
pub fn write_batches(&mut self, batches: &[&RecordBatch]) -> Result<(), ArrowError> {
for row in record_batches_to_json_rows_opts(
batches,
self.explicit_nulls,
self.timestamp_format,
)? {
for row in
record_batches_to_json_rows_opts(batches, self.explicit_nulls, self.timestamp_format)?
{
self.write_row(&Value::Object(row))?;
}
Ok(())
Expand Down Expand Up @@ -1186,7 +1182,7 @@ mod tests {

assert_json_eq(
&buf,
r#"{"micros":1542129070011.375,"millis":1542129070011.0,"name":"a","nanos":1542129070011.376,"secs":1542129070000.0}
r#"{"micros":1542129070011,"millis":1542129070011,"name":"a","nanos":1542129070011,"secs":1542129070000}
{"name":"b"}
"#,
);
Expand Down Expand Up @@ -1339,7 +1335,7 @@ mod tests {

assert_json_eq(
&buf,
r#"{"date32":1542067200000.0,"date64":1542129070011.0,"name":"a"}
r#"{"date32":1542067200000,"date64":1542129070011,"name":"a"}
{"name":"b"}
"#,
);
Expand Down
Loading