Skip to content
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

Feature/2523 keyscopes in flattened map not handled #3194

Merged
merged 6 commits into from Jan 26, 2019

Conversation

Projects
2 participants
@jelovirt
Copy link
Member

commented Jan 26, 2019

Migrated to new PR from #3141 in order to allow commiters to modify the code.

Fixes test cases reported in issue #2523.
Two issues were identified:

  1. When collecting resolve tasks in KeyRefModule.WalkMap, files referenced through mapref but flattened in map-ref stage are not picked up. They are instead added in collectProcessingTopics. This means they are parsed with root scope instead of their correct scope.
  2. When transforming a flattened map key using the KeyRefPaser module it's assumed that one file only has a single key scope. Scopes added outside topicrefs or maprefs are then ignored.

I refactored the elemName deque to keyRefElemNames to make the distinction between the two deques elemNames and keyRefElemNames more clear.

simtind added some commits Nov 5, 2018

Detect key scopes in keyreparser filter methods
Signed-off-by: Tinderholt, Simen <simtind@gmail.com>
Apply key scope settings to submap processing jobs
Signed-off-by: Tinderholt, Simen <simtind@gmail.com>
Test that submaps are collected by walkmap() and assigned correct key…
… scope.

Signed-off-by: Tinderholt, Simen <simtind@gmail.com>
Test that keyrefs are resolved in their parent scope when ditamap con…
…tains key scopes.

Signed-off-by: Tinderholt, Simen <simtind@gmail.com>

@jelovirt jelovirt added this to In progress in 3.3 via automation Jan 26, 2019

@jelovirt jelovirt force-pushed the feature/2523-keyscopes-in-flattened-map-not-handled branch from a5de575 to 5ee1e3f Jan 26, 2019

@jelovirt jelovirt self-assigned this Jan 26, 2019

Refactor to simplify keyscope stack
Signed-off-by: Jarno Elovirta <jarno@elovirta.com>

@jelovirt jelovirt force-pushed the feature/2523-keyscopes-in-flattened-map-not-handled branch from 139ad36 to 991a18a Jan 26, 2019

Clean test
Signed-off-by: Jarno Elovirta <jarno@elovirta.com>
@jelovirt

This comment has been minimized.

Copy link
Member Author

commented Jan 26, 2019

Since I opened this PR as a copy of the original PR, I cannot approve this using the GitHub review. So approving in a comment.

@jelovirt jelovirt merged commit d49e0c9 into develop Jan 26, 2019

4 checks passed

DCO DCO
Details
WIP Ready for review
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details

3.3 automation moved this from In progress to Done Jan 26, 2019

@jelovirt jelovirt deleted the feature/2523-keyscopes-in-flattened-map-not-handled branch Jan 26, 2019

@jelovirt jelovirt added this to the 3.3 milestone Jan 26, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.