reader: fix jgf properties #1149
Merged
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
jameshcorbett
force-pushed
the
reader-fix-jgf-properties
branch
from
17e6eff
to
f49a102
Compare
jameshcorbett
force-pushed
the
reader-fix-jgf-properties
branch
from
f49a102
to
3da41f8
Compare
Problem: the JGF reader requires each vertex's 'properties' field to be either null or a JSON object, but doesn't ever check the type. This leads to silent failures when the type read in is wrong. Add a check for the type of the properties field if it is not null.
Problem: the Python JGF writer outputs properties as a list by default, but the reader expects a mapping. Change the default to a dictionary.
jameshcorbett
force-pushed
the
reader-fix-jgf-properties
branch
from
3da41f8
to
6e20c67
Compare
|
@milroy this is ready for review whenever. |
milroy
approved these changes
Apr 5, 2024
| @@ -45,6 +45,17 @@ | |||
| }, | |||
There was a problem hiding this comment.
Typo in the commit message. I think you mean "there are no tests where the JGF writer handles properties correctly."
There was a problem hiding this comment.
Good catch, thanks! Force-pushed with the correction.
Problem: there are no tests that the JGF writer handles properties correctly. Add them.
Problem: t/t8001-util-ion-R.t expects JGF properties to be formatted as a JSON array, but they are actually given by a mapping. Fix the expected type.
jameshcorbett
force-pushed
the
reader-fix-jgf-properties
branch
from
6e20c67
to
f2f2899
Compare
|
Thanks! Setting MWP. |
jameshcorbett
added
the
merge-when-passing
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## master #1149 +/- ##
========================================
+ Coverage 71.0% 73.9% +2.8%
========================================
Files 96 103 +7
Lines 12867 14395 +1528
========================================
+ Hits 9147 10643 +1496
- Misses 3720 3752 +32
|
This was referenced Apr 5, 2024
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.
Given this vertex in JGF, resource-query reports it has no properties.
{ "id": "35", "metadata": { "type": "node", "basename": "node", "name": "compute-01", "id": 1, "uniq_id": 35, "rank": 0, "exclusive": true, "unit": "", "size": 1, "properties": ["pdebug"], "paths": { "containment": "/ElCapitan0/rack0/compute-01" } } }Looking at the reader, I found that it expects properties to be given as a mapping with keys the name of the property. When I changed the vertex in JGF to the following, the property was recognized. It looks like the reader had been silently failing on the type.
{ "id": "35", "metadata": { "type": "node", "basename": "node", "name": "compute-01", "id": 1, "uniq_id": 35, "rank": 0, "exclusive": true, "unit": "", "size": 1, "properties": { "pdebug": "" }, "paths": { "containment": "/ElCapitan0/rack0/compute-01" } } },