Skip to content

Commit 5382442

Browse files
ksseniikssenii
committed
Merge remote-tracking branch 'upstream/master' into allowed-caches-dir-for-dynamic-disks
2 parents 164b4f0 + a1522e2 commit 5382442

File tree

410 files changed

+6032
-2815
lines changed

Some content is hidden

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

410 files changed

+6032
-2815
lines changed

‎contrib/boost‎

Submodule boost updated 57683 files

‎contrib/boost-cmake/CMakeLists.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -172,9 +172,9 @@ endif()
172172
# coroutine
173173

174174
set (SRCS_COROUTINE
175-
"${LIBRARY_DIR}/libs/coroutine/detail/coroutine_context.cpp"
176-
"${LIBRARY_DIR}/libs/coroutine/exceptions.cpp"
177-
"${LIBRARY_DIR}/libs/coroutine/posix/stack_traits.cpp"
175+
"${LIBRARY_DIR}/libs/coroutine/src/detail/coroutine_context.cpp"
176+
"${LIBRARY_DIR}/libs/coroutine/src/exceptions.cpp"
177+
"${LIBRARY_DIR}/libs/coroutine/src/posix/stack_traits.cpp"
178178
)
179179
add_library (_boost_coroutine ${SRCS_COROUTINE})
180180
add_library (boost::coroutine ALIAS _boost_coroutine)

‎contrib/cityhash102/include/city.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ struct uint128
7373

7474
uint128() = default;
7575
uint128(uint64 low64_, uint64 high64_) : low64(low64_), high64(high64_) {}
76-
friend bool operator ==(const uint128 & x, const uint128 & y) { return (x.low64 == y.low64) && (x.high64 == y.high64); }
77-
friend bool operator !=(const uint128 & x, const uint128 & y) { return !(x == y); }
76+
77+
friend auto operator<=>(const uint128 &, const uint128 &) = default;
7878
};
7979

8080
inline uint64 Uint128Low64(const uint128 & x) { return x.low64; }

‎contrib/curl‎

Submodule curl updated 638 files

‎contrib/curl-cmake/CMakeLists.txt‎

Lines changed: 109 additions & 111 deletions
Original file line numberDiff line numberDiff line change
@@ -8,125 +8,122 @@ endif()
88
set (LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/curl")
99

1010
set (SRCS
11-
"${LIBRARY_DIR}/lib/fopen.c"
12-
"${LIBRARY_DIR}/lib/noproxy.c"
13-
"${LIBRARY_DIR}/lib/idn.c"
14-
"${LIBRARY_DIR}/lib/cfilters.c"
15-
"${LIBRARY_DIR}/lib/cf-socket.c"
11+
"${LIBRARY_DIR}/lib/altsvc.c"
12+
"${LIBRARY_DIR}/lib/amigaos.c"
13+
"${LIBRARY_DIR}/lib/asyn-thread.c"
14+
"${LIBRARY_DIR}/lib/base64.c"
15+
"${LIBRARY_DIR}/lib/bufq.c"
16+
"${LIBRARY_DIR}/lib/bufref.c"
17+
"${LIBRARY_DIR}/lib/cf-h1-proxy.c"
1618
"${LIBRARY_DIR}/lib/cf-haproxy.c"
1719
"${LIBRARY_DIR}/lib/cf-https-connect.c"
18-
"${LIBRARY_DIR}/lib/file.c"
19-
"${LIBRARY_DIR}/lib/timeval.c"
20-
"${LIBRARY_DIR}/lib/base64.c"
21-
"${LIBRARY_DIR}/lib/hostip.c"
22-
"${LIBRARY_DIR}/lib/progress.c"
23-
"${LIBRARY_DIR}/lib/formdata.c"
20+
"${LIBRARY_DIR}/lib/cf-socket.c"
21+
"${LIBRARY_DIR}/lib/cfilters.c"
22+
"${LIBRARY_DIR}/lib/conncache.c"
23+
"${LIBRARY_DIR}/lib/connect.c"
24+
"${LIBRARY_DIR}/lib/content_encoding.c"
2425
"${LIBRARY_DIR}/lib/cookie.c"
25-
"${LIBRARY_DIR}/lib/http.c"
26-
"${LIBRARY_DIR}/lib/sendf.c"
27-
"${LIBRARY_DIR}/lib/url.c"
26+
"${LIBRARY_DIR}/lib/curl_addrinfo.c"
27+
"${LIBRARY_DIR}/lib/curl_des.c"
28+
"${LIBRARY_DIR}/lib/curl_endian.c"
29+
"${LIBRARY_DIR}/lib/curl_fnmatch.c"
30+
"${LIBRARY_DIR}/lib/curl_get_line.c"
31+
"${LIBRARY_DIR}/lib/curl_gethostname.c"
32+
"${LIBRARY_DIR}/lib/curl_gssapi.c"
33+
"${LIBRARY_DIR}/lib/curl_memrchr.c"
34+
"${LIBRARY_DIR}/lib/curl_multibyte.c"
35+
"${LIBRARY_DIR}/lib/curl_ntlm_core.c"
36+
"${LIBRARY_DIR}/lib/curl_ntlm_wb.c"
37+
"${LIBRARY_DIR}/lib/curl_path.c"
38+
"${LIBRARY_DIR}/lib/curl_range.c"
39+
"${LIBRARY_DIR}/lib/curl_rtmp.c"
40+
"${LIBRARY_DIR}/lib/curl_sasl.c"
41+
"${LIBRARY_DIR}/lib/curl_sspi.c"
42+
"${LIBRARY_DIR}/lib/curl_threads.c"
43+
"${LIBRARY_DIR}/lib/curl_trc.c"
2844
"${LIBRARY_DIR}/lib/dict.c"
29-
"${LIBRARY_DIR}/lib/if2ip.c"
30-
"${LIBRARY_DIR}/lib/speedcheck.c"
31-
"${LIBRARY_DIR}/lib/ldap.c"
32-
"${LIBRARY_DIR}/lib/version.c"
33-
"${LIBRARY_DIR}/lib/getenv.c"
34-
"${LIBRARY_DIR}/lib/escape.c"
35-
"${LIBRARY_DIR}/lib/mprintf.c"
36-
"${LIBRARY_DIR}/lib/telnet.c"
37-
"${LIBRARY_DIR}/lib/netrc.c"
38-
"${LIBRARY_DIR}/lib/getinfo.c"
39-
"${LIBRARY_DIR}/lib/transfer.c"
40-
"${LIBRARY_DIR}/lib/strcase.c"
45+
"${LIBRARY_DIR}/lib/doh.c"
46+
"${LIBRARY_DIR}/lib/dynbuf.c"
47+
"${LIBRARY_DIR}/lib/dynhds.c"
4148
"${LIBRARY_DIR}/lib/easy.c"
42-
"${LIBRARY_DIR}/lib/curl_fnmatch.c"
43-
"${LIBRARY_DIR}/lib/curl_log.c"
49+
"${LIBRARY_DIR}/lib/escape.c"
50+
"${LIBRARY_DIR}/lib/file.c"
4451
"${LIBRARY_DIR}/lib/fileinfo.c"
45-
"${LIBRARY_DIR}/lib/krb5.c"
46-
"${LIBRARY_DIR}/lib/memdebug.c"
47-
"${LIBRARY_DIR}/lib/http_chunks.c"
48-
"${LIBRARY_DIR}/lib/strtok.c"
49-
"${LIBRARY_DIR}/lib/connect.c"
50-
"${LIBRARY_DIR}/lib/llist.c"
52+
"${LIBRARY_DIR}/lib/fopen.c"
53+
"${LIBRARY_DIR}/lib/formdata.c"
54+
"${LIBRARY_DIR}/lib/getenv.c"
55+
"${LIBRARY_DIR}/lib/getinfo.c"
56+
"${LIBRARY_DIR}/lib/gopher.c"
5157
"${LIBRARY_DIR}/lib/hash.c"
52-
"${LIBRARY_DIR}/lib/multi.c"
53-
"${LIBRARY_DIR}/lib/content_encoding.c"
54-
"${LIBRARY_DIR}/lib/share.c"
55-
"${LIBRARY_DIR}/lib/http_digest.c"
56-
"${LIBRARY_DIR}/lib/md4.c"
57-
"${LIBRARY_DIR}/lib/md5.c"
58-
"${LIBRARY_DIR}/lib/http_negotiate.c"
59-
"${LIBRARY_DIR}/lib/inet_pton.c"
60-
"${LIBRARY_DIR}/lib/strtoofft.c"
61-
"${LIBRARY_DIR}/lib/strerror.c"
62-
"${LIBRARY_DIR}/lib/amigaos.c"
58+
"${LIBRARY_DIR}/lib/headers.c"
59+
"${LIBRARY_DIR}/lib/hmac.c"
6360
"${LIBRARY_DIR}/lib/hostasyn.c"
61+
"${LIBRARY_DIR}/lib/hostip.c"
6462
"${LIBRARY_DIR}/lib/hostip4.c"
6563
"${LIBRARY_DIR}/lib/hostip6.c"
6664
"${LIBRARY_DIR}/lib/hostsyn.c"
65+
"${LIBRARY_DIR}/lib/hsts.c"
66+
"${LIBRARY_DIR}/lib/http.c"
67+
"${LIBRARY_DIR}/lib/http2.c"
68+
"${LIBRARY_DIR}/lib/http_aws_sigv4.c"
69+
"${LIBRARY_DIR}/lib/http_chunks.c"
70+
"${LIBRARY_DIR}/lib/http_digest.c"
71+
"${LIBRARY_DIR}/lib/http_negotiate.c"
72+
"${LIBRARY_DIR}/lib/http_ntlm.c"
73+
"${LIBRARY_DIR}/lib/http_proxy.c"
74+
"${LIBRARY_DIR}/lib/idn.c"
75+
"${LIBRARY_DIR}/lib/if2ip.c"
76+
"${LIBRARY_DIR}/lib/imap.c"
6777
"${LIBRARY_DIR}/lib/inet_ntop.c"
78+
"${LIBRARY_DIR}/lib/inet_pton.c"
79+
"${LIBRARY_DIR}/lib/krb5.c"
80+
"${LIBRARY_DIR}/lib/ldap.c"
81+
"${LIBRARY_DIR}/lib/llist.c"
82+
"${LIBRARY_DIR}/lib/md4.c"
83+
"${LIBRARY_DIR}/lib/md5.c"
84+
"${LIBRARY_DIR}/lib/memdebug.c"
85+
"${LIBRARY_DIR}/lib/mime.c"
86+
"${LIBRARY_DIR}/lib/mprintf.c"
87+
"${LIBRARY_DIR}/lib/mqtt.c"
88+
"${LIBRARY_DIR}/lib/multi.c"
89+
"${LIBRARY_DIR}/lib/netrc.c"
90+
"${LIBRARY_DIR}/lib/nonblock.c"
91+
"${LIBRARY_DIR}/lib/noproxy.c"
92+
"${LIBRARY_DIR}/lib/openldap.c"
6893
"${LIBRARY_DIR}/lib/parsedate.c"
94+
"${LIBRARY_DIR}/lib/pingpong.c"
95+
"${LIBRARY_DIR}/lib/pop3.c"
96+
"${LIBRARY_DIR}/lib/progress.c"
97+
"${LIBRARY_DIR}/lib/psl.c"
98+
"${LIBRARY_DIR}/lib/rand.c"
99+
"${LIBRARY_DIR}/lib/rename.c"
100+
"${LIBRARY_DIR}/lib/rtsp.c"
69101
"${LIBRARY_DIR}/lib/select.c"
70-
"${LIBRARY_DIR}/lib/splay.c"
71-
"${LIBRARY_DIR}/lib/strdup.c"
102+
"${LIBRARY_DIR}/lib/sendf.c"
103+
"${LIBRARY_DIR}/lib/setopt.c"
104+
"${LIBRARY_DIR}/lib/sha256.c"
105+
"${LIBRARY_DIR}/lib/share.c"
106+
"${LIBRARY_DIR}/lib/slist.c"
107+
"${LIBRARY_DIR}/lib/smb.c"
108+
"${LIBRARY_DIR}/lib/smtp.c"
109+
"${LIBRARY_DIR}/lib/socketpair.c"
72110
"${LIBRARY_DIR}/lib/socks.c"
73-
"${LIBRARY_DIR}/lib/curl_addrinfo.c"
74111
"${LIBRARY_DIR}/lib/socks_gssapi.c"
75112
"${LIBRARY_DIR}/lib/socks_sspi.c"
76-
"${LIBRARY_DIR}/lib/curl_sspi.c"
77-
"${LIBRARY_DIR}/lib/slist.c"
78-
"${LIBRARY_DIR}/lib/nonblock.c"
79-
"${LIBRARY_DIR}/lib/curl_memrchr.c"
80-
"${LIBRARY_DIR}/lib/imap.c"
81-
"${LIBRARY_DIR}/lib/pop3.c"
82-
"${LIBRARY_DIR}/lib/smtp.c"
83-
"${LIBRARY_DIR}/lib/pingpong.c"
84-
"${LIBRARY_DIR}/lib/rtsp.c"
85-
"${LIBRARY_DIR}/lib/curl_threads.c"
86-
"${LIBRARY_DIR}/lib/warnless.c"
87-
"${LIBRARY_DIR}/lib/hmac.c"
88-
"${LIBRARY_DIR}/lib/curl_rtmp.c"
89-
"${LIBRARY_DIR}/lib/openldap.c"
90-
"${LIBRARY_DIR}/lib/curl_gethostname.c"
91-
"${LIBRARY_DIR}/lib/gopher.c"
92-
"${LIBRARY_DIR}/lib/http_proxy.c"
93-
"${LIBRARY_DIR}/lib/asyn-thread.c"
94-
"${LIBRARY_DIR}/lib/curl_gssapi.c"
95-
"${LIBRARY_DIR}/lib/http_ntlm.c"
96-
"${LIBRARY_DIR}/lib/curl_ntlm_wb.c"
97-
"${LIBRARY_DIR}/lib/curl_ntlm_core.c"
98-
"${LIBRARY_DIR}/lib/curl_sasl.c"
99-
"${LIBRARY_DIR}/lib/rand.c"
100-
"${LIBRARY_DIR}/lib/curl_multibyte.c"
101-
"${LIBRARY_DIR}/lib/conncache.c"
102-
"${LIBRARY_DIR}/lib/cf-h1-proxy.c"
103-
"${LIBRARY_DIR}/lib/http2.c"
104-
"${LIBRARY_DIR}/lib/smb.c"
105-
"${LIBRARY_DIR}/lib/curl_endian.c"
106-
"${LIBRARY_DIR}/lib/curl_des.c"
113+
"${LIBRARY_DIR}/lib/speedcheck.c"
114+
"${LIBRARY_DIR}/lib/splay.c"
115+
"${LIBRARY_DIR}/lib/strcase.c"
116+
"${LIBRARY_DIR}/lib/strdup.c"
117+
"${LIBRARY_DIR}/lib/strerror.c"
118+
"${LIBRARY_DIR}/lib/strtok.c"
119+
"${LIBRARY_DIR}/lib/strtoofft.c"
107120
"${LIBRARY_DIR}/lib/system_win32.c"
108-
"${LIBRARY_DIR}/lib/mime.c"
109-
"${LIBRARY_DIR}/lib/sha256.c"
110-
"${LIBRARY_DIR}/lib/setopt.c"
111-
"${LIBRARY_DIR}/lib/curl_path.c"
112-
"${LIBRARY_DIR}/lib/curl_range.c"
113-
"${LIBRARY_DIR}/lib/psl.c"
114-
"${LIBRARY_DIR}/lib/doh.c"
115-
"${LIBRARY_DIR}/lib/urlapi.c"
116-
"${LIBRARY_DIR}/lib/curl_get_line.c"
117-
"${LIBRARY_DIR}/lib/altsvc.c"
118-
"${LIBRARY_DIR}/lib/socketpair.c"
119-
"${LIBRARY_DIR}/lib/bufref.c"
120-
"${LIBRARY_DIR}/lib/bufq.c"
121-
"${LIBRARY_DIR}/lib/dynbuf.c"
122-
"${LIBRARY_DIR}/lib/dynhds.c"
123-
"${LIBRARY_DIR}/lib/hsts.c"
124-
"${LIBRARY_DIR}/lib/http_aws_sigv4.c"
125-
"${LIBRARY_DIR}/lib/mqtt.c"
126-
"${LIBRARY_DIR}/lib/rename.c"
127-
"${LIBRARY_DIR}/lib/headers.c"
121+
"${LIBRARY_DIR}/lib/telnet.c"
128122
"${LIBRARY_DIR}/lib/timediff.c"
129-
"${LIBRARY_DIR}/lib/vauth/vauth.c"
123+
"${LIBRARY_DIR}/lib/timeval.c"
124+
"${LIBRARY_DIR}/lib/transfer.c"
125+
"${LIBRARY_DIR}/lib/url.c"
126+
"${LIBRARY_DIR}/lib/urlapi.c"
130127
"${LIBRARY_DIR}/lib/vauth/cleartext.c"
131128
"${LIBRARY_DIR}/lib/vauth/cram.c"
132129
"${LIBRARY_DIR}/lib/vauth/digest.c"
@@ -138,23 +135,24 @@ set (SRCS
138135
"${LIBRARY_DIR}/lib/vauth/oauth2.c"
139136
"${LIBRARY_DIR}/lib/vauth/spnego_gssapi.c"
140137
"${LIBRARY_DIR}/lib/vauth/spnego_sspi.c"
138+
"${LIBRARY_DIR}/lib/vauth/vauth.c"
139+
"${LIBRARY_DIR}/lib/version.c"
141140
"${LIBRARY_DIR}/lib/vquic/vquic.c"
142-
"${LIBRARY_DIR}/lib/vtls/openssl.c"
141+
"${LIBRARY_DIR}/lib/vssh/libssh.c"
142+
"${LIBRARY_DIR}/lib/vssh/libssh2.c"
143+
"${LIBRARY_DIR}/lib/vtls/bearssl.c"
143144
"${LIBRARY_DIR}/lib/vtls/gtls.c"
144-
"${LIBRARY_DIR}/lib/vtls/vtls.c"
145-
"${LIBRARY_DIR}/lib/vtls/nss.c"
146-
"${LIBRARY_DIR}/lib/vtls/wolfssl.c"
145+
"${LIBRARY_DIR}/lib/vtls/hostcheck.c"
146+
"${LIBRARY_DIR}/lib/vtls/keylog.c"
147+
"${LIBRARY_DIR}/lib/vtls/mbedtls.c"
148+
"${LIBRARY_DIR}/lib/vtls/openssl.c"
147149
"${LIBRARY_DIR}/lib/vtls/schannel.c"
148150
"${LIBRARY_DIR}/lib/vtls/schannel_verify.c"
149151
"${LIBRARY_DIR}/lib/vtls/sectransp.c"
150-
"${LIBRARY_DIR}/lib/vtls/gskit.c"
151-
"${LIBRARY_DIR}/lib/vtls/mbedtls.c"
152-
"${LIBRARY_DIR}/lib/vtls/bearssl.c"
153-
"${LIBRARY_DIR}/lib/vtls/keylog.c"
152+
"${LIBRARY_DIR}/lib/vtls/vtls.c"
153+
"${LIBRARY_DIR}/lib/vtls/wolfssl.c"
154154
"${LIBRARY_DIR}/lib/vtls/x509asn1.c"
155-
"${LIBRARY_DIR}/lib/vtls/hostcheck.c"
156-
"${LIBRARY_DIR}/lib/vssh/libssh2.c"
157-
"${LIBRARY_DIR}/lib/vssh/libssh.c"
155+
"${LIBRARY_DIR}/lib/warnless.c"
158156
)
159157

160158
add_library (_curl ${SRCS})

‎contrib/krb5‎

‎docker/test/base/setup_export_logs.sh‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ CONNECTION_PARAMETERS=${CONNECTION_PARAMETERS:=""}
1717
# Create all configured system logs:
1818
clickhouse-client --query "SYSTEM FLUSH LOGS"
1919

20+
# It's doesn't make sense to try creating tables if SYNC fails
21+
echo "SYSTEM SYNC DATABASE REPLICA default" | clickhouse-client --receive_timeout 180 $CONNECTION_PARAMETERS || exit 0
22+
2023
# For each system log table:
2124
clickhouse-client --query "SHOW TABLES FROM system LIKE '%\\_log'" | while read -r table
2225
do
@@ -38,14 +41,15 @@ do
3841

3942
echo "Creating destination table ${table}_${hash}" >&2
4043

41-
echo "$statement" | clickhouse-client $CONNECTION_PARAMETERS
44+
echo "$statement" | clickhouse-client --distributed_ddl_task_timeout=10 $CONNECTION_PARAMETERS || continue
4245

4346
echo "Creating table system.${table}_sender" >&2
4447

4548
# Create Distributed table and materialized view to watch on the original table:
4649
clickhouse-client --query "
4750
CREATE TABLE system.${table}_sender
4851
ENGINE = Distributed(${CLUSTER}, default, ${table}_${hash})
52+
SETTINGS flush_on_detach=0
4953
EMPTY AS
5054
SELECT ${EXTRA_COLUMNS_EXPRESSION}, *
5155
FROM system.${table}

‎docker/test/install/deb/Dockerfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ ENV \
1212
# install systemd packages
1313
RUN apt-get update && \
1414
apt-get install -y --no-install-recommends \
15+
sudo \
1516
systemd \
1617
&& \
1718
apt-get clean && \

‎docker/test/performance-comparison/Dockerfile‎

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,7 @@
11
# docker build -t clickhouse/performance-comparison .
22

3-
# Using ubuntu:22.04 over 20.04 as all other images, since:
4-
# a) ubuntu 20.04 has too old parallel, and does not support --memsuspend
5-
# b) anyway for perf tests it should not be important (backward compatiblity
6-
# with older ubuntu had been checked lots of times in various tests)
7-
FROM ubuntu:22.04
8-
9-
# ARG for quick switch to a given ubuntu mirror
10-
ARG apt_archive="http://archive.ubuntu.com"
11-
RUN sed -i "s|http://archive.ubuntu.com|$apt_archive|g" /etc/apt/sources.list
12-
13-
ENV LANG=C.UTF-8
14-
ENV TZ=Europe/Amsterdam
15-
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
3+
ARG FROM_TAG=latest
4+
FROM clickhouse/test-base:$FROM_TAG
165

176
RUN apt-get update \
187
&& DEBIAN_FRONTEND=noninteractive apt-get install --yes --no-install-recommends \
@@ -56,10 +45,9 @@ COPY * /
5645
# node #0 should be less stable because of system interruptions. We bind
5746
# randomly to node 1 or 0 to gather some statistics on that. We have to bind
5847
# both servers and the tmpfs on which the database is stored. How to do it
59-
# through Yandex Sandbox API is unclear, but by default tmpfs uses
48+
# is unclear, but by default tmpfs uses
6049
# 'process allocation policy', not sure which process but hopefully the one that
61-
# writes to it, so just bind the downloader script as well. We could also try to
62-
# remount it with proper options in Sandbox task.
50+
# writes to it, so just bind the downloader script as well.
6351
# https://www.kernel.org/doc/Documentation/filesystems/tmpfs.txt
6452
# Double-escaped backslashes are a tribute to the engineering wonder of docker --
6553
# it gives '/bin/sh: 1: [bash,: not found' otherwise.

‎docker/test/performance-comparison/compare.sh‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ function configure
9090
set +m
9191

9292
wait_for_server $LEFT_SERVER_PORT $left_pid
93-
echo Server for setup started
93+
echo "Server for setup started"
9494

9595
clickhouse-client --port $LEFT_SERVER_PORT --query "create database test" ||:
9696
clickhouse-client --port $LEFT_SERVER_PORT --query "rename table datasets.hits_v1 to test.hits" ||:
@@ -156,9 +156,9 @@ function restart
156156
wait_for_server $RIGHT_SERVER_PORT $right_pid
157157
echo right ok
158158

159-
clickhouse-client --port $LEFT_SERVER_PORT --query "select * from system.tables where database != 'system'"
159+
clickhouse-client --port $LEFT_SERVER_PORT --query "select * from system.tables where database NOT IN ('system', 'INFORMATION_SCHEMA', 'information_schema')"
160160
clickhouse-client --port $LEFT_SERVER_PORT --query "select * from system.build_options"
161-
clickhouse-client --port $RIGHT_SERVER_PORT --query "select * from system.tables where database != 'system'"
161+
clickhouse-client --port $RIGHT_SERVER_PORT --query "select * from system.tables where database NOT IN ('system', 'INFORMATION_SCHEMA', 'information_schema')"
162162
clickhouse-client --port $RIGHT_SERVER_PORT --query "select * from system.build_options"
163163

164164
# Check again that both servers we started are running -- this is important
@@ -352,14 +352,12 @@ function get_profiles
352352
wait
353353

354354
clickhouse-client --port $LEFT_SERVER_PORT --query "select * from system.query_log where type in ('QueryFinish', 'ExceptionWhileProcessing') format TSVWithNamesAndTypes" > left-query-log.tsv ||: &
355-
clickhouse-client --port $LEFT_SERVER_PORT --query "select * from system.query_thread_log format TSVWithNamesAndTypes" > left-query-thread-log.tsv ||: &
356355
clickhouse-client --port $LEFT_SERVER_PORT --query "select * from system.trace_log format TSVWithNamesAndTypes" > left-trace-log.tsv ||: &
357356
clickhouse-client --port $LEFT_SERVER_PORT --query "select arrayJoin(trace) addr, concat(splitByChar('/', addressToLine(addr))[-1], '#', demangle(addressToSymbol(addr)) ) name from system.trace_log group by addr format TSVWithNamesAndTypes" > left-addresses.tsv ||: &
358357
clickhouse-client --port $LEFT_SERVER_PORT --query "select * from system.metric_log format TSVWithNamesAndTypes" > left-metric-log.tsv ||: &
359358
clickhouse-client --port $LEFT_SERVER_PORT --query "select * from system.asynchronous_metric_log format TSVWithNamesAndTypes" > left-async-metric-log.tsv ||: &
360359

361360
clickhouse-client --port $RIGHT_SERVER_PORT --query "select * from system.query_log where type in ('QueryFinish', 'ExceptionWhileProcessing') format TSVWithNamesAndTypes" > right-query-log.tsv ||: &
362-
clickhouse-client --port $RIGHT_SERVER_PORT --query "select * from system.query_thread_log format TSVWithNamesAndTypes" > right-query-thread-log.tsv ||: &
363361
clickhouse-client --port $RIGHT_SERVER_PORT --query "select * from system.trace_log format TSVWithNamesAndTypes" > right-trace-log.tsv ||: &
364362
clickhouse-client --port $RIGHT_SERVER_PORT --query "select arrayJoin(trace) addr, concat(splitByChar('/', addressToLine(addr))[-1], '#', demangle(addressToSymbol(addr)) ) name from system.trace_log group by addr format TSVWithNamesAndTypes" > right-addresses.tsv ||: &
365363
clickhouse-client --port $RIGHT_SERVER_PORT --query "select * from system.metric_log format TSVWithNamesAndTypes" > right-metric-log.tsv ||: &

0 commit comments

Comments
 (0)