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

Avoid doing invalid range requests if a node has no points #56265

Merged
merged 1 commit into from
Feb 8, 2024

Conversation

uclaros
Copy link
Contributor

@uclaros uclaros commented Feb 8, 2024

Description

If a remote copc file would have empty nodes, we would craft an invalid range request to the server (lower bound > upper bound) and the server would reply with the whole copc, which could be huge.

Fixes #55210

@uclaros uclaros added Bug Either a bug report, or a bug fix. Let's hope for the latter! Point Clouds labels Feb 8, 2024
@github-actions github-actions bot added this to the 3.36.0 milestone Feb 8, 2024
Copy link

github-actions bot commented Feb 8, 2024

🪟 Windows builds ready!

Windows builds of this PR are available for testing here. Debug symbols for this build are available here.

(Built from commit 973c39b)

@nyalldawson nyalldawson merged commit 81736d1 into qgis:master Feb 8, 2024
41 checks passed
@qgis-bot
Copy link
Collaborator

qgis-bot commented Feb 8, 2024

The backport to release-3_34 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 973c39b134e... Avoid doing invalid range requests if a node has no points
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
Auto-merging src/3d/symbols/qgspointcloud3dsymbol_p.cpp
Auto-merging src/core/pointcloud/qgscopcpointcloudblockrequest.cpp
CONFLICT (content): Merge conflict in src/core/pointcloud/qgscopcpointcloudblockrequest.cpp
Auto-merging src/core/pointcloud/qgspointcloudstatscalculator.cpp
Auto-merging src/core/pointcloud/qgsremotecopcpointcloudindex.cpp
CONFLICT (content): Merge conflict in src/core/pointcloud/qgsremotecopcpointcloudindex.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-release-3_34 release-3_34
# Navigate to the new working tree
cd .worktrees/backport-release-3_34
# Create a new branch
git switch --create backport-56265-to-release-3_34
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 973c39b134e74d1a2b1b4cb53b3c7074e9cd5542
# Push it to GitHub
git push --set-upstream origin backport-56265-to-release-3_34
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release-3_34

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

@qgis-bot qgis-bot added the failed backport The automated backport attempt failed, needs a manual backport label Feb 8, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport release-3_34 Bug Either a bug report, or a bug fix. Let's hope for the latter! failed backport The automated backport attempt failed, needs a manual backport Point Clouds
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Loading a remote COPC gets stuck when calculating stats and in 3D view
3 participants