diff --git a/crates/cli/src/modules/mod.rs b/crates/cli/src/modules/mod.rs index ec2177b5..f5e60929 100644 --- a/crates/cli/src/modules/mod.rs +++ b/crates/cli/src/modules/mod.rs @@ -202,10 +202,6 @@ impl UnwrapResult for Result { } } -trait TableName { - fn table_name(&self) -> &'static str; -} - pub fn read_file(path: &str) -> Vec { if path == "-" { let mut stdin = std::io::stdin().lock(); diff --git a/crates/store/src/backend/foundationdb/mod.rs b/crates/store/src/backend/foundationdb/mod.rs index cdec7230..88fbdc3e 100644 --- a/crates/store/src/backend/foundationdb/mod.rs +++ b/crates/store/src/backend/foundationdb/mod.rs @@ -50,7 +50,7 @@ impl ReadVersion { pub fn new(version: i64) -> Self { Self { version, - expires: Instant::now() + Duration::from_secs(60 * 2), + expires: Instant::now() + Duration::from_secs(1), } } diff --git a/crates/store/src/backend/foundationdb/read.rs b/crates/store/src/backend/foundationdb/read.rs index d0623b12..080fb5af 100644 --- a/crates/store/src/backend/foundationdb/read.rs +++ b/crates/store/src/backend/foundationdb/read.rs @@ -142,19 +142,19 @@ impl FdbStore { } pub(crate) async fn read_trx(&self) -> crate::Result { - let trx = self.db.create_trx()?; let (is_expired, mut read_version) = { let version = self.version.lock(); (version.is_expired(), version.version) }; + let trx = self.db.create_trx()?; if is_expired { read_version = trx.get_read_version().await?; *self.version.lock() = ReadVersion::new(read_version); + } else { + trx.set_read_version(read_version); } - trx.set_read_version(read_version); - Ok(trx) } }