thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-20 00:30:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Review fixes

Browse Source
This commit is contained in:
BoloniniD 2022-09-16 20:54:46 +03:00
parent 452ef4435b
commit 1c0047dbff
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/CMakeLists.txt vendored
View File

@ -92,9 +92,7 @@ add_contrib (openldap-cmake openldap)
add_contrib (grpc-cmake grpc) add_contrib (grpc-cmake grpc)
add_contrib (msgpack-c-cmake msgpack-c) add_contrib (msgpack-c-cmake msgpack-c)
if (ENABLE_RUST) add_contrib (corrosion-cmake corrosion)
add_contrib (corrosion-cmake corrosion)
endif()
if (ENABLE_FUZZING) if (ENABLE_FUZZING)
add_contrib (libprotobuf-mutator-cmake libprotobuf-mutator) add_contrib (libprotobuf-mutator-cmake libprotobuf-mutator)

8
contrib/corrosion-cmake/CMakeLists.txt
View File

@ -11,9 +11,6 @@ if(NOT ENABLE_RUST)
return() return()
endif() endif()
# Define function corrosion_import_crate()
include ("${ClickHouse_SOURCE_DIR}/contrib/corrosion/cmake/Corrosion.cmake")
message(STATUS "Checking Rust toolchain for current target") message(STATUS "Checking Rust toolchain for current target")
if(CMAKE_TOOLCHAIN_FILE MATCHES "linux/toolchain-x86_64") if(CMAKE_TOOLCHAIN_FILE MATCHES "linux/toolchain-x86_64")
@ -47,6 +44,9 @@ if(CMAKE_TOOLCHAIN_FILE MATCHES "ppc64le")
execute_process(COMMAND rustup target add powerpc64le-unknown-linux-gnu) execute_process(COMMAND rustup target add powerpc64le-unknown-linux-gnu)
endif() endif()
execute_process(rustup target default ${Rust_CARGO_TARGET}) execute_process(COMMAND rustup default stable-${Rust_CARGO_TARGET})
message(STATUS "Switched Rust target to ${Rust_CARGO_TARGET}") message(STATUS "Switched Rust target to ${Rust_CARGO_TARGET}")
# Define function corrosion_import_crate()
include ("${ClickHouse_SOURCE_DIR}/contrib/corrosion/cmake/Corrosion.cmake")

2
src/Functions/FunctionsHashing.cpp
View File

@ -56,7 +56,7 @@ It returns a BLAKE3 hash as a byte array with type FixedString(32).
{"hash", "SELECT hex(BLAKE3('ABC'))"}}, {"hash", "SELECT hex(BLAKE3('ABC'))"}},
Documentation::Categories{"Hash"} Documentation::Categories{"Hash"}
}, },
FunctionFactory::CaseInsensitive); FunctionFactory::CaseSensitive);
#endif #endif
} }
} }