Limit table size to TSK_MAX_ID #2337
Merged
Conversation
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
benjeffery
force-pushed
the
change-max-rows
branch
from
89fcd7f to
41294e9
Compare
Member
Author
|
Heh, was good to do this as it exposed a logic error in the overflow check. The calculation overflowed when the added rows were greater than the maximum. |
Codecov Report
@@ Coverage Diff @@
## main #2337 +/- ##
=======================================
Coverage 93.28% 93.28%
=======================================
Files 28 28
Lines 26712 26713 +1
Branches 1222 1222
=======================================
+ Hits 24917 24918 +1
Misses 1762 1762
Partials 33 33
Flags with carried forward coverage won't be shown. Click here to find out more.
Continue to review full report at Codecov.
|
jeromekelleher
approved these changes
Jun 13, 2022
c/tskit/tables.c
Outdated
| return current_size > (TSK_MAX_SIZE - additional_elements); | ||
| tsk_size_t max_val = TSK_MAX_SIZE; | ||
| return additional_elements > max_val | ||
| || current_size > (TSK_MAX_SIZE - additional_elements); |
Member
There was a problem hiding this comment.
Should probably use (max_val - additional_elements) here
Member
|
Needs CHANGELOGs update |
benjeffery
force-pushed
the
change-max-rows
branch
from
41294e9 to
b81e1c3
Compare
benjeffery
force-pushed
the
change-max-rows
branch
from
b81e1c3 to
ad011ff
Compare
GertjanBisschop
added a commit
to GertjanBisschop/tskit
that referenced
this pull request
Jun 22, 2022
Docstring did not reflect the changes in tskit-dev#2337.
benjeffery
pushed a commit
to GertjanBisschop/tskit
that referenced
this pull request
Jun 22, 2022
Docstring did not reflect the changes in tskit-dev#2337.
mergify bot
pushed a commit
that referenced
this pull request
Jun 22, 2022
Docstring did not reflect the changes in #2337.
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 #2336