Clean up pointers to middle_query_t in outputs to release memory#1567
Merged
lonvia merged 2 commits intoosm2pgsql-dev:masterfrom Sep 5, 2021
Merged
Clean up pointers to middle_query_t in outputs to release memory#1567lonvia merged 2 commits intoosm2pgsql-dev:masterfrom
lonvia merged 2 commits intoosm2pgsql-dev:masterfrom
Conversation
The outputs have a shared pointer to the middle_query_t to access the data held by the middle. This in turn holds pointers to potentially large datastructures and the flat node file. We need to release those pointers after we don't need them any more so that if and when the middle doesn't need those data structures any more they get cleaned up. In effect this releases the memory used for the cache and flat node store earlier. Fixes osm2pgsql-dev#1563
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
The outputs have a shared pointer to the middle_query_t to access the data held by the middle. This in turn holds pointers to potentially large datastructures and the flat node file. We need to release those pointers after we don't need them any more so that if and when the middle doesn't need those data structures any more they get cleaned up.
In effect this releases the memory used for the cache and flat node store earlier.
Fixes #1563
The second commit cleans up the code a bit using a proper accessor in
output_tto access themidpointer.