Fix for compilation and cargo clippy

apache · Jul 19, 2023 · 126bed6 · 126bed6
1 parent 9de23ec
commit 126bed6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/ballista/scheduler/src/cluster/kv.rs b/ballista/scheduler/src/cluster/kv.rs
@@ -39,7 +39,7 @@ use ballista_core::serde::protobuf::{
 use ballista_core::serde::scheduler::{ExecutorData, ExecutorMetadata};
 use ballista_core::serde::BallistaCodec;
 use dashmap::DashMap;
-use datafusion::physical_plan::file_format::get_scan_files;
+use datafusion::datasource::physical_plan::get_scan_files;
 use datafusion::physical_plan::ExecutionPlan;
 use datafusion::prelude::SessionContext;
 use datafusion_proto::logical_plan::AsLogicalPlan;
@@ -295,7 +295,7 @@ impl<S: KeyValueStore, T: 'static + AsLogicalPlan, U: 'static + AsExecutionPlan>
                                 .collect();
                         let ch_topology = ch_topology.unwrap();
                         for node in ch_topology.nodes() {
-                            if let Some(mut data) = executor_data.get_mut(&node.id) {
+                            if let Some(data) = executor_data.get_mut(&node.id) {
                                 data.slots = node.available_slots;
                             } else {
                                 error!("Fail to find executor data for {}", &node.id);

diff --git a/ballista/scheduler/src/cluster/memory.rs b/ballista/scheduler/src/cluster/memory.rs
@@ -42,7 +42,7 @@ use std::collections::{HashMap, HashSet};
 use std::ops::DerefMut;
 
 use ballista_core::consistent_hash::node::Node;
-use datafusion::physical_plan::file_format::get_scan_files;
+use datafusion::datasource::physical_plan::get_scan_files;
 use datafusion::physical_plan::ExecutionPlan;
 use std::sync::Arc;
 use tokio::sync::{Mutex, MutexGuard};
@@ -161,7 +161,7 @@ impl ClusterState for InMemoryClusterState {
                     // Update the available slots
                     let ch_topology = ch_topology.unwrap();
                     for node in ch_topology.nodes() {
-                        if let Some(mut data) = guard.get_mut(&node.id) {
+                        if let Some(data) = guard.get_mut(&node.id) {
                             data.slots = node.available_slots;
                         } else {
                             error!("Fail to find executor data for {}", &node.id);

diff --git a/ballista/scheduler/src/cluster/mod.rs b/ballista/scheduler/src/cluster/mod.rs
@@ -1061,6 +1061,7 @@ mod test {
                     location: Path::from(format!("file--{}", i)),
                     last_modified: Default::default(),
                     size: 1,
+                    e_tag: None,
                 },
                 partition_values: vec![],
                 range: None,