alamb commented on code in PR #3417:
URL: https://github.com/apache/arrow-rs/pull/3417#discussion_r1059639535
##########
arrow-json/src/writer.rs:
##########
@@ -925,7 +923,67 @@ mod tests {
assert_json_eq(
&buf,
- r#"{"nanos":"2018-11-13 17:11:10.011375885","micros":"2018-11-13
17:11:10.011375","millis":"2018-11-13 17:11:10.011","secs":"2018-11-13
17:11:10","name":"a"}
+
r#"{"micros":"2018-11-13T17:11:10.011375","millis":"2018-11-13T17:11:10.011","name":"a","nanos":"2018-11-13T17:11:10.011375885","secs":"2018-11-13T17:11:10"}
+{"name":"b"}
+"#,
+ );
+ }
+
+ #[test]
+ #[cfg(feature = "chrono-tz")]
+ fn write_timestamps_with_tz() {
+ let ts_string = "2018-11-13T17:11:10.011375885995";
+ let ts_nanos = ts_string
+ .parse::<chrono::NaiveDateTime>()
+ .unwrap()
+ .timestamp_nanos();
+ let ts_micros = ts_nanos / 1000;
+ let ts_millis = ts_micros / 1000;
+ let ts_secs = ts_millis / 1000;
+
+ let arr_nanos = TimestampNanosecondArray::from(vec![Some(ts_nanos),
None]);
+ let arr_micros = TimestampMicrosecondArray::from(vec![Some(ts_micros),
None]);
+ let arr_millis = TimestampMillisecondArray::from(vec![Some(ts_millis),
None]);
+ let arr_secs = TimestampSecondArray::from(vec![Some(ts_secs), None]);
+ let arr_names = StringArray::from(vec![Some("a"), Some("b")]);
+
+ let tz = "+00:00".to_string();
+
+ let arr_nanos = arr_nanos.with_timezone(&tz);
+ let arr_micros = arr_micros.with_timezone(&tz);
+ let arr_millis = arr_millis.with_timezone(&tz);
+ let arr_secs = arr_secs.with_timezone(&tz);
+
+ let schema = Schema::new(vec![
+ Field::new("nanos", arr_nanos.data_type().clone(), true),
+ Field::new("micros", arr_micros.data_type().clone(), true),
+ Field::new("millis", arr_millis.data_type().clone(), true),
+ Field::new("secs", arr_secs.data_type().clone(), true),
+ Field::new("name", arr_names.data_type().clone(), true),
+ ]);
+ let schema = Arc::new(schema);
+
+ let batch = RecordBatch::try_new(
+ schema,
+ vec![
+ Arc::new(arr_nanos),
+ Arc::new(arr_micros),
+ Arc::new(arr_millis),
+ Arc::new(arr_secs),
+ Arc::new(arr_names),
+ ],
+ )
+ .unwrap();
+
+ let mut buf = Vec::new();
+ {
+ let mut writer = LineDelimitedWriter::new(&mut buf);
+ writer.write_batches(&[batch]).unwrap();
+ }
+
+ assert_json_eq(
+ &buf,
+
r#"{"micros":"2018-11-13T17:11:10.011375Z","millis":"2018-11-13T17:11:10.011Z","name":"a","nanos":"2018-11-13T17:11:10.011375885Z","secs":"2018-11-13T17:11:10Z"}
Review Comment:
😍
##########
arrow-json/Cargo.toml:
##########
@@ -37,6 +37,9 @@ name = "arrow_json"
path = "src/lib.rs"
bench = false
+[features]
+default = ["chrono-tz"]
Review Comment:
This looks like it follows the model of arrow-array 👍
https://github.com/apache/arrow-rs/blob/9398af67d5d6530616fd5e687ba781299d74bfd4/arrow-array/Cargo.toml#L52
We probably want to add `arrow-json/chrono-tz` to to arrow/Cargo.toml as
well:
https://github.com/apache/arrow-rs/blob/9398af67d5d6530616fd5e687ba781299d74bfd4/arrow/Cargo.toml#L96
##########
arrow-json/src/writer.rs:
##########
@@ -217,17 +219,13 @@ macro_rules! set_column_by_array_type {
macro_rules! set_temporal_column_by_array_type {
($array_type:ident, $col_name:ident, $rows:ident, $array:ident,
$row_count:ident, $cast_fn:ident) => {
- let arr = $array.as_any().downcast_ref::<$array_type>().unwrap();
-
$rows
.iter_mut()
.enumerate()
.take($row_count)
.for_each(|(i, row)| {
- if !arr.is_null(i) {
- if let Some(v) = arr.$cast_fn(i) {
- row.insert($col_name.to_string(),
v.to_string().into());
- }
+ if !$array.is_null(i) {
+ row.insert($col_name.to_string(),
array_value_to_string($array, i).unwrap().to_string().into());
Review Comment:
💯 for using "array_value_to_string" here
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
