Support xxHash with external lz4 #4495
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
orivej
commented
Feb 24, 2019
| @@ -20,8 +20,7 @@ target_link_libraries(clickhouse_functions | |||
| ${METROHASH_LIBRARIES} | |||
| murmurhash | |||
| ${BASE64_LIBRARY} | |||
| ${OPENSSL_CRYPTO_LIBRARY} | |||
| ${LZ4_LIBRARY}) | |||
There was a problem hiding this comment.
LZ4_LIBRARY is not needed here due to USE_XXHASH added below. It came from https://github.com/yandex/ClickHouse/pull/3905/files#diff-6ad97c74dd7af3de638524e1b08e1093R25.
xxhash.h does not exist in external lz4 because it is an implementation detail and its symbols are namespaced with XXH_NAMESPACE macro. When lz4 is external, xxHash has to be external too, and the dependents have to link to it. This find_xxhash.cmake is based on find_lz4.cmake.
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.
I hereby agree to the terms of the CLA available at: https://yandex.ru/legal/cla/?lang=en
Category (leave one):
Short description (up to few sentences):
xxhash.hdoes not exist in external lz4 because it is an implementation detail and its symbols are namespaced withXXH_NAMESPACEmacro. When lz4 is external, xxHash has to be external too, and the dependents have to link to it.The old
find_xxhash.cmakewas added in 7b42029.The new
find_xxhash.cmakeis based onfind_lz4.cmake.I have tested that ClickHouse builds without
contrib/lz4both with and without system xxhash, and uses system xxhash if available.