From 1c0047dbffb2ef92a6611c8e6e64b5ef9227c261 Mon Sep 17 00:00:00 2001 From: BoloniniD Date: Fri, 16 Sep 2022 20:54:46 +0300 Subject: [PATCH] Review fixes --- contrib/CMakeLists.txt | 4 +--- contrib/corrosion-cmake/CMakeLists.txt | 8 ++++---- src/Functions/FunctionsHashing.cpp | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt index 375fd444166..478a76a5626 100644 --- a/contrib/CMakeLists.txt +++ b/contrib/CMakeLists.txt @@ -92,9 +92,7 @@ add_contrib (openldap-cmake openldap) add_contrib (grpc-cmake grpc) add_contrib (msgpack-c-cmake msgpack-c) -if (ENABLE_RUST) - add_contrib (corrosion-cmake corrosion) -endif() +add_contrib (corrosion-cmake corrosion) if (ENABLE_FUZZING) add_contrib (libprotobuf-mutator-cmake libprotobuf-mutator) diff --git a/contrib/corrosion-cmake/CMakeLists.txt b/contrib/corrosion-cmake/CMakeLists.txt index 6526482e452..d7de5edcd4c 100644 --- a/contrib/corrosion-cmake/CMakeLists.txt +++ b/contrib/corrosion-cmake/CMakeLists.txt @@ -11,9 +11,6 @@ if(NOT ENABLE_RUST) return() endif() -# Define function corrosion_import_crate() -include ("${ClickHouse_SOURCE_DIR}/contrib/corrosion/cmake/Corrosion.cmake") - message(STATUS "Checking Rust toolchain for current target") 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) 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}") + +# Define function corrosion_import_crate() +include ("${ClickHouse_SOURCE_DIR}/contrib/corrosion/cmake/Corrosion.cmake") diff --git a/src/Functions/FunctionsHashing.cpp b/src/Functions/FunctionsHashing.cpp index 2baf305ac73..c425ffbf28c 100644 --- a/src/Functions/FunctionsHashing.cpp +++ b/src/Functions/FunctionsHashing.cpp @@ -56,7 +56,7 @@ It returns a BLAKE3 hash as a byte array with type FixedString(32). {"hash", "SELECT hex(BLAKE3('ABC'))"}}, Documentation::Categories{"Hash"} }, - FunctionFactory::CaseInsensitive); + FunctionFactory::CaseSensitive); #endif } }