feat: update rust edition to 2024 (#1355)

* feat: update rust edition to 2024

* fix: correct msrvcheck

* migrate resolver to v3 (2024 edition default)

Author: killzoner

Cargo.toml

@@ -18,14 +18,14 @@
 [workspace]
 exclude = ["dev/msrvcheck", "python"]
 members = ["ballista-cli", "ballista/client", "ballista/core", "ballista/executor", "ballista/scheduler", "benchmarks", "examples"]
-resolver = "2"
+resolver = "3"
 
 [workspace.package]
 # edition to be changed to 2024 when we update 
 # Minimum Supported Rust Version (MSRV) to 1.85.0
 # which is datafusion 49
 # 
-edition = "2021"
+edition = "2024"
 # we should try to follow datafusion version 
 rust-version = "1.88.0"
 

ballista-cli/src/command.rs

@@ -28,7 +28,7 @@ use datafusion::common::Result;
 use datafusion::error::DataFusionError;
 use datafusion::prelude::SessionContext;
 
-use crate::functions::{display_all_functions, Function};
+use crate::functions::{Function, display_all_functions};
 use crate::print_format::PrintFormat;
 use crate::print_options::PrintOptions;
 

ballista-cli/src/exec.rs

@@ -18,15 +18,15 @@
 //! Execution functions
 
 use std::fs::File;
-use std::io::prelude::*;
 use std::io::BufReader;
+use std::io::prelude::*;
 use std::sync::Arc;
 use std::time::Instant;
 
 use datafusion::common::Result;
 use datafusion::prelude::SessionContext;
-use rustyline::error::ReadlineError;
 use rustyline::Editor;
+use rustyline::error::ReadlineError;
 
 use crate::{
     command::{Command, OutputFormat},

ballista-cli/src/main.rs

@@ -20,7 +20,7 @@ use std::{env, sync::Arc};
 
 use ballista::{extension::SessionConfigExt, prelude::SessionContextExt};
 use ballista_cli::{
-    exec, print_format::PrintFormat, print_options::PrintOptions, BALLISTA_CLI_VERSION,
+    BALLISTA_CLI_VERSION, exec, print_format::PrintFormat, print_options::PrintOptions,
 };
 use clap::Parser;
 use datafusion::{

ballista/client/tests/bugs.rs

@@ -130,14 +130,14 @@ order by sum_sales - avg_monthly_sales, s_store_name
 
         let result = ctx.sql(query).await?.collect().await?;
         let expected = [
-    "+-------------+-----------+----------------+----------------+--------+-------+--------------------+-----------+---------+---------+",
-    "| i_category  | i_brand   | s_store_name   | s_company_name | d_year | d_moy | avg_monthly_sales  | sum_sales | psum    | nsum    |",
-    "+-------------+-----------+----------------+----------------+--------+-------+--------------------+-----------+---------+---------+",
-    "| Electronics | TechBrand | Downtown Store | Retail Corp    | 1999   | 4     | 1499.9850000000001 | 999.99    | 999.99  | 999.99  |",
-    "| Electronics | TechBrand | Downtown Store | Retail Corp    | 1999   | 3     | 1499.9850000000001 | 999.99    | 1999.98 | 999.99  |",
-    "| Electronics | TechBrand | Downtown Store | Retail Corp    | 1999   | 1     | 1499.9850000000001 | 1999.98   | 1999.98 | 1999.98 |",
-    "| Electronics | TechBrand | Downtown Store | Retail Corp    | 1999   | 2     | 1499.9850000000001 | 1999.98   | 1999.98 | 999.99  |",
-    "+-------------+-----------+----------------+----------------+--------+-------+--------------------+-----------+---------+---------+",
+            "+-------------+-----------+----------------+----------------+--------+-------+--------------------+-----------+---------+---------+",
+            "| i_category  | i_brand   | s_store_name   | s_company_name | d_year | d_moy | avg_monthly_sales  | sum_sales | psum    | nsum    |",
+            "+-------------+-----------+----------------+----------------+--------+-------+--------------------+-----------+---------+---------+",
+            "| Electronics | TechBrand | Downtown Store | Retail Corp    | 1999   | 4     | 1499.9850000000001 | 999.99    | 999.99  | 999.99  |",
+            "| Electronics | TechBrand | Downtown Store | Retail Corp    | 1999   | 3     | 1499.9850000000001 | 999.99    | 1999.98 | 999.99  |",
+            "| Electronics | TechBrand | Downtown Store | Retail Corp    | 1999   | 1     | 1499.9850000000001 | 1999.98   | 1999.98 | 1999.98 |",
+            "| Electronics | TechBrand | Downtown Store | Retail Corp    | 1999   | 2     | 1499.9850000000001 | 1999.98   | 1999.98 | 999.99  |",
+            "+-------------+-----------+----------------+----------------+--------+-------+--------------------+-----------+---------+---------+",
         ];
 
         assert_batches_eq!(expected, &result);

ballista/client/tests/common/mod.rs

@@ -21,7 +21,7 @@ use std::path::PathBuf;
 
 use ballista::prelude::{SessionConfigExt, SessionContextExt};
 use ballista_core::serde::{
-    protobuf::scheduler_grpc_client::SchedulerGrpcClient, BallistaCodec,
+    BallistaCodec, protobuf::scheduler_grpc_client::SchedulerGrpcClient,
 };
 use ballista_core::{ConfigProducer, RuntimeProducer};
 use ballista_scheduler::SessionBuilder;

ballista/client/tests/context_setup.rs

@@ -103,15 +103,15 @@ mod remote {
 #[cfg(feature = "standalone")]
 mod standalone {
 
-    use std::sync::{atomic::AtomicBool, Arc};
+    use std::sync::{Arc, atomic::AtomicBool};
 
     use ballista::extension::{SessionConfigExt, SessionContextExt};
     use ballista_core::serde::BallistaPhysicalExtensionCodec;
     use datafusion::{
         assert_batches_eq,
         common::exec_err,
         execution::{
-            context::QueryPlanner, SessionState, SessionStateBuilder, TaskContext,
+            SessionState, SessionStateBuilder, TaskContext, context::QueryPlanner,
         },
         logical_expr::LogicalPlan,
         physical_plan::ExecutionPlan,
@@ -226,9 +226,11 @@ mod standalone {
             .collect()
             .await;
 
-        assert!(physical_codec
-            .invoked
-            .load(std::sync::atomic::Ordering::Relaxed));
+        assert!(
+            physical_codec
+                .invoked
+                .load(std::sync::atomic::Ordering::Relaxed)
+        );
         Ok(())
     }
 

ballista/core/src/client.rs

@@ -29,9 +29,9 @@ use crate::error::{BallistaError, Result as BResult};
 use crate::serde::scheduler::{Action, PartitionId};
 
 use arrow_flight;
-use arrow_flight::utils::flight_data_to_arrow_batch;
 use arrow_flight::Ticket;
-use arrow_flight::{flight_service_client::FlightServiceClient, FlightData};
+use arrow_flight::utils::flight_data_to_arrow_batch;
+use arrow_flight::{FlightData, flight_service_client::FlightServiceClient};
 use datafusion::arrow::array::ArrayRef;
 use datafusion::arrow::buffer::{Buffer, MutableBuffer};
 use datafusion::arrow::ipc::convert::try_schema_from_ipc_buffer;
@@ -45,7 +45,7 @@ use datafusion::error::DataFusionError;
 use datafusion::error::Result;
 
 use crate::serde::protobuf;
-use crate::utils::{create_grpc_client_connection, GrpcClientConfig};
+use crate::utils::{GrpcClientConfig, create_grpc_client_connection};
 use datafusion::physical_plan::{RecordBatchStream, SendableRecordBatchStream};
 use futures::{Stream, StreamExt};
 use log::{debug, warn};

ballista/core/src/consistent_hash/mod.rs

@@ -153,10 +153,10 @@ where
             .range(hashed_key..)
             .chain(self.virtual_nodes.iter())
         {
-            if let Some((node, _)) = self.node_replicas.get(node_name) {
-                if node.is_valid() {
-                    return Some(position_key.clone());
-                }
+            if let Some((node, _)) = self.node_replicas.get(node_name)
+                && node.is_valid()
+            {
+                return Some(position_key.clone());
             }
             if tolerance == 0 {
                 return None;
@@ -177,8 +177,8 @@ pub fn md5_hash(data: &[u8]) -> Vec<u8> {
 
 #[cfg(test)]
 mod test {
-    use crate::consistent_hash::node::Node;
     use crate::consistent_hash::ConsistentHash;
+    use crate::consistent_hash::node::Node;
 
     #[test]
     fn test_topology() {
@@ -219,9 +219,11 @@ mod test {
         for (i, key) in keys.iter().enumerate() {
             if i == 2 {
                 assert!(consistent_hash.get(key.as_bytes()).is_none());
-                assert!(consistent_hash
-                    .get_with_tolerance(key.as_bytes(), 1)
-                    .is_some());
+                assert!(
+                    consistent_hash
+                        .get_with_tolerance(key.as_bytes(), 1)
+                        .is_some()
+                );
             } else {
                 assert_eq!(
                     consistent_hash.get(key.as_bytes()).unwrap().name(),

ballista/core/src/diagram.rs

@@ -19,19 +19,19 @@ use crate::error::Result;
 use crate::execution_plans::{ShuffleWriterExec, UnresolvedShuffleExec};
 
 use datafusion::datasource::source::DataSourceExec;
+use datafusion::physical_plan::ExecutionPlan;
 use datafusion::physical_plan::aggregates::AggregateExec;
 use datafusion::physical_plan::coalesce_batches::CoalesceBatchesExec;
 use datafusion::physical_plan::coalesce_partitions::CoalescePartitionsExec;
 use datafusion::physical_plan::filter::FilterExec;
 use datafusion::physical_plan::joins::HashJoinExec;
 use datafusion::physical_plan::projection::ProjectionExec;
 use datafusion::physical_plan::sorts::sort::SortExec;
-use datafusion::physical_plan::ExecutionPlan;
 use log::warn;
 use std::fs::File;
 use std::io::{BufWriter, Write};
-use std::sync::atomic::{AtomicUsize, Ordering};
 use std::sync::Arc;
+use std::sync::atomic::{AtomicUsize, Ordering};
 
 pub fn produce_diagram(filename: &str, stages: &[Arc<ShuffleWriterExec>]) -> Result<()> {
     let write_file = File::create(filename)?;