diff --git a/CMakeLists.txt b/CMakeLists.txt index 65ff9dc5384..421f5f7dfe6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -101,17 +101,6 @@ if (ENABLE_FUZZING) set (ENABLE_PROTOBUF 1) endif() -option (ENABLE_WOBOQ_CODEBROWSER "Build for woboq codebrowser" OFF) - -if (ENABLE_WOBOQ_CODEBROWSER) - set (ENABLE_EMBEDDED_COMPILER 0) - set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-poison-system-directories") - # woboq codebrowser uses clang tooling, and they could add default system - # clang includes, and later clang will warn for those added by itself - # includes. - set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-poison-system-directories") -endif() - # Global libraries # See: # - default_libs.cmake diff --git a/README.md b/README.md index 4ff9b9caaa1..6d253342a15 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,6 @@ curl https://clickhouse.com/ | sh * [YouTube channel](https://www.youtube.com/c/ClickHouseDB) has a lot of content about ClickHouse in video format. * [Slack](https://clickhouse.com/slack) and [Telegram](https://telegram.me/clickhouse_en) allow chatting with ClickHouse users in real-time. * [Blog](https://clickhouse.com/blog/) contains various ClickHouse-related articles, as well as announcements and reports about events. -* [Code Browser (Woboq)](https://clickhouse.com/codebrowser/ClickHouse/index.html) with syntax highlighting and navigation. * [Code Browser (github.dev)](https://github.dev/ClickHouse/ClickHouse) with syntax highlighting, powered by github.dev. * [Static Analysis (SonarCloud)](https://sonarcloud.io/project/issues?resolved=false&id=ClickHouse_ClickHouse) proposes C++ quality improvements. * [Contacts](https://clickhouse.com/company/contact) can help to get your questions answered if there are any. diff --git a/docker/images.json b/docker/images.json index d895e2da2f0..a70eb9df2ef 100644 --- a/docker/images.json +++ b/docker/images.json @@ -1,9 +1,7 @@ { "docker/packager/binary": { "name": "clickhouse/binary-builder", - "dependent": [ - "docker/test/codebrowser" - ] + "dependent": [] }, "docker/test/compatibility/centos": { "name": "clickhouse/test-old-centos", @@ -59,10 +57,6 @@ "name": "clickhouse/upgrade-check", "dependent": [] }, - "docker/test/codebrowser": { - "name": "clickhouse/codebrowser", - "dependent": [] - }, "docker/test/integration/runner": { "only_amd64": true, "name": "clickhouse/integration-tests-runner", diff --git a/docker/test/codebrowser/Dockerfile b/docker/test/codebrowser/Dockerfile deleted file mode 100644 index 8136fd1fbbc..00000000000 --- a/docker/test/codebrowser/Dockerfile +++ /dev/null @@ -1,30 +0,0 @@ -# rebuild in #33610 -# docker build --network=host -t clickhouse/codebrowser . -# docker run --volume=path_to_repo:/repo_folder --volume=path_to_result:/test_output clickhouse/codebrowser -ARG FROM_TAG=latest -FROM clickhouse/binary-builder:$FROM_TAG - -# ARG for quick switch to a given ubuntu mirror -ARG apt_archive="http://archive.ubuntu.com" -RUN sed -i "s|http://archive.ubuntu.com|$apt_archive|g" /etc/apt/sources.list - -RUN apt-get update && apt-get --yes --allow-unauthenticated install libclang-${LLVM_VERSION}-dev libmlir-${LLVM_VERSION}-dev - -ARG TARGETARCH -RUN arch=${TARGETARCH:-amd64} \ - && case $arch in \ - amd64) rarch=x86_64 ;; \ - arm64) rarch=aarch64 ;; \ - *) exit 1 ;; \ - esac - -# repo versions doesn't work correctly with C++17 -# also we push reports to s3, so we add index.html to subfolder urls -# https://github.com/ClickHouse/woboq_codebrowser/commit/37e15eaf377b920acb0b48dbe82471be9203f76b -RUN git clone --branch=master --depth=1 https://github.com/ClickHouse/woboq_codebrowser /woboq_codebrowser \ - && cd /woboq_codebrowser \ - && cmake . -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=clang\+\+-${LLVM_VERSION} -DCMAKE_C_COMPILER=clang-${LLVM_VERSION} -DCLANG_BUILTIN_HEADERS_DIR=/usr/lib/llvm-${LLVM_VERSION}/lib/clang/${LLVM_VERSION}/include \ - && ninja - -COPY build.sh / -CMD ["bash", "-c", "/build.sh 2>&1"] diff --git a/docker/test/codebrowser/build.sh b/docker/test/codebrowser/build.sh deleted file mode 100755 index d76d0c3a039..00000000000 --- a/docker/test/codebrowser/build.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/env bash - -set -x -e - - -STATIC_DATA=${STATIC_DATA:-/woboq_codebrowser/data} -SOURCE_DIRECTORY=${SOURCE_DIRECTORY:-/build} -BUILD_DIRECTORY=${BUILD_DIRECTORY:-/workdir/build} -OUTPUT_DIRECTORY=${OUTPUT_DIRECTORY:-/workdir/output} -HTML_RESULT_DIRECTORY=${HTML_RESULT_DIRECTORY:-$OUTPUT_DIRECTORY/html_report} -SHA=${SHA:-nosha} -DATA=${DATA:-https://s3.amazonaws.com/clickhouse-test-reports/codebrowser/data} -nproc=$(($(nproc) + 2)) # increase parallelism - -read -ra CMAKE_FLAGS <<< "${CMAKE_FLAGS:-}" - -mkdir -p "$BUILD_DIRECTORY" && cd "$BUILD_DIRECTORY" -cmake "$SOURCE_DIRECTORY" -DCMAKE_CXX_COMPILER="/usr/bin/clang++-${LLVM_VERSION}" -DCMAKE_C_COMPILER="/usr/bin/clang-${LLVM_VERSION}" -DENABLE_WOBOQ_CODEBROWSER=ON "${CMAKE_FLAGS[@]}" -mkdir -p "$HTML_RESULT_DIRECTORY" -echo 'Filter out too noisy "Error: filename" lines and keep them in full codebrowser_generator.log' -/woboq_codebrowser/generator/codebrowser_generator -b "$BUILD_DIRECTORY" -a \ - -o "$HTML_RESULT_DIRECTORY" --execute-concurrency="$nproc" -p "ClickHouse:$SOURCE_DIRECTORY:$SHA" \ - -d "$DATA" \ - |& ts '%Y-%m-%d %H:%M:%S' \ - | tee "$OUTPUT_DIRECTORY/codebrowser_generator.log" \ - | grep --line-buffered -v ':[0-9]* Error: ' -cp -r "$STATIC_DATA" "$HTML_RESULT_DIRECTORY/" -/woboq_codebrowser/indexgenerator/codebrowser_indexgenerator "$HTML_RESULT_DIRECTORY" \ - -d "$DATA" |& ts '%Y-%m-%d %H:%M:%S' diff --git a/docs/en/development/developer-instruction.md b/docs/en/development/developer-instruction.md index d632829d6a6..8ec049dd004 100644 --- a/docs/en/development/developer-instruction.md +++ b/docs/en/development/developer-instruction.md @@ -276,8 +276,6 @@ Most probably some of the builds will fail at first times. This is due to the fa ## Browse ClickHouse Source Code {#browse-clickhouse-source-code} -You can use the **Woboq** online code browser available [here](https://clickhouse.com/codebrowser/ClickHouse/src/index.html). It provides code navigation, semantic highlighting, search and indexing. The code snapshot is updated daily. - You can use GitHub integrated code browser [here](https://github.dev/ClickHouse/ClickHouse). Also, you can browse sources on [GitHub](https://github.com/ClickHouse/ClickHouse) as usual. diff --git a/docs/ru/development/developer-instruction.md b/docs/ru/development/developer-instruction.md index 7294bc2ae87..c63622594e4 100644 --- a/docs/ru/development/developer-instruction.md +++ b/docs/ru/development/developer-instruction.md @@ -289,6 +289,4 @@ Pull request можно создать, даже если работа над з ## Навигация по коду ClickHouse {#navigatsiia-po-kodu-clickhouse} -Для навигации по коду онлайн доступен **Woboq**, он расположен [здесь](https://clickhouse.com/codebrowser/ClickHouse/src/index.html). В нём реализовано удобное перемещение между исходными файлами, семантическая подсветка, подсказки, индексация и поиск. Слепок кода обновляется ежедневно. - Также вы можете просматривать исходники на [GitHub](https://github.com/ClickHouse/ClickHouse). diff --git a/docs/zh/development/developer-instruction.md b/docs/zh/development/developer-instruction.md index 557bf33ee0c..1c1d4a03d64 100644 --- a/docs/zh/development/developer-instruction.md +++ b/docs/zh/development/developer-instruction.md @@ -270,6 +270,4 @@ ClickHouse成员一旦在您的拉取请求上贴上«可以测试»标签，就 ## 浏览ClickHouse源代码 {#browse-clickhouse-source-code} -您可以使用 **Woboq** 在线代码浏览器 [点击这里](https://clickhouse.com/codebrowser/ClickHouse/src/index.html). 它提供了代码导航和语义突出显示、搜索和索引。 代码快照每天更新。 - 此外，您还可以像往常一样浏览源代码 [GitHub](https://github.com/ClickHouse/ClickHouse) diff --git a/utils/check-style/aspell-ignore/en/aspell-dict.txt b/utils/check-style/aspell-ignore/en/aspell-dict.txt index bcb971951e5..2f14edda20d 100644 --- a/utils/check-style/aspell-ignore/en/aspell-dict.txt +++ b/utils/check-style/aspell-ignore/en/aspell-dict.txt @@ -958,7 +958,6 @@ WikiStat WindowView WithNames WithNamesAndTypes -Woboq WordNet WriteBuffer WriteBuffers