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

An attempt to fix oid overflow in regclass #30184

Merged
merged 3 commits into from Jun 13, 2019

Conversation

elpaso
Copy link
Contributor

@elpaso elpaso commented Jun 12, 2019

QGIS was using int to store oids, but oids are 4 byte unsigned ints.

This is an attempt to partially fix #30041

QGIS was using int to store oids, but oids are 4 byte unsigned ints.

This is an attempt to partially fix qgis#30041
@elpaso
Copy link
Contributor Author

elpaso commented Jun 12, 2019

@jef-n what do you think?

@elpaso elpaso added backport release-3_4 Bug Either a bug report, or a bug fix. Let's hope for the latter! labels Jun 13, 2019
@elpaso elpaso merged commit ffe3c31 into qgis:master Jun 13, 2019
@elpaso elpaso deleted the bugfix-gh30041-pg-oid-overflow branch June 13, 2019 06:49
@backporting
Copy link
Contributor

backporting bot commented Jun 13, 2019

The backport to release-3_4 failed:

Commits ["ad8c5a6d98dfe2cd206ec5157fc8778af998980d","c90583c0dbaea80ca3b4c14dfd4d9a305d7fc733","c94310df56119d61089249ee7bbc5ad188a6096c"] could not be cherry-picked on top of release-3_4

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub.
git fetch
# Create new working tree.
git worktree add .worktrees/backport release-3_4
# Navigate to the new directory.
cd .worktrees/backport
# Cherry-pick all the commits of this pull request and resolve the likely conflicts.
git cherry-pick ad8c5a6d98dfe2cd206ec5157fc8778af998980d c90583c0dbaea80ca3b4c14dfd4d9a305d7fc733 c94310df56119d61089249ee7bbc5ad188a6096c
# Create a new branch with these backported commits.
git checkout -b backport-30184-to-release-3_4
# Push it to GitHub.
git push --set-upstream origin backport-30184-to-release-3_4
# Go back to the original working tree.
cd ../..
# Delete the working tree.
git worktree remove .worktrees/backport

Then, create a pull request where the base branch is release-3_4 and the compare/head branch is backport-30184-to-release-3_4.

elpaso added a commit to elpaso/QGIS that referenced this pull request Jun 14, 2019
An attempt to fix oid overflow in regclass

Cherry-picked from master ffe3c31
@elpaso elpaso mentioned this pull request Jun 14, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Bug Either a bug report, or a bug fix. Let's hope for the latter!
Projects
None yet
2 participants