Single-file libs now include dictBuilder #2212
Merged
Conversation
This file contains 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
Hashing functions still to fix.
terrelln
approved these changes
Jun 22, 2020
terrelln
reviewed
Jun 22, 2020
|
|
||
|
|
||
| /** | ||
| * Hash the d-byte value pointed to by p and mod 2^f | ||
| */ | ||
| static size_t FASTCOVER_hashPtrToIndex(const void* p, U32 h, unsigned d) { | ||
| if (d == 6) { | ||
| return ZSTD_hash6Ptr(p, h) & ((1 << h) - 1); | ||
| return FASTCOVER_hash6Ptr(p, h) & ((1 << h) - 1); |
There was a problem hiding this comment.
Wow, this & ((1 << h) -1) is completely redundant. I will put up a separate PR to remove it.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
The
dictBuildersources were missing from the single-file libs, as per #2211. This PR:I'm not 100% happy with the approach for fixing the macros (adding
#undefs) since it adds noise around the definitions. That said... I'm not sure pulling out that code into a shared header would be any cleaner.The hash functions were already present in
zstd_compress_internal.hbut instead of relying on those the choice was to prefix (withCOVER_orFASTCOVER_accordingly). This was felt to be cleaner (than detectingZSTD_COMPRESS_H, which felt like introducing future breakage).