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

Add _TSK_BIG_TABLES typedef. #1531

Merged
merged 1 commit into from
Jun 28, 2021
Merged

Conversation

jeromekelleher
Copy link
Member

Closes #1528

@codecov
Copy link

codecov bot commented Jun 28, 2021

Codecov Report

Merging #1531 (59bd85f) into main (53b3179) will decrease coverage by 0.00%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #1531      +/-   ##
==========================================
- Coverage   93.70%   93.70%   -0.01%     
==========================================
  Files          27       27              
  Lines       22760    22759       -1     
  Branches     1076     1076              
==========================================
- Hits        21327    21326       -1     
  Misses       1399     1399              
  Partials       34       34              
Flag Coverage Δ
c-tests 92.03% <100.00%> (-0.01%) ⬇️
lwt-tests 92.97% <ø> (ø)
python-c-tests 95.29% <ø> (ø)
python-tests 98.80% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
c/tskit/tables.c 90.16% <100.00%> (-0.01%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 53b3179...59bd85f. Read the comment docs.

Copy link
Member

@benjeffery benjeffery left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome! Looks good to me - you mentioned you had some concerns about this way of overflow checking, are you happy with this now?

@jeromekelleher
Copy link
Member Author

Looks good to me - you mentioned you had some concerns about this way of overflow checking, are you happy with this now?

I thought some more about it and you're right, it is much better! I got rid of the checks for > 0 since these are unsigned types, but basically it's what you proposed.

I'm slightly worried about the fact we don't have any tests for the boundary behaviour for num_rows though, I tried leaving out the "+1" and all the tests still passed.

@benjeffery
Copy link
Member

Yep, added an issue for that #1532

@jeromekelleher
Copy link
Member Author

@Mergifyio rebase

@mergify
Copy link
Contributor

mergify bot commented Jun 28, 2021

Command rebase: success

Branch has been successfully rebased

@jeromekelleher
Copy link
Member Author

Yep, this is working on CircleCI, just verified it's definitely running in 64 bit mode by checking the total memory used reported in valgrind (much more in 64 bit mode).

@jeromekelleher jeromekelleher added the AUTOMERGE-REQUESTED Ask Mergify to merge this PR label Jun 28, 2021
@mergify mergify bot merged commit d0fba43 into tskit-dev:main Jun 28, 2021
@mergify mergify bot removed the AUTOMERGE-REQUESTED Ask Mergify to merge this PR label Jun 28, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add compile flag for supporting 64 bit IDs
2 participants