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

Jump to bottom

Feature/2523 keyscopes in flattened map not handled #3194

Merged
merged 6 commits into from Jan 26, 2019
Merged

Feature/2523 keyscopes in flattened map not handled #3194

merged 6 commits into from Jan 26, 2019

Conversation

jelovirt
Copy link
Member

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

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

Signed-off-by: Tinderholt, Simen <simtind@gmail.com>
@jelovirt jelovirt added bug priority/medium Medium (or unknown) priority issue preprocess/keyref labels Jan 26, 2019
@jelovirt jelovirt added this to In progress in 3.3 via automation Jan 26, 2019
@simtind simtind mentioned this pull request Jan 26, 2019
Closed
@jelovirt jelovirt force-pushed the feature/2523-keyscopes-in-flattened-map-not-handled branch from a5de575 to 5ee1e3f Compare January 26, 2019 15:35
@jelovirt jelovirt self-assigned this Jan 26, 2019
@jelovirt
Refactor to simplify keyscope stack
991a18a 
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 Compare January 26, 2019 16:11
@jelovirt
Clean test
e967ae3 
Signed-off-by: Jarno Elovirta <jarno@elovirta.com>
@jelovirt
Copy link
Member Author

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
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 January 26, 2019 17:11
@jelovirt jelovirt added this to the 3.3 milestone Jan 26, 2019
@infotexture infotexture mentioned this pull request Feb 19, 2019
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@jelovirt jelovirt

Labels
bug preprocess/keyref priority/medium Medium (or unknown) priority issue
Projects
No open projects
3.3
  
Done
Milestone
3.3
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@jelovirt @simtind