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
50f5fbea
Unverified
Commit
50f5fbea
authored
Nov 03, 2025
by
Tobias Koppers
Committed by
GitHub
Nov 03, 2025
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Turbopack: add a batch add method to the storage (#84270)
### What? Makes adding multiple items at once more efficient.
parent
763c1f49
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
129 additions
and
2 deletions
+129
-2
dynamic_storage.rs
...crates/turbo-tasks-backend/src/backend/dynamic_storage.rs
+13
-0
mod.rs
...k/crates/turbo-tasks-backend/src/backend/operation/mod.rs
+57
-2
storage.rs
turbopack/crates/turbo-tasks-backend/src/backend/storage.rs
+36
-0
data_storage.rs
turbopack/crates/turbo-tasks-backend/src/data_storage.rs
+23
-0
No files found.
turbopack/crates/turbo-tasks-backend/src/backend/dynamic_storage.rs
View file @
50f5fbea
...
@@ -58,6 +58,19 @@ impl DynamicStorage {
...
@@ -58,6 +58,19 @@ impl DynamicStorage {
self
.get_or_create_map_mut
(
ty
)
.add
(
item
)
self
.get_or_create_map_mut
(
ty
)
.add
(
item
)
}
}
pub
fn
extend
(
&
mut
self
,
ty
:
CachedDataItemType
,
item
:
impl
Iterator
<
Item
=
CachedDataItem
>
,
)
->
bool
{
let
map
=
self
.get_or_create_map_mut
(
ty
);
let
mut
added
=
true
;
for
item
in
item
{
added
=
map
.add
(
item
)
&&
added
;
}
added
}
pub
fn
insert
(
&
mut
self
,
item
:
CachedDataItem
)
->
Option
<
CachedDataItemValue
>
{
pub
fn
insert
(
&
mut
self
,
item
:
CachedDataItem
)
->
Option
<
CachedDataItemValue
>
{
let
ty
=
item
.ty
();
let
ty
=
item
.ty
();
self
.get_or_create_map_mut
(
ty
)
.insert
(
item
)
self
.get_or_create_map_mut
(
ty
)
.insert
(
item
)
...
...
turbopack/crates/turbo-tasks-backend/src/backend/operation/mod.rs
View file @
50f5fbea
...
@@ -364,9 +364,26 @@ impl<'e, B: BackingStorage> ChildExecuteContext<'e> for ChildExecuteContextImpl<
...
@@ -364,9 +364,26 @@ impl<'e, B: BackingStorage> ChildExecuteContext<'e> for ChildExecuteContextImpl<
pub
trait
TaskGuard
:
Debug
{
pub
trait
TaskGuard
:
Debug
{
fn
id
(
&
self
)
->
TaskId
;
fn
id
(
&
self
)
->
TaskId
;
/// Adds a new item to the task if the key is not already present.
/// Returns `true` if the item was added.
/// Returns `false` if an item with the same key was already present.
#[must_use]
#[must_use]
fn
add
(
&
mut
self
,
item
:
CachedDataItem
)
->
bool
;
fn
add
(
&
mut
self
,
item
:
CachedDataItem
)
->
bool
;
/// Adds a new item to the task. The key must not be already present.
/// Might panic if the key is already present.
fn
add_new
(
&
mut
self
,
item
:
CachedDataItem
);
fn
add_new
(
&
mut
self
,
item
:
CachedDataItem
);
/// Extends the task with items from the iterator.
/// Overwrites existing keys.
/// Returns `true` if all items were new and added.
/// Returns `false` if any item had a key that was already present.
fn
extend
(
&
mut
self
,
ty
:
CachedDataItemType
,
items
:
impl
Iterator
<
Item
=
CachedDataItem
>
,
)
->
bool
;
/// Extends the task with items from the iterator.
/// Might panic if any item has a key that is already present.
fn
extend_new
(
&
mut
self
,
ty
:
CachedDataItemType
,
items
:
impl
Iterator
<
Item
=
CachedDataItem
>
);
fn
insert
(
&
mut
self
,
item
:
CachedDataItem
)
->
Option
<
CachedDataItemValue
>
;
fn
insert
(
&
mut
self
,
item
:
CachedDataItem
)
->
Option
<
CachedDataItemValue
>
;
fn
update
(
fn
update
(
&
mut
self
,
&
mut
self
,
...
@@ -489,11 +506,49 @@ impl<B: BackingStorage> TaskGuard for TaskGuardImpl<'_, B> {
...
@@ -489,11 +506,49 @@ impl<B: BackingStorage> TaskGuard for TaskGuardImpl<'_, B> {
#[track_caller]
#[track_caller]
fn
add_new
(
&
mut
self
,
item
:
CachedDataItem
)
{
fn
add_new
(
&
mut
self
,
item
:
CachedDataItem
)
{
self
.check_access
(
item
.category
());
let
category
=
item
.category
();
let
added
=
self
.add
(
item
);
self
.check_access
(
category
);
if
!
self
.task_id
.is_transient
()
&&
item
.is_persistent
()
{
self
.task
.track_modification
(
category
.into_specific
());
}
let
added
=
self
.task
.add
(
item
);
assert
!
(
added
,
"Item already exists"
);
assert
!
(
added
,
"Item already exists"
);
}
}
#[track_caller]
fn
extend
(
&
mut
self
,
ty
:
CachedDataItemType
,
items
:
impl
Iterator
<
Item
=
CachedDataItem
>
,
)
->
bool
{
let
category
=
ty
.category
();
self
.check_access
(
category
);
if
!
self
.task_id
.is_transient
()
&&
ty
.is_persistent
()
{
let
mut
items
=
items
.peekable
();
// Check if the iterator is empty
if
items
.peek
()
.is_none
()
{
return
true
;
}
// TODO this is not optimal as we always track a modification even if nothing is changed
self
.task
.track_modification
(
category
.into_specific
());
self
.task
.extend
(
ty
,
items
)
}
else
{
self
.task
.extend
(
ty
,
items
)
}
}
#[track_caller]
fn
extend_new
(
&
mut
self
,
ty
:
CachedDataItemType
,
items
:
impl
Iterator
<
Item
=
CachedDataItem
>
)
{
let
category
=
ty
.category
();
self
.check_access
(
category
);
if
!
self
.task_id
.is_transient
()
&&
ty
.is_persistent
()
{
self
.task
.track_modification
(
category
.into_specific
());
}
let
added
=
self
.task
.extend
(
ty
,
items
);
assert
!
(
added
,
"At least one item already exists"
);
}
#[track_caller]
#[track_caller]
fn
insert
(
&
mut
self
,
item
:
CachedDataItem
)
->
Option
<
CachedDataItemValue
>
{
fn
insert
(
&
mut
self
,
item
:
CachedDataItem
)
->
Option
<
CachedDataItemValue
>
{
let
category
=
item
.category
();
let
category
=
item
.category
();
...
...
turbopack/crates/turbo-tasks-backend/src/backend/storage.rs
View file @
50f5fbea
...
@@ -317,6 +317,36 @@ macro_rules! generate_inner_storage_internal {
...
@@ -317,6 +317,36 @@ macro_rules! generate_inner_storage_internal {
$crate
::
generate_inner_storage_internal!
(
update
:
$self
,
$key
,
$update
:
$
(
$config
)
+
)
$crate
::
generate_inner_storage_internal!
(
update
:
$self
,
$key
,
$update
:
$
(
$config
)
+
)
};
};
// fn extend
(
extend
:
$self:ident
,
$ty:ident
,
$items:ident
:
$tag:ident
$key_field:ident
=>
$field:ident
,)
=>
{
if
let
CachedDataItemType
::
$tag
=
$ty
{
return
$self
.
$field
.extend
(
$items
.map
(|
item
|
{
let
pair
=
turbo_tasks
::
KeyValuePair
::
into_key_and_value
(
item
);
if
let
(
CachedDataItemKey
::
$tag
{
$key_field
},
CachedDataItemValue
::
$tag
{
value
})
=
pair
{
(
$key_field
,
value
)
}
else
{
unreachable!
()
}
}));
}
};
(
extend
:
$self:ident
,
$ty:ident
,
$items:ident
:
$tag:ident
=>
$field:ident
,)
=>
{
if
let
CachedDataItemType
::
$tag
=
$ty
{
return
$self
.
$field
.extend
(
$items
.map
(|
item
|
{
let
pair
=
turbo_tasks
::
KeyValuePair
::
into_key_and_value
(
item
);
if
let
(
_
,
CachedDataItemValue
::
$tag
{
value
})
=
pair
{
((),
value
)
}
else
{
unreachable!
()
}
}));
}
};
(
extend
:
$self:ident
,
$ty:ident
,
$items:ident
:
$tag:ident
$
(
$key_field:ident
)
?
=>
$field:ident
,
$
(
$config:tt
)
+
)
=>
{
$crate
::
generate_inner_storage_internal!
(
extend
:
$self
,
$ty
,
$items
:
$tag
$
(
$key_field
)
?
=>
$field
,);
$crate
::
generate_inner_storage_internal!
(
extend
:
$self
,
$ty
,
$items
:
$
(
$config
)
+
)
};
// fn get_mut_or_insert_with
// fn get_mut_or_insert_with
(
get_mut_or_insert_with
:
$self:ident
,
$key:ident
,
$insert_with:ident
:
$tag:ident
$key_field:ident
=>
$field:ident
,)
=>
{
(
get_mut_or_insert_with
:
$self:ident
,
$key:ident
,
$insert_with:ident
:
$tag:ident
$key_field:ident
=>
$field:ident
,)
=>
{
if
let
CachedDataItemKey
::
$tag
{
$key_field
}
=
$key
{
if
let
CachedDataItemKey
::
$tag
{
$key_field
}
=
$key
{
...
@@ -426,6 +456,12 @@ macro_rules! generate_inner_storage {
...
@@ -426,6 +456,12 @@ macro_rules! generate_inner_storage {
self
.dynamic
.add
(
item
)
self
.dynamic
.add
(
item
)
}
}
pub
fn
extend
(
&
mut
self
,
ty
:
CachedDataItemType
,
items
:
impl
Iterator
<
Item
=
CachedDataItem
>
)
->
bool
{
use
crate
::
data_storage
::
Storage
;
$crate
::
generate_inner_storage_internal!
(
extend
:
self
,
ty
,
items
:
$
(
$config
)
*
);
self
.dynamic
.extend
(
ty
,
items
)
}
pub
fn
insert
(
&
mut
self
,
item
:
CachedDataItem
)
->
Option
<
CachedDataItemValue
>
{
pub
fn
insert
(
&
mut
self
,
item
:
CachedDataItem
)
->
Option
<
CachedDataItemValue
>
{
use
crate
::
data_storage
::
Storage
;
use
crate
::
data_storage
::
Storage
;
$crate
::
generate_inner_storage_internal!
(
CachedDataItem
:
self
,
item
,
value
,
option_value
,
insert
(
value
):
$
(
$config
)
*
);
$crate
::
generate_inner_storage_internal!
(
CachedDataItem
:
self
,
item
,
value
,
option_value
,
insert
(
value
):
$
(
$config
)
*
);
...
...
turbopack/crates/turbo-tasks-backend/src/data_storage.rs
View file @
50f5fbea
...
@@ -10,7 +10,15 @@ pub trait Storage {
...
@@ -10,7 +10,15 @@ pub trait Storage {
where
where
Self
:
'l
;
Self
:
'l
;
/// Adds a key-value pair to the storage, if the key is not already present.
/// Returns `true` if the key was not present and the value was added.
/// Returns `false` if the key was already present.
fn
add
(
&
mut
self
,
key
:
Self
::
K
,
value
:
Self
::
V
)
->
bool
;
fn
add
(
&
mut
self
,
key
:
Self
::
K
,
value
:
Self
::
V
)
->
bool
;
/// Extends the storage with key-value pairs from the iterator.
/// Overwrites existing keys.
/// Returns `true` if all keys were new and added.
/// Returns `false` if any key was already present.
fn
extend
(
&
mut
self
,
items
:
impl
Iterator
<
Item
=
(
Self
::
K
,
Self
::
V
)
>
)
->
bool
;
fn
insert
(
&
mut
self
,
key
:
Self
::
K
,
value
:
Self
::
V
)
->
Option
<
Self
::
V
>
;
fn
insert
(
&
mut
self
,
key
:
Self
::
K
,
value
:
Self
::
V
)
->
Option
<
Self
::
V
>
;
fn
remove
(
&
mut
self
,
key
:
&
Self
::
K
)
->
Option
<
Self
::
V
>
;
fn
remove
(
&
mut
self
,
key
:
&
Self
::
K
)
->
Option
<
Self
::
V
>
;
fn
contains_key
(
&
self
,
key
:
&
Self
::
K
)
->
bool
;
fn
contains_key
(
&
self
,
key
:
&
Self
::
K
)
->
bool
;
...
@@ -60,6 +68,14 @@ impl<V> Storage for OptionStorage<V> {
...
@@ -60,6 +68,14 @@ impl<V> Storage for OptionStorage<V> {
}
}
}
}
fn
extend
(
&
mut
self
,
items
:
impl
Iterator
<
Item
=
(
Self
::
K
,
Self
::
V
)
>
)
->
bool
{
let
mut
added
=
true
;
for
(
_
,
value
)
in
items
{
added
=
self
.insert
((),
value
)
.is_none
()
&&
added
;
}
added
}
fn
insert
(
&
mut
self
,
_
:
(),
value
:
V
)
->
Option
<
V
>
{
fn
insert
(
&
mut
self
,
_
:
(),
value
:
V
)
->
Option
<
V
>
{
self
.value
.replace
(
value
)
self
.value
.replace
(
value
)
}
}
...
@@ -148,6 +164,13 @@ impl<K: Hash + Eq, V> Storage for AutoMapStorage<K, V> {
...
@@ -148,6 +164,13 @@ impl<K: Hash + Eq, V> Storage for AutoMapStorage<K, V> {
}
}
}
}
fn
extend
(
&
mut
self
,
items
:
impl
Iterator
<
Item
=
(
Self
::
K
,
Self
::
V
)
>
)
->
bool
{
let
len
=
self
.map
.len
();
let
mut
count
=
0
;
self
.map
.extend
(
items
.inspect
(|
_
|
count
+=
1
));
self
.map
.len
()
==
len
+
count
}
fn
insert
(
&
mut
self
,
key
:
K
,
value
:
V
)
->
Option
<
V
>
{
fn
insert
(
&
mut
self
,
key
:
K
,
value
:
V
)
->
Option
<
V
>
{
self
.map
.insert
(
key
,
value
)
self
.map
.insert
(
key
,
value
)
}
}
...
...
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