Merge pull request tursodatabase#1762 from tursodatabase/streaming-co…

…mpaction Libsql-wal: streaming compaction
Kudo · Sep 30, 2024 · 8abff7b · 8abff7b
2 parents 6f7204e + 06e177f
commit 8abff7b
Show file tree

Hide file tree

Showing 18 changed files with 1,223 additions and 995 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/libsql-server/Cargo.toml b/libsql-server/Cargo.toml
@@ -96,6 +96,7 @@ aws-config = "1"
 aws-sdk-s3 = "1"
 aws-smithy-runtime = "1.6.2"
 dialoguer = { version = "0.11.0", features = ["history"] }
+indicatif = "0.17.8"
 
 [dev-dependencies]
 arbitrary = { version = "1.3.0", features = ["derive_arbitrary"] }

diff --git a/libsql-server/src/main.rs b/libsql-server/src/main.rs
@@ -9,7 +9,7 @@ use bytesize::ByteSize;
 use clap::Parser;
 use hyper::client::HttpConnector;
 use libsql_server::auth::{parse_http_basic_auth_arg, parse_jwt_keys, user_auth_strategies, Auth};
-use libsql_server::wal_toolkit::{S3Args, WalToolkit};
+use libsql_server::wal_toolkit::{S3Args, WalToolkitCommand};
 use tokio::sync::Notify;
 use tokio::time::Duration;
 use tracing_subscriber::util::SubscriberInitExt;
@@ -328,7 +328,7 @@ enum UtilsSubcommands {
         #[clap(flatten)]
         s3_args: S3Args,
         #[clap(subcommand)]
-        command: WalToolkit,
+        command: WalToolkitCommand,
     },
 }
 
@@ -754,7 +754,7 @@ async fn main() -> Result<()> {
                 path,
                 s3_args,
             } => {
-                command.run(path, s3_args).await?;
+                command.exec(path, s3_args).await?;
             }
         }