Skip to content

Commit 8abff7b

Browse files
authored
Merge pull request #1762 from tursodatabase/streaming-compaction
Libsql-wal: streaming compaction
2 parents 6f7204e + 06e177f commit 8abff7b

File tree

18 files changed

+1223
-995
lines changed

18 files changed

+1223
-995
lines changed

Cargo.lock

Lines changed: 42 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

libsql-server/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ aws-config = "1"
9696
aws-sdk-s3 = "1"
9797
aws-smithy-runtime = "1.6.2"
9898
dialoguer = { version = "0.11.0", features = ["history"] }
99+
indicatif = "0.17.8"
99100

100101
[dev-dependencies]
101102
arbitrary = { version = "1.3.0", features = ["derive_arbitrary"] }

libsql-server/src/main.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use bytesize::ByteSize;
99
use clap::Parser;
1010
use hyper::client::HttpConnector;
1111
use libsql_server::auth::{parse_http_basic_auth_arg, parse_jwt_keys, user_auth_strategies, Auth};
12-
use libsql_server::wal_toolkit::{S3Args, WalToolkit};
12+
use libsql_server::wal_toolkit::{S3Args, WalToolkitCommand};
1313
use tokio::sync::Notify;
1414
use tokio::time::Duration;
1515
use tracing_subscriber::util::SubscriberInitExt;
@@ -328,7 +328,7 @@ enum UtilsSubcommands {
328328
#[clap(flatten)]
329329
s3_args: S3Args,
330330
#[clap(subcommand)]
331-
command: WalToolkit,
331+
command: WalToolkitCommand,
332332
},
333333
}
334334

@@ -754,7 +754,7 @@ async fn main() -> Result<()> {
754754
path,
755755
s3_args,
756756
} => {
757-
command.run(path, s3_args).await?;
757+
command.exec(path, s3_args).await?;
758758
}
759759
}
760760

0 commit comments

Comments
 (0)