Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
N
next.js
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Alex
next.js
Commits
ec9f7f3e
Commit
ec9f7f3e
authored
Apr 04, 2026
by
Luke Sandberg
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fewer copies
parent
d8ef88ee
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
117 additions
and
129 deletions
+117
-129
mod.rs
...k/crates/turbo-tasks-backend/src/backend/operation/mod.rs
+80
-54
backing_storage.rs
turbopack/crates/turbo-tasks-backend/src/backing_storage.rs
+10
-8
key_value_database.rs
...es/turbo-tasks-backend/src/database/key_value_database.rs
+4
-12
noop_kv.rs
turbopack/crates/turbo-tasks-backend/src/database/noop_kv.rs
+2
-6
mod.rs
...pack/crates/turbo-tasks-backend/src/database/turbo/mod.rs
+2
-11
kv_backing_storage.rs
...pack/crates/turbo-tasks-backend/src/kv_backing_storage.rs
+19
-38
No files found.
turbopack/crates/turbo-tasks-backend/src/backend/operation/mod.rs
View file @
ec9f7f3e
...
@@ -182,23 +182,16 @@ impl<'e, B: BackingStorage> ExecuteContextImpl<'e, B> {
...
@@ -182,23 +182,16 @@ impl<'e, B: BackingStorage> ExecuteContextImpl<'e, B> {
self
.backend
.should_restore
()
&&
self
.backend.local_is_partial
self
.backend
.should_restore
()
&&
self
.backend.local_is_partial
}
}
fn
restore
_task_data
(
fn
lookup
_task_data
(
&
self
,
&
self
,
task_id
:
TaskId
,
task_id
:
TaskId
,
category
:
SpecificTaskDataCategory
,
category
:
SpecificTaskDataCategory
,
)
->
TaskStorage
{
)
->
Option
<
turbo_persistence
::
ArcBytes
>
{
if
!
self
.should_check_backing_storage
()
{
if
!
self
.should_check_backing_storage
()
{
// If we don't need to restore, we can just return an empty storage
return
None
;
return
TaskStorage
::
default
();
}
}
let
mut
storage
=
TaskStorage
::
default
();
match
self
.backend.backing_storage
.lookup_data
(
task_id
,
category
)
{
let
result
=
self
Ok
(
bytes
)
=>
bytes
,
.backend
.backing_storage
.lookup_data
(
task_id
,
category
,
&
mut
storage
);
match
result
{
Ok
(())
=>
storage
,
Err
(
e
)
=>
{
Err
(
e
)
=>
{
panic!
(
panic!
(
"Failed to restore task data (corrupted database or bug): {:?}"
,
"Failed to restore task data (corrupted database or bug): {:?}"
,
...
@@ -531,28 +524,39 @@ impl<'e, B: BackingStorage> ExecuteContext<'e> for ExecuteContextImpl<'e, B> {
...
@@ -531,28 +524,39 @@ impl<'e, B: BackingStorage> ExecuteContext<'e> for ExecuteContextImpl<'e, B> {
category
.includes_meta
()
&&
!
task
.flags
.is_restored
(
TaskDataCategory
::
Meta
);
category
.includes_meta
()
&&
!
task
.flags
.is_restored
(
TaskDataCategory
::
Meta
);
if
needs_data
||
needs_meta
{
if
needs_data
||
needs_meta
{
// Avoid holding the lock too long since this can also affect other tasks
// Avoid holding the lock too long since this can also affect other tasks.
// Drop lock once, do all I/O, then re-acquire once
// Drop lock once, do all I/O (returning raw bytes), then re-acquire once
// and decode directly into the live task — no scratch TaskStorage needed.
drop
(
task
);
drop
(
task
);
let
storage
_data
=
needs_data
let
bytes
_data
=
needs_data
.then
(||
self
.
restore
_task_data
(
task_id
,
SpecificTaskDataCategory
::
Data
));
.then
(||
self
.
lookup
_task_data
(
task_id
,
SpecificTaskDataCategory
::
Data
));
let
storage
_meta
=
needs_meta
let
bytes
_meta
=
needs_meta
.then
(||
self
.
restore
_task_data
(
task_id
,
SpecificTaskDataCategory
::
Meta
));
.then
(||
self
.
lookup
_task_data
(
task_id
,
SpecificTaskDataCategory
::
Meta
));
task
=
self
.backend.storage
.access_mut
(
task_id
);
task
=
self
.backend.storage
.access_mut
(
task_id
);
// Handle race conditions and merge
// Handle race conditions and decode directly into live storage.
if
let
Some
(
storage
)
=
storage_data
// set_restored is called even when no bytes found (task simply has no
&&
!
task
.flags
.is_restored
(
TaskDataCategory
::
Data
)
// persisted data for this category).
{
if
needs_data
&&
!
task
.flags
.is_restored
(
TaskDataCategory
::
Data
)
{
task
.restore_from
(
storage
,
TaskDataCategory
::
Data
);
if
let
Some
(
bytes
)
=
bytes_data
.flatten
()
{
let
mut
decoder
=
new_turbo_bincode_decoder
(
&
bytes
);
task
.decode
(
SpecificTaskDataCategory
::
Data
,
&
mut
decoder
)
.unwrap_or_else
(|
e
|
{
panic!
(
"Failed to decode Data for {task_id:?}: {e:?}"
)
});
}
task
.flags
.set_restored
(
TaskDataCategory
::
Data
);
task
.flags
.set_restored
(
TaskDataCategory
::
Data
);
}
}
if
let
Some
(
storage
)
=
storage_meta
if
needs_meta
&&
!
task
.flags
.is_restored
(
TaskDataCategory
::
Meta
)
{
&&
!
task
.flags
.is_restored
(
TaskDataCategory
::
Meta
)
if
let
Some
(
bytes
)
=
bytes_meta
.flatten
()
{
{
let
mut
decoder
=
new_turbo_bincode_decoder
(
&
bytes
);
task
.restore_from
(
storage
,
TaskDataCategory
::
Meta
);
task
.decode
(
SpecificTaskDataCategory
::
Meta
,
&
mut
decoder
)
.unwrap_or_else
(|
e
|
{
panic!
(
"Failed to decode Meta for {task_id:?}: {e:?}"
)
});
}
task
.flags
.set_restored
(
TaskDataCategory
::
Meta
);
task
.flags
.set_restored
(
TaskDataCategory
::
Meta
);
}
}
}
}
...
@@ -625,47 +629,69 @@ impl<'e, B: BackingStorage> ExecuteContext<'e> for ExecuteContextImpl<'e, B> {
...
@@ -625,47 +629,69 @@ impl<'e, B: BackingStorage> ExecuteContext<'e> for ExecuteContextImpl<'e, B> {
category
.includes_meta
()
&&
!
task2
.flags
.is_restored
(
TaskDataCategory
::
Meta
);
category
.includes_meta
()
&&
!
task2
.flags
.is_restored
(
TaskDataCategory
::
Meta
);
if
needs_data1
||
needs_meta1
||
needs_data2
||
needs_meta2
{
if
needs_data1
||
needs_meta1
||
needs_data2
||
needs_meta2
{
// Avoid holding the lock too long since this can also affect other tasks
// Avoid holding the lock too long since this can also affect other tasks.
// Drop locks once, do all I/O, then re-acquire once
// Drop locks once, do all I/O (returning raw bytes), then re-acquire once
// and decode directly into the live tasks — no scratch TaskStorage needed.
drop
(
task1
);
drop
(
task1
);
drop
(
task2
);
drop
(
task2
);
let
storage
_data1
=
needs_data1
let
bytes
_data1
=
needs_data1
.then
(||
self
.
restore
_task_data
(
task_id1
,
SpecificTaskDataCategory
::
Data
));
.then
(||
self
.
lookup
_task_data
(
task_id1
,
SpecificTaskDataCategory
::
Data
));
let
storage
_meta1
=
needs_meta1
let
bytes
_meta1
=
needs_meta1
.then
(||
self
.
restore
_task_data
(
task_id1
,
SpecificTaskDataCategory
::
Meta
));
.then
(||
self
.
lookup
_task_data
(
task_id1
,
SpecificTaskDataCategory
::
Meta
));
let
storage
_data2
=
needs_data2
let
bytes
_data2
=
needs_data2
.then
(||
self
.
restore
_task_data
(
task_id2
,
SpecificTaskDataCategory
::
Data
));
.then
(||
self
.
lookup
_task_data
(
task_id2
,
SpecificTaskDataCategory
::
Data
));
let
storage
_meta2
=
needs_meta2
let
bytes
_meta2
=
needs_meta2
.then
(||
self
.
restore
_task_data
(
task_id2
,
SpecificTaskDataCategory
::
Meta
));
.then
(||
self
.
lookup
_task_data
(
task_id2
,
SpecificTaskDataCategory
::
Meta
));
let
(
t1
,
t2
)
=
self
.backend.storage
.access_pair_mut
(
task_id1
,
task_id2
);
let
(
t1
,
t2
)
=
self
.backend.storage
.access_pair_mut
(
task_id1
,
task_id2
);
task1
=
t1
;
task1
=
t1
;
task2
=
t2
;
task2
=
t2
;
// Merge results, handling race conditions
// Decode directly into live storage, handling race conditions.
if
let
Some
(
storage
)
=
storage_data1
// set_restored is called even when no bytes found.
&&
!
task1
.flags
.is_restored
(
TaskDataCategory
::
Data
)
if
needs_data1
&&
!
task1
.flags
.is_restored
(
TaskDataCategory
::
Data
)
{
{
if
let
Some
(
bytes
)
=
bytes_data1
.flatten
()
{
task1
.restore_from
(
storage
,
TaskDataCategory
::
Data
);
let
mut
decoder
=
new_turbo_bincode_decoder
(
&
bytes
);
task1
.decode
(
SpecificTaskDataCategory
::
Data
,
&
mut
decoder
)
.unwrap_or_else
(|
e
|
{
panic!
(
"Failed to decode Data for {task_id1:?}: {e:?}"
)
});
}
task1
.flags
.set_restored
(
TaskDataCategory
::
Data
);
task1
.flags
.set_restored
(
TaskDataCategory
::
Data
);
}
}
if
let
Some
(
storage
)
=
storage_meta1
if
needs_meta1
&&
!
task1
.flags
.is_restored
(
TaskDataCategory
::
Meta
)
{
&&
!
task1
.flags
.is_restored
(
TaskDataCategory
::
Meta
)
if
let
Some
(
bytes
)
=
bytes_meta1
.flatten
()
{
{
let
mut
decoder
=
new_turbo_bincode_decoder
(
&
bytes
);
task1
.restore_from
(
storage
,
TaskDataCategory
::
Meta
);
task1
.decode
(
SpecificTaskDataCategory
::
Meta
,
&
mut
decoder
)
.unwrap_or_else
(|
e
|
{
panic!
(
"Failed to decode Meta for {task_id1:?}: {e:?}"
)
});
}
task1
.flags
.set_restored
(
TaskDataCategory
::
Meta
);
task1
.flags
.set_restored
(
TaskDataCategory
::
Meta
);
}
}
if
let
Some
(
storage
)
=
storage_data2
if
needs_data2
&&
!
task2
.flags
.is_restored
(
TaskDataCategory
::
Data
)
{
&&
!
task2
.flags
.is_restored
(
TaskDataCategory
::
Data
)
if
let
Some
(
bytes
)
=
bytes_data2
.flatten
()
{
{
let
mut
decoder
=
new_turbo_bincode_decoder
(
&
bytes
);
task2
.restore_from
(
storage
,
TaskDataCategory
::
Data
);
task2
.decode
(
SpecificTaskDataCategory
::
Data
,
&
mut
decoder
)
.unwrap_or_else
(|
e
|
{
panic!
(
"Failed to decode Data for {task_id2:?}: {e:?}"
)
});
}
task2
.flags
.set_restored
(
TaskDataCategory
::
Data
);
task2
.flags
.set_restored
(
TaskDataCategory
::
Data
);
}
}
if
let
Some
(
storage
)
=
storage_meta2
if
needs_meta2
&&
!
task2
.flags
.is_restored
(
TaskDataCategory
::
Meta
)
{
&&
!
task2
.flags
.is_restored
(
TaskDataCategory
::
Meta
)
if
let
Some
(
bytes
)
=
bytes_meta2
.flatten
()
{
{
let
mut
decoder
=
new_turbo_bincode_decoder
(
&
bytes
);
task2
.restore_from
(
storage
,
TaskDataCategory
::
Meta
);
task2
.decode
(
SpecificTaskDataCategory
::
Meta
,
&
mut
decoder
)
.unwrap_or_else
(|
e
|
{
panic!
(
"Failed to decode Meta for {task_id2:?}: {e:?}"
)
});
}
task2
.flags
.set_restored
(
TaskDataCategory
::
Meta
);
task2
.flags
.set_restored
(
TaskDataCategory
::
Meta
);
}
}
}
}
...
...
turbopack/crates/turbo-tasks-backend/src/backing_storage.rs
View file @
ec9f7f3e
...
@@ -4,10 +4,11 @@ use anyhow::Result;
...
@@ -4,10 +4,11 @@ use anyhow::Result;
use
either
::
Either
;
use
either
::
Either
;
use
smallvec
::
SmallVec
;
use
smallvec
::
SmallVec
;
use
turbo_bincode
::
TurboBincodeBuffer
;
use
turbo_bincode
::
TurboBincodeBuffer
;
use
turbo_persistence
::
ArcBytes
;
use
turbo_tasks
::{
TaskId
,
backend
::
CachedTaskType
};
use
turbo_tasks
::{
TaskId
,
backend
::
CachedTaskType
};
use
crate
::{
use
crate
::{
backend
::{
AnyOperation
,
SpecificTaskDataCategory
,
storage_schema
::
TaskStorage
},
backend
::{
AnyOperation
,
SpecificTaskDataCategory
},
utils
::
chunked_vec
::
ChunkedVec
,
utils
::
chunked_vec
::
ChunkedVec
,
};
};
...
@@ -69,14 +70,16 @@ pub trait BackingStorageSealed: 'static + Send + Sync {
...
@@ -69,14 +70,16 @@ pub trait BackingStorageSealed: 'static + Send + Sync {
/// The caller must verify each returned TaskId by comparing the stored task type which will
/// The caller must verify each returned TaskId by comparing the stored task type which will
/// require a second database read
/// require a second database read
fn
lookup_task_candidates
(
&
self
,
key
:
&
CachedTaskType
)
->
Result
<
SmallVec
<
[
TaskId
;
1
]
>>
;
fn
lookup_task_candidates
(
&
self
,
key
:
&
CachedTaskType
)
->
Result
<
SmallVec
<
[
TaskId
;
1
]
>>
;
/// Looks up and decodes persisted data for a single task, updating the provided storage with
/// Looks up raw persisted bytes for a single task.
/// data from the database in the given category.
///
/// Returns `None` if the task has no persisted data for the given category.
/// The caller is responsible for decoding the returned bytes. The returned
/// [`ArcBytes`] is ref-counted and zero-copy when backed by a memory-mapped file.
fn
lookup_data
(
fn
lookup_data
(
&
self
,
&
self
,
task_id
:
TaskId
,
task_id
:
TaskId
,
category
:
SpecificTaskDataCategory
,
category
:
SpecificTaskDataCategory
,
storage
:
&
mut
TaskStorage
,
)
->
Result
<
Option
<
ArcBytes
>>
;
)
->
Result
<
()
>
;
/// Batch lookup raw bytes for multiple tasks, calling
/// Batch lookup raw bytes for multiple tasks, calling
/// `callback(index, Option<&[u8]>)` for every task in `task_ids` immediately after its
/// `callback(index, Option<&[u8]>)` for every task in `task_ids` immediately after its
...
@@ -151,9 +154,8 @@ where
...
@@ -151,9 +154,8 @@ where
&
self
,
&
self
,
task_id
:
TaskId
,
task_id
:
TaskId
,
category
:
SpecificTaskDataCategory
,
category
:
SpecificTaskDataCategory
,
storage
:
&
mut
TaskStorage
,
)
->
Result
<
Option
<
ArcBytes
>>
{
)
->
Result
<
()
>
{
either
::
for_both!
(
self
,
this
=>
this
.lookup_data
(
task_id
,
category
))
either
::
for_both!
(
self
,
this
=>
this
.lookup_data
(
task_id
,
category
,
storage
))
}
}
fn
batch_lookup_data
(
fn
batch_lookup_data
(
...
...
turbopack/crates/turbo-tasks-backend/src/database/key_value_database.rs
View file @
ec9f7f3e
use
anyhow
::
Result
;
use
anyhow
::
Result
;
use
smallvec
::
SmallVec
;
use
smallvec
::
SmallVec
;
use
turbo_persistence
::{
FamilyConfig
,
FamilyKind
};
use
turbo_persistence
::{
ArcBytes
,
FamilyConfig
,
FamilyKind
};
use
crate
::
database
::
write_batch
::
ConcurrentWriteBatch
;
use
crate
::
database
::
write_batch
::
ConcurrentWriteBatch
;
...
@@ -57,21 +57,13 @@ pub trait KeyValueDatabase {
...
@@ -57,21 +57,13 @@ pub trait KeyValueDatabase {
false
false
}
}
type
ValueBuffer
<
'l
>
:
std
::
borrow
::
Borrow
<
[
u8
]
>
fn
get
(
&
self
,
key_space
:
KeySpace
,
key
:
&
[
u8
])
->
Result
<
Option
<
ArcBytes
>>
;
where
Self
:
'l
;
fn
get
(
&
self
,
key_space
:
KeySpace
,
key
:
&
[
u8
])
->
Result
<
Option
<
Self
::
ValueBuffer
<
'_
>>>
;
/// Looks up a key and returns all matching values.
/// Looks up a key and returns all matching values.
///
///
/// Useful for keyspaces where keys are hashes and collisions are possible (e.g., TaskCache).
/// Useful for keyspaces where keys are hashes and collisions are possible (e.g., TaskCache).
/// The default implementation returns at most one value (from `get`), but implementations
/// The default implementation returns at most one value (from `get`), but implementations
/// that support multiple values per key should override this.
/// that support multiple values per key should override this.
fn
get_multiple
(
fn
get_multiple
(
&
self
,
key_space
:
KeySpace
,
key
:
&
[
u8
])
->
Result
<
SmallVec
<
[
ArcBytes
;
1
]
>>
{
&
self
,
key_space
:
KeySpace
,
key
:
&
[
u8
],
)
->
Result
<
SmallVec
<
[
Self
::
ValueBuffer
<
'_
>
;
1
]
>>
{
Ok
(
self
.get
(
key_space
,
key
)
?
.into_iter
()
.collect
())
Ok
(
self
.get
(
key_space
,
key
)
?
.into_iter
()
.collect
())
}
}
...
@@ -89,7 +81,7 @@ pub trait KeyValueDatabase {
...
@@ -89,7 +81,7 @@ pub trait KeyValueDatabase {
)
->
Result
<
()
>
{
)
->
Result
<
()
>
{
for
(
index
,
key
)
in
keys
.iter
()
.enumerate
()
{
for
(
index
,
key
)
in
keys
.iter
()
.enumerate
()
{
let
value
=
self
.get
(
key_space
,
key
)
?
;
let
value
=
self
.get
(
key_space
,
key
)
?
;
let
opt_bytes
=
value
.as_
ref
()
.map
(
std
::
borrow
::
Borrow
::
<
[
u8
]
>
::
borrow
);
let
opt_bytes
=
value
.as_
deref
(
);
callback
(
index
,
opt_bytes
)
?
;
callback
(
index
,
opt_bytes
)
?
;
}
}
Ok
(())
Ok
(())
...
...
turbopack/crates/turbo-tasks-backend/src/database/noop_kv.rs
View file @
ec9f7f3e
use
anyhow
::
Result
;
use
anyhow
::
Result
;
use
turbo_persistence
::
ArcBytes
;
use
crate
::
database
::{
use
crate
::
database
::{
key_value_database
::{
KeySpace
,
KeyValueDatabase
},
key_value_database
::{
KeySpace
,
KeyValueDatabase
},
...
@@ -8,12 +9,7 @@ use crate::database::{
...
@@ -8,12 +9,7 @@ use crate::database::{
pub
struct
NoopKvDb
;
pub
struct
NoopKvDb
;
impl
KeyValueDatabase
for
NoopKvDb
{
impl
KeyValueDatabase
for
NoopKvDb
{
type
ValueBuffer
<
'l
>
fn
get
(
&
self
,
_key_space
:
KeySpace
,
_key
:
&
[
u8
])
->
Result
<
Option
<
ArcBytes
>>
{
=
&
'l
[
u8
]
where
Self
:
'l
;
fn
get
(
&
self
,
_key_space
:
KeySpace
,
_key
:
&
[
u8
])
->
Result
<
Option
<
Self
::
ValueBuffer
<
'_
>>>
{
Ok
(
None
)
Ok
(
None
)
}
}
...
...
turbopack/crates/turbo-tasks-backend/src/database/turbo/mod.rs
View file @
ec9f7f3e
...
@@ -87,12 +87,7 @@ impl KeyValueDatabase for TurboKeyValueDatabase {
...
@@ -87,12 +87,7 @@ impl KeyValueDatabase for TurboKeyValueDatabase {
self
.db
.is_empty
()
self
.db
.is_empty
()
}
}
type
ValueBuffer
<
'l
>
fn
get
(
&
self
,
key_space
:
KeySpace
,
key
:
&
[
u8
])
->
Result
<
Option
<
ArcBytes
>>
{
=
ArcBytes
where
Self
:
'l
;
fn
get
(
&
self
,
key_space
:
KeySpace
,
key
:
&
[
u8
])
->
Result
<
Option
<
Self
::
ValueBuffer
<
'_
>>>
{
self
.db
.get
(
key_space
as
usize
,
&
key
)
self
.db
.get
(
key_space
as
usize
,
&
key
)
}
}
...
@@ -105,11 +100,7 @@ impl KeyValueDatabase for TurboKeyValueDatabase {
...
@@ -105,11 +100,7 @@ impl KeyValueDatabase for TurboKeyValueDatabase {
self
.db
.batch_get_with
(
key_space
as
usize
,
keys
,
callback
)
self
.db
.batch_get_with
(
key_space
as
usize
,
keys
,
callback
)
}
}
fn
get_multiple
(
fn
get_multiple
(
&
self
,
key_space
:
KeySpace
,
key
:
&
[
u8
])
->
Result
<
SmallVec
<
[
ArcBytes
;
1
]
>>
{
&
self
,
key_space
:
KeySpace
,
key
:
&
[
u8
],
)
->
Result
<
SmallVec
<
[
Self
::
ValueBuffer
<
'_
>
;
1
]
>>
{
self
.db
.get_multiple
(
key_space
as
usize
,
&
key
)
self
.db
.get_multiple
(
key_space
as
usize
,
&
key
)
}
}
...
...
turbopack/crates/turbo-tasks-backend/src/kv_backing_storage.rs
View file @
ec9f7f3e
...
@@ -7,7 +7,8 @@ use std::{
...
@@ -7,7 +7,8 @@ use std::{
use
anyhow
::{
Context
,
Result
};
use
anyhow
::{
Context
,
Result
};
use
smallvec
::
SmallVec
;
use
smallvec
::
SmallVec
;
use
turbo_bincode
::{
new_turbo_bincode_decoder
,
turbo_bincode_decode
,
turbo_bincode_encode
};
use
turbo_bincode
::{
turbo_bincode_decode
,
turbo_bincode_encode
};
use
turbo_persistence
::
ArcBytes
;
use
turbo_tasks
::{
use
turbo_tasks
::{
TaskId
,
TaskId
,
backend
::
CachedTaskType
,
backend
::
CachedTaskType
,
...
@@ -18,7 +19,7 @@ use turbo_tasks_hash::Xxh3Hash64Hasher;
...
@@ -18,7 +19,7 @@ use turbo_tasks_hash::Xxh3Hash64Hasher;
use
crate
::{
use
crate
::{
GitVersionInfo
,
GitVersionInfo
,
backend
::{
AnyOperation
,
SpecificTaskDataCategory
,
storage_schema
::
TaskStorage
},
backend
::{
AnyOperation
,
SpecificTaskDataCategory
},
backing_storage
::{
BackingStorage
,
BackingStorageSealed
,
SnapshotItem
},
backing_storage
::{
BackingStorage
,
BackingStorageSealed
,
SnapshotItem
},
database
::{
database
::{
db_invalidation
::{
StartupCacheState
,
check_db_invalidation_and_cleanup
,
invalidate_db
},
db_invalidation
::{
StartupCacheState
,
check_db_invalidation_and_cleanup
,
invalidate_db
},
...
@@ -47,11 +48,6 @@ impl AsRef<[u8]> for IntKey {
...
@@ -47,11 +48,6 @@ impl AsRef<[u8]> for IntKey {
}
}
}
}
fn
as_u32
(
bytes
:
impl
Borrow
<
[
u8
]
>
)
->
Result
<
u32
>
{
let
n
=
u32
::
from_le_bytes
(
bytes
.borrow
()
.try_into
()
?
);
Ok
(
n
)
}
// We want to invalidate the cache on panic for most users, but this is a band-aid to underlying
// We want to invalidate the cache on panic for most users, but this is a band-aid to underlying
// problems in turbo-tasks.
// problems in turbo-tasks.
//
//
...
@@ -187,7 +183,7 @@ impl<T: KeyValueDatabase> KeyValueDatabaseBackingStorageInner<T> {
...
@@ -187,7 +183,7 @@ impl<T: KeyValueDatabase> KeyValueDatabaseBackingStorageInner<T> {
fn
get_infra_u32
(
&
self
,
key
:
u32
)
->
Result
<
Option
<
u32
>>
{
fn
get_infra_u32
(
&
self
,
key
:
u32
)
->
Result
<
Option
<
u32
>>
{
self
.database
self
.database
.get
(
KeySpace
::
Infra
,
IntKey
::
new
(
key
)
.as_ref
())
?
.get
(
KeySpace
::
Infra
,
IntKey
::
new
(
key
)
.as_ref
())
?
.map
(
as_u32
)
.map
(
|
b
|
Ok
(
u32
::
from_le_bytes
((
*
b
)
.try_into
()
?
))
)
.transpose
()
.transpose
()
}
}
}
}
...
@@ -212,16 +208,13 @@ impl<T: KeyValueDatabase + Send + Sync + 'static> BackingStorageSealed
...
@@ -212,16 +208,13 @@ impl<T: KeyValueDatabase + Send + Sync + 'static> BackingStorageSealed
}
}
fn
uncompleted_operations
(
&
self
)
->
Result
<
Vec
<
AnyOperation
>>
{
fn
uncompleted_operations
(
&
self
)
->
Result
<
Vec
<
AnyOperation
>>
{
fn
get
(
database
:
&
impl
KeyValueDatabase
)
->
Result
<
Vec
<
AnyOperation
>>
{
self
.inner
let
Some
(
operations
)
=
.database
database
.get
(
KeySpace
::
Infra
,
IntKey
::
new
(
META_KEY_OPERATIONS
)
.as_ref
())
?
.get
(
KeySpace
::
Infra
,
IntKey
::
new
(
META_KEY_OPERATIONS
)
.as_ref
())
?
else
{
.map
(|
b
|
turbo_bincode_decode
(
&
b
))
return
Ok
(
Vec
::
new
());
.transpose
()
};
.map
(
Option
::
unwrap_or_default
)
let
operations
=
turbo_bincode_decode
(
operations
.borrow
())
?
;
.context
(
"Unable to read uncompleted operations from database"
)
Ok
(
operations
)
}
get
(
&
self
.inner.database
)
.context
(
"Unable to read uncompleted operations from database"
)
}
}
fn
save_snapshot
<
I
>
(
fn
save_snapshot
<
I
>
(
...
@@ -298,14 +291,14 @@ impl<T: KeyValueDatabase + Send + Sync + 'static> BackingStorageSealed
...
@@ -298,14 +291,14 @@ impl<T: KeyValueDatabase + Send + Sync + 'static> BackingStorageSealed
}
}
fn
lookup_task_candidates
(
&
self
,
task_type
:
&
CachedTaskType
)
->
Result
<
SmallVec
<
[
TaskId
;
1
]
>>
{
fn
lookup_task_candidates
(
&
self
,
task_type
:
&
CachedTaskType
)
->
Result
<
SmallVec
<
[
TaskId
;
1
]
>>
{
let
inner
=
&*
self
.inner
;
if
self
.inner.database
.is_empty
()
{
if
inner
.database
.is_empty
()
{
// Checking if the database is empty is a performance optimization
// Checking if the database is empty is a performance optimization
// to avoid computing the hash.
// to avoid computing the hash.
return
Ok
(
SmallVec
::
new
());
return
Ok
(
SmallVec
::
new
());
}
}
let
hash
=
compute_task_type_hash
(
task_type
);
let
hash
=
compute_task_type_hash
(
task_type
);
let
buffers
=
inner
let
buffers
=
self
.inner
.database
.database
.get_multiple
(
KeySpace
::
TaskCache
,
&
hash
.to_le_bytes
())
.get_multiple
(
KeySpace
::
TaskCache
,
&
hash
.to_le_bytes
())
.with_context
(||
{
.with_context
(||
{
...
@@ -314,7 +307,7 @@ impl<T: KeyValueDatabase + Send + Sync + 'static> BackingStorageSealed
...
@@ -314,7 +307,7 @@ impl<T: KeyValueDatabase + Send + Sync + 'static> BackingStorageSealed
let
mut
task_ids
=
SmallVec
::
with_capacity
(
buffers
.len
());
let
mut
task_ids
=
SmallVec
::
with_capacity
(
buffers
.len
());
for
bytes
in
buffers
{
for
bytes
in
buffers
{
let
bytes
=
bytes
.borrow
(
)
.try_into
()
?
;
let
bytes
=
(
*
bytes
)
.try_into
()
?
;
let
id
=
TaskId
::
try_from
(
u32
::
from_le_bytes
(
bytes
))
.unwrap
();
let
id
=
TaskId
::
try_from
(
u32
::
from_le_bytes
(
bytes
))
.unwrap
();
task_ids
.push
(
id
);
task_ids
.push
(
id
);
}
}
...
@@ -325,22 +318,11 @@ impl<T: KeyValueDatabase + Send + Sync + 'static> BackingStorageSealed
...
@@ -325,22 +318,11 @@ impl<T: KeyValueDatabase + Send + Sync + 'static> BackingStorageSealed
&
self
,
&
self
,
task_id
:
TaskId
,
task_id
:
TaskId
,
category
:
SpecificTaskDataCategory
,
category
:
SpecificTaskDataCategory
,
storage
:
&
mut
TaskStorage
,
)
->
Result
<
Option
<
ArcBytes
>>
{
)
->
Result
<
()
>
{
self
.inner
let
inner
=
&*
self
.inner
;
let
Some
(
bytes
)
=
inner
.database
.database
.get
(
category
.key_space
(),
IntKey
::
new
(
*
task_id
)
.as_ref
())
.get
(
category
.key_space
(),
IntKey
::
new
(
*
task_id
)
.as_ref
())
.with_context
(||
{
.with_context
(||
format!
(
"Looking up task storage for {task_id} from database failed"
))
format!
(
"Looking up task storage for {task_id} from database failed"
)
})
?
else
{
return
Ok
(());
};
let
mut
decoder
=
new_turbo_bincode_decoder
(
bytes
.borrow
());
storage
.decode
(
category
,
&
mut
decoder
)
.map_err
(|
e
|
anyhow
::
anyhow!
(
"Failed to decode {category:?}: {e:?}"
))
}
}
fn
batch_lookup_data
(
fn
batch_lookup_data
(
...
@@ -349,10 +331,9 @@ impl<T: KeyValueDatabase + Send + Sync + 'static> BackingStorageSealed
...
@@ -349,10 +331,9 @@ impl<T: KeyValueDatabase + Send + Sync + 'static> BackingStorageSealed
category
:
SpecificTaskDataCategory
,
category
:
SpecificTaskDataCategory
,
callback
:
&
mut
dyn
FnMut
(
usize
,
Option
<&
[
u8
]
>
),
callback
:
&
mut
dyn
FnMut
(
usize
,
Option
<&
[
u8
]
>
),
)
->
Result
<
()
>
{
)
->
Result
<
()
>
{
let
inner
=
&*
self
.inner
;
let
int_keys
:
Vec
<
_
>
=
task_ids
.iter
()
.map
(|
&
id
|
IntKey
::
new
(
*
id
))
.collect
();
let
int_keys
:
Vec
<
_
>
=
task_ids
.iter
()
.map
(|
&
id
|
IntKey
::
new
(
*
id
))
.collect
();
let
keys
=
int_keys
.iter
()
.map
(|
k
|
k
.as_ref
())
.collect
::
<
Vec
<
_
>>
();
let
keys
=
int_keys
.iter
()
.map
(|
k
|
k
.as_ref
())
.collect
::
<
Vec
<
_
>>
();
inner
self
.
inner
.database
.database
.batch_get_with
(
category
.key_space
(),
&
keys
,
|
index
,
opt_bytes
|
{
.batch_get_with
(
category
.key_space
(),
&
keys
,
|
index
,
opt_bytes
|
{
callback
(
index
,
opt_bytes
);
callback
(
index
,
opt_bytes
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment