Skip to content

Commit a140df6

Browse files
committed
More formatting
1 parent 4a0a6e6 commit a140df6

4 files changed

Lines changed: 25 additions & 27 deletions

File tree

ballista/client/tests/context_checks.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@ mod supported {
2424
standalone_context_with_state,
2525
};
2626
use ballista_core::config::BallistaConfig;
27-
use datafusion::arrow::array::StringArray;
2827
use datafusion::arrow::array::Array;
28+
use datafusion::arrow::array::StringArray;
2929
use datafusion::arrow::record_batch::RecordBatch;
3030
use datafusion::physical_plan::collect;
3131
use datafusion::prelude::*;
3232
use datafusion::{assert_batches_eq, prelude::SessionContext};
3333
use rstest::*;
34-
use std::sync::Arc;
3534
use std::path::PathBuf;
35+
use std::sync::Arc;
3636

3737
#[rstest::fixture]
3838
fn test_data() -> String {

ballista/core/src/serde/mod.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -852,8 +852,7 @@ mod test {
852852
plan_message.try_encode(&mut buf).unwrap();
853853

854854
let decoded_message = LogicalPlanNode::try_decode(&buf).unwrap();
855-
let decoded =
856-
decoded_message.try_into_logical_plan(&ctx, &codec).unwrap();
855+
let decoded = decoded_message.try_into_logical_plan(&ctx, &codec).unwrap();
857856

858857
let LogicalPlan::Extension(ext) = &decoded else {
859858
panic!("expected Extension, got {decoded:?}");
@@ -889,8 +888,8 @@ mod test {
889888
ExplainFormat::Graphviz,
890889
] {
891890
let s = BallistaExplainNode::format_as_str(&f);
892-
let parsed = BallistaExplainNode::format_from_str(s)
893-
.expect("round-trip must succeed");
891+
let parsed =
892+
BallistaExplainNode::format_from_str(s).expect("round-trip must succeed");
894893
assert_eq!(parsed, f);
895894
}
896895
assert!(BallistaExplainNode::format_from_str("bogus").is_none());

ballista/executor/src/execution_loop.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -520,9 +520,9 @@ mod tests {
520520
CreateUpdateSessionParams, CreateUpdateSessionResult, ExecuteQueryParams,
521521
ExecuteQueryResult, ExecutorRegistration, ExecutorStoppedParams,
522522
ExecutorStoppedResult, GetCatalogParams, GetCatalogResult, GetJobMetricsParams,
523-
GetJobMetricsResult, GetJobStatusParams,
524-
GetJobStatusResult, GetRemoteFunctionsParams, GetRemoteFunctionsResult,
525-
HeartBeatParams, HeartBeatResult, RegisterExecutorParams, RegisterExecutorResult,
523+
GetJobMetricsResult, GetJobStatusParams, GetJobStatusResult,
524+
GetRemoteFunctionsParams, GetRemoteFunctionsResult, HeartBeatParams,
525+
HeartBeatResult, RegisterExecutorParams, RegisterExecutorResult,
526526
RemoveSessionParams, RemoveSessionResult, UpdateTaskStatusParams,
527527
UpdateTaskStatusResult,
528528
};

ballista/scheduler/src/scheduler_server/grpc.rs

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ use ballista_core::serde::protobuf::{
2727
ExecuteQueryFailureResult, ExecuteQueryParams, ExecuteQueryResult,
2828
ExecuteQuerySuccessResult, ExecutorHeartbeat, ExecutorStoppedParams,
2929
ExecutorStoppedResult, GetCatalogParams, GetCatalogResult, GetJobMetricsParams,
30-
GetJobMetricsResult, GetJobStatusParams,
31-
GetJobStatusResult, GetRemoteFunctionsParams, GetRemoteFunctionsResult,
32-
HeartBeatParams, HeartBeatResult, JobStatus, KeyValuePair, PollWorkParams,
33-
PollWorkResult, RegisterExecutorParams, RegisterExecutorResult, RemoveSessionParams,
34-
RemoveSessionResult, UpdateTaskStatusParams, UpdateTaskStatusResult,
35-
execute_query_failure_result, execute_query_result,
30+
GetJobMetricsResult, GetJobStatusParams, GetJobStatusResult,
31+
GetRemoteFunctionsParams, GetRemoteFunctionsResult, HeartBeatParams, HeartBeatResult,
32+
JobStatus, KeyValuePair, PollWorkParams, PollWorkResult, RegisterExecutorParams,
33+
RegisterExecutorResult, RemoveSessionParams, RemoveSessionResult,
34+
UpdateTaskStatusParams, UpdateTaskStatusResult, execute_query_failure_result,
35+
execute_query_result,
3636
};
3737
use ballista_core::serde::scheduler::ExecutorMetadata;
3838
use datafusion_proto::logical_plan::AsLogicalPlan;
@@ -783,18 +783,17 @@ fn serialize_stage_metrics(
783783
};
784784

785785
let metrics = if plan.metrics().is_some() {
786-
let metrics: ballista_core::serde::protobuf::OperatorMetricsSet =
787-
raw_metrics
788-
.get(metric_index)
789-
.ok_or_else(|| {
790-
BallistaError::Internal(format!(
791-
"Missing metrics for operator {} at depth {}",
792-
plan.name(),
793-
depth
794-
))
795-
})?
796-
.clone()
797-
.try_into()?;
786+
let metrics: ballista_core::serde::protobuf::OperatorMetricsSet = raw_metrics
787+
.get(metric_index)
788+
.ok_or_else(|| {
789+
BallistaError::Internal(format!(
790+
"Missing metrics for operator {} at depth {}",
791+
plan.name(),
792+
depth
793+
))
794+
})?
795+
.clone()
796+
.try_into()?;
798797
metric_index += 1;
799798
metrics.metrics
800799
} else {

0 commit comments

Comments
 (0)