chore: move repeat_by to polars-ops (#11461)

pola-rs · Oct 2, 2023 · 93cdd8d · 93cdd8d
1 parent 10a6852
commit 93cdd8d
Show file tree

Hide file tree

Showing 19 changed files with 142 additions and 251 deletions.
diff --git a/crates/polars-core/Cargo.toml b/crates/polars-core/Cargo.toml
@@ -80,7 +80,6 @@ rows = []
 zip_with = []
 round_series = []
 checked_arithmetic = []
-repeat_by = []
 is_first_distinct = []
 is_last_distinct = []
 asof_join = []
@@ -147,7 +146,6 @@ docs-selection = [
   "zip_with",
   "round_series",
   "checked_arithmetic",
-  "repeat_by",
   "is_first_distinct",
   "is_last_distinct",
   "asof_join",

diff --git a/crates/polars-core/src/chunked_array/ops/mod.rs b/crates/polars-core/src/chunked_array/ops/mod.rs
@@ -38,8 +38,6 @@ mod len;
 pub(crate) mod min_max_binary;
 mod nulls;
 mod peaks;
-#[cfg(feature = "repeat_by")]
-mod repeat_by;
 mod reverse;
 pub(crate) mod rolling_window;
 mod set;
@@ -649,15 +647,6 @@ pub trait ChunkPeaks {
     }
 }
 
-/// Repeat the values `n` times.
-#[cfg(feature = "repeat_by")]
-pub trait RepeatBy {
-    /// Repeat the values `n` times, where `n` is determined by the values in `by`.
-    fn repeat_by(&self, _by: &IdxCa) -> PolarsResult<ListChunked> {
-        unimplemented!()
-    }
-}
-
 #[cfg(feature = "is_first_distinct")]
 /// Mask the first unique values as `true`
 pub trait IsFirstDistinct<T: PolarsDataType> {

diff --git a/crates/polars-core/src/chunked_array/ops/repeat_by.rs b/crates/polars-core/src/chunked_array/ops/repeat_by.rs
diff --git a/crates/polars-core/src/series/implementations/binary.rs b/crates/polars-core/src/series/implementations/binary.rs
@@ -247,11 +247,6 @@ impl SeriesTrait for SeriesWrap<BinaryChunked> {
         Arc::new(SeriesWrap(Clone::clone(&self.0)))
     }
 
-    #[cfg(feature = "repeat_by")]
-    fn repeat_by(&self, by: &IdxCa) -> PolarsResult<ListChunked> {
-        RepeatBy::repeat_by(&self.0, by)
-    }
-
     #[cfg(feature = "mode")]
     fn mode(&self) -> PolarsResult<Series> {
         Ok(self.0.mode()?.into_series())

diff --git a/crates/polars-core/src/series/implementations/boolean.rs b/crates/polars-core/src/series/implementations/boolean.rs
@@ -315,11 +315,6 @@ impl SeriesTrait for SeriesWrap<BooleanChunked> {
         Arc::new(SeriesWrap(Clone::clone(&self.0)))
     }
 
-    #[cfg(feature = "repeat_by")]
-    fn repeat_by(&self, by: &IdxCa) -> PolarsResult<ListChunked> {
-        RepeatBy::repeat_by(&self.0, by)
-    }
-
     #[cfg(feature = "mode")]
     fn mode(&self) -> PolarsResult<Series> {
         Ok(self.0.mode()?.into_series())

diff --git a/crates/polars-core/src/series/implementations/categorical.rs b/crates/polars-core/src/series/implementations/categorical.rs
@@ -318,15 +318,6 @@ impl SeriesTrait for SeriesWrap<CategoricalChunked> {
         Arc::new(SeriesWrap(Clone::clone(&self.0)))
     }
 
-    #[cfg(feature = "repeat_by")]
-    fn repeat_by(&self, by: &IdxCa) -> PolarsResult<ListChunked> {
-        let out = self.0.logical().repeat_by(by)?;
-        let casted = out
-            .cast(&DataType::List(Box::new(self.dtype().clone())))
-            .unwrap();
-        Ok(casted.list().unwrap().clone())
-    }
-
     #[cfg(feature = "mode")]
     fn mode(&self) -> PolarsResult<Series> {
         let cats = self.0.logical().mode()?;

diff --git a/crates/polars-core/src/series/implementations/dates_time.rs b/crates/polars-core/src/series/implementations/dates_time.rs
@@ -409,28 +409,6 @@ macro_rules! impl_dyn_series {
             fn peak_min(&self) -> BooleanChunked {
                 self.0.peak_min()
             }
-            #[cfg(feature = "repeat_by")]
-            fn repeat_by(&self, by: &IdxCa) -> PolarsResult<ListChunked> {
-                match self.0.dtype() {
-                    DataType::Date => Ok(self
-                        .0
-                        .repeat_by(by)?
-                        .cast(&DataType::List(Box::new(DataType::Date)))
-                        .unwrap()
-                        .list()
-                        .unwrap()
-                        .clone()),
-                    DataType::Time => Ok(self
-                        .0
-                        .repeat_by(by)?
-                        .cast(&DataType::List(Box::new(DataType::Time)))
-                        .unwrap()
-                        .list()
-                        .unwrap()
-                        .clone()),
-                    _ => unreachable!(),
-                }
-            }
             #[cfg(feature = "mode")]
             fn mode(&self) -> PolarsResult<Series> {
                 self.0.mode().map(|ca| ca.$into_logical().into_series())

diff --git a/crates/polars-core/src/series/implementations/datetime.rs b/crates/polars-core/src/series/implementations/datetime.rs
@@ -417,20 +417,6 @@ impl SeriesTrait for SeriesWrap<DatetimeChunked> {
     fn peak_min(&self) -> BooleanChunked {
         self.0.peak_min()
     }
-    #[cfg(feature = "repeat_by")]
-    fn repeat_by(&self, by: &IdxCa) -> PolarsResult<ListChunked> {
-        Ok(self
-            .0
-            .repeat_by(by)?
-            .cast(&DataType::List(Box::new(DataType::Datetime(
-                self.0.time_unit(),
-                self.0.time_zone().clone(),
-            ))))
-            .unwrap()
-            .list()
-            .unwrap()
-            .clone())
-    }
     #[cfg(feature = "mode")]
     fn mode(&self) -> PolarsResult<Series> {
         self.0.mode().map(|ca| {

diff --git a/crates/polars-core/src/series/implementations/duration.rs b/crates/polars-core/src/series/implementations/duration.rs
@@ -454,19 +454,6 @@ impl SeriesTrait for SeriesWrap<DurationChunked> {
     fn peak_min(&self) -> BooleanChunked {
         self.0.peak_min()
     }
-    #[cfg(feature = "repeat_by")]
-    fn repeat_by(&self, by: &IdxCa) -> PolarsResult<ListChunked> {
-        Ok(self
-            .0
-            .repeat_by(by)?
-            .cast(&DataType::List(Box::new(DataType::Duration(
-                self.0.time_unit(),
-            ))))
-            .unwrap()
-            .list()
-            .unwrap()
-            .clone())
-    }
     #[cfg(feature = "mode")]
     fn mode(&self) -> PolarsResult<Series> {
         self.0

diff --git a/crates/polars-core/src/series/implementations/floats.rs b/crates/polars-core/src/series/implementations/floats.rs
@@ -343,11 +343,6 @@ macro_rules! impl_dyn_series {
                 self.0.peak_min()
             }
 
-            #[cfg(feature = "repeat_by")]
-            fn repeat_by(&self, by: &IdxCa) -> PolarsResult<ListChunked> {
-                RepeatBy::repeat_by(&self.0, by)
-            }
-
             #[cfg(feature = "checked_arithmetic")]
             fn checked_div(&self, rhs: &Series) -> PolarsResult<Series> {
                 self.0.checked_div(rhs)

diff --git a/crates/polars-core/src/series/implementations/mod.rs b/crates/polars-core/src/series/implementations/mod.rs
@@ -442,11 +442,6 @@ macro_rules! impl_dyn_series {
                 self.0.peak_min()
             }
 
-            #[cfg(feature = "repeat_by")]
-            fn repeat_by(&self, by: &IdxCa) -> PolarsResult<ListChunked> {
-                RepeatBy::repeat_by(&self.0, by)
-            }
-
             #[cfg(feature = "checked_arithmetic")]
             fn checked_div(&self, rhs: &Series) -> PolarsResult<Series> {
                 self.0.checked_div(rhs)

diff --git a/crates/polars-core/src/series/implementations/utf8.rs b/crates/polars-core/src/series/implementations/utf8.rs
@@ -264,11 +264,6 @@ impl SeriesTrait for SeriesWrap<Utf8Chunked> {
         Arc::new(SeriesWrap(Clone::clone(&self.0)))
     }
 
-    #[cfg(feature = "repeat_by")]
-    fn repeat_by(&self, by: &IdxCa) -> PolarsResult<ListChunked> {
-        RepeatBy::repeat_by(&self.0, by)
-    }
-
     #[cfg(feature = "mode")]
     fn mode(&self) -> PolarsResult<Series> {
         Ok(self.0.mode()?.into_series())

diff --git a/crates/polars-core/src/series/series_trait.rs b/crates/polars-core/src/series/series_trait.rs
@@ -488,10 +488,6 @@ pub trait SeriesTrait:
         invalid_operation_panic!(peak_min, self)
     }
 
-    #[cfg(feature = "repeat_by")]
-    fn repeat_by(&self, _by: &IdxCa) -> PolarsResult<ListChunked> {
-        polars_bail!(opq = repeat_by, self._dtype());
-    }
     #[cfg(feature = "checked_arithmetic")]
     fn checked_div(&self, _rhs: &Series) -> PolarsResult<Series> {
         polars_bail!(opq = checked_div, self._dtype());

diff --git a/crates/polars-ops/Cargo.toml b/crates/polars-ops/Cargo.toml
@@ -108,3 +108,4 @@ list_drop_nulls = []
 extract_groups = ["dtype-struct", "polars-core/regex"]
 is_in = ["polars-core/reinterpret"]
 convert_index = []
+repeat_by = []
diff --git a/crates/polars-ops/src/chunked_array/mod.rs b/crates/polars-ops/src/chunked_array/mod.rs
@@ -15,6 +15,8 @@ mod sum;
 mod top_k;
 
 pub mod gather_skip_nulls;
+#[cfg(feature = "repeat_by")]
+mod repeat_by;
 
 pub use binary::*;
 #[cfg(feature = "timezones")]
@@ -24,6 +26,8 @@ pub use interpolate::*;
 pub use list::*;
 #[allow(unused_imports)]
 use polars_core::prelude::*;
+#[cfg(feature = "repeat_by")]
+pub use repeat_by::*;
 pub use set::ChunkedSet;
 pub use strings::*;
 #[cfg(feature = "top_k")]