Remove run subcommand and flatten CLI args

Author: sgrebnov

.github/workflows/run_spicebench.yml

@@ -26,7 +26,7 @@ jobs:
 
       - name: Run spicebench
         run: |
-          cargo run -p spicebench -- run \
-            --ready-wait 180 \
-            --concurrency 2 \
+          cargo run -p spicebench -- \
+            --system-adapter-http-url http://localhost:8080/rpc \
+            --system-adapter-execution-mode direct-query \
             --query-set tpch

src/args/dataset.rs

@@ -287,7 +287,7 @@ pub struct DataConsistencyArgs {
 }
 
 #[derive(Parser, Debug)]
-pub struct LoadTestArgs {
+pub struct BenchRunArgs {
     #[command(flatten)]
     pub(crate) test_args: DatasetTestArgs,
 

src/args/mod.rs

@@ -16,16 +16,10 @@ limitations under the License.
 
 use std::path::PathBuf;
 
-use clap::{ArgAction, Parser, Subcommand, ValueEnum};
+use clap::{ArgAction, Parser, ValueEnum};
 
 mod dataset;
-pub use dataset::{DatasetTestArgs, LoadTestArgs};
-
-#[derive(Subcommand)]
-pub enum Commands {
-    /// Run a load test against a spiced instance
-    Run(LoadTestArgs),
-}
+pub use dataset::{BenchRunArgs, DatasetTestArgs};
 
 /// Arguments Common to all [`TestCommands`].
 #[derive(Parser, Debug, Clone)]

src/commands/load/mod.rs

@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 use super::get_app_and_start_request;
-use crate::{args::LoadTestArgs, health::HealthMonitor, spiced_metrics::MetricsScraper};
+use crate::{args::BenchRunArgs, health::HealthMonitor, spiced_metrics::MetricsScraper};
 use std::time::Duration;
 use test_framework::{
     TestType, anyhow,
@@ -38,7 +38,7 @@ use tokio::signal;
 use tokio_util::sync::CancellationToken;
 
 #[expect(clippy::too_many_lines)]
-pub(crate) async fn run(args: &LoadTestArgs) -> anyhow::Result<()> {
+pub(crate) async fn run(args: &BenchRunArgs) -> anyhow::Result<()> {
     if args.test_args.common.concurrency < 2 {
         return Err(anyhow::anyhow!(
             "Concurrency should be greater than 1 for a load test"

src/main.rs

@@ -23,13 +23,13 @@ mod health;
 mod metrics;
 mod spiced_metrics;
 
-use args::Commands;
+use args::BenchRunArgs;
 
 #[derive(Parser)]
 #[command(author, version, about, long_about = None)]
 struct Cli {
-    #[command(subcommand)]
-    subcommand: Commands,
+    #[command(flatten)]
+    args: BenchRunArgs,
 }
 
 #[tokio::main]
@@ -40,17 +40,13 @@ async fn main() -> anyhow::Result<()> {
     let raw_cli_args: Vec<String> = std::env::args().skip(1).collect();
     let cli = Cli::parse();
 
-    match cli.subcommand {
-        Commands::Run(args) => {
-            if commands::maybe_dispatch_run_to_system_adapter(&raw_cli_args, &args.test_args.common)
-                .await?
-            {
-                return Ok(());
-            }
-
-            commands::load::run(&args).await?
-        }
+    if commands::maybe_dispatch_run_to_system_adapter(&raw_cli_args, &cli.args.test_args.common)
+        .await?
+    {
+        return Ok(());
     }
 
+    commands::load::run(&cli.args).await?;
+
     Ok(())
 }