Bmoric/fix diff #16513
Merged
Bmoric/fix diff #16513
Conversation
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
github-actions
bot
added
area/platform
jdpgrailsdev
reviewed
Sep 9, 2022
| fieldNamesThatAreOneOfs)) | ||
| .map(fieldWithSchema -> { | ||
| if (withNamedOneOf && isOneOfField(fieldWithSchema.getRight())) { | ||
| final List<String> newPath = new ArrayList<>(fieldWithSchema.getLeft()); |
There was a problem hiding this comment.
Nit: this could be reduced to a one liner: final List<String> newPath = List.of(fieldWithSchema.getLeft(), "oneOf");
There was a problem hiding this comment.
I reverted the fix. We shouldn't allow it and have the format being enforced instead.
|
Re-request review because there was several changes since the last approval. |
| @@ -334,10 +335,15 @@ private static UpdateStreamTransform getStreamDiff(final AirbyteStream streamOld | |||
| final Set<FieldTransform> fieldTransforms = new HashSet<>(); | |||
| final Map<List<String>, JsonNode> fieldNameToTypeOld = getFullyQualifiedFieldNamesWithTypes(streamOld.getJsonSchema()) | |||
| .stream() | |||
| .collect(Collectors.toMap(Pair::getLeft, Pair::getRight)); | |||
| .collect( | |||
| () -> new HashMap<>(), | |||
There was a problem hiding this comment.
Nit: I think that you can do HashMap::new here as well.
gosusnp
approved these changes
Sep 12, 2022
Merged
robbinhan
pushed a commit
to robbinhan/airbyte
that referenced
this pull request
Sep 29, 2022
* Add test on the catalog diff logic * Simplify test case * Fix the bug * Rm useless val * Format * Update test input * revert map change * Add test * Fix test * Format * Use sugar * Fix PMD errors Co-authored-by: Malik Diarra <malik@airbyte.io>
jhammarstedt
pushed a commit
to jhammarstedt/airbyte
that referenced
this pull request
Oct 31, 2022
* Add test on the catalog diff logic * Simplify test case * Fix the bug * Rm useless val * Format * Update test input * revert map change * Add test * Fix test * Format * Use sugar * Fix PMD errors Co-authored-by: Malik Diarra <malik@airbyte.io>
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.
What
Fix the catalog diff, Address https://github.com/airbytehq/oncall/issues/463
How
CatalogHelpers.getFullyQualifiedFieldNamesWithTypeswas including the oneOfField which could lead to duplicated key if the one of is contains in an array (one entry for the array, one entry for the one of).This PR is adding a oneOf indicator as part of the key path which makes it unique. This doesn't change the behavior of the diff or gettingAllFieldName.Edit: we now consider the field as updated if there is an issue.