fix: wrong cargo lock (apache#405)

* chore: fix cargo.lock * chore: move datafusion part to separate sub mod
chunshao90 · Nov 17, 2022 · 28f04a8 · 28f04a8
1 parent e85c84b
commit 28f04a8
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 17 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/common_types/src/time.rs b/common_types/src/time.rs
@@ -9,10 +9,6 @@ use std::{
     time::{self, Duration, SystemTime},
 };
 
-use datafusion::{
-    prelude::{col, lit, Expr},
-    scalar::ScalarValue,
-};
 use proto::common as common_pb;
 use snafu::{Backtrace, OptionExt, Snafu};
 
@@ -280,18 +276,6 @@ impl TimeRange {
             self.exclusive_end.min(other.exclusive_end),
         )
     }
-
-    /// Creates expression like:
-    /// start <= time && time < end
-    pub fn to_df_expr(&self, column_name: impl AsRef<str>) -> Expr {
-        let ts_start = ScalarValue::TimestampMillisecond(Some(self.inclusive_start.as_i64()), None);
-        let ts_end = ScalarValue::TimestampMillisecond(Some(self.exclusive_end.as_i64()), None);
-        let column_name = column_name.as_ref();
-        let ts_low = col(column_name).gt_eq(lit(ts_start));
-        let ts_high = col(column_name).lt(lit(ts_end));
-
-        ts_low.and(ts_high)
-    }
 }
 
 impl From<TimeRange> for common_pb::TimeRange {
@@ -314,6 +298,31 @@ impl TryFrom<common_pb::TimeRange> for TimeRange {
     }
 }
 
+#[cfg(feature = "datafusion")]
+mod datafusion_ext {
+    use datafusion::{
+        prelude::{col, lit, Expr},
+        scalar::ScalarValue,
+    };
+
+    use crate::time::TimeRange;
+
+    impl TimeRange {
+        /// Creates expression like:
+        /// start <= time && time < end
+        pub fn to_df_expr(&self, column_name: impl AsRef<str>) -> Expr {
+            let ts_start =
+                ScalarValue::TimestampMillisecond(Some(self.inclusive_start.as_i64()), None);
+            let ts_end = ScalarValue::TimestampMillisecond(Some(self.exclusive_end.as_i64()), None);
+            let column_name = column_name.as_ref();
+            let ts_low = col(column_name).gt_eq(lit(ts_start));
+            let ts_high = col(column_name).lt(lit(ts_end));
+
+            ts_low.and(ts_high)
+        }
+    }
+}
+
 #[cfg(test)]
 mod test {
     use std::time::Duration;