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

make changes analog to https://github.com/ClickHouse/ClickHouse/pull/20495/files but for clang-13

Browse Source
This commit is contained in:
Sergei Semin 2021-09-07 01:08:57 +03:00
parent 0f2954ee97
commit b739d1cc92
13 changed files with 78 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/builder/Dockerfile
View File

@ -1,6 +1,6 @@
FROM ubuntu:20.04
ENV DEBIAN_FRONTEND=noninteractive LLVM_VERSION=12
ENV DEBIAN_FRONTEND=noninteractive LLVM_VERSION=13
RUN sed -i 's|http://archive|http://ru.archive|g' /etc/apt/sources.list

2
docker/builder/build.sh
View File

@ -4,7 +4,7 @@ set -e
#ccache -s # uncomment to display CCache statistics
mkdir -p /server/build_docker
cd /server/build_docker
cmake -G Ninja /server "-DCMAKE_C_COMPILER=$(command -v clang-12)" "-DCMAKE_CXX_COMPILER=$(command -v clang++-12)"
cmake -G Ninja /server "-DCMAKE_C_COMPILER=$(command -v clang-13)" "-DCMAKE_CXX_COMPILER=$(command -v clang++-13)"
# Set the number of build jobs to the half of number of virtual CPU cores (rounded up).
# By default, ninja use all virtual CPU cores, that leads to very high memory consumption without much improvement in build time.

2
docker/packager/binary/Dockerfile
View File

@ -53,8 +53,6 @@ RUN apt-get update \
lld-${LLVM_VERSION} \
llvm-${LLVM_VERSION} \
llvm-${LLVM_VERSION}-dev \
libicu-dev \
libreadline-dev \
moreutils \
ninja-build \
pigz \

12
docker/packager/deb/Dockerfile
View File

@ -1,7 +1,7 @@
# docker build -t yandex/clickhouse-deb-builder .
FROM ubuntu:20.04
ENV DEBIAN_FRONTEND=noninteractive LLVM_VERSION=12
ENV DEBIAN_FRONTEND=noninteractive LLVM_VERSION=13
RUN sed -i 's|http://archive|http://ru.archive|g' /etc/apt/sources.list
@ -37,17 +37,17 @@ RUN curl -O https://clickhouse-datasets.s3.yandex.net/utils/1/dpkg-deb \
RUN apt-get update \
&& apt-get install \
alien \
clang-12 \
clang-tidy-12 \
clang-${LLVM_VERSION} \
clang-tidy-${LLVM_VERSION} \
cmake \
debhelper \
devscripts \
gdb \
git \
gperf \
lld-12 \
llvm-12 \
llvm-12-dev \
lld-${LLVM_VERSION} \
llvm-${LLVM_VERSION} \
llvm-${LLVM_VERSION}-dev \
moreutils \
ninja-build \
perl \

3
docker/packager/packager
View File

@ -205,7 +205,8 @@ if __name__ == "__main__":
parser.add_argument("--build-type", choices=("debug", ""), default="")
parser.add_argument("--compiler", choices=("clang-11", "clang-11-darwin", "clang-11-darwin-aarch64", "clang-11-aarch64",
"clang-12", "clang-12-darwin", "clang-12-darwin-aarch64", "clang-12-aarch64",
"clang-11-freebsd", "clang-12-freebsd", "gcc-10"), default="clang-12")
"clang-13", "clang-13-darwin", "clang-13-darwin-aarch64", "clang-13-aarch64",
"clang-11-freebsd", "clang-12-freebsd", "clang-13-freebsd", "gcc-10"), default="clang-13")
parser.add_argument("--sanitizer", choices=("address", "thread", "memory", "undefined", ""), default="")
parser.add_argument("--unbundled", action="store_true")
parser.add_argument("--split-binary", action="store_true")

2
docker/test/base/Dockerfile
View File

@ -1,7 +1,7 @@
# docker build -t yandex/clickhouse-test-base .
FROM ubuntu:20.04
ENV DEBIAN_FRONTEND=noninteractive LLVM_VERSION=12
ENV DEBIAN_FRONTEND=noninteractive LLVM_VERSION=13
RUN sed -i 's|http://archive|http://ru.archive|g' /etc/apt/sources.list

4
docker/test/codebrowser/Dockerfile
View File

@ -11,7 +11,7 @@ RUN apt-get update && apt-get --yes --allow-unauthenticated install clang-9 libl
# https://github.com/ClickHouse-Extras/woboq_codebrowser/commit/37e15eaf377b920acb0b48dbe82471be9203f76b
RUN git clone https://github.com/ClickHouse-Extras/woboq_codebrowser
RUN cd woboq_codebrowser && cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=clang\+\+-12 -DCMAKE_C_COMPILER=clang-12 && make -j
RUN cd woboq_codebrowser && cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=clang\+\+-13 -DCMAKE_C_COMPILER=clang-13 && make -j
ENV CODEGEN=/woboq_codebrowser/generator/codebrowser_generator
ENV CODEINDEX=/woboq_codebrowser/indexgenerator/codebrowser_indexgenerator
@ -24,7 +24,7 @@ ENV SHA=nosha
ENV DATA="data"
CMD mkdir -p $BUILD_DIRECTORY && cd $BUILD_DIRECTORY && \
cmake $SOURCE_DIRECTORY -DCMAKE_CXX_COMPILER=/usr/bin/clang\+\+-12 -DCMAKE_C_COMPILER=/usr/bin/clang-12 -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DENABLE_EMBEDDED_COMPILER=0 -DENABLE_S3=0 && \
cmake $SOURCE_DIRECTORY -DCMAKE_CXX_COMPILER=/usr/bin/clang\+\+-13 -DCMAKE_C_COMPILER=/usr/bin/clang-13 -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DENABLE_EMBEDDED_COMPILER=0 -DENABLE_S3=0 && \
mkdir -p $HTML_RESULT_DIRECTORY && \
$CODEGEN -b $BUILD_DIRECTORY -a -o $HTML_RESULT_DIRECTORY -p ClickHouse:$SOURCE_DIRECTORY:$SHA -d $DATA | ts '%Y-%m-%d %H:%M:%S' && \
cp -r $STATIC_DATA $HTML_RESULT_DIRECTORY/ &&\

2
docker/test/fasttest/Dockerfile
View File

@ -1,7 +1,7 @@
# docker build -t yandex/clickhouse-fasttest .
FROM ubuntu:20.04
ENV DEBIAN_FRONTEND=noninteractive LLVM_VERSION=12
ENV DEBIAN_FRONTEND=noninteractive LLVM_VERSION=13
RUN sed -i 's|http://archive|http://ru.archive|g' /etc/apt/sources.list

2
docker/test/fasttest/run.sh
View File

@ -9,7 +9,7 @@ trap 'kill $(jobs -pr) ||:' EXIT
stage=${stage:-}
# Compiler version, normally set by Dockerfile
export LLVM_VERSION=${LLVM_VERSION:-12}
export LLVM_VERSION=${LLVM_VERSION:-13}
# A variable to pass additional flags to CMake.
# Here we explicitly default it to nothing so that bash doesn't complain about

2
docker/test/fuzzer/run-fuzzer.sh
View File

@ -12,7 +12,7 @@ stage=${stage:-}
script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
echo "$script_dir"
repo_dir=ch
BINARY_TO_DOWNLOAD=${BINARY_TO_DOWNLOAD:="clang-12_debug_none_bundled_unsplitted_disable_False_binary"}
BINARY_TO_DOWNLOAD=${BINARY_TO_DOWNLOAD:="clang-13_debug_none_bundled_unsplitted_disable_False_binary"}
function clone
{

2
docker/test/keeper-jepsen/run.sh
View File

@ -2,7 +2,7 @@
set -euo pipefail
CLICKHOUSE_PACKAGE=${CLICKHOUSE_PACKAGE:="https://clickhouse-builds.s3.yandex.net/$PR_TO_TEST/$SHA_TO_TEST/clickhouse_build_check/clang-12_relwithdebuginfo_none_bundled_unsplitted_disable_False_binary/clickhouse"}
CLICKHOUSE_PACKAGE=${CLICKHOUSE_PACKAGE:="https://clickhouse-builds.s3.yandex.net/$PR_TO_TEST/$SHA_TO_TEST/clickhouse_build_check/clang-13_relwithdebuginfo_none_bundled_unsplitted_disable_False_binary/clickhouse"}
CLICKHOUSE_REPO_PATH=${CLICKHOUSE_REPO_PATH:=""}

8
docs/en/development/build.md
View File

@ -23,7 +23,7 @@ $ sudo apt-get install git cmake python ninja-build
Or cmake3 instead of cmake on older systems.
### Install clang-12 (recommended) {#install-clang-12}
### Install clang-13 (recommended) {#install-clang-13}
On Ubuntu/Debian you can use the automatic installation script (check [official webpage](https://apt.llvm.org/))
@ -33,11 +33,11 @@ sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)"
For other Linux distribution - check the availability of the [prebuild packages](https://releases.llvm.org/download.html) or build clang [from sources](https://clang.llvm.org/get_started.html).
#### Use clang-12 for Builds
#### Use clang-13 for Builds
``` bash
$ export CC=clang-12
$ export CXX=clang++-12
$ export CC=clang-13
$ export CXX=clang++-13
```
Gcc can also be used though it is discouraged.

114
tests/ci/ci_config.json
View File

@ -1,7 +1,7 @@
{
"build_config": [
{
"compiler": "clang-12",
"compiler": "clang-13",
"build-type": "",
"sanitizer": "",
"package-type": "deb",
@ -12,7 +12,7 @@
"with_coverage": false
},
{
"compiler": "clang-12",
"compiler": "clang-13",
"build-type": "",
"sanitizer": "",
"package-type": "performance",
@ -32,7 +32,7 @@
"with_coverage": false
},
{
"compiler": "clang-12",
"compiler": "clang-13",
"build-type": "",
"sanitizer": "address",
"package-type": "deb",
@ -42,7 +42,7 @@
"with_coverage": false
},
{
"compiler": "clang-12",
"compiler": "clang-13",
"build-type": "",
"sanitizer": "undefined",
"package-type": "deb",
@ -52,7 +52,7 @@
"with_coverage": false
},
{
"compiler": "clang-12",
"compiler": "clang-13",
"build-type": "",
"sanitizer": "thread",
"package-type": "deb",
@ -62,7 +62,7 @@
"with_coverage": false
},
{
"compiler": "clang-12",
"compiler": "clang-13",
"build-type": "",
"sanitizer": "memory",
"package-type": "deb",
@ -72,7 +72,7 @@
"with_coverage": false
},
{
"compiler": "clang-12",
"compiler": "clang-13",
"build-type": "debug",
"sanitizer": "",
"package-type": "deb",
@ -92,7 +92,7 @@
"with_coverage": false
},
{
"compiler": "clang-12",
"compiler": "clang-13",
"build-type": "",
"sanitizer": "",
"package-type": "binary",
@ -104,7 +104,7 @@
],
"special_build_config": [
{
"compiler": "clang-12",
"compiler": "clang-13",
"build-type": "debug",
"sanitizer": "",
"package-type": "deb",
@ -114,7 +114,7 @@
"with_coverage": false
},
{
"compiler": "clang-12",
"compiler": "clang-13",
"build-type": "",
"sanitizer": "",
"package-type": "binary",
@ -124,7 +124,7 @@
"with_coverage": false
},
{
"compiler": "clang-12-darwin",
"compiler": "clang-13-darwin",
"build-type": "",
"sanitizer": "",
"package-type": "binary",
@ -134,7 +134,7 @@
"with_coverage": false
},
{
"compiler": "clang-12-aarch64",
"compiler": "clang-13-aarch64",
"build-type": "",
"sanitizer": "",
"package-type": "binary",
@ -144,7 +144,7 @@
"with_coverage": false
},
{
"compiler": "clang-12-freebsd",
"compiler": "clang-13-freebsd",
"build-type": "",
"sanitizer": "",
"package-type": "binary",
@ -154,7 +154,7 @@
"with_coverage": false
},
{
"compiler": "clang-12-darwin-aarch64",
"compiler": "clang-13-darwin-aarch64",
"build-type": "",
"sanitizer": "",
"package-type": "binary",
@ -167,7 +167,7 @@
"tests_config": {
"Functional stateful tests (address)": {
"required_build_properties": {
"compiler": "clang-12",
"compiler": "clang-13",
"package_type": "deb",
"build_type": "relwithdebuginfo",
"sanitizer": "address",
@ -179,7 +179,7 @@
},
"Functional stateful tests (thread)": {
"required_build_properties": {
"compiler": "clang-12",
"compiler": "clang-13",
"package_type": "deb",
"build_type": "relwithdebuginfo",
"sanitizer": "thread",
@ -191,7 +191,7 @@
},
"Functional stateful tests (memory)": {
"required_build_properties": {
"compiler": "clang-12",
"compiler": "clang-13",
"package_type": "deb",
"build_type": "relwithdebuginfo",
"sanitizer": "memory",
@ -203,7 +203,7 @@
},
"Functional stateful tests (ubsan)": {
"required_build_properties": {
"compiler": "clang-12",
"compiler": "clang-13",
"package_type": "deb",
"build_type": "relwithdebuginfo",
"sanitizer": "undefined",
@ -215,7 +215,7 @@
},
"Functional stateful tests (debug)": {
"required_build_properties": {
"compiler": "clang-12",
"compiler": "clang-13",
"package_type": "deb",
"build_type": "debug",
"sanitizer": "none",
@ -227,7 +227,7 @@
},
"Functional stateful tests (release)": {
"required_build_properties": {
"compiler": "clang-12",
"compiler": "clang-13",
"package_type": "deb",
"build_type": "relwithdebuginfo",
"sanitizer": "none",
@ -239,7 +239,7 @@
},
"Functional stateful tests (release, DatabaseOrdinary)": {
"required_build_properties": {
"compiler": "clang-12",
"compiler": "clang-13",
"package_type": "deb",
"build_type": "relwithdebuginfo",
"sanitizer": "none",
@ -251,7 +251,7 @@
},
"Functional stateful tests (release, DatabaseReplicated)": {
"required_build_properties": {
"compiler": "clang-12",
"compiler": "clang-13",
"package_type": "deb",
"build_type": "relwithdebuginfo",
"sanitizer": "none",
@ -263,7 +263,7 @@
},
"Functional stateless tests (address)": {
"required_build_properties": {
"compiler": "clang-12",
"compiler": "clang-13",
"package_type": "deb",
"build_type": "relwithdebuginfo",
"sanitizer": "address",
@ -275,7 +275,7 @@
},
"Functional stateless tests (thread)": {
"required_build_properties": {
"compiler": "clang-12",
"compiler": "clang-13",
"package_type": "deb",
"build_type": "relwithdebuginfo",
"sanitizer": "thread",
@ -287,7 +287,7 @@
},
"Functional stateless tests (memory)": {
"required_build_properties": {
"compiler": "clang-12",
"compiler": "clang-13",
"package_type": "deb",
"build_type": "relwithdebuginfo",
"sanitizer": "memory",
@ -299,7 +299,7 @@
},
"Functional stateless tests (ubsan)": {
"required_build_properties": {
"compiler": "clang-12",
"compiler": "clang-13",
"package_type": "deb",
"build_type": "relwithdebuginfo",
"sanitizer": "undefined",
@ -311,7 +311,7 @@
},
"Functional stateless tests (debug)": {
"required_build_properties": {
"compiler": "clang-12",
"compiler": "clang-13",
"package_type": "deb",
"build_type": "debug",
"sanitizer": "none",
@ -323,7 +323,7 @@
},
"Functional stateless tests (release)": {
"required_build_properties": {
"compiler": "clang-12",
"compiler": "clang-13",
"package_type": "deb",
"build_type": "relwithdebuginfo",
"sanitizer": "none",
@ -335,7 +335,7 @@
},
"Functional stateless tests (pytest)": {
"required_build_properties": {
"compiler": "clang-12",
"compiler": "clang-13",
"package_type": "deb",
"build_type": "relwithdebuginfo",
"sanitizer": "none",
@ -359,7 +359,7 @@
},
"Functional stateless tests (release, wide parts enabled)": {
"required_build_properties": {
"compiler": "clang-12",
"compiler": "clang-13",
"package_type": "deb",
"build_type": "relwithdebuginfo",
"sanitizer": "none",
@ -371,7 +371,7 @@
},
"Functional stateless tests (release, DatabaseOrdinary)": {
"required_build_properties": {
"compiler": "clang-12",
"compiler": "clang-13",
"package_type": "deb",
"build_type": "relwithdebuginfo",
"sanitizer": "none",
@ -383,7 +383,7 @@
},
"Functional stateless tests (release, DatabaseReplicated)": {
"required_build_properties": {
"compiler": "clang-12",
"compiler": "clang-13",
"package_type": "deb",
"build_type": "relwithdebuginfo",
"sanitizer": "none",
@ -395,7 +395,7 @@
},
"Stress test (address)": {
"required_build_properties": {
"compiler": "clang-12",
"compiler": "clang-13",
"package_type": "deb",
"build_type": "relwithdebuginfo",
"sanitizer": "address",
@ -407,7 +407,7 @@
},
"Stress test (thread)": {
"required_build_properties": {
"compiler": "clang-12",
"compiler": "clang-13",
"package_type": "deb",
"build_type": "relwithdebuginfo",
"sanitizer": "thread",
@ -419,7 +419,7 @@
},
"Stress test (undefined)": {
"required_build_properties": {
"compiler": "clang-12",
"compiler": "clang-13",
"package_type": "deb",
"build_type": "relwithdebuginfo",
"sanitizer": "undefined",
@ -431,7 +431,7 @@
},
"Stress test (memory)": {
"required_build_properties": {
"compiler": "clang-12",
"compiler": "clang-13",
"package_type": "deb",
"build_type": "relwithdebuginfo",
"sanitizer": "memory",
@ -443,7 +443,7 @@
},
"Stress test (debug)": {
"required_build_properties": {
"compiler": "clang-12",
"compiler": "clang-13",
"package_type": "deb",
"build_type": "debug",
"sanitizer": "none",
@ -455,7 +455,7 @@
},
"Integration tests (asan)": {
"required_build_properties": {
"compiler": "clang-12",
"compiler": "clang-13",
"package_type": "deb",
"build_type": "relwithdebuginfo",
"sanitizer": "address",
@ -467,7 +467,7 @@
},
"Integration tests (thread)": {
"required_build_properties": {
"compiler": "clang-12",
"compiler": "clang-13",
"package_type": "deb",
"build_type": "relwithdebuginfo",
"sanitizer": "thread",
@ -479,7 +479,7 @@
},
"Integration tests (release)": {
"required_build_properties": {
"compiler": "clang-12",
"compiler": "clang-13",
"package_type": "deb",
"build_type": "relwithdebuginfo",
"sanitizer": "none",
@ -491,7 +491,7 @@
},
"Integration tests (memory)": {
"required_build_properties": {
"compiler": "clang-12",
"compiler": "clang-13",
"package_type": "deb",
"build_type": "relwithdebuginfo",
"sanitizer": "memory",
@ -503,7 +503,7 @@
},
"Integration tests flaky check (asan)": {
"required_build_properties": {
"compiler": "clang-12",
"compiler": "clang-13",
"package_type": "deb",
"build_type": "relwithdebuginfo",
"sanitizer": "address",
@ -515,7 +515,7 @@
},
"Compatibility check": {
"required_build_properties": {
"compiler": "clang-12",
"compiler": "clang-13",
"package_type": "deb",
"build_type": "relwithdebuginfo",
"sanitizer": "none",
@ -527,7 +527,7 @@
},
"Split build smoke test": {
"required_build_properties": {
"compiler": "clang-12",
"compiler": "clang-13",
"package_type": "binary",
"build_type": "relwithdebuginfo",
"sanitizer": "none",
@ -539,7 +539,7 @@
},
"Testflows check": {
"required_build_properties": {
"compiler": "clang-12",
"compiler": "clang-13",
"package_type": "deb",
"build_type": "relwithdebuginfo",
"sanitizer": "none",
@ -563,7 +563,7 @@
},
"Unit tests release clang": {
"required_build_properties": {
"compiler": "clang-12",
"compiler": "clang-13",
"package_type": "binary",
"build_type": "relwithdebuginfo",
"sanitizer": "none",
@ -575,7 +575,7 @@
},
"Unit tests ASAN": {
"required_build_properties": {
"compiler": "clang-12",
"compiler": "clang-13",
"package_type": "binary",
"build_type": "relwithdebuginfo",
"sanitizer": "address",
@ -587,7 +587,7 @@
},
"Unit tests MSAN": {
"required_build_properties": {
"compiler": "clang-12",
"compiler": "clang-13",
"package_type": "binary",
"build_type": "relwithdebuginfo",
"sanitizer": "memory",
@ -599,7 +599,7 @@
},
"Unit tests TSAN": {
"required_build_properties": {
"compiler": "clang-12",
"compiler": "clang-13",
"package_type": "binary",
"build_type": "relwithdebuginfo",
"sanitizer": "thread",
@ -611,7 +611,7 @@
},
"Unit tests UBSAN": {
"required_build_properties": {
"compiler": "clang-12",
"compiler": "clang-13",
"package_type": "binary",
"build_type": "relwithdebuginfo",
"sanitizer": "thread",
@ -623,7 +623,7 @@
},
"AST fuzzer (debug)": {
"required_build_properties": {
"compiler": "clang-12",
"compiler": "clang-13",
"package_type": "binary",
"build_type": "debug",
"sanitizer": "none",
@ -635,7 +635,7 @@
},
"AST fuzzer (ASan)": {
"required_build_properties": {
"compiler": "clang-12",
"compiler": "clang-13",
"package_type": "binary",
"build_type": "relwithdebuginfo",
"sanitizer": "address",
@ -647,7 +647,7 @@
},
"AST fuzzer (MSan)": {
"required_build_properties": {
"compiler": "clang-12",
"compiler": "clang-13",
"package_type": "binary",
"build_type": "relwithdebuginfo",
"sanitizer": "memory",
@ -659,7 +659,7 @@
},
"AST fuzzer (TSan)": {
"required_build_properties": {
"compiler": "clang-12",
"compiler": "clang-13",
"package_type": "binary",
"build_type": "relwithdebuginfo",
"sanitizer": "thread",
@ -671,7 +671,7 @@
},
"AST fuzzer (UBSan)": {
"required_build_properties": {
"compiler": "clang-12",
"compiler": "clang-13",
"package_type": "binary",
"build_type": "relwithdebuginfo",
"sanitizer": "undefined",
@ -683,7 +683,7 @@
},
"Release": {
"required_build_properties": {
"compiler": "clang-12",
"compiler": "clang-13",
"package_type": "deb",
"build_type": "relwithdebuginfo",
"sanitizer": "none",
@ -695,7 +695,7 @@
},
"Functional stateless tests flaky check (address)": {
"required_build_properties": {
"compiler": "clang-12",
"compiler": "clang-13",
"package_type": "deb",
"build_type": "relwithdebuginfo",
"sanitizer": "address",