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

Fix build

Browse Source
This commit is contained in:
Nikolay Degterinsky 2022-12-29 02:17:52 +00:00
parent 7bb8db4bb3
commit 945d50af87
5 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/CMakeLists.txt
View File

@ -567,7 +567,9 @@ if (ENABLE_NLP)
dbms_target_link_libraries (PUBLIC ch_contrib::nlp_data)
endif()
dbms_target_link_libraries (PUBLIC ch_contrib::ulid)
if (TARGET ch_contrib::ulid)
dbms_target_link_libraries (PUBLIC ch_contrib::ulid)
endif()
if (TARGET ch_contrib::bzip2)
target_link_libraries (clickhouse_common_io PRIVATE ch_contrib::bzip2)

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

@ -54,3 +54,4 @@
#cmakedefine01 USE_BLAKE3
#cmakedefine01 USE_SKIM
#cmakedefine01 USE_OPENSSL_INTREE
#cmakedefine01 USE_ULID

6
src/Functions/generateULID.cpp
View File

@ -1,3 +1,7 @@
#include "config.h"
#if USE_ULID
#include <Columns/ColumnFixedString.h>
#include <DataTypes/DataTypeFixedString.h>
#include <Functions/FunctionFactory.h>
@ -74,3 +78,5 @@ REGISTER_FUNCTION(GenerateULID)
}
}
#endif

3
src/configure_config.cmake
View File

@ -94,6 +94,9 @@ endif()
if (ENABLE_NLP)
set(USE_NLP 1)
endif()
if (TARGET ch_contrib::ulid)
set(USE_ULID 1)
endif()
if (TARGET ch_contrib::llvm)
set(USE_EMBEDDED_COMPILER 1)
endif()

2
tests/queries/0_stateless/02515_generate_ulid.sql
View File

@ -1 +1,3 @@
-- Tags: no-fasttest
SELECT generateULID(1) != generateULID(2), toTypeName(generateULID());