Skip to content
This repository was archived by the owner on Mar 22, 2023. It is now read-only.

Fixes#1164

Merged
igchor merged 2 commits intopmem:masterfrom
lukaszstolarczuk:fixes
Jul 20, 2021
Merged

Fixes#1164
igchor merged 2 commits intopmem:masterfrom
lukaszstolarczuk:fixes

Conversation

@lukaszstolarczuk
Copy link
Copy Markdown
Member

@lukaszstolarczuk lukaszstolarczuk commented Jul 19, 2021

two random fixes before rc 😉


This change is Reviewable

next may be end() in case of the last key (or in case of concurrent erase).
it wasn't added during one of merge's.

ref. 1c37736
Copy link
Copy Markdown
Contributor

@igchor igchor left a comment

Choose a reason for hiding this comment

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

:lgtm:

Reviewable status: 0 of 2 files reviewed, all discussions resolved

@codecov
Copy link
Copy Markdown

codecov bot commented Jul 19, 2021

Codecov Report

Merging #1164 (45a72a9) into master (b4a8a3f) will decrease coverage by 0.01%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1164      +/-   ##
==========================================
- Coverage   94.08%   94.07%   -0.02%     
==========================================
  Files          52       52              
  Lines        5124     5115       -9     
==========================================
- Hits         4821     4812       -9     
  Misses        303      303              
Flag Coverage Δ
tests_clang_debug_cpp17 93.62% <ø> (-0.04%) ⬇️
tests_gcc_debug 90.67% <ø> (-0.02%) ⬇️

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

Impacted Files Coverage Δ
include/libpmemobj++/persistent_ptr.hpp 97.53% <ø> (+0.86%) ⬆️
...ude/libpmemobj++/container/concurrent_hash_map.hpp 94.35% <0.00%> (-0.16%) ⬇️

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 b4a8a3f...45a72a9. Read the comment docs.

Copy link
Copy Markdown
Contributor

@KFilipek KFilipek left a comment

Choose a reason for hiding this comment

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

Reviewed 2 of 2 files at r1.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on @lukaszstolarczuk)


include/libpmemobj++/persistent_ptr.hpp, line 579 at r1 (raw file):

0xF00000000000000;

0xFDEADBEEF000000; still is a bit nerdy and better to debbuging

Copy link
Copy Markdown
Member Author

@lukaszstolarczuk lukaszstolarczuk left a comment

Choose a reason for hiding this comment

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

Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on @lukaszstolarczuk)


include/libpmemobj++/persistent_ptr.hpp, line 579 at r1 (raw file):

Previously, KFilipek (Krzysztof Filipek) wrote…
0xF00000000000000;

0xFDEADBEEF000000; still is a bit nerdy and better to debbuging

It's a cherry-pick from a stable branch actually, so I'd leave it as is.

Copy link
Copy Markdown
Contributor

@KFilipek KFilipek left a comment

Choose a reason for hiding this comment

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

:lgtm:

Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on @lukaszstolarczuk)


include/libpmemobj++/persistent_ptr.hpp, line 579 at r1 (raw file):

Previously, lukaszstolarczuk (Łukasz Stolarczuk) wrote…

It's a cherry-pick from a stable branch actually, so I'd leave it as is.

That made me sad, but ok.

@igchor igchor merged commit f35afb8 into pmem:master Jul 20, 2021
@lukaszstolarczuk lukaszstolarczuk deleted the fixes branch July 20, 2021 08:33
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants