From c4fcca1ba48d3c08fdd2234f8b4e850079786a80 Mon Sep 17 00:00:00 2001
From: "R. Tyler Croy" <rtyler@brokenco.de>
Date: Wed, 28 Feb 2024 21:34:39 -0800
Subject: [PATCH] chore: clean up some compilation failures and un-ignore some
 tests

---
 crates/core/src/kernel/models/schema.rs        | 2 +-
 crates/core/src/kernel/snapshot/log_segment.rs | 2 --
 crates/core/src/lib.rs                         | 2 +-
 crates/core/src/operations/convert_to_delta.rs | 2 +-
 crates/core/src/operations/merge/mod.rs        | 2 +-
 crates/core/src/writer/stats.rs                | 1 -
 crates/core/tests/command_optimize.rs          | 1 -
 7 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/crates/core/src/kernel/models/schema.rs b/crates/core/src/kernel/models/schema.rs
index 9330b3ce43..c9f82b8d4a 100644
--- a/crates/core/src/kernel/models/schema.rs
+++ b/crates/core/src/kernel/models/schema.rs
@@ -643,7 +643,7 @@ mod tests {
     use super::*;
     use serde_json;
     use serde_json::json;
-    use std::hash::DefaultHasher;
+    use std::collections::hash_map::DefaultHasher;
 
     #[test]
     fn test_serde_data_types() {
diff --git a/crates/core/src/kernel/snapshot/log_segment.rs b/crates/core/src/kernel/snapshot/log_segment.rs
index 2a7973586a..8a88c6a600 100644
--- a/crates/core/src/kernel/snapshot/log_segment.rs
+++ b/crates/core/src/kernel/snapshot/log_segment.rs
@@ -515,8 +515,6 @@ pub(super) async fn list_log_files(
 
 #[cfg(test)]
 pub(super) mod tests {
-    use std::str::FromStr;
-
     use deltalake_test::utils::*;
 
     use super::*;
diff --git a/crates/core/src/lib.rs b/crates/core/src/lib.rs
index b24faf248e..4ef9fc06fd 100644
--- a/crates/core/src/lib.rs
+++ b/crates/core/src/lib.rs
@@ -47,7 +47,7 @@
 //! # Querying Delta Tables with Datafusion
 //!
 //! Querying from local filesystem:
-//! ```ignore
+//! ```
 //! use std::sync::Arc;
 //! use datafusion::prelude::SessionContext;
 //!
diff --git a/crates/core/src/operations/convert_to_delta.rs b/crates/core/src/operations/convert_to_delta.rs
index 7f8e8309db..351a596062 100644
--- a/crates/core/src/operations/convert_to_delta.rs
+++ b/crates/core/src/operations/convert_to_delta.rs
@@ -226,7 +226,7 @@ impl ConvertToDeltaBuilder {
     }
 
     /// Consume self into CreateBuilder with corresponding add actions, schemas and operation meta
-    async fn into_create_builder(mut self) -> Result<CreateBuilder, Error> {
+    async fn into_create_builder(self) -> Result<CreateBuilder, Error> {
         // Use the specified log store. If a log store is not provided, create a new store from the specified path.
         // Return an error if neither log store nor path is provided
         let log_store = if let Some(log_store) = self.log_store {
diff --git a/crates/core/src/operations/merge/mod.rs b/crates/core/src/operations/merge/mod.rs
index 6190e8f724..a495afb9e7 100644
--- a/crates/core/src/operations/merge/mod.rs
+++ b/crates/core/src/operations/merge/mod.rs
@@ -1320,7 +1320,7 @@ async fn execute(
         build_case(copy_when, copy_then)?,
     ));
 
-    let mut new_columns = {
+    let new_columns = {
         let plan = projection.into_unoptimized_plan();
         let mut fields: Vec<Expr> = plan
             .schema()
diff --git a/crates/core/src/writer/stats.rs b/crates/core/src/writer/stats.rs
index 40e7b303cc..20201c949c 100644
--- a/crates/core/src/writer/stats.rs
+++ b/crates/core/src/writer/stats.rs
@@ -645,7 +645,6 @@ mod tests {
         }
     }
 
-    #[ignore]
     #[tokio::test]
     async fn test_delta_stats() {
         let temp_dir = tempfile::tempdir().unwrap();
diff --git a/crates/core/tests/command_optimize.rs b/crates/core/tests/command_optimize.rs
index e26e642e73..deda18928b 100644
--- a/crates/core/tests/command_optimize.rs
+++ b/crates/core/tests/command_optimize.rs
@@ -416,7 +416,6 @@ async fn test_commit_interval() -> Result<(), Box<dyn Error>> {
 }
 
 #[tokio::test]
-#[ignore]
 /// Validate that bin packing is idempotent.
 async fn test_idempotent() -> Result<(), Box<dyn Error>> {
     //TODO: Compression makes it hard to get the target file size...