Database: ingest deprecated ESRI names to be able to better import old WKT ESRI#4282
Merged
rouault merged 2 commits intoOSGeo:masterfrom Oct 22, 2024
Merged
Database: ingest deprecated ESRI names to be able to better import old WKT ESRI#4282rouault merged 2 commits intoOSGeo:masterfrom
rouault merged 2 commits intoOSGeo:masterfrom
Conversation
Current proj.db build time is typically 50 to 60 seconds (and up to 7.5 hours on arm64 cross-compilation with full emulation!). Most of it is due to running consistency checks. Those checks actually only need to run once each time when we update the content of the database. When skipping them, the build time is cut to 3 seconds or so. So in data/CMakeLists.txt, let keep track of an expected md5sum resulting from the concatenation of the data/sql/*.sql files. When building proj.db, we check if the got and expected md5sum match. If they do build proj.db by inserting the consistency check triggers after having inserted data record. If there's a mismatch, do a one time build with the triggers inserted before the data records, check that proj.db builds fine with that, and if so, emit a CMake error message indicating to the user that they must update the PROJ_DB_SQL_EXPECTED_MD5 variable in data/CMakeLists.txt with the provided value. Next runs will go through the fast build path, until content is updated again.
jjimenezshaw
approved these changes
Oct 18, 2024
Member
Author
|
The backport to stderrstdoutTo backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-9.5 9.5
# Navigate to the new working tree
cd .worktrees/backport-9.5
# Create a new branch
git switch --create backport-4282-to-9.5
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 842240d67baaee616c6ef1d415635ae923e0dac3,a6f5fa77036a578ece69117bcb7a6aa8341de1d7
# Push it to GitHub
git push --set-upstream origin backport-4282-to-9.5
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-9.5Then, create a pull request where the |
Member
Author
|
9.5 backport in #4286 |
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.
Fixes #4281
On top of PR #4280