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

remove hashid define guard

Browse Source
This commit is contained in:
Michael Nutt 2022-05-18 15:25:59 -04:00
parent 8bff9b8ce9
commit e453132db8
8 changed files with 9 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
contrib/hashidsxx-cmake/CMakeLists.txt
View File

@ -1,10 +1,3 @@
option(ENABLE_HASHIDSXX "Enable hashidsxx" ${ENABLE_LIBRARIES})
if (NOT ENABLE_HASHIDSXX)
message(STATUS "Not using hashidsxx")
return()
endif()
set (LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/hashidsxx")
set (SRCS

1
src/Common/config.h.in
View File

@ -26,4 +26,3 @@
#cmakedefine01 USE_ODBC
#cmakedefine01 USE_REPLXX
#cmakedefine01 USE_JEMALLOC
#cmakedefine01 USE_HASHIDSXX

1
src/Core/config_core.h.in
View File

@ -21,4 +21,3 @@
#cmakedefine01 USE_ODBC
#cmakedefine01 USE_REPLXX
#cmakedefine01 USE_JEMALLOC
#cmakedefine01 USE_HASHIDSXX

6
src/Functions/FunctionHashID.cpp
View File

@ -1,10 +1,6 @@
#include "FunctionHashID.h"
#include <Functions/FunctionFactory.h>
#if USE_HASHIDSXX
namespace DB
{
@ -14,5 +10,3 @@ void registerFunctionHashID(FunctionFactory & factory)
}
}
#endif

22
src/Functions/FunctionHashID.h
View File

@ -2,19 +2,17 @@
#include <Common/config.h>
#if USE_HASHIDSXX
#include <hashids.h>
# include <hashids.h>
#include <Columns/ColumnString.h>
#include <Columns/ColumnsNumber.h>
#include <DataTypes/DataTypeString.h>
#include <Functions/FunctionFactory.h>
#include <Functions/FunctionHelpers.h>
#include <Functions/IFunction.h>
# include <Columns/ColumnString.h>
# include <Columns/ColumnsNumber.h>
# include <DataTypes/DataTypeString.h>
# include <Functions/FunctionFactory.h>
# include <Functions/FunctionHelpers.h>
# include <Functions/IFunction.h>
# include <functional>
# include <initializer_list>
#include <functional>
#include <initializer_list>
namespace DB
{
@ -159,5 +157,3 @@ public:
};
}
#endif

3
src/Functions/registerFunctions.cpp
View File

@ -132,10 +132,7 @@ void registerFunctions()
#endif
registerFunctionTid(factory);
registerFunctionLogTrace(factory);
#if USE_HASHIDSXX
registerFunctionHashID(factory);
#endif
}
}

3
src/configure_config.cmake
View File

@ -100,6 +100,3 @@ endif()
if (TARGET ch_contrib::jemalloc)
set(USE_JEMALLOC 1)
endif()
if (TARGET ch_contrib::hashidsxx)
set(USE_HASHIDSXX 1)
endif()

2
tests/queries/0_stateless/02293_hashid.sql
View File

@ -1,5 +1,3 @@
-- Tags: no-fasttest
select number, hashid(number) from system.numbers limit 5;
select number, hashid(number, 's3cr3t', 16, 'abcdefghijklmnop') from system.numbers limit 5;
select hashid(1234567890123456, 's3cr3t');