Skip to content

Commit 8d6ba10

Browse files
committed
Retire native WAL
The native WAL code is not production ready and is currently not maintained. Therefore, let's retire the code.
1 parent 3d93148 commit 8d6ba10

1,221 files changed

Lines changed: 49 additions & 79854 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Cargo.lock

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

Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ members = [
1616
"vendored/sqlite3-parser",
1717

1818
"xtask", "libsql-hrana",
19-
"libsql-wal",
2019
]
2120

2221
exclude = [

libsql-replication/Cargo.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ license = "MIT"
1212
tonic = { version = "0.11", default-features = false, features = ["codegen", "prost"] }
1313
prost = "0.12"
1414
libsql-sys = { version = "0.8", path = "../libsql-sys", default-features = false, features = ["wal", "rusqlite", "api"] }
15-
libsql-wal = { version = "0.1.0-alpha.1", path = "../libsql-wal/", optional = true }
1615
rusqlite = { workspace = true }
1716
parking_lot = "0.12.1"
1817
bytes = { version = "1.5.0", features = ["serde"] }
@@ -38,4 +37,3 @@ tonic-build = "0.11"
3837

3938
[features]
4039
encryption = ["libsql-sys/encryption"]
41-
libsql_wal = ["dep:libsql-wal"]

libsql-replication/src/injector/mod.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
use std::future::Future;
22

33
use super::rpc::replication::Frame as RpcFrame;
4-
#[cfg(feature = "libsql_wal")]
5-
pub use libsql_injector::LibsqlInjector;
64
pub use sqlite_injector::SqliteInjector;
75

86
use crate::frame::FrameNo;
@@ -11,8 +9,6 @@ pub use error::Error;
119
use error::Result;
1210

1311
mod error;
14-
#[cfg(feature = "libsql_wal")]
15-
mod libsql_injector;
1612
mod sqlite_injector;
1713

1814
pub trait Injector {

libsql-server/Cargo.toml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,7 @@ hyper-tungstenite = "0.11"
3737
itertools = "0.10.5"
3838
jsonwebtoken = "9"
3939
libsql = { path = "../libsql/", optional = true }
40-
libsql_replication = { path = "../libsql-replication", features = ["libsql_wal"] }
41-
libsql-wal = { path = "../libsql-wal/" }
40+
libsql_replication = { path = "../libsql-replication" }
4241
metrics = "0.21.1"
4342
metrics-util = "0.15"
4443
metrics-exporter-prometheus = "0.12.2"
@@ -91,7 +90,7 @@ async-recursion = "1"
9190
mimalloc = "0.1.42"
9291
rheaper = { git = "https://github.com/MarinPostma/rheaper.git", tag = "v0.2.0", default-features = false, features = ["allocator"] }
9392
tar = "0.4.41"
94-
aws-config = "1"
93+
aws-config = { version = "1", features = ["behavior-version-latest"] }
9594
aws-sdk-s3 = "1"
9695
aws-smithy-runtime = "1.6.2"
9796
dialoguer = { version = "0.11.0", features = ["history"] }

libsql-server/src/bottomless_migrate.rs

Lines changed: 0 additions & 194 deletions
This file was deleted.

libsql-server/src/connection/connection_core.rs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,6 @@ impl<W: Wal + Send + 'static> CoreConnection<W> {
384384
#[cfg(test)]
385385
mod test {
386386
use itertools::Itertools;
387-
use libsql_sys::wal::either::Either as EitherWAL;
388387
use libsql_sys::wal::wrapper::PassthroughWalWrapper;
389388
use libsql_sys::wal::{Sqlite3Wal, Sqlite3WalManager};
390389
use rand::Rng;
@@ -454,7 +453,7 @@ mod test {
454453
None,
455454
Default::default(),
456455
Arc::new(|_| unreachable!()),
457-
Arc::new(|| EitherWAL::A(Sqlite3WalManager::default())),
456+
Arc::new(|| Sqlite3WalManager::default()),
458457
)
459458
.await
460459
.unwrap();
@@ -500,7 +499,7 @@ mod test {
500499
None,
501500
Default::default(),
502501
Arc::new(|_| unreachable!()),
503-
Arc::new(|| EitherWAL::A(Sqlite3WalManager::default())),
502+
Arc::new(|| Sqlite3WalManager::default()),
504503
)
505504
.await
506505
.unwrap();
@@ -551,7 +550,7 @@ mod test {
551550
None,
552551
Default::default(),
553552
Arc::new(|_| unreachable!()),
554-
Arc::new(|| EitherWAL::A(Sqlite3WalManager::default())),
553+
Arc::new(|| Sqlite3WalManager::default()),
555554
)
556555
.await
557556
.unwrap();
@@ -634,7 +633,7 @@ mod test {
634633
None,
635634
Default::default(),
636635
Arc::new(|_| unreachable!()),
637-
Arc::new(|| EitherWAL::A(Sqlite3WalManager::default())),
636+
Arc::new(|| Sqlite3WalManager::default()),
638637
)
639638
.await
640639
.unwrap();
@@ -727,7 +726,7 @@ mod test {
727726
None,
728727
Default::default(),
729728
Arc::new(|_| unreachable!()),
730-
Arc::new(|| EitherWAL::A(Sqlite3WalManager::default())),
729+
Arc::new(|| Sqlite3WalManager::default()),
731730
)
732731
.await
733732
.unwrap();

libsql-server/src/connection/connection_manager.rs

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,19 @@ use std::time::{Duration, Instant};
66
use crossbeam::deque::Steal;
77
use crossbeam::sync::{Parker, Unparker};
88
use hashbrown::HashMap;
9-
use libsql_sys::wal::either::Either;
109
use libsql_sys::wal::wrapper::{WrapWal, WrappedWal};
1110
use libsql_sys::wal::{CheckpointMode, Sqlite3Wal, Sqlite3WalManager, Wal};
12-
use libsql_wal::io::StdIO;
13-
use libsql_wal::wal::{LibsqlWal, LibsqlWalManager};
1411
use metrics::atomics::AtomicU64;
1512
use parking_lot::{Mutex, MutexGuard};
1613
use rusqlite::ErrorCode;
1714

18-
use crate::SqldStorage;
19-
2015
use super::connection_core::CoreConnection;
2116
use super::TXN_TIMEOUT;
2217

2318
pub type ConnId = u64;
24-
pub type InnerWalManager = Either<Sqlite3WalManager, LibsqlWalManager<StdIO, SqldStorage>>;
19+
pub type InnerWalManager = Sqlite3WalManager;
2520

26-
pub type InnerWal = Either<Sqlite3Wal, LibsqlWal<StdIO, SqldStorage>>;
21+
pub type InnerWal = Sqlite3Wal;
2722
pub type ManagedConnectionWal = WrappedWal<ManagedConnectionWalWrapper, InnerWal>;
2823

2924
#[derive(Copy, Clone, Debug)]

libsql-server/src/connection/legacy.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,6 @@ pub struct LegacyConnection<T> {
170170
#[cfg(test)]
171171
impl LegacyConnection<libsql_sys::wal::wrapper::PassthroughWalWrapper> {
172172
pub async fn new_test(path: &Path) -> Self {
173-
use libsql_sys::wal::either::Either as EitherWAL;
174173
use libsql_sys::wal::Sqlite3WalManager;
175174

176175
Self::new(
@@ -185,7 +184,7 @@ impl LegacyConnection<libsql_sys::wal::wrapper::PassthroughWalWrapper> {
185184
Default::default(),
186185
Arc::new(|_| unreachable!()),
187186
ConnectionManager::new(TXN_TIMEOUT),
188-
Arc::new(|| EitherWAL::A(Sqlite3WalManager::default())),
187+
Arc::new(|| Sqlite3WalManager::default()),
189188
)
190189
.await
191190
.unwrap()

0 commit comments

Comments
 (0)