-
Notifications
You must be signed in to change notification settings - Fork 243
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
merge.go: drop Compression field if nil in child #1329
Closed
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1338,6 +1338,71 @@ func TestMerge(t *testing.T) { | |
{path.New(TAG_CHILD, "kernelArguments"), path.New(TAG_RESULT, "kernelArguments")}, | ||
}}, | ||
}, | ||
|
||
// when compressed and un-compressed files are merged, out does not have Compression field | ||
{ | ||
in1: types.Config{ | ||
Storage: types.Storage{ | ||
Files: []types.File{ | ||
{ | ||
Node: types.Node{ | ||
Path: "/a", | ||
}, | ||
FileEmbedded1: types.FileEmbedded1{ | ||
Contents: types.Resource{ | ||
Source: util.StrToPtr("data:"), | ||
Compression: util.StrToPtr("gzip"), | ||
}, | ||
}, | ||
}, | ||
}, | ||
}, | ||
}, | ||
in2: types.Config{ | ||
Storage: types.Storage{ | ||
Files: []types.File{ | ||
{ | ||
Node: types.Node{ | ||
Path: "/a", | ||
}, | ||
FileEmbedded1: types.FileEmbedded1{ | ||
Contents: types.Resource{ | ||
Source: util.StrToPtr("data:hello world"), | ||
}, | ||
}, | ||
}, | ||
}, | ||
}, | ||
}, | ||
out: types.Config{ | ||
Storage: types.Storage{ | ||
Files: []types.File{ | ||
{ | ||
Node: types.Node{ | ||
Path: "/a", | ||
}, | ||
FileEmbedded1: types.FileEmbedded1{ | ||
Contents: types.Resource{ | ||
Source: util.StrToPtr("data:hello world"), | ||
}, | ||
}, | ||
}, | ||
}, | ||
}, | ||
}, | ||
transcript: Transcript{[]Mapping{ | ||
{path.New(TAG_CHILD, "storage", "files", 0, "path"), path.New(TAG_RESULT, "storage", "files", 0, "path")}, | ||
{path.New(TAG_CHILD, "storage", "files", 0, "contents", "source"), path.New(TAG_RESULT, "storage", "files", 0, "contents", "source")}, | ||
{path.New(TAG_PARENT, "storage", "files", 0, "contents"), path.New(TAG_RESULT, "storage", "files", 0, "contents")}, | ||
{path.New(TAG_CHILD, "storage", "files", 0, "contents"), path.New(TAG_RESULT, "storage", "files", 0, "contents")}, | ||
{path.New(TAG_PARENT, "storage", "files", 0), path.New(TAG_RESULT, "storage", "files", 0)}, | ||
{path.New(TAG_CHILD, "storage", "files", 0), path.New(TAG_RESULT, "storage", "files", 0)}, | ||
{path.New(TAG_PARENT, "storage", "files"), path.New(TAG_RESULT, "storage", "files")}, | ||
{path.New(TAG_CHILD, "storage", "files"), path.New(TAG_RESULT, "storage", "files")}, | ||
{path.New(TAG_PARENT, "storage"), path.New(TAG_RESULT, "storage")}, | ||
{path.New(TAG_CHILD, "storage"), path.New(TAG_RESULT, "storage")}, | ||
Comment on lines
+1394
to
+1403
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I reverse engineered this so have no idea if it's correct |
||
}}, | ||
}, | ||
} | ||
|
||
for i, test := range tests { | ||
|
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is there a better place to put this? Doesn't seem like it should be a case in
mergeStruct()
since it's such a general function but I couldn't find where else to put itThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm confused how this works...wouldn't we fall through to the case below without this?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah it would fall through to the next case which calls
resultField.Set(parentField)
. Afaict that's what we want to avoid doing, and instead we want to do nothing (ie set Compression to nil)There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The bug we're hitting is when
parentField
hasCompression = gzip
butchildField.IsNil()
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Right sorry, I get confused sometimes how in Go fallthrough requires an explicit
fallthrough
.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Haha when I read your comment I had a definite moment of crisis over that