update coverage tools to llvm-10

update coverage tools to llvm-10

docker/test/coverage/Dockerfile

@@ -12,14 +12,13 @@ RUN apt-get --allow-unauthenticated update -y \
     software-properties-common
 
 
-RUN echo "deb [trusted=yes] http://apt.llvm.org/bionic/ llvm-toolchain-bionic-9 main" >> /etc/apt/sources.list
-
 RUN apt-get --allow-unauthenticated update -y \
     && env DEBIAN_FRONTEND=noninteractive \
         apt-get --allow-unauthenticated install --yes --no-install-recommends \
             perl \
             lcov \
-            llvm-9 \
+            clang-10 \
+            llvm-10 \
             tzdata
 
 
@@ -29,8 +28,8 @@ ENV OUTPUT_DIR=/output
 ENV IGNORE='.*contrib.*'
 
 
-CMD mkdir -p /build/obj-x86_64-linux-gnu && cd /build/obj-x86_64-linux-gnu && CC=clang-9 CXX=clang++-9 cmake .. && cd /; \
+CMD mkdir -p /build/obj-x86_64-linux-gnu && cd /build/obj-x86_64-linux-gnu && CC=clang-10 CXX=clang++-10 cmake .. && cd /; \
     dpkg -i /package_folder/clickhouse-common-static_*.deb; \
-    llvm-profdata-9 merge -sparse ${COVERAGE_DIR}/* -o clickhouse.profdata && \
-    llvm-cov-9 export /usr/bin/clickhouse -instr-profile=clickhouse.profdata -j=16 -format=lcov -skip-functions -ignore-filename-regex $IGNORE > output.lcov && \
+    llvm-profdata-10 merge -sparse ${COVERAGE_DIR}/* -o clickhouse.profdata && \
+    llvm-cov-10 export /usr/bin/clickhouse -instr-profile=clickhouse.profdata -j=16 -format=lcov -skip-functions -ignore-filename-regex $IGNORE > output.lcov && \
     genhtml output.lcov --ignore-errors source --output-directory ${OUTPUT_DIR}

docker/test/stateful_with_coverage/Dockerfile

@@ -6,9 +6,7 @@ RUN echo "deb [trusted=yes] http://apt.llvm.org/bionic/ llvm-toolchain-bionic-9
 RUN apt-get update -y \
     && env DEBIAN_FRONTEND=noninteractive \
         apt-get install --yes --no-install-recommends \
-        python-requests \
-        llvm-8 \
-        llvm-9
+        python-requests
 
 COPY s3downloader /s3downloader
 COPY run.sh /run.sh

docker/test/stateful_with_coverage/run.sh

@@ -20,9 +20,9 @@ start_clickhouse () {
 }
 
 wait_llvm_profdata () {
-    while kill -0 `pgrep llvm-profdata-9`;
+    while kill -0 `pgrep llvm-profdata-10`;
     do
-        echo "Waiting for profdata" `pgrep llvm-profdata-9` "still alive"
+        echo "Waiting for profdata" `pgrep llvm-profdata-10` "still alive"
         sleep 3
     done
 }
@@ -31,7 +31,7 @@ merge_client_files_in_background () {
     client_files=`ls /client_*profraw 2>/dev/null`
     if [ ! -z "$client_files" ]
     then
-        llvm-profdata-9 merge -sparse $client_files -o merged_client_`date +%s`.profraw
+        llvm-profdata-10 merge -sparse $client_files -o merged_client_`date +%s`.profraw
         rm $client_files
     fi
 }

docker/test/stateless_with_coverage/Dockerfile

@@ -4,8 +4,6 @@ FROM yandex/clickhouse-deb-builder
 
 ARG odbc_driver_url="https://github.com/ClickHouse/clickhouse-odbc/releases/download/v1.1.4.20200302/clickhouse-odbc-1.1.4-Linux.tar.gz"
 
-RUN echo "deb [trusted=yes] http://apt.llvm.org/bionic/ llvm-toolchain-bionic-9 main" >> /etc/apt/sources.list
-
 RUN apt-get update -y \
     && env DEBIAN_FRONTEND=noninteractive \
         apt-get install --yes --no-install-recommends \
@@ -31,7 +29,6 @@ RUN apt-get update -y \
             brotli \
             gdb \
             lsof \
-            llvm-9 \
             unixodbc \
             wget \
             qemu-user-static