diff --git a/CMakeLists.txt b/CMakeLists.txt index 5c10bbbd0e0..f0ef4ed7c51 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -283,8 +283,6 @@ include (cmake/find_contrib_lib.cmake) find_contrib_lib(cityhash) find_contrib_lib(farmhash) find_contrib_lib(metrohash) -find_contrib_lib(murmurhash2) -find_contrib_lib(murmurhash3) find_contrib_lib(btrie) find_contrib_lib(double-conversion) diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt index 18babdf0d87..89f5b2df6a1 100644 --- a/contrib/CMakeLists.txt +++ b/contrib/CMakeLists.txt @@ -43,6 +43,8 @@ if (USE_INTERNAL_METROHASH_LIBRARY) add_subdirectory (libmetrohash) endif () +add_subdirectory (murmurhash) + if (USE_INTERNAL_BTRIE_LIBRARY) add_subdirectory (libbtrie) endif () @@ -51,14 +53,6 @@ if (USE_INTERNAL_UNWIND_LIBRARY) add_subdirectory (libunwind) endif () -if (USE_INTERNAL_MURMURHASH2_LIBRARY) - add_subdirectory (libmurmurhash2) -endif () - -if (USE_INTERNAL_MURMURHASH3_LIBRARY) - add_subdirectory (libmurmurhash3) -endif () - if (USE_INTERNAL_ZLIB_LIBRARY) add_subdirectory (${INTERNAL_ZLIB_NAME}) # todo: make pull to Dead2/zlib-ng and remove: diff --git a/contrib/libmurmurhash2/CMakeLists.txt b/contrib/libmurmurhash2/CMakeLists.txt deleted file mode 100644 index fede35faa50..00000000000 --- a/contrib/libmurmurhash2/CMakeLists.txt +++ /dev/null @@ -1,6 +0,0 @@ -add_library(murmurhash2 - src/murmurhash2.cpp - include/murmurhash2.h) - -target_include_directories (murmurhash2 PUBLIC include) -target_include_directories (murmurhash2 PUBLIC src) diff --git a/contrib/libmurmurhash3/CMakeLists.txt b/contrib/libmurmurhash3/CMakeLists.txt deleted file mode 100644 index 7503ec7a63d..00000000000 --- a/contrib/libmurmurhash3/CMakeLists.txt +++ /dev/null @@ -1,7 +0,0 @@ -add_library(murmurhash3 - src/murmurhash3.cpp - include/murmurhash3.h) - -target_include_directories (murmurhash3 PUBLIC include) -target_include_directories (murmurhash3 PUBLIC src) - diff --git a/contrib/libmurmurhash3/LICENSE b/contrib/libmurmurhash3/LICENSE deleted file mode 100644 index 7f0546011c1..00000000000 --- a/contrib/libmurmurhash3/LICENSE +++ /dev/null @@ -1 +0,0 @@ -MurmurHash3 was written by Austin Appleby, and is placed in the publicdomain. The author hereby disclaims copyright to this source code. diff --git a/contrib/libmurmurhash3/README b/contrib/libmurmurhash3/README deleted file mode 100644 index 5428d30b26d..00000000000 --- a/contrib/libmurmurhash3/README +++ /dev/null @@ -1,6 +0,0 @@ -Original URL: https://github.com/aappleby/smhasher - -version: -commit 61a0530f28277f2e850bfc39600ce61d02b518de -author aappleby@gmail.com -date 2016-01-09T06:07:17Z diff --git a/contrib/murmurhash/CMakeLists.txt b/contrib/murmurhash/CMakeLists.txt new file mode 100644 index 00000000000..c5e467a2d6d --- /dev/null +++ b/contrib/murmurhash/CMakeLists.txt @@ -0,0 +1,7 @@ +add_library(murmurhash + src/murmurhash2.cpp + src/murmurhash3.cpp + include/murmurhash2.h + include/murmurhash3.h) + +target_include_directories (murmurhash PUBLIC include) diff --git a/contrib/libmurmurhash2/LICENSE b/contrib/murmurhash/LICENSE similarity index 100% rename from contrib/libmurmurhash2/LICENSE rename to contrib/murmurhash/LICENSE diff --git a/contrib/libmurmurhash2/README b/contrib/murmurhash/README similarity index 100% rename from contrib/libmurmurhash2/README rename to contrib/murmurhash/README diff --git a/contrib/libmurmurhash2/include/murmurhash2.h b/contrib/murmurhash/include/murmurhash2.h similarity index 100% rename from contrib/libmurmurhash2/include/murmurhash2.h rename to contrib/murmurhash/include/murmurhash2.h diff --git a/contrib/libmurmurhash3/include/murmurhash3.h b/contrib/murmurhash/include/murmurhash3.h similarity index 100% rename from contrib/libmurmurhash3/include/murmurhash3.h rename to contrib/murmurhash/include/murmurhash3.h diff --git a/contrib/libmurmurhash2/src/murmurhash2.cpp b/contrib/murmurhash/src/murmurhash2.cpp similarity index 100% rename from contrib/libmurmurhash2/src/murmurhash2.cpp rename to contrib/murmurhash/src/murmurhash2.cpp diff --git a/contrib/libmurmurhash3/src/murmurhash3.cpp b/contrib/murmurhash/src/murmurhash3.cpp similarity index 100% rename from contrib/libmurmurhash3/src/murmurhash3.cpp rename to contrib/murmurhash/src/murmurhash3.cpp diff --git a/dbms/src/Functions/CMakeLists.txt b/dbms/src/Functions/CMakeLists.txt index 1d905133259..cfc782ff977 100644 --- a/dbms/src/Functions/CMakeLists.txt +++ b/dbms/src/Functions/CMakeLists.txt @@ -91,7 +91,7 @@ list(REMOVE_ITEM clickhouse_functions_headers IFunction.h FunctionFactory.h Func add_library(clickhouse_functions ${clickhouse_functions_sources}) -target_link_libraries(clickhouse_functions PUBLIC dbms PRIVATE libconsistent-hashing ${FARMHASH_LIBRARIES} ${METROHASH_LIBRARIES} ${MURMURHASH2_LIBRARIES} ${MURMURHASH3_LIBRARIES}) +target_link_libraries(clickhouse_functions PUBLIC dbms PRIVATE libconsistent-hashing ${FARMHASH_LIBRARIES} ${METROHASH_LIBRARIES} murmurhash) target_include_directories (clickhouse_functions SYSTEM BEFORE PUBLIC ${DIVIDE_INCLUDE_DIR}) diff --git a/dbms/tests/queries/0_stateless/00678_murmurhash2.reference b/dbms/tests/queries/0_stateless/00678_murmurhash2.reference deleted file mode 100644 index 0c567703050..00000000000 --- a/dbms/tests/queries/0_stateless/00678_murmurhash2.reference +++ /dev/null @@ -1,15 +0,0 @@ -623211862 -3533626746 -2388617433 -2708309598 -2414502773 -670491991 -0 -0 -0 -0 -0 -0 -0 -1 -1 diff --git a/dbms/tests/queries/0_stateless/00678_murmurhash2.sql b/dbms/tests/queries/0_stateless/00678_murmurhash2.sql deleted file mode 100644 index 2d4beabd777..00000000000 --- a/dbms/tests/queries/0_stateless/00678_murmurhash2.sql +++ /dev/null @@ -1,17 +0,0 @@ -SELECT murmurHash2_32(123456); -SELECT murmurHash2_32(CAST(3 AS UInt8)); -SELECT murmurHash2_32(CAST(1.2684 AS Float32)); -SELECT murmurHash2_32(CAST(-154477 AS Int64)); -SELECT murmurHash2_32('foo'); -SELECT murmurHash2_32(CAST('bar' AS FixedString(3))); -SELECT murmurHash2_32(x) FROM (SELECT CAST(1 AS Enum8('a' = 1, 'b' = 2)) as x); - -SELECT murmurHash2_32(''); -SELECT murmurHash2_32('\x01'); -SELECT murmurHash2_32('\x02\0'); -SELECT murmurHash2_32('\x03\0\0'); -SELECT murmurHash2_32(1); -SELECT murmurHash2_32(toUInt16(2)); - -SELECT murmurHash2_32(2) = bitXor(toUInt32(0x5bd1e995 * bitXor(toUInt32(3 * 0x5bd1e995) AS a, bitShiftRight(a, 13))) AS b, bitShiftRight(b, 15)); -SELECT murmurHash2_32('\x02') = bitXor(toUInt32(0x5bd1e995 * bitXor(toUInt32(3 * 0x5bd1e995) AS a, bitShiftRight(a, 13))) AS b, bitShiftRight(b, 15));