github/codex
4
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-10-21 07:42:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid repeated table clones during config merging (#47902)

Browse Source 
## Why

Recursive config merging clones overlay tables at each nesting level, repeatedly copying their descendants.

## What changed

Clone the overlay at the `merge_toml_values` entry point and pass owned values through recursive merges. Normalize overlay tables in place, preserving the public API and existing merge semantics.

GitOrigin-RevId: 05e66648e37d571566b3d119bd3aab3924fb0c74
This commit is contained in:
Ian MacLeod
2026-09-24 18:08:57 +00:00
committed by copyberry
parent 2347a61d0d
commit 975d30c043
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
codex-rs/config/src/merge.rs
+8 -9
View File
@@ -55,7 +55,7 @@ impl ShellEnvironmentPolicyFilterRepresentation {
/// Merge config `overlay` into `base`, giving `overlay` precedence.
pub fn merge_toml_values(base: &mut TomlValue, overlay: &TomlValue) {
merge_toml_values_at_path(base, overlay, &mut Vec::new());
merge_toml_values_at_path(base, overlay.clone(), &mut Vec::new());
}
pub fn is_structured_feature_path<S: AsRef<str>>(path: &[S]) -> bool {
@@ -72,8 +72,8 @@ pub fn is_structured_feature_path<S: AsRef<str>>(path: &[S]) -> bool {
)
}
fn merge_toml_values_at_path(base: &mut TomlValue, overlay: &TomlValue, path: &mut Vec<String>) {
replace_shell_environment_policy_filter_representation(base, overlay, path);
fn merge_toml_values_at_path(base: &mut TomlValue, overlay: TomlValue, path: &mut Vec<String>) {
replace_shell_environment_policy_filter_representation(base, &overlay, path);
if is_structured_feature_path(path) {
if let TomlValue::Boolean(enabled) = base
@@ -86,16 +86,15 @@ fn merge_toml_values_at_path(base: &mut TomlValue, overlay: &TomlValue, path: &m
} else if let TomlValue::Table(table) = base
&& let TomlValue::Boolean(enabled) = overlay
{
table.insert("enabled".to_string(), TomlValue::Boolean(*enabled));
table.insert("enabled".to_string(), TomlValue::Boolean(enabled));
return;
}
}
if let TomlValue::Table(overlay_table) = overlay
&& let TomlValue::Table(base_table) = base
if let TomlValue::Table(base_table) = &mut *base
&& let TomlValue::Table(mut overlay_table) = overlay
{
normalize_key_aliases(path, base_table);
let mut overlay_table = overlay_table.clone();
normalize_key_aliases(path, &mut overlay_table);
if is_network_domains_path(path) {
normalize_network_domain_keys(base_table);
@@ -140,14 +139,14 @@ fn merge_toml_values_at_path(base: &mut TomlValue, overlay: &TomlValue, path: &m
for (key, value) in overlay_table {
path.push(key.clone());
if let Some(existing) = base_table.get_mut(&key) {
merge_toml_values_at_path(existing, &value, path);
merge_toml_values_at_path(existing, value, path);
} else {
base_table.insert(key, normalized_with_key_aliases(&value, path));
}
path.pop();
}
} else {
*base = normalized_with_key_aliases(overlay, path);
*base = normalized_with_key_aliases(&overlay, path);
}
}