Skip to content

Commit 513b7f6

Browse files
yokoflyyokofly
authored
Bugfix/issue 914 clang 19 (#916)
1 parent 2e2b937 commit 513b7f6

File tree

163 files changed

+49141
-44220
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

163 files changed

+49141
-44220
lines changed

‎.github/workflows/manual_trigger_build.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,11 @@ jobs:
7070
docker run --name static-server -p 8080:80 -v $GITHUB_WORKSPACE/output:/usr/share/nginx/html:ro -d nginx
7171
cd $GITHUB_WORKSPACE/docker/server
7272
73+
# prepare files to be copied to the image
74+
mkdir -p resources/protos/google/protobuf
75+
cp -r $GITHUB_WORKSPACE/contrib/google-protobuf/src/google/protobuf/*.proto ./resources/protos/google/protobuf/
76+
rm -rf resources/protos/google/protobuf/unittest_*
77+
7378
# build docker image
7479
docker build . --network host --build-arg single_binary_location_url=http://localhost:8080/proton -t ghcr.io/timeplus-io/proton:$TAG
7580
@@ -107,6 +112,11 @@ jobs:
107112
docker run --name static-server -p 8080:80 -v $GITHUB_WORKSPACE/output:/usr/share/nginx/html:ro -d nginx
108113
cd $GITHUB_WORKSPACE/docker/server
109114
115+
# prepare files to be copied to the image
116+
mkdir -p resources/protos/google/protobuf
117+
cp -r $GITHUB_WORKSPACE/contrib/google-protobuf/src/google/protobuf/*.proto ./resources/protos/google/protobuf/
118+
rm -rf resources/protos/google/protobuf/unittest_*
119+
110120
# build docker image
111121
docker build . --network host --build-arg single_binary_location_url=http://localhost:8080/proton -t ghcr.io/timeplus-io/proton:$TAG
112122

‎.github/workflows/manual_trigger_delete_image.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ jobs:
1515
packages: write
1616
contents: read
1717
steps:
18-
- uses: actions/checkout@v4
18+
- uses: actions/checkout@v4.1.7
1919
- name: Generate Python ENV
20-
uses: actions/setup-python@v4
20+
uses: actions/setup-python@v5.4.0
2121
with:
2222
python-version: '3.10'
2323
- name: pip install requests

‎.github/workflows/manual_trigger_mark_stable.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
env:
3131
TAG: ${{ github.event.inputs.tag }}
3232
- name: Add tag to image
33-
uses: shrink/actions-docker-registry-tag@v3
33+
uses: shrink/actions-docker-registry-tag@v4.0.0
3434
with:
3535
registry: ghcr.io
3636
repository: ${{ github.repository }}

‎.github/workflows/nightly_test.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,11 @@ jobs:
5555
docker run --name static-server -p 8080:80 -v $GITHUB_WORKSPACE/output:/usr/share/nginx/html:ro -d nginx
5656
cd $GITHUB_WORKSPACE/docker/server
5757
58+
# prepare files to be copied to the image
59+
mkdir -p resources/protos/google/protobuf
60+
cp -r $GITHUB_WORKSPACE/contrib/google-protobuf/src/google/protobuf/*.proto ./resources/protos/google/protobuf/
61+
rm -rf resources/protos/google/protobuf/unittest_*
62+
5863
docker build . --network host --build-arg single_binary_location_url=http://localhost:8080/proton -t ghcr.io/timeplus-io/proton:testing-$SANITIZER-$ARCH-$GITHUB_SHA
5964
docker push ghcr.io/timeplus-io/proton:testing-$SANITIZER-$ARCH-$GITHUB_SHA
6065
steps:
@@ -193,6 +198,11 @@ jobs:
193198
docker run --name static-server -p 8080:80 -v $GITHUB_WORKSPACE/output:/usr/share/nginx/html:ro -d nginx
194199
cd $GITHUB_WORKSPACE/docker/server
195200
201+
# prepare files to be copied to the image
202+
mkdir -p resources/protos/google/protobuf
203+
cp -r $GITHUB_WORKSPACE/contrib/google-protobuf/src/google/protobuf/*.proto ./resources/protos/google/protobuf/
204+
rm -rf resources/protos/google/protobuf/unittest_*
205+
196206
docker build . --network host --build-arg single_binary_location_url=http://localhost:8080/proton -t ghcr.io/timeplus-io/proton:testing-$ARCH-$GITHUB_SHA
197207
docker push ghcr.io/timeplus-io/proton:testing-$ARCH-$GITHUB_SHA
198208
steps:
@@ -314,6 +324,11 @@ jobs:
314324
docker run --name static-server -p 8080:80 -v $GITHUB_WORKSPACE/output:/usr/share/nginx/html:ro -d nginx
315325
cd $GITHUB_WORKSPACE/docker/server
316326
327+
# prepare files to be copied to the image
328+
mkdir -p resources/protos/google/protobuf
329+
cp -r $GITHUB_WORKSPACE/contrib/google-protobuf/src/google/protobuf/*.proto ./resources/protos/google/protobuf/
330+
rm -rf resources/protos/google/protobuf/unittest_*
331+
317332
docker build . --network host --build-arg single_binary_location_url=http://localhost:8080/proton -t ghcr.io/timeplus-io/proton:testing-$SANITIZER-$ARCH-$GITHUB_SHA
318333
docker push ghcr.io/timeplus-io/proton:testing-$SANITIZER-$ARCH-$GITHUB_SHA
319334
steps:

‎.github/workflows/proton_ci.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ on: # yamllint disable-line rule:truthy
1717
- 'utils/check-style/aspell-ignore/**'
1818
- 'examples/**'
1919

20+
concurrency:
21+
group: ${{ github.workflow }}-${{ github.ref }}
22+
cancel-in-progress: true
23+
2024
jobs:
2125
verify:
2226
name: Labels check
@@ -27,7 +31,7 @@ jobs:
2731
GH_PERSONAL_ACCESS_TOKEN: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
2832
steps:
2933
- name: Checkout Repo
30-
uses: actions/checkout@v2
34+
uses: actions/checkout@v4.2.2
3135
with:
3236
token: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
3337
submodules: false
@@ -81,6 +85,11 @@ jobs:
8185
docker run --name static-server -p 8080:80 -v $GITHUB_WORKSPACE/output:/usr/share/nginx/html:ro -d nginx
8286
cd $GITHUB_WORKSPACE/docker/server
8387
88+
# prepare files to be copied to the image
89+
mkdir -p resources/protos/google/protobuf
90+
cp -r $GITHUB_WORKSPACE/contrib/google-protobuf/src/google/protobuf/*.proto ./resources/protos/google/protobuf/
91+
rm -rf resources/protos/google/protobuf/unittest_*
92+
8493
# build docker image
8594
docker build . --network host --build-arg single_binary_location_url=http://localhost:8080/proton -t ghcr.io/timeplus-io/proton:testing-$SANITIZER-$ARCH-$GITHUB_SHA
8695

‎.github/workflows/release_build.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,11 @@ jobs:
4848
docker run --name static-server -p 8080:80 -v $GITHUB_WORKSPACE/output:/usr/share/nginx/html:ro -d nginx
4949
cd $GITHUB_WORKSPACE/docker/server
5050
51+
# prepare files to be copied to the image
52+
mkdir -p resources/protos/google/protobuf
53+
cp -r $GITHUB_WORKSPACE/contrib/google-protobuf/src/google/protobuf/*.proto ./resources/protos/google/protobuf/
54+
rm -rf resources/protos/google/protobuf/unittest_*
55+
5156
# build docker image
5257
docker build . --network host --build-arg single_binary_location_url=http://localhost:8080/proton -t ghcr.io/timeplus-io/proton:$GITHUB_SHA-amd64
5358
@@ -105,6 +110,11 @@ jobs:
105110
docker run --name static-server -p 8080:80 -v $GITHUB_WORKSPACE/output:/usr/share/nginx/html:ro -d nginx
106111
cd $GITHUB_WORKSPACE/docker/server
107112
113+
# prepare files to be copied to the image
114+
mkdir -p resources/protos/google/protobuf
115+
cp -r $GITHUB_WORKSPACE/contrib/google-protobuf/src/google/protobuf/*.proto ./resources/protos/google/protobuf/
116+
rm -rf resources/protos/google/protobuf/unittest_*
117+
108118
# build docker image
109119
docker build . --network host --build-arg single_binary_location_url=http://localhost:8080/proton -t ghcr.io/timeplus-io/proton:$GITHUB_SHA-arm64v8
110120

‎.github/workflows/run_command.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ jobs:
9393
ec2-instance-id: ${{ steps.start-ec2-runner.outputs.ec2-instance-id }}
9494
steps:
9595
- name: Configure AWS credentials
96-
uses: aws-actions/configure-aws-credentials@v1
96+
uses: aws-actions/configure-aws-credentials@v4.1.0
9797
with:
9898
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
9999
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
@@ -131,24 +131,24 @@ jobs:
131131
GH_PERSONAL_ACCESS_TOKEN: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
132132
steps:
133133
- name: Configure AWS credentials from Test account
134-
uses: aws-actions/configure-aws-credentials@v1
134+
uses: aws-actions/configure-aws-credentials@v4.1.0
135135
with:
136136
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
137137
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
138138
aws-region: ${{ secrets.AWS_REGION }}
139139
- name: Login to ghcr.io
140-
uses: docker/login-action@v2
140+
uses: docker/login-action@v3.3.0
141141
with:
142142
registry: ghcr.io
143143
username: proton_robot
144144
password: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
145145
- name: Checkout Repo
146-
uses: actions/checkout@v2
146+
uses: actions/checkout@v4.2.2
147147
with:
148148
token: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
149149
submodules: ${{ inputs.submodules }}
150150
- name: Checkout quark
151-
uses: actions/checkout@v3
151+
uses: actions/checkout@v4.2.2
152152
with:
153153
repository: timeplus-io/quark
154154
path: quark
@@ -162,7 +162,7 @@ jobs:
162162
${{ inputs.command }}
163163
- name: Release binary
164164
if: ${{ inputs.upload_files != '' }}
165-
uses: softprops/action-gh-release@v1
165+
uses: softprops/action-gh-release@v2.2.1
166166
with:
167167
files: ${{ inputs.upload_files }}
168168
token: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
@@ -177,7 +177,7 @@ jobs:
177177
if: ${{ always() }} # required to stop the runner even if the error happened in the previous jobs
178178
steps:
179179
- name: Configure AWS credentials
180-
uses: aws-actions/configure-aws-credentials@v1
180+
uses: aws-actions/configure-aws-credentials@v4.1.0
181181
with:
182182
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
183183
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

‎.gitmodules

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,6 @@
2929
[submodule "contrib/jemalloc"]
3030
path = contrib/jemalloc
3131
url = https://github.com/jemalloc/jemalloc.git
32-
[submodule "contrib/protobuf"]
33-
path = contrib/protobuf
34-
url = https://github.com/ClickHouse-Extras/protobuf.git
35-
branch = v3.13.0.1
3632
[submodule "contrib/boost"]
3733
path = contrib/boost
3834
url = https://github.com/ClickHouse-Extras/boost.git
@@ -79,13 +75,13 @@
7975
[submodule "contrib/aws"]
8076
path = contrib/aws
8177
url = https://github.com/ClickHouse-Extras/aws-sdk-cpp.git
82-
[submodule "aws-c-event-stream"]
78+
[submodule "contrib/aws-c-event-stream"]
8379
path = contrib/aws-c-event-stream
8480
url = https://github.com/awslabs/aws-c-event-stream.git
85-
[submodule "aws-c-common"]
81+
[submodule "contrib/aws-c-common"]
8682
path = contrib/aws-c-common
8783
url = https://github.com/ClickHouse/aws-c-common.git
88-
[submodule "aws-checksums"]
84+
[submodule "contrib/aws-checksums"]
8985
path = contrib/aws-checksums
9086
url = https://github.com/awslabs/aws-checksums.git
9187
[submodule "contrib/curl"]
@@ -142,10 +138,9 @@
142138
[submodule "contrib/xz"]
143139
path = contrib/xz
144140
url = https://github.com/xz-mirror/xz
145-
[submodule "contrib/abseil-cpp"]
141+
[submodule "contrib/abseil"]
146142
path = contrib/abseil-cpp
147-
url = https://github.com/abseil/abseil-cpp.git
148-
branch = lts_2021_11_02
143+
url = https://github.com/ClickHouse/abseil-cpp.git
149144
[submodule "contrib/dragonbox"]
150145
path = contrib/dragonbox
151146
url = https://github.com/ClickHouse-Extras/dragonbox.git
@@ -280,9 +275,15 @@
280275
[submodule "contrib/google-benchmark"]
281276
path = contrib/google-benchmark
282277
url = https://github.com/google/benchmark.git
278+
[submodule "contrib/libdivide"]
279+
path = contrib/libdivide
280+
url = https://github.com/ridiculousfish/libdivide.git
283281
[submodule "contrib/c-ares"]
284282
path = contrib/c-ares
285283
url = https://github.com/c-ares/c-ares.git
286284
[submodule "contrib/pulsar-cmake/pulsar-client-cpp"]
287285
path = contrib/pulsar-cmake/pulsar-client-cpp
288286
url = https://github.com/apache/pulsar-client-cpp.git
287+
[submodule "contrib/google-protobuf"]
288+
path = contrib/google-protobuf
289+
url = https://github.com/ClickHouse/google-protobuf

‎PreLoad.cmake

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,14 @@ if (NOT "$ENV{CFLAGS}" STREQUAL ""
4848
endif()
4949

5050
# Default toolchain - this is needed to avoid dependency on OS files.
51-
execute_process(COMMAND uname -s OUTPUT_VARIABLE OS)
52-
execute_process(COMMAND uname -m OUTPUT_VARIABLE ARCH)
51+
execute_process(COMMAND uname -s
52+
OUTPUT_VARIABLE OS
53+
COMMAND_ERROR_IS_FATAL ANY
54+
)
55+
execute_process(COMMAND uname -m
56+
OUTPUT_VARIABLE ARCH
57+
COMMAND_ERROR_IS_FATAL ANY
58+
)
5359

5460
# By default, prefer clang on Linux
5561
# But note, that you still may change the compiler with -DCMAKE_C_COMPILER/-DCMAKE_CXX_COMPILER.

‎base/poco/JSON/src/pdjson.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -314,13 +314,13 @@ static int read_unicode(json_stream *json)
314314

315315
if (l < 0xdc00 || l > 0xdfff) {
316316
json_error(json, "invalid surrogate pair continuation \\u%04lx out "
317-
"of range (dc00-dfff)", l);
317+
"of range (dc00-dfff)", (unsigned long)l);
318318
return -1;
319319
}
320320

321321
cp = ((h - 0xd800) * 0x400) + ((l - 0xdc00) + 0x10000);
322322
} else if (cp >= 0xdc00 && cp <= 0xdfff) {
323-
json_error(json, "dangling surrogate \\u%04lx", cp);
323+
json_error(json, "dangling surrogate \\u%04lx", (unsigned long)cp);
324324
return -1;
325325
}
326326

0 commit comments

Comments
 (0)