Fixed merge for substitutions #138
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Oops, seems like there are some failing tests... I will fix that |
IgorFedchenko
commented
Dec 11, 2019
| @@ -394,7 +395,7 @@ public IHoconElement Clone(IHoconElement newParent) | |||
| var clone = new HoconObject(newParent); | |||
| foreach (var kvp in this) | |||
| { | |||
| clone.SetField(kvp.Key, kvp.Value); | |||
| clone.SetField(kvp.Key, kvp.Value.CloneValue(clone) as HoconField); | |||
There was a problem hiding this comment.
We need to clone all child elements as well, to make deep copy of referenced subtree
IgorFedchenko
commented
Dec 11, 2019
| @@ -184,7 +184,7 @@ private HoconValue ResolveSubstitution(HoconSubstitution sub) | |||
|
|
|||
| // third case, regular substitution | |||
| _root.GetObject().TryGetValue(sub.Path, out var field); | |||
| return field; | |||
| return field?.Clone(field.Parent) as HoconValue; | |||
There was a problem hiding this comment.
Returning clone of the references sub-tree, which is safe for modifications
Aaronontheweb
pushed a commit
that referenced
this pull request
Dec 27, 2019
* Added failing test * Make substitution to use deep copy + fixed deep clone for some types * NRE fix * Fixed deep clone to take substitutions into account
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Close #127
The basic idea of the fix is that in current implementation substitution takes value "by reference" - which means that when object merge occurs the initial value, referenced in substitution, is modified. This could lead to lots of issues, not only with the once described in closing issue.
So the fix is basically make substitution to just deeply copy referenced sub-tree, so that it was safe to modify.
In the edge case when we do not need to modify referenced object we could still keep the "be reference" behavior instead of "by value". Not sure if it will save much performance and if it is important at all. But checking if we are somehow, somewhere modifying substituted value (not to say that we could reference one sub-tree, that includes another substitution that could also be modified then) - too complicated. So let's just take it by value and sleep soundly at night.