Skip to content

Commit eca30f6

Browse files
committed
Merge branch 'master' into disable_enble_url_encoding
2 parents 994852f + fe0dbbe commit eca30f6

File tree

250 files changed

+4213
-1151
lines changed

Some content is hidden

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

250 files changed

+4213
-1151
lines changed

README.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,18 +47,21 @@ Please feel free to reach out to tyler `<at>` clickhouse `<dot>` com.
4747
You can also peruse [ClickHouse Events](https://clickhouse.com/company/news-events) for a list of all upcoming trainings, meetups, speaking engagements, etc.
4848

4949
Upcoming meetups
50-
* [Austin Meetup](https://www.meetup.com/clickhouse-austin-user-group/events/307289908) - May 13, 2025
5150
* [London Meetup](https://www.meetup.com/clickhouse-london-user-group/events/306047172/) - May 14, 2025
5251
* [Istanbul Meetup](https://www.meetup.com/clickhouse-turkiye-meetup-group/events/306978337/) - May 15, 2025
5352
* [Shenzhen Meetup](https://www.huodongxing.com/event/7803892350511) - May 17, 2025
53+
* [Belgium Meetup](https://www.meetup.com/clickhouse-belgium-user-group/events/307818346/) - May 20, 2025
5454
* [Seattle Meetup](https://www.meetup.com/clickhouse-seattle-user-group/events/307622716/) - May 20, 2025
5555
* [Tokyo Meetup](https://www.meetup.com/clickhouse-tokyo-user-group/events/307689645/) - June 5, 2025
56+
* [Cyprus Meetup](https://www.meetup.com/clickhouse-cyprus-user-group/events/307819236) - June 10, 2025
5657
* [Washington DC Meetup](https://www.meetup.com/clickhouse-dc-user-group/events/307622954/) - June 12, 2025
58+
* [Tel Aviv Meetup](https://www.meetup.com/clickhouse-meetup-israel/events/307820741/) - June 17, 2025
5759
* [Atlanta Meetup](https://www.meetup.com/clickhouse-atlanta-meetup-group/events/307627590/) - July 8, 2025
5860
* [New York Meetup](https://www.meetup.com/clickhouse-new-york-user-group/events/307627675/) - July 15, 2025
5961

6062

6163
Recent meetups
64+
* [Austin Meetup](https://www.meetup.com/clickhouse-austin-user-group/events/307289908) - May 13, 2025
6265
* [Denver Meetup](https://www.meetup.com/clickhouse-denver-user-group/events/306934991/) - April 23, 2025
6366
* [Jakarta Meetup with AWS](https://www.meetup.com/clickhouse-indonesia-user-group/events/306973747/) - April 22, 2025
6467
* [Kuala Lumper Meetup with CNCF](https://www.meetup.com/clickhouse-malaysia-meetup-group/events/306697678/) - April 16, 2025

ci/jobs/performance_tests.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,6 @@ def run_test(
170170
if res != 0:
171171
with open(f"{results_path}/{test_name}-err.log", "w") as f:
172172
f.write(err)
173-
err = Shell.get_output(f"echo \"{err}\" | grep '{test_name}\t'")
174173
with open(f"{results_path}/{test_name}-raw.tsv", "w") as f:
175174
f.write(out)
176175
with open(f"{results_path}/wall-clock-times.tsv", "a") as f:

ci/jobs/scripts/check_style/aspell-ignore/en/aspell-dict.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ CapContains
152152
CapUnion
153153
CapnProto
154154
CapnProtoEnumComparingMode
155+
CardSecondary
155156
CatBoost
156157
CellAreaM
157158
CellAreaRads
@@ -2484,6 +2485,7 @@ positionCaseInsensitiveUTF
24842485
positionUTF
24852486
positiveModulo
24862487
positiveModuloOrNull
2488+
postfilter
24872489
postfix
24882490
postfixes
24892491
postgres
@@ -2501,6 +2503,7 @@ prefetched
25012503
prefetches
25022504
prefetching
25032505
prefetchsize
2506+
prefilter
25042507
preflight
25052508
preimage
25062509
preloaded

ci/jobs/scripts/check_style/check-settings-style

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ done
6969
# previous releases, which is more important than consistency
7070
for setting in $(
7171
awk '{ gsub(/^.*Settings/, "", $2); print $1 " " $2}' "${SETTINGS_FILE}" | \
72-
sort | uniq | awk '{ print $1 }' | uniq -d | grep -v "connect_timeout" | grep -v "max_connections"
72+
sort | uniq | awk '{ print $1 }' | uniq -d | grep -v "connect_timeout" | grep -v "max_connections" | grep -v "max_block_size"
7373
);
7474
do
7575
echo "# Found multiple definitions of setting ${setting} with different types: "

ci/jobs/sqltest_job.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -290,9 +290,12 @@ def do():
290290
command=do,
291291
)
292292
)
293-
results[-1].set_files("report.html")
294293

295-
Result.create_from(results=results, stopwatch=stop_watch, files=[]).complete_job()
294+
Result.create_from(
295+
results=results,
296+
stopwatch=stop_watch,
297+
files=["report.html"] if results[-1].is_ok() else [],
298+
).complete_job()
296299

297300

298301
if __name__ == "__main__":

ci/praktika/info.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,10 @@ def is_merge_queue_event(self):
113113
def is_push_event(self):
114114
return self.env.EVENT_TYPE == "push"
115115

116+
@property
117+
def is_dispatch_event(self):
118+
return self.env.EVENT_TYPE == "dispatch"
119+
116120
@property
117121
def instance_lifecycle(self):
118122
return self.env.INSTANCE_LIFE_CYCLE

ci/praktika/job.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ def parametrize(
9292
== len(timeout)
9393
== len(provides)
9494
== len(requires)
95-
), f"Parametrization lists must be of the same size [{len(parameter)}, {len(runs_on)}, {len(timeout)}, {len(provides)}, {len(requires)}]"
95+
), f"Parametrization lists for job [{self.name}] must be of the same size [{len(parameter)}, {len(runs_on)}, {len(timeout)}, {len(provides)}, {len(requires)}]"
9696

9797
res = []
9898
for parameter_, runs_on_, timeout_, provides_, requires_ in zip(

ci/praktika/json.html

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1257,10 +1257,6 @@
12571257
return { data: jsonData, lastModifiedTime: newLastModifiedTime, eTag: newETag, updated: true };
12581258
} catch (error) {
12591259
console.error('Error loading Results:', error);
1260-
if (infoElement) {
1261-
infoElement.textContent = 'Error loading data';
1262-
infoElement.style.display = 'block';
1263-
}
12641260
return { data: null, lastModifiedTime: null, eTag: null, updated: true };
12651261
}
12661262
}

ci/praktika/result.py

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -545,21 +545,14 @@ def copy_result_to_s3(cls, result, clean=False):
545545
s3_path = f"{Settings.HTML_S3_PATH}/{env.get_s3_prefix()}/{Path(result_file_path).name}"
546546
if clean:
547547
S3.delete(s3_path)
548-
archive_file = Utils.compress_file(result_file_path, no_strict=True)
549-
archive_type = archive_file.split(".")[-1]
550-
content_encoding = ""
551-
if archive_type == "gz":
548+
# gzip is supported by most browsers
549+
archive_file = Utils.compress_file_gz(result_file_path)
550+
if archive_file:
551+
assert archive_file.endswith(".gz")
552552
content_encoding = "gzip"
553-
elif archive_type == "zst":
554-
content_encoding = "zstd"
555-
elif archive_type == "br":
556-
content_encoding = "br"
557553
else:
558-
if archive_type:
559-
print(
560-
f"WARNING: Not supported compress codec: [{archive_type}] - skip compress"
561-
)
562-
archive_file = result_file_path
554+
content_encoding = ""
555+
archive_file = result_file_path
563556

564557
url = S3.copy_file_to_s3(
565558
s3_path=s3_path,

ci/praktika/runner.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ def generate_local_run_environment(workflow, job, pr=None, sha=None):
3636
BRANCH="branch_name",
3737
SHA=sha or Shell.get_output("git rev-parse HEAD"),
3838
PR_NUMBER=pr or -1,
39-
EVENT_TYPE="",
39+
EVENT_TYPE=workflow.event,
4040
JOB_OUTPUT_STREAM="",
4141
EVENT_FILE_PATH="",
4242
CHANGE_URL="",
@@ -250,7 +250,8 @@ def _run(self, workflow, job, docker="", no_docker=False, param=None, test=""):
250250
docker = docker or f"{docker_name}:{docker_tag}"
251251
current_dir = os.getcwd()
252252
Shell.check(
253-
"docker ps | grep -q praktika && docker rm -f praktika", verbose=True
253+
"docker ps -a --format '{{.Names}}' | grep -q praktika && docker rm -f praktika",
254+
verbose=True,
254255
)
255256
cmd = f"docker run --rm --name praktika {'--user $(id -u):$(id -g)' if not from_root else ''} -e PYTHONPATH='.:./ci' --volume ./:{current_dir} --workdir={current_dir} {' '.join(settings)} {docker} {job.command}"
256257
else:

0 commit comments

Comments
 (0)