mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-11-10 09:32:06 +00:00
Merge remote-tracking branch 'upstream/master' into perf-huge-ast
This commit is contained in:
commit
256a699f43
3
.github/ISSUE_TEMPLATE/85_bug-report.md
vendored
3
.github/ISSUE_TEMPLATE/85_bug-report.md
vendored
@ -21,8 +21,7 @@ assignees: ''
|
|||||||
|
|
||||||
**Enable crash reporting**
|
**Enable crash reporting**
|
||||||
|
|
||||||
> If possible, change "enabled" to true in "send_crash_reports" section in `config.xml`:
|
> Change "enabled" to true in "send_crash_reports" section in `config.xml`:
|
||||||
|
|
||||||
```
|
```
|
||||||
<send_crash_reports>
|
<send_crash_reports>
|
||||||
<!-- Changing <enabled> to true allows sending crash reports to -->
|
<!-- Changing <enabled> to true allows sending crash reports to -->
|
||||||
|
1
.github/workflows/backport_branches.yml
vendored
1
.github/workflows/backport_branches.yml
vendored
@ -76,6 +76,7 @@ jobs:
|
|||||||
uses: ClickHouse/checkout@v1
|
uses: ClickHouse/checkout@v1
|
||||||
with:
|
with:
|
||||||
clear-repository: true
|
clear-repository: true
|
||||||
|
fetch-depth: 0 # to find ancestor merge commits necessary for finding proper docker tags
|
||||||
- name: Download changed aarch64 images
|
- name: Download changed aarch64 images
|
||||||
uses: actions/download-artifact@v3
|
uses: actions/download-artifact@v3
|
||||||
with:
|
with:
|
||||||
|
1
.github/workflows/docs_check.yml
vendored
1
.github/workflows/docs_check.yml
vendored
@ -73,6 +73,7 @@ jobs:
|
|||||||
uses: ClickHouse/checkout@v1
|
uses: ClickHouse/checkout@v1
|
||||||
with:
|
with:
|
||||||
clear-repository: true
|
clear-repository: true
|
||||||
|
fetch-depth: 0 # to find ancestor merge commits necessary for finding proper docker tags
|
||||||
- name: Download changed aarch64 images
|
- name: Download changed aarch64 images
|
||||||
uses: actions/download-artifact@v3
|
uses: actions/download-artifact@v3
|
||||||
with:
|
with:
|
||||||
|
46
.github/workflows/master.yml
vendored
46
.github/workflows/master.yml
vendored
@ -60,6 +60,7 @@ jobs:
|
|||||||
uses: ClickHouse/checkout@v1
|
uses: ClickHouse/checkout@v1
|
||||||
with:
|
with:
|
||||||
clear-repository: true
|
clear-repository: true
|
||||||
|
fetch-depth: 0 # to find ancestor merge commits necessary for finding proper docker tags
|
||||||
- name: Download changed aarch64 images
|
- name: Download changed aarch64 images
|
||||||
uses: actions/download-artifact@v3
|
uses: actions/download-artifact@v3
|
||||||
with:
|
with:
|
||||||
@ -892,6 +893,48 @@ jobs:
|
|||||||
docker ps --quiet | xargs --no-run-if-empty docker kill ||:
|
docker ps --quiet | xargs --no-run-if-empty docker kill ||:
|
||||||
docker ps --all --quiet | xargs --no-run-if-empty docker rm -f ||:
|
docker ps --all --quiet | xargs --no-run-if-empty docker rm -f ||:
|
||||||
sudo rm -fr "$TEMP_PATH" "$CACHES_PATH"
|
sudo rm -fr "$TEMP_PATH" "$CACHES_PATH"
|
||||||
|
BuilderBinS390X:
|
||||||
|
needs: [DockerHubPush]
|
||||||
|
runs-on: [self-hosted, builder]
|
||||||
|
steps:
|
||||||
|
- name: Set envs
|
||||||
|
run: |
|
||||||
|
cat >> "$GITHUB_ENV" << 'EOF'
|
||||||
|
TEMP_PATH=${{runner.temp}}/build_check
|
||||||
|
IMAGES_PATH=${{runner.temp}}/images_path
|
||||||
|
REPO_COPY=${{runner.temp}}/build_check/ClickHouse
|
||||||
|
CACHES_PATH=${{runner.temp}}/../ccaches
|
||||||
|
BUILD_NAME=binary_s390x
|
||||||
|
EOF
|
||||||
|
- name: Download changed images
|
||||||
|
uses: actions/download-artifact@v3
|
||||||
|
with:
|
||||||
|
name: changed_images
|
||||||
|
path: ${{ env.IMAGES_PATH }}
|
||||||
|
- name: Check out repository code
|
||||||
|
uses: ClickHouse/checkout@v1
|
||||||
|
with:
|
||||||
|
clear-repository: true
|
||||||
|
submodules: true
|
||||||
|
fetch-depth: 0 # otherwise we will have no info about contributors
|
||||||
|
- name: Build
|
||||||
|
run: |
|
||||||
|
sudo rm -fr "$TEMP_PATH"
|
||||||
|
mkdir -p "$TEMP_PATH"
|
||||||
|
cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
|
||||||
|
cd "$REPO_COPY/tests/ci" && python3 build_check.py "$BUILD_NAME"
|
||||||
|
- name: Upload build URLs to artifacts
|
||||||
|
if: ${{ success() || failure() }}
|
||||||
|
uses: actions/upload-artifact@v3
|
||||||
|
with:
|
||||||
|
name: ${{ env.BUILD_URLS }}
|
||||||
|
path: ${{ env.TEMP_PATH }}/${{ env.BUILD_URLS }}.json
|
||||||
|
- name: Cleanup
|
||||||
|
if: always()
|
||||||
|
run: |
|
||||||
|
docker ps --quiet | xargs --no-run-if-empty docker kill ||:
|
||||||
|
docker ps --all --quiet | xargs --no-run-if-empty docker rm -f ||:
|
||||||
|
sudo rm -fr "$TEMP_PATH" "$CACHES_PATH"
|
||||||
############################################################################################
|
############################################################################################
|
||||||
##################################### Docker images #######################################
|
##################################### Docker images #######################################
|
||||||
############################################################################################
|
############################################################################################
|
||||||
@ -975,6 +1018,7 @@ jobs:
|
|||||||
- BuilderBinFreeBSD
|
- BuilderBinFreeBSD
|
||||||
- BuilderBinPPC64
|
- BuilderBinPPC64
|
||||||
- BuilderBinRISCV64
|
- BuilderBinRISCV64
|
||||||
|
- BuilderBinS390X
|
||||||
- BuilderBinAmd64Compat
|
- BuilderBinAmd64Compat
|
||||||
- BuilderBinAarch64V80Compat
|
- BuilderBinAarch64V80Compat
|
||||||
- BuilderBinClangTidy
|
- BuilderBinClangTidy
|
||||||
@ -3643,7 +3687,7 @@ jobs:
|
|||||||
cat >> "$GITHUB_ENV" << 'EOF'
|
cat >> "$GITHUB_ENV" << 'EOF'
|
||||||
TEMP_PATH=${{runner.temp}}/unit_tests_asan
|
TEMP_PATH=${{runner.temp}}/unit_tests_asan
|
||||||
REPORTS_PATH=${{runner.temp}}/reports_dir
|
REPORTS_PATH=${{runner.temp}}/reports_dir
|
||||||
CHECK_NAME=Unit tests (release-clang)
|
CHECK_NAME=Unit tests (release)
|
||||||
REPO_COPY=${{runner.temp}}/unit_tests_asan/ClickHouse
|
REPO_COPY=${{runner.temp}}/unit_tests_asan/ClickHouse
|
||||||
EOF
|
EOF
|
||||||
- name: Download json reports
|
- name: Download json reports
|
||||||
|
1
.github/workflows/nightly.yml
vendored
1
.github/workflows/nightly.yml
vendored
@ -53,6 +53,7 @@ jobs:
|
|||||||
uses: ClickHouse/checkout@v1
|
uses: ClickHouse/checkout@v1
|
||||||
with:
|
with:
|
||||||
clear-repository: true
|
clear-repository: true
|
||||||
|
fetch-depth: 0 # to find ancestor merge commits necessary for finding proper docker tags
|
||||||
- name: Download changed aarch64 images
|
- name: Download changed aarch64 images
|
||||||
uses: actions/download-artifact@v3
|
uses: actions/download-artifact@v3
|
||||||
with:
|
with:
|
||||||
|
81
.github/workflows/pull_request.yml
vendored
81
.github/workflows/pull_request.yml
vendored
@ -94,6 +94,7 @@ jobs:
|
|||||||
uses: ClickHouse/checkout@v1
|
uses: ClickHouse/checkout@v1
|
||||||
with:
|
with:
|
||||||
clear-repository: true
|
clear-repository: true
|
||||||
|
fetch-depth: 0 # to find ancestor merge commits necessary for finding proper docker tags
|
||||||
- name: Download changed aarch64 images
|
- name: Download changed aarch64 images
|
||||||
uses: actions/download-artifact@v3
|
uses: actions/download-artifact@v3
|
||||||
with:
|
with:
|
||||||
@ -952,6 +953,47 @@ jobs:
|
|||||||
docker ps --quiet | xargs --no-run-if-empty docker kill ||:
|
docker ps --quiet | xargs --no-run-if-empty docker kill ||:
|
||||||
docker ps --all --quiet | xargs --no-run-if-empty docker rm -f ||:
|
docker ps --all --quiet | xargs --no-run-if-empty docker rm -f ||:
|
||||||
sudo rm -fr "$TEMP_PATH" "$CACHES_PATH"
|
sudo rm -fr "$TEMP_PATH" "$CACHES_PATH"
|
||||||
|
BuilderBinS390X:
|
||||||
|
needs: [DockerHubPush, FastTest, StyleCheck]
|
||||||
|
runs-on: [self-hosted, builder]
|
||||||
|
steps:
|
||||||
|
- name: Set envs
|
||||||
|
run: |
|
||||||
|
cat >> "$GITHUB_ENV" << 'EOF'
|
||||||
|
TEMP_PATH=${{runner.temp}}/build_check
|
||||||
|
IMAGES_PATH=${{runner.temp}}/images_path
|
||||||
|
REPO_COPY=${{runner.temp}}/build_check/ClickHouse
|
||||||
|
CACHES_PATH=${{runner.temp}}/../ccaches
|
||||||
|
BUILD_NAME=binary_s390x
|
||||||
|
EOF
|
||||||
|
- name: Download changed images
|
||||||
|
uses: actions/download-artifact@v3
|
||||||
|
with:
|
||||||
|
name: changed_images
|
||||||
|
path: ${{ env.IMAGES_PATH }}
|
||||||
|
- name: Check out repository code
|
||||||
|
uses: ClickHouse/checkout@v1
|
||||||
|
with:
|
||||||
|
clear-repository: true
|
||||||
|
submodules: true
|
||||||
|
- name: Build
|
||||||
|
run: |
|
||||||
|
sudo rm -fr "$TEMP_PATH"
|
||||||
|
mkdir -p "$TEMP_PATH"
|
||||||
|
cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
|
||||||
|
cd "$REPO_COPY/tests/ci" && python3 build_check.py "$BUILD_NAME"
|
||||||
|
- name: Upload build URLs to artifacts
|
||||||
|
if: ${{ success() || failure() }}
|
||||||
|
uses: actions/upload-artifact@v3
|
||||||
|
with:
|
||||||
|
name: ${{ env.BUILD_URLS }}
|
||||||
|
path: ${{ env.TEMP_PATH }}/${{ env.BUILD_URLS }}.json
|
||||||
|
- name: Cleanup
|
||||||
|
if: always()
|
||||||
|
run: |
|
||||||
|
docker ps --quiet | xargs --no-run-if-empty docker kill ||:
|
||||||
|
docker ps --all --quiet | xargs --no-run-if-empty docker rm -f ||:
|
||||||
|
sudo rm -fr "$TEMP_PATH" "$CACHES_PATH"
|
||||||
############################################################################################
|
############################################################################################
|
||||||
##################################### Docker images #######################################
|
##################################### Docker images #######################################
|
||||||
############################################################################################
|
############################################################################################
|
||||||
@ -1034,6 +1076,7 @@ jobs:
|
|||||||
- BuilderBinFreeBSD
|
- BuilderBinFreeBSD
|
||||||
- BuilderBinPPC64
|
- BuilderBinPPC64
|
||||||
- BuilderBinRISCV64
|
- BuilderBinRISCV64
|
||||||
|
- BuilderBinS390X
|
||||||
- BuilderBinAmd64Compat
|
- BuilderBinAmd64Compat
|
||||||
- BuilderBinAarch64V80Compat
|
- BuilderBinAarch64V80Compat
|
||||||
- BuilderBinClangTidy
|
- BuilderBinClangTidy
|
||||||
@ -4541,7 +4584,7 @@ jobs:
|
|||||||
cat >> "$GITHUB_ENV" << 'EOF'
|
cat >> "$GITHUB_ENV" << 'EOF'
|
||||||
TEMP_PATH=${{runner.temp}}/unit_tests_asan
|
TEMP_PATH=${{runner.temp}}/unit_tests_asan
|
||||||
REPORTS_PATH=${{runner.temp}}/reports_dir
|
REPORTS_PATH=${{runner.temp}}/reports_dir
|
||||||
CHECK_NAME=Unit tests (release-clang)
|
CHECK_NAME=Unit tests (release)
|
||||||
REPO_COPY=${{runner.temp}}/unit_tests_asan/ClickHouse
|
REPO_COPY=${{runner.temp}}/unit_tests_asan/ClickHouse
|
||||||
EOF
|
EOF
|
||||||
- name: Download json reports
|
- name: Download json reports
|
||||||
@ -5182,3 +5225,39 @@ jobs:
|
|||||||
docker ps --quiet | xargs --no-run-if-empty docker kill ||:
|
docker ps --quiet | xargs --no-run-if-empty docker kill ||:
|
||||||
docker ps --all --quiet | xargs --no-run-if-empty docker rm -f ||:
|
docker ps --all --quiet | xargs --no-run-if-empty docker rm -f ||:
|
||||||
sudo rm -fr "$TEMP_PATH"
|
sudo rm -fr "$TEMP_PATH"
|
||||||
|
##############################################################################################
|
||||||
|
##################################### SQL TEST ###############################################
|
||||||
|
##############################################################################################
|
||||||
|
SQLTest:
|
||||||
|
needs: [BuilderDebRelease]
|
||||||
|
runs-on: [self-hosted, fuzzer-unit-tester]
|
||||||
|
steps:
|
||||||
|
- name: Set envs
|
||||||
|
run: |
|
||||||
|
cat >> "$GITHUB_ENV" << 'EOF'
|
||||||
|
TEMP_PATH=${{runner.temp}}/sqltest
|
||||||
|
REPORTS_PATH=${{runner.temp}}/reports_dir
|
||||||
|
CHECK_NAME=SQLTest
|
||||||
|
REPO_COPY=${{runner.temp}}/sqltest/ClickHouse
|
||||||
|
EOF
|
||||||
|
- name: Download json reports
|
||||||
|
uses: actions/download-artifact@v3
|
||||||
|
with:
|
||||||
|
path: ${{ env.REPORTS_PATH }}
|
||||||
|
- name: Check out repository code
|
||||||
|
uses: ClickHouse/checkout@v1
|
||||||
|
with:
|
||||||
|
clear-repository: true
|
||||||
|
- name: SQLTest
|
||||||
|
run: |
|
||||||
|
sudo rm -fr "$TEMP_PATH"
|
||||||
|
mkdir -p "$TEMP_PATH"
|
||||||
|
cp -r "$GITHUB_WORKSPACE" "$TEMP_PATH"
|
||||||
|
cd "$REPO_COPY/tests/ci"
|
||||||
|
python3 sqltest.py "$CHECK_NAME"
|
||||||
|
- name: Cleanup
|
||||||
|
if: always()
|
||||||
|
run: |
|
||||||
|
docker ps --quiet | xargs --no-run-if-empty docker kill ||:
|
||||||
|
docker ps --all --quiet | xargs --no-run-if-empty docker rm -f ||:
|
||||||
|
sudo rm -fr "$TEMP_PATH"
|
||||||
|
1
.github/workflows/release_branches.yml
vendored
1
.github/workflows/release_branches.yml
vendored
@ -52,6 +52,7 @@ jobs:
|
|||||||
uses: ClickHouse/checkout@v1
|
uses: ClickHouse/checkout@v1
|
||||||
with:
|
with:
|
||||||
clear-repository: true
|
clear-repository: true
|
||||||
|
fetch-depth: 0 # to find ancestor merge commits necessary for finding proper docker tags
|
||||||
- name: Download changed aarch64 images
|
- name: Download changed aarch64 images
|
||||||
uses: actions/download-artifact@v3
|
uses: actions/download-artifact@v3
|
||||||
with:
|
with:
|
||||||
|
38
.gitmodules
vendored
38
.gitmodules
vendored
@ -3,7 +3,7 @@
|
|||||||
url = https://github.com/facebook/zstd
|
url = https://github.com/facebook/zstd
|
||||||
[submodule "contrib/lz4"]
|
[submodule "contrib/lz4"]
|
||||||
path = contrib/lz4
|
path = contrib/lz4
|
||||||
url = https://github.com/lz4/lz4
|
url = https://github.com/ClickHouse/lz4
|
||||||
[submodule "contrib/librdkafka"]
|
[submodule "contrib/librdkafka"]
|
||||||
path = contrib/librdkafka
|
path = contrib/librdkafka
|
||||||
url = https://github.com/ClickHouse/librdkafka
|
url = https://github.com/ClickHouse/librdkafka
|
||||||
@ -13,7 +13,6 @@
|
|||||||
[submodule "contrib/zlib-ng"]
|
[submodule "contrib/zlib-ng"]
|
||||||
path = contrib/zlib-ng
|
path = contrib/zlib-ng
|
||||||
url = https://github.com/ClickHouse/zlib-ng
|
url = https://github.com/ClickHouse/zlib-ng
|
||||||
branch = clickhouse-2.0.x
|
|
||||||
[submodule "contrib/googletest"]
|
[submodule "contrib/googletest"]
|
||||||
path = contrib/googletest
|
path = contrib/googletest
|
||||||
url = https://github.com/google/googletest
|
url = https://github.com/google/googletest
|
||||||
@ -41,13 +40,9 @@
|
|||||||
[submodule "contrib/boost"]
|
[submodule "contrib/boost"]
|
||||||
path = contrib/boost
|
path = contrib/boost
|
||||||
url = https://github.com/ClickHouse/boost
|
url = https://github.com/ClickHouse/boost
|
||||||
[submodule "contrib/base64"]
|
|
||||||
path = contrib/base64
|
|
||||||
url = https://github.com/ClickHouse/Turbo-Base64
|
|
||||||
[submodule "contrib/arrow"]
|
[submodule "contrib/arrow"]
|
||||||
path = contrib/arrow
|
path = contrib/arrow
|
||||||
url = https://github.com/ClickHouse/arrow
|
url = https://github.com/ClickHouse/arrow
|
||||||
branch = blessed/release-6.0.1
|
|
||||||
[submodule "contrib/thrift"]
|
[submodule "contrib/thrift"]
|
||||||
path = contrib/thrift
|
path = contrib/thrift
|
||||||
url = https://github.com/apache/thrift
|
url = https://github.com/apache/thrift
|
||||||
@ -93,7 +88,6 @@
|
|||||||
[submodule "contrib/grpc"]
|
[submodule "contrib/grpc"]
|
||||||
path = contrib/grpc
|
path = contrib/grpc
|
||||||
url = https://github.com/ClickHouse/grpc
|
url = https://github.com/ClickHouse/grpc
|
||||||
branch = v1.33.2
|
|
||||||
[submodule "contrib/aws"]
|
[submodule "contrib/aws"]
|
||||||
path = contrib/aws
|
path = contrib/aws
|
||||||
url = https://github.com/ClickHouse/aws-sdk-cpp
|
url = https://github.com/ClickHouse/aws-sdk-cpp
|
||||||
@ -140,11 +134,9 @@
|
|||||||
[submodule "contrib/cassandra"]
|
[submodule "contrib/cassandra"]
|
||||||
path = contrib/cassandra
|
path = contrib/cassandra
|
||||||
url = https://github.com/ClickHouse/cpp-driver
|
url = https://github.com/ClickHouse/cpp-driver
|
||||||
branch = clickhouse
|
|
||||||
[submodule "contrib/libuv"]
|
[submodule "contrib/libuv"]
|
||||||
path = contrib/libuv
|
path = contrib/libuv
|
||||||
url = https://github.com/ClickHouse/libuv
|
url = https://github.com/ClickHouse/libuv
|
||||||
branch = clickhouse
|
|
||||||
[submodule "contrib/fmtlib"]
|
[submodule "contrib/fmtlib"]
|
||||||
path = contrib/fmtlib
|
path = contrib/fmtlib
|
||||||
url = https://github.com/fmtlib/fmt
|
url = https://github.com/fmtlib/fmt
|
||||||
@ -157,11 +149,9 @@
|
|||||||
[submodule "contrib/cyrus-sasl"]
|
[submodule "contrib/cyrus-sasl"]
|
||||||
path = contrib/cyrus-sasl
|
path = contrib/cyrus-sasl
|
||||||
url = https://github.com/ClickHouse/cyrus-sasl
|
url = https://github.com/ClickHouse/cyrus-sasl
|
||||||
branch = cyrus-sasl-2.1
|
|
||||||
[submodule "contrib/croaring"]
|
[submodule "contrib/croaring"]
|
||||||
path = contrib/croaring
|
path = contrib/croaring
|
||||||
url = https://github.com/RoaringBitmap/CRoaring
|
url = https://github.com/RoaringBitmap/CRoaring
|
||||||
branch = v0.2.66
|
|
||||||
[submodule "contrib/miniselect"]
|
[submodule "contrib/miniselect"]
|
||||||
path = contrib/miniselect
|
path = contrib/miniselect
|
||||||
url = https://github.com/danlark1/miniselect
|
url = https://github.com/danlark1/miniselect
|
||||||
@ -174,7 +164,6 @@
|
|||||||
[submodule "contrib/abseil-cpp"]
|
[submodule "contrib/abseil-cpp"]
|
||||||
path = contrib/abseil-cpp
|
path = contrib/abseil-cpp
|
||||||
url = https://github.com/abseil/abseil-cpp
|
url = https://github.com/abseil/abseil-cpp
|
||||||
branch = lts_2021_11_02
|
|
||||||
[submodule "contrib/dragonbox"]
|
[submodule "contrib/dragonbox"]
|
||||||
path = contrib/dragonbox
|
path = contrib/dragonbox
|
||||||
url = https://github.com/ClickHouse/dragonbox
|
url = https://github.com/ClickHouse/dragonbox
|
||||||
@ -187,7 +176,6 @@
|
|||||||
[submodule "contrib/boringssl"]
|
[submodule "contrib/boringssl"]
|
||||||
path = contrib/boringssl
|
path = contrib/boringssl
|
||||||
url = https://github.com/ClickHouse/boringssl
|
url = https://github.com/ClickHouse/boringssl
|
||||||
branch = unknown_branch_from_artur
|
|
||||||
[submodule "contrib/NuRaft"]
|
[submodule "contrib/NuRaft"]
|
||||||
path = contrib/NuRaft
|
path = contrib/NuRaft
|
||||||
url = https://github.com/ClickHouse/NuRaft
|
url = https://github.com/ClickHouse/NuRaft
|
||||||
@ -248,7 +236,6 @@
|
|||||||
[submodule "contrib/annoy"]
|
[submodule "contrib/annoy"]
|
||||||
path = contrib/annoy
|
path = contrib/annoy
|
||||||
url = https://github.com/ClickHouse/annoy
|
url = https://github.com/ClickHouse/annoy
|
||||||
branch = ClickHouse-master
|
|
||||||
[submodule "contrib/qpl"]
|
[submodule "contrib/qpl"]
|
||||||
path = contrib/qpl
|
path = contrib/qpl
|
||||||
url = https://github.com/intel/qpl
|
url = https://github.com/intel/qpl
|
||||||
@ -282,7 +269,6 @@
|
|||||||
[submodule "contrib/openssl"]
|
[submodule "contrib/openssl"]
|
||||||
path = contrib/openssl
|
path = contrib/openssl
|
||||||
url = https://github.com/openssl/openssl
|
url = https://github.com/openssl/openssl
|
||||||
branch = openssl-3.0
|
|
||||||
[submodule "contrib/google-benchmark"]
|
[submodule "contrib/google-benchmark"]
|
||||||
path = contrib/google-benchmark
|
path = contrib/google-benchmark
|
||||||
url = https://github.com/google/benchmark
|
url = https://github.com/google/benchmark
|
||||||
@ -331,6 +317,10 @@
|
|||||||
[submodule "contrib/liburing"]
|
[submodule "contrib/liburing"]
|
||||||
path = contrib/liburing
|
path = contrib/liburing
|
||||||
url = https://github.com/axboe/liburing
|
url = https://github.com/axboe/liburing
|
||||||
|
[submodule "contrib/libarchive"]
|
||||||
|
path = contrib/libarchive
|
||||||
|
url = https://github.com/libarchive/libarchive.git
|
||||||
|
ignore = dirty
|
||||||
[submodule "contrib/libfiu"]
|
[submodule "contrib/libfiu"]
|
||||||
path = contrib/libfiu
|
path = contrib/libfiu
|
||||||
url = https://github.com/ClickHouse/libfiu.git
|
url = https://github.com/ClickHouse/libfiu.git
|
||||||
@ -340,3 +330,21 @@
|
|||||||
[submodule "contrib/c-ares"]
|
[submodule "contrib/c-ares"]
|
||||||
path = contrib/c-ares
|
path = contrib/c-ares
|
||||||
url = https://github.com/c-ares/c-ares.git
|
url = https://github.com/c-ares/c-ares.git
|
||||||
|
[submodule "contrib/incbin"]
|
||||||
|
path = contrib/incbin
|
||||||
|
url = https://github.com/graphitemaster/incbin.git
|
||||||
|
[submodule "contrib/usearch"]
|
||||||
|
path = contrib/usearch
|
||||||
|
url = https://github.com/unum-cloud/usearch.git
|
||||||
|
[submodule "contrib/SimSIMD"]
|
||||||
|
path = contrib/SimSIMD
|
||||||
|
url = https://github.com/ashvardanian/SimSIMD.git
|
||||||
|
[submodule "contrib/FP16"]
|
||||||
|
path = contrib/FP16
|
||||||
|
url = https://github.com/Maratyszcza/FP16.git
|
||||||
|
[submodule "contrib/robin-map"]
|
||||||
|
path = contrib/robin-map
|
||||||
|
url = https://github.com/Tessil/robin-map.git
|
||||||
|
[submodule "contrib/aklomp-base64"]
|
||||||
|
path = contrib/aklomp-base64
|
||||||
|
url = https://github.com/aklomp/base64.git
|
||||||
|
397
CHANGELOG.md
397
CHANGELOG.md
@ -1,4 +1,6 @@
|
|||||||
### Table of Contents
|
### Table of Contents
|
||||||
|
**[ClickHouse release v23.8 LTS, 2023-08-31](#238)**<br/>
|
||||||
|
**[ClickHouse release v23.7, 2023-07-27](#237)**<br/>
|
||||||
**[ClickHouse release v23.6, 2023-06-30](#236)**<br/>
|
**[ClickHouse release v23.6, 2023-06-30](#236)**<br/>
|
||||||
**[ClickHouse release v23.5, 2023-06-08](#235)**<br/>
|
**[ClickHouse release v23.5, 2023-06-08](#235)**<br/>
|
||||||
**[ClickHouse release v23.4, 2023-04-26](#234)**<br/>
|
**[ClickHouse release v23.4, 2023-04-26](#234)**<br/>
|
||||||
@ -9,6 +11,401 @@
|
|||||||
|
|
||||||
# 2023 Changelog
|
# 2023 Changelog
|
||||||
|
|
||||||
|
### <a id="238"></a> ClickHouse release 23.8 LTS, 2023-08-31
|
||||||
|
|
||||||
|
#### Backward Incompatible Change
|
||||||
|
* If a dynamic disk contains a name, it should be specified as `disk = disk(name = 'disk_name'`, ...) in disk function arguments. In previous version it could be specified as `disk = disk_<disk_name>(...)`, which is no longer supported. [#52820](https://github.com/ClickHouse/ClickHouse/pull/52820) ([Kseniia Sumarokova](https://github.com/kssenii)).
|
||||||
|
* `clickhouse-benchmark` will establish connections in parallel when invoked with `--concurrency` more than one. Previously it was unusable if you ran it with 1000 concurrent connections from Europe to the US. Correct calculation of QPS for connections with high latency. Backward incompatible change: the option for JSON output of `clickhouse-benchmark` is removed. If you've used this option, you can also extract data from the `system.query_log` in JSON format as a workaround. [#53293](https://github.com/ClickHouse/ClickHouse/pull/53293) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
|
||||||
|
* The `microseconds` column is removed from the `system.text_log`, and the `milliseconds` column is removed from the `system.metric_log`, because they are redundant in the presence of the `event_time_microseconds` column. [#53601](https://github.com/ClickHouse/ClickHouse/pull/53601) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
|
||||||
|
* Deprecate the metadata cache feature. It is experimental and we have never used it. The feature is dangerous: [#51182](https://github.com/ClickHouse/ClickHouse/issues/51182). Remove the `system.merge_tree_metadata_cache` system table. The metadata cache is still available in this version but will be removed soon. This closes [#39197](https://github.com/ClickHouse/ClickHouse/issues/39197). [#51303](https://github.com/ClickHouse/ClickHouse/pull/51303) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
|
||||||
|
* Disable support for 3DES in TLS connections. [#52893](https://github.com/ClickHouse/ClickHouse/pull/52893) ([Kenji Noguchi](https://github.com/knoguchi)).
|
||||||
|
|
||||||
|
#### New Feature
|
||||||
|
* Direct import from zip/7z/tar archives. Example: `file('*.zip :: *.csv')`. [#50321](https://github.com/ClickHouse/ClickHouse/pull/50321) ([nikitakeba](https://github.com/nikitakeba)).
|
||||||
|
* Add column `ptr` to `system.trace_log` for `trace_type = 'MemorySample'`. This column contains an address of allocation. Added function `flameGraph` which can build flamegraph containing allocated and not released memory. Reworking of [#38391](https://github.com/ClickHouse/ClickHouse/issues/38391). [#45322](https://github.com/ClickHouse/ClickHouse/pull/45322) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
|
||||||
|
* Added table function `azureBlobStorageCluster`. The supported set of features is very similar to table function `s3Cluster`. [#50795](https://github.com/ClickHouse/ClickHouse/pull/50795) ([SmitaRKulkarni](https://github.com/SmitaRKulkarni)).
|
||||||
|
* Allow using `cluster`, `clusterAllReplicas`, `remote`, and `remoteSecure` without table name in issue [#50808](https://github.com/ClickHouse/ClickHouse/issues/50808). [#50848](https://github.com/ClickHouse/ClickHouse/pull/50848) ([Yangkuan Liu](https://github.com/LiuYangkuan)).
|
||||||
|
* A system table to monitor kafka consumers. [#50999](https://github.com/ClickHouse/ClickHouse/pull/50999) ([Ilya Golshtein](https://github.com/ilejn)).
|
||||||
|
* Added `max_sessions_for_user` setting. [#51724](https://github.com/ClickHouse/ClickHouse/pull/51724) ([Alexey Gerasimchuck](https://github.com/Demilivor)).
|
||||||
|
* New functions `toUTCTimestamp/fromUTCTimestamp` to act same as spark's `to_utc_timestamp/from_utc_timestamp`. [#52117](https://github.com/ClickHouse/ClickHouse/pull/52117) ([KevinyhZou](https://github.com/KevinyhZou)).
|
||||||
|
* Add new functions `structureToCapnProtoSchema`/`structureToProtobufSchema` that convert ClickHouse table structure to CapnProto/Protobuf format schema. Allow to input/output data in CapnProto/Protobuf format without external format schema using autogenerated schema from table structure (controled by settings `format_capn_proto_use_autogenerated_schema`/`format_protobuf_use_autogenerated_schema`). Allow to export autogenerated schema while input/outoput using setting `output_format_schema`. [#52278](https://github.com/ClickHouse/ClickHouse/pull/52278) ([Kruglov Pavel](https://github.com/Avogar)).
|
||||||
|
* A new field `query_cache_usage` in `system.query_log` now shows if and how the query cache was used. [#52384](https://github.com/ClickHouse/ClickHouse/pull/52384) ([Robert Schulze](https://github.com/rschu1ze)).
|
||||||
|
* Add new function `startsWithUTF8` and `endsWithUTF8`. [#52555](https://github.com/ClickHouse/ClickHouse/pull/52555) ([李扬](https://github.com/taiyang-li)).
|
||||||
|
* Allow variable number of columns in TSV/CuatomSeprarated/JSONCompactEachRow, make schema inference work with variable number of columns. Add settings `input_format_tsv_allow_variable_number_of_columns`, `input_format_custom_allow_variable_number_of_columns`, `input_format_json_compact_allow_variable_number_of_columns`. [#52692](https://github.com/ClickHouse/ClickHouse/pull/52692) ([Kruglov Pavel](https://github.com/Avogar)).
|
||||||
|
* Added `SYSTEM STOP/START PULLING REPLICATION LOG` queries (for testing `ReplicatedMergeTree`). [#52881](https://github.com/ClickHouse/ClickHouse/pull/52881) ([Alexander Tokmakov](https://github.com/tavplubix)).
|
||||||
|
* Allow to execute constant non-deterministic functions in mutations on initiator. [#53129](https://github.com/ClickHouse/ClickHouse/pull/53129) ([Anton Popov](https://github.com/CurtizJ)).
|
||||||
|
* Add input format `One` that doesn't read any data and always returns single row with column `dummy` with type `UInt8` and value `0` like `system.one`. It can be used together with `_file/_path` virtual columns to list files in file/s3/url/hdfs/etc table functions without reading any data. [#53209](https://github.com/ClickHouse/ClickHouse/pull/53209) ([Kruglov Pavel](https://github.com/Avogar)).
|
||||||
|
* Add `tupleConcat` function. Closes [#52759](https://github.com/ClickHouse/ClickHouse/issues/52759). [#53239](https://github.com/ClickHouse/ClickHouse/pull/53239) ([Nikolay Degterinsky](https://github.com/evillique)).
|
||||||
|
* Support `TRUNCATE DATABASE` operation. [#53261](https://github.com/ClickHouse/ClickHouse/pull/53261) ([Bharat Nallan](https://github.com/bharatnc)).
|
||||||
|
* Add `max_threads_for_indexes` setting to limit number of threads used for primary key processing. [#53313](https://github.com/ClickHouse/ClickHouse/pull/53313) ([jorisgio](https://github.com/jorisgio)).
|
||||||
|
* Re-add SipHash keyed functions. [#53525](https://github.com/ClickHouse/ClickHouse/pull/53525) ([Salvatore Mesoraca](https://github.com/aiven-sal)).
|
||||||
|
* ([#52755](https://github.com/ClickHouse/ClickHouse/issues/52755) , [#52895](https://github.com/ClickHouse/ClickHouse/issues/52895)) Added functions `arrayRotateLeft`, `arrayRotateRight`, `arrayShiftLeft`, `arrayShiftRight`. [#53557](https://github.com/ClickHouse/ClickHouse/pull/53557) ([Mikhail Koviazin](https://github.com/mkmkme)).
|
||||||
|
* Add column `name` to `system.clusters` as an alias to cluster. [#53605](https://github.com/ClickHouse/ClickHouse/pull/53605) ([irenjj](https://github.com/irenjj)).
|
||||||
|
* The advanced dashboard now allows mass editing (save/load). [#53608](https://github.com/ClickHouse/ClickHouse/pull/53608) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
|
||||||
|
* The advanced dashboard now has an option to maximize charts and move them around. [#53622](https://github.com/ClickHouse/ClickHouse/pull/53622) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
|
||||||
|
* Added support for adding and subtracting arrays: `[5,2] + [1,7]`. Division and multiplication were not implemented due to confusion between pointwise multiplication and the scalar product of arguments. Closes [#49939](https://github.com/ClickHouse/ClickHouse/issues/49939). [#52625](https://github.com/ClickHouse/ClickHouse/pull/52625) ([Yarik Briukhovetskyi](https://github.com/yariks5s)).
|
||||||
|
* Add support for string literals as table names. Closes [#52178](https://github.com/ClickHouse/ClickHouse/issues/52178). [#52635](https://github.com/ClickHouse/ClickHouse/pull/52635) ([hendrik-m](https://github.com/hendrik-m)).
|
||||||
|
|
||||||
|
#### Experimental Feature
|
||||||
|
* Add new table engine `S3Queue` for streaming data import from s3. Closes [#37012](https://github.com/ClickHouse/ClickHouse/issues/37012). [#49086](https://github.com/ClickHouse/ClickHouse/pull/49086) ([s-kat](https://github.com/s-kat)). It is not ready to use. Do not use it.
|
||||||
|
* Enable parallel reading from replicas over distributed table. Related to [#49708](https://github.com/ClickHouse/ClickHouse/issues/49708). [#53005](https://github.com/ClickHouse/ClickHouse/pull/53005) ([Igor Nikonov](https://github.com/devcrafter)).
|
||||||
|
* Add experimental support for HNSW as approximate neighbor search method. [#53447](https://github.com/ClickHouse/ClickHouse/pull/53447) ([Davit Vardanyan](https://github.com/davvard)). This is currently intended for those who continue working on the implementation. Do not use it.
|
||||||
|
|
||||||
|
#### Performance Improvement
|
||||||
|
* Parquet filter pushdown. I.e. when reading Parquet files, row groups (chunks of the file) are skipped based on the WHERE condition and the min/max values in each column. In particular, if the file is roughly sorted by some column, queries that filter by a short range of that column will be much faster. [#52951](https://github.com/ClickHouse/ClickHouse/pull/52951) ([Michael Kolupaev](https://github.com/al13n321)).
|
||||||
|
* Optimize reading small row groups by batching them together in Parquet. Closes [#53069](https://github.com/ClickHouse/ClickHouse/issues/53069). [#53281](https://github.com/ClickHouse/ClickHouse/pull/53281) ([Kruglov Pavel](https://github.com/Avogar)).
|
||||||
|
* Optimize count from files in most input formats. Closes [#44334](https://github.com/ClickHouse/ClickHouse/issues/44334). [#53637](https://github.com/ClickHouse/ClickHouse/pull/53637) ([Kruglov Pavel](https://github.com/Avogar)).
|
||||||
|
* Use filter by file/path before reading in `url`/`file`/`hdfs` table functins. [#53529](https://github.com/ClickHouse/ClickHouse/pull/53529) ([Kruglov Pavel](https://github.com/Avogar)).
|
||||||
|
* Enable JIT compilation for AArch64, PowerPC, SystemZ, RISC-V. [#38217](https://github.com/ClickHouse/ClickHouse/pull/38217) ([Maksim Kita](https://github.com/kitaisreal)).
|
||||||
|
* Add setting `rewrite_count_distinct_if_with_count_distinct_implementation` to rewrite `countDistinctIf` with `count_distinct_implementation`. Closes [#30642](https://github.com/ClickHouse/ClickHouse/issues/30642). [#46051](https://github.com/ClickHouse/ClickHouse/pull/46051) ([flynn](https://github.com/ucasfl)).
|
||||||
|
* Speed up merging of states of `uniq` and `uniqExact` aggregate functions by parallelizing conversion before merge. [#50748](https://github.com/ClickHouse/ClickHouse/pull/50748) ([Jiebin Sun](https://github.com/jiebinn)).
|
||||||
|
* Optimize aggregation performance of nullable string key when using a large number of variable length keys. [#51399](https://github.com/ClickHouse/ClickHouse/pull/51399) ([LiuNeng](https://github.com/liuneng1994)).
|
||||||
|
* Add a pass in Analyzer for time filter optimization with preimage. The performance experiments of SSB on the ICX device (Intel Xeon Platinum 8380 CPU, 80 cores, 160 threads) show that this change could bring an improvement of 8.5% to the geomean QPS when the experimental analyzer is enabled. [#52091](https://github.com/ClickHouse/ClickHouse/pull/52091) ([Zhiguo Zhou](https://github.com/ZhiguoZh)).
|
||||||
|
* Optimize the merge if all hash sets are single-level in the `uniqExact` (COUNT DISTINCT) function. [#52973](https://github.com/ClickHouse/ClickHouse/pull/52973) ([Jiebin Sun](https://github.com/jiebinn)).
|
||||||
|
* `Join` table engine: do not clone hash join data structure with all columns. [#53046](https://github.com/ClickHouse/ClickHouse/pull/53046) ([Duc Canh Le](https://github.com/canhld94)).
|
||||||
|
* Implement native `ORC` input format without the "apache arrow" library to improve performance. [#53324](https://github.com/ClickHouse/ClickHouse/pull/53324) ([李扬](https://github.com/taiyang-li)).
|
||||||
|
* The dashboard will tell the server to compress the data, which is useful for large time frames over slow internet connections. For example, one chart with 86400 points can be 1.5 MB uncompressed and 60 KB compressed with `br`. [#53569](https://github.com/ClickHouse/ClickHouse/pull/53569) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
|
||||||
|
* Better utilization of thread pool for BACKUPs and RESTOREs. [#53649](https://github.com/ClickHouse/ClickHouse/pull/53649) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
|
||||||
|
* Load filesystem cache metadata on startup in parallel. Configured by `load_metadata_threads` (default: 1) cache config setting. Related to [#52037](https://github.com/ClickHouse/ClickHouse/issues/52037). [#52943](https://github.com/ClickHouse/ClickHouse/pull/52943) ([Kseniia Sumarokova](https://github.com/kssenii)).
|
||||||
|
* Improve `move_primary_key_columns_to_end_of_prewhere`. [#53337](https://github.com/ClickHouse/ClickHouse/pull/53337) ([Han Fei](https://github.com/hanfei1991)).
|
||||||
|
* This optimizes the interaction with ClickHouse Keeper. Previously the caller could register the same watch callback multiple times. In that case each entry was consuming memory and the same callback was called multiple times which didn't make much sense. In order to avoid this the caller could have some logic to not add the same watch multiple times. With this change this deduplication is done internally if the watch callback is passed via shared_ptr. [#53452](https://github.com/ClickHouse/ClickHouse/pull/53452) ([Alexander Gololobov](https://github.com/davenger)).
|
||||||
|
* Cache number of rows in files for count in file/s3/url/hdfs/azure functions. The cache can be enabled/disabled by setting `use_cache_for_count_from_files` (enabled by default). Continuation of https://github.com/ClickHouse/ClickHouse/pull/53637. [#53692](https://github.com/ClickHouse/ClickHouse/pull/53692) ([Kruglov Pavel](https://github.com/Avogar)).
|
||||||
|
* More careful thread management will improve the speed of the S3 table function over a large number of files by more than ~25%. [#53668](https://github.com/ClickHouse/ClickHouse/pull/53668) ([pufit](https://github.com/pufit)).
|
||||||
|
|
||||||
|
#### Improvement
|
||||||
|
* Add `stderr_reaction` configuration/setting to control the reaction (none, log or throw) when external command stderr has data. This helps make debugging external command easier. [#43210](https://github.com/ClickHouse/ClickHouse/pull/43210) ([Amos Bird](https://github.com/amosbird)).
|
||||||
|
* Add `partition` column to the `system part_log` and merge table. [#48990](https://github.com/ClickHouse/ClickHouse/pull/48990) ([Jianfei Hu](https://github.com/incfly)).
|
||||||
|
* The sizes of the (index) uncompressed/mark, mmap and query caches can now be configured dynamically at runtime (without server restart). [#51446](https://github.com/ClickHouse/ClickHouse/pull/51446) ([Robert Schulze](https://github.com/rschu1ze)).
|
||||||
|
* If a dictionary is created with a complex key, automatically choose the "complex key" layout variant. [#49587](https://github.com/ClickHouse/ClickHouse/pull/49587) ([xiebin](https://github.com/xbthink)).
|
||||||
|
* Add setting `use_concurrency_control` for better testing of the new concurrency control feature. [#49618](https://github.com/ClickHouse/ClickHouse/pull/49618) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
|
||||||
|
* Added suggestions for mistyped names for databases and tables. [#49801](https://github.com/ClickHouse/ClickHouse/pull/49801) ([Yarik Briukhovetskyi](https://github.com/yariks5s)).
|
||||||
|
* While read small files from HDFS by Gluten, we found that it will cost more times when compare to directly query by Spark. And we did something with that. [#50063](https://github.com/ClickHouse/ClickHouse/pull/50063) ([KevinyhZou](https://github.com/KevinyhZou)).
|
||||||
|
* There were too many worthless error logs after session expiration, which we didn't like. [#50171](https://github.com/ClickHouse/ClickHouse/pull/50171) ([helifu](https://github.com/helifu)).
|
||||||
|
* Introduce fallback ZooKeeper sessions which are time-bound. Fixed `index` column in system.zookeeper_connection for DNS addresses. [#50424](https://github.com/ClickHouse/ClickHouse/pull/50424) ([Anton Kozlov](https://github.com/tonickkozlov)).
|
||||||
|
* Add ability to log when max_partitions_per_insert_block is reached. [#50948](https://github.com/ClickHouse/ClickHouse/pull/50948) ([Sean Haynes](https://github.com/seandhaynes)).
|
||||||
|
* Added a bunch of custom commands to clickhouse-keeper-client (mostly to make ClickHouse debugging easier). [#51117](https://github.com/ClickHouse/ClickHouse/pull/51117) ([pufit](https://github.com/pufit)).
|
||||||
|
* Updated check for connection string in `azureBlobStorage` table function as connection string with "sas" does not always begin with the default endpoint and updated connection URL to include "sas" token after adding Azure's container to URL. [#51141](https://github.com/ClickHouse/ClickHouse/pull/51141) ([SmitaRKulkarni](https://github.com/SmitaRKulkarni)).
|
||||||
|
* Fix description for filtering sets in the `full_sorting_merge` JOIN algorithm. [#51329](https://github.com/ClickHouse/ClickHouse/pull/51329) ([Tanay Tummalapalli](https://github.com/ttanay)).
|
||||||
|
* Fixed memory consumption in `Aggregator` when `max_block_size` is huge. [#51566](https://github.com/ClickHouse/ClickHouse/pull/51566) ([Nikita Taranov](https://github.com/nickitat)).
|
||||||
|
* Add `SYSTEM SYNC FILESYSTEM CACHE` command. It will compare in-memory state of filesystem cache with what it has on disk and fix in-memory state if needed. This is only needed if you are making manual interventions in on-disk data, which is highly discouraged. [#51622](https://github.com/ClickHouse/ClickHouse/pull/51622) ([Kseniia Sumarokova](https://github.com/kssenii)).
|
||||||
|
* Attempt to create a generic proxy resolver for CH while keeping backwards compatibility with existing S3 storage conf proxy resolver. [#51749](https://github.com/ClickHouse/ClickHouse/pull/51749) ([Arthur Passos](https://github.com/arthurpassos)).
|
||||||
|
* Support reading tuple subcolumns from file/s3/hdfs/url/azureBlobStorage table functions. [#51806](https://github.com/ClickHouse/ClickHouse/pull/51806) ([Kruglov Pavel](https://github.com/Avogar)).
|
||||||
|
* Function `arrayIntersect` now returns the values in the order, corresponding to the first argument. Closes [#27622](https://github.com/ClickHouse/ClickHouse/issues/27622). [#51850](https://github.com/ClickHouse/ClickHouse/pull/51850) ([Yarik Briukhovetskyi](https://github.com/yariks5s)).
|
||||||
|
* Add new queries, which allow to create/drop of access entities in specified access storage or move access entities from one access storage to another. [#51912](https://github.com/ClickHouse/ClickHouse/pull/51912) ([pufit](https://github.com/pufit)).
|
||||||
|
* Make `ALTER TABLE FREEZE` queries not replicated in the Replicated database engine. [#52064](https://github.com/ClickHouse/ClickHouse/pull/52064) ([Mike Kot](https://github.com/myrrc)).
|
||||||
|
* Added possibility to flush system tables on unexpected shutdown. [#52174](https://github.com/ClickHouse/ClickHouse/pull/52174) ([Alexey Gerasimchuck](https://github.com/Demilivor)).
|
||||||
|
* Fix the case when `s3` table function refused to work with pre-signed URLs. close [#50846](https://github.com/ClickHouse/ClickHouse/issues/50846). [#52310](https://github.com/ClickHouse/ClickHouse/pull/52310) ([chen](https://github.com/xiedeyantu)).
|
||||||
|
* Add column `name` as an alias to `event` and `metric` in the `system.events` and `system.metrics` tables. Closes [#51257](https://github.com/ClickHouse/ClickHouse/issues/51257). [#52315](https://github.com/ClickHouse/ClickHouse/pull/52315) ([chen](https://github.com/xiedeyantu)).
|
||||||
|
* Added support of syntax `CREATE UNIQUE INDEX` in parser as a no-op for better SQL compatibility. `UNIQUE` index is not supported. Set `create_index_ignore_unique = 1` to ignore UNIQUE keyword in queries. [#52320](https://github.com/ClickHouse/ClickHouse/pull/52320) ([Ilya Yatsishin](https://github.com/qoega)).
|
||||||
|
* Add support of predefined macro (`{database}` and `{table}`) in some Kafka engine settings: topic, consumer, client_id, etc. [#52386](https://github.com/ClickHouse/ClickHouse/pull/52386) ([Yury Bogomolov](https://github.com/ybogo)).
|
||||||
|
* Disable updating the filesystem cache during backup/restore. Filesystem cache must not be updated during backup/restore, it seems it just slows down the process without any profit (because the BACKUP command can read a lot of data and it's no use to put all the data to the filesystem cache and immediately evict it). [#52402](https://github.com/ClickHouse/ClickHouse/pull/52402) ([Vitaly Baranov](https://github.com/vitlibar)).
|
||||||
|
* The configuration of S3 endpoint allow using it from the root, and append '/' automatically if needed. [#47809](https://github.com/ClickHouse/ClickHouse/issues/47809). [#52600](https://github.com/ClickHouse/ClickHouse/pull/52600) ([xiaolei565](https://github.com/xiaolei565)).
|
||||||
|
* For clickhouse-local allow positional options and populate global UDF settings (user_scripts_path and user_defined_executable_functions_config). [#52643](https://github.com/ClickHouse/ClickHouse/pull/52643) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
|
||||||
|
* `system.asynchronous_metrics` now includes metrics "QueryCacheEntries" and "QueryCacheBytes" to inspect the query cache. [#52650](https://github.com/ClickHouse/ClickHouse/pull/52650) ([Robert Schulze](https://github.com/rschu1ze)).
|
||||||
|
* Added possibility to use `s3_storage_class` parameter in the `SETTINGS` clause of the `BACKUP` statement for backups to S3. [#52658](https://github.com/ClickHouse/ClickHouse/pull/52658) ([Roman Vasin](https://github.com/rvasin)).
|
||||||
|
* Add utility `print-backup-info.py` which parses a backup metadata file and prints information about the backup. [#52690](https://github.com/ClickHouse/ClickHouse/pull/52690) ([Vitaly Baranov](https://github.com/vitlibar)).
|
||||||
|
* Closes [#49510](https://github.com/ClickHouse/ClickHouse/issues/49510). Currently we have database and table names case-sensitive, but BI tools query `information_schema` sometimes in lowercase, sometimes in uppercase. For this reason we have `information_schema` database, containing lowercase tables, such as `information_schema.tables` and `INFORMATION_SCHEMA` database, containing uppercase tables, such as `INFORMATION_SCHEMA.TABLES`. But some tools are querying `INFORMATION_SCHEMA.tables` and `information_schema.TABLES`. The proposed solution is to duplicate both lowercase and uppercase tables in lowercase and uppercase `information_schema` database. [#52695](https://github.com/ClickHouse/ClickHouse/pull/52695) ([Yarik Briukhovetskyi](https://github.com/yariks5s)).
|
||||||
|
* Query`CHECK TABLE` has better performance and usability (sends progress updates, cancellable). [#52745](https://github.com/ClickHouse/ClickHouse/pull/52745) ([vdimir](https://github.com/vdimir)).
|
||||||
|
* Add support for `modulo`, `intDiv`, `intDivOrZero` for tuples by distributing them across tuple's elements. [#52758](https://github.com/ClickHouse/ClickHouse/pull/52758) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
|
||||||
|
* Search for default `yaml` and `yml` configs in clickhouse-client after `xml`. [#52767](https://github.com/ClickHouse/ClickHouse/pull/52767) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
|
||||||
|
* When merging into non-'clickhouse' rooted configuration, configs with different root node name just bypassed without exception. [#52770](https://github.com/ClickHouse/ClickHouse/pull/52770) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
|
||||||
|
* Now it's possible to specify min (`memory_profiler_sample_min_allocation_size`) and max (`memory_profiler_sample_max_allocation_size`) size for allocations to be tracked with sampling memory profiler. [#52779](https://github.com/ClickHouse/ClickHouse/pull/52779) ([alesapin](https://github.com/alesapin)).
|
||||||
|
* Add `precise_float_parsing` setting to switch float parsing methods (fast/precise). [#52791](https://github.com/ClickHouse/ClickHouse/pull/52791) ([Andrey Zvonov](https://github.com/zvonand)).
|
||||||
|
* Use the same default paths for `clickhouse-keeper` (symlink) as for `clickhouse-keeper` (executable). [#52861](https://github.com/ClickHouse/ClickHouse/pull/52861) ([Vitaly Baranov](https://github.com/vitlibar)).
|
||||||
|
* Improve error message for table function `remote`. Closes [#40220](https://github.com/ClickHouse/ClickHouse/issues/40220). [#52959](https://github.com/ClickHouse/ClickHouse/pull/52959) ([jiyoungyoooo](https://github.com/jiyoungyoooo)).
|
||||||
|
* Added the possibility to specify custom storage policy in the `SETTINGS` clause of `RESTORE` queries. [#52970](https://github.com/ClickHouse/ClickHouse/pull/52970) ([Victor Krasnov](https://github.com/sirvickr)).
|
||||||
|
* Add the ability to throttle the S3 requests on backup operations (`BACKUP` and `RESTORE` commands now honor `s3_max_[get/put]_[rps/burst]`). [#52974](https://github.com/ClickHouse/ClickHouse/pull/52974) ([Daniel Pozo Escalona](https://github.com/danipozo)).
|
||||||
|
* Add settings to ignore ON CLUSTER clause in queries for management of replicated user-defined functions or access control entities with replicated storage. [#52975](https://github.com/ClickHouse/ClickHouse/pull/52975) ([Aleksei Filatov](https://github.com/aalexfvk)).
|
||||||
|
* EXPLAIN actions for JOIN step. [#53006](https://github.com/ClickHouse/ClickHouse/pull/53006) ([Maksim Kita](https://github.com/kitaisreal)).
|
||||||
|
* Make `hasTokenOrNull` and `hasTokenCaseInsensitiveOrNull` return null for empty needles. [#53059](https://github.com/ClickHouse/ClickHouse/pull/53059) ([ltrk2](https://github.com/ltrk2)).
|
||||||
|
* Allow to restrict allowed paths for filesystem caches. Mainly useful for dynamic disks. If in server config `filesystem_caches_path` is specified, all filesystem caches' paths will be restricted to this directory. E.g. if the `path` in cache config is relative - it will be put in `filesystem_caches_path`; if `path` in cache config is absolute, it will be required to lie inside `filesystem_caches_path`. If `filesystem_caches_path` is not specified in config, then behaviour will be the same as in earlier versions. [#53124](https://github.com/ClickHouse/ClickHouse/pull/53124) ([Kseniia Sumarokova](https://github.com/kssenii)).
|
||||||
|
* Added a bunch of custom commands (mostly to make ClickHouse debugging easier). [#53127](https://github.com/ClickHouse/ClickHouse/pull/53127) ([pufit](https://github.com/pufit)).
|
||||||
|
* Add diagnostic info about file name during schema inference - it helps when you process multiple files with globs. [#53135](https://github.com/ClickHouse/ClickHouse/pull/53135) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
|
||||||
|
* Client will load suggestions using the main connection if the second connection is not allowed to create a session. [#53177](https://github.com/ClickHouse/ClickHouse/pull/53177) ([Alexey Gerasimchuck](https://github.com/Demilivor)).
|
||||||
|
* Add EXCEPT clause to `SYSTEM STOP/START LISTEN QUERIES [ALL/DEFAULT/CUSTOM]` query, for example `SYSTEM STOP LISTEN QUERIES ALL EXCEPT TCP, HTTP`. [#53280](https://github.com/ClickHouse/ClickHouse/pull/53280) ([Nikolay Degterinsky](https://github.com/evillique)).
|
||||||
|
* Change the default of `max_concurrent_queries` from 100 to 1000. It's ok to have many concurrent queries if they are not heavy, and mostly waiting for the network. Note: don't confuse concurrent queries and QPS: for example, ClickHouse server can do tens of thousands of QPS with less than 100 concurrent queries. [#53285](https://github.com/ClickHouse/ClickHouse/pull/53285) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
|
||||||
|
* Limit number of concurrent background partition optimize merges. [#53405](https://github.com/ClickHouse/ClickHouse/pull/53405) ([Duc Canh Le](https://github.com/canhld94)).
|
||||||
|
* Added a setting `allow_moving_table_directory_to_trash` that allows to ignore `Directory for table data already exists` error when replicating/recovering a `Replicated` database. [#53425](https://github.com/ClickHouse/ClickHouse/pull/53425) ([Alexander Tokmakov](https://github.com/tavplubix)).
|
||||||
|
* If server settings `asynchronous_metrics_update_period_s` and `asynchronous_heavy_metrics_update_period_s` are misconfigured to 0, it will now fail gracefully instead of terminating the application. [#53428](https://github.com/ClickHouse/ClickHouse/pull/53428) ([Robert Schulze](https://github.com/rschu1ze)).
|
||||||
|
* The ClickHouse server now respects memory limits changed via cgroups when reloading its configuration. [#53455](https://github.com/ClickHouse/ClickHouse/pull/53455) ([Robert Schulze](https://github.com/rschu1ze)).
|
||||||
|
* Add ability to turn off flush of Distributed tables on `DETACH`, `DROP`, or server shutdown. [#53501](https://github.com/ClickHouse/ClickHouse/pull/53501) ([Azat Khuzhin](https://github.com/azat)).
|
||||||
|
* The `domainRFC` function now supports IPv6 in square brackets. [#53506](https://github.com/ClickHouse/ClickHouse/pull/53506) ([Chen768959](https://github.com/Chen768959)).
|
||||||
|
* Use longer timeout for S3 CopyObject requests, which are used in backups. [#53533](https://github.com/ClickHouse/ClickHouse/pull/53533) ([Michael Kolupaev](https://github.com/al13n321)).
|
||||||
|
* Added server setting `aggregate_function_group_array_max_element_size`. This setting is used to limit array size for `groupArray` function at serialization. The default value is `16777215`. [#53550](https://github.com/ClickHouse/ClickHouse/pull/53550) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
|
||||||
|
* `SCHEMA()` was added as alias for `DATABASE()` to improve MySQL compatibility. [#53587](https://github.com/ClickHouse/ClickHouse/pull/53587) ([Daniël van Eeden](https://github.com/dveeden)).
|
||||||
|
* Add asynchronous metrics about tables in the system database. For example, `TotalBytesOfMergeTreeTablesSystem`. This closes [#53603](https://github.com/ClickHouse/ClickHouse/issues/53603). [#53604](https://github.com/ClickHouse/ClickHouse/pull/53604) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
|
||||||
|
* SQL editor in the Play UI and Dashboard will not use Grammarly. [#53614](https://github.com/ClickHouse/ClickHouse/pull/53614) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
|
||||||
|
* As expert-level settings, it is now possible to (1) configure the size_ratio (i.e. the relative size of the protected queue) of the [index] mark/uncompressed caches, (2) configure the cache policy of the index mark and index uncompressed caches. [#53657](https://github.com/ClickHouse/ClickHouse/pull/53657) ([Robert Schulze](https://github.com/rschu1ze)).
|
||||||
|
* Added client info validation to the query packet in TCPHandler. [#53673](https://github.com/ClickHouse/ClickHouse/pull/53673) ([Alexey Gerasimchuck](https://github.com/Demilivor)).
|
||||||
|
* Retry loading parts in case of network errors while interaction with Microsoft Azure. [#53750](https://github.com/ClickHouse/ClickHouse/pull/53750) ([SmitaRKulkarni](https://github.com/SmitaRKulkarni)).
|
||||||
|
* Stacktrace for exceptions, Materailized view exceptions are propagated. [#53766](https://github.com/ClickHouse/ClickHouse/pull/53766) ([Ilya Golshtein](https://github.com/ilejn)).
|
||||||
|
* If no hostname or port were specified, keeper client will try to search for a connection string in the ClickHouse's config.xml. [#53769](https://github.com/ClickHouse/ClickHouse/pull/53769) ([pufit](https://github.com/pufit)).
|
||||||
|
* Add profile event `PartsLockMicroseconds` which shows the amount of microseconds we hold the data parts lock in MergeTree table engine family. [#53797](https://github.com/ClickHouse/ClickHouse/pull/53797) ([alesapin](https://github.com/alesapin)).
|
||||||
|
* Make reconnect limit in RAFT limits configurable for keeper. This configuration can help to make keeper to rebuild connection with peers quicker if the current connection is broken. [#53817](https://github.com/ClickHouse/ClickHouse/pull/53817) ([Pengyuan Bian](https://github.com/bianpengyuan)).
|
||||||
|
* Ignore foreign keys in tables definition to improve compatibility with MySQL, so a user wouldn't need to rewrite his SQL of the foreign key part, ref [#53380](https://github.com/ClickHouse/ClickHouse/issues/53380). [#53864](https://github.com/ClickHouse/ClickHouse/pull/53864) ([jsc0218](https://github.com/jsc0218)).
|
||||||
|
|
||||||
|
#### Build/Testing/Packaging Improvement
|
||||||
|
* Don't expose symbols from ClickHouse binary to dynamic linker. It might fix [#43933](https://github.com/ClickHouse/ClickHouse/issues/43933). [#47475](https://github.com/ClickHouse/ClickHouse/pull/47475) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
|
||||||
|
* Add `clickhouse-keeper-client` symlink to the clickhouse-server package. [#51882](https://github.com/ClickHouse/ClickHouse/pull/51882) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
|
||||||
|
* Add https://github.com/elliotchance/sqltest to CI to report the SQL 2016 conformance. [#52293](https://github.com/ClickHouse/ClickHouse/pull/52293) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
|
||||||
|
* Upgrade PRQL to 0.9.3. [#53060](https://github.com/ClickHouse/ClickHouse/pull/53060) ([Maximilian Roos](https://github.com/max-sixty)).
|
||||||
|
* System tables from CI checks are exported to ClickHouse Cloud. [#53086](https://github.com/ClickHouse/ClickHouse/pull/53086) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
|
||||||
|
* The compiler's profile data (`-ftime-trace`) is uploaded to ClickHouse Cloud. [#53100](https://github.com/ClickHouse/ClickHouse/pull/53100) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
|
||||||
|
* Speed up Debug and Tidy builds. [#53178](https://github.com/ClickHouse/ClickHouse/pull/53178) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
|
||||||
|
* Speed up the build by removing tons and tonnes of garbage. One of the frequently included headers was poisoned by boost. [#53180](https://github.com/ClickHouse/ClickHouse/pull/53180) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
|
||||||
|
* Remove even more garbage. [#53182](https://github.com/ClickHouse/ClickHouse/pull/53182) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
|
||||||
|
* The function `arrayAUC` was using heavy C++ templates - ditched them. [#53183](https://github.com/ClickHouse/ClickHouse/pull/53183) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
|
||||||
|
* Some translation units were always rebuilt regardless of ccache. The culprit is found and fixed. [#53184](https://github.com/ClickHouse/ClickHouse/pull/53184) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
|
||||||
|
* The compiler's profile data (`-ftime-trace`) is uploaded to ClickHouse Cloud., the second attempt after [#53100](https://github.com/ClickHouse/ClickHouse/issues/53100). [#53213](https://github.com/ClickHouse/ClickHouse/pull/53213) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
|
||||||
|
* Export logs from CI in stateful tests to ClickHouse Cloud. [#53351](https://github.com/ClickHouse/ClickHouse/pull/53351) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
|
||||||
|
* Export logs from CI in stress tests. [#53353](https://github.com/ClickHouse/ClickHouse/pull/53353) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
|
||||||
|
* Export logs from CI in fuzzer. [#53354](https://github.com/ClickHouse/ClickHouse/pull/53354) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
|
||||||
|
* Preserve environment parameters in `clickhouse start` command. Fixes [#51962](https://github.com/ClickHouse/ClickHouse/issues/51962). [#53418](https://github.com/ClickHouse/ClickHouse/pull/53418) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
|
||||||
|
* Follow up for [#53418](https://github.com/ClickHouse/ClickHouse/issues/53418). Small improvements for install_check.py, adding tests for proper ENV parameters passing to the main process on `init.d start`. [#53457](https://github.com/ClickHouse/ClickHouse/pull/53457) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
|
||||||
|
* Reorganize file management in CMake to prevent potential duplications. For instance, `indexHint.cpp` is duplicated in both `dbms_sources` and `clickhouse_functions_sources`. [#53621](https://github.com/ClickHouse/ClickHouse/pull/53621) ([Amos Bird](https://github.com/amosbird)).
|
||||||
|
* Upgrade snappy to 1.1.10. [#53672](https://github.com/ClickHouse/ClickHouse/pull/53672) ([李扬](https://github.com/taiyang-li)).
|
||||||
|
* Slightly improve cmake build by sanitizing some dependencies and removing some duplicates. Each commit includes a short description of the changes made. [#53759](https://github.com/ClickHouse/ClickHouse/pull/53759) ([Amos Bird](https://github.com/amosbird)).
|
||||||
|
|
||||||
|
#### Bug Fix (user-visible misbehavior in an official stable release)
|
||||||
|
* Do not reset (experimental) Annoy index during build-up with more than one mark [#51325](https://github.com/ClickHouse/ClickHouse/pull/51325) ([Tian Xinhui](https://github.com/xinhuitian)).
|
||||||
|
* Fix usage of temporary directories during RESTORE [#51493](https://github.com/ClickHouse/ClickHouse/pull/51493) ([Azat Khuzhin](https://github.com/azat)).
|
||||||
|
* Fix binary arithmetic for Nullable(IPv4) [#51642](https://github.com/ClickHouse/ClickHouse/pull/51642) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
|
||||||
|
* Support IPv4 and IPv6 data types as dictionary attributes [#51756](https://github.com/ClickHouse/ClickHouse/pull/51756) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
|
||||||
|
* A fix for checksum of compress marks [#51777](https://github.com/ClickHouse/ClickHouse/pull/51777) ([SmitaRKulkarni](https://github.com/SmitaRKulkarni)).
|
||||||
|
* Fix mistakenly comma parsing as part of datetime in CSV best effort parsing [#51950](https://github.com/ClickHouse/ClickHouse/pull/51950) ([Kruglov Pavel](https://github.com/Avogar)).
|
||||||
|
* Don't throw exception when executable UDF has parameters [#51961](https://github.com/ClickHouse/ClickHouse/pull/51961) ([Nikita Taranov](https://github.com/nickitat)).
|
||||||
|
* Fix recalculation of skip indexes and projections in `ALTER DELETE` queries [#52530](https://github.com/ClickHouse/ClickHouse/pull/52530) ([Anton Popov](https://github.com/CurtizJ)).
|
||||||
|
* MaterializedMySQL: Fix the infinite loop in ReadBuffer::read [#52621](https://github.com/ClickHouse/ClickHouse/pull/52621) ([Val Doroshchuk](https://github.com/valbok)).
|
||||||
|
* Load suggestion only with `clickhouse` dialect [#52628](https://github.com/ClickHouse/ClickHouse/pull/52628) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
|
||||||
|
* Init and destroy ares channel on demand. [#52634](https://github.com/ClickHouse/ClickHouse/pull/52634) ([Arthur Passos](https://github.com/arthurpassos)).
|
||||||
|
* Fix filtering by virtual columns with OR expression [#52653](https://github.com/ClickHouse/ClickHouse/pull/52653) ([Azat Khuzhin](https://github.com/azat)).
|
||||||
|
* Fix crash in function `tuple` with one sparse column argument [#52659](https://github.com/ClickHouse/ClickHouse/pull/52659) ([Anton Popov](https://github.com/CurtizJ)).
|
||||||
|
* Fix named collections on cluster [#52687](https://github.com/ClickHouse/ClickHouse/pull/52687) ([Al Korgun](https://github.com/alkorgun)).
|
||||||
|
* Fix reading of unnecessary column in case of multistage `PREWHERE` [#52689](https://github.com/ClickHouse/ClickHouse/pull/52689) ([Anton Popov](https://github.com/CurtizJ)).
|
||||||
|
* Fix unexpected sort result on multi columns with nulls first direction [#52761](https://github.com/ClickHouse/ClickHouse/pull/52761) ([copperybean](https://github.com/copperybean)).
|
||||||
|
* Fix data race in Keeper reconfiguration [#52804](https://github.com/ClickHouse/ClickHouse/pull/52804) ([Antonio Andelic](https://github.com/antonio2368)).
|
||||||
|
* Fix sorting of sparse columns with large limit [#52827](https://github.com/ClickHouse/ClickHouse/pull/52827) ([Anton Popov](https://github.com/CurtizJ)).
|
||||||
|
* clickhouse-keeper: fix implementation of server with poll. [#52833](https://github.com/ClickHouse/ClickHouse/pull/52833) ([Andy Fiddaman](https://github.com/citrus-it)).
|
||||||
|
* Make regexp analyzer recognize named capturing groups [#52840](https://github.com/ClickHouse/ClickHouse/pull/52840) ([Han Fei](https://github.com/hanfei1991)).
|
||||||
|
* Fix possible assert in `~PushingAsyncPipelineExecutor` in clickhouse-local [#52862](https://github.com/ClickHouse/ClickHouse/pull/52862) ([Kruglov Pavel](https://github.com/Avogar)).
|
||||||
|
* Fix reading of empty `Nested(Array(LowCardinality(...)))` [#52949](https://github.com/ClickHouse/ClickHouse/pull/52949) ([Anton Popov](https://github.com/CurtizJ)).
|
||||||
|
* Added new tests for session_log and fixed the inconsistency between login and logout. [#52958](https://github.com/ClickHouse/ClickHouse/pull/52958) ([Alexey Gerasimchuck](https://github.com/Demilivor)).
|
||||||
|
* Fix password leak in show create mysql table [#52962](https://github.com/ClickHouse/ClickHouse/pull/52962) ([Duc Canh Le](https://github.com/canhld94)).
|
||||||
|
* Convert sparse column format to full in CreateSetAndFilterOnTheFlyStep [#53000](https://github.com/ClickHouse/ClickHouse/pull/53000) ([vdimir](https://github.com/vdimir)).
|
||||||
|
* Fix rare race condition with empty key prefix directory deletion in fs cache [#53055](https://github.com/ClickHouse/ClickHouse/pull/53055) ([Kseniia Sumarokova](https://github.com/kssenii)).
|
||||||
|
* Fix ZstdDeflatingWriteBuffer truncating the output sometimes [#53064](https://github.com/ClickHouse/ClickHouse/pull/53064) ([Michael Kolupaev](https://github.com/al13n321)).
|
||||||
|
* Fix query_id in part_log with async flush queries [#53103](https://github.com/ClickHouse/ClickHouse/pull/53103) ([Raúl Marín](https://github.com/Algunenano)).
|
||||||
|
* Fix possible error from cache "Read unexpected size" [#53121](https://github.com/ClickHouse/ClickHouse/pull/53121) ([Kseniia Sumarokova](https://github.com/kssenii)).
|
||||||
|
* Disable the new parquet encoder [#53130](https://github.com/ClickHouse/ClickHouse/pull/53130) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
|
||||||
|
* Fix "Not-ready Set" exception [#53162](https://github.com/ClickHouse/ClickHouse/pull/53162) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
|
||||||
|
* Fix character escaping in the PostgreSQL engine [#53250](https://github.com/ClickHouse/ClickHouse/pull/53250) ([Nikolay Degterinsky](https://github.com/evillique)).
|
||||||
|
* Experimental session_log table: Added new tests for session_log and fixed the inconsistency between login and logout. [#53255](https://github.com/ClickHouse/ClickHouse/pull/53255) ([Alexey Gerasimchuck](https://github.com/Demilivor)). Fixed inconsistency between login success and logout [#53302](https://github.com/ClickHouse/ClickHouse/pull/53302) ([Alexey Gerasimchuck](https://github.com/Demilivor)).
|
||||||
|
* Fix adding sub-second intervals to DateTime [#53309](https://github.com/ClickHouse/ClickHouse/pull/53309) ([Michael Kolupaev](https://github.com/al13n321)).
|
||||||
|
* Fix "Context has expired" error in dictionaries [#53342](https://github.com/ClickHouse/ClickHouse/pull/53342) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
|
||||||
|
* Fix incorrect normal projection AST format [#53347](https://github.com/ClickHouse/ClickHouse/pull/53347) ([Amos Bird](https://github.com/amosbird)).
|
||||||
|
* Forbid use_structure_from_insertion_table_in_table_functions when execute Scalar [#53348](https://github.com/ClickHouse/ClickHouse/pull/53348) ([flynn](https://github.com/ucasfl)).
|
||||||
|
* Fix loading lazy database during system.table select query [#53372](https://github.com/ClickHouse/ClickHouse/pull/53372) ([SmitaRKulkarni](https://github.com/SmitaRKulkarni)).
|
||||||
|
* Fixed system.data_skipping_indices for MaterializedMySQL [#53381](https://github.com/ClickHouse/ClickHouse/pull/53381) ([Filipp Ozinov](https://github.com/bakwc)).
|
||||||
|
* Fix processing single carriage return in TSV file segmentation engine [#53407](https://github.com/ClickHouse/ClickHouse/pull/53407) ([Kruglov Pavel](https://github.com/Avogar)).
|
||||||
|
* Fix `Context has expired` error properly [#53433](https://github.com/ClickHouse/ClickHouse/pull/53433) ([Michael Kolupaev](https://github.com/al13n321)).
|
||||||
|
* Fix `timeout_overflow_mode` when having subquery in the rhs of IN [#53439](https://github.com/ClickHouse/ClickHouse/pull/53439) ([Duc Canh Le](https://github.com/canhld94)).
|
||||||
|
* Fix an unexpected behavior in [#53152](https://github.com/ClickHouse/ClickHouse/issues/53152) [#53440](https://github.com/ClickHouse/ClickHouse/pull/53440) ([Zhiguo Zhou](https://github.com/ZhiguoZh)).
|
||||||
|
* Fix JSON_QUERY Function parse error while path is all number [#53470](https://github.com/ClickHouse/ClickHouse/pull/53470) ([KevinyhZou](https://github.com/KevinyhZou)).
|
||||||
|
* Fix wrong columns order for queries with parallel FINAL. [#53489](https://github.com/ClickHouse/ClickHouse/pull/53489) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
|
||||||
|
* Fixed SELECTing from ReplacingMergeTree with do_not_merge_across_partitions_select_final [#53511](https://github.com/ClickHouse/ClickHouse/pull/53511) ([Vasily Nemkov](https://github.com/Enmk)).
|
||||||
|
* Flush async insert queue first on shutdown [#53547](https://github.com/ClickHouse/ClickHouse/pull/53547) ([joelynch](https://github.com/joelynch)).
|
||||||
|
* Fix crash in join on sparse columna [#53548](https://github.com/ClickHouse/ClickHouse/pull/53548) ([vdimir](https://github.com/vdimir)).
|
||||||
|
* Fix possible UB in Set skipping index for functions with incorrect args [#53559](https://github.com/ClickHouse/ClickHouse/pull/53559) ([Azat Khuzhin](https://github.com/azat)).
|
||||||
|
* Fix possible UB in inverted indexes (experimental feature) [#53560](https://github.com/ClickHouse/ClickHouse/pull/53560) ([Azat Khuzhin](https://github.com/azat)).
|
||||||
|
* Fix: interpolate expression takes source column instead of same name aliased from select expression. [#53572](https://github.com/ClickHouse/ClickHouse/pull/53572) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
|
||||||
|
* Fix number of dropped granules in EXPLAIN PLAN index=1 [#53616](https://github.com/ClickHouse/ClickHouse/pull/53616) ([wangxiaobo](https://github.com/wzb5212)).
|
||||||
|
* Correctly handle totals and extremes with `DelayedSource` [#53644](https://github.com/ClickHouse/ClickHouse/pull/53644) ([Antonio Andelic](https://github.com/antonio2368)).
|
||||||
|
* Prepared set cache in mutation pipeline stuck [#53645](https://github.com/ClickHouse/ClickHouse/pull/53645) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
|
||||||
|
* Fix bug on mutations with subcolumns of type JSON in predicates of UPDATE and DELETE queries. [#53677](https://github.com/ClickHouse/ClickHouse/pull/53677) ([VanDarkholme7](https://github.com/VanDarkholme7)).
|
||||||
|
* Fix filter pushdown for full_sorting_merge join [#53699](https://github.com/ClickHouse/ClickHouse/pull/53699) ([vdimir](https://github.com/vdimir)).
|
||||||
|
* Try to fix bug with `NULL::LowCardinality(Nullable(...)) NOT IN` [#53706](https://github.com/ClickHouse/ClickHouse/pull/53706) ([Andrey Zvonov](https://github.com/zvonand)).
|
||||||
|
* Fix: sorted distinct with sparse columns [#53711](https://github.com/ClickHouse/ClickHouse/pull/53711) ([Igor Nikonov](https://github.com/devcrafter)).
|
||||||
|
* `transform`: correctly handle default column with multiple rows [#53742](https://github.com/ClickHouse/ClickHouse/pull/53742) ([Salvatore Mesoraca](https://github.com/aiven-sal)).
|
||||||
|
* Fix fuzzer crash in parseDateTime [#53764](https://github.com/ClickHouse/ClickHouse/pull/53764) ([Robert Schulze](https://github.com/rschu1ze)).
|
||||||
|
* MaterializedPostgreSQL: fix uncaught exception in getCreateTableQueryImpl [#53832](https://github.com/ClickHouse/ClickHouse/pull/53832) ([Kseniia Sumarokova](https://github.com/kssenii)).
|
||||||
|
* Fix possible segfault while using PostgreSQL engine [#53847](https://github.com/ClickHouse/ClickHouse/pull/53847) ([Kseniia Sumarokova](https://github.com/kssenii)).
|
||||||
|
* Fix named_collection_admin alias [#54066](https://github.com/ClickHouse/ClickHouse/pull/54066) ([Kseniia Sumarokova](https://github.com/kssenii)).
|
||||||
|
|
||||||
|
### <a id="237"></a> ClickHouse release 23.7, 2023-07-27
|
||||||
|
|
||||||
|
#### Backward Incompatible Change
|
||||||
|
* Add `NAMED COLLECTION` access type (aliases `USE NAMED COLLECTION`, `NAMED COLLECTION USAGE`). This PR is backward incompatible because this access type is disabled by default (because a parent access type `NAMED COLLECTION ADMIN` is disabled by default as well). Proposed in [#50277](https://github.com/ClickHouse/ClickHouse/issues/50277). To grant use `GRANT NAMED COLLECTION ON collection_name TO user` or `GRANT NAMED COLLECTION ON * TO user`, to be able to give these grants `named_collection_admin` is required in config (previously it was named `named_collection_control`, so will remain as an alias). [#50625](https://github.com/ClickHouse/ClickHouse/pull/50625) ([Kseniia Sumarokova](https://github.com/kssenii)).
|
||||||
|
* Fixing a typo in the `system.parts` column name `last_removal_attemp_time`. Now it is named `last_removal_attempt_time`. [#52104](https://github.com/ClickHouse/ClickHouse/pull/52104) ([filimonov](https://github.com/filimonov)).
|
||||||
|
* Bump version of the distributed_ddl_entry_format_version to 5 by default (enables opentelemetry and initial_query_idd pass through). This will not allow to process existing entries for distributed DDL after *downgrade* (but note, that usually there should be no such unprocessed entries). [#52128](https://github.com/ClickHouse/ClickHouse/pull/52128) ([Azat Khuzhin](https://github.com/azat)).
|
||||||
|
* Check projection metadata the same way we check ordinary metadata. This change may prevent the server from starting in case there was a table with an invalid projection. An example is a projection that created positional columns in PK (e.g. `projection p (select * order by 1, 4)` which is not allowed in table PK and can cause a crash during insert/merge). Drop such projections before the update. Fixes [#52353](https://github.com/ClickHouse/ClickHouse/issues/52353). [#52361](https://github.com/ClickHouse/ClickHouse/pull/52361) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
|
||||||
|
* The experimental feature `hashid` is removed due to a bug. The quality of implementation was questionable at the start, and it didn't get through the experimental status. This closes [#52406](https://github.com/ClickHouse/ClickHouse/issues/52406). [#52449](https://github.com/ClickHouse/ClickHouse/pull/52449) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
|
||||||
|
|
||||||
|
#### New Feature
|
||||||
|
* Added `Overlay` database engine to combine multiple databases into one. Added `Filesystem` database engine to represent a directory in the filesystem as a set of implicitly available tables with auto-detected formats and structures. A new `S3` database engine allows to read-only interact with s3 storage by representing a prefix as a set of tables. A new `HDFS` database engine allows to interact with HDFS storage in the same way. [#48821](https://github.com/ClickHouse/ClickHouse/pull/48821) ([alekseygolub](https://github.com/alekseygolub)).
|
||||||
|
* Add support for external disks in Keeper for storing snapshots and logs. [#50098](https://github.com/ClickHouse/ClickHouse/pull/50098) ([Antonio Andelic](https://github.com/antonio2368)).
|
||||||
|
* Add support for multi-directory selection (`{}`) globs. [#50559](https://github.com/ClickHouse/ClickHouse/pull/50559) ([Andrey Zvonov](https://github.com/zvonand)).
|
||||||
|
* Kafka connector can fetch Avro schema from schema registry with basic authentication using url-encoded credentials. [#49664](https://github.com/ClickHouse/ClickHouse/pull/49664) ([Ilya Golshtein](https://github.com/ilejn)).
|
||||||
|
* Add function `arrayJaccardIndex` which computes the Jaccard similarity between two arrays. [#50076](https://github.com/ClickHouse/ClickHouse/pull/50076) ([FFFFFFFHHHHHHH](https://github.com/FFFFFFFHHHHHHH)).
|
||||||
|
* Add a column `is_obsolete` to `system.settings` and similar tables. Closes [#50819](https://github.com/ClickHouse/ClickHouse/issues/50819). [#50826](https://github.com/ClickHouse/ClickHouse/pull/50826) ([flynn](https://github.com/ucasfl)).
|
||||||
|
* Implement support of encrypted elements in configuration file. Added possibility to use encrypted text in leaf elements of configuration file. The text is encrypted using encryption codecs from `<encryption_codecs>` section. [#50986](https://github.com/ClickHouse/ClickHouse/pull/50986) ([Roman Vasin](https://github.com/rvasin)).
|
||||||
|
* Grace Hash Join algorithm is now applicable to FULL and RIGHT JOINs. [#49483](https://github.com/ClickHouse/ClickHouse/issues/49483). [#51013](https://github.com/ClickHouse/ClickHouse/pull/51013) ([lgbo](https://github.com/lgbo-ustc)).
|
||||||
|
* Add `SYSTEM STOP LISTEN` query for more graceful termination. Closes [#47972](https://github.com/ClickHouse/ClickHouse/issues/47972). [#51016](https://github.com/ClickHouse/ClickHouse/pull/51016) ([Nikolay Degterinsky](https://github.com/evillique)).
|
||||||
|
* Add `input_format_csv_allow_variable_number_of_columns` options. [#51273](https://github.com/ClickHouse/ClickHouse/pull/51273) ([Dmitry Kardymon](https://github.com/kardymonds)).
|
||||||
|
* Another boring feature: add function `substring_index`, as in Spark or MySQL. [#51472](https://github.com/ClickHouse/ClickHouse/pull/51472) ([李扬](https://github.com/taiyang-li)).
|
||||||
|
* A system table `jemalloc_bins` to show stats for jemalloc bins. Example `SELECT *, size * (nmalloc - ndalloc) AS allocated_bytes FROM system.jemalloc_bins WHERE allocated_bytes > 0 ORDER BY allocated_bytes DESC LIMIT 10`. Enjoy. [#51674](https://github.com/ClickHouse/ClickHouse/pull/51674) ([Alexander Gololobov](https://github.com/davenger)).
|
||||||
|
* Add `RowBinaryWithDefaults` format with extra byte before each column as a flag for using the column's default value. Closes [#50854](https://github.com/ClickHouse/ClickHouse/issues/50854). [#51695](https://github.com/ClickHouse/ClickHouse/pull/51695) ([Kruglov Pavel](https://github.com/Avogar)).
|
||||||
|
* Added `default_temporary_table_engine` setting. Same as `default_table_engine` but for temporary tables. [#51292](https://github.com/ClickHouse/ClickHouse/issues/51292). [#51708](https://github.com/ClickHouse/ClickHouse/pull/51708) ([velavokr](https://github.com/velavokr)).
|
||||||
|
* Added new `initcap` / `initcapUTF8` functions which convert the first letter of each word to upper case and the rest to lower case. [#51735](https://github.com/ClickHouse/ClickHouse/pull/51735) ([Dmitry Kardymon](https://github.com/kardymonds)).
|
||||||
|
* Create table now supports `PRIMARY KEY` syntax in column definition. Columns are added to primary index in the same order columns are defined. [#51881](https://github.com/ClickHouse/ClickHouse/pull/51881) ([Ilya Yatsishin](https://github.com/qoega)).
|
||||||
|
* Added the possibility to use date and time format specifiers in log and error log file names, either in config files (`log` and `errorlog` tags) or command line arguments (`--log-file` and `--errorlog-file`). [#51945](https://github.com/ClickHouse/ClickHouse/pull/51945) ([Victor Krasnov](https://github.com/sirvickr)).
|
||||||
|
* Added Peak Memory Usage statistic to HTTP headers. [#51946](https://github.com/ClickHouse/ClickHouse/pull/51946) ([Dmitry Kardymon](https://github.com/kardymonds)).
|
||||||
|
* Added new `hasSubsequence` (+`CaseInsensitive` and `UTF8` versions) functions to match subsequences in strings. [#52050](https://github.com/ClickHouse/ClickHouse/pull/52050) ([Dmitry Kardymon](https://github.com/kardymonds)).
|
||||||
|
* Add `array_agg` as alias of `groupArray` for PostgreSQL compatibility. Closes [#52100](https://github.com/ClickHouse/ClickHouse/issues/52100). ### Documentation entry for user-facing changes. [#52135](https://github.com/ClickHouse/ClickHouse/pull/52135) ([flynn](https://github.com/ucasfl)).
|
||||||
|
* Add `any_value` as a compatibility alias for `any` aggregate function. Closes [#52140](https://github.com/ClickHouse/ClickHouse/issues/52140). [#52147](https://github.com/ClickHouse/ClickHouse/pull/52147) ([flynn](https://github.com/ucasfl)).
|
||||||
|
* Add aggregate function `array_concat_agg` for compatibility with BigQuery, it's alias of `groupArrayArray`. Closes [#52139](https://github.com/ClickHouse/ClickHouse/issues/52139). [#52149](https://github.com/ClickHouse/ClickHouse/pull/52149) ([flynn](https://github.com/ucasfl)).
|
||||||
|
* Add `OCTET_LENGTH` as an alias to `length`. Closes [#52153](https://github.com/ClickHouse/ClickHouse/issues/52153). [#52176](https://github.com/ClickHouse/ClickHouse/pull/52176) ([FFFFFFFHHHHHHH](https://github.com/FFFFFFFHHHHHHH)).
|
||||||
|
* Added `firstLine` function to extract the first line from the multi-line string. This closes [#51172](https://github.com/ClickHouse/ClickHouse/issues/51172). [#52209](https://github.com/ClickHouse/ClickHouse/pull/52209) ([Mikhail Koviazin](https://github.com/mkmkme)).
|
||||||
|
* Implement KQL-style formatting for the `Interval` data type. This is only needed for compatibility with the `Kusto` query language. [#45671](https://github.com/ClickHouse/ClickHouse/pull/45671) ([ltrk2](https://github.com/ltrk2)).
|
||||||
|
* Added query `SYSTEM FLUSH ASYNC INSERT QUEUE` which flushes all pending asynchronous inserts to the destination tables. Added a server-side setting `async_insert_queue_flush_on_shutdown` (`true` by default) which determines whether to flush queue of asynchronous inserts on graceful shutdown. Setting `async_insert_threads` is now a server-side setting. [#49160](https://github.com/ClickHouse/ClickHouse/pull/49160) ([Anton Popov](https://github.com/CurtizJ)).
|
||||||
|
* Aliases `current_database` and a new function `current_schemas` for compatibility with PostgreSQL. [#51076](https://github.com/ClickHouse/ClickHouse/pull/51076) ([Pedro Riera](https://github.com/priera)).
|
||||||
|
* Add alias for functions `today` (now available under the `curdate`/`current_date` names) and `now` (`current_timestamp`). [#52106](https://github.com/ClickHouse/ClickHouse/pull/52106) ([Lloyd-Pottiger](https://github.com/Lloyd-Pottiger)).
|
||||||
|
* Support `async_deduplication_token` for async insert. [#52136](https://github.com/ClickHouse/ClickHouse/pull/52136) ([Han Fei](https://github.com/hanfei1991)).
|
||||||
|
* Add new setting `disable_url_encoding` that allows to disable decoding/encoding path in uri in URL engine. [#52337](https://github.com/ClickHouse/ClickHouse/pull/52337) ([Kruglov Pavel](https://github.com/Avogar)).
|
||||||
|
|
||||||
|
#### Performance Improvement
|
||||||
|
* Enable automatic selection of the sparse serialization format by default. It improves performance. The format is supported since version 22.1. After this change, downgrading to versions older than 22.1 might not be possible. You can turn off the usage of the sparse serialization format by providing the `ratio_of_defaults_for_sparse_serialization = 1` setting for your MergeTree tables. [#49631](https://github.com/ClickHouse/ClickHouse/pull/49631) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
|
||||||
|
* Enable `move_all_conditions_to_prewhere` and `enable_multiple_prewhere_read_steps` settings by default. [#46365](https://github.com/ClickHouse/ClickHouse/pull/46365) ([Alexander Gololobov](https://github.com/davenger)).
|
||||||
|
* Improves performance of some queries by tuning allocator. [#46416](https://github.com/ClickHouse/ClickHouse/pull/46416) ([Azat Khuzhin](https://github.com/azat)).
|
||||||
|
* Now we use fixed-size tasks in `MergeTreePrefetchedReadPool` as in `MergeTreeReadPool`. Also from now we use connection pool for S3 requests. [#49732](https://github.com/ClickHouse/ClickHouse/pull/49732) ([Nikita Taranov](https://github.com/nickitat)).
|
||||||
|
* More pushdown to the right side of join. [#50532](https://github.com/ClickHouse/ClickHouse/pull/50532) ([Nikita Taranov](https://github.com/nickitat)).
|
||||||
|
* Improve grace_hash join by reserving hash table's size (resubmit). [#50875](https://github.com/ClickHouse/ClickHouse/pull/50875) ([lgbo](https://github.com/lgbo-ustc)).
|
||||||
|
* Waiting on lock in `OpenedFileCache` could be noticeable sometimes. We sharded it into multiple sub-maps (each with its own lock) to avoid contention. [#51341](https://github.com/ClickHouse/ClickHouse/pull/51341) ([Nikita Taranov](https://github.com/nickitat)).
|
||||||
|
* Move conditions with primary key columns to the end of PREWHERE chain. The idea is that conditions with PK columns are likely to be used in PK analysis and will not contribute much more to PREWHERE filtering. [#51958](https://github.com/ClickHouse/ClickHouse/pull/51958) ([Alexander Gololobov](https://github.com/davenger)).
|
||||||
|
* Speed up `COUNT(DISTINCT)` for String types by inlining SipHash. The performance experiments of *OnTime* on the ICX device (Intel Xeon Platinum 8380 CPU, 80 cores, 160 threads) show that this change could bring an improvement of *11.6%* to the QPS of the query *Q8* while having no impact on others. [#52036](https://github.com/ClickHouse/ClickHouse/pull/52036) ([Zhiguo Zhou](https://github.com/ZhiguoZh)).
|
||||||
|
* Enable `allow_vertical_merges_from_compact_to_wide_parts` by default. It will save memory usage during merges. [#52295](https://github.com/ClickHouse/ClickHouse/pull/52295) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
|
||||||
|
* Fix incorrect projection analysis which invalidates primary keys. This issue only exists when `query_plan_optimize_primary_key = 1, query_plan_optimize_projection = 1`. This fixes [#48823](https://github.com/ClickHouse/ClickHouse/issues/48823). This fixes [#51173](https://github.com/ClickHouse/ClickHouse/issues/51173). [#52308](https://github.com/ClickHouse/ClickHouse/pull/52308) ([Amos Bird](https://github.com/amosbird)).
|
||||||
|
* Reduce the number of syscalls in `FileCache::loadMetadata` - this speeds up server startup if the filesystem cache is configured. [#52435](https://github.com/ClickHouse/ClickHouse/pull/52435) ([Raúl Marín](https://github.com/Algunenano)).
|
||||||
|
* Allow to have strict lower boundary for file segment size by downloading remaining data in the background. Minimum size of file segment (if actual file size is bigger) is configured as cache configuration setting `boundary_alignment`, by default `4Mi`. Number of background threads are configured as cache configuration setting `background_download_threads`, by default `2`. Also `max_file_segment_size` was increased from `8Mi` to `32Mi` in this PR. [#51000](https://github.com/ClickHouse/ClickHouse/pull/51000) ([Kseniia Sumarokova](https://github.com/kssenii)).
|
||||||
|
* Decreased default timeouts for S3 from 30 seconds to 3 seconds, and for other HTTP from 180 seconds to 30 seconds. [#51171](https://github.com/ClickHouse/ClickHouse/pull/51171) ([Michael Kolupaev](https://github.com/al13n321)).
|
||||||
|
* New setting `merge_tree_determine_task_size_by_prewhere_columns` added. If set to `true` only sizes of the columns from `PREWHERE` section will be considered to determine reading task size. Otherwise all the columns from query are considered. [#52606](https://github.com/ClickHouse/ClickHouse/pull/52606) ([Nikita Taranov](https://github.com/nickitat)).
|
||||||
|
|
||||||
|
#### Improvement
|
||||||
|
* Use read_bytes/total_bytes_to_read for progress bar in s3/file/url/... table functions for better progress indication. [#51286](https://github.com/ClickHouse/ClickHouse/pull/51286) ([Kruglov Pavel](https://github.com/Avogar)).
|
||||||
|
* Introduce a table setting `wait_for_unique_parts_send_before_shutdown_ms` which specify the amount of time replica will wait before closing interserver handler for replicated sends. Also fix inconsistency with shutdown of tables and interserver handlers: now server shutdown tables first and only after it shut down interserver handlers. [#51851](https://github.com/ClickHouse/ClickHouse/pull/51851) ([alesapin](https://github.com/alesapin)).
|
||||||
|
* Allow SQL standard `FETCH` without `OFFSET`. See https://antonz.org/sql-fetch/. [#51293](https://github.com/ClickHouse/ClickHouse/pull/51293) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
|
||||||
|
* Allow filtering HTTP headers for the URL/S3 table functions with the new `http_forbid_headers` section in config. Both exact matching and regexp filters are available. [#51038](https://github.com/ClickHouse/ClickHouse/pull/51038) ([Nikolay Degterinsky](https://github.com/evillique)).
|
||||||
|
* Don't show messages about `16 EiB` free space in logs, as they don't make sense. This closes [#49320](https://github.com/ClickHouse/ClickHouse/issues/49320). [#49342](https://github.com/ClickHouse/ClickHouse/pull/49342) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
|
||||||
|
* Properly check the limit for the `sleepEachRow` function. Add a setting `function_sleep_max_microseconds_per_block`. This is needed for generic query fuzzer. [#49343](https://github.com/ClickHouse/ClickHouse/pull/49343) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
|
||||||
|
* Fix two issues in `geoHash` functions. [#50066](https://github.com/ClickHouse/ClickHouse/pull/50066) ([李扬](https://github.com/taiyang-li)).
|
||||||
|
* Log async insert flush queries into `system.query_log`. [#51160](https://github.com/ClickHouse/ClickHouse/pull/51160) ([Raúl Marín](https://github.com/Algunenano)).
|
||||||
|
* Functions `date_diff` and `age` now support millisecond/microsecond unit and work with microsecond precision. [#51291](https://github.com/ClickHouse/ClickHouse/pull/51291) ([Dmitry Kardymon](https://github.com/kardymonds)).
|
||||||
|
* Improve parsing of path in clickhouse-keeper-client. [#51359](https://github.com/ClickHouse/ClickHouse/pull/51359) ([Azat Khuzhin](https://github.com/azat)).
|
||||||
|
* A third-party product depending on ClickHouse (Gluten: a Plugin to Double SparkSQL's Performance) had a bug. This fix avoids heap overflow in that third-party product while reading from HDFS. [#51386](https://github.com/ClickHouse/ClickHouse/pull/51386) ([李扬](https://github.com/taiyang-li)).
|
||||||
|
* Add ability to disable native copy for S3 (setting for BACKUP/RESTORE `allow_s3_native_copy`, and `s3_allow_native_copy` for `s3`/`s3_plain` disks). [#51448](https://github.com/ClickHouse/ClickHouse/pull/51448) ([Azat Khuzhin](https://github.com/azat)).
|
||||||
|
* Add column `primary_key_size` to `system.parts` table to show compressed primary key size on disk. Closes [#51400](https://github.com/ClickHouse/ClickHouse/issues/51400). [#51496](https://github.com/ClickHouse/ClickHouse/pull/51496) ([Yarik Briukhovetskyi](https://github.com/yariks5s)).
|
||||||
|
* Allow running `clickhouse-local` without procfs, without home directory existing, and without name resolution plugins from glibc. [#51518](https://github.com/ClickHouse/ClickHouse/pull/51518) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
|
||||||
|
* Add placeholder `%a` for rull filename in rename_files_after_processing setting. [#51603](https://github.com/ClickHouse/ClickHouse/pull/51603) ([Kruglov Pavel](https://github.com/Avogar)).
|
||||||
|
* Add column `modification_time` into `system.parts_columns`. [#51685](https://github.com/ClickHouse/ClickHouse/pull/51685) ([Azat Khuzhin](https://github.com/azat)).
|
||||||
|
* Add new setting `input_format_csv_use_default_on_bad_values` to CSV format that allows to insert default value when parsing of a single field failed. [#51716](https://github.com/ClickHouse/ClickHouse/pull/51716) ([KevinyhZou](https://github.com/KevinyhZou)).
|
||||||
|
* Added a crash log flush to the disk after the unexpected crash. [#51720](https://github.com/ClickHouse/ClickHouse/pull/51720) ([Alexey Gerasimchuck](https://github.com/Demilivor)).
|
||||||
|
* Fix behavior in dashboard page where errors unrelated to authentication are not shown. Also fix 'overlapping' chart behavior. [#51744](https://github.com/ClickHouse/ClickHouse/pull/51744) ([Zach Naimon](https://github.com/ArctypeZach)).
|
||||||
|
* Allow UUID to UInt128 conversion. [#51765](https://github.com/ClickHouse/ClickHouse/pull/51765) ([Dmitry Kardymon](https://github.com/kardymonds)).
|
||||||
|
* Added support for function `range` of Nullable arguments. [#51767](https://github.com/ClickHouse/ClickHouse/pull/51767) ([Dmitry Kardymon](https://github.com/kardymonds)).
|
||||||
|
* Convert condition like `toyear(x) = c` to `c1 <= x < c2`. [#51795](https://github.com/ClickHouse/ClickHouse/pull/51795) ([Han Fei](https://github.com/hanfei1991)).
|
||||||
|
* Improve MySQL compatibility of the statement `SHOW INDEX`. [#51796](https://github.com/ClickHouse/ClickHouse/pull/51796) ([Robert Schulze](https://github.com/rschu1ze)).
|
||||||
|
* Fix `use_structure_from_insertion_table_in_table_functions` does not work with `MATERIALIZED` and `ALIAS` columns. Closes [#51817](https://github.com/ClickHouse/ClickHouse/issues/51817). Closes [#51019](https://github.com/ClickHouse/ClickHouse/issues/51019). [#51825](https://github.com/ClickHouse/ClickHouse/pull/51825) ([flynn](https://github.com/ucasfl)).
|
||||||
|
* Cache dictionary now requests only unique keys from source. Closes [#51762](https://github.com/ClickHouse/ClickHouse/issues/51762). [#51853](https://github.com/ClickHouse/ClickHouse/pull/51853) ([Maksim Kita](https://github.com/kitaisreal)).
|
||||||
|
* Fixed the case when settings were not applied for EXPLAIN query when FORMAT was provided. [#51859](https://github.com/ClickHouse/ClickHouse/pull/51859) ([Nikita Taranov](https://github.com/nickitat)).
|
||||||
|
* Allow SETTINGS before FORMAT in DESCRIBE TABLE query for compatibility with SELECT query. Closes [#51544](https://github.com/ClickHouse/ClickHouse/issues/51544). [#51899](https://github.com/ClickHouse/ClickHouse/pull/51899) ([Nikolay Degterinsky](https://github.com/evillique)).
|
||||||
|
* Var-Int encoded integers (e.g. used by the native protocol) can now use the full 64-bit range. 3rd party clients are advised to update their var-int code accordingly. [#51905](https://github.com/ClickHouse/ClickHouse/pull/51905) ([Robert Schulze](https://github.com/rschu1ze)).
|
||||||
|
* Update certificates when they change without the need to manually SYSTEM RELOAD CONFIG. [#52030](https://github.com/ClickHouse/ClickHouse/pull/52030) ([Mike Kot](https://github.com/myrrc)).
|
||||||
|
* Added `allow_create_index_without_type` setting that allow to ignore `ADD INDEX` queries without specified `TYPE`. Standard SQL queries will just succeed without changing table schema. [#52056](https://github.com/ClickHouse/ClickHouse/pull/52056) ([Ilya Yatsishin](https://github.com/qoega)).
|
||||||
|
* Log messages are written to the `system.text_log` from the server startup. [#52113](https://github.com/ClickHouse/ClickHouse/pull/52113) ([Dmitry Kardymon](https://github.com/kardymonds)).
|
||||||
|
* In cases where the HTTP endpoint has multiple IP addresses and the first of them is unreachable, a timeout exception was thrown. Made session creation with handling all resolved endpoints. [#52116](https://github.com/ClickHouse/ClickHouse/pull/52116) ([Aleksei Filatov](https://github.com/aalexfvk)).
|
||||||
|
* Avro input format now supports Union even if it contains only a single type. Closes [#52131](https://github.com/ClickHouse/ClickHouse/issues/52131). [#52137](https://github.com/ClickHouse/ClickHouse/pull/52137) ([flynn](https://github.com/ucasfl)).
|
||||||
|
* Add setting `optimize_use_implicit_projections` to disable implicit projections (currently only `min_max_count` projection). [#52152](https://github.com/ClickHouse/ClickHouse/pull/52152) ([Amos Bird](https://github.com/amosbird)).
|
||||||
|
* It was possible to use the function `hasToken` for infinite loop. Now this possibility is removed. This closes [#52156](https://github.com/ClickHouse/ClickHouse/issues/52156). [#52160](https://github.com/ClickHouse/ClickHouse/pull/52160) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
|
||||||
|
* Create ZK ancestors optimistically. [#52195](https://github.com/ClickHouse/ClickHouse/pull/52195) ([Raúl Marín](https://github.com/Algunenano)).
|
||||||
|
* Fix [#50582](https://github.com/ClickHouse/ClickHouse/issues/50582). Avoid the `Not found column ... in block` error in some cases of reading in-order and constants. [#52259](https://github.com/ClickHouse/ClickHouse/pull/52259) ([Chen768959](https://github.com/Chen768959)).
|
||||||
|
* Check whether S2 geo primitives are invalid as early as possible on ClickHouse side. This closes: [#27090](https://github.com/ClickHouse/ClickHouse/issues/27090). [#52260](https://github.com/ClickHouse/ClickHouse/pull/52260) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
|
||||||
|
* Add back missing projection QueryAccessInfo when `query_plan_optimize_projection = 1`. This fixes [#50183](https://github.com/ClickHouse/ClickHouse/issues/50183) . This fixes [#50093](https://github.com/ClickHouse/ClickHouse/issues/50093). [#52327](https://github.com/ClickHouse/ClickHouse/pull/52327) ([Amos Bird](https://github.com/amosbird)).
|
||||||
|
* When `ZooKeeperRetriesControl` rethrows an error, it's more useful to see its original stack trace, not the one from `ZooKeeperRetriesControl` itself. [#52347](https://github.com/ClickHouse/ClickHouse/pull/52347) ([Vitaly Baranov](https://github.com/vitlibar)).
|
||||||
|
* Wait for zero copy replication lock even if some disks don't support it. [#52376](https://github.com/ClickHouse/ClickHouse/pull/52376) ([Raúl Marín](https://github.com/Algunenano)).
|
||||||
|
* Now interserver port will be closed only after tables are shut down. [#52498](https://github.com/ClickHouse/ClickHouse/pull/52498) ([alesapin](https://github.com/alesapin)).
|
||||||
|
|
||||||
|
#### Experimental Feature
|
||||||
|
* Writing parquet files is 10x faster, it's multi-threaded now. Almost the same speed as reading. [#49367](https://github.com/ClickHouse/ClickHouse/pull/49367) ([Michael Kolupaev](https://github.com/al13n321)). This is controlled by the setting `output_format_parquet_use_custom_encoder` which is disabled by default, because the feature is non-ideal.
|
||||||
|
* Added support for [PRQL](https://prql-lang.org/) as a query language. [#50686](https://github.com/ClickHouse/ClickHouse/pull/50686) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
|
||||||
|
* Allow to add disk name for custom disks. Previously custom disks would use an internal generated disk name. Now it will be possible with `disk = disk_<name>(...)` (e.g. disk will have name `name`) . [#51552](https://github.com/ClickHouse/ClickHouse/pull/51552) ([Kseniia Sumarokova](https://github.com/kssenii)). This syntax can be changed in this release.
|
||||||
|
* (experimental MaterializedMySQL) Fixed crash when `mysqlxx::Pool::Entry` is used after it was disconnected. [#52063](https://github.com/ClickHouse/ClickHouse/pull/52063) ([Val Doroshchuk](https://github.com/valbok)).
|
||||||
|
* (experimental MaterializedMySQL) `CREATE TABLE ... AS SELECT` .. is now supported in MaterializedMySQL. [#52067](https://github.com/ClickHouse/ClickHouse/pull/52067) ([Val Doroshchuk](https://github.com/valbok)).
|
||||||
|
* (experimental MaterializedMySQL) Introduced automatic conversion of text types to utf8 for MaterializedMySQL. [#52084](https://github.com/ClickHouse/ClickHouse/pull/52084) ([Val Doroshchuk](https://github.com/valbok)).
|
||||||
|
* (experimental MaterializedMySQL) Now unquoted UTF-8 strings are supported in DDL for MaterializedMySQL. [#52318](https://github.com/ClickHouse/ClickHouse/pull/52318) ([Val Doroshchuk](https://github.com/valbok)).
|
||||||
|
* (experimental MaterializedMySQL) Now double quoted comments are supported in MaterializedMySQL. [#52355](https://github.com/ClickHouse/ClickHouse/pull/52355) ([Val Doroshchuk](https://github.com/valbok)).
|
||||||
|
* Upgrade Intel QPL from v1.1.0 to v1.2.0 2. Upgrade Intel accel-config from v3.5 to v4.0 3. Fixed issue that Device IOTLB miss has big perf. impact for IAA accelerators. [#52180](https://github.com/ClickHouse/ClickHouse/pull/52180) ([jasperzhu](https://github.com/jinjunzh)).
|
||||||
|
* The `session_timezone` setting (new in version 23.6) is demoted to experimental. [#52445](https://github.com/ClickHouse/ClickHouse/pull/52445) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
|
||||||
|
* Support ZooKeeper `reconfig` command for ClickHouse Keeper with incremental reconfiguration which can be enabled via `keeper_server.enable_reconfiguration` setting. Support adding servers, removing servers, and changing server priorities. [#49450](https://github.com/ClickHouse/ClickHouse/pull/49450) ([Mike Kot](https://github.com/myrrc)). It is suspected that this feature is incomplete.
|
||||||
|
|
||||||
|
#### Build/Testing/Packaging Improvement
|
||||||
|
* Add experimental ClickHouse builds for Linux RISC-V 64 to CI. [#31398](https://github.com/ClickHouse/ClickHouse/pull/31398) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
|
||||||
|
* Add integration test check with the enabled Analyzer. [#50926](https://github.com/ClickHouse/ClickHouse/pull/50926) [#52210](https://github.com/ClickHouse/ClickHouse/pull/52210) ([Dmitry Novik](https://github.com/novikd)).
|
||||||
|
* Reproducible builds for Rust. [#52395](https://github.com/ClickHouse/ClickHouse/pull/52395) ([Azat Khuzhin](https://github.com/azat)).
|
||||||
|
* Update Cargo dependencies. [#51721](https://github.com/ClickHouse/ClickHouse/pull/51721) ([Raúl Marín](https://github.com/Algunenano)).
|
||||||
|
* Make the function `CHColumnToArrowColumn::fillArrowArrayWithArrayColumnData` to work with nullable arrays, which are not possible in ClickHouse, but needed for Gluten. [#52112](https://github.com/ClickHouse/ClickHouse/pull/52112) ([李扬](https://github.com/taiyang-li)).
|
||||||
|
* We've updated the CCTZ library to master, but there are no user-visible changes. [#52124](https://github.com/ClickHouse/ClickHouse/pull/52124) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
|
||||||
|
* The `system.licenses` table now includes the hard-forked library Poco. This closes [#52066](https://github.com/ClickHouse/ClickHouse/issues/52066). [#52127](https://github.com/ClickHouse/ClickHouse/pull/52127) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
|
||||||
|
* Check that there are no cases of bad punctuation: whitespace before a comma like `Hello ,world` instead of `Hello, world`. [#52549](https://github.com/ClickHouse/ClickHouse/pull/52549) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
|
||||||
|
|
||||||
|
#### Bug Fix (user-visible misbehavior in an official stable release)
|
||||||
|
* Fix MaterializedPostgreSQL syncTables [#49698](https://github.com/ClickHouse/ClickHouse/pull/49698) ([Kseniia Sumarokova](https://github.com/kssenii)).
|
||||||
|
* Fix projection with optimize_aggregators_of_group_by_keys [#49709](https://github.com/ClickHouse/ClickHouse/pull/49709) ([Amos Bird](https://github.com/amosbird)).
|
||||||
|
* Fix optimize_skip_unused_shards with JOINs [#51037](https://github.com/ClickHouse/ClickHouse/pull/51037) ([Azat Khuzhin](https://github.com/azat)).
|
||||||
|
* Fix formatDateTime() with fractional negative datetime64 [#51290](https://github.com/ClickHouse/ClickHouse/pull/51290) ([Dmitry Kardymon](https://github.com/kardymonds)).
|
||||||
|
* Functions `hasToken*` were totally wrong. Add a test for [#43358](https://github.com/ClickHouse/ClickHouse/issues/43358) [#51378](https://github.com/ClickHouse/ClickHouse/pull/51378) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
|
||||||
|
* Fix optimization to move functions before sorting. [#51481](https://github.com/ClickHouse/ClickHouse/pull/51481) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
|
||||||
|
* Fix Block structure mismatch in Pipe::unitePipes for FINAL [#51492](https://github.com/ClickHouse/ClickHouse/pull/51492) ([Nikita Taranov](https://github.com/nickitat)).
|
||||||
|
* Fix SIGSEGV for clusters with zero weight across all shards (fixes INSERT INTO FUNCTION clusterAllReplicas()) [#51545](https://github.com/ClickHouse/ClickHouse/pull/51545) ([Azat Khuzhin](https://github.com/azat)).
|
||||||
|
* Fix timeout for hedged requests [#51582](https://github.com/ClickHouse/ClickHouse/pull/51582) ([Azat Khuzhin](https://github.com/azat)).
|
||||||
|
* Fix logical error in ANTI join with NULL [#51601](https://github.com/ClickHouse/ClickHouse/pull/51601) ([vdimir](https://github.com/vdimir)).
|
||||||
|
* Fix for moving 'IN' conditions to PREWHERE [#51610](https://github.com/ClickHouse/ClickHouse/pull/51610) ([Alexander Gololobov](https://github.com/davenger)).
|
||||||
|
* Do not apply PredicateExpressionsOptimizer for ASOF/ANTI join [#51633](https://github.com/ClickHouse/ClickHouse/pull/51633) ([vdimir](https://github.com/vdimir)).
|
||||||
|
* Fix async insert with deduplication for ReplicatedMergeTree using merging algorithms [#51676](https://github.com/ClickHouse/ClickHouse/pull/51676) ([Antonio Andelic](https://github.com/antonio2368)).
|
||||||
|
* Fix reading from empty column in `parseSipHashKey` [#51804](https://github.com/ClickHouse/ClickHouse/pull/51804) ([Nikita Taranov](https://github.com/nickitat)).
|
||||||
|
* Fix segfault when create invalid EmbeddedRocksdb table [#51847](https://github.com/ClickHouse/ClickHouse/pull/51847) ([Duc Canh Le](https://github.com/canhld94)).
|
||||||
|
* Fix inserts into MongoDB tables [#51876](https://github.com/ClickHouse/ClickHouse/pull/51876) ([Nikolay Degterinsky](https://github.com/evillique)).
|
||||||
|
* Fix deadlock on DatabaseCatalog shutdown [#51908](https://github.com/ClickHouse/ClickHouse/pull/51908) ([Alexander Tokmakov](https://github.com/tavplubix)).
|
||||||
|
* Fix error in subquery operators [#51922](https://github.com/ClickHouse/ClickHouse/pull/51922) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
|
||||||
|
* Fix async connect to hosts with multiple ips [#51934](https://github.com/ClickHouse/ClickHouse/pull/51934) ([Kruglov Pavel](https://github.com/Avogar)).
|
||||||
|
* Do not remove inputs after ActionsDAG::merge [#51947](https://github.com/ClickHouse/ClickHouse/pull/51947) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
|
||||||
|
* Check refcount in `RemoveManyObjectStorageOperation::finalize` instead of `execute` [#51954](https://github.com/ClickHouse/ClickHouse/pull/51954) ([vdimir](https://github.com/vdimir)).
|
||||||
|
* Allow parametric UDFs [#51964](https://github.com/ClickHouse/ClickHouse/pull/51964) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
|
||||||
|
* Small fix for toDateTime64() for dates after 2283-12-31 [#52130](https://github.com/ClickHouse/ClickHouse/pull/52130) ([Andrey Zvonov](https://github.com/zvonand)).
|
||||||
|
* Fix ORDER BY tuple of WINDOW functions [#52145](https://github.com/ClickHouse/ClickHouse/pull/52145) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
|
||||||
|
* Fix incorrect projection analysis when aggregation expression contains monotonic functions [#52151](https://github.com/ClickHouse/ClickHouse/pull/52151) ([Amos Bird](https://github.com/amosbird)).
|
||||||
|
* Fix error in `groupArrayMoving` functions [#52161](https://github.com/ClickHouse/ClickHouse/pull/52161) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
|
||||||
|
* Disable direct join for range dictionary [#52187](https://github.com/ClickHouse/ClickHouse/pull/52187) ([Duc Canh Le](https://github.com/canhld94)).
|
||||||
|
* Fix sticky mutations test (and extremely rare race condition) [#52197](https://github.com/ClickHouse/ClickHouse/pull/52197) ([alesapin](https://github.com/alesapin)).
|
||||||
|
* Fix race in Web disk [#52211](https://github.com/ClickHouse/ClickHouse/pull/52211) ([Kseniia Sumarokova](https://github.com/kssenii)).
|
||||||
|
* Fix data race in Connection::setAsyncCallback on unknown packet from server [#52219](https://github.com/ClickHouse/ClickHouse/pull/52219) ([Kruglov Pavel](https://github.com/Avogar)).
|
||||||
|
* Fix temp data deletion on startup, add test [#52275](https://github.com/ClickHouse/ClickHouse/pull/52275) ([vdimir](https://github.com/vdimir)).
|
||||||
|
* Don't use minmax_count projections when counting nullable columns [#52297](https://github.com/ClickHouse/ClickHouse/pull/52297) ([Amos Bird](https://github.com/amosbird)).
|
||||||
|
* MergeTree/ReplicatedMergeTree should use server timezone for log entries [#52325](https://github.com/ClickHouse/ClickHouse/pull/52325) ([Azat Khuzhin](https://github.com/azat)).
|
||||||
|
* Fix parameterized view with cte and multiple usage [#52328](https://github.com/ClickHouse/ClickHouse/pull/52328) ([SmitaRKulkarni](https://github.com/SmitaRKulkarni)).
|
||||||
|
* Disable expression templates for time intervals [#52335](https://github.com/ClickHouse/ClickHouse/pull/52335) ([Alexander Tokmakov](https://github.com/tavplubix)).
|
||||||
|
* Fix `apply_snapshot` in Keeper [#52358](https://github.com/ClickHouse/ClickHouse/pull/52358) ([Antonio Andelic](https://github.com/antonio2368)).
|
||||||
|
* Update build-osx.md [#52377](https://github.com/ClickHouse/ClickHouse/pull/52377) ([AlexBykovski](https://github.com/AlexBykovski)).
|
||||||
|
* Fix `countSubstrings()` hang with empty needle and a column haystack [#52409](https://github.com/ClickHouse/ClickHouse/pull/52409) ([Sergei Trifonov](https://github.com/serxa)).
|
||||||
|
* Fix normal projection with merge table [#52432](https://github.com/ClickHouse/ClickHouse/pull/52432) ([Amos Bird](https://github.com/amosbird)).
|
||||||
|
* Fix possible double-free in Aggregator [#52439](https://github.com/ClickHouse/ClickHouse/pull/52439) ([Nikita Taranov](https://github.com/nickitat)).
|
||||||
|
* Fixed inserting into Buffer engine [#52440](https://github.com/ClickHouse/ClickHouse/pull/52440) ([Vasily Nemkov](https://github.com/Enmk)).
|
||||||
|
* The implementation of AnyHash was non-conformant. [#52448](https://github.com/ClickHouse/ClickHouse/pull/52448) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
|
||||||
|
* Check recursion depth in OptimizedRegularExpression [#52451](https://github.com/ClickHouse/ClickHouse/pull/52451) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
|
||||||
|
* Fix data-race DatabaseReplicated::startupTables()/canExecuteReplicatedMetadataAlter() [#52490](https://github.com/ClickHouse/ClickHouse/pull/52490) ([Azat Khuzhin](https://github.com/azat)).
|
||||||
|
* Fix abort in function `transform` [#52513](https://github.com/ClickHouse/ClickHouse/pull/52513) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
|
||||||
|
* Fix lightweight delete after drop of projection [#52517](https://github.com/ClickHouse/ClickHouse/pull/52517) ([Anton Popov](https://github.com/CurtizJ)).
|
||||||
|
* Fix possible error "Cannot drain connections: cancel first" [#52585](https://github.com/ClickHouse/ClickHouse/pull/52585) ([Kruglov Pavel](https://github.com/Avogar)).
|
||||||
|
|
||||||
|
|
||||||
### <a id="236"></a> ClickHouse release 23.6, 2023-06-29
|
### <a id="236"></a> ClickHouse release 23.6, 2023-06-29
|
||||||
|
|
||||||
#### Backward Incompatible Change
|
#### Backward Incompatible Change
|
||||||
|
@ -118,7 +118,11 @@ endif()
|
|||||||
# - sanitize.cmake
|
# - sanitize.cmake
|
||||||
add_library(global-libs INTERFACE)
|
add_library(global-libs INTERFACE)
|
||||||
|
|
||||||
include (cmake/fuzzer.cmake)
|
# We don't want to instrument everything with fuzzer, but only specific targets (see below),
|
||||||
|
# also, since we build our own llvm, we specifically don't want to instrument
|
||||||
|
# libFuzzer library itself - it would result in infinite recursion
|
||||||
|
#include (cmake/fuzzer.cmake)
|
||||||
|
|
||||||
include (cmake/sanitize.cmake)
|
include (cmake/sanitize.cmake)
|
||||||
|
|
||||||
option(ENABLE_COLORED_BUILD "Enable colors in compiler output" ON)
|
option(ENABLE_COLORED_BUILD "Enable colors in compiler output" ON)
|
||||||
@ -165,8 +169,14 @@ elseif(GLIBC_COMPATIBILITY)
|
|||||||
message (${RECONFIGURE_MESSAGE_LEVEL} "Glibc compatibility cannot be enabled in current configuration")
|
message (${RECONFIGURE_MESSAGE_LEVEL} "Glibc compatibility cannot be enabled in current configuration")
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
# Make sure the final executable has symbols exported
|
if (OS_LINUX)
|
||||||
set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -rdynamic")
|
# We should not export dynamic symbols, because:
|
||||||
|
# - The main clickhouse binary does not use dlopen,
|
||||||
|
# and whatever is poisoning it by LD_PRELOAD should not link to our symbols.
|
||||||
|
# - The clickhouse-odbc-bridge and clickhouse-library-bridge binaries
|
||||||
|
# should not expose their symbols to ODBC drivers and libraries.
|
||||||
|
set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--no-export-dynamic")
|
||||||
|
endif ()
|
||||||
|
|
||||||
if (OS_DARWIN)
|
if (OS_DARWIN)
|
||||||
# The `-all_load` flag forces loading of all symbols from all libraries,
|
# The `-all_load` flag forces loading of all symbols from all libraries,
|
||||||
@ -202,9 +212,6 @@ option(OMIT_HEAVY_DEBUG_SYMBOLS
|
|||||||
"Do not generate debugger info for heavy modules (ClickHouse functions and dictionaries, some contrib)"
|
"Do not generate debugger info for heavy modules (ClickHouse functions and dictionaries, some contrib)"
|
||||||
${OMIT_HEAVY_DEBUG_SYMBOLS_DEFAULT})
|
${OMIT_HEAVY_DEBUG_SYMBOLS_DEFAULT})
|
||||||
|
|
||||||
if (CMAKE_BUILD_TYPE_UC STREQUAL "DEBUG")
|
|
||||||
set(USE_DEBUG_HELPERS ON)
|
|
||||||
endif()
|
|
||||||
option(USE_DEBUG_HELPERS "Enable debug helpers" ${USE_DEBUG_HELPERS})
|
option(USE_DEBUG_HELPERS "Enable debug helpers" ${USE_DEBUG_HELPERS})
|
||||||
|
|
||||||
option(BUILD_STANDALONE_KEEPER "Build keeper as small standalone binary" OFF)
|
option(BUILD_STANDALONE_KEEPER "Build keeper as small standalone binary" OFF)
|
||||||
@ -555,6 +562,46 @@ add_subdirectory (programs)
|
|||||||
add_subdirectory (tests)
|
add_subdirectory (tests)
|
||||||
add_subdirectory (utils)
|
add_subdirectory (utils)
|
||||||
|
|
||||||
|
# Function get_all_targets collects all targets recursively
|
||||||
|
function(get_all_targets var)
|
||||||
|
macro(get_all_targets_recursive targets dir)
|
||||||
|
get_property(subdirectories DIRECTORY ${dir} PROPERTY SUBDIRECTORIES)
|
||||||
|
foreach(subdir ${subdirectories})
|
||||||
|
get_all_targets_recursive(${targets} ${subdir})
|
||||||
|
endforeach()
|
||||||
|
get_property(current_targets DIRECTORY ${dir} PROPERTY BUILDSYSTEM_TARGETS)
|
||||||
|
list(APPEND ${targets} ${current_targets})
|
||||||
|
endmacro()
|
||||||
|
|
||||||
|
set(targets)
|
||||||
|
get_all_targets_recursive(targets ${CMAKE_CURRENT_SOURCE_DIR})
|
||||||
|
set(${var} ${targets} PARENT_SCOPE)
|
||||||
|
endfunction()
|
||||||
|
|
||||||
|
if (FUZZER)
|
||||||
|
# Bundle fuzzers target
|
||||||
|
add_custom_target(fuzzers)
|
||||||
|
# Instrument all targets fuzzer and link with libfuzzer
|
||||||
|
get_all_targets(all_targets)
|
||||||
|
foreach(target ${all_targets})
|
||||||
|
if (NOT(target STREQUAL "_fuzzer" OR target STREQUAL "_fuzzer_no_main"))
|
||||||
|
get_target_property(target_type ${target} TYPE)
|
||||||
|
if (NOT(target_type STREQUAL "INTERFACE_LIBRARY" OR target_type STREQUAL "UTILITY"))
|
||||||
|
target_compile_options(${target} PRIVATE "-fsanitize=fuzzer-no-link")
|
||||||
|
endif()
|
||||||
|
# clickhouse fuzzer isn't working correctly
|
||||||
|
# initial PR https://github.com/ClickHouse/ClickHouse/pull/27526
|
||||||
|
#if (target MATCHES ".+_fuzzer" OR target STREQUAL "clickhouse")
|
||||||
|
if (target MATCHES ".+_fuzzer")
|
||||||
|
message(STATUS "${target} instrumented with fuzzer")
|
||||||
|
target_link_libraries(${target} PUBLIC ch_contrib::fuzzer)
|
||||||
|
# Add to fuzzers bundle
|
||||||
|
add_dependencies(fuzzers ${target})
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
endforeach()
|
||||||
|
endif()
|
||||||
|
|
||||||
include (cmake/sanitize_targets.cmake)
|
include (cmake/sanitize_targets.cmake)
|
||||||
|
|
||||||
# Build native targets if necessary
|
# Build native targets if necessary
|
||||||
|
@ -78,6 +78,14 @@ if (OS MATCHES "Linux"
|
|||||||
AND ("$ENV{CC}" MATCHES ".*clang.*" OR CMAKE_C_COMPILER MATCHES ".*clang.*"))
|
AND ("$ENV{CC}" MATCHES ".*clang.*" OR CMAKE_C_COMPILER MATCHES ".*clang.*"))
|
||||||
|
|
||||||
if (ARCH MATCHES "amd64|x86_64")
|
if (ARCH MATCHES "amd64|x86_64")
|
||||||
|
# NOTE: right now musl is not ready, since unwind is too slow with it
|
||||||
|
#
|
||||||
|
# FWIW the following had been tried:
|
||||||
|
# - update musl
|
||||||
|
# - compile musl with debug
|
||||||
|
# - compile musl with debug and -fasynchronous-unwind-tables
|
||||||
|
#
|
||||||
|
# But none of this changes anything so far.
|
||||||
set (CMAKE_TOOLCHAIN_FILE "cmake/linux/toolchain-x86_64.cmake" CACHE INTERNAL "")
|
set (CMAKE_TOOLCHAIN_FILE "cmake/linux/toolchain-x86_64.cmake" CACHE INTERNAL "")
|
||||||
elseif (ARCH MATCHES "^(aarch64.*|AARCH64.*|arm64.*|ARM64.*)")
|
elseif (ARCH MATCHES "^(aarch64.*|AARCH64.*|arm64.*|ARM64.*)")
|
||||||
set (CMAKE_TOOLCHAIN_FILE "cmake/linux/toolchain-aarch64.cmake" CACHE INTERNAL "")
|
set (CMAKE_TOOLCHAIN_FILE "cmake/linux/toolchain-aarch64.cmake" CACHE INTERNAL "")
|
||||||
|
@ -23,11 +23,8 @@ curl https://clickhouse.com/ | sh
|
|||||||
|
|
||||||
## Upcoming Events
|
## Upcoming Events
|
||||||
|
|
||||||
* [**v23.7 Release Webinar**](https://clickhouse.com/company/events/v23-7-community-release-call?utm_source=github&utm_medium=social&utm_campaign=release-webinar-2023-07) - Jul 27 - 23.7 is rapidly approaching. Original creator, co-founder, and CTO of ClickHouse Alexey Milovidov will walk us through the highlights of the release.
|
* [**v23.8 Community Call**](https://clickhouse.com/company/events/v23-8-community-release-call?utm_source=github&utm_medium=social&utm_campaign=release-webinar-2023-08) - Aug 31 - 23.8 is rapidly approaching. Original creator, co-founder, and CTO of ClickHouse Alexey Milovidov will walk us through the highlights of the release.
|
||||||
* [**ClickHouse Meetup in Boston**](https://www.meetup.com/clickhouse-boston-user-group/events/293913596) - Jul 18
|
* [**ClickHouse & AI - A Meetup in San Francisco**](https://www.meetup.com/clickhouse-silicon-valley-meetup-group/events/294472987) - Aug 8
|
||||||
* [**ClickHouse Meetup in NYC**](https://www.meetup.com/clickhouse-new-york-user-group/events/293913441) - Jul 19
|
|
||||||
* [**ClickHouse Meetup in Toronto**](https://www.meetup.com/clickhouse-toronto-user-group/events/294183127) - Jul 20
|
|
||||||
* [**ClickHouse Meetup in Singapore**](https://www.meetup.com/clickhouse-singapore-meetup-group/events/294428050/) - Jul 27
|
|
||||||
* [**ClickHouse Meetup in Paris**](https://www.meetup.com/clickhouse-france-user-group/events/294283460) - Sep 12
|
* [**ClickHouse Meetup in Paris**](https://www.meetup.com/clickhouse-france-user-group/events/294283460) - Sep 12
|
||||||
|
|
||||||
Also, keep an eye out for upcoming meetups around the world. Somewhere else you want us to be? Please feel free to reach out to tyler <at> clickhouse <dot> com.
|
Also, keep an eye out for upcoming meetups around the world. Somewhere else you want us to be? Please feel free to reach out to tyler <at> clickhouse <dot> com.
|
||||||
|
11
SECURITY.md
11
SECURITY.md
@ -13,17 +13,14 @@ The following versions of ClickHouse server are currently being supported with s
|
|||||||
|
|
||||||
| Version | Supported |
|
| Version | Supported |
|
||||||
|:-|:-|
|
|:-|:-|
|
||||||
|
| 23.8 | ✔️ |
|
||||||
|
| 23.7 | ✔️ |
|
||||||
| 23.6 | ✔️ |
|
| 23.6 | ✔️ |
|
||||||
| 23.5 | ✔️ |
|
| 23.5 | ❌ |
|
||||||
| 23.4 | ✔️ |
|
| 23.4 | ❌ |
|
||||||
| 23.3 | ✔️ |
|
| 23.3 | ✔️ |
|
||||||
| 23.2 | ❌ |
|
| 23.2 | ❌ |
|
||||||
| 23.1 | ❌ |
|
| 23.1 | ❌ |
|
||||||
| 22.12 | ❌ |
|
|
||||||
| 22.11 | ❌ |
|
|
||||||
| 22.10 | ❌ |
|
|
||||||
| 22.9 | ❌ |
|
|
||||||
| 22.8 | ✔️ |
|
|
||||||
| 22.* | ❌ |
|
| 22.* | ❌ |
|
||||||
| 21.* | ❌ |
|
| 21.* | ❌ |
|
||||||
| 20.* | ❌ |
|
| 20.* | ❌ |
|
||||||
|
@ -3,6 +3,7 @@
|
|||||||
#include <magic_enum.hpp>
|
#include <magic_enum.hpp>
|
||||||
#include <fmt/format.h>
|
#include <fmt/format.h>
|
||||||
|
|
||||||
|
|
||||||
template <class T> concept is_enum = std::is_enum_v<T>;
|
template <class T> concept is_enum = std::is_enum_v<T>;
|
||||||
|
|
||||||
namespace detail
|
namespace detail
|
||||||
|
@ -7,8 +7,6 @@
|
|||||||
#include <base/find_symbols.h>
|
#include <base/find_symbols.h>
|
||||||
#include <base/preciseExp10.h>
|
#include <base/preciseExp10.h>
|
||||||
|
|
||||||
#include <iostream>
|
|
||||||
|
|
||||||
#define JSON_MAX_DEPTH 100
|
#define JSON_MAX_DEPTH 100
|
||||||
|
|
||||||
|
|
||||||
|
@ -8,8 +8,10 @@
|
|||||||
#include <functional>
|
#include <functional>
|
||||||
#include <iosfwd>
|
#include <iosfwd>
|
||||||
|
|
||||||
|
#include <base/defines.h>
|
||||||
#include <base/types.h>
|
#include <base/types.h>
|
||||||
#include <base/unaligned.h>
|
#include <base/unaligned.h>
|
||||||
|
#include <base/simd.h>
|
||||||
|
|
||||||
#include <city.h>
|
#include <city.h>
|
||||||
|
|
||||||
@ -28,6 +30,11 @@
|
|||||||
#define CRC_INT __crc32cd
|
#define CRC_INT __crc32cd
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if defined(__aarch64__) && defined(__ARM_NEON)
|
||||||
|
#include <arm_neon.h>
|
||||||
|
#pragma clang diagnostic ignored "-Wreserved-identifier"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The std::string_view-like container to avoid creating strings to find substrings in the hash table.
|
* The std::string_view-like container to avoid creating strings to find substrings in the hash table.
|
||||||
@ -73,14 +80,14 @@ using StringRefs = std::vector<StringRef>;
|
|||||||
* For more information, see hash_map_string_2.cpp
|
* For more information, see hash_map_string_2.cpp
|
||||||
*/
|
*/
|
||||||
|
|
||||||
inline bool compareSSE2(const char * p1, const char * p2)
|
inline bool compare8(const char * p1, const char * p2)
|
||||||
{
|
{
|
||||||
return 0xFFFF == _mm_movemask_epi8(_mm_cmpeq_epi8(
|
return 0xFFFF == _mm_movemask_epi8(_mm_cmpeq_epi8(
|
||||||
_mm_loadu_si128(reinterpret_cast<const __m128i *>(p1)),
|
_mm_loadu_si128(reinterpret_cast<const __m128i *>(p1)),
|
||||||
_mm_loadu_si128(reinterpret_cast<const __m128i *>(p2))));
|
_mm_loadu_si128(reinterpret_cast<const __m128i *>(p2))));
|
||||||
}
|
}
|
||||||
|
|
||||||
inline bool compareSSE2x4(const char * p1, const char * p2)
|
inline bool compare64(const char * p1, const char * p2)
|
||||||
{
|
{
|
||||||
return 0xFFFF == _mm_movemask_epi8(
|
return 0xFFFF == _mm_movemask_epi8(
|
||||||
_mm_and_si128(
|
_mm_and_si128(
|
||||||
@ -100,7 +107,30 @@ inline bool compareSSE2x4(const char * p1, const char * p2)
|
|||||||
_mm_loadu_si128(reinterpret_cast<const __m128i *>(p2) + 3)))));
|
_mm_loadu_si128(reinterpret_cast<const __m128i *>(p2) + 3)))));
|
||||||
}
|
}
|
||||||
|
|
||||||
inline bool memequalSSE2Wide(const char * p1, const char * p2, size_t size)
|
#elif defined(__aarch64__) && defined(__ARM_NEON)
|
||||||
|
|
||||||
|
inline bool compare8(const char * p1, const char * p2)
|
||||||
|
{
|
||||||
|
uint64_t mask = getNibbleMask(vceqq_u8(
|
||||||
|
vld1q_u8(reinterpret_cast<const unsigned char *>(p1)), vld1q_u8(reinterpret_cast<const unsigned char *>(p2))));
|
||||||
|
return 0xFFFFFFFFFFFFFFFF == mask;
|
||||||
|
}
|
||||||
|
|
||||||
|
inline bool compare64(const char * p1, const char * p2)
|
||||||
|
{
|
||||||
|
uint64_t mask = getNibbleMask(vandq_u8(
|
||||||
|
vandq_u8(vceqq_u8(vld1q_u8(reinterpret_cast<const unsigned char *>(p1)), vld1q_u8(reinterpret_cast<const unsigned char *>(p2))),
|
||||||
|
vceqq_u8(vld1q_u8(reinterpret_cast<const unsigned char *>(p1 + 16)), vld1q_u8(reinterpret_cast<const unsigned char *>(p2 + 16)))),
|
||||||
|
vandq_u8(vceqq_u8(vld1q_u8(reinterpret_cast<const unsigned char *>(p1 + 32)), vld1q_u8(reinterpret_cast<const unsigned char *>(p2 + 32))),
|
||||||
|
vceqq_u8(vld1q_u8(reinterpret_cast<const unsigned char *>(p1 + 48)), vld1q_u8(reinterpret_cast<const unsigned char *>(p2 + 48))))));
|
||||||
|
return 0xFFFFFFFFFFFFFFFF == mask;
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(__SSE2__) || (defined(__aarch64__) && defined(__ARM_NEON))
|
||||||
|
|
||||||
|
inline bool memequalWide(const char * p1, const char * p2, size_t size)
|
||||||
{
|
{
|
||||||
/** The order of branches and the trick with overlapping comparisons
|
/** The order of branches and the trick with overlapping comparisons
|
||||||
* are the same as in memcpy implementation.
|
* are the same as in memcpy implementation.
|
||||||
@ -137,7 +167,7 @@ inline bool memequalSSE2Wide(const char * p1, const char * p2, size_t size)
|
|||||||
|
|
||||||
while (size >= 64)
|
while (size >= 64)
|
||||||
{
|
{
|
||||||
if (compareSSE2x4(p1, p2))
|
if (compare64(p1, p2))
|
||||||
{
|
{
|
||||||
p1 += 64;
|
p1 += 64;
|
||||||
p2 += 64;
|
p2 += 64;
|
||||||
@ -149,17 +179,16 @@ inline bool memequalSSE2Wide(const char * p1, const char * p2, size_t size)
|
|||||||
|
|
||||||
switch (size / 16)
|
switch (size / 16)
|
||||||
{
|
{
|
||||||
case 3: if (!compareSSE2(p1 + 32, p2 + 32)) return false; [[fallthrough]];
|
case 3: if (!compare8(p1 + 32, p2 + 32)) return false; [[fallthrough]];
|
||||||
case 2: if (!compareSSE2(p1 + 16, p2 + 16)) return false; [[fallthrough]];
|
case 2: if (!compare8(p1 + 16, p2 + 16)) return false; [[fallthrough]];
|
||||||
case 1: if (!compareSSE2(p1, p2)) return false;
|
case 1: if (!compare8(p1, p2)) return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
return compareSSE2(p1 + size - 16, p2 + size - 16);
|
return compare8(p1 + size - 16, p2 + size - 16);
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
inline bool operator== (StringRef lhs, StringRef rhs)
|
inline bool operator== (StringRef lhs, StringRef rhs)
|
||||||
{
|
{
|
||||||
if (lhs.size != rhs.size)
|
if (lhs.size != rhs.size)
|
||||||
@ -168,8 +197,8 @@ inline bool operator== (StringRef lhs, StringRef rhs)
|
|||||||
if (lhs.size == 0)
|
if (lhs.size == 0)
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
#if defined(__SSE2__)
|
#if defined(__SSE2__) || (defined(__aarch64__) && defined(__ARM_NEON))
|
||||||
return memequalSSE2Wide(lhs.data, rhs.data, lhs.size);
|
return memequalWide(lhs.data, rhs.data, lhs.size);
|
||||||
#else
|
#else
|
||||||
return 0 == memcmp(lhs.data, rhs.data, lhs.size);
|
return 0 == memcmp(lhs.data, rhs.data, lhs.size);
|
||||||
#endif
|
#endif
|
||||||
@ -274,6 +303,8 @@ struct CRC32Hash
|
|||||||
if (size == 0)
|
if (size == 0)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
|
chassert(pos);
|
||||||
|
|
||||||
if (size < 8)
|
if (size < 8)
|
||||||
{
|
{
|
||||||
return static_cast<unsigned>(hashLessThan8(x.data, x.size));
|
return static_cast<unsigned>(hashLessThan8(x.data, x.size));
|
||||||
|
@ -115,8 +115,15 @@
|
|||||||
/// because SIGABRT is easier to debug than SIGTRAP (the second one makes gdb crazy)
|
/// because SIGABRT is easier to debug than SIGTRAP (the second one makes gdb crazy)
|
||||||
#if !defined(chassert)
|
#if !defined(chassert)
|
||||||
#if defined(ABORT_ON_LOGICAL_ERROR)
|
#if defined(ABORT_ON_LOGICAL_ERROR)
|
||||||
|
// clang-format off
|
||||||
|
#include <base/types.h>
|
||||||
|
namespace DB
|
||||||
|
{
|
||||||
|
void abortOnFailedAssertion(const String & description);
|
||||||
|
}
|
||||||
#define chassert(x) static_cast<bool>(x) ? void(0) : ::DB::abortOnFailedAssertion(#x)
|
#define chassert(x) static_cast<bool>(x) ? void(0) : ::DB::abortOnFailedAssertion(#x)
|
||||||
#define UNREACHABLE() abort()
|
#define UNREACHABLE() abort()
|
||||||
|
// clang-format off
|
||||||
#else
|
#else
|
||||||
/// Here sizeof() trick is used to suppress unused warning for result,
|
/// Here sizeof() trick is used to suppress unused warning for result,
|
||||||
/// since simple "(void)x" will evaluate the expression, while
|
/// since simple "(void)x" will evaluate the expression, while
|
||||||
|
14
base/base/simd.h
Normal file
14
base/base/simd.h
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
#pragma once
|
||||||
|
|
||||||
|
#if defined(__aarch64__) && defined(__ARM_NEON)
|
||||||
|
|
||||||
|
# include <arm_neon.h>
|
||||||
|
# pragma clang diagnostic ignored "-Wreserved-identifier"
|
||||||
|
|
||||||
|
/// Returns a 64 bit mask of nibbles (4 bits for each byte).
|
||||||
|
inline uint64_t getNibbleMask(uint8x16_t res)
|
||||||
|
{
|
||||||
|
return vget_lane_u64(vreinterpret_u64_u8(vshrn_n_u16(vreinterpretq_u16_u8(res), 4)), 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
@ -12,7 +12,6 @@
|
|||||||
#include <tuple>
|
#include <tuple>
|
||||||
#include <limits>
|
#include <limits>
|
||||||
|
|
||||||
#include <boost/multiprecision/cpp_bin_float.hpp>
|
|
||||||
#include <boost/math/special_functions/fpclassify.hpp>
|
#include <boost/math/special_functions/fpclassify.hpp>
|
||||||
|
|
||||||
// NOLINTBEGIN(*)
|
// NOLINTBEGIN(*)
|
||||||
@ -22,6 +21,7 @@
|
|||||||
#define CONSTEXPR_FROM_DOUBLE constexpr
|
#define CONSTEXPR_FROM_DOUBLE constexpr
|
||||||
using FromDoubleIntermediateType = long double;
|
using FromDoubleIntermediateType = long double;
|
||||||
#else
|
#else
|
||||||
|
#include <boost/multiprecision/cpp_bin_float.hpp>
|
||||||
/// `wide_integer_from_builtin` can't be constexpr with non-literal `cpp_bin_float_double_extended`
|
/// `wide_integer_from_builtin` can't be constexpr with non-literal `cpp_bin_float_double_extended`
|
||||||
#define CONSTEXPR_FROM_DOUBLE
|
#define CONSTEXPR_FROM_DOUBLE
|
||||||
using FromDoubleIntermediateType = boost::multiprecision::cpp_bin_float_double_extended;
|
using FromDoubleIntermediateType = boost::multiprecision::cpp_bin_float_double_extended;
|
||||||
|
@ -19,7 +19,6 @@
|
|||||||
#include "Poco/UTF16Encoding.h"
|
#include "Poco/UTF16Encoding.h"
|
||||||
#include "Poco/Buffer.h"
|
#include "Poco/Buffer.h"
|
||||||
#include "Poco/Exception.h"
|
#include "Poco/Exception.h"
|
||||||
#include <iostream>
|
|
||||||
|
|
||||||
|
|
||||||
using Poco::Buffer;
|
using Poco::Buffer;
|
||||||
|
@ -97,7 +97,7 @@ namespace Data
|
|||||||
///
|
///
|
||||||
/// static void extract(std::size_t pos, Person& obj, const Person& defVal, AbstractExtractor::Ptr pExt)
|
/// static void extract(std::size_t pos, Person& obj, const Person& defVal, AbstractExtractor::Ptr pExt)
|
||||||
/// {
|
/// {
|
||||||
/// // defVal is the default person we should use if we encunter NULL entries, so we take the individual fields
|
/// // defVal is the default person we should use if we encounter NULL entries, so we take the individual fields
|
||||||
/// // as defaults. You can do more complex checking, ie return defVal if only one single entry of the fields is null etc...
|
/// // as defaults. You can do more complex checking, ie return defVal if only one single entry of the fields is null etc...
|
||||||
/// poco_assert_dbg (!pExt.isNull());
|
/// poco_assert_dbg (!pExt.isNull());
|
||||||
/// std::string lastName;
|
/// std::string lastName;
|
||||||
|
@ -67,6 +67,8 @@ public:
|
|||||||
|
|
||||||
Message(
|
Message(
|
||||||
const std::string & source, const std::string & text, Priority prio, const char * file, int line, std::string_view fmt_str = {});
|
const std::string & source, const std::string & text, Priority prio, const char * file, int line, std::string_view fmt_str = {});
|
||||||
|
Message(
|
||||||
|
std::string && source, std::string && text, Priority prio, const char * file, int line, std::string_view fmt_str);
|
||||||
/// Creates a Message with the given source, text, priority,
|
/// Creates a Message with the given source, text, priority,
|
||||||
/// source file path and line.
|
/// source file path and line.
|
||||||
///
|
///
|
||||||
|
@ -57,7 +57,7 @@ public:
|
|||||||
URI();
|
URI();
|
||||||
/// Creates an empty URI.
|
/// Creates an empty URI.
|
||||||
|
|
||||||
explicit URI(const std::string & uri);
|
explicit URI(const std::string & uri, bool enable_url_encoding = true);
|
||||||
/// Parses an URI from the given string. Throws a
|
/// Parses an URI from the given string. Throws a
|
||||||
/// SyntaxException if the uri is not valid.
|
/// SyntaxException if the uri is not valid.
|
||||||
|
|
||||||
@ -350,6 +350,10 @@ protected:
|
|||||||
static const std::string ILLEGAL;
|
static const std::string ILLEGAL;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
void encodePath(std::string & encodedStr) const;
|
||||||
|
void decodePath(const std::string & encodedStr);
|
||||||
|
|
||||||
|
|
||||||
std::string _scheme;
|
std::string _scheme;
|
||||||
std::string _userInfo;
|
std::string _userInfo;
|
||||||
std::string _host;
|
std::string _host;
|
||||||
@ -357,6 +361,8 @@ private:
|
|||||||
std::string _path;
|
std::string _path;
|
||||||
std::string _query;
|
std::string _query;
|
||||||
std::string _fragment;
|
std::string _fragment;
|
||||||
|
|
||||||
|
bool _enable_url_encoding = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
@ -60,6 +60,19 @@ Message::Message(const std::string& source, const std::string& text, Priority pr
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Message::Message(std::string && source, std::string && text, Priority prio, const char * file, int line, std::string_view fmt_str):
|
||||||
|
_source(std::move(source)),
|
||||||
|
_text(std::move(text)),
|
||||||
|
_prio(prio),
|
||||||
|
_tid(0),
|
||||||
|
_file(file),
|
||||||
|
_line(line),
|
||||||
|
_pMap(0),
|
||||||
|
_fmt_str(fmt_str)
|
||||||
|
{
|
||||||
|
init();
|
||||||
|
}
|
||||||
|
|
||||||
Message::Message(const Message& msg):
|
Message::Message(const Message& msg):
|
||||||
_source(msg._source),
|
_source(msg._source),
|
||||||
_text(msg._text),
|
_text(msg._text),
|
||||||
|
@ -16,7 +16,6 @@
|
|||||||
#include "Poco/TaskManager.h"
|
#include "Poco/TaskManager.h"
|
||||||
#include "Poco/Exception.h"
|
#include "Poco/Exception.h"
|
||||||
|
|
||||||
#include <iostream>
|
|
||||||
#include <array>
|
#include <array>
|
||||||
|
|
||||||
|
|
||||||
|
@ -36,8 +36,8 @@ URI::URI():
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
URI::URI(const std::string& uri):
|
URI::URI(const std::string& uri, bool enable_url_encoding):
|
||||||
_port(0)
|
_port(0), _enable_url_encoding(enable_url_encoding)
|
||||||
{
|
{
|
||||||
parse(uri);
|
parse(uri);
|
||||||
}
|
}
|
||||||
@ -107,7 +107,8 @@ URI::URI(const URI& uri):
|
|||||||
_port(uri._port),
|
_port(uri._port),
|
||||||
_path(uri._path),
|
_path(uri._path),
|
||||||
_query(uri._query),
|
_query(uri._query),
|
||||||
_fragment(uri._fragment)
|
_fragment(uri._fragment),
|
||||||
|
_enable_url_encoding(uri._enable_url_encoding)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -119,7 +120,8 @@ URI::URI(const URI& baseURI, const std::string& relativeURI):
|
|||||||
_port(baseURI._port),
|
_port(baseURI._port),
|
||||||
_path(baseURI._path),
|
_path(baseURI._path),
|
||||||
_query(baseURI._query),
|
_query(baseURI._query),
|
||||||
_fragment(baseURI._fragment)
|
_fragment(baseURI._fragment),
|
||||||
|
_enable_url_encoding(baseURI._enable_url_encoding)
|
||||||
{
|
{
|
||||||
resolve(relativeURI);
|
resolve(relativeURI);
|
||||||
}
|
}
|
||||||
@ -151,6 +153,7 @@ URI& URI::operator = (const URI& uri)
|
|||||||
_path = uri._path;
|
_path = uri._path;
|
||||||
_query = uri._query;
|
_query = uri._query;
|
||||||
_fragment = uri._fragment;
|
_fragment = uri._fragment;
|
||||||
|
_enable_url_encoding = uri._enable_url_encoding;
|
||||||
}
|
}
|
||||||
return *this;
|
return *this;
|
||||||
}
|
}
|
||||||
@ -181,6 +184,7 @@ void URI::swap(URI& uri)
|
|||||||
std::swap(_path, uri._path);
|
std::swap(_path, uri._path);
|
||||||
std::swap(_query, uri._query);
|
std::swap(_query, uri._query);
|
||||||
std::swap(_fragment, uri._fragment);
|
std::swap(_fragment, uri._fragment);
|
||||||
|
std::swap(_enable_url_encoding, uri._enable_url_encoding);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -201,7 +205,7 @@ std::string URI::toString() const
|
|||||||
std::string uri;
|
std::string uri;
|
||||||
if (isRelative())
|
if (isRelative())
|
||||||
{
|
{
|
||||||
encode(_path, RESERVED_PATH, uri);
|
encodePath(uri);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@ -217,7 +221,7 @@ std::string URI::toString() const
|
|||||||
{
|
{
|
||||||
if (!auth.empty() && _path[0] != '/')
|
if (!auth.empty() && _path[0] != '/')
|
||||||
uri += '/';
|
uri += '/';
|
||||||
encode(_path, RESERVED_PATH, uri);
|
encodePath(uri);
|
||||||
}
|
}
|
||||||
else if (!_query.empty() || !_fragment.empty())
|
else if (!_query.empty() || !_fragment.empty())
|
||||||
{
|
{
|
||||||
@ -313,7 +317,7 @@ void URI::setAuthority(const std::string& authority)
|
|||||||
void URI::setPath(const std::string& path)
|
void URI::setPath(const std::string& path)
|
||||||
{
|
{
|
||||||
_path.clear();
|
_path.clear();
|
||||||
decode(path, _path);
|
decodePath(path);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -418,7 +422,7 @@ void URI::setPathEtc(const std::string& pathEtc)
|
|||||||
std::string URI::getPathEtc() const
|
std::string URI::getPathEtc() const
|
||||||
{
|
{
|
||||||
std::string pathEtc;
|
std::string pathEtc;
|
||||||
encode(_path, RESERVED_PATH, pathEtc);
|
encodePath(pathEtc);
|
||||||
if (!_query.empty())
|
if (!_query.empty())
|
||||||
{
|
{
|
||||||
pathEtc += '?';
|
pathEtc += '?';
|
||||||
@ -436,7 +440,7 @@ std::string URI::getPathEtc() const
|
|||||||
std::string URI::getPathAndQuery() const
|
std::string URI::getPathAndQuery() const
|
||||||
{
|
{
|
||||||
std::string pathAndQuery;
|
std::string pathAndQuery;
|
||||||
encode(_path, RESERVED_PATH, pathAndQuery);
|
encodePath(pathAndQuery);
|
||||||
if (!_query.empty())
|
if (!_query.empty())
|
||||||
{
|
{
|
||||||
pathAndQuery += '?';
|
pathAndQuery += '?';
|
||||||
@ -681,6 +685,21 @@ void URI::decode(const std::string& str, std::string& decodedStr, bool plusAsSpa
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void URI::encodePath(std::string & encodedStr) const
|
||||||
|
{
|
||||||
|
if (_enable_url_encoding)
|
||||||
|
encode(_path, RESERVED_PATH, encodedStr);
|
||||||
|
else
|
||||||
|
encodedStr = _path;
|
||||||
|
}
|
||||||
|
|
||||||
|
void URI::decodePath(const std::string & encodedStr)
|
||||||
|
{
|
||||||
|
if (_enable_url_encoding)
|
||||||
|
decode(encodedStr, _path);
|
||||||
|
else
|
||||||
|
_path = encodedStr;
|
||||||
|
}
|
||||||
|
|
||||||
bool URI::isWellKnownPort() const
|
bool URI::isWellKnownPort() const
|
||||||
{
|
{
|
||||||
@ -820,7 +839,7 @@ void URI::parsePath(std::string::const_iterator& it, const std::string::const_it
|
|||||||
{
|
{
|
||||||
std::string path;
|
std::string path;
|
||||||
while (it != end && *it != '?' && *it != '#') path += *it++;
|
while (it != end && *it != '?' && *it != '#') path += *it++;
|
||||||
decode(path, _path);
|
decodePath(path);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -14,7 +14,6 @@
|
|||||||
|
|
||||||
#include "Poco/JSON/Object.h"
|
#include "Poco/JSON/Object.h"
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <sstream>
|
|
||||||
|
|
||||||
|
|
||||||
using Poco::Dynamic::Var;
|
using Poco::Dynamic::Var;
|
||||||
|
@ -26,7 +26,6 @@
|
|||||||
#include "Poco/CountingStream.h"
|
#include "Poco/CountingStream.h"
|
||||||
#include "Poco/RegularExpression.h"
|
#include "Poco/RegularExpression.h"
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
#include <iostream>
|
|
||||||
|
|
||||||
|
|
||||||
using Poco::NumberFormatter;
|
using Poco::NumberFormatter;
|
||||||
|
@ -146,7 +146,7 @@ namespace Net
|
|||||||
|
|
||||||
std::string cipherList;
|
std::string cipherList;
|
||||||
/// Specifies the supported ciphers in OpenSSL notation.
|
/// Specifies the supported ciphers in OpenSSL notation.
|
||||||
/// Defaults to "ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH".
|
/// Defaults to "ALL:!ADH:!LOW:!EXP:!MD5:!3DES:@STRENGTH".
|
||||||
|
|
||||||
std::string dhParamsFile;
|
std::string dhParamsFile;
|
||||||
/// Specifies a file containing Diffie-Hellman parameters.
|
/// Specifies a file containing Diffie-Hellman parameters.
|
||||||
@ -172,7 +172,7 @@ namespace Net
|
|||||||
VerificationMode verificationMode = VERIFY_RELAXED,
|
VerificationMode verificationMode = VERIFY_RELAXED,
|
||||||
int verificationDepth = 9,
|
int verificationDepth = 9,
|
||||||
bool loadDefaultCAs = false,
|
bool loadDefaultCAs = false,
|
||||||
const std::string & cipherList = "ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH");
|
const std::string & cipherList = "ALL:!ADH:!LOW:!EXP:!MD5:!3DES:@STRENGTH");
|
||||||
/// Creates a Context.
|
/// Creates a Context.
|
||||||
///
|
///
|
||||||
/// * usage specifies whether the context is used by a client or server.
|
/// * usage specifies whether the context is used by a client or server.
|
||||||
@ -200,7 +200,7 @@ namespace Net
|
|||||||
VerificationMode verificationMode = VERIFY_RELAXED,
|
VerificationMode verificationMode = VERIFY_RELAXED,
|
||||||
int verificationDepth = 9,
|
int verificationDepth = 9,
|
||||||
bool loadDefaultCAs = false,
|
bool loadDefaultCAs = false,
|
||||||
const std::string & cipherList = "ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH");
|
const std::string & cipherList = "ALL:!ADH:!LOW:!EXP:!MD5:!3DES:@STRENGTH");
|
||||||
/// Creates a Context.
|
/// Creates a Context.
|
||||||
///
|
///
|
||||||
/// * usage specifies whether the context is used by a client or server.
|
/// * usage specifies whether the context is used by a client or server.
|
||||||
|
@ -76,7 +76,7 @@ namespace Net
|
|||||||
/// <verificationMode>none|relaxed|strict|once</verificationMode>
|
/// <verificationMode>none|relaxed|strict|once</verificationMode>
|
||||||
/// <verificationDepth>1..9</verificationDepth>
|
/// <verificationDepth>1..9</verificationDepth>
|
||||||
/// <loadDefaultCAFile>true|false</loadDefaultCAFile>
|
/// <loadDefaultCAFile>true|false</loadDefaultCAFile>
|
||||||
/// <cipherList>ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH</cipherList>
|
/// <cipherList>ALL:!ADH:!LOW:!EXP:!MD5:!3DES:@STRENGTH</cipherList>
|
||||||
/// <preferServerCiphers>true|false</preferServerCiphers>
|
/// <preferServerCiphers>true|false</preferServerCiphers>
|
||||||
/// <privateKeyPassphraseHandler>
|
/// <privateKeyPassphraseHandler>
|
||||||
/// <name>KeyFileHandler</name>
|
/// <name>KeyFileHandler</name>
|
||||||
|
@ -41,7 +41,7 @@ Context::Params::Params():
|
|||||||
verificationMode(VERIFY_RELAXED),
|
verificationMode(VERIFY_RELAXED),
|
||||||
verificationDepth(9),
|
verificationDepth(9),
|
||||||
loadDefaultCAs(false),
|
loadDefaultCAs(false),
|
||||||
cipherList("ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH")
|
cipherList("ALL:!ADH:!LOW:!EXP:!MD5:!3DES:@STRENGTH")
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2,11 +2,11 @@
|
|||||||
|
|
||||||
# NOTE: has nothing common with DBMS_TCP_PROTOCOL_VERSION,
|
# NOTE: has nothing common with DBMS_TCP_PROTOCOL_VERSION,
|
||||||
# only DBMS_TCP_PROTOCOL_VERSION should be incremented on protocol changes.
|
# only DBMS_TCP_PROTOCOL_VERSION should be incremented on protocol changes.
|
||||||
SET(VERSION_REVISION 54476)
|
SET(VERSION_REVISION 54478)
|
||||||
SET(VERSION_MAJOR 23)
|
SET(VERSION_MAJOR 23)
|
||||||
SET(VERSION_MINOR 7)
|
SET(VERSION_MINOR 9)
|
||||||
SET(VERSION_PATCH 1)
|
SET(VERSION_PATCH 1)
|
||||||
SET(VERSION_GITHASH d1c7e13d08868cb04d3562dcced704dd577cb1df)
|
SET(VERSION_GITHASH ebc7d9a9f3b40be89e0b3e738b35d394aabeea3e)
|
||||||
SET(VERSION_DESCRIBE v23.7.1.1-testing)
|
SET(VERSION_DESCRIBE v23.9.1.1-testing)
|
||||||
SET(VERSION_STRING 23.7.1.1)
|
SET(VERSION_STRING 23.9.1.1)
|
||||||
# end of autochange
|
# end of autochange
|
||||||
|
@ -4,10 +4,19 @@ macro(add_glob cur_list)
|
|||||||
endmacro()
|
endmacro()
|
||||||
|
|
||||||
macro(add_headers_and_sources prefix common_path)
|
macro(add_headers_and_sources prefix common_path)
|
||||||
add_glob(${prefix}_headers ${CMAKE_CURRENT_SOURCE_DIR} ${common_path}/*.h)
|
add_glob(${prefix}_headers ${common_path}/*.h)
|
||||||
add_glob(${prefix}_sources ${common_path}/*.cpp ${common_path}/*.c ${common_path}/*.h)
|
add_glob(${prefix}_sources ${common_path}/*.cpp ${common_path}/*.c)
|
||||||
endmacro()
|
endmacro()
|
||||||
|
|
||||||
macro(add_headers_only prefix common_path)
|
macro(add_headers_only prefix common_path)
|
||||||
add_glob(${prefix}_headers ${CMAKE_CURRENT_SOURCE_DIR} ${common_path}/*.h)
|
add_glob(${prefix}_headers ${common_path}/*.h)
|
||||||
|
endmacro()
|
||||||
|
|
||||||
|
macro(extract_into_parent_list src_list dest_list)
|
||||||
|
list(REMOVE_ITEM ${src_list} ${ARGN})
|
||||||
|
get_filename_component(__dir_name ${CMAKE_CURRENT_SOURCE_DIR} NAME)
|
||||||
|
foreach(file IN ITEMS ${ARGN})
|
||||||
|
list(APPEND ${dest_list} ${__dir_name}/${file})
|
||||||
|
endforeach()
|
||||||
|
set(${dest_list} "${${dest_list}}" PARENT_SCOPE)
|
||||||
endmacro()
|
endmacro()
|
||||||
|
@ -1,58 +0,0 @@
|
|||||||
# Embed a set of resource files into a resulting object file.
|
|
||||||
#
|
|
||||||
# Signature: `clickhouse_embed_binaries(TARGET <target> RESOURCE_DIR <dir> RESOURCES <resource> ...)
|
|
||||||
#
|
|
||||||
# This will generate a static library target named `<target>`, which contains the contents of
|
|
||||||
# each `<resource>` file. The files should be located in `<dir>`. <dir> defaults to
|
|
||||||
# ${CMAKE_CURRENT_SOURCE_DIR}, and the resources may not be empty.
|
|
||||||
#
|
|
||||||
# Each resource will result in three symbols in the final archive, based on the name `<resource>`.
|
|
||||||
# These are:
|
|
||||||
# 1. `_binary_<name>_start`: Points to the start of the binary data from `<resource>`.
|
|
||||||
# 2. `_binary_<name>_end`: Points to the end of the binary data from `<resource>`.
|
|
||||||
# 2. `_binary_<name>_size`: Points to the size of the binary data from `<resource>`.
|
|
||||||
#
|
|
||||||
# `<name>` is a normalized name derived from `<resource>`, by replacing the characters "./-" with
|
|
||||||
# the character "_", and the character "+" with "_PLUS_". This scheme is similar to those generated
|
|
||||||
# by `ld -r -b binary`, and matches the expectations in `./base/common/getResource.cpp`.
|
|
||||||
macro(clickhouse_embed_binaries)
|
|
||||||
set(one_value_args TARGET RESOURCE_DIR)
|
|
||||||
set(resources RESOURCES)
|
|
||||||
cmake_parse_arguments(EMBED "" "${one_value_args}" ${resources} ${ARGN})
|
|
||||||
|
|
||||||
if (NOT DEFINED EMBED_TARGET)
|
|
||||||
message(FATAL_ERROR "A target name must be provided for embedding binary resources into")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if (NOT DEFINED EMBED_RESOURCE_DIR)
|
|
||||||
set(EMBED_RESOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
list(LENGTH EMBED_RESOURCES N_RESOURCES)
|
|
||||||
if (N_RESOURCES LESS 1)
|
|
||||||
message(FATAL_ERROR "The list of binary resources to embed may not be empty")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
add_library("${EMBED_TARGET}" STATIC)
|
|
||||||
set_target_properties("${EMBED_TARGET}" PROPERTIES LINKER_LANGUAGE C)
|
|
||||||
|
|
||||||
set(EMBED_TEMPLATE_FILE "${PROJECT_SOURCE_DIR}/programs/embed_binary.S.in")
|
|
||||||
|
|
||||||
foreach(RESOURCE_FILE ${EMBED_RESOURCES})
|
|
||||||
set(ASSEMBLY_FILE_NAME "${RESOURCE_FILE}.S")
|
|
||||||
set(BINARY_FILE_NAME "${RESOURCE_FILE}")
|
|
||||||
|
|
||||||
# Normalize the name of the resource.
|
|
||||||
string(REGEX REPLACE "[\./-]" "_" SYMBOL_NAME "${RESOURCE_FILE}") # - must be last in regex
|
|
||||||
string(REPLACE "+" "_PLUS_" SYMBOL_NAME "${SYMBOL_NAME}")
|
|
||||||
|
|
||||||
# Generate the configured assembly file in the output directory.
|
|
||||||
configure_file("${EMBED_TEMPLATE_FILE}" "${CMAKE_CURRENT_BINARY_DIR}/${ASSEMBLY_FILE_NAME}" @ONLY)
|
|
||||||
|
|
||||||
# Set the include directory for relative paths specified for `.incbin` directive.
|
|
||||||
set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/${ASSEMBLY_FILE_NAME}" APPEND PROPERTY INCLUDE_DIRECTORIES "${EMBED_RESOURCE_DIR}")
|
|
||||||
|
|
||||||
target_sources("${EMBED_TARGET}" PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/${ASSEMBLY_FILE_NAME}")
|
|
||||||
set_target_properties("${EMBED_TARGET}" PROPERTIES OBJECT_DEPENDS "${RESOURCE_FILE}")
|
|
||||||
endforeach()
|
|
||||||
endmacro()
|
|
@ -47,7 +47,7 @@ if (CMAKE_BUILD_TYPE_UC STREQUAL "RELWITHDEBINFO" AND ENABLE_THINLTO AND PARALLE
|
|||||||
set (PARALLEL_LINK_JOBS 2)
|
set (PARALLEL_LINK_JOBS 2)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
message(STATUS "Building sub-tree with ${PARALLEL_COMPILE_JOBS} compile jobs and ${PARALLEL_LINK_JOBS} linker jobs (system: ${NUMBER_OF_LOGICAL_CORES} cores, ${TOTAL_PHYSICAL_MEMORY} MB DRAM, 'OFF' means the native core count).")
|
message(STATUS "Building sub-tree with ${PARALLEL_COMPILE_JOBS} compile jobs and ${PARALLEL_LINK_JOBS} linker jobs (system: ${NUMBER_OF_LOGICAL_CORES} cores, ${TOTAL_PHYSICAL_MEMORY} MB RAM, 'OFF' means the native core count).")
|
||||||
|
|
||||||
if (PARALLEL_COMPILE_JOBS LESS NUMBER_OF_LOGICAL_CORES)
|
if (PARALLEL_COMPILE_JOBS LESS NUMBER_OF_LOGICAL_CORES)
|
||||||
set(CMAKE_JOB_POOL_COMPILE compile_job_pool${CMAKE_CURRENT_SOURCE_DIR})
|
set(CMAKE_JOB_POOL_COMPILE compile_job_pool${CMAKE_CURRENT_SOURCE_DIR})
|
||||||
|
@ -35,10 +35,6 @@ find_package(Threads REQUIRED)
|
|||||||
include (cmake/unwind.cmake)
|
include (cmake/unwind.cmake)
|
||||||
include (cmake/cxx.cmake)
|
include (cmake/cxx.cmake)
|
||||||
|
|
||||||
# Delay the call to link the global interface after the libc++ libraries are included to avoid circular dependencies
|
|
||||||
# which are ok with static libraries but not with dynamic ones
|
|
||||||
link_libraries(global-group)
|
|
||||||
|
|
||||||
if (NOT OS_ANDROID)
|
if (NOT OS_ANDROID)
|
||||||
if (NOT USE_MUSL)
|
if (NOT USE_MUSL)
|
||||||
# Our compatibility layer doesn't build under Android, many errors in musl.
|
# Our compatibility layer doesn't build under Android, many errors in musl.
|
||||||
@ -47,6 +43,8 @@ if (NOT OS_ANDROID)
|
|||||||
add_subdirectory(base/harmful)
|
add_subdirectory(base/harmful)
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
|
link_libraries(global-group)
|
||||||
|
|
||||||
target_link_libraries(global-group INTERFACE
|
target_link_libraries(global-group INTERFACE
|
||||||
-Wl,--start-group
|
-Wl,--start-group
|
||||||
$<TARGET_PROPERTY:global-libs,INTERFACE_LINK_LIBRARIES>
|
$<TARGET_PROPERTY:global-libs,INTERFACE_LINK_LIBRARIES>
|
||||||
|
@ -5,9 +5,9 @@ set (CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
|
|||||||
|
|
||||||
set (CMAKE_SYSTEM_NAME "Linux")
|
set (CMAKE_SYSTEM_NAME "Linux")
|
||||||
set (CMAKE_SYSTEM_PROCESSOR "ppc64le")
|
set (CMAKE_SYSTEM_PROCESSOR "ppc64le")
|
||||||
set (CMAKE_C_COMPILER_TARGET "ppc64le-linux-gnu")
|
set (CMAKE_C_COMPILER_TARGET "powerpc64le-linux-gnu")
|
||||||
set (CMAKE_CXX_COMPILER_TARGET "ppc64le-linux-gnu")
|
set (CMAKE_CXX_COMPILER_TARGET "powerpc64le-linux-gnu")
|
||||||
set (CMAKE_ASM_COMPILER_TARGET "ppc64le-linux-gnu")
|
set (CMAKE_ASM_COMPILER_TARGET "powerpc64le-linux-gnu")
|
||||||
|
|
||||||
# Will be changed later, but somehow needed to be set here.
|
# Will be changed later, but somehow needed to be set here.
|
||||||
set (CMAKE_AR "ar")
|
set (CMAKE_AR "ar")
|
||||||
|
@ -20,6 +20,9 @@ set (CMAKE_SYSROOT "${TOOLCHAIN_PATH}/s390x-linux-gnu/libc")
|
|||||||
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --gcc-toolchain=${TOOLCHAIN_PATH}")
|
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --gcc-toolchain=${TOOLCHAIN_PATH}")
|
||||||
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --gcc-toolchain=${TOOLCHAIN_PATH}")
|
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --gcc-toolchain=${TOOLCHAIN_PATH}")
|
||||||
set (CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} --gcc-toolchain=${TOOLCHAIN_PATH}")
|
set (CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} --gcc-toolchain=${TOOLCHAIN_PATH}")
|
||||||
|
set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=mold -Wl,-L${CMAKE_SYSROOT}/usr/lib64")
|
||||||
|
set (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -fuse-ld=mold -Wl,-L${CMAKE_SYSROOT}/usr/lib64")
|
||||||
|
set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fuse-ld=mold -Wl,-L${CMAKE_SYSROOT}/usr/lib64")
|
||||||
|
|
||||||
set (HAS_PRE_1970_EXITCODE "0" CACHE STRING "Result from TRY_RUN" FORCE)
|
set (HAS_PRE_1970_EXITCODE "0" CACHE STRING "Result from TRY_RUN" FORCE)
|
||||||
set (HAS_PRE_1970_EXITCODE__TRYRUN_OUTPUT "" CACHE STRING "Output from TRY_RUN" FORCE)
|
set (HAS_PRE_1970_EXITCODE__TRYRUN_OUTPUT "" CACHE STRING "Output from TRY_RUN" FORCE)
|
||||||
|
@ -22,8 +22,9 @@ macro(clickhouse_split_debug_symbols)
|
|||||||
# Splits debug symbols into separate file, leaves the binary untouched:
|
# Splits debug symbols into separate file, leaves the binary untouched:
|
||||||
COMMAND "${OBJCOPY_PATH}" --only-keep-debug "${STRIP_DESTINATION_DIR}/bin/${STRIP_TARGET}" "${STRIP_DESTINATION_DIR}/lib/debug/bin/${STRIP_TARGET}.debug"
|
COMMAND "${OBJCOPY_PATH}" --only-keep-debug "${STRIP_DESTINATION_DIR}/bin/${STRIP_TARGET}" "${STRIP_DESTINATION_DIR}/lib/debug/bin/${STRIP_TARGET}.debug"
|
||||||
COMMAND chmod 0644 "${STRIP_DESTINATION_DIR}/lib/debug/bin/${STRIP_TARGET}.debug"
|
COMMAND chmod 0644 "${STRIP_DESTINATION_DIR}/lib/debug/bin/${STRIP_TARGET}.debug"
|
||||||
# Strips binary, sections '.note' & '.comment' are removed in line with Debian's stripping policy: www.debian.org/doc/debian-policy/ch-files.html, section '.clickhouse.hash' is needed for integrity check:
|
# Strips binary, sections '.note' & '.comment' are removed in line with Debian's stripping policy: www.debian.org/doc/debian-policy/ch-files.html, section '.clickhouse.hash' is needed for integrity check.
|
||||||
COMMAND "${STRIP_PATH}" --remove-section=.comment --remove-section=.note --keep-section=.clickhouse.hash "${STRIP_DESTINATION_DIR}/bin/${STRIP_TARGET}"
|
# Also, after we disabled the export of symbols for dynamic linking, we still to keep a static symbol table for good stack traces.
|
||||||
|
COMMAND "${STRIP_PATH}" --strip-debug --remove-section=.comment --remove-section=.note "${STRIP_DESTINATION_DIR}/bin/${STRIP_TARGET}"
|
||||||
# Associate stripped binary with debug symbols:
|
# Associate stripped binary with debug symbols:
|
||||||
COMMAND "${OBJCOPY_PATH}" --add-gnu-debuglink "${STRIP_DESTINATION_DIR}/lib/debug/bin/${STRIP_TARGET}.debug" "${STRIP_DESTINATION_DIR}/bin/${STRIP_TARGET}"
|
COMMAND "${OBJCOPY_PATH}" --add-gnu-debuglink "${STRIP_DESTINATION_DIR}/lib/debug/bin/${STRIP_TARGET}.debug" "${STRIP_DESTINATION_DIR}/bin/${STRIP_TARGET}"
|
||||||
COMMENT "Stripping clickhouse binary" VERBATIM
|
COMMENT "Stripping clickhouse binary" VERBATIM
|
||||||
|
@ -19,6 +19,19 @@ else ()
|
|||||||
message (FATAL_ERROR "Platform ${CMAKE_SYSTEM_NAME} is not supported")
|
message (FATAL_ERROR "Platform ${CMAKE_SYSTEM_NAME} is not supported")
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
|
# Since we always use toolchain files to generate hermetic builds, cmake will
|
||||||
|
# always think it's a cross-compilation, See
|
||||||
|
# https://cmake.org/cmake/help/latest/variable/CMAKE_CROSSCOMPILING.html
|
||||||
|
#
|
||||||
|
# This will slow down cmake configuration and compilation. For instance, LLVM
|
||||||
|
# will try to configure NATIVE LLVM targets with all tests enabled (You'll see
|
||||||
|
# Building native llvm-tblgen...).
|
||||||
|
#
|
||||||
|
# Here, we set it manually by checking the system name and processor.
|
||||||
|
if (${CMAKE_SYSTEM_NAME} STREQUAL ${CMAKE_HOST_SYSTEM_NAME} AND ${CMAKE_SYSTEM_PROCESSOR} STREQUAL ${CMAKE_HOST_SYSTEM_PROCESSOR})
|
||||||
|
set (CMAKE_CROSSCOMPILING 0)
|
||||||
|
endif ()
|
||||||
|
|
||||||
if (CMAKE_CROSSCOMPILING)
|
if (CMAKE_CROSSCOMPILING)
|
||||||
if (OS_DARWIN)
|
if (OS_DARWIN)
|
||||||
# FIXME: broken dependencies
|
# FIXME: broken dependencies
|
||||||
@ -47,7 +60,7 @@ if (CMAKE_CROSSCOMPILING)
|
|||||||
set (ENABLE_RUST OFF CACHE INTERNAL "")
|
set (ENABLE_RUST OFF CACHE INTERNAL "")
|
||||||
elseif (ARCH_S390X)
|
elseif (ARCH_S390X)
|
||||||
set (ENABLE_GRPC OFF CACHE INTERNAL "")
|
set (ENABLE_GRPC OFF CACHE INTERNAL "")
|
||||||
set (ENABLE_SENTRY OFF CACHE INTERNAL "")
|
set (ENABLE_RUST OFF CACHE INTERNAL "")
|
||||||
endif ()
|
endif ()
|
||||||
elseif (OS_FREEBSD)
|
elseif (OS_FREEBSD)
|
||||||
# FIXME: broken dependencies
|
# FIXME: broken dependencies
|
||||||
|
18
contrib/CMakeLists.txt
vendored
18
contrib/CMakeLists.txt
vendored
@ -92,6 +92,7 @@ add_contrib (google-protobuf-cmake google-protobuf)
|
|||||||
add_contrib (openldap-cmake openldap)
|
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)
|
||||||
|
add_contrib (libarchive-cmake libarchive)
|
||||||
|
|
||||||
add_contrib (corrosion-cmake corrosion)
|
add_contrib (corrosion-cmake corrosion)
|
||||||
|
|
||||||
@ -134,10 +135,8 @@ add_contrib (aws-cmake
|
|||||||
aws-cmake
|
aws-cmake
|
||||||
)
|
)
|
||||||
|
|
||||||
add_contrib (base64-cmake base64)
|
add_contrib (aklomp-base64-cmake aklomp-base64)
|
||||||
if (NOT ARCH_S390X)
|
|
||||||
add_contrib (simdjson-cmake simdjson)
|
add_contrib (simdjson-cmake simdjson)
|
||||||
endif()
|
|
||||||
add_contrib (rapidjson-cmake rapidjson)
|
add_contrib (rapidjson-cmake rapidjson)
|
||||||
add_contrib (fastops-cmake fastops)
|
add_contrib (fastops-cmake fastops)
|
||||||
add_contrib (libuv-cmake libuv)
|
add_contrib (libuv-cmake libuv)
|
||||||
@ -164,13 +163,13 @@ add_contrib (libpq-cmake libpq)
|
|||||||
add_contrib (nuraft-cmake NuRaft)
|
add_contrib (nuraft-cmake NuRaft)
|
||||||
add_contrib (fast_float-cmake fast_float)
|
add_contrib (fast_float-cmake fast_float)
|
||||||
add_contrib (datasketches-cpp-cmake datasketches-cpp)
|
add_contrib (datasketches-cpp-cmake datasketches-cpp)
|
||||||
|
add_contrib (incbin-cmake incbin)
|
||||||
|
|
||||||
option(ENABLE_NLP "Enable NLP functions support" ${ENABLE_LIBRARIES})
|
option(ENABLE_NLP "Enable NLP functions support" ${ENABLE_LIBRARIES})
|
||||||
if (ENABLE_NLP)
|
if (ENABLE_NLP)
|
||||||
add_contrib (libstemmer-c-cmake libstemmer_c)
|
add_contrib (libstemmer-c-cmake libstemmer_c)
|
||||||
add_contrib (wordnet-blast-cmake wordnet-blast)
|
add_contrib (wordnet-blast-cmake wordnet-blast)
|
||||||
add_contrib (lemmagen-c-cmake lemmagen-c)
|
add_contrib (lemmagen-c-cmake lemmagen-c)
|
||||||
add_contrib (nlp-data-cmake nlp-data)
|
|
||||||
add_contrib (cld2-cmake cld2)
|
add_contrib (cld2-cmake cld2)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
@ -195,6 +194,17 @@ if (ARCH_S390X)
|
|||||||
add_contrib(crc32-s390x-cmake crc32-s390x)
|
add_contrib(crc32-s390x-cmake crc32-s390x)
|
||||||
endif()
|
endif()
|
||||||
add_contrib (annoy-cmake annoy)
|
add_contrib (annoy-cmake annoy)
|
||||||
|
|
||||||
|
option(ENABLE_USEARCH "Enable USearch (Approximate Neighborhood Search, HNSW) support" ${ENABLE_LIBRARIES})
|
||||||
|
if (ENABLE_USEARCH)
|
||||||
|
add_contrib (FP16-cmake FP16)
|
||||||
|
add_contrib (robin-map-cmake robin-map)
|
||||||
|
add_contrib (SimSIMD-cmake SimSIMD)
|
||||||
|
add_contrib (usearch-cmake usearch) # requires: FP16, robin-map, SimdSIMD
|
||||||
|
else ()
|
||||||
|
message(STATUS "Not using USearch")
|
||||||
|
endif ()
|
||||||
|
|
||||||
add_contrib (xxHash-cmake xxHash)
|
add_contrib (xxHash-cmake xxHash)
|
||||||
|
|
||||||
add_contrib (libbcrypt-cmake libbcrypt)
|
add_contrib (libbcrypt-cmake libbcrypt)
|
||||||
|
1
contrib/FP16
vendored
Submodule
1
contrib/FP16
vendored
Submodule
@ -0,0 +1 @@
|
|||||||
|
Subproject commit 0a92994d729ff76a58f692d3028ca1b64b145d91
|
1
contrib/FP16-cmake/CMakeLists.txt
Normal file
1
contrib/FP16-cmake/CMakeLists.txt
Normal file
@ -0,0 +1 @@
|
|||||||
|
# See contrib/usearch-cmake/CMakeLists.txt
|
1
contrib/SimSIMD
vendored
Submodule
1
contrib/SimSIMD
vendored
Submodule
@ -0,0 +1 @@
|
|||||||
|
Subproject commit de2cb75b9e9e3389d5e1e51fd9f8ed151f3c17cf
|
1
contrib/SimSIMD-cmake/CMakeLists.txt
Normal file
1
contrib/SimSIMD-cmake/CMakeLists.txt
Normal file
@ -0,0 +1 @@
|
|||||||
|
# See contrib/usearch-cmake/CMakeLists.txt
|
1
contrib/aklomp-base64
vendored
Submodule
1
contrib/aklomp-base64
vendored
Submodule
@ -0,0 +1 @@
|
|||||||
|
Subproject commit e77bd70bdd860c52c561568cffb251d88bba064c
|
1
contrib/aklomp-base64-cmake/.gitignore
vendored
Normal file
1
contrib/aklomp-base64-cmake/.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
|||||||
|
config.h
|
68
contrib/aklomp-base64-cmake/CMakeLists.txt
Normal file
68
contrib/aklomp-base64-cmake/CMakeLists.txt
Normal file
@ -0,0 +1,68 @@
|
|||||||
|
option (ENABLE_BASE64 "Enable base64" ${ENABLE_LIBRARIES})
|
||||||
|
|
||||||
|
if (NOT ENABLE_BASE64)
|
||||||
|
message(STATUS "Not using base64")
|
||||||
|
return()
|
||||||
|
endif()
|
||||||
|
|
||||||
|
SET(LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/aklomp-base64")
|
||||||
|
|
||||||
|
if (ARCH_AMD64)
|
||||||
|
# These defines enable/disable SIMD codecs in base64's runtime codec dispatch.
|
||||||
|
# We don't want to limit ourselves --> enable all.
|
||||||
|
set(HAVE_SSSE3 1)
|
||||||
|
set(HAVE_SSE41 1)
|
||||||
|
set(HAVE_SSE42 1)
|
||||||
|
set(HAVE_AVX 1)
|
||||||
|
set(HAVE_AVX2 1)
|
||||||
|
set(HAVE_AVX512 1)
|
||||||
|
endif ()
|
||||||
|
|
||||||
|
if (ARCH_AARCH64)
|
||||||
|
# The choice of HAVE_NEON* depends on the target machine because base64 provides
|
||||||
|
# no runtime dispatch on ARM. NEON is only mandatory with the normal build profile.
|
||||||
|
if(NOT NO_ARMV81_OR_HIGHER)
|
||||||
|
set(HAVE_NEON64 1)
|
||||||
|
set(HAVE_NEON32 0)
|
||||||
|
endif ()
|
||||||
|
endif ()
|
||||||
|
|
||||||
|
configure_file(config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
|
||||||
|
|
||||||
|
add_library(_base64
|
||||||
|
"${LIBRARY_DIR}/lib/lib.c"
|
||||||
|
"${LIBRARY_DIR}/lib/codec_choose.c"
|
||||||
|
|
||||||
|
"${LIBRARY_DIR}/lib/tables/tables.c"
|
||||||
|
"${LIBRARY_DIR}/lib/tables/table_dec_32bit.h"
|
||||||
|
"${LIBRARY_DIR}/lib/tables/table_enc_12bit.h"
|
||||||
|
|
||||||
|
"${LIBRARY_DIR}/lib/codecs.h"
|
||||||
|
|
||||||
|
"${CMAKE_CURRENT_BINARY_DIR}/config.h"
|
||||||
|
|
||||||
|
"${LIBRARY_DIR}/lib/arch/generic/codec.c"
|
||||||
|
"${LIBRARY_DIR}/lib/arch/ssse3/codec.c"
|
||||||
|
"${LIBRARY_DIR}/lib/arch/sse41/codec.c"
|
||||||
|
"${LIBRARY_DIR}/lib/arch/sse42/codec.c"
|
||||||
|
"${LIBRARY_DIR}/lib/arch/avx/codec.c"
|
||||||
|
"${LIBRARY_DIR}/lib/arch/avx2/codec.c"
|
||||||
|
"${LIBRARY_DIR}/lib/arch/avx512/codec.c"
|
||||||
|
|
||||||
|
"${LIBRARY_DIR}/lib/arch/neon32/codec.c"
|
||||||
|
"${LIBRARY_DIR}/lib/arch/neon64/codec.c"
|
||||||
|
)
|
||||||
|
|
||||||
|
if (ARCH_AMD64)
|
||||||
|
set_source_files_properties(${LIBRARY_DIR}/lib/arch/ssse3/codec.c PROPERTIES COMPILE_FLAGS "-mssse3")
|
||||||
|
set_source_files_properties(${LIBRARY_DIR}/lib/arch/sse41/codec.c PROPERTIES COMPILE_FLAGS "-msse4.1")
|
||||||
|
set_source_files_properties(${LIBRARY_DIR}/lib/arch/sse42/codec.c PROPERTIES COMPILE_FLAGS "-msse4.2")
|
||||||
|
set_source_files_properties(${LIBRARY_DIR}/lib/arch/avx/codec.c PROPERTIES COMPILE_FLAGS "-mavx")
|
||||||
|
set_source_files_properties(${LIBRARY_DIR}/lib/arch/avx2/codec.c PROPERTIES COMPILE_FLAGS "-mavx2")
|
||||||
|
set_source_files_properties(${LIBRARY_DIR}/lib/arch/avx512/codec.c PROPERTIES COMPILE_FLAGS "-mavx512vl -mavx512vbmi")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
target_include_directories(_base64 SYSTEM PUBLIC ${LIBRARY_DIR}/include)
|
||||||
|
target_include_directories(_base64 PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
|
||||||
|
|
||||||
|
add_library(ch_contrib::base64 ALIAS _base64)
|
9
contrib/aklomp-base64-cmake/config.h.in
Normal file
9
contrib/aklomp-base64-cmake/config.h.in
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
#cmakedefine01 HAVE_SSSE3
|
||||||
|
#cmakedefine01 HAVE_SSE41
|
||||||
|
#cmakedefine01 HAVE_SSE42
|
||||||
|
#cmakedefine01 HAVE_AVX
|
||||||
|
#cmakedefine01 HAVE_AVX2
|
||||||
|
#cmakedefine01 HAVE_AVX512
|
||||||
|
|
||||||
|
#cmakedefine01 HAVE_NEON32
|
||||||
|
#cmakedefine01 HAVE_NEON64
|
2
contrib/arrow
vendored
2
contrib/arrow
vendored
@ -1 +1 @@
|
|||||||
Subproject commit 1f1b3d35fb6eb73e6492d3afd8a85cde848d174f
|
Subproject commit 1d93838f69a802639ca144ea5704a98e2481810d
|
@ -334,20 +334,36 @@ set(ARROW_SRCS
|
|||||||
"${LIBRARY_DIR}/compute/api_vector.cc"
|
"${LIBRARY_DIR}/compute/api_vector.cc"
|
||||||
"${LIBRARY_DIR}/compute/cast.cc"
|
"${LIBRARY_DIR}/compute/cast.cc"
|
||||||
"${LIBRARY_DIR}/compute/exec.cc"
|
"${LIBRARY_DIR}/compute/exec.cc"
|
||||||
|
"${LIBRARY_DIR}/compute/exec/accumulation_queue.cc"
|
||||||
|
"${LIBRARY_DIR}/compute/exec/accumulation_queue.h"
|
||||||
|
"${LIBRARY_DIR}/compute/exec/aggregate.cc"
|
||||||
"${LIBRARY_DIR}/compute/exec/aggregate_node.cc"
|
"${LIBRARY_DIR}/compute/exec/aggregate_node.cc"
|
||||||
|
"${LIBRARY_DIR}/compute/exec/asof_join_node.cc"
|
||||||
|
"${LIBRARY_DIR}/compute/exec/bloom_filter.cc"
|
||||||
"${LIBRARY_DIR}/compute/exec/exec_plan.cc"
|
"${LIBRARY_DIR}/compute/exec/exec_plan.cc"
|
||||||
"${LIBRARY_DIR}/compute/exec/expression.cc"
|
"${LIBRARY_DIR}/compute/exec/expression.cc"
|
||||||
"${LIBRARY_DIR}/compute/exec/filter_node.cc"
|
"${LIBRARY_DIR}/compute/exec/filter_node.cc"
|
||||||
"${LIBRARY_DIR}/compute/exec/project_node.cc"
|
"${LIBRARY_DIR}/compute/exec/hash_join.cc"
|
||||||
"${LIBRARY_DIR}/compute/exec/source_node.cc"
|
"${LIBRARY_DIR}/compute/exec/hash_join_dict.cc"
|
||||||
"${LIBRARY_DIR}/compute/exec/sink_node.cc"
|
"${LIBRARY_DIR}/compute/exec/hash_join_node.cc"
|
||||||
|
"${LIBRARY_DIR}/compute/exec/key_hash.cc"
|
||||||
|
"${LIBRARY_DIR}/compute/exec/key_map.cc"
|
||||||
|
"${LIBRARY_DIR}/compute/exec/map_node.cc"
|
||||||
|
"${LIBRARY_DIR}/compute/exec/options.cc"
|
||||||
"${LIBRARY_DIR}/compute/exec/order_by_impl.cc"
|
"${LIBRARY_DIR}/compute/exec/order_by_impl.cc"
|
||||||
"${LIBRARY_DIR}/compute/exec/partition_util.cc"
|
"${LIBRARY_DIR}/compute/exec/partition_util.cc"
|
||||||
|
"${LIBRARY_DIR}/compute/exec/project_node.cc"
|
||||||
|
"${LIBRARY_DIR}/compute/exec/query_context.cc"
|
||||||
|
"${LIBRARY_DIR}/compute/exec/sink_node.cc"
|
||||||
|
"${LIBRARY_DIR}/compute/exec/source_node.cc"
|
||||||
|
"${LIBRARY_DIR}/compute/exec/swiss_join.cc"
|
||||||
|
"${LIBRARY_DIR}/compute/exec/task_util.cc"
|
||||||
|
"${LIBRARY_DIR}/compute/exec/tpch_node.cc"
|
||||||
|
"${LIBRARY_DIR}/compute/exec/union_node.cc"
|
||||||
|
"${LIBRARY_DIR}/compute/exec/util.cc"
|
||||||
"${LIBRARY_DIR}/compute/function.cc"
|
"${LIBRARY_DIR}/compute/function.cc"
|
||||||
"${LIBRARY_DIR}/compute/function_internal.cc"
|
"${LIBRARY_DIR}/compute/function_internal.cc"
|
||||||
"${LIBRARY_DIR}/compute/kernel.cc"
|
"${LIBRARY_DIR}/compute/kernel.cc"
|
||||||
"${LIBRARY_DIR}/compute/light_array.cc"
|
|
||||||
"${LIBRARY_DIR}/compute/registry.cc"
|
|
||||||
"${LIBRARY_DIR}/compute/kernels/aggregate_basic.cc"
|
"${LIBRARY_DIR}/compute/kernels/aggregate_basic.cc"
|
||||||
"${LIBRARY_DIR}/compute/kernels/aggregate_mode.cc"
|
"${LIBRARY_DIR}/compute/kernels/aggregate_mode.cc"
|
||||||
"${LIBRARY_DIR}/compute/kernels/aggregate_quantile.cc"
|
"${LIBRARY_DIR}/compute/kernels/aggregate_quantile.cc"
|
||||||
@ -355,49 +371,43 @@ set(ARROW_SRCS
|
|||||||
"${LIBRARY_DIR}/compute/kernels/aggregate_var_std.cc"
|
"${LIBRARY_DIR}/compute/kernels/aggregate_var_std.cc"
|
||||||
"${LIBRARY_DIR}/compute/kernels/codegen_internal.cc"
|
"${LIBRARY_DIR}/compute/kernels/codegen_internal.cc"
|
||||||
"${LIBRARY_DIR}/compute/kernels/hash_aggregate.cc"
|
"${LIBRARY_DIR}/compute/kernels/hash_aggregate.cc"
|
||||||
|
"${LIBRARY_DIR}/compute/kernels/row_encoder.cc"
|
||||||
"${LIBRARY_DIR}/compute/kernels/scalar_arithmetic.cc"
|
"${LIBRARY_DIR}/compute/kernels/scalar_arithmetic.cc"
|
||||||
"${LIBRARY_DIR}/compute/kernels/scalar_boolean.cc"
|
"${LIBRARY_DIR}/compute/kernels/scalar_boolean.cc"
|
||||||
"${LIBRARY_DIR}/compute/kernels/scalar_cast_boolean.cc"
|
"${LIBRARY_DIR}/compute/kernels/scalar_cast_boolean.cc"
|
||||||
"${LIBRARY_DIR}/compute/kernels/scalar_cast_dictionary.cc"
|
"${LIBRARY_DIR}/compute/kernels/scalar_cast_dictionary.cc"
|
||||||
"${LIBRARY_DIR}/compute/kernels/scalar_cast_internal.cc"
|
|
||||||
"${LIBRARY_DIR}/compute/kernels/scalar_cast_extension.cc"
|
"${LIBRARY_DIR}/compute/kernels/scalar_cast_extension.cc"
|
||||||
|
"${LIBRARY_DIR}/compute/kernels/scalar_cast_internal.cc"
|
||||||
"${LIBRARY_DIR}/compute/kernels/scalar_cast_nested.cc"
|
"${LIBRARY_DIR}/compute/kernels/scalar_cast_nested.cc"
|
||||||
"${LIBRARY_DIR}/compute/kernels/scalar_cast_numeric.cc"
|
"${LIBRARY_DIR}/compute/kernels/scalar_cast_numeric.cc"
|
||||||
"${LIBRARY_DIR}/compute/kernels/scalar_cast_string.cc"
|
"${LIBRARY_DIR}/compute/kernels/scalar_cast_string.cc"
|
||||||
"${LIBRARY_DIR}/compute/kernels/scalar_cast_temporal.cc"
|
"${LIBRARY_DIR}/compute/kernels/scalar_cast_temporal.cc"
|
||||||
"${LIBRARY_DIR}/compute/kernels/scalar_compare.cc"
|
"${LIBRARY_DIR}/compute/kernels/scalar_compare.cc"
|
||||||
|
"${LIBRARY_DIR}/compute/kernels/scalar_if_else.cc"
|
||||||
"${LIBRARY_DIR}/compute/kernels/scalar_nested.cc"
|
"${LIBRARY_DIR}/compute/kernels/scalar_nested.cc"
|
||||||
"${LIBRARY_DIR}/compute/kernels/scalar_random.cc"
|
"${LIBRARY_DIR}/compute/kernels/scalar_random.cc"
|
||||||
"${LIBRARY_DIR}/compute/kernels/scalar_round.cc"
|
"${LIBRARY_DIR}/compute/kernels/scalar_round.cc"
|
||||||
"${LIBRARY_DIR}/compute/kernels/scalar_set_lookup.cc"
|
"${LIBRARY_DIR}/compute/kernels/scalar_set_lookup.cc"
|
||||||
|
"${LIBRARY_DIR}/compute/kernels/scalar_string_ascii.cc"
|
||||||
|
"${LIBRARY_DIR}/compute/kernels/scalar_string_utf8.cc"
|
||||||
"${LIBRARY_DIR}/compute/kernels/scalar_temporal_binary.cc"
|
"${LIBRARY_DIR}/compute/kernels/scalar_temporal_binary.cc"
|
||||||
"${LIBRARY_DIR}/compute/kernels/scalar_temporal_unary.cc"
|
"${LIBRARY_DIR}/compute/kernels/scalar_temporal_unary.cc"
|
||||||
"${LIBRARY_DIR}/compute/kernels/scalar_validity.cc"
|
"${LIBRARY_DIR}/compute/kernels/scalar_validity.cc"
|
||||||
"${LIBRARY_DIR}/compute/kernels/scalar_if_else.cc"
|
|
||||||
"${LIBRARY_DIR}/compute/kernels/scalar_string_ascii.cc"
|
|
||||||
"${LIBRARY_DIR}/compute/kernels/scalar_string_utf8.cc"
|
|
||||||
"${LIBRARY_DIR}/compute/kernels/util_internal.cc"
|
"${LIBRARY_DIR}/compute/kernels/util_internal.cc"
|
||||||
"${LIBRARY_DIR}/compute/kernels/vector_array_sort.cc"
|
"${LIBRARY_DIR}/compute/kernels/vector_array_sort.cc"
|
||||||
"${LIBRARY_DIR}/compute/kernels/vector_cumulative_ops.cc"
|
"${LIBRARY_DIR}/compute/kernels/vector_cumulative_ops.cc"
|
||||||
"${LIBRARY_DIR}/compute/kernels/vector_hash.cc"
|
"${LIBRARY_DIR}/compute/kernels/vector_hash.cc"
|
||||||
"${LIBRARY_DIR}/compute/kernels/vector_rank.cc"
|
|
||||||
"${LIBRARY_DIR}/compute/kernels/vector_select_k.cc"
|
|
||||||
"${LIBRARY_DIR}/compute/kernels/vector_nested.cc"
|
"${LIBRARY_DIR}/compute/kernels/vector_nested.cc"
|
||||||
|
"${LIBRARY_DIR}/compute/kernels/vector_rank.cc"
|
||||||
"${LIBRARY_DIR}/compute/kernels/vector_replace.cc"
|
"${LIBRARY_DIR}/compute/kernels/vector_replace.cc"
|
||||||
|
"${LIBRARY_DIR}/compute/kernels/vector_select_k.cc"
|
||||||
"${LIBRARY_DIR}/compute/kernels/vector_selection.cc"
|
"${LIBRARY_DIR}/compute/kernels/vector_selection.cc"
|
||||||
"${LIBRARY_DIR}/compute/kernels/vector_sort.cc"
|
"${LIBRARY_DIR}/compute/kernels/vector_sort.cc"
|
||||||
"${LIBRARY_DIR}/compute/kernels/row_encoder.cc"
|
"${LIBRARY_DIR}/compute/light_array.cc"
|
||||||
"${LIBRARY_DIR}/compute/exec/union_node.cc"
|
"${LIBRARY_DIR}/compute/registry.cc"
|
||||||
"${LIBRARY_DIR}/compute/exec/key_hash.cc"
|
"${LIBRARY_DIR}/compute/row/compare_internal.cc"
|
||||||
"${LIBRARY_DIR}/compute/exec/key_map.cc"
|
|
||||||
"${LIBRARY_DIR}/compute/exec/util.cc"
|
|
||||||
"${LIBRARY_DIR}/compute/exec/hash_join_dict.cc"
|
|
||||||
"${LIBRARY_DIR}/compute/exec/hash_join.cc"
|
|
||||||
"${LIBRARY_DIR}/compute/exec/hash_join_node.cc"
|
|
||||||
"${LIBRARY_DIR}/compute/exec/task_util.cc"
|
|
||||||
"${LIBRARY_DIR}/compute/row/encode_internal.cc"
|
"${LIBRARY_DIR}/compute/row/encode_internal.cc"
|
||||||
"${LIBRARY_DIR}/compute/row/grouper.cc"
|
"${LIBRARY_DIR}/compute/row/grouper.cc"
|
||||||
"${LIBRARY_DIR}/compute/row/compare_internal.cc"
|
|
||||||
"${LIBRARY_DIR}/compute/row/row_internal.cc"
|
"${LIBRARY_DIR}/compute/row/row_internal.cc"
|
||||||
|
|
||||||
"${LIBRARY_DIR}/ipc/dictionary.cc"
|
"${LIBRARY_DIR}/ipc/dictionary.cc"
|
||||||
@ -502,9 +512,10 @@ target_include_directories(_parquet SYSTEM BEFORE
|
|||||||
"${ClickHouse_SOURCE_DIR}/contrib/arrow/cpp/src"
|
"${ClickHouse_SOURCE_DIR}/contrib/arrow/cpp/src"
|
||||||
"${CMAKE_CURRENT_SOURCE_DIR}/cpp/src")
|
"${CMAKE_CURRENT_SOURCE_DIR}/cpp/src")
|
||||||
target_link_libraries(_parquet
|
target_link_libraries(_parquet
|
||||||
PUBLIC _arrow
|
PUBLIC
|
||||||
PRIVATE
|
_arrow
|
||||||
ch_contrib::thrift
|
ch_contrib::thrift
|
||||||
|
PRIVATE
|
||||||
boost::headers_only
|
boost::headers_only
|
||||||
boost::regex
|
boost::regex
|
||||||
OpenSSL::Crypto OpenSSL::SSL)
|
OpenSSL::Crypto OpenSSL::SSL)
|
||||||
|
1
contrib/base64
vendored
1
contrib/base64
vendored
@ -1 +0,0 @@
|
|||||||
Subproject commit 9499e0c4945589973b9ea1bc927377cfbc84aa46
|
|
@ -1,60 +0,0 @@
|
|||||||
if(ARCH_AMD64 OR ARCH_AARCH64 OR ARCH_PPC64LE OR ARCH_S390X)
|
|
||||||
option (ENABLE_BASE64 "Enable base64" ${ENABLE_LIBRARIES})
|
|
||||||
elseif(ENABLE_BASE64)
|
|
||||||
message (${RECONFIGURE_MESSAGE_LEVEL} "base64 library is only supported on x86_64 and aarch64")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if (NOT ENABLE_BASE64)
|
|
||||||
message(STATUS "Not using base64")
|
|
||||||
return()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
SET(LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/base64")
|
|
||||||
|
|
||||||
add_library(_base64_scalar OBJECT "${LIBRARY_DIR}/turbob64c.c" "${LIBRARY_DIR}/turbob64d.c")
|
|
||||||
add_library(_base64_ssse3 OBJECT "${LIBRARY_DIR}/turbob64sse.c") # This file also contains code for ARM NEON
|
|
||||||
|
|
||||||
if (ARCH_AMD64)
|
|
||||||
add_library(_base64_avx OBJECT "${LIBRARY_DIR}/turbob64sse.c") # This is not a mistake. One file is compiled twice.
|
|
||||||
add_library(_base64_avx2 OBJECT "${LIBRARY_DIR}/turbob64avx2.c")
|
|
||||||
endif ()
|
|
||||||
|
|
||||||
target_compile_options(_base64_scalar PRIVATE -falign-loops)
|
|
||||||
|
|
||||||
if (ARCH_AMD64)
|
|
||||||
target_compile_options(_base64_ssse3 PRIVATE -mno-avx -mno-avx2 -mssse3 -falign-loops)
|
|
||||||
target_compile_options(_base64_avx PRIVATE -falign-loops -mavx)
|
|
||||||
target_compile_options(_base64_avx2 PRIVATE -falign-loops -mavx2)
|
|
||||||
else ()
|
|
||||||
if (ARCH_PPC64LE)
|
|
||||||
target_compile_options(_base64_ssse3 PRIVATE -D__SSSE3__ -falign-loops)
|
|
||||||
else()
|
|
||||||
target_compile_options(_base64_ssse3 PRIVATE -falign-loops)
|
|
||||||
endif()
|
|
||||||
endif ()
|
|
||||||
|
|
||||||
if (ARCH_AMD64)
|
|
||||||
add_library(_base64
|
|
||||||
$<TARGET_OBJECTS:_base64_scalar>
|
|
||||||
$<TARGET_OBJECTS:_base64_ssse3>
|
|
||||||
$<TARGET_OBJECTS:_base64_avx>
|
|
||||||
$<TARGET_OBJECTS:_base64_avx2>)
|
|
||||||
else ()
|
|
||||||
add_library(_base64
|
|
||||||
$<TARGET_OBJECTS:_base64_scalar>
|
|
||||||
$<TARGET_OBJECTS:_base64_ssse3>)
|
|
||||||
endif ()
|
|
||||||
|
|
||||||
target_include_directories(_base64 SYSTEM PUBLIC ${LIBRARY_DIR})
|
|
||||||
|
|
||||||
if (XCODE OR XCODE_VERSION)
|
|
||||||
# https://gitlab.kitware.com/cmake/cmake/issues/17457
|
|
||||||
# Some native build systems may not like targets that have only object files, so consider adding at least one real source file
|
|
||||||
# This applies to Xcode.
|
|
||||||
if (NOT EXISTS "${CMAKE_CURRENT_BINARY_DIR}/dummy.c")
|
|
||||||
file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/dummy.c" "")
|
|
||||||
endif ()
|
|
||||||
target_sources(_base64 PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/dummy.c")
|
|
||||||
endif ()
|
|
||||||
|
|
||||||
add_library(ch_contrib::base64 ALIAS _base64)
|
|
2
contrib/boost
vendored
2
contrib/boost
vendored
@ -1 +1 @@
|
|||||||
Subproject commit aec12eea7fc762721ae16943d1361340c66c9c17
|
Subproject commit ae94606a70f1e298ce2a5718db858079185c4d9c
|
@ -19,18 +19,22 @@ add_library (_boost_filesystem ${SRCS_FILESYSTEM})
|
|||||||
add_library (boost::filesystem ALIAS _boost_filesystem)
|
add_library (boost::filesystem ALIAS _boost_filesystem)
|
||||||
target_include_directories (_boost_filesystem SYSTEM BEFORE PUBLIC ${LIBRARY_DIR})
|
target_include_directories (_boost_filesystem SYSTEM BEFORE PUBLIC ${LIBRARY_DIR})
|
||||||
|
|
||||||
# headers-only
|
if (OS_LINUX)
|
||||||
|
target_compile_definitions (_boost_filesystem PRIVATE
|
||||||
|
BOOST_FILESYSTEM_HAS_POSIX_AT_APIS=1
|
||||||
|
)
|
||||||
|
endif ()
|
||||||
|
|
||||||
|
|
||||||
|
# headers-only
|
||||||
add_library (_boost_headers_only INTERFACE)
|
add_library (_boost_headers_only INTERFACE)
|
||||||
add_library (boost::headers_only ALIAS _boost_headers_only)
|
add_library (boost::headers_only ALIAS _boost_headers_only)
|
||||||
target_include_directories (_boost_headers_only SYSTEM BEFORE INTERFACE ${LIBRARY_DIR})
|
target_include_directories (_boost_headers_only SYSTEM BEFORE INTERFACE ${LIBRARY_DIR})
|
||||||
|
|
||||||
# asio
|
|
||||||
|
|
||||||
target_compile_definitions (_boost_headers_only INTERFACE
|
target_compile_definitions (_boost_headers_only INTERFACE
|
||||||
BOOST_ASIO_STANDALONE=1
|
BOOST_ASIO_STANDALONE=1
|
||||||
# Avoid using of deprecated in c++ > 17 std::result_of
|
BOOST_ASIO_HAS_STD_INVOKE_RESULT=1 # Avoid using of deprecated in c++ > 17 std::result_of
|
||||||
BOOST_ASIO_HAS_STD_INVOKE_RESULT=1
|
BOOST_TIMER_ENABLE_DEPRECATED=1 # wordnet-blast (enabled via USE_NLP) uses Boost legacy timer classes
|
||||||
)
|
)
|
||||||
|
|
||||||
# iostreams
|
# iostreams
|
||||||
@ -172,9 +176,9 @@ endif()
|
|||||||
# coroutine
|
# coroutine
|
||||||
|
|
||||||
set (SRCS_COROUTINE
|
set (SRCS_COROUTINE
|
||||||
"${LIBRARY_DIR}/libs/coroutine/detail/coroutine_context.cpp"
|
"${LIBRARY_DIR}/libs/coroutine/src/detail/coroutine_context.cpp"
|
||||||
"${LIBRARY_DIR}/libs/coroutine/exceptions.cpp"
|
"${LIBRARY_DIR}/libs/coroutine/src/exceptions.cpp"
|
||||||
"${LIBRARY_DIR}/libs/coroutine/posix/stack_traits.cpp"
|
"${LIBRARY_DIR}/libs/coroutine/src/posix/stack_traits.cpp"
|
||||||
)
|
)
|
||||||
add_library (_boost_coroutine ${SRCS_COROUTINE})
|
add_library (_boost_coroutine ${SRCS_COROUTINE})
|
||||||
add_library (boost::coroutine ALIAS _boost_coroutine)
|
add_library (boost::coroutine ALIAS _boost_coroutine)
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
include(${ClickHouse_SOURCE_DIR}/cmake/embed_binary.cmake)
|
|
||||||
set(LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/cctz")
|
set(LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/cctz")
|
||||||
|
|
||||||
set (SRCS
|
set (SRCS
|
||||||
@ -23,12 +22,10 @@ if (OS_FREEBSD)
|
|||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
# Related to time_zones table:
|
# Related to time_zones table:
|
||||||
# StorageSystemTimeZones.generated.cpp is autogenerated each time during a build
|
# TimeZones.generated.cpp is autogenerated each time during a build
|
||||||
# data in this file will be used to populate the system.time_zones table, this is specific to OS_LINUX
|
set(TIMEZONES_FILE "${CMAKE_CURRENT_BINARY_DIR}/TimeZones.generated.cpp")
|
||||||
# as the library that's built using embedded tzdata is also specific to OS_LINUX
|
|
||||||
set(SYSTEM_STORAGE_TZ_FILE "${PROJECT_BINARY_DIR}/src/Storages/System/StorageSystemTimeZones.generated.cpp")
|
|
||||||
# remove existing copies so that its generated fresh on each build.
|
# remove existing copies so that its generated fresh on each build.
|
||||||
file(REMOVE ${SYSTEM_STORAGE_TZ_FILE})
|
file(REMOVE ${TIMEZONES_FILE})
|
||||||
|
|
||||||
# get the list of timezones from tzdata shipped with cctz
|
# get the list of timezones from tzdata shipped with cctz
|
||||||
set(TZDIR "${LIBRARY_DIR}/testdata/zoneinfo")
|
set(TZDIR "${LIBRARY_DIR}/testdata/zoneinfo")
|
||||||
@ -36,28 +33,44 @@ file(STRINGS "${LIBRARY_DIR}/testdata/version" TZDATA_VERSION)
|
|||||||
set_property(GLOBAL PROPERTY TZDATA_VERSION_PROP "${TZDATA_VERSION}")
|
set_property(GLOBAL PROPERTY TZDATA_VERSION_PROP "${TZDATA_VERSION}")
|
||||||
message(STATUS "Packaging with tzdata version: ${TZDATA_VERSION}")
|
message(STATUS "Packaging with tzdata version: ${TZDATA_VERSION}")
|
||||||
|
|
||||||
set(TIMEZONE_RESOURCE_FILES)
|
|
||||||
|
|
||||||
# each file in that dir (except of tab and localtime) store the info about timezone
|
# each file in that dir (except of tab and localtime) store the info about timezone
|
||||||
execute_process(COMMAND
|
execute_process(COMMAND
|
||||||
bash -c "cd ${TZDIR} && find * -type f -and ! -name '*.tab' -and ! -name 'localtime' | LC_ALL=C sort | paste -sd ';' -"
|
bash -c "cd ${TZDIR} && find * -type f -and ! -name '*.tab' -and ! -name 'localtime' | LC_ALL=C sort | paste -sd ';' -"
|
||||||
OUTPUT_STRIP_TRAILING_WHITESPACE
|
OUTPUT_STRIP_TRAILING_WHITESPACE
|
||||||
OUTPUT_VARIABLE TIMEZONES)
|
OUTPUT_VARIABLE TIMEZONES)
|
||||||
|
|
||||||
file(APPEND ${SYSTEM_STORAGE_TZ_FILE} "// autogenerated by ClickHouse/contrib/cctz-cmake/CMakeLists.txt\n")
|
file(APPEND ${TIMEZONES_FILE} "// autogenerated by ClickHouse/contrib/cctz-cmake/CMakeLists.txt\n")
|
||||||
file(APPEND ${SYSTEM_STORAGE_TZ_FILE} "const char * auto_time_zones[] {\n" )
|
file(APPEND ${TIMEZONES_FILE} "#include <incbin.h>\n")
|
||||||
|
|
||||||
|
set (COUNTER 1)
|
||||||
|
foreach(TIMEZONE ${TIMEZONES})
|
||||||
|
file(APPEND ${TIMEZONES_FILE} "INCBIN(resource_timezone${COUNTER}, \"${TZDIR}/${TIMEZONE}\");\n")
|
||||||
|
MATH(EXPR COUNTER "${COUNTER}+1")
|
||||||
|
endforeach(TIMEZONE)
|
||||||
|
|
||||||
|
file(APPEND ${TIMEZONES_FILE} "const char * auto_time_zones[] {\n" )
|
||||||
|
|
||||||
foreach(TIMEZONE ${TIMEZONES})
|
foreach(TIMEZONE ${TIMEZONES})
|
||||||
file(APPEND ${SYSTEM_STORAGE_TZ_FILE} " \"${TIMEZONE}\",\n")
|
file(APPEND ${TIMEZONES_FILE} " \"${TIMEZONE}\",\n")
|
||||||
list(APPEND TIMEZONE_RESOURCE_FILES "${TIMEZONE}")
|
MATH(EXPR COUNTER "${COUNTER}+1")
|
||||||
endforeach(TIMEZONE)
|
endforeach(TIMEZONE)
|
||||||
file(APPEND ${SYSTEM_STORAGE_TZ_FILE} " nullptr};\n")
|
|
||||||
clickhouse_embed_binaries(
|
file(APPEND ${TIMEZONES_FILE} " nullptr\n};\n\n")
|
||||||
TARGET tzdata
|
|
||||||
RESOURCE_DIR "${TZDIR}"
|
file(APPEND ${TIMEZONES_FILE} "#include <string_view>\n\n")
|
||||||
RESOURCES ${TIMEZONE_RESOURCE_FILES}
|
file(APPEND ${TIMEZONES_FILE} "std::string_view getTimeZone(const char * name)\n{\n" )
|
||||||
)
|
|
||||||
add_dependencies(_cctz tzdata)
|
set (COUNTER 1)
|
||||||
target_link_libraries(_cctz INTERFACE "-Wl,${WHOLE_ARCHIVE} $<TARGET_FILE:tzdata> -Wl,${NO_WHOLE_ARCHIVE}")
|
foreach(TIMEZONE ${TIMEZONES})
|
||||||
|
file(APPEND ${TIMEZONES_FILE} " if (std::string_view(\"${TIMEZONE}\") == name) return { reinterpret_cast<const char *>(gresource_timezone${COUNTER}Data), gresource_timezone${COUNTER}Size };\n")
|
||||||
|
MATH(EXPR COUNTER "${COUNTER}+1")
|
||||||
|
endforeach(TIMEZONE)
|
||||||
|
|
||||||
|
file(APPEND ${TIMEZONES_FILE} " return {};\n")
|
||||||
|
file(APPEND ${TIMEZONES_FILE} "}\n")
|
||||||
|
|
||||||
|
add_library (tzdata ${TIMEZONES_FILE})
|
||||||
|
target_link_libraries(tzdata ch_contrib::incbin)
|
||||||
|
target_link_libraries(_cctz tzdata)
|
||||||
|
|
||||||
add_library(ch_contrib::cctz ALIAS _cctz)
|
add_library(ch_contrib::cctz ALIAS _cctz)
|
||||||
|
@ -73,8 +73,8 @@ struct uint128
|
|||||||
|
|
||||||
uint128() = default;
|
uint128() = default;
|
||||||
uint128(uint64 low64_, uint64 high64_) : low64(low64_), high64(high64_) {}
|
uint128(uint64 low64_, uint64 high64_) : low64(low64_), high64(high64_) {}
|
||||||
friend bool operator ==(const uint128 & x, const uint128 & y) { return (x.low64 == y.low64) && (x.high64 == y.high64); }
|
|
||||||
friend bool operator !=(const uint128 & x, const uint128 & y) { return !(x == y); }
|
friend auto operator<=>(const uint128 &, const uint128 &) = default;
|
||||||
};
|
};
|
||||||
|
|
||||||
inline uint64 Uint128Low64(const uint128 & x) { return x.low64; }
|
inline uint64 Uint128Low64(const uint128 & x) { return x.low64; }
|
||||||
|
@ -17,20 +17,22 @@ endif()
|
|||||||
|
|
||||||
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")
|
# See https://doc.rust-lang.org/nightly/rustc/platform-support.html
|
||||||
|
|
||||||
|
if((CMAKE_TOOLCHAIN_FILE MATCHES "linux/toolchain-x86_64") AND (CMAKE_TOOLCHAIN_FILE MATCHES "musl"))
|
||||||
|
set(Rust_CARGO_TARGET "x86_64-unknown-linux-musl")
|
||||||
|
elseif(CMAKE_TOOLCHAIN_FILE MATCHES "linux/toolchain-x86_64")
|
||||||
set(Rust_CARGO_TARGET "x86_64-unknown-linux-gnu")
|
set(Rust_CARGO_TARGET "x86_64-unknown-linux-gnu")
|
||||||
endif()
|
elseif((CMAKE_TOOLCHAIN_FILE MATCHES "linux/toolchain-aarch64") AND (CMAKE_TOOLCHAIN_FILE MATCHES "musl"))
|
||||||
|
set(Rust_CARGO_TARGET "aarch64-unknown-linux-musl")
|
||||||
if(CMAKE_TOOLCHAIN_FILE MATCHES "linux/toolchain-aarch64")
|
elseif(CMAKE_TOOLCHAIN_FILE MATCHES "linux/toolchain-aarch64")
|
||||||
set(Rust_CARGO_TARGET "aarch64-unknown-linux-gnu")
|
set(Rust_CARGO_TARGET "aarch64-unknown-linux-gnu")
|
||||||
endif()
|
elseif((CMAKE_TOOLCHAIN_FILE MATCHES "darwin") AND (CMAKE_TOOLCHAIN_FILE MATCHES "x86_64"))
|
||||||
|
|
||||||
if((CMAKE_TOOLCHAIN_FILE MATCHES "darwin") AND (CMAKE_TOOLCHAIN_FILE MATCHES "x86_64"))
|
|
||||||
set(Rust_CARGO_TARGET "x86_64-apple-darwin")
|
set(Rust_CARGO_TARGET "x86_64-apple-darwin")
|
||||||
endif()
|
elseif((CMAKE_TOOLCHAIN_FILE MATCHES "freebsd") AND (CMAKE_TOOLCHAIN_FILE MATCHES "x86_64"))
|
||||||
|
|
||||||
if((CMAKE_TOOLCHAIN_FILE MATCHES "freebsd") AND (CMAKE_TOOLCHAIN_FILE MATCHES "x86_64"))
|
|
||||||
set(Rust_CARGO_TARGET "x86_64-unknown-freebsd")
|
set(Rust_CARGO_TARGET "x86_64-unknown-freebsd")
|
||||||
|
elseif(CMAKE_TOOLCHAIN_FILE MATCHES "linux/toolchain-riscv64")
|
||||||
|
set(Rust_CARGO_TARGET "riscv64gc-unknown-linux-gnu")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(CMAKE_TOOLCHAIN_FILE MATCHES "ppc64le")
|
if(CMAKE_TOOLCHAIN_FILE MATCHES "ppc64le")
|
||||||
|
2
contrib/curl
vendored
2
contrib/curl
vendored
@ -1 +1 @@
|
|||||||
Subproject commit b0edf0b7dae44d9e66f270a257cf654b35d5263d
|
Subproject commit eb3b049df526bf125eda23218e680ce7fa9ec46c
|
@ -8,125 +8,122 @@ endif()
|
|||||||
set (LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/curl")
|
set (LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/curl")
|
||||||
|
|
||||||
set (SRCS
|
set (SRCS
|
||||||
"${LIBRARY_DIR}/lib/fopen.c"
|
"${LIBRARY_DIR}/lib/altsvc.c"
|
||||||
"${LIBRARY_DIR}/lib/noproxy.c"
|
"${LIBRARY_DIR}/lib/amigaos.c"
|
||||||
"${LIBRARY_DIR}/lib/idn.c"
|
"${LIBRARY_DIR}/lib/asyn-thread.c"
|
||||||
"${LIBRARY_DIR}/lib/cfilters.c"
|
"${LIBRARY_DIR}/lib/base64.c"
|
||||||
"${LIBRARY_DIR}/lib/cf-socket.c"
|
"${LIBRARY_DIR}/lib/bufq.c"
|
||||||
|
"${LIBRARY_DIR}/lib/bufref.c"
|
||||||
|
"${LIBRARY_DIR}/lib/cf-h1-proxy.c"
|
||||||
"${LIBRARY_DIR}/lib/cf-haproxy.c"
|
"${LIBRARY_DIR}/lib/cf-haproxy.c"
|
||||||
"${LIBRARY_DIR}/lib/cf-https-connect.c"
|
"${LIBRARY_DIR}/lib/cf-https-connect.c"
|
||||||
"${LIBRARY_DIR}/lib/file.c"
|
"${LIBRARY_DIR}/lib/cf-socket.c"
|
||||||
"${LIBRARY_DIR}/lib/timeval.c"
|
"${LIBRARY_DIR}/lib/cfilters.c"
|
||||||
"${LIBRARY_DIR}/lib/base64.c"
|
"${LIBRARY_DIR}/lib/conncache.c"
|
||||||
"${LIBRARY_DIR}/lib/hostip.c"
|
|
||||||
"${LIBRARY_DIR}/lib/progress.c"
|
|
||||||
"${LIBRARY_DIR}/lib/formdata.c"
|
|
||||||
"${LIBRARY_DIR}/lib/cookie.c"
|
|
||||||
"${LIBRARY_DIR}/lib/http.c"
|
|
||||||
"${LIBRARY_DIR}/lib/sendf.c"
|
|
||||||
"${LIBRARY_DIR}/lib/url.c"
|
|
||||||
"${LIBRARY_DIR}/lib/dict.c"
|
|
||||||
"${LIBRARY_DIR}/lib/if2ip.c"
|
|
||||||
"${LIBRARY_DIR}/lib/speedcheck.c"
|
|
||||||
"${LIBRARY_DIR}/lib/ldap.c"
|
|
||||||
"${LIBRARY_DIR}/lib/version.c"
|
|
||||||
"${LIBRARY_DIR}/lib/getenv.c"
|
|
||||||
"${LIBRARY_DIR}/lib/escape.c"
|
|
||||||
"${LIBRARY_DIR}/lib/mprintf.c"
|
|
||||||
"${LIBRARY_DIR}/lib/telnet.c"
|
|
||||||
"${LIBRARY_DIR}/lib/netrc.c"
|
|
||||||
"${LIBRARY_DIR}/lib/getinfo.c"
|
|
||||||
"${LIBRARY_DIR}/lib/transfer.c"
|
|
||||||
"${LIBRARY_DIR}/lib/strcase.c"
|
|
||||||
"${LIBRARY_DIR}/lib/easy.c"
|
|
||||||
"${LIBRARY_DIR}/lib/curl_fnmatch.c"
|
|
||||||
"${LIBRARY_DIR}/lib/curl_log.c"
|
|
||||||
"${LIBRARY_DIR}/lib/fileinfo.c"
|
|
||||||
"${LIBRARY_DIR}/lib/krb5.c"
|
|
||||||
"${LIBRARY_DIR}/lib/memdebug.c"
|
|
||||||
"${LIBRARY_DIR}/lib/http_chunks.c"
|
|
||||||
"${LIBRARY_DIR}/lib/strtok.c"
|
|
||||||
"${LIBRARY_DIR}/lib/connect.c"
|
"${LIBRARY_DIR}/lib/connect.c"
|
||||||
"${LIBRARY_DIR}/lib/llist.c"
|
|
||||||
"${LIBRARY_DIR}/lib/hash.c"
|
|
||||||
"${LIBRARY_DIR}/lib/multi.c"
|
|
||||||
"${LIBRARY_DIR}/lib/content_encoding.c"
|
"${LIBRARY_DIR}/lib/content_encoding.c"
|
||||||
"${LIBRARY_DIR}/lib/share.c"
|
"${LIBRARY_DIR}/lib/cookie.c"
|
||||||
"${LIBRARY_DIR}/lib/http_digest.c"
|
"${LIBRARY_DIR}/lib/curl_addrinfo.c"
|
||||||
"${LIBRARY_DIR}/lib/md4.c"
|
"${LIBRARY_DIR}/lib/curl_des.c"
|
||||||
"${LIBRARY_DIR}/lib/md5.c"
|
"${LIBRARY_DIR}/lib/curl_endian.c"
|
||||||
"${LIBRARY_DIR}/lib/http_negotiate.c"
|
"${LIBRARY_DIR}/lib/curl_fnmatch.c"
|
||||||
"${LIBRARY_DIR}/lib/inet_pton.c"
|
"${LIBRARY_DIR}/lib/curl_get_line.c"
|
||||||
"${LIBRARY_DIR}/lib/strtoofft.c"
|
"${LIBRARY_DIR}/lib/curl_gethostname.c"
|
||||||
"${LIBRARY_DIR}/lib/strerror.c"
|
"${LIBRARY_DIR}/lib/curl_gssapi.c"
|
||||||
"${LIBRARY_DIR}/lib/amigaos.c"
|
"${LIBRARY_DIR}/lib/curl_memrchr.c"
|
||||||
|
"${LIBRARY_DIR}/lib/curl_multibyte.c"
|
||||||
|
"${LIBRARY_DIR}/lib/curl_ntlm_core.c"
|
||||||
|
"${LIBRARY_DIR}/lib/curl_ntlm_wb.c"
|
||||||
|
"${LIBRARY_DIR}/lib/curl_path.c"
|
||||||
|
"${LIBRARY_DIR}/lib/curl_range.c"
|
||||||
|
"${LIBRARY_DIR}/lib/curl_rtmp.c"
|
||||||
|
"${LIBRARY_DIR}/lib/curl_sasl.c"
|
||||||
|
"${LIBRARY_DIR}/lib/curl_sspi.c"
|
||||||
|
"${LIBRARY_DIR}/lib/curl_threads.c"
|
||||||
|
"${LIBRARY_DIR}/lib/curl_trc.c"
|
||||||
|
"${LIBRARY_DIR}/lib/dict.c"
|
||||||
|
"${LIBRARY_DIR}/lib/doh.c"
|
||||||
|
"${LIBRARY_DIR}/lib/dynbuf.c"
|
||||||
|
"${LIBRARY_DIR}/lib/dynhds.c"
|
||||||
|
"${LIBRARY_DIR}/lib/easy.c"
|
||||||
|
"${LIBRARY_DIR}/lib/escape.c"
|
||||||
|
"${LIBRARY_DIR}/lib/file.c"
|
||||||
|
"${LIBRARY_DIR}/lib/fileinfo.c"
|
||||||
|
"${LIBRARY_DIR}/lib/fopen.c"
|
||||||
|
"${LIBRARY_DIR}/lib/formdata.c"
|
||||||
|
"${LIBRARY_DIR}/lib/getenv.c"
|
||||||
|
"${LIBRARY_DIR}/lib/getinfo.c"
|
||||||
|
"${LIBRARY_DIR}/lib/gopher.c"
|
||||||
|
"${LIBRARY_DIR}/lib/hash.c"
|
||||||
|
"${LIBRARY_DIR}/lib/headers.c"
|
||||||
|
"${LIBRARY_DIR}/lib/hmac.c"
|
||||||
"${LIBRARY_DIR}/lib/hostasyn.c"
|
"${LIBRARY_DIR}/lib/hostasyn.c"
|
||||||
|
"${LIBRARY_DIR}/lib/hostip.c"
|
||||||
"${LIBRARY_DIR}/lib/hostip4.c"
|
"${LIBRARY_DIR}/lib/hostip4.c"
|
||||||
"${LIBRARY_DIR}/lib/hostip6.c"
|
"${LIBRARY_DIR}/lib/hostip6.c"
|
||||||
"${LIBRARY_DIR}/lib/hostsyn.c"
|
"${LIBRARY_DIR}/lib/hostsyn.c"
|
||||||
|
"${LIBRARY_DIR}/lib/hsts.c"
|
||||||
|
"${LIBRARY_DIR}/lib/http.c"
|
||||||
|
"${LIBRARY_DIR}/lib/http2.c"
|
||||||
|
"${LIBRARY_DIR}/lib/http_aws_sigv4.c"
|
||||||
|
"${LIBRARY_DIR}/lib/http_chunks.c"
|
||||||
|
"${LIBRARY_DIR}/lib/http_digest.c"
|
||||||
|
"${LIBRARY_DIR}/lib/http_negotiate.c"
|
||||||
|
"${LIBRARY_DIR}/lib/http_ntlm.c"
|
||||||
|
"${LIBRARY_DIR}/lib/http_proxy.c"
|
||||||
|
"${LIBRARY_DIR}/lib/idn.c"
|
||||||
|
"${LIBRARY_DIR}/lib/if2ip.c"
|
||||||
|
"${LIBRARY_DIR}/lib/imap.c"
|
||||||
"${LIBRARY_DIR}/lib/inet_ntop.c"
|
"${LIBRARY_DIR}/lib/inet_ntop.c"
|
||||||
|
"${LIBRARY_DIR}/lib/inet_pton.c"
|
||||||
|
"${LIBRARY_DIR}/lib/krb5.c"
|
||||||
|
"${LIBRARY_DIR}/lib/ldap.c"
|
||||||
|
"${LIBRARY_DIR}/lib/llist.c"
|
||||||
|
"${LIBRARY_DIR}/lib/md4.c"
|
||||||
|
"${LIBRARY_DIR}/lib/md5.c"
|
||||||
|
"${LIBRARY_DIR}/lib/memdebug.c"
|
||||||
|
"${LIBRARY_DIR}/lib/mime.c"
|
||||||
|
"${LIBRARY_DIR}/lib/mprintf.c"
|
||||||
|
"${LIBRARY_DIR}/lib/mqtt.c"
|
||||||
|
"${LIBRARY_DIR}/lib/multi.c"
|
||||||
|
"${LIBRARY_DIR}/lib/netrc.c"
|
||||||
|
"${LIBRARY_DIR}/lib/nonblock.c"
|
||||||
|
"${LIBRARY_DIR}/lib/noproxy.c"
|
||||||
|
"${LIBRARY_DIR}/lib/openldap.c"
|
||||||
"${LIBRARY_DIR}/lib/parsedate.c"
|
"${LIBRARY_DIR}/lib/parsedate.c"
|
||||||
|
"${LIBRARY_DIR}/lib/pingpong.c"
|
||||||
|
"${LIBRARY_DIR}/lib/pop3.c"
|
||||||
|
"${LIBRARY_DIR}/lib/progress.c"
|
||||||
|
"${LIBRARY_DIR}/lib/psl.c"
|
||||||
|
"${LIBRARY_DIR}/lib/rand.c"
|
||||||
|
"${LIBRARY_DIR}/lib/rename.c"
|
||||||
|
"${LIBRARY_DIR}/lib/rtsp.c"
|
||||||
"${LIBRARY_DIR}/lib/select.c"
|
"${LIBRARY_DIR}/lib/select.c"
|
||||||
"${LIBRARY_DIR}/lib/splay.c"
|
"${LIBRARY_DIR}/lib/sendf.c"
|
||||||
"${LIBRARY_DIR}/lib/strdup.c"
|
"${LIBRARY_DIR}/lib/setopt.c"
|
||||||
|
"${LIBRARY_DIR}/lib/sha256.c"
|
||||||
|
"${LIBRARY_DIR}/lib/share.c"
|
||||||
|
"${LIBRARY_DIR}/lib/slist.c"
|
||||||
|
"${LIBRARY_DIR}/lib/smb.c"
|
||||||
|
"${LIBRARY_DIR}/lib/smtp.c"
|
||||||
|
"${LIBRARY_DIR}/lib/socketpair.c"
|
||||||
"${LIBRARY_DIR}/lib/socks.c"
|
"${LIBRARY_DIR}/lib/socks.c"
|
||||||
"${LIBRARY_DIR}/lib/curl_addrinfo.c"
|
|
||||||
"${LIBRARY_DIR}/lib/socks_gssapi.c"
|
"${LIBRARY_DIR}/lib/socks_gssapi.c"
|
||||||
"${LIBRARY_DIR}/lib/socks_sspi.c"
|
"${LIBRARY_DIR}/lib/socks_sspi.c"
|
||||||
"${LIBRARY_DIR}/lib/curl_sspi.c"
|
"${LIBRARY_DIR}/lib/speedcheck.c"
|
||||||
"${LIBRARY_DIR}/lib/slist.c"
|
"${LIBRARY_DIR}/lib/splay.c"
|
||||||
"${LIBRARY_DIR}/lib/nonblock.c"
|
"${LIBRARY_DIR}/lib/strcase.c"
|
||||||
"${LIBRARY_DIR}/lib/curl_memrchr.c"
|
"${LIBRARY_DIR}/lib/strdup.c"
|
||||||
"${LIBRARY_DIR}/lib/imap.c"
|
"${LIBRARY_DIR}/lib/strerror.c"
|
||||||
"${LIBRARY_DIR}/lib/pop3.c"
|
"${LIBRARY_DIR}/lib/strtok.c"
|
||||||
"${LIBRARY_DIR}/lib/smtp.c"
|
"${LIBRARY_DIR}/lib/strtoofft.c"
|
||||||
"${LIBRARY_DIR}/lib/pingpong.c"
|
|
||||||
"${LIBRARY_DIR}/lib/rtsp.c"
|
|
||||||
"${LIBRARY_DIR}/lib/curl_threads.c"
|
|
||||||
"${LIBRARY_DIR}/lib/warnless.c"
|
|
||||||
"${LIBRARY_DIR}/lib/hmac.c"
|
|
||||||
"${LIBRARY_DIR}/lib/curl_rtmp.c"
|
|
||||||
"${LIBRARY_DIR}/lib/openldap.c"
|
|
||||||
"${LIBRARY_DIR}/lib/curl_gethostname.c"
|
|
||||||
"${LIBRARY_DIR}/lib/gopher.c"
|
|
||||||
"${LIBRARY_DIR}/lib/http_proxy.c"
|
|
||||||
"${LIBRARY_DIR}/lib/asyn-thread.c"
|
|
||||||
"${LIBRARY_DIR}/lib/curl_gssapi.c"
|
|
||||||
"${LIBRARY_DIR}/lib/http_ntlm.c"
|
|
||||||
"${LIBRARY_DIR}/lib/curl_ntlm_wb.c"
|
|
||||||
"${LIBRARY_DIR}/lib/curl_ntlm_core.c"
|
|
||||||
"${LIBRARY_DIR}/lib/curl_sasl.c"
|
|
||||||
"${LIBRARY_DIR}/lib/rand.c"
|
|
||||||
"${LIBRARY_DIR}/lib/curl_multibyte.c"
|
|
||||||
"${LIBRARY_DIR}/lib/conncache.c"
|
|
||||||
"${LIBRARY_DIR}/lib/cf-h1-proxy.c"
|
|
||||||
"${LIBRARY_DIR}/lib/http2.c"
|
|
||||||
"${LIBRARY_DIR}/lib/smb.c"
|
|
||||||
"${LIBRARY_DIR}/lib/curl_endian.c"
|
|
||||||
"${LIBRARY_DIR}/lib/curl_des.c"
|
|
||||||
"${LIBRARY_DIR}/lib/system_win32.c"
|
"${LIBRARY_DIR}/lib/system_win32.c"
|
||||||
"${LIBRARY_DIR}/lib/mime.c"
|
"${LIBRARY_DIR}/lib/telnet.c"
|
||||||
"${LIBRARY_DIR}/lib/sha256.c"
|
|
||||||
"${LIBRARY_DIR}/lib/setopt.c"
|
|
||||||
"${LIBRARY_DIR}/lib/curl_path.c"
|
|
||||||
"${LIBRARY_DIR}/lib/curl_range.c"
|
|
||||||
"${LIBRARY_DIR}/lib/psl.c"
|
|
||||||
"${LIBRARY_DIR}/lib/doh.c"
|
|
||||||
"${LIBRARY_DIR}/lib/urlapi.c"
|
|
||||||
"${LIBRARY_DIR}/lib/curl_get_line.c"
|
|
||||||
"${LIBRARY_DIR}/lib/altsvc.c"
|
|
||||||
"${LIBRARY_DIR}/lib/socketpair.c"
|
|
||||||
"${LIBRARY_DIR}/lib/bufref.c"
|
|
||||||
"${LIBRARY_DIR}/lib/bufq.c"
|
|
||||||
"${LIBRARY_DIR}/lib/dynbuf.c"
|
|
||||||
"${LIBRARY_DIR}/lib/dynhds.c"
|
|
||||||
"${LIBRARY_DIR}/lib/hsts.c"
|
|
||||||
"${LIBRARY_DIR}/lib/http_aws_sigv4.c"
|
|
||||||
"${LIBRARY_DIR}/lib/mqtt.c"
|
|
||||||
"${LIBRARY_DIR}/lib/rename.c"
|
|
||||||
"${LIBRARY_DIR}/lib/headers.c"
|
|
||||||
"${LIBRARY_DIR}/lib/timediff.c"
|
"${LIBRARY_DIR}/lib/timediff.c"
|
||||||
"${LIBRARY_DIR}/lib/vauth/vauth.c"
|
"${LIBRARY_DIR}/lib/timeval.c"
|
||||||
|
"${LIBRARY_DIR}/lib/transfer.c"
|
||||||
|
"${LIBRARY_DIR}/lib/url.c"
|
||||||
|
"${LIBRARY_DIR}/lib/urlapi.c"
|
||||||
"${LIBRARY_DIR}/lib/vauth/cleartext.c"
|
"${LIBRARY_DIR}/lib/vauth/cleartext.c"
|
||||||
"${LIBRARY_DIR}/lib/vauth/cram.c"
|
"${LIBRARY_DIR}/lib/vauth/cram.c"
|
||||||
"${LIBRARY_DIR}/lib/vauth/digest.c"
|
"${LIBRARY_DIR}/lib/vauth/digest.c"
|
||||||
@ -138,23 +135,24 @@ set (SRCS
|
|||||||
"${LIBRARY_DIR}/lib/vauth/oauth2.c"
|
"${LIBRARY_DIR}/lib/vauth/oauth2.c"
|
||||||
"${LIBRARY_DIR}/lib/vauth/spnego_gssapi.c"
|
"${LIBRARY_DIR}/lib/vauth/spnego_gssapi.c"
|
||||||
"${LIBRARY_DIR}/lib/vauth/spnego_sspi.c"
|
"${LIBRARY_DIR}/lib/vauth/spnego_sspi.c"
|
||||||
|
"${LIBRARY_DIR}/lib/vauth/vauth.c"
|
||||||
|
"${LIBRARY_DIR}/lib/version.c"
|
||||||
"${LIBRARY_DIR}/lib/vquic/vquic.c"
|
"${LIBRARY_DIR}/lib/vquic/vquic.c"
|
||||||
"${LIBRARY_DIR}/lib/vtls/openssl.c"
|
"${LIBRARY_DIR}/lib/vssh/libssh.c"
|
||||||
|
"${LIBRARY_DIR}/lib/vssh/libssh2.c"
|
||||||
|
"${LIBRARY_DIR}/lib/vtls/bearssl.c"
|
||||||
"${LIBRARY_DIR}/lib/vtls/gtls.c"
|
"${LIBRARY_DIR}/lib/vtls/gtls.c"
|
||||||
"${LIBRARY_DIR}/lib/vtls/vtls.c"
|
"${LIBRARY_DIR}/lib/vtls/hostcheck.c"
|
||||||
"${LIBRARY_DIR}/lib/vtls/nss.c"
|
"${LIBRARY_DIR}/lib/vtls/keylog.c"
|
||||||
"${LIBRARY_DIR}/lib/vtls/wolfssl.c"
|
"${LIBRARY_DIR}/lib/vtls/mbedtls.c"
|
||||||
|
"${LIBRARY_DIR}/lib/vtls/openssl.c"
|
||||||
"${LIBRARY_DIR}/lib/vtls/schannel.c"
|
"${LIBRARY_DIR}/lib/vtls/schannel.c"
|
||||||
"${LIBRARY_DIR}/lib/vtls/schannel_verify.c"
|
"${LIBRARY_DIR}/lib/vtls/schannel_verify.c"
|
||||||
"${LIBRARY_DIR}/lib/vtls/sectransp.c"
|
"${LIBRARY_DIR}/lib/vtls/sectransp.c"
|
||||||
"${LIBRARY_DIR}/lib/vtls/gskit.c"
|
"${LIBRARY_DIR}/lib/vtls/vtls.c"
|
||||||
"${LIBRARY_DIR}/lib/vtls/mbedtls.c"
|
"${LIBRARY_DIR}/lib/vtls/wolfssl.c"
|
||||||
"${LIBRARY_DIR}/lib/vtls/bearssl.c"
|
|
||||||
"${LIBRARY_DIR}/lib/vtls/keylog.c"
|
|
||||||
"${LIBRARY_DIR}/lib/vtls/x509asn1.c"
|
"${LIBRARY_DIR}/lib/vtls/x509asn1.c"
|
||||||
"${LIBRARY_DIR}/lib/vtls/hostcheck.c"
|
"${LIBRARY_DIR}/lib/warnless.c"
|
||||||
"${LIBRARY_DIR}/lib/vssh/libssh2.c"
|
|
||||||
"${LIBRARY_DIR}/lib/vssh/libssh.c"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
add_library (_curl ${SRCS})
|
add_library (_curl ${SRCS})
|
||||||
|
2
contrib/idxd-config
vendored
2
contrib/idxd-config
vendored
@ -1 +1 @@
|
|||||||
Subproject commit f6605c41a735e3fdfef2d2d18655a33af6490b99
|
Subproject commit a836ce0e42052a69bffbbc14239ab4097f3b77f1
|
1
contrib/incbin
vendored
Submodule
1
contrib/incbin
vendored
Submodule
@ -0,0 +1 @@
|
|||||||
|
Subproject commit 6e576cae5ab5810f25e2631f2e0b80cbe7dc8cbf
|
8
contrib/incbin-cmake/CMakeLists.txt
Normal file
8
contrib/incbin-cmake/CMakeLists.txt
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
set(LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/incbin")
|
||||||
|
add_library(_incbin INTERFACE)
|
||||||
|
target_include_directories(_incbin SYSTEM INTERFACE ${LIBRARY_DIR})
|
||||||
|
add_library(ch_contrib::incbin ALIAS _incbin)
|
||||||
|
|
||||||
|
# Warning "incbin is incompatible with bitcode. Using the library will break upload to App Store if you have bitcode enabled.
|
||||||
|
# Add `#define INCBIN_SILENCE_BITCODE_WARNING` before including this header to silence this warning."
|
||||||
|
target_compile_definitions(_incbin INTERFACE INCBIN_SILENCE_BITCODE_WARNING)
|
@ -1,6 +1,7 @@
|
|||||||
option(ENABLE_ISAL_LIBRARY "Enable ISA-L library" ${ENABLE_LIBRARIES})
|
option(ENABLE_ISAL_LIBRARY "Enable ISA-L library" ${ENABLE_LIBRARIES})
|
||||||
if (ARCH_AARCH64)
|
|
||||||
# Disable ISA-L libray on aarch64.
|
# ISA-L is only available for x86-64, so it shall be disabled for other platforms
|
||||||
|
if (NOT ARCH_AMD64)
|
||||||
set (ENABLE_ISAL_LIBRARY OFF)
|
set (ENABLE_ISAL_LIBRARY OFF)
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
|
2
contrib/krb5
vendored
2
contrib/krb5
vendored
@ -1 +1 @@
|
|||||||
Subproject commit b56ce6ba690e1f320df1a64afa34980c3e462617
|
Subproject commit 71b06c2276009ae649c7703019f3b4605f66fd3d
|
1
contrib/libarchive
vendored
Submodule
1
contrib/libarchive
vendored
Submodule
@ -0,0 +1 @@
|
|||||||
|
Subproject commit ee45796171324519f0c0bfd012018dd099296336
|
182
contrib/libarchive-cmake/CMakeLists.txt
Normal file
182
contrib/libarchive-cmake/CMakeLists.txt
Normal file
@ -0,0 +1,182 @@
|
|||||||
|
set (LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/libarchive")
|
||||||
|
|
||||||
|
set(SRCS
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_acl.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_blake2sp_ref.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_blake2s_ref.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_check_magic.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_cmdline.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_cryptor.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_digest.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_disk_acl_darwin.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_disk_acl_freebsd.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_disk_acl_linux.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_disk_acl_sunos.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_entry.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_entry_copy_bhfi.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_entry_copy_stat.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_entry_link_resolver.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_entry_sparse.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_entry_stat.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_entry_strmode.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_entry_xattr.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_getdate.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_hmac.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_match.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_options.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_pack_dev.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_pathmatch.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_ppmd7.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_ppmd8.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_random.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_rb.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_read_add_passphrase.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_read_append_filter.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_read.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_read_data_into_fd.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_read_disk_entry_from_file.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_read_disk_posix.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_read_disk_set_standard_lookup.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_read_disk_windows.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_read_extract2.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_read_extract.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_read_open_fd.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_read_open_file.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_read_open_filename.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_read_open_memory.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_read_set_format.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_read_set_options.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_read_support_filter_all.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_read_support_filter_by_code.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_read_support_filter_bzip2.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_read_support_filter_compress.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_read_support_filter_grzip.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_read_support_filter_gzip.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_read_support_filter_lrzip.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_read_support_filter_lz4.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_read_support_filter_lzop.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_read_support_filter_none.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_read_support_filter_program.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_read_support_filter_rpm.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_read_support_filter_uu.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_read_support_filter_xz.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_read_support_filter_zstd.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_read_support_format_7zip.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_read_support_format_all.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_read_support_format_ar.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_read_support_format_by_code.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_read_support_format_cab.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_read_support_format_cpio.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_read_support_format_empty.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_read_support_format_iso9660.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_read_support_format_lha.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_read_support_format_mtree.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_read_support_format_rar5.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_read_support_format_rar.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_read_support_format_raw.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_read_support_format_tar.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_read_support_format_warc.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_read_support_format_xar.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_read_support_format_zip.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_string.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_string_sprintf.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_util.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_version_details.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_virtual.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_windows.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_write_add_filter_b64encode.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_write_add_filter_by_name.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_write_add_filter_bzip2.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_write_add_filter.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_write_add_filter_compress.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_write_add_filter_grzip.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_write_add_filter_gzip.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_write_add_filter_lrzip.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_write_add_filter_lz4.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_write_add_filter_lzop.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_write_add_filter_none.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_write_add_filter_program.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_write_add_filter_uuencode.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_write_add_filter_xz.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_write_add_filter_zstd.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_write.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_write_disk_posix.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_write_disk_set_standard_lookup.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_write_disk_windows.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_write_open_fd.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_write_open_file.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_write_open_filename.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_write_open_memory.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_write_set_format_7zip.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_write_set_format_ar.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_write_set_format_by_name.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_write_set_format.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_write_set_format_cpio_binary.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_write_set_format_cpio.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_write_set_format_cpio_newc.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_write_set_format_cpio_odc.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_write_set_format_filter_by_ext.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_write_set_format_gnutar.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_write_set_format_iso9660.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_write_set_format_mtree.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_write_set_format_pax.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_write_set_format_raw.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_write_set_format_shar.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_write_set_format_ustar.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_write_set_format_v7tar.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_write_set_format_warc.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_write_set_format_xar.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_write_set_format_zip.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_write_set_options.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/archive_write_set_passphrase.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/filter_fork_posix.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/filter_fork_windows.c"
|
||||||
|
"${LIBRARY_DIR}/libarchive/xxhash.c"
|
||||||
|
)
|
||||||
|
|
||||||
|
add_library(_libarchive ${SRCS})
|
||||||
|
target_include_directories(_libarchive PUBLIC
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}
|
||||||
|
"${LIBRARY_DIR}/libarchive"
|
||||||
|
)
|
||||||
|
|
||||||
|
target_compile_definitions(_libarchive PUBLIC
|
||||||
|
HAVE_CONFIG_H
|
||||||
|
)
|
||||||
|
|
||||||
|
target_compile_options(_libarchive PRIVATE "-Wno-reserved-macro-identifier")
|
||||||
|
|
||||||
|
if (TARGET ch_contrib::xz)
|
||||||
|
target_compile_definitions(_libarchive PUBLIC HAVE_LZMA_H=1 HAVE_LIBLZMA=1)
|
||||||
|
target_link_libraries(_libarchive PRIVATE ch_contrib::xz)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if (TARGET ch_contrib::zlib)
|
||||||
|
target_compile_definitions(_libarchive PUBLIC HAVE_ZLIB_H=1)
|
||||||
|
target_link_libraries(_libarchive PRIVATE ch_contrib::zlib)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if (TARGET ch_contrib::zstd)
|
||||||
|
target_compile_definitions(_libarchive PUBLIC HAVE_ZSTD_H=1 HAVE_LIBZSTD=1)
|
||||||
|
target_link_libraries(_libarchive PRIVATE ch_contrib::zstd)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if (TARGET ch_contrib::bzip2)
|
||||||
|
target_compile_definitions(_libarchive PUBLIC HAVE_BZLIB_H=1)
|
||||||
|
target_link_libraries(_libarchive PRIVATE ch_contrib::bzip2)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if (OS_LINUX)
|
||||||
|
target_compile_definitions(
|
||||||
|
_libarchive PUBLIC
|
||||||
|
MAJOR_IN_SYSMACROS=1
|
||||||
|
HAVE_LINUX_FS_H=1
|
||||||
|
HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC=1
|
||||||
|
HAVE_LINUX_TYPES_H=1
|
||||||
|
HAVE_SYS_STATFS_H=1
|
||||||
|
HAVE_FUTIMESAT=1
|
||||||
|
HAVE_ICONV=1
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
add_library(ch_contrib::libarchive ALIAS _libarchive)
|
1391
contrib/libarchive-cmake/config.h
Normal file
1391
contrib/libarchive-cmake/config.h
Normal file
File diff suppressed because it is too large
Load Diff
@ -17,7 +17,8 @@
|
|||||||
#ifndef METROHASH_PLATFORM_H
|
#ifndef METROHASH_PLATFORM_H
|
||||||
#define METROHASH_PLATFORM_H
|
#define METROHASH_PLATFORM_H
|
||||||
|
|
||||||
#include <stdint.h>
|
#include <bit>
|
||||||
|
#include <cstdint>
|
||||||
#include <cstring>
|
#include <cstring>
|
||||||
|
|
||||||
// rotate right idiom recognized by most compilers
|
// rotate right idiom recognized by most compilers
|
||||||
@ -33,6 +34,11 @@ inline static uint64_t read_u64(const void * const ptr)
|
|||||||
// so we use memcpy() which is the most portable. clang & gcc usually translates `memcpy()` into a single `load` instruction
|
// so we use memcpy() which is the most portable. clang & gcc usually translates `memcpy()` into a single `load` instruction
|
||||||
// when hardware supports it, so using memcpy() is efficient too.
|
// when hardware supports it, so using memcpy() is efficient too.
|
||||||
memcpy(&result, ptr, sizeof(result));
|
memcpy(&result, ptr, sizeof(result));
|
||||||
|
|
||||||
|
#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
|
||||||
|
result = std::byteswap(result);
|
||||||
|
#endif
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -40,6 +46,11 @@ inline static uint64_t read_u32(const void * const ptr)
|
|||||||
{
|
{
|
||||||
uint32_t result;
|
uint32_t result;
|
||||||
memcpy(&result, ptr, sizeof(result));
|
memcpy(&result, ptr, sizeof(result));
|
||||||
|
|
||||||
|
#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
|
||||||
|
result = std::byteswap(result);
|
||||||
|
#endif
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -47,6 +58,11 @@ inline static uint64_t read_u16(const void * const ptr)
|
|||||||
{
|
{
|
||||||
uint16_t result;
|
uint16_t result;
|
||||||
memcpy(&result, ptr, sizeof(result));
|
memcpy(&result, ptr, sizeof(result));
|
||||||
|
|
||||||
|
#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
|
||||||
|
result = std::byteswap(result);
|
||||||
|
#endif
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
2
contrib/libpqxx
vendored
2
contrib/libpqxx
vendored
@ -1 +1 @@
|
|||||||
Subproject commit bdd6540fb95ff56c813691ceb5da5a3266cf235d
|
Subproject commit 791d68fd89902835133c50435e380ec7a73271b7
|
2
contrib/libunwind
vendored
2
contrib/libunwind
vendored
@ -1 +1 @@
|
|||||||
Subproject commit e48aa13f67dc722511b5af33a32ba9b7748176b5
|
Subproject commit 30cc1d3fd3655a5cfa0ab112fe320fb9fc0a8344
|
2
contrib/llvm-project
vendored
2
contrib/llvm-project
vendored
@ -1 +1 @@
|
|||||||
Subproject commit d857c707fccd50423bea1c4710dc469cf89607a9
|
Subproject commit e7b8befca85c8b847614432dba250c22d35fbae0
|
@ -1,18 +1,16 @@
|
|||||||
if (APPLE OR NOT ARCH_AMD64 OR SANITIZE STREQUAL "undefined")
|
if (APPLE OR SANITIZE STREQUAL "undefined")
|
||||||
set (ENABLE_EMBEDDED_COMPILER_DEFAULT OFF)
|
set (ENABLE_EMBEDDED_COMPILER_DEFAULT OFF)
|
||||||
else()
|
else()
|
||||||
set (ENABLE_EMBEDDED_COMPILER_DEFAULT ON)
|
set (ENABLE_EMBEDDED_COMPILER_DEFAULT ON)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
option (ENABLE_EMBEDDED_COMPILER "Enable support for 'compile_expressions' option for query execution" ${ENABLE_EMBEDDED_COMPILER_DEFAULT})
|
option (ENABLE_EMBEDDED_COMPILER "Enable support for JIT compilation during query execution" ${ENABLE_EMBEDDED_COMPILER_DEFAULT})
|
||||||
|
|
||||||
if (NOT ENABLE_EMBEDDED_COMPILER)
|
if (NOT ENABLE_EMBEDDED_COMPILER)
|
||||||
message(STATUS "Not using LLVM")
|
message(STATUS "Not using LLVM")
|
||||||
return()
|
return()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# TODO: Enable compilation on AArch64
|
|
||||||
|
|
||||||
set (LLVM_VERSION "15.0.0bundled")
|
set (LLVM_VERSION "15.0.0bundled")
|
||||||
set (LLVM_INCLUDE_DIRS
|
set (LLVM_INCLUDE_DIRS
|
||||||
"${ClickHouse_SOURCE_DIR}/contrib/llvm-project/llvm/include"
|
"${ClickHouse_SOURCE_DIR}/contrib/llvm-project/llvm/include"
|
||||||
@ -58,18 +56,30 @@ set (REQUIRED_LLVM_LIBRARIES
|
|||||||
LLVMDemangle
|
LLVMDemangle
|
||||||
)
|
)
|
||||||
|
|
||||||
# if (ARCH_AMD64)
|
if (ARCH_AMD64)
|
||||||
|
set (LLVM_TARGETS_TO_BUILD "X86" CACHE INTERNAL "")
|
||||||
list(APPEND REQUIRED_LLVM_LIBRARIES LLVMX86Info LLVMX86Desc LLVMX86CodeGen)
|
list(APPEND REQUIRED_LLVM_LIBRARIES LLVMX86Info LLVMX86Desc LLVMX86CodeGen)
|
||||||
# elseif (ARCH_AARCH64)
|
elseif (ARCH_AARCH64)
|
||||||
# list(APPEND REQUIRED_LLVM_LIBRARIES LLVMAArch64Info LLVMAArch64Desc LLVMAArch64CodeGen)
|
set (LLVM_TARGETS_TO_BUILD "AArch64" CACHE INTERNAL "")
|
||||||
# endif ()
|
list(APPEND REQUIRED_LLVM_LIBRARIES LLVMAArch64Info LLVMAArch64Desc LLVMAArch64CodeGen)
|
||||||
|
elseif (ARCH_PPC64LE)
|
||||||
|
set (LLVM_TARGETS_TO_BUILD "PowerPC" CACHE INTERNAL "")
|
||||||
|
list(APPEND REQUIRED_LLVM_LIBRARIES LLVMPowerPCInfo LLVMPowerPCDesc LLVMPowerPCCodeGen)
|
||||||
|
elseif (ARCH_S390X)
|
||||||
|
set (LLVM_TARGETS_TO_BUILD "SystemZ" CACHE INTERNAL "")
|
||||||
|
list(APPEND REQUIRED_LLVM_LIBRARIES LLVMSystemZInfo LLVMSystemZDesc LLVMSystemZCodeGen)
|
||||||
|
elseif (ARCH_RISCV64)
|
||||||
|
set (LLVM_TARGETS_TO_BUILD "RISCV" CACHE INTERNAL "")
|
||||||
|
list(APPEND REQUIRED_LLVM_LIBRARIES LLVMRISCVInfo LLVMRISCVDesc LLVMRISCVCodeGen)
|
||||||
|
endif ()
|
||||||
|
|
||||||
|
message (STATUS "LLVM TARGETS TO BUILD ${LLVM_TARGETS_TO_BUILD}")
|
||||||
|
|
||||||
set (CMAKE_INSTALL_RPATH "ON") # Do not adjust RPATH in llvm, since then it will not be able to find libcxx/libcxxabi/libunwind
|
set (CMAKE_INSTALL_RPATH "ON") # Do not adjust RPATH in llvm, since then it will not be able to find libcxx/libcxxabi/libunwind
|
||||||
set (LLVM_COMPILER_CHECKED 1 CACHE INTERNAL "") # Skip internal compiler selection
|
set (LLVM_COMPILER_CHECKED 1 CACHE INTERNAL "") # Skip internal compiler selection
|
||||||
set (LLVM_ENABLE_EH 1 CACHE INTERNAL "") # With exception handling
|
set (LLVM_ENABLE_EH 1 CACHE INTERNAL "") # With exception handling
|
||||||
set (LLVM_ENABLE_RTTI 1 CACHE INTERNAL "")
|
set (LLVM_ENABLE_RTTI 1 CACHE INTERNAL "")
|
||||||
set (LLVM_ENABLE_PIC 0 CACHE INTERNAL "")
|
set (LLVM_ENABLE_PIC 0 CACHE INTERNAL "")
|
||||||
set (LLVM_TARGETS_TO_BUILD "X86" CACHE STRING "") # for x86 + ARM: "X86;AArch64"
|
|
||||||
|
|
||||||
# Omit unnecessary stuff (just the options which are ON by default)
|
# Omit unnecessary stuff (just the options which are ON by default)
|
||||||
set(LLVM_ENABLE_BACKTRACES 0 CACHE INTERNAL "")
|
set(LLVM_ENABLE_BACKTRACES 0 CACHE INTERNAL "")
|
||||||
@ -99,15 +109,12 @@ set(LLVM_ENABLE_BINDINGS 0 CACHE INTERNAL "")
|
|||||||
set (LLVM_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/llvm-project/llvm")
|
set (LLVM_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/llvm-project/llvm")
|
||||||
set (LLVM_BINARY_DIR "${ClickHouse_BINARY_DIR}/contrib/llvm-project/llvm")
|
set (LLVM_BINARY_DIR "${ClickHouse_BINARY_DIR}/contrib/llvm-project/llvm")
|
||||||
|
|
||||||
# Since we always use toolchain files to generate hermatic builds, cmake will
|
message (STATUS "LLVM CMAKE CROSS COMPILING ${CMAKE_CROSSCOMPILING}")
|
||||||
# think it's a cross compilation, and LLVM will try to configure NATIVE LLVM
|
if (CMAKE_CROSSCOMPILING)
|
||||||
# targets with all tests enabled, which will slow down cmake configuration and
|
set (LLVM_HOST_TRIPLE "${CMAKE_C_COMPILER_TARGET}" CACHE INTERNAL "")
|
||||||
# compilation (You'll see Building native llvm-tblgen...). Let's disable the
|
message (STATUS "CROSS COMPILING SET LLVM HOST TRIPLE ${LLVM_HOST_TRIPLE}")
|
||||||
# cross compiling indicator for now.
|
endif()
|
||||||
#
|
|
||||||
# TODO We should let cmake know whether it's indeed a cross compilation in the
|
|
||||||
# first place.
|
|
||||||
set (CMAKE_CROSSCOMPILING 0)
|
|
||||||
add_subdirectory ("${LLVM_SOURCE_DIR}" "${LLVM_BINARY_DIR}")
|
add_subdirectory ("${LLVM_SOURCE_DIR}" "${LLVM_BINARY_DIR}")
|
||||||
|
|
||||||
set_directory_properties (PROPERTIES
|
set_directory_properties (PROPERTIES
|
||||||
|
2
contrib/lz4
vendored
2
contrib/lz4
vendored
@ -1 +1 @@
|
|||||||
Subproject commit e82198428c8061372d5adef1f9bfff4203f6081e
|
Subproject commit 92ebf1870b9acbefc0e7970409a181954a10ff40
|
@ -13,6 +13,11 @@ add_library (ch_contrib::lz4 ALIAS _lz4)
|
|||||||
|
|
||||||
target_compile_definitions (_lz4 PUBLIC LZ4_DISABLE_DEPRECATE_WARNINGS=1)
|
target_compile_definitions (_lz4 PUBLIC LZ4_DISABLE_DEPRECATE_WARNINGS=1)
|
||||||
target_compile_definitions (_lz4 PUBLIC LZ4_FAST_DEC_LOOP=1)
|
target_compile_definitions (_lz4 PUBLIC LZ4_FAST_DEC_LOOP=1)
|
||||||
|
|
||||||
|
if(ARCH_S390X)
|
||||||
|
target_compile_definitions(_lz4 PRIVATE LZ4_STATIC_LINKING_ONLY_ENDIANNESS_INDEPENDENT_OUTPUT)
|
||||||
|
endif()
|
||||||
|
|
||||||
if (SANITIZE STREQUAL "undefined")
|
if (SANITIZE STREQUAL "undefined")
|
||||||
target_compile_options (_lz4 PRIVATE -fno-sanitize=undefined)
|
target_compile_options (_lz4 PRIVATE -fno-sanitize=undefined)
|
||||||
endif ()
|
endif ()
|
||||||
|
@ -1,15 +0,0 @@
|
|||||||
include(${ClickHouse_SOURCE_DIR}/cmake/embed_binary.cmake)
|
|
||||||
|
|
||||||
set(LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/nlp-data")
|
|
||||||
|
|
||||||
add_library (_nlp_data INTERFACE)
|
|
||||||
|
|
||||||
clickhouse_embed_binaries(
|
|
||||||
TARGET nlp_dictionaries
|
|
||||||
RESOURCE_DIR "${LIBRARY_DIR}"
|
|
||||||
RESOURCES charset.zst tonality_ru.zst programming.zst
|
|
||||||
)
|
|
||||||
|
|
||||||
add_dependencies(_nlp_data nlp_dictionaries)
|
|
||||||
target_link_libraries(_nlp_data INTERFACE "-Wl,${WHOLE_ARCHIVE} $<TARGET_FILE:nlp_dictionaries> -Wl,${NO_WHOLE_ARCHIVE}")
|
|
||||||
add_library(ch_contrib::nlp_data ALIAS _nlp_data)
|
|
2
contrib/openldap
vendored
2
contrib/openldap
vendored
@ -1 +1 @@
|
|||||||
Subproject commit 8688afe6bc95ebcd20edf4578c536362218cb70a
|
Subproject commit 5671b80e369df2caf5f34e02924316205a43c895
|
@ -96,71 +96,82 @@ target_compile_definitions(_lber
|
|||||||
)
|
)
|
||||||
|
|
||||||
set(_ldap_srcs
|
set(_ldap_srcs
|
||||||
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/bind.c"
|
|
||||||
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/open.c"
|
|
||||||
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/result.c"
|
|
||||||
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/error.c"
|
|
||||||
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/compare.c"
|
|
||||||
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/search.c"
|
|
||||||
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/controls.c"
|
|
||||||
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/messages.c"
|
|
||||||
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/references.c"
|
|
||||||
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/extended.c"
|
|
||||||
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/cyrus.c"
|
|
||||||
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/modify.c"
|
|
||||||
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/add.c"
|
|
||||||
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/modrdn.c"
|
|
||||||
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/delete.c"
|
|
||||||
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/abandon.c"
|
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/abandon.c"
|
||||||
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/sasl.c"
|
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/add.c"
|
||||||
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/sbind.c"
|
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/addentry.c"
|
||||||
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/unbind.c"
|
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/assertion.c"
|
||||||
|
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/avl.c"
|
||||||
|
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/bind.c"
|
||||||
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/cancel.c"
|
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/cancel.c"
|
||||||
|
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/charray.c"
|
||||||
|
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/compare.c"
|
||||||
|
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/controls.c"
|
||||||
|
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/cyrus.c"
|
||||||
|
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/dds.c"
|
||||||
|
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/delete.c"
|
||||||
|
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/deref.c"
|
||||||
|
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/dnssrv.c"
|
||||||
|
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/error.c"
|
||||||
|
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/extended.c"
|
||||||
|
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/fetch.c"
|
||||||
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/filter.c"
|
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/filter.c"
|
||||||
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/free.c"
|
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/free.c"
|
||||||
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/sort.c"
|
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/getattr.c"
|
||||||
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/passwd.c"
|
|
||||||
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/whoami.c"
|
|
||||||
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/vc.c"
|
|
||||||
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/getdn.c"
|
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/getdn.c"
|
||||||
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/getentry.c"
|
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/getentry.c"
|
||||||
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/getattr.c"
|
|
||||||
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/getvalues.c"
|
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/getvalues.c"
|
||||||
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/addentry.c"
|
|
||||||
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/request.c"
|
|
||||||
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/os-ip.c"
|
|
||||||
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/url.c"
|
|
||||||
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/pagectrl.c"
|
|
||||||
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/sortctrl.c"
|
|
||||||
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/vlvctrl.c"
|
|
||||||
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/init.c"
|
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/init.c"
|
||||||
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/options.c"
|
|
||||||
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/print.c"
|
|
||||||
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/string.c"
|
|
||||||
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/util-int.c"
|
|
||||||
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/schema.c"
|
|
||||||
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/charray.c"
|
|
||||||
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/os-local.c"
|
|
||||||
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/dnssrv.c"
|
|
||||||
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/utf-8.c"
|
|
||||||
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/utf-8-conv.c"
|
|
||||||
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/tls2.c"
|
|
||||||
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/tls_o.c"
|
|
||||||
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/tls_g.c"
|
|
||||||
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/turn.c"
|
|
||||||
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/ppolicy.c"
|
|
||||||
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/dds.c"
|
|
||||||
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/txn.c"
|
|
||||||
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/ldap_sync.c"
|
|
||||||
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/stctrl.c"
|
|
||||||
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/assertion.c"
|
|
||||||
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/deref.c"
|
|
||||||
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/ldifutil.c"
|
|
||||||
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/ldif.c"
|
|
||||||
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/fetch.c"
|
|
||||||
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/lbase64.c"
|
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/lbase64.c"
|
||||||
|
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/ldap_sync.c"
|
||||||
|
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/ldif.c"
|
||||||
|
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/ldifutil.c"
|
||||||
|
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/messages.c"
|
||||||
|
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/modify.c"
|
||||||
|
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/modrdn.c"
|
||||||
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/msctrl.c"
|
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/msctrl.c"
|
||||||
|
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/open.c"
|
||||||
|
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/options.c"
|
||||||
|
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/os-ip.c"
|
||||||
|
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/os-local.c"
|
||||||
|
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/pagectrl.c"
|
||||||
|
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/passwd.c"
|
||||||
|
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/ppolicy.c"
|
||||||
|
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/print.c"
|
||||||
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/psearchctrl.c"
|
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/psearchctrl.c"
|
||||||
|
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/rdwr.c"
|
||||||
|
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/references.c"
|
||||||
|
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/request.c"
|
||||||
|
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/result.c"
|
||||||
|
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/rq.c"
|
||||||
|
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/sasl.c"
|
||||||
|
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/sbind.c"
|
||||||
|
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/schema.c"
|
||||||
|
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/search.c"
|
||||||
|
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/sort.c"
|
||||||
|
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/sortctrl.c"
|
||||||
|
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/stctrl.c"
|
||||||
|
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/string.c"
|
||||||
|
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/tavl.c"
|
||||||
|
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/thr_debug.c"
|
||||||
|
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/thr_nt.c"
|
||||||
|
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/thr_posix.c"
|
||||||
|
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/thr_pth.c"
|
||||||
|
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/thr_thr.c"
|
||||||
|
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/threads.c"
|
||||||
|
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/tls2.c"
|
||||||
|
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/tls_g.c"
|
||||||
|
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/tls_o.c"
|
||||||
|
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/tpool.c"
|
||||||
|
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/turn.c"
|
||||||
|
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/txn.c"
|
||||||
|
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/unbind.c"
|
||||||
|
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/url.c"
|
||||||
|
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/utf-8-conv.c"
|
||||||
|
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/utf-8.c"
|
||||||
|
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/util-int.c"
|
||||||
|
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/vc.c"
|
||||||
|
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/vlvctrl.c"
|
||||||
|
"${OPENLDAP_SOURCE_DIR}/libraries/libldap/whoami.c"
|
||||||
)
|
)
|
||||||
|
|
||||||
mkversion(ldap)
|
mkversion(ldap)
|
||||||
@ -185,43 +196,5 @@ target_compile_definitions(_ldap
|
|||||||
PRIVATE LDAP_LIBRARY
|
PRIVATE LDAP_LIBRARY
|
||||||
)
|
)
|
||||||
|
|
||||||
set(_ldap_r_specific_srcs
|
add_library(ch_contrib::ldap ALIAS _ldap)
|
||||||
"${OPENLDAP_SOURCE_DIR}/libraries/libldap_r/threads.c"
|
|
||||||
"${OPENLDAP_SOURCE_DIR}/libraries/libldap_r/rdwr.c"
|
|
||||||
"${OPENLDAP_SOURCE_DIR}/libraries/libldap_r/tpool.c"
|
|
||||||
"${OPENLDAP_SOURCE_DIR}/libraries/libldap_r/rq.c"
|
|
||||||
"${OPENLDAP_SOURCE_DIR}/libraries/libldap_r/thr_posix.c"
|
|
||||||
"${OPENLDAP_SOURCE_DIR}/libraries/libldap_r/thr_thr.c"
|
|
||||||
"${OPENLDAP_SOURCE_DIR}/libraries/libldap_r/thr_nt.c"
|
|
||||||
"${OPENLDAP_SOURCE_DIR}/libraries/libldap_r/thr_pth.c"
|
|
||||||
"${OPENLDAP_SOURCE_DIR}/libraries/libldap_r/thr_stub.c"
|
|
||||||
"${OPENLDAP_SOURCE_DIR}/libraries/libldap_r/thr_debug.c"
|
|
||||||
)
|
|
||||||
|
|
||||||
mkversion(ldap_r)
|
|
||||||
|
|
||||||
add_library(_ldap_r
|
|
||||||
${_ldap_r_specific_srcs}
|
|
||||||
${_ldap_srcs}
|
|
||||||
"${CMAKE_CURRENT_BINARY_DIR}/ldap_r-version.c"
|
|
||||||
)
|
|
||||||
|
|
||||||
target_link_libraries(_ldap_r
|
|
||||||
PRIVATE _lber
|
|
||||||
PRIVATE OpenSSL::Crypto OpenSSL::SSL
|
|
||||||
)
|
|
||||||
|
|
||||||
target_include_directories(_ldap_r SYSTEM
|
|
||||||
PUBLIC ${_extra_build_dir}/include
|
|
||||||
PUBLIC "${OPENLDAP_SOURCE_DIR}/include"
|
|
||||||
PRIVATE "${OPENLDAP_SOURCE_DIR}/libraries/libldap_r"
|
|
||||||
PRIVATE "${OPENLDAP_SOURCE_DIR}/libraries/libldap"
|
|
||||||
)
|
|
||||||
|
|
||||||
target_compile_definitions(_ldap_r
|
|
||||||
PRIVATE LDAP_R_COMPILE
|
|
||||||
PRIVATE LDAP_LIBRARY
|
|
||||||
)
|
|
||||||
|
|
||||||
add_library(ch_contrib::ldap ALIAS _ldap_r)
|
|
||||||
add_library(ch_contrib::lber ALIAS _lber)
|
add_library(ch_contrib::lber ALIAS _lber)
|
||||||
|
2
contrib/openssl
vendored
2
contrib/openssl
vendored
@ -1 +1 @@
|
|||||||
Subproject commit 19cc035b6c6f2283573d29c7ea7f7d675cf750ce
|
Subproject commit 245cb0291e0db99d9ccf3692fa76f440b2b054c2
|
@ -126,7 +126,7 @@ if(ENABLE_OPENSSL_DYNAMIC OR ENABLE_OPENSSL)
|
|||||||
elseif(ARCH_PPC64LE)
|
elseif(ARCH_PPC64LE)
|
||||||
macro(perl_generate_asm FILE_IN FILE_OUT)
|
macro(perl_generate_asm FILE_IN FILE_OUT)
|
||||||
add_custom_command(OUTPUT ${FILE_OUT}
|
add_custom_command(OUTPUT ${FILE_OUT}
|
||||||
COMMAND /usr/bin/env perl ${FILE_IN} "linux64" ${FILE_OUT})
|
COMMAND /usr/bin/env perl ${FILE_IN} "linux64v2" ${FILE_OUT})
|
||||||
endmacro()
|
endmacro()
|
||||||
|
|
||||||
perl_generate_asm(${OPENSSL_SOURCE_DIR}/crypto/aes/asm/aes-ppc.pl ${OPENSSL_BINARY_DIR}/crypto/aes/aes-ppc.s)
|
perl_generate_asm(${OPENSSL_SOURCE_DIR}/crypto/aes/asm/aes-ppc.pl ${OPENSSL_BINARY_DIR}/crypto/aes/aes-ppc.s)
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
/*
|
/*
|
||||||
* WARNING: do not edit!
|
* WARNING: do not edit!
|
||||||
* Generated by Makefile from ../include/openssl/cmp.h.in
|
* Generated by Makefile from include/openssl/cmp.h.in
|
||||||
*
|
*
|
||||||
* Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved.
|
* Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved.
|
||||||
* Copyright Nokia 2007-2019
|
* Copyright Nokia 2007-2019
|
||||||
* Copyright Siemens AG 2015-2019
|
* Copyright Siemens AG 2015-2019
|
||||||
*
|
*
|
||||||
@ -193,13 +193,16 @@ typedef ASN1_BIT_STRING OSSL_CMP_PKIFAILUREINFO;
|
|||||||
* -- CertReqMsg
|
* -- CertReqMsg
|
||||||
* }
|
* }
|
||||||
*/
|
*/
|
||||||
# define OSSL_CMP_PKISTATUS_accepted 0
|
# define OSSL_CMP_PKISTATUS_request -3
|
||||||
# define OSSL_CMP_PKISTATUS_grantedWithMods 1
|
# define OSSL_CMP_PKISTATUS_trans -2
|
||||||
# define OSSL_CMP_PKISTATUS_rejection 2
|
# define OSSL_CMP_PKISTATUS_unspecified -1
|
||||||
# define OSSL_CMP_PKISTATUS_waiting 3
|
# define OSSL_CMP_PKISTATUS_accepted 0
|
||||||
# define OSSL_CMP_PKISTATUS_revocationWarning 4
|
# define OSSL_CMP_PKISTATUS_grantedWithMods 1
|
||||||
|
# define OSSL_CMP_PKISTATUS_rejection 2
|
||||||
|
# define OSSL_CMP_PKISTATUS_waiting 3
|
||||||
|
# define OSSL_CMP_PKISTATUS_revocationWarning 4
|
||||||
# define OSSL_CMP_PKISTATUS_revocationNotification 5
|
# define OSSL_CMP_PKISTATUS_revocationNotification 5
|
||||||
# define OSSL_CMP_PKISTATUS_keyUpdateWarning 6
|
# define OSSL_CMP_PKISTATUS_keyUpdateWarning 6
|
||||||
|
|
||||||
typedef ASN1_INTEGER OSSL_CMP_PKISTATUS;
|
typedef ASN1_INTEGER OSSL_CMP_PKISTATUS;
|
||||||
DECLARE_ASN1_ITEM(OSSL_CMP_PKISTATUS)
|
DECLARE_ASN1_ITEM(OSSL_CMP_PKISTATUS)
|
||||||
@ -439,11 +442,12 @@ int OSSL_CMP_CTX_build_cert_chain(OSSL_CMP_CTX *ctx, X509_STORE *own_trusted,
|
|||||||
int OSSL_CMP_CTX_set1_pkey(OSSL_CMP_CTX *ctx, EVP_PKEY *pkey);
|
int OSSL_CMP_CTX_set1_pkey(OSSL_CMP_CTX *ctx, EVP_PKEY *pkey);
|
||||||
int OSSL_CMP_CTX_set1_referenceValue(OSSL_CMP_CTX *ctx,
|
int OSSL_CMP_CTX_set1_referenceValue(OSSL_CMP_CTX *ctx,
|
||||||
const unsigned char *ref, int len);
|
const unsigned char *ref, int len);
|
||||||
int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, const unsigned char *sec,
|
int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx,
|
||||||
const int len);
|
const unsigned char *sec, int len);
|
||||||
/* CMP message header and extra certificates: */
|
/* CMP message header and extra certificates: */
|
||||||
int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name);
|
int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name);
|
||||||
int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav);
|
int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav);
|
||||||
|
int OSSL_CMP_CTX_reset_geninfo_ITAVs(OSSL_CMP_CTX *ctx);
|
||||||
int OSSL_CMP_CTX_set1_extraCertsOut(OSSL_CMP_CTX *ctx,
|
int OSSL_CMP_CTX_set1_extraCertsOut(OSSL_CMP_CTX *ctx,
|
||||||
STACK_OF(X509) *extraCertsOut);
|
STACK_OF(X509) *extraCertsOut);
|
||||||
/* certificate template: */
|
/* certificate template: */
|
||||||
@ -499,6 +503,7 @@ ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr);
|
|||||||
OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg);
|
OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg);
|
||||||
int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg);
|
int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg);
|
||||||
int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg);
|
int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg);
|
||||||
|
int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg);
|
||||||
OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid);
|
OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid);
|
||||||
OSSL_CMP_MSG *OSSL_CMP_MSG_read(const char *file, OSSL_LIB_CTX *libctx,
|
OSSL_CMP_MSG *OSSL_CMP_MSG_read(const char *file, OSSL_LIB_CTX *libctx,
|
||||||
const char *propq);
|
const char *propq);
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* WARNING: do not edit!
|
* WARNING: do not edit!
|
||||||
* Generated by Makefile from ../include/openssl/opensslv.h.in
|
* Generated by Makefile from include/openssl/opensslv.h.in
|
||||||
*
|
*
|
||||||
* Copyright 1999-2020 The OpenSSL Project Authors. All Rights Reserved.
|
* Copyright 1999-2020 The OpenSSL Project Authors. All Rights Reserved.
|
||||||
*
|
*
|
||||||
@ -29,7 +29,7 @@ extern "C" {
|
|||||||
*/
|
*/
|
||||||
# define OPENSSL_VERSION_MAJOR 3
|
# define OPENSSL_VERSION_MAJOR 3
|
||||||
# define OPENSSL_VERSION_MINOR 0
|
# define OPENSSL_VERSION_MINOR 0
|
||||||
# define OPENSSL_VERSION_PATCH 7
|
# define OPENSSL_VERSION_PATCH 10
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Additional version information
|
* Additional version information
|
||||||
@ -74,21 +74,21 @@ extern "C" {
|
|||||||
* longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and
|
* longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and
|
||||||
* OPENSSL_VERSION_BUILD_METADATA_STR appended.
|
* OPENSSL_VERSION_BUILD_METADATA_STR appended.
|
||||||
*/
|
*/
|
||||||
# define OPENSSL_VERSION_STR "3.0.7"
|
# define OPENSSL_VERSION_STR "3.0.10"
|
||||||
# define OPENSSL_FULL_VERSION_STR "3.0.7"
|
# define OPENSSL_FULL_VERSION_STR "3.0.10"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* SECTION 3: ADDITIONAL METADATA
|
* SECTION 3: ADDITIONAL METADATA
|
||||||
*
|
*
|
||||||
* These strings are defined separately to allow them to be parsable.
|
* These strings are defined separately to allow them to be parsable.
|
||||||
*/
|
*/
|
||||||
# define OPENSSL_RELEASE_DATE "1 Nov 2022"
|
# define OPENSSL_RELEASE_DATE "1 Aug 2023"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* SECTION 4: BACKWARD COMPATIBILITY
|
* SECTION 4: BACKWARD COMPATIBILITY
|
||||||
*/
|
*/
|
||||||
|
|
||||||
# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.7 1 Nov 2022"
|
# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.10 1 Aug 2023"
|
||||||
|
|
||||||
/* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */
|
/* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */
|
||||||
# ifdef OPENSSL_VERSION_PRE_RELEASE
|
# ifdef OPENSSL_VERSION_PRE_RELEASE
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
/*
|
/*
|
||||||
* WARNING: do not edit!
|
* WARNING: do not edit!
|
||||||
* Generated by Makefile from ../include/openssl/x509v3.h.in
|
* Generated by Makefile from include/openssl/x509v3.h.in
|
||||||
*
|
*
|
||||||
* Copyright 1999-2021 The OpenSSL Project Authors. All Rights Reserved.
|
* Copyright 1999-2023 The OpenSSL Project Authors. All Rights Reserved.
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License 2.0 (the "License"). You may not use
|
* Licensed under the Apache License 2.0 (the "License"). You may not use
|
||||||
* this file except in compliance with the License. You can obtain a copy
|
* this file except in compliance with the License. You can obtain a copy
|
||||||
@ -177,7 +177,7 @@ typedef struct GENERAL_NAME_st {
|
|||||||
OTHERNAME *otherName; /* otherName */
|
OTHERNAME *otherName; /* otherName */
|
||||||
ASN1_IA5STRING *rfc822Name;
|
ASN1_IA5STRING *rfc822Name;
|
||||||
ASN1_IA5STRING *dNSName;
|
ASN1_IA5STRING *dNSName;
|
||||||
ASN1_TYPE *x400Address;
|
ASN1_STRING *x400Address;
|
||||||
X509_NAME *directoryName;
|
X509_NAME *directoryName;
|
||||||
EDIPARTYNAME *ediPartyName;
|
EDIPARTYNAME *ediPartyName;
|
||||||
ASN1_IA5STRING *uniformResourceIdentifier;
|
ASN1_IA5STRING *uniformResourceIdentifier;
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
/*
|
/*
|
||||||
* WARNING: do not edit!
|
* WARNING: do not edit!
|
||||||
* Generated by Makefile from ../include/openssl/cmp.h.in
|
* Generated by Makefile from include/openssl/cmp.h.in
|
||||||
*
|
*
|
||||||
* Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved.
|
* Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved.
|
||||||
* Copyright Nokia 2007-2019
|
* Copyright Nokia 2007-2019
|
||||||
* Copyright Siemens AG 2015-2019
|
* Copyright Siemens AG 2015-2019
|
||||||
*
|
*
|
||||||
@ -193,13 +193,16 @@ typedef ASN1_BIT_STRING OSSL_CMP_PKIFAILUREINFO;
|
|||||||
* -- CertReqMsg
|
* -- CertReqMsg
|
||||||
* }
|
* }
|
||||||
*/
|
*/
|
||||||
# define OSSL_CMP_PKISTATUS_accepted 0
|
# define OSSL_CMP_PKISTATUS_request -3
|
||||||
# define OSSL_CMP_PKISTATUS_grantedWithMods 1
|
# define OSSL_CMP_PKISTATUS_trans -2
|
||||||
# define OSSL_CMP_PKISTATUS_rejection 2
|
# define OSSL_CMP_PKISTATUS_unspecified -1
|
||||||
# define OSSL_CMP_PKISTATUS_waiting 3
|
# define OSSL_CMP_PKISTATUS_accepted 0
|
||||||
# define OSSL_CMP_PKISTATUS_revocationWarning 4
|
# define OSSL_CMP_PKISTATUS_grantedWithMods 1
|
||||||
|
# define OSSL_CMP_PKISTATUS_rejection 2
|
||||||
|
# define OSSL_CMP_PKISTATUS_waiting 3
|
||||||
|
# define OSSL_CMP_PKISTATUS_revocationWarning 4
|
||||||
# define OSSL_CMP_PKISTATUS_revocationNotification 5
|
# define OSSL_CMP_PKISTATUS_revocationNotification 5
|
||||||
# define OSSL_CMP_PKISTATUS_keyUpdateWarning 6
|
# define OSSL_CMP_PKISTATUS_keyUpdateWarning 6
|
||||||
|
|
||||||
typedef ASN1_INTEGER OSSL_CMP_PKISTATUS;
|
typedef ASN1_INTEGER OSSL_CMP_PKISTATUS;
|
||||||
DECLARE_ASN1_ITEM(OSSL_CMP_PKISTATUS)
|
DECLARE_ASN1_ITEM(OSSL_CMP_PKISTATUS)
|
||||||
@ -439,11 +442,12 @@ int OSSL_CMP_CTX_build_cert_chain(OSSL_CMP_CTX *ctx, X509_STORE *own_trusted,
|
|||||||
int OSSL_CMP_CTX_set1_pkey(OSSL_CMP_CTX *ctx, EVP_PKEY *pkey);
|
int OSSL_CMP_CTX_set1_pkey(OSSL_CMP_CTX *ctx, EVP_PKEY *pkey);
|
||||||
int OSSL_CMP_CTX_set1_referenceValue(OSSL_CMP_CTX *ctx,
|
int OSSL_CMP_CTX_set1_referenceValue(OSSL_CMP_CTX *ctx,
|
||||||
const unsigned char *ref, int len);
|
const unsigned char *ref, int len);
|
||||||
int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, const unsigned char *sec,
|
int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx,
|
||||||
const int len);
|
const unsigned char *sec, int len);
|
||||||
/* CMP message header and extra certificates: */
|
/* CMP message header and extra certificates: */
|
||||||
int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name);
|
int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name);
|
||||||
int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav);
|
int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav);
|
||||||
|
int OSSL_CMP_CTX_reset_geninfo_ITAVs(OSSL_CMP_CTX *ctx);
|
||||||
int OSSL_CMP_CTX_set1_extraCertsOut(OSSL_CMP_CTX *ctx,
|
int OSSL_CMP_CTX_set1_extraCertsOut(OSSL_CMP_CTX *ctx,
|
||||||
STACK_OF(X509) *extraCertsOut);
|
STACK_OF(X509) *extraCertsOut);
|
||||||
/* certificate template: */
|
/* certificate template: */
|
||||||
@ -499,6 +503,7 @@ ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr);
|
|||||||
OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg);
|
OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg);
|
||||||
int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg);
|
int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg);
|
||||||
int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg);
|
int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg);
|
||||||
|
int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg);
|
||||||
OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid);
|
OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid);
|
||||||
OSSL_CMP_MSG *OSSL_CMP_MSG_read(const char *file, OSSL_LIB_CTX *libctx,
|
OSSL_CMP_MSG *OSSL_CMP_MSG_read(const char *file, OSSL_LIB_CTX *libctx,
|
||||||
const char *propq);
|
const char *propq);
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* WARNING: do not edit!
|
* WARNING: do not edit!
|
||||||
* Generated by Makefile from ../include/openssl/opensslv.h.in
|
* Generated by Makefile from include/openssl/opensslv.h.in
|
||||||
*
|
*
|
||||||
* Copyright 1999-2020 The OpenSSL Project Authors. All Rights Reserved.
|
* Copyright 1999-2020 The OpenSSL Project Authors. All Rights Reserved.
|
||||||
*
|
*
|
||||||
@ -29,7 +29,7 @@ extern "C" {
|
|||||||
*/
|
*/
|
||||||
# define OPENSSL_VERSION_MAJOR 3
|
# define OPENSSL_VERSION_MAJOR 3
|
||||||
# define OPENSSL_VERSION_MINOR 0
|
# define OPENSSL_VERSION_MINOR 0
|
||||||
# define OPENSSL_VERSION_PATCH 7
|
# define OPENSSL_VERSION_PATCH 10
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Additional version information
|
* Additional version information
|
||||||
@ -74,21 +74,21 @@ extern "C" {
|
|||||||
* longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and
|
* longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and
|
||||||
* OPENSSL_VERSION_BUILD_METADATA_STR appended.
|
* OPENSSL_VERSION_BUILD_METADATA_STR appended.
|
||||||
*/
|
*/
|
||||||
# define OPENSSL_VERSION_STR "3.0.7"
|
# define OPENSSL_VERSION_STR "3.0.10"
|
||||||
# define OPENSSL_FULL_VERSION_STR "3.0.7"
|
# define OPENSSL_FULL_VERSION_STR "3.0.10"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* SECTION 3: ADDITIONAL METADATA
|
* SECTION 3: ADDITIONAL METADATA
|
||||||
*
|
*
|
||||||
* These strings are defined separately to allow them to be parsable.
|
* These strings are defined separately to allow them to be parsable.
|
||||||
*/
|
*/
|
||||||
# define OPENSSL_RELEASE_DATE "1 Nov 2022"
|
# define OPENSSL_RELEASE_DATE "1 Aug 2023"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* SECTION 4: BACKWARD COMPATIBILITY
|
* SECTION 4: BACKWARD COMPATIBILITY
|
||||||
*/
|
*/
|
||||||
|
|
||||||
# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.7 1 Nov 2022"
|
# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.10 1 Aug 2023"
|
||||||
|
|
||||||
/* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */
|
/* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */
|
||||||
# ifdef OPENSSL_VERSION_PRE_RELEASE
|
# ifdef OPENSSL_VERSION_PRE_RELEASE
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
/*
|
/*
|
||||||
* WARNING: do not edit!
|
* WARNING: do not edit!
|
||||||
* Generated by Makefile from ../include/openssl/x509v3.h.in
|
* Generated by Makefile from include/openssl/x509v3.h.in
|
||||||
*
|
*
|
||||||
* Copyright 1999-2021 The OpenSSL Project Authors. All Rights Reserved.
|
* Copyright 1999-2023 The OpenSSL Project Authors. All Rights Reserved.
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License 2.0 (the "License"). You may not use
|
* Licensed under the Apache License 2.0 (the "License"). You may not use
|
||||||
* this file except in compliance with the License. You can obtain a copy
|
* this file except in compliance with the License. You can obtain a copy
|
||||||
@ -177,7 +177,7 @@ typedef struct GENERAL_NAME_st {
|
|||||||
OTHERNAME *otherName; /* otherName */
|
OTHERNAME *otherName; /* otherName */
|
||||||
ASN1_IA5STRING *rfc822Name;
|
ASN1_IA5STRING *rfc822Name;
|
||||||
ASN1_IA5STRING *dNSName;
|
ASN1_IA5STRING *dNSName;
|
||||||
ASN1_TYPE *x400Address;
|
ASN1_STRING *x400Address;
|
||||||
X509_NAME *directoryName;
|
X509_NAME *directoryName;
|
||||||
EDIPARTYNAME *ediPartyName;
|
EDIPARTYNAME *ediPartyName;
|
||||||
ASN1_IA5STRING *uniformResourceIdentifier;
|
ASN1_IA5STRING *uniformResourceIdentifier;
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
/*
|
/*
|
||||||
* WARNING: do not edit!
|
* WARNING: do not edit!
|
||||||
* Generated by Makefile from ../include/openssl/cmp.h.in
|
* Generated by Makefile from include/openssl/cmp.h.in
|
||||||
*
|
*
|
||||||
* Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved.
|
* Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved.
|
||||||
* Copyright Nokia 2007-2019
|
* Copyright Nokia 2007-2019
|
||||||
* Copyright Siemens AG 2015-2019
|
* Copyright Siemens AG 2015-2019
|
||||||
*
|
*
|
||||||
@ -193,13 +193,16 @@ typedef ASN1_BIT_STRING OSSL_CMP_PKIFAILUREINFO;
|
|||||||
* -- CertReqMsg
|
* -- CertReqMsg
|
||||||
* }
|
* }
|
||||||
*/
|
*/
|
||||||
# define OSSL_CMP_PKISTATUS_accepted 0
|
# define OSSL_CMP_PKISTATUS_request -3
|
||||||
# define OSSL_CMP_PKISTATUS_grantedWithMods 1
|
# define OSSL_CMP_PKISTATUS_trans -2
|
||||||
# define OSSL_CMP_PKISTATUS_rejection 2
|
# define OSSL_CMP_PKISTATUS_unspecified -1
|
||||||
# define OSSL_CMP_PKISTATUS_waiting 3
|
# define OSSL_CMP_PKISTATUS_accepted 0
|
||||||
# define OSSL_CMP_PKISTATUS_revocationWarning 4
|
# define OSSL_CMP_PKISTATUS_grantedWithMods 1
|
||||||
|
# define OSSL_CMP_PKISTATUS_rejection 2
|
||||||
|
# define OSSL_CMP_PKISTATUS_waiting 3
|
||||||
|
# define OSSL_CMP_PKISTATUS_revocationWarning 4
|
||||||
# define OSSL_CMP_PKISTATUS_revocationNotification 5
|
# define OSSL_CMP_PKISTATUS_revocationNotification 5
|
||||||
# define OSSL_CMP_PKISTATUS_keyUpdateWarning 6
|
# define OSSL_CMP_PKISTATUS_keyUpdateWarning 6
|
||||||
|
|
||||||
typedef ASN1_INTEGER OSSL_CMP_PKISTATUS;
|
typedef ASN1_INTEGER OSSL_CMP_PKISTATUS;
|
||||||
DECLARE_ASN1_ITEM(OSSL_CMP_PKISTATUS)
|
DECLARE_ASN1_ITEM(OSSL_CMP_PKISTATUS)
|
||||||
@ -439,11 +442,12 @@ int OSSL_CMP_CTX_build_cert_chain(OSSL_CMP_CTX *ctx, X509_STORE *own_trusted,
|
|||||||
int OSSL_CMP_CTX_set1_pkey(OSSL_CMP_CTX *ctx, EVP_PKEY *pkey);
|
int OSSL_CMP_CTX_set1_pkey(OSSL_CMP_CTX *ctx, EVP_PKEY *pkey);
|
||||||
int OSSL_CMP_CTX_set1_referenceValue(OSSL_CMP_CTX *ctx,
|
int OSSL_CMP_CTX_set1_referenceValue(OSSL_CMP_CTX *ctx,
|
||||||
const unsigned char *ref, int len);
|
const unsigned char *ref, int len);
|
||||||
int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, const unsigned char *sec,
|
int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx,
|
||||||
const int len);
|
const unsigned char *sec, int len);
|
||||||
/* CMP message header and extra certificates: */
|
/* CMP message header and extra certificates: */
|
||||||
int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name);
|
int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name);
|
||||||
int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav);
|
int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav);
|
||||||
|
int OSSL_CMP_CTX_reset_geninfo_ITAVs(OSSL_CMP_CTX *ctx);
|
||||||
int OSSL_CMP_CTX_set1_extraCertsOut(OSSL_CMP_CTX *ctx,
|
int OSSL_CMP_CTX_set1_extraCertsOut(OSSL_CMP_CTX *ctx,
|
||||||
STACK_OF(X509) *extraCertsOut);
|
STACK_OF(X509) *extraCertsOut);
|
||||||
/* certificate template: */
|
/* certificate template: */
|
||||||
@ -499,6 +503,7 @@ ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr);
|
|||||||
OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg);
|
OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg);
|
||||||
int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg);
|
int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg);
|
||||||
int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg);
|
int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg);
|
||||||
|
int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg);
|
||||||
OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid);
|
OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid);
|
||||||
OSSL_CMP_MSG *OSSL_CMP_MSG_read(const char *file, OSSL_LIB_CTX *libctx,
|
OSSL_CMP_MSG *OSSL_CMP_MSG_read(const char *file, OSSL_LIB_CTX *libctx,
|
||||||
const char *propq);
|
const char *propq);
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* WARNING: do not edit!
|
* WARNING: do not edit!
|
||||||
* Generated by Makefile from ../include/openssl/opensslv.h.in
|
* Generated by Makefile from include/openssl/opensslv.h.in
|
||||||
*
|
*
|
||||||
* Copyright 1999-2020 The OpenSSL Project Authors. All Rights Reserved.
|
* Copyright 1999-2020 The OpenSSL Project Authors. All Rights Reserved.
|
||||||
*
|
*
|
||||||
@ -29,7 +29,7 @@ extern "C" {
|
|||||||
*/
|
*/
|
||||||
# define OPENSSL_VERSION_MAJOR 3
|
# define OPENSSL_VERSION_MAJOR 3
|
||||||
# define OPENSSL_VERSION_MINOR 0
|
# define OPENSSL_VERSION_MINOR 0
|
||||||
# define OPENSSL_VERSION_PATCH 7
|
# define OPENSSL_VERSION_PATCH 10
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Additional version information
|
* Additional version information
|
||||||
@ -74,21 +74,21 @@ extern "C" {
|
|||||||
* longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and
|
* longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and
|
||||||
* OPENSSL_VERSION_BUILD_METADATA_STR appended.
|
* OPENSSL_VERSION_BUILD_METADATA_STR appended.
|
||||||
*/
|
*/
|
||||||
# define OPENSSL_VERSION_STR "3.0.7"
|
# define OPENSSL_VERSION_STR "3.0.10"
|
||||||
# define OPENSSL_FULL_VERSION_STR "3.0.7"
|
# define OPENSSL_FULL_VERSION_STR "3.0.10"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* SECTION 3: ADDITIONAL METADATA
|
* SECTION 3: ADDITIONAL METADATA
|
||||||
*
|
*
|
||||||
* These strings are defined separately to allow them to be parsable.
|
* These strings are defined separately to allow them to be parsable.
|
||||||
*/
|
*/
|
||||||
# define OPENSSL_RELEASE_DATE "1 Nov 2022"
|
# define OPENSSL_RELEASE_DATE "1 Aug 2023"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* SECTION 4: BACKWARD COMPATIBILITY
|
* SECTION 4: BACKWARD COMPATIBILITY
|
||||||
*/
|
*/
|
||||||
|
|
||||||
# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.7 1 Nov 2022"
|
# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.10 1 Aug 2023"
|
||||||
|
|
||||||
/* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */
|
/* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */
|
||||||
# ifdef OPENSSL_VERSION_PRE_RELEASE
|
# ifdef OPENSSL_VERSION_PRE_RELEASE
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
/*
|
/*
|
||||||
* WARNING: do not edit!
|
* WARNING: do not edit!
|
||||||
* Generated by Makefile from ../include/openssl/x509v3.h.in
|
* Generated by Makefile from include/openssl/x509v3.h.in
|
||||||
*
|
*
|
||||||
* Copyright 1999-2021 The OpenSSL Project Authors. All Rights Reserved.
|
* Copyright 1999-2023 The OpenSSL Project Authors. All Rights Reserved.
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License 2.0 (the "License"). You may not use
|
* Licensed under the Apache License 2.0 (the "License"). You may not use
|
||||||
* this file except in compliance with the License. You can obtain a copy
|
* this file except in compliance with the License. You can obtain a copy
|
||||||
@ -177,7 +177,7 @@ typedef struct GENERAL_NAME_st {
|
|||||||
OTHERNAME *otherName; /* otherName */
|
OTHERNAME *otherName; /* otherName */
|
||||||
ASN1_IA5STRING *rfc822Name;
|
ASN1_IA5STRING *rfc822Name;
|
||||||
ASN1_IA5STRING *dNSName;
|
ASN1_IA5STRING *dNSName;
|
||||||
ASN1_TYPE *x400Address;
|
ASN1_STRING *x400Address;
|
||||||
X509_NAME *directoryName;
|
X509_NAME *directoryName;
|
||||||
EDIPARTYNAME *ediPartyName;
|
EDIPARTYNAME *ediPartyName;
|
||||||
ASN1_IA5STRING *uniformResourceIdentifier;
|
ASN1_IA5STRING *uniformResourceIdentifier;
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
/*
|
/*
|
||||||
* WARNING: do not edit!
|
* WARNING: do not edit!
|
||||||
* Generated by Makefile from ../include/openssl/cmp.h.in
|
* Generated by Makefile from include/openssl/cmp.h.in
|
||||||
*
|
*
|
||||||
* Copyright 2007-2021 The OpenSSL Project Authors. All Rights Reserved.
|
* Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved.
|
||||||
* Copyright Nokia 2007-2019
|
* Copyright Nokia 2007-2019
|
||||||
* Copyright Siemens AG 2015-2019
|
* Copyright Siemens AG 2015-2019
|
||||||
*
|
*
|
||||||
@ -193,13 +193,16 @@ typedef ASN1_BIT_STRING OSSL_CMP_PKIFAILUREINFO;
|
|||||||
* -- CertReqMsg
|
* -- CertReqMsg
|
||||||
* }
|
* }
|
||||||
*/
|
*/
|
||||||
# define OSSL_CMP_PKISTATUS_accepted 0
|
# define OSSL_CMP_PKISTATUS_request -3
|
||||||
# define OSSL_CMP_PKISTATUS_grantedWithMods 1
|
# define OSSL_CMP_PKISTATUS_trans -2
|
||||||
# define OSSL_CMP_PKISTATUS_rejection 2
|
# define OSSL_CMP_PKISTATUS_unspecified -1
|
||||||
# define OSSL_CMP_PKISTATUS_waiting 3
|
# define OSSL_CMP_PKISTATUS_accepted 0
|
||||||
# define OSSL_CMP_PKISTATUS_revocationWarning 4
|
# define OSSL_CMP_PKISTATUS_grantedWithMods 1
|
||||||
|
# define OSSL_CMP_PKISTATUS_rejection 2
|
||||||
|
# define OSSL_CMP_PKISTATUS_waiting 3
|
||||||
|
# define OSSL_CMP_PKISTATUS_revocationWarning 4
|
||||||
# define OSSL_CMP_PKISTATUS_revocationNotification 5
|
# define OSSL_CMP_PKISTATUS_revocationNotification 5
|
||||||
# define OSSL_CMP_PKISTATUS_keyUpdateWarning 6
|
# define OSSL_CMP_PKISTATUS_keyUpdateWarning 6
|
||||||
|
|
||||||
typedef ASN1_INTEGER OSSL_CMP_PKISTATUS;
|
typedef ASN1_INTEGER OSSL_CMP_PKISTATUS;
|
||||||
DECLARE_ASN1_ITEM(OSSL_CMP_PKISTATUS)
|
DECLARE_ASN1_ITEM(OSSL_CMP_PKISTATUS)
|
||||||
@ -439,11 +442,12 @@ int OSSL_CMP_CTX_build_cert_chain(OSSL_CMP_CTX *ctx, X509_STORE *own_trusted,
|
|||||||
int OSSL_CMP_CTX_set1_pkey(OSSL_CMP_CTX *ctx, EVP_PKEY *pkey);
|
int OSSL_CMP_CTX_set1_pkey(OSSL_CMP_CTX *ctx, EVP_PKEY *pkey);
|
||||||
int OSSL_CMP_CTX_set1_referenceValue(OSSL_CMP_CTX *ctx,
|
int OSSL_CMP_CTX_set1_referenceValue(OSSL_CMP_CTX *ctx,
|
||||||
const unsigned char *ref, int len);
|
const unsigned char *ref, int len);
|
||||||
int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx, const unsigned char *sec,
|
int OSSL_CMP_CTX_set1_secretValue(OSSL_CMP_CTX *ctx,
|
||||||
const int len);
|
const unsigned char *sec, int len);
|
||||||
/* CMP message header and extra certificates: */
|
/* CMP message header and extra certificates: */
|
||||||
int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name);
|
int OSSL_CMP_CTX_set1_recipient(OSSL_CMP_CTX *ctx, const X509_NAME *name);
|
||||||
int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav);
|
int OSSL_CMP_CTX_push0_geninfo_ITAV(OSSL_CMP_CTX *ctx, OSSL_CMP_ITAV *itav);
|
||||||
|
int OSSL_CMP_CTX_reset_geninfo_ITAVs(OSSL_CMP_CTX *ctx);
|
||||||
int OSSL_CMP_CTX_set1_extraCertsOut(OSSL_CMP_CTX *ctx,
|
int OSSL_CMP_CTX_set1_extraCertsOut(OSSL_CMP_CTX *ctx,
|
||||||
STACK_OF(X509) *extraCertsOut);
|
STACK_OF(X509) *extraCertsOut);
|
||||||
/* certificate template: */
|
/* certificate template: */
|
||||||
@ -499,6 +503,7 @@ ASN1_OCTET_STRING *OSSL_CMP_HDR_get0_recipNonce(const OSSL_CMP_PKIHEADER *hdr);
|
|||||||
OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg);
|
OSSL_CMP_PKIHEADER *OSSL_CMP_MSG_get0_header(const OSSL_CMP_MSG *msg);
|
||||||
int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg);
|
int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg);
|
||||||
int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg);
|
int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg);
|
||||||
|
int OSSL_CMP_MSG_update_recipNonce(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg);
|
||||||
OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid);
|
OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int rid);
|
||||||
OSSL_CMP_MSG *OSSL_CMP_MSG_read(const char *file, OSSL_LIB_CTX *libctx,
|
OSSL_CMP_MSG *OSSL_CMP_MSG_read(const char *file, OSSL_LIB_CTX *libctx,
|
||||||
const char *propq);
|
const char *propq);
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* WARNING: do not edit!
|
* WARNING: do not edit!
|
||||||
* Generated by Makefile from ../include/openssl/opensslv.h.in
|
* Generated by Makefile from include/openssl/opensslv.h.in
|
||||||
*
|
*
|
||||||
* Copyright 1999-2020 The OpenSSL Project Authors. All Rights Reserved.
|
* Copyright 1999-2020 The OpenSSL Project Authors. All Rights Reserved.
|
||||||
*
|
*
|
||||||
@ -29,7 +29,7 @@ extern "C" {
|
|||||||
*/
|
*/
|
||||||
# define OPENSSL_VERSION_MAJOR 3
|
# define OPENSSL_VERSION_MAJOR 3
|
||||||
# define OPENSSL_VERSION_MINOR 0
|
# define OPENSSL_VERSION_MINOR 0
|
||||||
# define OPENSSL_VERSION_PATCH 7
|
# define OPENSSL_VERSION_PATCH 10
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Additional version information
|
* Additional version information
|
||||||
@ -74,21 +74,21 @@ extern "C" {
|
|||||||
* longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and
|
* longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and
|
||||||
* OPENSSL_VERSION_BUILD_METADATA_STR appended.
|
* OPENSSL_VERSION_BUILD_METADATA_STR appended.
|
||||||
*/
|
*/
|
||||||
# define OPENSSL_VERSION_STR "3.0.7"
|
# define OPENSSL_VERSION_STR "3.0.10"
|
||||||
# define OPENSSL_FULL_VERSION_STR "3.0.7"
|
# define OPENSSL_FULL_VERSION_STR "3.0.10"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* SECTION 3: ADDITIONAL METADATA
|
* SECTION 3: ADDITIONAL METADATA
|
||||||
*
|
*
|
||||||
* These strings are defined separately to allow them to be parsable.
|
* These strings are defined separately to allow them to be parsable.
|
||||||
*/
|
*/
|
||||||
# define OPENSSL_RELEASE_DATE "1 Nov 2022"
|
# define OPENSSL_RELEASE_DATE "1 Aug 2023"
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* SECTION 4: BACKWARD COMPATIBILITY
|
* SECTION 4: BACKWARD COMPATIBILITY
|
||||||
*/
|
*/
|
||||||
|
|
||||||
# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.7 1 Nov 2022"
|
# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.10 1 Aug 2023"
|
||||||
|
|
||||||
/* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */
|
/* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */
|
||||||
# ifdef OPENSSL_VERSION_PRE_RELEASE
|
# ifdef OPENSSL_VERSION_PRE_RELEASE
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
/*
|
/*
|
||||||
* WARNING: do not edit!
|
* WARNING: do not edit!
|
||||||
* Generated by Makefile from ../include/openssl/x509v3.h.in
|
* Generated by Makefile from include/openssl/x509v3.h.in
|
||||||
*
|
*
|
||||||
* Copyright 1999-2021 The OpenSSL Project Authors. All Rights Reserved.
|
* Copyright 1999-2023 The OpenSSL Project Authors. All Rights Reserved.
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License 2.0 (the "License"). You may not use
|
* Licensed under the Apache License 2.0 (the "License"). You may not use
|
||||||
* this file except in compliance with the License. You can obtain a copy
|
* this file except in compliance with the License. You can obtain a copy
|
||||||
@ -177,7 +177,7 @@ typedef struct GENERAL_NAME_st {
|
|||||||
OTHERNAME *otherName; /* otherName */
|
OTHERNAME *otherName; /* otherName */
|
||||||
ASN1_IA5STRING *rfc822Name;
|
ASN1_IA5STRING *rfc822Name;
|
||||||
ASN1_IA5STRING *dNSName;
|
ASN1_IA5STRING *dNSName;
|
||||||
ASN1_TYPE *x400Address;
|
ASN1_STRING *x400Address;
|
||||||
X509_NAME *directoryName;
|
X509_NAME *directoryName;
|
||||||
EDIPARTYNAME *ediPartyName;
|
EDIPARTYNAME *ediPartyName;
|
||||||
ASN1_IA5STRING *uniformResourceIdentifier;
|
ASN1_IA5STRING *uniformResourceIdentifier;
|
||||||
|
2
contrib/orc
vendored
2
contrib/orc
vendored
@ -1 +1 @@
|
|||||||
Subproject commit 568d1d60c250af1890f226c182bc15bd8cc94cf1
|
Subproject commit a20d1d9d7ad4a4be7b7ba97588e16ca8b9abb2b6
|
2
contrib/qpl
vendored
2
contrib/qpl
vendored
@ -1 +1 @@
|
|||||||
Subproject commit 3f8f5cea27739f5261e8fd577dc233ffe88bf679
|
Subproject commit faaf19350459c076e66bb5df11743c3fade59b73
|
2
contrib/re2
vendored
2
contrib/re2
vendored
@ -1 +1 @@
|
|||||||
Subproject commit 03da4fc0857c285e3a26782f6bc8931c4c950df4
|
Subproject commit a807e8a3aac2cc33c77b7071efea54fcabe38e0c
|
@ -32,7 +32,6 @@ set(RE2_SOURCES
|
|||||||
${SRC_DIR}/re2/tostring.cc
|
${SRC_DIR}/re2/tostring.cc
|
||||||
${SRC_DIR}/re2/unicode_casefold.cc
|
${SRC_DIR}/re2/unicode_casefold.cc
|
||||||
${SRC_DIR}/re2/unicode_groups.cc
|
${SRC_DIR}/re2/unicode_groups.cc
|
||||||
${SRC_DIR}/util/pcre.cc
|
|
||||||
${SRC_DIR}/util/rune.cc
|
${SRC_DIR}/util/rune.cc
|
||||||
${SRC_DIR}/util/strutil.cc
|
${SRC_DIR}/util/strutil.cc
|
||||||
)
|
)
|
||||||
|
1
contrib/robin-map
vendored
Submodule
1
contrib/robin-map
vendored
Submodule
@ -0,0 +1 @@
|
|||||||
|
Subproject commit 851a59e0e3063ee0e23089062090a73fd3de482d
|
1
contrib/robin-map-cmake/CMakeLists.txt
Normal file
1
contrib/robin-map-cmake/CMakeLists.txt
Normal file
@ -0,0 +1 @@
|
|||||||
|
# See contrib/usearch-cmake/CMakeLists.txt
|
2
contrib/snappy
vendored
2
contrib/snappy
vendored
@ -1 +1 @@
|
|||||||
Subproject commit fb057edfed820212076239fd32cb2ff23e9016bf
|
Subproject commit 6ebb5b1ab8801ea3fde103c5c29f5ab86df5fe7a
|
@ -20,6 +20,7 @@ echo '/boost/context/*' >> $FILES_TO_CHECKOUT
|
|||||||
echo '/boost/convert/*' >> $FILES_TO_CHECKOUT
|
echo '/boost/convert/*' >> $FILES_TO_CHECKOUT
|
||||||
echo '/boost/coroutine/*' >> $FILES_TO_CHECKOUT
|
echo '/boost/coroutine/*' >> $FILES_TO_CHECKOUT
|
||||||
echo '/boost/core/*' >> $FILES_TO_CHECKOUT
|
echo '/boost/core/*' >> $FILES_TO_CHECKOUT
|
||||||
|
echo '/boost/describe/*' >> $FILES_TO_CHECKOUT
|
||||||
echo '/boost/detail/*' >> $FILES_TO_CHECKOUT
|
echo '/boost/detail/*' >> $FILES_TO_CHECKOUT
|
||||||
echo '/boost/dynamic_bitset/*' >> $FILES_TO_CHECKOUT
|
echo '/boost/dynamic_bitset/*' >> $FILES_TO_CHECKOUT
|
||||||
echo '/boost/exception/*' >> $FILES_TO_CHECKOUT
|
echo '/boost/exception/*' >> $FILES_TO_CHECKOUT
|
||||||
@ -82,4 +83,4 @@ echo '/libs/*' >> $FILES_TO_CHECKOUT
|
|||||||
|
|
||||||
git config core.sparsecheckout true
|
git config core.sparsecheckout true
|
||||||
git checkout $1
|
git checkout $1
|
||||||
git read-tree -mu HEAD
|
git read-tree -mu HEAD
|
||||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user