Make property handling more robust #2244
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
Property changes were reflected piece by piece in the database. This changes it so they are only done in one go after all the changes have been made. So if something fails before we get to the point where we write all properties to the database, no updates are actually done. And the code is simpler because we keep track of necessary database updates automatically and do them the next time the store() function is called.
If osm2pgsql fails during initialization, for instance because the input file or the style file was not found, it had already initialized the osm2pgsql_properties table in the database. We now write the properties table later to reduce the chances that a small error on the command line destroys an existing database this way.
joto
force-pushed
the
robust-properties
branch
from
451b2e9
to
7b77762
Compare
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.
(Changes to) Properties are stored at a later time in the database so the db is not changed if osm2pgsql fails for some reason. Basically we are trying to do as many checks as possible before actually writing the properties to the db. For instance the input file is now actually opened before properties are written,
This solves some cases already mentioned in PR #2085.