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

[processing] save NULL and empty values into different files in Split Vector Layer algorithm (fix #38105) #46997

Merged
merged 2 commits into from
Jan 27, 2022

Conversation

alexbruy
Copy link
Contributor

Description

The Split Vector Layer algorithm exports both NULL and empty attribute values to the same filename, as a result one file overwrites another and some results are lost. Proposed PR assigns different suffixes for such files (_EMPTY and _NULL).

Fixes #38105.

Also fix unreported bug with displaying incorrect number of features written to each output file.

@alexbruy alexbruy added Processing Relating to QGIS Processing framework or individual Processing algorithms backport queued_ltr_backports Queued Backports labels Jan 25, 2022
@github-actions github-actions bot added this to the 3.24.0 milestone Jan 25, 2022
Vector Layer algorithm (fix #38105)

Also fix unreported bug with reporting incorrect feature count written
to the files.
@alexbruy alexbruy merged commit d90bc87 into qgis:master Jan 27, 2022
@qgis-bot
Copy link
Collaborator

The backport to queued_ltr_backports failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 9a3465e88e... ad test
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

stdout
[backport-46997-to-queued_ltr_backports 9e53168c37] [processing] save NULL and empty values into different files in Split Vector Layer algorithm (fix #38105)
 Author: Alexander Bruy <alexander.bruy@gmail.com>
 Date: Tue Jan 25 19:48:11 2022 +0200
 1 file changed, 14 insertions(+), 1 deletion(-)
Auto-merging tests/src/analysis/testqgsprocessingalgs.cpp
CONFLICT (content): Merge conflict in tests/src/analysis/testqgsprocessingalgs.cpp

To 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-queued_ltr_backports queued_ltr_backports
# Navigate to the new working tree
cd .worktrees/backport-queued_ltr_backports
# Create a new branch
git switch --create backport-46997-to-queued_ltr_backports
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 0780bf08a0126cbc5adb7125bd06bc59a2010cad,9a3465e88ec884f0b5f6881111f45679b0559487
# Push it to GitHub
git push --set-upstream origin backport-46997-to-queued_ltr_backports
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-queued_ltr_backports

Then, create a pull request where the base branch is queued_ltr_backports and the compare/head branch is backport-46997-to-queued_ltr_backports.

@qgis-bot qgis-bot added the failed backport The automated backport attempt failed, needs a manual backport label Jan 27, 2022
@alexbruy alexbruy deleted the split-vector-null branch January 27, 2022 07:50
@qgis-bot
Copy link
Collaborator

The backport to failed failed:

The process '/usr/bin/git' failed with exit code 128
stderr
fatal: invalid reference: failed

To 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-failed failed
# Navigate to the new working tree
cd .worktrees/backport-failed
# Create a new branch
git switch --create backport-46997-to-failed
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 0780bf08a0126cbc5adb7125bd06bc59a2010cad,9a3465e88ec884f0b5f6881111f45679b0559487
# Push it to GitHub
git push --set-upstream origin backport-46997-to-failed
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-failed

Then, create a pull request where the base branch is failed and the compare/head branch is backport-46997-to-failed.

@m-kuhn
Copy link
Member

m-kuhn commented Jan 27, 2022

FYI: Backport bot updated to use failed backport instead of backport failed to avoid the backport loop issue in the future. CC @3nids

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport queued_ltr_backports Queued Backports failed backport The automated backport attempt failed, needs a manual backport Processing Relating to QGIS Processing framework or individual Processing algorithms
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Split Vector Layer algorithm does not export both null and empty values
4 participants