Skip to content

Commit 5f7eddd

Browse files
yariks5syariks5s
authored
Merge branch 'ClickHouse:master' into Loop-table-function
2 parents b0d202c + b3b9000 commit 5f7eddd

328 files changed

Lines changed: 3448 additions & 1503 deletions

File tree

Some content is hidden

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

‎.clangd‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,6 @@ Diagnostics:
1414
readability-identifier-naming,
1515
bugprone-reserved-identifier,
1616
]
17+
# Require LLVM 20 (https://github.com/llvm/llvm-project/pull/67749)
18+
Style:
19+
AngledHeaders: [".*"]

‎LICENSE‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright 2016-2024 ClickHouse, Inc.
1+
Copyright 2016-2025 ClickHouse, Inc.
22

33
Apache License
44
Version 2.0, January 2004
@@ -188,7 +188,7 @@ Copyright 2016-2024 ClickHouse, Inc.
188188
same "printed page" as the copyright notice for easier
189189
identification within third-party archives.
190190

191-
Copyright 2016-2024 ClickHouse, Inc.
191+
Copyright 2016-2025 ClickHouse, Inc.
192192

193193
Licensed under the Apache License, Version 2.0 (the "License");
194194
you may not use this file except in compliance with the License.

‎ci/docker/fasttest/Dockerfile‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,5 +111,4 @@ RUN arch=${TARGETARCH:-amd64} \
111111
&& dpkg -i /tmp/nfpm.deb \
112112
&& rm /tmp/nfpm.deb
113113

114-
ENV PYTHONPATH="/wd"
115114
ENV PYTHONUNBUFFERED=1

‎ci/docker/stateless-test/Dockerfile‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,6 @@ ENV MINIO_ROOT_PASSWORD="clickhouse"
112112
# for minio to work without root
113113
RUN chmod 777 /home
114114
ENV HOME="/home"
115-
ENV TEMP_DIR="/tmp/praktika"
116-
ENV PATH="/wd/tests:/tmp/praktika/input:$PATH"
117115

118116
RUN npm install -g azurite@3.30.0 \
119117
&& npm install -g tslib && npm install -g node

‎ci/jobs/build_clickhouse.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
import argparse
22
import os
33

4-
from praktika.result import Result, ResultTranslator
5-
from praktika.settings import Settings
4+
from praktika.result import Result
65
from praktika.utils import MetaClasses, Shell, Utils
76

87
from ci.jobs.scripts.clickhouse_version import CHVersion
98
from ci.workflows.defs import CIFiles, ToolSet
109
from ci.workflows.pull_request import S3_BUILDS_BUCKET
1110

11+
current_directory = Utils.cwd()
12+
build_dir = f"{current_directory}/ci/tmp/build/"
13+
temp_dir = f"{current_directory}/ci/tmp/"
14+
1215

1316
class JobStages(metaclass=MetaClasses.WithIter):
1417
CHECKOUT_SUBMODULES = "checkout"
@@ -123,8 +126,6 @@ def main():
123126
COMPILER_CPP=ToolSet.COMPILER_CPP,
124127
)
125128

126-
build_dir = f"{Settings.TEMP_DIR}/build"
127-
128129
res = True
129130
results = []
130131
version = ""
@@ -194,16 +195,15 @@ def main():
194195
else:
195196
deb_arch = "arm64"
196197

197-
output_dir = "/tmp/praktika/output/"
198-
assert Shell.check(f"rm -f {output_dir}/*.deb")
198+
assert Shell.check(f"rm -f {temp_dir}/*.deb")
199199

200200
results.append(
201201
Result.from_commands_run(
202202
name="Build Packages",
203203
command=[
204204
f"DESTDIR={build_dir}/root ninja programs/install",
205205
f"ln -sf {build_dir}/root {Utils.cwd()}/packages/root",
206-
f"cd {Utils.cwd()}/packages/ && OUTPUT_DIR={output_dir} BUILD_TYPE={package_type} VERSION_STRING={version} DEB_ARCH={deb_arch} ./build --deb",
206+
f"cd {Utils.cwd()}/packages/ && OUTPUT_DIR={temp_dir} BUILD_TYPE={package_type} VERSION_STRING={version} DEB_ARCH={deb_arch} ./build --deb",
207207
],
208208
workdir=build_dir,
209209
with_log=True,

‎ci/jobs/clickbench.py‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,18 @@
44
from ci.praktika.result import Result
55
from ci.praktika.utils import Shell, Utils
66

7+
temp_dir = f"{Utils.cwd()}/ci/tmp/"
8+
79

810
# TODO: generic functionality - move to separate file
911
class ClickHouseBinary:
1012
def __init__(self):
11-
self.path = "/tmp/praktika/input/"
12-
self.config_path = "/tmp/praktika/config"
13+
self.path = temp_dir
14+
self.config_path = f"{temp_dir}/config"
1315
self.start_cmd = (
1416
f"{self.path}/clickhouse-server --config-file={self.config_path}/config.xml"
1517
)
16-
self.log_file = "/tmp/praktika/server.log"
18+
self.log_file = f"{temp_dir}/server.log"
1719
self.port = 9000
1820

1921
def install(self):

‎ci/jobs/fast_test.py‎

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@
88
from ci.jobs.scripts.functional_tests_results import FTResultsProcessor
99
from ci.workflows.defs import ToolSet
1010

11+
current_directory = Utils.cwd()
12+
build_dir = f"{current_directory}/ci/tmp/build"
13+
temp_dir = f"{current_directory}/ci/tmp/"
14+
1115

1216
def clone_submodules():
1317
submodules_to_update = [
@@ -43,7 +47,6 @@ def clone_submodules():
4347
"contrib/c-ares",
4448
"contrib/morton-nd",
4549
"contrib/xxHash",
46-
"contrib/expected",
4750
"contrib/simdjson",
4851
"contrib/liburing",
4952
"contrib/libfiu",
@@ -69,22 +72,18 @@ def clone_submodules():
6972
def update_path_ch_config(config_file_path=""):
7073
print("Updating path in clickhouse config")
7174
config_file_path = (
72-
config_file_path or f"{Settings.TEMP_DIR}/etc/clickhouse-server/config.xml"
73-
)
74-
ssl_config_file_path = (
75-
f"{Settings.TEMP_DIR}/etc/clickhouse-server/config.d/ssl_certs.xml"
75+
config_file_path or f"{temp_dir}/etc/clickhouse-server/config.xml"
7676
)
77+
ssl_config_file_path = f"{temp_dir}/etc/clickhouse-server/config.d/ssl_certs.xml"
7778
try:
7879
with open(config_file_path, "r", encoding="utf-8") as file:
7980
content = file.read()
8081

8182
with open(ssl_config_file_path, "r", encoding="utf-8") as file:
8283
ssl_config_content = file.read()
83-
content = content.replace(">/var/", f">{Settings.TEMP_DIR}/var/")
84-
content = content.replace(">/etc/", f">{Settings.TEMP_DIR}/etc/")
85-
ssl_config_content = ssl_config_content.replace(
86-
">/etc/", f">{Settings.TEMP_DIR}/etc/"
87-
)
84+
content = content.replace(">/var/", f">{temp_dir}/var/")
85+
content = content.replace(">/etc/", f">{temp_dir}/etc/")
86+
ssl_config_content = ssl_config_content.replace(">/etc/", f">{temp_dir}/etc/")
8887
with open(config_file_path, "w", encoding="utf-8") as file:
8988
file.write(content)
9089
with open(ssl_config_file_path, "w", encoding="utf-8") as file:
@@ -122,9 +121,6 @@ def main():
122121
stages.pop(0)
123122
stages.insert(0, stage)
124123

125-
current_directory = Utils.cwd()
126-
build_dir = f"{Settings.TEMP_DIR}/build"
127-
128124
Utils.add_to_PATH(f"{build_dir}/programs:{current_directory}/tests")
129125

130126
res = True
@@ -190,11 +186,11 @@ def main():
190186

191187
if res and JobStages.CONFIG in stages:
192188
commands = [
193-
f"rm -rf {Settings.TEMP_DIR}/etc/ && mkdir -p {Settings.TEMP_DIR}/etc/clickhouse-client {Settings.TEMP_DIR}/etc/clickhouse-server",
194-
f"cp ./programs/server/config.xml ./programs/server/users.xml {Settings.TEMP_DIR}/etc/clickhouse-server/",
195-
f"./tests/config/install.sh {Settings.TEMP_DIR}/etc/clickhouse-server {Settings.TEMP_DIR}/etc/clickhouse-client --fast-test",
196-
# f"cp -a {current_directory}/programs/server/config.d/log_to_console.xml {Settings.TEMP_DIR}/etc/clickhouse-server/config.d/",
197-
f"rm -f {Settings.TEMP_DIR}/etc/clickhouse-server/config.d/secure_ports.xml",
189+
f"rm -rf {temp_dir}/etc/ && mkdir -p {temp_dir}/etc/clickhouse-client {temp_dir}/etc/clickhouse-server",
190+
f"cp ./programs/server/config.xml ./programs/server/users.xml {temp_dir}/etc/clickhouse-server/",
191+
f"./tests/config/install.sh {temp_dir}/etc/clickhouse-server {temp_dir}/etc/clickhouse-client --fast-test",
192+
# f"cp -a {current_directory}/programs/server/config.d/log_to_console.xml {temp_dir}/etc/clickhouse-server/config.d/",
193+
f"rm -f {temp_dir}/etc/clickhouse-server/config.d/secure_ports.xml",
198194
update_path_ch_config,
199195
]
200196
results.append(

‎ci/jobs/functional_stateful_tests.py‎

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@
44
from pathlib import Path
55

66
from praktika.result import Result
7-
from praktika.settings import Settings
87
from praktika.utils import MetaClasses, Shell, Utils
98

109
from ci.jobs.scripts.clickhouse_proc import ClickHouseProc
1110
from ci.jobs.scripts.functional_tests_results import FTResultsProcessor
1211

12+
temp_dir = f"{Utils.cwd()}/ci/tmp/"
13+
1314

1415
class JobStages(metaclass=MetaClasses.WithIter):
1516
INSTALL_CLICKHOUSE = "install"
@@ -19,9 +20,7 @@ class JobStages(metaclass=MetaClasses.WithIter):
1920

2021
def parse_args():
2122
parser = argparse.ArgumentParser(description="ClickHouse Build Job")
22-
parser.add_argument(
23-
"--ch-path", help="Path to clickhouse binary", default=f"{Settings.INPUT_DIR}"
24-
)
23+
parser.add_argument("--ch-path", help="Path to clickhouse binary", default=temp_dir)
2524
parser.add_argument(
2625
"--test-options",
2726
help="Comma separated option(s): parallel|non-parallel|BATCH_NUM/BTATCH_TOT|..",
@@ -35,7 +34,7 @@ def parse_args():
3534
def run_test(
3635
no_parallel: bool, no_sequiential: bool, batch_num: int, batch_total: int, test=""
3736
):
38-
test_output_file = f"{Settings.OUTPUT_DIR}/test_result.txt"
37+
test_output_file = f"{temp_dir}/test_result.txt"
3938

4039
test_command = f"clickhouse-test --jobs 2 --testname --shard --zookeeper --check-zookeeper-session --no-stateless \
4140
--hung-check --print-time \
@@ -84,24 +83,24 @@ def main():
8483

8584
if res and JobStages.INSTALL_CLICKHOUSE in stages:
8685
commands = [
87-
f"rm -rf /tmp/praktika/var/log/clickhouse-server/clickhouse-server.*",
86+
f"rm -rf {temp_dir}/var/log/clickhouse-server/clickhouse-server.*",
8887
f"chmod +x {ch_path}/clickhouse",
8988
f"ln -sf {ch_path}/clickhouse {ch_path}/clickhouse-server",
9089
f"ln -sf {ch_path}/clickhouse {ch_path}/clickhouse-client",
9190
f"ln -sf {ch_path}/clickhouse {ch_path}/clickhouse-compressor",
9291
f"ln -sf {ch_path}/clickhouse {ch_path}/clickhouse-local",
9392
f"ln -sf {ch_path}/clickhouse {ch_path}/clickhouse-obfuscator",
94-
f"rm -rf {Settings.TEMP_DIR}/etc/ && mkdir -p {Settings.TEMP_DIR}/etc/clickhouse-client {Settings.TEMP_DIR}/etc/clickhouse-server",
95-
f"cp programs/server/config.xml programs/server/users.xml {Settings.TEMP_DIR}/etc/clickhouse-server/",
96-
f"./tests/config/install.sh {Settings.TEMP_DIR}/etc/clickhouse-server {Settings.TEMP_DIR}/etc/clickhouse-client --s3-storage --no-azure",
93+
f"rm -rf {temp_dir}/etc/ && mkdir -p {temp_dir}/etc/clickhouse-client {temp_dir}/etc/clickhouse-server",
94+
f"cp programs/server/config.xml programs/server/users.xml {temp_dir}/etc/clickhouse-server/",
95+
f"./tests/config/install.sh {temp_dir}/etc/clickhouse-server {temp_dir}/etc/clickhouse-client --s3-storage --no-azure",
9796
# clickhouse benchmark segfaults with --config-path, so provide client config by its default location
98-
f"cp {Settings.TEMP_DIR}/etc/clickhouse-client/* /etc/clickhouse-client/",
97+
f"cp {temp_dir}/etc/clickhouse-client/* /etc/clickhouse-client/",
9998
# update_path_ch_config,
100-
# f"sed -i 's|>/var/|>{Settings.TEMP_DIR}/var/|g; s|>/etc/|>{Settings.TEMP_DIR}/etc/|g' {Settings.TEMP_DIR}/etc/clickhouse-server/config.xml",
101-
# f"sed -i 's|>/etc/|>{Settings.TEMP_DIR}/etc/|g' {Settings.TEMP_DIR}/etc/clickhouse-server/config.d/ssl_certs.xml",
102-
f"for file in /tmp/praktika/etc/clickhouse-server/config.d/*.xml; do [ -f $file ] && echo Change config $file && sed -i 's|>/var/log|>{Settings.TEMP_DIR}/var/log|g; s|>/etc/|>{Settings.TEMP_DIR}/etc/|g' $(readlink -f $file); done",
103-
f"for file in /tmp/praktika/etc/clickhouse-server/*.xml; do [ -f $file ] && echo Change config $file && sed -i 's|>/var/log|>{Settings.TEMP_DIR}/var/log|g; s|>/etc/|>{Settings.TEMP_DIR}/etc/|g' $(readlink -f $file); done",
104-
f"for file in /tmp/praktika/etc/clickhouse-server/config.d/*.xml; do [ -f $file ] && echo Change config $file && sed -i 's|<path>local_disk|<path>{Settings.TEMP_DIR}/local_disk|g' $(readlink -f $file); done",
99+
# f"sed -i 's|>/var/|>{temp_dir}/var/|g; s|>/etc/|>{temp_dir}/etc/|g' {temp_dir}/etc/clickhouse-server/config.xml",
100+
# f"sed -i 's|>/etc/|>{temp_dir}/etc/|g' {temp_dir}/etc/clickhouse-server/config.d/ssl_certs.xml",
101+
f"for file in {temp_dir}/etc/clickhouse-server/config.d/*.xml; do [ -f $file ] && echo Change config $file && sed -i 's|>/var/log|>{temp_dir}/var/log|g; s|>/etc/|>{temp_dir}/etc/|g' $(readlink -f $file); done",
102+
f"for file in {temp_dir}/etc/clickhouse-server/*.xml; do [ -f $file ] && echo Change config $file && sed -i 's|>/var/log|>{temp_dir}/var/log|g; s|>/etc/|>{temp_dir}/etc/|g' $(readlink -f $file); done",
103+
f"for file in {temp_dir}/etc/clickhouse-server/config.d/*.xml; do [ -f $file ] && echo Change config $file && sed -i 's|<path>local_disk|<path>{temp_dir}/local_disk|g' $(readlink -f $file); done",
105104
f"clickhouse-server --version",
106105
]
107106
results.append(
@@ -116,7 +115,7 @@ def main():
116115
stop_watch_ = Utils.Stopwatch()
117116
step_name = "Start ClickHouse Server"
118117
print(step_name)
119-
minio_log = "/tmp/praktika/output/minio.log"
118+
minio_log = f"{temp_dir}/minio.log"
120119
res = res and CH.start_minio(test_type="stateful", log_file_path=minio_log)
121120
logs_to_attach += [minio_log]
122121
time.sleep(10)
@@ -133,8 +132,8 @@ def main():
133132
if res:
134133
print("ch started")
135134
logs_to_attach += [
136-
"/tmp/praktika/var/log/clickhouse-server/clickhouse-server.log",
137-
"/tmp/praktika/var/log/clickhouse-server/clickhouse-server.err.log",
135+
f"{temp_dir}/var/log/clickhouse-server/clickhouse-server.log",
136+
f"{temp_dir}/var/log/clickhouse-server/clickhouse-server.err.log",
138137
]
139138
results.append(
140139
Result.create_from(
@@ -161,7 +160,7 @@ def main():
161160
batch_total=total_batches,
162161
test=args.test,
163162
)
164-
results.append(FTResultsProcessor(wd=Settings.OUTPUT_DIR).run())
163+
results.append(FTResultsProcessor(wd=temp_dir).run())
165164
results[-1].set_timing(stopwatch=stop_watch_)
166165
res = results[-1].is_ok()
167166

‎ci/jobs/functional_stateless_tests.py‎

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@
44
from pathlib import Path
55

66
from praktika.result import Result
7-
from praktika.settings import Settings
87
from praktika.utils import MetaClasses, Shell, Utils
98

109
from ci.jobs.scripts.clickhouse_proc import ClickHouseProc
1110
from ci.jobs.scripts.functional_tests_results import FTResultsProcessor
1211

12+
temp_dir = f"{Utils.cwd()}/ci/tmp/"
13+
1314

1415
class JobStages(metaclass=MetaClasses.WithIter):
1516
INSTALL_CLICKHOUSE = "install"
@@ -19,9 +20,7 @@ class JobStages(metaclass=MetaClasses.WithIter):
1920

2021
def parse_args():
2122
parser = argparse.ArgumentParser(description="ClickHouse Build Job")
22-
parser.add_argument(
23-
"--ch-path", help="Path to clickhouse binary", default=f"{Settings.INPUT_DIR}"
24-
)
23+
parser.add_argument("--ch-path", help="Path to clickhouse binary", default=temp_dir)
2524
parser.add_argument(
2625
"--test-options",
2726
help="Comma separated option(s): parallel|non-parallel|BATCH_NUM/BTATCH_TOT|..",
@@ -36,7 +35,7 @@ def run_stateless_test(
3635
no_parallel: bool, no_sequiential: bool, batch_num: int, batch_total: int, test=""
3736
):
3837
assert not (no_parallel and no_sequiential)
39-
test_output_file = f"{Settings.OUTPUT_DIR}/test_result.txt"
38+
test_output_file = f"{temp_dir}/test_result.txt"
4039
aux = ""
4140
nproc = int(Utils.cpu_count() / 2)
4241
if batch_num and batch_total:
@@ -99,7 +98,7 @@ def main():
9998

10099
if res and JobStages.INSTALL_CLICKHOUSE in stages:
101100
commands = [
102-
f"rm -rf /tmp/praktika/var/log/clickhouse-server/clickhouse-server.*",
101+
f"rm -rf {temp_dir}/var/log/clickhouse-server/clickhouse-server.*",
103102
f"chmod +x {ch_path}/clickhouse",
104103
f"ln -sf {ch_path}/clickhouse {ch_path}/clickhouse-server",
105104
f"ln -sf {ch_path}/clickhouse {ch_path}/clickhouse-client",
@@ -108,19 +107,19 @@ def main():
108107
f"ln -sf {ch_path}/clickhouse {ch_path}/clickhouse-disks",
109108
f"ln -sf {ch_path}/clickhouse {ch_path}/clickhouse-obfuscator",
110109
f"ln -sf {ch_path}/clickhouse {ch_path}/clickhouse-format",
111-
f"rm -rf {Settings.TEMP_DIR}/etc/ && mkdir -p {Settings.TEMP_DIR}/etc/clickhouse-client {Settings.TEMP_DIR}/etc/clickhouse-server",
112-
f"cp programs/server/config.xml programs/server/users.xml {Settings.TEMP_DIR}/etc/clickhouse-server/",
113-
f"./tests/config/install.sh {Settings.TEMP_DIR}/etc/clickhouse-server {Settings.TEMP_DIR}/etc/clickhouse-client --s3-storage {'--no-azure' if no_azure else ''}",
110+
f"rm -rf {temp_dir}/etc/ && mkdir -p {temp_dir}/etc/clickhouse-client {temp_dir}/etc/clickhouse-server",
111+
f"cp programs/server/config.xml programs/server/users.xml {temp_dir}/etc/clickhouse-server/",
112+
f"./tests/config/install.sh {temp_dir}/etc/clickhouse-server {temp_dir}/etc/clickhouse-client --s3-storage {'--no-azure' if no_azure else ''}",
114113
# clickhouse benchmark segfaults with --config-path, so provide client config by its default location
115-
f"cp {Settings.TEMP_DIR}/etc/clickhouse-client/* /etc/clickhouse-client/",
114+
f"cp {temp_dir}/etc/clickhouse-client/* /etc/clickhouse-client/",
116115
# update_path_ch_config,
117-
# f"sed -i 's|>/var/|>{Settings.TEMP_DIR}/var/|g; s|>/etc/|>{Settings.TEMP_DIR}/etc/|g' {Settings.TEMP_DIR}/etc/clickhouse-server/config.xml",
118-
# f"sed -i 's|>/etc/|>{Settings.TEMP_DIR}/etc/|g' {Settings.TEMP_DIR}/etc/clickhouse-server/config.d/ssl_certs.xml",
119-
f"for file in /tmp/praktika/etc/clickhouse-server/config.d/*.xml; do [ -f $file ] && echo Change config $file && sed -i 's|>/var/log|>{Settings.TEMP_DIR}/var/log|g; s|>/etc/|>{Settings.TEMP_DIR}/etc/|g' $(readlink -f $file); done",
120-
f"for file in /tmp/praktika/etc/clickhouse-server/*.xml; do [ -f $file ] && echo Change config $file && sed -i 's|>/var/log|>{Settings.TEMP_DIR}/var/log|g; s|>/etc/|>{Settings.TEMP_DIR}/etc/|g' $(readlink -f $file); done",
121-
f"for file in /tmp/praktika/etc/clickhouse-server/config.d/*.xml; do [ -f $file ] && echo Change config $file && sed -i 's|<path>local_disk|<path>{Settings.TEMP_DIR}/local_disk|g' $(readlink -f $file); done",
116+
# f"sed -i 's|>/var/|>{temp_dir}/var/|g; s|>/etc/|>{temp_dir}/etc/|g' {temp_dir}/etc/clickhouse-server/config.xml",
117+
# f"sed -i 's|>/etc/|>{temp_dir}/etc/|g' {temp_dir}/etc/clickhouse-server/config.d/ssl_certs.xml",
118+
f"for file in {temp_dir}/etc/clickhouse-server/config.d/*.xml; do [ -f $file ] && echo Change config $file && sed -i 's|>/var/log|>{temp_dir}/var/log|g; s|>/etc/|>{temp_dir}/etc/|g' $(readlink -f $file); done",
119+
f"for file in {temp_dir}/etc/clickhouse-server/*.xml; do [ -f $file ] && echo Change config $file && sed -i 's|>/var/log|>{temp_dir}/var/log|g; s|>/etc/|>{temp_dir}/etc/|g' $(readlink -f $file); done",
120+
f"for file in {temp_dir}/etc/clickhouse-server/config.d/*.xml; do [ -f $file ] && echo Change config $file && sed -i 's|<path>local_disk|<path>{temp_dir}/local_disk|g' $(readlink -f $file); done",
122121
f"clickhouse-server --version",
123-
f"chmod +x /tmp/praktika/input/clickhouse-odbc-bridge",
122+
f"chmod +x {temp_dir}/clickhouse-odbc-bridge",
124123
]
125124
results.append(
126125
Result.from_commands_run(
@@ -134,7 +133,7 @@ def main():
134133
stop_watch_ = Utils.Stopwatch()
135134
step_name = "Start ClickHouse Server"
136135
print(step_name)
137-
minio_log = "/tmp/praktika/output/minio.log"
136+
minio_log = f"{temp_dir}/minio.log"
138137
res = res and CH.start_minio(test_type="stateless", log_file_path=minio_log)
139138
logs_to_attach += [minio_log]
140139
time.sleep(10)
@@ -148,8 +147,8 @@ def main():
148147
if res:
149148
print("ch started")
150149
logs_to_attach += [
151-
"/tmp/praktika/var/log/clickhouse-server/clickhouse-server.log",
152-
"/tmp/praktika/var/log/clickhouse-server/clickhouse-server.err.log",
150+
f"{temp_dir}/var/log/clickhouse-server/clickhouse-server.log",
151+
f"{temp_dir}/var/log/clickhouse-server/clickhouse-server.err.log",
153152
]
154153
results.append(
155154
Result.create_from(
@@ -176,7 +175,7 @@ def main():
176175
test=args.test,
177176
)
178177
CH.log_cluster_stop_replication()
179-
results.append(FTResultsProcessor(wd=Settings.OUTPUT_DIR).run())
178+
results.append(FTResultsProcessor(wd=temp_dir).run())
180179
results[-1].set_timing(stopwatch=stop_watch_)
181180
res = results[-1].is_ok()
182181

0 commit comments

Comments
 (0)