Fix avro names #408
Merged
Fix avro names #408
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
The key difference is that field names, symbols and type names are unified in the Salad/RDF data model, but are separate in the Avro data model. Types and fields names and enum symbols need to have their names mapped differently. This is now handled. The practical effect is that this fixes a longstanding issue in referencing types from imported schemas, as is done in cwltool extension schema to reference cwl:Expression. refs #326
|
refs #326 |
Codecov Report
@@ Coverage Diff @@
## main #408 +/- ##
==========================================
- Coverage 78.98% 78.45% -0.53%
==========================================
Files 18 18
Lines 3231 3245 +14
Branches 872 876 +4
==========================================
- Hits 2552 2546 -6
- Misses 441 460 +19
- Partials 238 239 +1
Continue to review full report at Codecov.
|
|
This pull request introduces 2 alerts when merging 353b8b1 into ab933f0 - view on LGTM.com new alerts:
|
|
@rupertnash can you confirm, and maybe contribute your use case as a pytest? |
|
Aye, I'll take a peek |
|
I had a recollection that I'd done this https://github.com/rupertnash/schema_salad/tree/avro-name-conversion. I'll rebase it onto this branch |
mr-c
reviewed
Jun 24, 2021
|
I confirm that @rupertnash 's test fails without the changes in this PR; thanks @tetron and @rupertnash ! |
tetron
added a commit
to common-workflow-language/cwltool
that referenced
this pull request
Jun 24, 2021
Specifically common-workflow-language/schema_salad#408 Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>
tetron
added a commit
to common-workflow-language/cwltool
that referenced
this pull request
Jun 28, 2021
* Update schema-salad dependency for bug fix Specifically common-workflow-language/schema_salad#408 * Use vocabulary in schema salad validation * Fixes internal Avro type change from File to org.w3id.cwl.cwl.File Co-authored-by: Michael R. Crusoe <1330696+mr-c@users.noreply.github.com> Co-authored-by: Michael R. Crusoe <michael.crusoe@gmail.com>
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.
For the part that still goes to avro for validation, converts to avro-compatible names with a dotted namespace instead of half standalone symbols and half URIs.
Fixes #326