fix date related series fmting

pola-rs · Oct 19, 2021 · 3790d41 · 3790d41
1 parent 4e8bb87
commit 3790d41
Show file tree

Hide file tree

Showing 7 changed files with 53 additions and 40 deletions.
diff --git a/polars/polars-core/src/chunked_array/logical/date.rs b/polars/polars-core/src/chunked_array/logical/date.rs
@@ -19,4 +19,9 @@ impl LogicalType for DateChunked {
     fn dtype(&self) -> &'static DataType {
         &DataType::Date
     }
+
+    #[cfg(feature = "dtype-date")]
+    fn get_any_value(&self, i: usize) -> AnyValue<'_> {
+        self.0.get_any_value(i).into_date()
+    }
 }
diff --git a/polars/polars-core/src/chunked_array/logical/datetime.rs b/polars/polars-core/src/chunked_array/logical/datetime.rs
@@ -19,4 +19,9 @@ impl LogicalType for DatetimeChunked {
     fn dtype(&self) -> &'static DataType {
         &DataType::Datetime
     }
+
+    #[cfg(feature = "dtype-date")]
+    fn get_any_value(&self, i: usize) -> AnyValue<'_> {
+        self.0.get_any_value(i).into_date()
+    }
 }
diff --git a/polars/polars-core/src/chunked_array/logical/mod.rs b/polars/polars-core/src/chunked_array/logical/mod.rs
@@ -41,6 +41,10 @@ impl<K: PolarsDataType, T: PolarsDataType> Logical<K, T> {
 pub trait LogicalType {
     /// Get data type of ChunkedArray.
     fn dtype(&self) -> &'static DataType;
+
+    fn get_any_value(&self, _i: usize) -> AnyValue<'_> {
+        unimplemented!()
+    }
 }
 
 impl<K: PolarsDataType, T: PolarsDataType> Logical<K, T>

diff --git a/polars/polars-core/src/chunked_array/logical/time.rs b/polars/polars-core/src/chunked_array/logical/time.rs
@@ -19,4 +19,9 @@ impl LogicalType for TimeChunked {
     fn dtype(&self) -> &'static DataType {
         &DataType::Time
     }
+
+    #[cfg(feature = "dtype-time")]
+    fn get_any_value(&self, i: usize) -> AnyValue<'_> {
+        self.0.get_any_value(i).into_time()
+    }
 }
diff --git a/polars/polars-core/src/fmt.rs b/polars/polars-core/src/fmt.rs
@@ -517,36 +517,23 @@ impl Display for AnyValue<'_> {
     }
 }
 
-macro_rules! fmt_option {
-    ($opt:expr) => {{
-        match $opt {
-            Some(v) => format!("{}", v),
-            None => "null".to_string(),
-        }
-    }};
-}
-
 macro_rules! impl_fmt_list {
     ($self:ident) => {{
         match $self.len() {
             0 => format!("[]"),
-            1 => format!("[{}]", fmt_option!($self.get(0))),
-            2 => format!(
-                "[{}, {}]",
-                fmt_option!($self.get(0)),
-                fmt_option!($self.get(1))
-            ),
+            1 => format!("[{}]", $self.get_any_value(0)),
+            2 => format!("[{}, {}]", $self.get_any_value(0), $self.get_any_value(1)),
             3 => format!(
                 "[{}, {}, {}]",
-                fmt_option!($self.get(0)),
-                fmt_option!($self.get(1)),
-                fmt_option!($self.get(2))
+                $self.get_any_value(0),
+                $self.get_any_value(1),
+                $self.get_any_value(2)
             ),
             _ => format!(
                 "[{}, {}, ... {}]",
-                fmt_option!($self.get(0)),
-                fmt_option!($self.get(1)),
-                fmt_option!($self.get($self.len() - 1))
+                $self.get_any_value(0),
+                $self.get_any_value(1),
+                $self.get_any_value($self.len() - 1)
             ),
         }
     }};
@@ -648,12 +635,11 @@ Series: 'a' [list]
     }
 
     #[test]
-    #[cfg(feature = "dtype-time64-ns")]
     fn test_fmt_temporal() {
-        let s = DateChunked::new_from_opt_slice("Date", &[Some(1), None, Some(3)]);
+        let s = Int32Chunked::new_from_opt_slice("Date", &[Some(1), None, Some(3)]).into_date();
         assert_eq!(
             r#"shape: (3,)
-Series: 'Date' [Date]
+Series: 'Date' [date]
 [
 	1970-01-02
 	null
@@ -662,7 +648,8 @@ Series: 'Date' [Date]
             format!("{:?}", s.into_series())
         );
 
-        let s = DatetimeChunked::new_from_opt_slice("", &[Some(1), None, Some(1_000_000_000_000)]);
+        let s = Int64Chunked::new_from_opt_slice("", &[Some(1), None, Some(1_000_000_000_000)])
+            .into_date();
         assert_eq!(
             r#"shape: (3,)
 Series: '' [datetime]
@@ -673,21 +660,8 @@ Series: '' [datetime]
 ]"#,
             format!("{:?}", s.into_series())
         );
-        let s = Time64NanosecondChunked::new_from_slice(
-            "",
-            &[1_000_000, 37_800_005_000_000, 86_399_210_000_000],
-        );
-        assert_eq!(
-            r#"shape: (3,)
-Series: '' [time64(ns)]
-[
-	00:00:00.001
-	10:30:00.005
-	23:59:59.210
-]"#,
-            format!("{:?}", s.into_series())
-        )
     }
+
     #[test]
     fn test_fmt_chunkedarray() {
         let ca = Int32Chunked::new_from_opt_slice("Date", &[Some(1), None, Some(3)]);

diff --git a/polars/polars-core/src/series/implementations/dates_time.rs b/polars/polars-core/src/series/implementations/dates_time.rs
@@ -459,7 +459,7 @@ macro_rules! impl_dyn_series {
             }
 
             fn get(&self, index: usize) -> AnyValue {
-                self.0.get_any_value(index).$into_logical()
+                self.0.get_any_value(index)
             }
 
             #[inline]

diff --git a/py-polars/tests/test_io.py b/py-polars/tests/test_io.py
@@ -266,3 +266,23 @@ def test_csq_quote_char():
     """
 
     assert pl.read_csv(rolling_stones.encode(), quote_char=None).shape == (9, 3)
+
+
+def test_date_list_fmt():
+    df = pl.DataFrame(
+        {
+            "mydate": ["2020-01-01", "2020-01-02", "2020-01-05", "2020-01-05"],
+            "index": [1, 2, 5, 5],
+        }
+    )
+
+    df = df.with_column(pl.col("mydate").str.strptime(pl.Date, "%Y-%m-%d"))
+    str(
+        df.groupby("index", maintain_order=True).agg(pl.col("mydate"))["mydate"]
+    ) == """shape: (3,)
+Series: 'mydate' [list]
+[
+	[2020-01-01]
+	[2020-01-02]
+	[2020-01-05, 2020-01-05]
+]"""