From 8a5df124e20a14c114e47e441856f019920330f1 Mon Sep 17 00:00:00 2001
From: Jorge Leitao <jorgecarleitao@gmail.com>
Date: Fri, 13 Aug 2021 22:10:48 +0100
Subject: [PATCH] Removed order from days_ms. (#285)

---
 src/array/ord.rs              |  6 +-----
 src/compute/comparison/mod.rs | 12 ------------
 src/compute/sort/mod.rs       |  8 +-------
 src/types/mod.rs              | 20 +-------------------
 4 files changed, 3 insertions(+), 43 deletions(-)

diff --git a/src/array/ord.rs b/src/array/ord.rs
index 8157dfbf72c..654877adeca 100644
--- a/src/array/ord.rs
+++ b/src/array/ord.rs
@@ -4,10 +4,7 @@ use std::cmp::Ordering;
 
 use crate::datatypes::*;
 use crate::error::{ArrowError, Result};
-use crate::{
-    array::*,
-    types::{days_ms, NativeType},
-};
+use crate::{array::*, types::NativeType};
 
 /// Compare the values at two arbitrary indices in two arrays.
 pub type DynComparator<'a> = Box<dyn Fn(usize, usize) -> Ordering + 'a>;
@@ -180,7 +177,6 @@ pub fn build_compare<'a>(left: &'a dyn Array, right: &'a dyn Array) -> Result<Dy
         | (Duration(Nanosecond), Duration(Nanosecond)) => compare_primitives::<i64>(left, right),
         (Float32, Float32) => compare_f32(left, right),
         (Float64, Float64) => compare_f64(left, right),
-        (Interval(DayTime), Interval(DayTime)) => compare_primitives::<days_ms>(left, right),
         (Utf8, Utf8) => compare_string::<i32>(left, right),
         (LargeUtf8, LargeUtf8) => compare_string::<i64>(left, right),
         (Dictionary(key_type_lhs, _), Dictionary(key_type_rhs, _)) => {
diff --git a/src/compute/comparison/mod.rs b/src/compute/comparison/mod.rs
index 8a8697e6a26..40bf8e1ca60 100644
--- a/src/compute/comparison/mod.rs
+++ b/src/compute/comparison/mod.rs
@@ -25,7 +25,6 @@
 use crate::array::*;
 use crate::datatypes::{DataType, IntervalUnit};
 use crate::error::{ArrowError, Result};
-use crate::types::days_ms;
 
 mod boolean;
 mod primitive;
@@ -112,17 +111,6 @@ pub fn compare(lhs: &dyn Array, rhs: &dyn Array, operator: Operator) -> Result<B
             let rhs = rhs.as_any().downcast_ref::<Float64Array>().unwrap();
             primitive::compare(lhs, rhs, operator)
         }
-        DataType::Interval(IntervalUnit::DayTime) => {
-            let lhs = lhs
-                .as_any()
-                .downcast_ref::<PrimitiveArray<days_ms>>()
-                .unwrap();
-            let rhs = rhs
-                .as_any()
-                .downcast_ref::<PrimitiveArray<days_ms>>()
-                .unwrap();
-            primitive::compare(lhs, rhs, operator)
-        }
         DataType::Utf8 => {
             let lhs = lhs.as_any().downcast_ref::<Utf8Array<i32>>().unwrap();
             let rhs = rhs.as_any().downcast_ref::<Utf8Array<i32>>().unwrap();
diff --git a/src/compute/sort/mod.rs b/src/compute/sort/mod.rs
index d1fcd213ad1..746e0d9a230 100644
--- a/src/compute/sort/mod.rs
+++ b/src/compute/sort/mod.rs
@@ -6,7 +6,7 @@ use crate::datatypes::*;
 use crate::error::{ArrowError, Result};
 use crate::{
     array::*,
-    types::{days_ms, Index, NativeType},
+    types::{Index, NativeType},
 };
 
 use crate::buffer::MutableBuffer;
@@ -63,9 +63,6 @@ pub fn sort(
         DataType::UInt64 => dyn_sort!(u64, values, ord::total_cmp, options, limit),
         DataType::Float32 => dyn_sort!(f32, values, ord::total_cmp_f32, options, limit),
         DataType::Float64 => dyn_sort!(f64, values, ord::total_cmp_f64, options, limit),
-        DataType::Interval(IntervalUnit::DayTime) => {
-            dyn_sort!(days_ms, values, ord::total_cmp, options, limit)
-        }
         _ => {
             let indices = sort_to_indices::<u64>(values, options, limit)?;
             take::take(values, &indices)
@@ -134,9 +131,6 @@ pub fn sort_to_indices<I: Index>(
         DataType::UInt64 => dyn_sort_indices!(I, u64, values, ord::total_cmp, options, limit),
         DataType::Float32 => dyn_sort_indices!(I, f32, values, ord::total_cmp_f32, options, limit),
         DataType::Float64 => dyn_sort_indices!(I, f64, values, ord::total_cmp_f64, options, limit),
-        DataType::Interval(IntervalUnit::DayTime) => {
-            dyn_sort_indices!(I, days_ms, values, ord::total_cmp, options, limit)
-        }
         DataType::Utf8 => Ok(utf8::indices_sorted_unstable_by::<I, i32>(
             values.as_any().downcast_ref().unwrap(),
             options,
diff --git a/src/types/mod.rs b/src/types/mod.rs
index fb96b099b22..b9f630f0055 100644
--- a/src/types/mod.rs
+++ b/src/types/mod.rs
@@ -7,10 +7,7 @@
 //! represent chunks of bits (e.g. `u8`, `u16`), and [`BitChunkIter`], that can be used to
 //! iterate over bitmaps in [`BitChunk`]s.
 //! Finally, this module also contains traits used to compile code optimized for SIMD instructions at [`simd`].
-use std::{
-    cmp::{Ord, Ordering},
-    convert::TryFrom,
-};
+use std::convert::TryFrom;
 
 mod bit_chunk;
 pub use bit_chunk::{BitChunk, BitChunkIter};
@@ -231,18 +228,3 @@ impl days_ms {
         self.0[1]
     }
 }
-
-impl Ord for days_ms {
-    fn cmp(&self, other: &Self) -> Ordering {
-        match self.days().cmp(&other.days()) {
-            Ordering::Equal => self.milliseconds().cmp(&other.milliseconds()),
-            other => other,
-        }
-    }
-}
-
-impl PartialOrd for days_ms {
-    fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
-        Some(self.cmp(other))
-    }
-}