Skip to content

Commit 6e82add

Browse files
committed
remove the migration from redb v1
v2 has been out there for long enough that people should be converted by now
1 parent 9ae2e52 commit 6e82add

File tree

4 files changed

+6
-339
lines changed

4 files changed

+6
-339
lines changed

Cargo.lock

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

Cargo.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ quinn = { package = "iroh-quinn", version = "0.12", features = ["ring"] }
5858
rand = "0.8"
5959
range-collections = "0.4.0"
6060
redb = { version = "2.2.0", optional = true }
61-
redb_v1 = { package = "redb", version = "1.5.1", optional = true }
6261
ref-cast = { version = "1.0.23", optional = true }
6362
reflink-copy = { version = "0.1.8", optional = true }
6463
self_cell = "1.0.1"
@@ -98,7 +97,7 @@ testdir = "0.9.1"
9897
default = ["fs-store", "net_protocol"]
9998
downloader = ["dep:parking_lot", "tokio-util/time", "dep:hashlink"]
10099
net_protocol = ["downloader", "dep:futures-util"]
101-
fs-store = ["dep:reflink-copy", "redb", "dep:redb_v1", "dep:tempfile"]
100+
fs-store = ["dep:reflink-copy", "redb", "dep:tempfile"]
102101
metrics = ["iroh-metrics/metrics"]
103102
redb = ["dep:redb"]
104103
cli = ["rpc", "dep:clap", "dep:indicatif", "dep:console"]

src/store/fs.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ use smallvec::SmallVec;
8787
use tokio::io::AsyncWriteExt;
8888
use tracing::trace_span;
8989

90-
mod migrate_redb_v1_v2;
9190
mod tables;
9291
#[doc(hidden)]
9392
pub mod test_support;
@@ -1510,7 +1509,9 @@ impl Actor {
15101509
let db = match redb::Database::create(path) {
15111510
Ok(db) => db,
15121511
Err(DatabaseError::UpgradeRequired(1)) => {
1513-
migrate_redb_v1_v2::run(path).map_err(ActorError::Migration)?
1512+
return Err(ActorError::Migration(anyhow::anyhow!(
1513+
"migration from v1 no longer supported"
1514+
)))
15141515
}
15151516
Err(err) => return Err(err.into()),
15161517
};

src/store/fs/migrate_redb_v1_v2.rs

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

0 commit comments

Comments
 (0)