more cleanup

Author: matthewmturner

src/cli/mod.rs

@@ -25,9 +25,8 @@ use datafusion::arrow::datatypes::SchemaRef;
 use datafusion::arrow::util::pretty::pretty_format_batches;
 use datafusion::arrow::{csv, json};
 use datafusion::sql::parser::DFParser;
-use datafusion_app::config::{merge_configs, AuthConfig, FlightSQLConfig};
+use datafusion_app::config::merge_configs;
 use datafusion_app::extensions::DftSessionStateBuilder;
-use datafusion_app::flightsql::FlightSQLContext;
 use datafusion_app::local::ExecutionContext;
 use datafusion_app::local_benchmarks::LocalBenchmarkStats;
 use futures::{Stream, StreamExt};
@@ -38,7 +37,14 @@ use std::fs::File;
 use std::io::Write;
 use std::path::{Path, PathBuf};
 #[cfg(feature = "flightsql")]
-use {datafusion_app::flightsql_benchmarks::FlightSQLBenchmarkStats, tonic::IntoRequest};
+use {
+    datafusion_app::{
+        config::{AuthConfig, FlightSQLConfig},
+        flightsql::FlightSQLContext,
+        flightsql_benchmarks::FlightSQLBenchmarkStats,
+    },
+    tonic::IntoRequest,
+};
 
 const LOCAL_BENCHMARK_HEADER_ROW: &str =
     "query,runs,logical_planning_min,logical_planning_max,logical_planning_mean,logical_planning_median,logical_planning_percent_of_total,physical_planning_min,physical_planning_max,physical_planning,mean,physical_planning_median,physical_planning_percent_of_total,execution_min,execution_max,execution_execution_mean,execution_median,execution_percent_of_total,total_min,total_max,total_mean,total_median,total_percent_of_total";

src/main.rs

@@ -17,8 +17,9 @@
 
 use clap::Parser;
 use color_eyre::Result;
-use datafusion_dft::args::Command;
-use datafusion_dft::{args::DftArgs, cli, config::create_config, flightsql_server, tui};
+#[cfg(feature = "flightsql")]
+use datafusion_dft::{args::Command, flightsql_server};
+use datafusion_dft::{args::DftArgs, cli, config::create_config, tui};
 
 fn main() -> Result<()> {
     let cli = DftArgs::parse();

tests/tui_cases/quit.rs

@@ -20,8 +20,9 @@
 use datafusion_app::extensions::DftSessionStateBuilder;
 use datafusion_app::local::ExecutionContext;
 use datafusion_dft::args::DftArgs;
+use datafusion_dft::config::create_config;
 use datafusion_dft::execution::AppExecution;
-use datafusion_dft::tui::state::initialize;
+use datafusion_dft::tui::state::AppState;
 use datafusion_dft::tui::{App, AppEvent};
 use ratatui::crossterm::event;
 use tempfile::{tempdir, TempDir};
@@ -102,11 +103,12 @@ struct TestApp<'app> {
     app: App<'app>,
 }
 
-impl<'app> TestApp<'app> {
+impl TestApp<'_> {
     /// Create a new [`TestApp`] instance configured with a temporary directory
     async fn new() -> Self {
         let config_path = tempdir().unwrap();
-        let state = initialize(config_path.path().to_path_buf());
+        let config = create_config(config_path.path().to_path_buf());
+        let state = AppState::new(config);
 
         let session_state =
             DftSessionStateBuilder::try_new(Some(state.config.tui.execution.clone()))