remove unneeded AsofJoin trait

pola-rs · Oct 21, 2021 · 62fe1be · 62fe1be
1 parent 50a93c7
commit 62fe1be
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 45 deletions.
diff --git a/polars/polars-core/src/frame/asof_join.rs b/polars/polars-core/src/frame/asof_join.rs
@@ -3,24 +3,12 @@ use crate::utils::CustomIterTools;
 use num::Bounded;
 use polars_arrow::trusted_len::PushUnchecked;
 
-pub(crate) trait JoinAsof<T: PolarsDataType> {
-    fn join_asof(&self, _other: &Series) -> Result<Vec<Option<u32>>> {
-        Err(PolarsError::InvalidOperation(
-            format!(
-                "asof join not implemented for key with dtype: {:?}",
-                T::get_dtype()
-            )
-            .into(),
-        ))
-    }
-}
-
-impl<T> JoinAsof<T> for ChunkedArray<T>
+impl<T> ChunkedArray<T>
 where
     T: PolarsNumericType,
     T::Native: Bounded + PartialOrd,
 {
-    fn join_asof(&self, other: &Series) -> Result<Vec<Option<u32>>> {
+    pub(crate) fn join_asof(&self, other: &Series) -> Result<Vec<Option<u32>>> {
         let other = self.unpack_series_matching_type(other)?;
         let mut rhs_iter = other.into_iter().peekable();
         let mut tuples = Vec::with_capacity(self.len());
@@ -102,11 +90,6 @@ where
     }
 }
 
-impl JoinAsof<BooleanType> for BooleanChunked {}
-impl JoinAsof<Utf8Type> for Utf8Chunked {}
-impl JoinAsof<ListType> for ListChunked {}
-impl JoinAsof<CategoricalType> for CategoricalChunked {}
-
 impl DataFrame {
     /// This is similar to a left-join except that we match on nearest key rather than equal keys.
     /// The keys must be sorted to perform an asof join

diff --git a/polars/polars-core/src/series/implementations/boolean.rs b/polars/polars-core/src/series/implementations/boolean.rs
@@ -10,8 +10,6 @@ use crate::chunked_array::{
     AsSinglePtr, ChunkIdIter,
 };
 use crate::fmt::FmtList;
-#[cfg(feature = "asof_join")]
-use crate::frame::asof_join::JoinAsof;
 #[cfg(feature = "pivot")]
 use crate::frame::groupby::pivot::*;
 use crate::frame::groupby::*;
@@ -43,11 +41,6 @@ impl private::PrivateSeries for SeriesWrap<BooleanChunked> {
         self.0.explode_by_offsets(offsets)
     }
 
-    #[cfg(feature = "asof_join")]
-    fn join_asof(&self, other: &Series) -> Result<Vec<Option<u32>>> {
-        self.0.join_asof(other)
-    }
-
     fn set_sorted(&mut self, reverse: bool) {
         self.0.set_sorted(reverse)
     }

diff --git a/polars/polars-core/src/series/implementations/categorical.rs b/polars/polars-core/src/series/implementations/categorical.rs
@@ -11,8 +11,6 @@ use crate::chunked_array::{
     AsSinglePtr, ChunkIdIter,
 };
 use crate::fmt::FmtList;
-#[cfg(feature = "asof_join")]
-use crate::frame::asof_join::JoinAsof;
 #[cfg(feature = "pivot")]
 use crate::frame::groupby::pivot::*;
 use crate::frame::groupby::*;
@@ -45,11 +43,6 @@ impl private::PrivateSeries for SeriesWrap<CategoricalChunked> {
         self.0.explode_by_offsets(offsets)
     }
 
-    #[cfg(feature = "asof_join")]
-    fn join_asof(&self, other: &Series) -> Result<Vec<Option<u32>>> {
-        self.0.join_asof(other)
-    }
-
     fn set_sorted(&mut self, reverse: bool) {
         self.0.set_sorted(reverse)
     }

diff --git a/polars/polars-core/src/series/implementations/dates_time.rs b/polars/polars-core/src/series/implementations/dates_time.rs
@@ -66,7 +66,6 @@ macro_rules! impl_dyn_series {
 
             #[cfg(feature = "asof_join")]
             fn join_asof(&self, other: &Series) -> Result<Vec<Option<u32>>> {
-                use crate::frame::asof_join::JoinAsof;
                 self.0.deref().join_asof(other)
             }
 

diff --git a/polars/polars-core/src/series/implementations/floats.rs b/polars/polars-core/src/series/implementations/floats.rs
@@ -17,8 +17,6 @@ use crate::chunked_array::{
     AsSinglePtr, ChunkIdIter,
 };
 use crate::fmt::FmtList;
-#[cfg(feature = "asof_join")]
-use crate::frame::asof_join::JoinAsof;
 #[cfg(feature = "pivot")]
 use crate::frame::groupby::pivot::*;
 use crate::frame::groupby::*;

diff --git a/polars/polars-core/src/series/implementations/mod.rs b/polars/polars-core/src/series/implementations/mod.rs
@@ -31,8 +31,6 @@ use crate::chunked_array::{
     AsSinglePtr, ChunkIdIter,
 };
 use crate::fmt::FmtList;
-#[cfg(feature = "asof_join")]
-use crate::frame::asof_join::JoinAsof;
 #[cfg(feature = "pivot")]
 use crate::frame::groupby::pivot::*;
 use crate::frame::groupby::*;

diff --git a/polars/polars-core/src/series/implementations/utf8.rs b/polars/polars-core/src/series/implementations/utf8.rs
@@ -10,8 +10,6 @@ use crate::chunked_array::{
     AsSinglePtr, ChunkIdIter,
 };
 use crate::fmt::FmtList;
-#[cfg(feature = "asof_join")]
-use crate::frame::asof_join::JoinAsof;
 #[cfg(feature = "pivot")]
 use crate::frame::groupby::pivot::*;
 use crate::frame::groupby::*;
@@ -41,11 +39,6 @@ impl private::PrivateSeries for SeriesWrap<Utf8Chunked> {
         self.0.explode_by_offsets(offsets)
     }
 
-    #[cfg(feature = "asof_join")]
-    fn join_asof(&self, other: &Series) -> Result<Vec<Option<u32>>> {
-        self.0.join_asof(other)
-    }
-
     fn set_sorted(&mut self, reverse: bool) {
         self.0.set_sorted(reverse)
     }