Merge branch 'main' into cdf_test_and_example

.github/workflows/build.yml

@@ -41,6 +41,34 @@ jobs:
           cargo msrv --path derive-macros/ verify --all-features
           cargo msrv --path ffi/ verify --all-features
           cargo msrv --path ffi-proc-macros/ verify --all-features
+  msrv-run-tests:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install minimal stable and cargo msrv
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: default
+          toolchain: stable
+          override: true
+      - uses: Swatinem/rust-cache@v2
+      - name: Install cargo-msrv
+        shell: bash
+        run: |
+          cargo install cargo-msrv --locked
+      - name: Get rust-version from Cargo.toml
+        id: rust-version
+        run: echo "RUST_VERSION=$(cargo msrv show --path kernel/ --output-format minimal)" >> $GITHUB_ENV
+      - name: Install specified rust version
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: ${{ env.RUST_VERSION }}
+          profile: minimal
+      - name: run tests
+        run: |
+          pushd kernel
+          echo "Testing with $(cargo msrv show --output-format minimal)"
+          cargo +$(cargo msrv show --output-format minimal) test
   docs:
     runs-on: ubuntu-latest
     env:

kernel/src/engine/default/filesystem.rs

@@ -160,7 +160,7 @@ mod tests {
     use object_store::memory::InMemory;
     use object_store::{local::LocalFileSystem, ObjectStore};
 
-    use test_utils::delta_path_for_version;
+    use test_utils::{abs_diff, delta_path_for_version};
 
     use crate::engine::default::executor::tokio::TokioBackgroundExecutor;
     use crate::engine::default::DefaultEngine;
@@ -241,7 +241,7 @@ mod tests {
         assert!(!files.is_empty());
         for meta in files.into_iter() {
             let meta_time = Duration::from_millis(meta.last_modified.try_into().unwrap());
-            assert!(meta_time.abs_diff(begin_time) < Duration::from_secs(10));
+            assert!(abs_diff(meta_time, begin_time) < Duration::from_secs(10));
         }
     }
     #[tokio::test]

kernel/src/engine/sync/fs_client.rs

@@ -84,6 +84,8 @@ mod tests {
     use itertools::Itertools;
     use url::Url;
 
+    use test_utils::abs_diff;
+
     use super::SyncFilesystemClient;
     use crate::FileSystemClient;
 
@@ -111,7 +113,7 @@ mod tests {
         assert!(!files.is_empty());
         for meta in files.iter() {
             let meta_time = Duration::from_millis(meta.last_modified.try_into()?);
-            assert!(meta_time.abs_diff(begin_time) < Duration::from_secs(10));
+            assert!(abs_diff(meta_time, begin_time) < Duration::from_secs(10));
         }
         Ok(())
     }

test-utils/src/lib.rs

@@ -106,3 +106,13 @@ pub fn into_record_batch(engine_data: Box<dyn EngineData>) -> RecordBatch {
         .unwrap()
         .into()
 }
+
+/// We implement abs_diff here so we don't have to bump our msrv.
+/// TODO: Remove and use std version when msrv >= 1.81.0
+pub fn abs_diff(self_dur: std::time::Duration, other: std::time::Duration) -> std::time::Duration {
+    if let Some(res) = self_dur.checked_sub(other) {
+        res
+    } else {
+        other.checked_sub(self_dur).unwrap()
+    }
+}