Skip to content

Commit 8b84ac6

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 d42e05a commit 8b84ac6

1,219 files changed

Lines changed: 41 additions & 79887 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
"libsql-storage",
2120
"libsql-storage-server",
2221
]

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/libsql_injector.rs

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

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: 1 addition & 2 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
libsql-storage = { path = "../libsql-storage", optional = true }
4342
metrics = "0.21.1"
4443
metrics-util = "0.15"

libsql-server/src/bottomless_migrate.rs

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

libsql-server/src/connection/connection_manager.rs

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,36 +8,29 @@ use crossbeam::sync::{Parker, Unparker};
88
use hashbrown::HashMap;
99
#[cfg(feature = "durable-wal")]
1010
use libsql_storage::{DurableWal, DurableWalManager};
11-
#[cfg(not(feature = "durable-wal"))]
12-
use libsql_sys::wal::either::Either;
1311
#[cfg(feature = "durable-wal")]
1412
use libsql_sys::wal::either::Either3;
1513
use libsql_sys::wal::wrapper::{WrapWal, WrappedWal};
1614
use libsql_sys::wal::{CheckpointMode, Sqlite3Wal, Sqlite3WalManager, Wal};
17-
use libsql_wal::io::StdIO;
18-
use libsql_wal::wal::{LibsqlWal, LibsqlWalManager};
1915
use metrics::atomics::AtomicU64;
2016
use parking_lot::{Mutex, MutexGuard};
2117
use rusqlite::ErrorCode;
2218

23-
use crate::SqldStorage;
24-
2519
use super::connection_core::CoreConnection;
2620
use super::TXN_TIMEOUT;
2721

2822
pub type ConnId = u64;
2923
#[cfg(feature = "durable-wal")]
30-
3124
pub type InnerWalManager =
3225
Either3<Sqlite3WalManager, LibsqlWalManager<StdIO, SqldStorage>, DurableWalManager>;
26+
#[cfg(not(feature = "durable-wal"))]
27+
pub type InnerWalManager = Sqlite3WalManager;
28+
3329
#[cfg(feature = "durable-wal")]
3430
pub type InnerWal = Either3<Sqlite3Wal, LibsqlWal<StdIO, SqldStorage>, DurableWal>;
3531

3632
#[cfg(not(feature = "durable-wal"))]
37-
pub type InnerWalManager = Either<Sqlite3WalManager, LibsqlWalManager<StdIO, SqldStorage>>;
38-
39-
#[cfg(not(feature = "durable-wal"))]
40-
pub type InnerWal = Either<Sqlite3Wal, LibsqlWal<StdIO, SqldStorage>>;
33+
pub type InnerWal = Sqlite3Wal;
4134
pub type ManagedConnectionWal = WrappedWal<ManagedConnectionWalWrapper, InnerWal>;
4235

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

0 commit comments

Comments
 (0)