Unverified Commit 546cdee5 authored by Benjamin Woodruff's avatar Benjamin Woodruff Committed by GitHub

refactor(turbo-tasks-backend): Remove `ExecuteContextImpl::lower_read_transaction` (#80822)

Following the removal of the other `transaction` and `lower_read_transaction` callsites in #80816...

If `ExecuteContextImpl::transaction` is inlined into `ExecuteContextImpl::restore_task_data` (the only remaining callsite), we no longer need `lower_read_transaction` and its crimes against Rust lifetimes.

Sanity checked with:

```
cargo check --features turbo-tasks-backend/lmdb
```
parent b6a2a2ed
...@@ -107,10 +107,11 @@ where ...@@ -107,10 +107,11 @@ where
} }
} }
fn transaction<'l>(&'l mut self) -> Option<&'l B::ReadTransaction<'l>> fn restore_task_data(
where &mut self,
'e: 'l, task_id: TaskId,
{ category: TaskDataCategory,
) -> Vec<CachedDataItem> {
if matches!(self.transaction, TransactionState::None) { if matches!(self.transaction, TransactionState::None) {
let tx = self.backend.backing_storage.start_read_transaction(); let tx = self.backend.backing_storage.start_read_transaction();
let tx = tx.map(|tx| { let tx = tx.map(|tx| {
...@@ -119,23 +120,16 @@ where ...@@ -119,23 +120,16 @@ where
}); });
self.transaction = TransactionState::Owned(tx); self.transaction = TransactionState::Owned(tx);
} }
match &self.transaction { let tx = match &self.transaction {
TransactionState::None => unreachable!(), TransactionState::None => unreachable!(),
TransactionState::Borrowed(tx) => tx.map(B::lower_read_transaction), TransactionState::Borrowed(tx) => *tx,
TransactionState::Owned(tx) => tx.as_ref().map(B::lower_read_transaction), TransactionState::Owned(tx) => tx.as_ref(),
} };
} // Safety: `tx` is a valid transaction from `self.backend.backing_storage`.
fn restore_task_data(
&mut self,
task_id: TaskId,
category: TaskDataCategory,
) -> Vec<CachedDataItem> {
// Safety: `transaction` is a valid transaction from `self.backend.backing_storage`.
let result = unsafe { let result = unsafe {
self.backend self.backend
.backing_storage .backing_storage
.lookup_data(self.transaction(), task_id, category) .lookup_data(tx, task_id, category)
}; };
match result { match result {
Ok(data) => data, Ok(data) => data,
......
...@@ -41,9 +41,6 @@ pub trait BackingStorage: BackingStorageSealed { ...@@ -41,9 +41,6 @@ pub trait BackingStorage: BackingStorageSealed {
/// [`BackingStorage::invalidate`] method. /// [`BackingStorage::invalidate`] method.
pub trait BackingStorageSealed: 'static + Send + Sync { pub trait BackingStorageSealed: 'static + Send + Sync {
type ReadTransaction<'l>; type ReadTransaction<'l>;
fn lower_read_transaction<'l: 'i + 'r, 'i: 'r, 'r>(
tx: &'r Self::ReadTransaction<'l>,
) -> &'r Self::ReadTransaction<'i>;
fn next_free_task_id(&self) -> Result<TaskId>; fn next_free_task_id(&self) -> Result<TaskId>;
fn next_session_id(&self) -> Result<SessionId>; fn next_session_id(&self) -> Result<SessionId>;
fn uncompleted_operations(&self) -> Result<Vec<AnyOperation>>; fn uncompleted_operations(&self) -> Result<Vec<AnyOperation>>;
......
...@@ -37,12 +37,6 @@ impl<T: KeyValueDatabase> KeyValueDatabase for FreshDbOptimization<T> { ...@@ -37,12 +37,6 @@ impl<T: KeyValueDatabase> KeyValueDatabase for FreshDbOptimization<T> {
where where
Self: 'l; Self: 'l;
fn lower_read_transaction<'l: 'i + 'r, 'i: 'r, 'r>(
tx: &'r Self::ReadTransaction<'l>,
) -> &'r Self::ReadTransaction<'i> {
T::lower_read_transaction(tx)
}
fn is_empty(&self) -> bool { fn is_empty(&self) -> bool {
self.fresh_db.load(Ordering::Acquire) || self.database.is_empty() self.fresh_db.load(Ordering::Acquire) || self.database.is_empty()
} }
......
...@@ -18,10 +18,6 @@ pub trait KeyValueDatabase { ...@@ -18,10 +18,6 @@ pub trait KeyValueDatabase {
where where
Self: 'l; Self: 'l;
fn lower_read_transaction<'l: 'i + 'r, 'i: 'r, 'r>(
tx: &'r Self::ReadTransaction<'l>,
) -> &'r Self::ReadTransaction<'i>;
fn begin_read_transaction(&self) -> Result<Self::ReadTransaction<'_>>; fn begin_read_transaction(&self) -> Result<Self::ReadTransaction<'_>>;
fn is_empty(&self) -> bool { fn is_empty(&self) -> bool {
......
...@@ -75,12 +75,6 @@ impl KeyValueDatabase for LmbdKeyValueDatabase { ...@@ -75,12 +75,6 @@ impl KeyValueDatabase for LmbdKeyValueDatabase {
where where
Self: 'l; Self: 'l;
fn lower_read_transaction<'l: 'i + 'r, 'i: 'r, 'r>(
tx: &'r Self::ReadTransaction<'l>,
) -> &'r Self::ReadTransaction<'i> {
tx
}
fn begin_read_transaction(&self) -> Result<Self::ReadTransaction<'_>> { fn begin_read_transaction(&self) -> Result<Self::ReadTransaction<'_>> {
Ok(self.env.begin_ro_txn()?) Ok(self.env.begin_ro_txn()?)
} }
......
...@@ -15,12 +15,6 @@ impl KeyValueDatabase for NoopKvDb { ...@@ -15,12 +15,6 @@ impl KeyValueDatabase for NoopKvDb {
where where
Self: 'l; Self: 'l;
fn lower_read_transaction<'l: 'i + 'r, 'i: 'r, 'r>(
tx: &'r Self::ReadTransaction<'l>,
) -> &'r Self::ReadTransaction<'i> {
tx
}
fn begin_read_transaction(&self) -> Result<Self::ReadTransaction<'_>> { fn begin_read_transaction(&self) -> Result<Self::ReadTransaction<'_>> {
Ok(()) Ok(())
} }
......
...@@ -53,14 +53,6 @@ impl<T: KeyValueDatabase + 'static> KeyValueDatabase for ReadTransactionCache<T> ...@@ -53,14 +53,6 @@ impl<T: KeyValueDatabase + 'static> KeyValueDatabase for ReadTransactionCache<T>
where where
T: 'l; T: 'l;
fn lower_read_transaction<'l: 'i + 'r, 'i: 'r, 'r>(
tx: &'r Self::ReadTransaction<'l>,
) -> &'r Self::ReadTransaction<'i> {
// Safety: When T compiles fine and lower_read_transaction is implemented correctly this is
// safe to do.
unsafe { transmute::<&'r Self::ReadTransaction<'l>, &'r Self::ReadTransaction<'i>>(tx) }
}
fn is_empty(&self) -> bool { fn is_empty(&self) -> bool {
self.database.is_empty() self.database.is_empty()
} }
......
...@@ -105,12 +105,6 @@ impl<T: KeyValueDatabase> KeyValueDatabase for StartupCacheLayer<T> { ...@@ -105,12 +105,6 @@ impl<T: KeyValueDatabase> KeyValueDatabase for StartupCacheLayer<T> {
where where
Self: 'l; Self: 'l;
fn lower_read_transaction<'l: 'i + 'r, 'i: 'r, 'r>(
tx: &'r Self::ReadTransaction<'l>,
) -> &'r Self::ReadTransaction<'i> {
T::lower_read_transaction(tx)
}
fn is_empty(&self) -> bool { fn is_empty(&self) -> bool {
self.database.is_empty() self.database.is_empty()
} }
......
...@@ -60,12 +60,6 @@ impl KeyValueDatabase for TurboKeyValueDatabase { ...@@ -60,12 +60,6 @@ impl KeyValueDatabase for TurboKeyValueDatabase {
where where
Self: 'l; Self: 'l;
fn lower_read_transaction<'l: 'i + 'r, 'i: 'r, 'r>(
tx: &'r Self::ReadTransaction<'l>,
) -> &'r Self::ReadTransaction<'i> {
tx
}
fn is_empty(&self) -> bool { fn is_empty(&self) -> bool {
self.db.is_empty() self.db.is_empty()
} }
......
...@@ -262,12 +262,6 @@ impl<T: KeyValueDatabase + Send + Sync + 'static> BackingStorageSealed ...@@ -262,12 +262,6 @@ impl<T: KeyValueDatabase + Send + Sync + 'static> BackingStorageSealed
{ {
type ReadTransaction<'l> = T::ReadTransaction<'l>; type ReadTransaction<'l> = T::ReadTransaction<'l>;
fn lower_read_transaction<'l: 'i + 'r, 'i: 'r, 'r>(
tx: &'r Self::ReadTransaction<'l>,
) -> &'r Self::ReadTransaction<'i> {
T::lower_read_transaction(tx)
}
fn next_free_task_id(&self) -> Result<TaskId> { fn next_free_task_id(&self) -> Result<TaskId> {
Ok(TaskId::try_from( Ok(TaskId::try_from(
self.inner self.inner
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment