Small improvements

Author: matthewmturner

.github/workflows/test.yml

@@ -295,7 +295,7 @@ jobs:
         uses: ./.github/actions/setup-rust
       - name: Start FlightSQL Server
         run: |
-          cargo r --features=flightsql -- serve-flight-sql --config data/configs/flightsql_basic.toml &
+          cargo r --features=flightsql -- serve-flightsql --config data/configs/flightsql_basic.toml &
       - name: Run auth tests
         run: |
           cargo t --features=flightsql extension_cases::auth_basic

README.md

@@ -46,7 +46,7 @@ dft -c "SELECT 1"
 dft -f query.sql
 
 # Start FlightSQL Server (requires `flightsql` feature)
-dft serve-flight-sql
+dft serve-flightsql
 
 # Start HTTP Server (requires `http` feature)
 dft serve-http

docs/flightsql_server.md

@@ -7,7 +7,7 @@
 ## Starting the Server
 
 ```sh
-dft serve-flight-sql
+dft serve-flightsql
 ```
 
 ## Endpoints

justfile

@@ -11,8 +11,8 @@ serve-http:
     RUST_LOG=info cargo r --features=http,flightsql -- serve-http   
 
 # Starts a debug FlightSQL server
-serve-flight-sql:
-    RUST_LOG=info cargo r --features=flightsql -- serve-flight-sql
+serve-flightsql:
+    RUST_LOG=info cargo r --features=flightsql -- serve-flightsql
 
 # You should already have run `cargo r --features=http -- serve-http` in another shell
 bench-http-basic:

src/args.rs

@@ -126,6 +126,7 @@ pub enum Command {
         config: Option<String>,
     },
     /// Start a FlightSQL server
+    #[command(name = "serve-flightsql")]
     ServeFlightSql {
         #[clap(short, long)]
         config: Option<String>,

src/cli/mod.rs

@@ -30,7 +30,7 @@ use datafusion_app::extensions::DftSessionStateBuilder;
 use datafusion_app::local::ExecutionContext;
 use datafusion_app::local_benchmarks::LocalBenchmarkStats;
 use futures::{Stream, StreamExt};
-use log::info;
+use log::{error, info};
 use parquet::{arrow::ArrowWriter, file::properties::WriterProperties};
 use std::error::Error;
 use std::fs::File;
@@ -606,8 +606,11 @@ pub async fn try_run(cli: DftArgs, config: AppConfig) -> Result<()> {
                 auth,
             );
             let flightsql_ctx = FlightSQLContext::new(flightsql_cfg);
-            flightsql_ctx.create_client(cli.host.clone()).await?;
-            app_execution.with_flightsql_ctx(flightsql_ctx);
+            if let Err(e) = flightsql_ctx.create_client(cli.host.clone()).await {
+                error!("{}", e.to_string())
+            } else {
+                app_execution.with_flightsql_ctx(flightsql_ctx);
+            }
         }
     }
     let app = CliApp::new(app_execution, cli.clone());

src/server/http/mod.rs

@@ -32,7 +32,7 @@ use datafusion_app::{
 };
 use router::create_router;
 use tokio::{net::TcpListener, signal};
-use tracing::{debug, info};
+use tracing::{debug, error, info};
 
 use super::try_start_metrics_server;
 
@@ -142,10 +142,14 @@ pub async fn try_run(cli: DftArgs, config: AppConfig) -> Result<()> {
 
         let flightsql_context = FlightSQLContext::new(flightsql_cfg.clone());
         // TODO - Consider adding flag to allow startup even if FlightSQL initiation fails
-        flightsql_context
+        if let Err(e) = flightsql_context
             .create_client(Some(flightsql_cfg.connection_url))
-            .await?;
-        app_execution.with_flightsql_ctx(flightsql_context);
+            .await
+        {
+            error!("{}", e.to_string())
+        } else {
+            app_execution.with_flightsql_ctx(flightsql_context);
+        }
     }
     debug!("Created AppExecution: {app_execution:?}");
     let app = HttpApp::try_new(

src/server/http/router.rs

@@ -91,6 +91,8 @@ async fn post_sql_handler(state: State<ExecutionState>, Json(body): Json<PostSql
         )
             .into_response();
     }
+    let rt = state.execution.session_ctx().runtime_env();
+    println!("Runtime {rt:?}");
     let req = ExecRequest { sql: body.sql };
     let opts = ExecOptions::new(Some(state.config.result_limit), body.flightsql);
     create_response(&state, req, opts).await