Commit de4b62b3 authored by Luke Sandberg's avatar Luke Sandberg

Fix builder dedup collapsing key-free results under shared default key

When resolve_raw_without_keys returns multiple matches (e.g. wildcard
patterns), each match is a separate key-free ResolveResult. Merging
these via alternatives() converted each to a ResolveResultBuilder, where
all values shared the same default RequestKey, causing all but the first
to be silently dropped.

Fix by tracking key-free values separately in the builder so they are
never subject to key-based deduplication.
parent 54dd30f6
...@@ -373,38 +373,71 @@ impl ModuleResolveResult { ...@@ -373,38 +373,71 @@ impl ModuleResolveResult {
pub struct ModuleResolveResultBuilder { pub struct ModuleResolveResultBuilder {
pub primary: FxIndexMap<RequestKey, ModuleResolveResultItem>, pub primary: FxIndexMap<RequestKey, ModuleResolveResultItem>,
/// Values from key-free results (where `primary_keys` was empty). Kept
/// separate so that key-based deduplication in `primary` does not
/// incorrectly collapse multiple key-free entries onto the same default
/// key.
pub key_free_values: Vec<ModuleResolveResultItem>,
pub affecting_sources: Vec<ResolvedVc<Box<dyn Source>>>, pub affecting_sources: Vec<ResolvedVc<Box<dyn Source>>>,
} }
impl From<ModuleResolveResultBuilder> for ModuleResolveResult { impl From<ModuleResolveResultBuilder> for ModuleResolveResult {
fn from(v: ModuleResolveResultBuilder) -> Self { fn from(v: ModuleResolveResultBuilder) -> Self {
let (keys, values): (Vec<_>, Vec<_>) = v.primary.into_iter().unzip(); if v.primary.is_empty() {
ModuleResolveResult { // All values came from key-free results — preserve the "no keys" invariant.
primary_keys: keys.into_boxed_slice(), ModuleResolveResult {
primary_values: values.into_boxed_slice(), primary_keys: Box::default(),
affecting_sources: v.affecting_sources.into_boxed_slice(), primary_values: v.key_free_values.into_boxed_slice(),
affecting_sources: v.affecting_sources.into_boxed_slice(),
}
} else {
let (mut keys, mut values): (Vec<_>, Vec<_>) = v.primary.into_iter().unzip();
// Append any key-free values with a default key so they are not
// silently dropped when mixing keyed and key-free results.
for value in v.key_free_values {
keys.push(RequestKey::default());
values.push(value);
}
ModuleResolveResult {
primary_keys: keys.into_boxed_slice(),
primary_values: values.into_boxed_slice(),
affecting_sources: v.affecting_sources.into_boxed_slice(),
}
} }
} }
} }
impl From<ModuleResolveResult> for ModuleResolveResultBuilder { impl From<ModuleResolveResult> for ModuleResolveResultBuilder {
fn from(v: ModuleResolveResult) -> Self { fn from(v: ModuleResolveResult) -> Self {
ModuleResolveResultBuilder { if v.primary_keys.is_empty() {
primary: v // Key-free result: put values into key_free_values to avoid
.primary_keys // collapsing them under a shared default key.
.into_iter() ModuleResolveResultBuilder {
.zip(v.primary_values.into_iter()) primary: FxIndexMap::default(),
.collect(), key_free_values: v.primary_values.into_vec(),
affecting_sources: v.affecting_sources.into_vec(), affecting_sources: v.affecting_sources.into_vec(),
}
} else {
ModuleResolveResultBuilder {
primary: v.primary_keys.into_iter().zip(v.primary_values).collect(),
key_free_values: Vec::new(),
affecting_sources: v.affecting_sources.into_vec(),
}
} }
} }
} }
impl ModuleResolveResultBuilder { impl ModuleResolveResultBuilder {
pub fn merge_alternatives(&mut self, other: &ModuleResolveResult) { pub fn merge_alternatives(&mut self, other: &ModuleResolveResult) {
for (key, value) in other.iter_primary() { if other.has_keys() {
let key = key.cloned().unwrap_or_default(); for (key, value) in other.iter_primary() {
if !self.primary.contains_key(&key) { let key = key.cloned().unwrap_or_default();
self.primary.insert(key, value.clone()); if !self.primary.contains_key(&key) {
self.primary.insert(key, value.clone());
}
} }
} else {
// Key-free result: append all values without key-based deduplication.
self.key_free_values
.extend(other.primary_values.iter().cloned());
} }
let set = self let set = self
.affecting_sources .affecting_sources
...@@ -695,18 +728,6 @@ impl ValueToString for ResolveResult { ...@@ -695,18 +728,6 @@ impl ValueToString for ResolveResult {
} }
impl ResolveResult { impl ResolveResult {
fn from_keyed(
keyed: impl IntoIterator<Item = (RequestKey, ResolveResultItem)>,
affecting_sources: Box<[ResolvedVc<Box<dyn Source>>]>,
) -> Self {
let (keys, values): (Vec<_>, Vec<_>) = keyed.into_iter().unzip();
ResolveResult {
primary_keys: keys.into_boxed_slice(),
primary_values: values.into_boxed_slice(),
affecting_sources,
}
}
pub fn unresolvable() -> Self { pub fn unresolvable() -> Self {
ResolveResult { ResolveResult {
primary_keys: Default::default(), primary_keys: Default::default(),
...@@ -954,38 +975,71 @@ impl ResolveResult { ...@@ -954,38 +975,71 @@ impl ResolveResult {
struct ResolveResultBuilder { struct ResolveResultBuilder {
primary: FxIndexMap<RequestKey, ResolveResultItem>, primary: FxIndexMap<RequestKey, ResolveResultItem>,
/// Values from key-free results (where `primary_keys` was empty). Kept
/// separate so that key-based deduplication in `primary` does not
/// incorrectly collapse multiple key-free entries onto the same default
/// key.
key_free_values: Vec<ResolveResultItem>,
affecting_sources: Vec<ResolvedVc<Box<dyn Source>>>, affecting_sources: Vec<ResolvedVc<Box<dyn Source>>>,
} }
impl From<ResolveResultBuilder> for ResolveResult { impl From<ResolveResultBuilder> for ResolveResult {
fn from(v: ResolveResultBuilder) -> Self { fn from(v: ResolveResultBuilder) -> Self {
let (keys, values): (Vec<_>, Vec<_>) = v.primary.into_iter().unzip(); if v.primary.is_empty() {
ResolveResult { // All values came from key-free results — preserve the "no keys" invariant.
primary_keys: keys.into_boxed_slice(), ResolveResult {
primary_values: values.into_boxed_slice(), primary_keys: Box::default(),
affecting_sources: v.affecting_sources.into_boxed_slice(), primary_values: v.key_free_values.into_boxed_slice(),
affecting_sources: v.affecting_sources.into_boxed_slice(),
}
} else {
let (mut keys, mut values): (Vec<_>, Vec<_>) = v.primary.into_iter().unzip();
// Append any key-free values with a default key so they are not
// silently dropped when mixing keyed and key-free results.
for value in v.key_free_values {
keys.push(RequestKey::default());
values.push(value);
}
ResolveResult {
primary_keys: keys.into_boxed_slice(),
primary_values: values.into_boxed_slice(),
affecting_sources: v.affecting_sources.into_boxed_slice(),
}
} }
} }
} }
impl From<ResolveResult> for ResolveResultBuilder { impl From<ResolveResult> for ResolveResultBuilder {
fn from(v: ResolveResult) -> Self { fn from(v: ResolveResult) -> Self {
ResolveResultBuilder { if v.primary_keys.is_empty() {
primary: v // Key-free result: put values into key_free_values to avoid
.primary_keys // collapsing them under a shared default key.
.into_iter() ResolveResultBuilder {
.zip(v.primary_values.into_iter()) primary: FxIndexMap::default(),
.collect(), key_free_values: v.primary_values.into_vec(),
affecting_sources: v.affecting_sources.into_vec(), affecting_sources: v.affecting_sources.into_vec(),
}
} else {
ResolveResultBuilder {
primary: v.primary_keys.into_iter().zip(v.primary_values).collect(),
key_free_values: Vec::new(),
affecting_sources: v.affecting_sources.into_vec(),
}
} }
} }
} }
impl ResolveResultBuilder { impl ResolveResultBuilder {
pub fn merge_alternatives(&mut self, other: &ResolveResult) { pub fn merge_alternatives(&mut self, other: &ResolveResult) {
for (key, value) in other.iter_primary() { if other.has_keys() {
let key = key.cloned().unwrap_or_default(); for (key, value) in other.iter_primary() {
if !self.primary.contains_key(&key) { let key = key.cloned().unwrap_or_default();
self.primary.insert(key, value.clone()); if !self.primary.contains_key(&key) {
self.primary.insert(key, value.clone());
}
} }
} else {
// Key-free result: append all values without key-based deduplication.
self.key_free_values
.extend(other.primary_values.iter().cloned());
} }
let set = self let set = self
.affecting_sources .affecting_sources
......
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