thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-21 15:12:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove USE_XXHASH (reduntant)

Browse Source
This commit is contained in:
Azat Khuzhin 2022-01-18 09:51:13 +03:00
parent 3e58094bcb
commit b23053d1f6
4 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/lz4-cmake/CMakeLists.txt
View File

@ -11,7 +11,7 @@ set (SRCS
add_library (_lz4 ${SRCS}) add_library (_lz4 ${SRCS})
add_library (ch_contrib::lz4 ALIAS _lz4) add_library (ch_contrib::lz4 ALIAS _lz4)
target_compile_definitions (_lz4 PUBLIC LZ4_DISABLE_DEPRECATE_WARNINGS=1 USE_XXHASH=1) target_compile_definitions (_lz4 PUBLIC LZ4_DISABLE_DEPRECATE_WARNINGS=1)
if (SANITIZE STREQUAL "undefined") if (SANITIZE STREQUAL "undefined")
target_compile_options (_lz4 PRIVATE -fno-sanitize=undefined) target_compile_options (_lz4 PRIVATE -fno-sanitize=undefined)
endif () endif ()

2
src/Functions/FunctionsHashing.cpp
View File

@ -37,9 +37,7 @@ void registerFunctionsHashing(FunctionFactory & factory)
factory.registerFunction<FunctionMurmurHash3_128>(); factory.registerFunction<FunctionMurmurHash3_128>();
factory.registerFunction<FunctionGccMurmurHash>(); factory.registerFunction<FunctionGccMurmurHash>();
#if USE_XXHASH
factory.registerFunction<FunctionXxHash32>(); factory.registerFunction<FunctionXxHash32>();
factory.registerFunction<FunctionXxHash64>(); factory.registerFunction<FunctionXxHash64>();
#endif
} }
} }

18
src/Functions/FunctionsHashing.h
View File

@ -12,10 +12,7 @@
#include <Common/SipHash.h> #include <Common/SipHash.h>
#include <Common/typeid_cast.h> #include <Common/typeid_cast.h>
#include <Common/HashTable/Hash.h> #include <Common/HashTable/Hash.h>
#include <xxhash.h>
#if USE_XXHASH
# include <xxhash.h>
#endif
#if USE_SSL #if USE_SSL
# include <openssl/md4.h> # include <openssl/md4.h>
@ -551,9 +548,6 @@ struct ImplMetroHash64
static constexpr bool use_int_hash_for_pods = true; static constexpr bool use_int_hash_for_pods = true;
}; };
#if USE_XXHASH
struct ImplXxHash32 struct ImplXxHash32
{ {
static constexpr auto name = "xxHash32"; static constexpr auto name = "xxHash32";
@ -574,7 +568,6 @@ struct ImplXxHash32
static constexpr bool use_int_hash_for_pods = false; static constexpr bool use_int_hash_for_pods = false;
}; };
struct ImplXxHash64 struct ImplXxHash64
{ {
static constexpr auto name = "xxHash64"; static constexpr auto name = "xxHash64";
@ -592,9 +585,6 @@ struct ImplXxHash64
static constexpr bool use_int_hash_for_pods = false; static constexpr bool use_int_hash_for_pods = false;
}; };
#endif
template <typename Impl> template <typename Impl>
class FunctionStringHashFixedString : public IFunction class FunctionStringHashFixedString : public IFunction
{ {
@ -1413,9 +1403,7 @@ using FunctionJavaHash = FunctionAnyHash<JavaHashImpl>;
using FunctionJavaHashUTF16LE = FunctionAnyHash<JavaHashUTF16LEImpl>; using FunctionJavaHashUTF16LE = FunctionAnyHash<JavaHashUTF16LEImpl>;
using FunctionHiveHash = FunctionAnyHash<HiveHashImpl>; using FunctionHiveHash = FunctionAnyHash<HiveHashImpl>;
#if USE_XXHASH using FunctionXxHash32 = FunctionAnyHash<ImplXxHash32>;
using FunctionXxHash32 = FunctionAnyHash<ImplXxHash32>; using FunctionXxHash64 = FunctionAnyHash<ImplXxHash64>;
using FunctionXxHash64 = FunctionAnyHash<ImplXxHash64>;
#endif
} }

1
src/Storages/System/StorageSystemBuildOptions.generated.cpp.in
View File

@ -33,7 +33,6 @@ const char * auto_config_build[]
"USE_RDKAFKA", "@USE_RDKAFKA@", "USE_RDKAFKA", "@USE_RDKAFKA@",
"USE_CAPNP", "@USE_CAPNP@", "USE_CAPNP", "@USE_CAPNP@",
"USE_BASE64", "@USE_BASE64@", "USE_BASE64", "@USE_BASE64@",
"USE_XXHASH", "@USE_XXHASH@",
"USE_HDFS", "@USE_HDFS@", "USE_HDFS", "@USE_HDFS@",
"USE_SNAPPY", "@USE_SNAPPY@", "USE_SNAPPY", "@USE_SNAPPY@",
"USE_PARQUET", "@USE_PARQUET@", "USE_PARQUET", "@USE_PARQUET@",