github-repos/config
1
0
Fork 0
mirror of https://github.com/lightbend/config.git synced 2025-03-19 22:00:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Optimize no-op object merges by throwing away the new HashMap and using the old one

Browse Source 
One side effect of this is that if an object merge does nothing, the ConfigOrigin
for the fallback is discarded instead of merged in, but I think that's OK.
This commit is contained in:
Havoc Pennington 2011-11-29 10:02:26 -05:00
parent 4964fdcbf0
commit 444219bb17
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
config/src/main/java/com/typesafe/config/impl/AbstractConfigObject.java
View File

@ -135,6 +135,7 @@ abstract class AbstractConfigObject extends AbstractConfigValue implements
if (ignoresFallbacks())
throw new ConfigException.BugOrBroken("should not be reached");
boolean changed = false;
boolean allResolved = true;
Map<String, AbstractConfigValue> merged = new HashMap<String, AbstractConfigValue>();
Set<String> allKeys = new HashSet<String>();
@ -150,12 +151,26 @@ abstract class AbstractConfigObject extends AbstractConfigValue implements
kept = first;
else
kept = first.withFallback(second);
merged.put(key, kept);
if (first != kept)
changed = true;
if (kept.resolveStatus() == ResolveStatus.UNRESOLVED)
allResolved = false;
}
return new SimpleConfigObject(mergeOrigins(this, fallback), merged,
ResolveStatus.fromBoolean(allResolved), fallback.ignoresFallbacks());
ResolveStatus newResolveStatus = ResolveStatus.fromBoolean(allResolved);
boolean newIgnoresFallbacks = fallback.ignoresFallbacks();
if (changed)
return new SimpleConfigObject(mergeOrigins(this, fallback), merged, newResolveStatus,
newIgnoresFallbacks);
else if (newResolveStatus != resolveStatus() || newIgnoresFallbacks != ignoresFallbacks())
return newCopy(newResolveStatus, newIgnoresFallbacks);
else
return this;
}
@Override