Commit d0ac1ecd authored by Benjamin Woodruff's avatar Benjamin Woodruff

Refactor ResolveResult and ModuleResolveResult to use indexed deduplicated arrays

Replace the flat `Box<[(RequestKey, Item)]>` primary field with three separate
arrays: `primary: Box<[(u32, u32)]>` for indices, `keys: Box<[RequestKey]>` for
deduplicated request keys, and `resolve_results`/`module_results` for deduplicated
items. This reduces memory usage when multiple primary entries share keys or items,
and enables key-only transforms (with_request, with_conditions, etc.) to share the
items array without cloning.

Adds accessor methods (primary_iter, primary_len, primary_first, etc.) and
from_pairs/map_keys_mut constructors to encapsulate the indexed representation.
Co-Authored-By: 's avatarClaude <noreply@anthropic.com>
parent cc79ef8c
...@@ -287,7 +287,7 @@ impl ReferencedAsset { ...@@ -287,7 +287,7 @@ impl ReferencedAsset {
if result.is_unresolvable_ref() { if result.is_unresolvable_ref() {
return Ok(ReferencedAsset::Unresolvable.cell()); return Ok(ReferencedAsset::Unresolvable.cell());
} }
for (_, result) in result.primary.iter() { for (_, result) in result.primary_iter() {
match result { match result {
ModuleResolveResultItem::External { ModuleResolveResultItem::External {
name: request, ty, .. name: request, ty, ..
...@@ -456,10 +456,10 @@ impl ModuleReference for EsmAssetReference { ...@@ -456,10 +456,10 @@ impl ModuleReference for EsmAssetReference {
if let Some(ModulePart::Evaluation) = &self.export_name if let Some(ModulePart::Evaluation) = &self.export_name
&& *self.module.side_effects().await? == ModuleSideEffects::SideEffectFree && *self.module.side_effects().await? == ModuleSideEffects::SideEffectFree
{ {
return Ok(ModuleResolveResult { return Ok(ModuleResolveResult::from_pairs(
primary: Box::new([(RequestKey::default(), ModuleResolveResultItem::Ignore)]), [(RequestKey::default(), ModuleResolveResultItem::Ignore)],
affecting_sources: Default::default(), Default::default(),
} )
.cell()); .cell());
} }
......
...@@ -401,13 +401,13 @@ impl PatternMapping { ...@@ -401,13 +401,13 @@ impl PatternMapping {
resolve_type: ResolveType, resolve_type: ResolveType,
) -> Result<Vc<PatternMapping>> { ) -> Result<Vc<PatternMapping>> {
let result = resolve_result.await?; let result = resolve_result.await?;
match result.primary.len() { match result.primary_len() {
0 => Ok(PatternMapping::Single(SinglePatternMapping::Unresolvable( 0 => Ok(PatternMapping::Single(SinglePatternMapping::Unresolvable(
request_to_string(request).await?.to_string(), request_to_string(request).await?.to_string(),
)) ))
.cell()), .cell()),
1 if !request.request_pattern().await?.has_dynamic_parts() => { 1 if !request.request_pattern().await?.has_dynamic_parts() => {
let resolve_item = &result.primary.first().unwrap().1; let resolve_item = &result.primary_first().unwrap().1;
let single_pattern_mapping = let single_pattern_mapping =
to_single_pattern_mapping(origin, chunking_context, resolve_item, resolve_type) to_single_pattern_mapping(origin, chunking_context, resolve_item, resolve_type)
.await?; .await?;
...@@ -416,8 +416,7 @@ impl PatternMapping { ...@@ -416,8 +416,7 @@ impl PatternMapping {
_ => { _ => {
let mut set = HashSet::new(); let mut set = HashSet::new();
let map = result let map = result
.primary .primary_iter()
.iter()
.filter_map(|(k, v)| { .filter_map(|(k, v)| {
let request = k.request.as_ref()?; let request = k.request.as_ref()?;
set.insert(request).then(|| (request.to_string(), v)) set.insert(request).then(|| (request.to_string(), v))
......
...@@ -76,7 +76,7 @@ pub async fn check_and_emit_too_many_matches_warning( ...@@ -76,7 +76,7 @@ pub async fn check_and_emit_too_many_matches_warning(
context_dir: FileSystemPath, context_dir: FileSystemPath,
pattern: ResolvedVc<Pattern>, pattern: ResolvedVc<Pattern>,
) -> Result<()> { ) -> Result<()> {
let num_matches = result.await?.primary.len(); let num_matches = result.await?.primary_len();
if num_matches > TOO_MANY_MATCHES_LIMIT { if num_matches > TOO_MANY_MATCHES_LIMIT {
TooManyMatchesWarning { TooManyMatchesWarning {
source: issue_source, source: issue_source,
......
...@@ -173,9 +173,9 @@ impl ModuleReference for WorkerAssetReference { ...@@ -173,9 +173,9 @@ impl ModuleReference for WorkerAssetReference {
// Wrap each resolved module in a WorkerLoaderModule // Wrap each resolved module in a WorkerLoaderModule
let result_ref = result.await?; let result_ref = result.await?;
let mut primary = Vec::with_capacity(result_ref.primary.len()); let mut primary = Vec::with_capacity(result_ref.primary_len());
for (request_key, resolve_item) in result_ref.primary.iter() { for (request_key, resolve_item) in result_ref.primary_iter() {
match resolve_item { match resolve_item {
ModuleResolveResultItem::Module(module) => { ModuleResolveResultItem::Module(module) => {
let Some(chunkable) = let Some(chunkable) =
...@@ -249,11 +249,7 @@ impl ModuleReference for WorkerAssetReference { ...@@ -249,11 +249,7 @@ impl ModuleReference for WorkerAssetReference {
} }
} }
Ok(ModuleResolveResult { Ok(ModuleResolveResult::from_pairs(primary, result_ref.affecting_sources.clone()).cell())
primary: primary.into_boxed_slice(),
affecting_sources: result_ref.affecting_sources.clone(),
}
.cell())
} }
fn chunking_type(&self) -> Option<ChunkingType> { fn chunking_type(&self) -> Option<ChunkingType> {
......
...@@ -295,7 +295,7 @@ async fn resolve_node_gyp_build_files( ...@@ -295,7 +295,7 @@ async fn resolve_node_gyp_build_files(
) )
.await?; .await?;
if let Some((_, ResolveResultItem::Source(source))) = if let Some((_, ResolveResultItem::Source(source))) =
resolved_prebuilt_file.primary.first() resolved_prebuilt_file.primary_first()
{ {
resolved.insert(format!("build/Release/{name}.node").into(), *source); resolved.insert(format!("build/Release/{name}.node").into(), *source);
if collect_affecting_sources { if collect_affecting_sources {
......
use std::mem::take;
use anyhow::Result; use anyhow::Result;
use serde_json::Value as JsonValue; use serde_json::Value as JsonValue;
use turbo_rcstr::{RcStr, rcstr}; use turbo_rcstr::{RcStr, rcstr};
...@@ -465,17 +463,10 @@ pub async fn type_resolve( ...@@ -465,17 +463,10 @@ pub async fn type_resolve(
#[turbo_tasks::function] #[turbo_tasks::function]
pub async fn as_typings_result(result: Vc<ModuleResolveResult>) -> Result<Vc<ModuleResolveResult>> { pub async fn as_typings_result(result: Vc<ModuleResolveResult>) -> Result<Vc<ModuleResolveResult>> {
let mut result = result.owned().await?; let mut result = result.owned().await?;
result.primary = IntoIterator::into_iter(take(&mut result.primary)) result.map_keys_mut(|k| RequestKey {
.map(|(k, v)| { request: k.request.clone(),
( conditions: k.conditions.extend([(rcstr!("types"), true)]),
RequestKey { });
request: k.request.clone(),
conditions: k.conditions.extend([(rcstr!("types"), true)]),
},
v,
)
})
.collect();
Ok(result.cell()) Ok(result.cell())
} }
......
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