Skip to content

Commit 9392862

Browse files
committed
Fix Clippy and lint
1 parent 1cf0348 commit 9392862

6 files changed

Lines changed: 12 additions & 8 deletions

File tree

Cargo.lock

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ballista/executor/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ arrow = { workspace = true }
4141
arrow-flight = { workspace = true }
4242
async-trait = { workspace = true }
4343

44-
ballista-core = { path = "../core", version = "51.0.0" }
45-
4644
backoff = { workspace = true }
4745

46+
ballista-core = { path = "../core", version = "51.0.0" }
47+
4848
clap = { workspace = true, optional = true }
4949
dashmap = { workspace = true }
5050
datafusion = { workspace = true }

ballista/scheduler/Cargo.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,15 @@ serde = { workspace = true, features = ["derive"] }
6969
tokio = { workspace = true, features = ["full"] }
7070
tokio-stream = { workspace = true, features = ["net"] }
7171
tonic = { workspace = true, features = ["router"] }
72+
tonic-prost = { workspace = true }
7273
tracing = { workspace = true, optional = true }
7374
tracing-appender = { workspace = true, optional = true }
7475
tracing-subscriber = { workspace = true, optional = true }
7576
uuid = { workspace = true }
7677

78+
[build-dependencies]
79+
tonic-prost-build = { workspace = true }
80+
7781
[dev-dependencies]
7882
rstest = { workspace = true }
7983

ballista/scheduler/build.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ fn main() -> Result<(), String> {
2020
println!("cargo:rerun-if-changed=proto/keda.proto");
2121

2222
#[cfg(feature = "keda-scaler")]
23-
tonic_build::configure()
23+
tonic_prost_build::configure()
2424
.compile_protos(&["proto/keda.proto"], &["proto"])
2525
.map_err(|e| format!("protobuf compilation failed: {e}"))?;
2626

ballista/scheduler/src/state/executor_manager.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ use std::time::Duration;
2020
use ballista_core::error::BallistaError;
2121
use ballista_core::error::Result;
2222
use ballista_core::serde::protobuf;
23-
use ballista_core::utils::GrpcClientConfig;
2423
use log::trace;
2524

2625
use crate::cluster::{BoundTask, ClusterState, ExecutorSlot};
@@ -37,8 +36,7 @@ use ballista_core::serde::protobuf::{
3736
use ballista_core::serde::scheduler::{ExecutorData, ExecutorMetadata};
3837

3938
use ballista_core::utils::{
40-
GrpcClientConfig, create_grpc_client_connection, create_grpc_client_endpoint,
41-
get_time_before,
39+
GrpcClientConfig, create_grpc_client_endpoint, get_time_before,
4240
};
4341

4442
use dashmap::DashMap;
@@ -465,7 +463,7 @@ impl ExecutorManager {
465463
async fn get_client(
466464
&self,
467465
executor_id: &str,
468-
grpc_client_config: &GrpcClientConfig,
466+
_grpc_client_config: &GrpcClientConfig,
469467
) -> Result<ExecutorGrpcClient<Channel>> {
470468
let client = self.clients.get(executor_id).map(|value| value.clone());
471469

benchmarks/src/bin/tpch.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ use std::{
6262
use structopt::StructOpt;
6363
use tokio::task::JoinHandle;
6464

65-
#[cfg(feature = "snmalloc")]
65+
#[cfg(all(feature = "snmalloc", not(feature = "mimalloc")))]
6666
#[global_allocator]
6767
static ALLOC: snmalloc_rs::SnMalloc = snmalloc_rs::SnMalloc;
6868

0 commit comments

Comments
 (0)