Skip to content

Commit 259cb46

Browse files
authored
Merge branch 'ClickHouse:master' into ci_mod
2 parents 505fc59 + 673d5c4 commit 259cb46

Some content is hidden

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

41 files changed

+466
-51
lines changed

.github/workflows/create_release.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,10 @@ jobs:
135135
./utils/list-versions/update-docker-version.sh
136136
echo "Generate ChangeLog"
137137
export CI=1
138+
docker pull clickhouse/style-test:latest
138139
docker run -u "${UID}:${GID}" -e PYTHONUNBUFFERED=1 -e CI=1 --network=host \
139140
--volume=".:/wd" --workdir="/wd" \
140-
clickhouse/style-test \
141+
clickhouse/style-test:latest \
141142
./tests/ci/changelog.py -v --debug-helpers \
142143
--gh-user-or-token ${{ secrets.ROBOT_CLICKHOUSE_COMMIT_TOKEN }} \
143144
--jobs=5 \

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114

115115
#### Bug Fix (user-visible misbehavior in an official stable release)
116116
* Fix incorrect projection analysis when `count(Nullable)` is used in aggregate projections. This fixes [#74495](https://github.com/ClickHouse/ClickHouse/issues/74495) . This PR also adds some logs around projection analysis to clarify why a projection is used or why not. [#74498](https://github.com/ClickHouse/ClickHouse/pull/74498) ([Amos Bird](https://github.com/amosbird)).
117-
* Fix "Part <...> does not contain in snapshot of previous virtual parts. (PART_IS_TEMPORARILY_LOCKED)" during DETACH PART. [#76039](https://github.com/ClickHouse/ClickHouse/pull/76039) ([Aleksei Filatov](https://github.com/aalexfvk)).
117+
* Fix `Part <...> does not contain in snapshot of previous virtual parts. (PART_IS_TEMPORARILY_LOCKED)` during `DETACH PART`. [#76039](https://github.com/ClickHouse/ClickHouse/pull/76039) ([Aleksei Filatov](https://github.com/aalexfvk)).
118118
* Fix not working skip indexes with expression with literals in analyzer and remove trivial casts during indexes analysis. [#77229](https://github.com/ClickHouse/ClickHouse/pull/77229) ([Pavel Kruglov](https://github.com/Avogar)).
119119
* Fix a bug when `close_session` query parameter didn't have any effect leading to named sessions being closed only after `session_timeout`. [#77336](https://github.com/ClickHouse/ClickHouse/pull/77336) ([Alexey Katsman](https://github.com/alexkats)).
120120
* Fixed receiving messages from NATS server without attached Materialized Views. [#77392](https://github.com/ClickHouse/ClickHouse/pull/77392) ([Dmitry Novikov](https://github.com/dmitry-sles-novikov)).

ci/docker/style-test/requirements.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,8 @@ yamllint==1.26.3
33
codespell==2.2.1
44
mypy==1.15.0
55
pylint==3.1.0
6-
tqdm==4.67.1 # required for change log generation
6+
# required for change log generation:
7+
tqdm==4.67.1
8+
thefuzz==0.22.1
9+
PyGitHub==2.6.1
10+
boto3==1.37.38

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1728,6 +1728,7 @@ distinctdynamictypes
17281728
distinctjsonpaths
17291729
distro
17301730
divideDecimal
1731+
divideOrNull
17311732
dmesg
17321733
doesnt
17331734
domainRFC
@@ -2038,6 +2039,7 @@ inodes
20382039
instantiation
20392040
instantiations
20402041
intDiv
2042+
intDivOrNull
20412043
intDivOrZero
20422044
intExp
20432045
intHash
@@ -2264,6 +2266,7 @@ mmap
22642266
mmapped
22652267
modularization
22662268
moduli
2269+
moduloOrNull
22672270
moduloOrZero
22682271
mongoc
22692272
mongocxx
@@ -2476,6 +2479,7 @@ positionCaseInsensitive
24762479
positionCaseInsensitiveUTF
24772480
positionUTF
24782481
positiveModulo
2482+
positiveModuloOrNull
24792483
postfix
24802484
postfixes
24812485
postgres

docker/keeper/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ RUN arch=${TARGETARCH:-amd64} \
3838
# lts / testing / prestable / etc
3939
ARG REPO_CHANNEL="stable"
4040
ARG REPOSITORY="https://packages.clickhouse.com/tgz/${REPO_CHANNEL}"
41-
ARG VERSION="25.3.2.39"
41+
ARG VERSION="25.3.3.42"
4242
ARG PACKAGES="clickhouse-keeper"
4343
ARG DIRECT_DOWNLOAD_URLS=""
4444

docker/server/Dockerfile.alpine

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ RUN arch=${TARGETARCH:-amd64} \
3535
# lts / testing / prestable / etc
3636
ARG REPO_CHANNEL="stable"
3737
ARG REPOSITORY="https://packages.clickhouse.com/tgz/${REPO_CHANNEL}"
38-
ARG VERSION="25.3.2.39"
38+
ARG VERSION="25.3.3.42"
3939
ARG PACKAGES="clickhouse-client clickhouse-server clickhouse-common-static"
4040
ARG DIRECT_DOWNLOAD_URLS=""
4141

docker/server/Dockerfile.ubuntu

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ RUN sed -i "s|http://archive.ubuntu.com|${apt_archive}|g" /etc/apt/sources.list
2828

2929
ARG REPO_CHANNEL="stable"
3030
ARG REPOSITORY="deb [signed-by=/usr/share/keyrings/clickhouse-keyring.gpg] https://packages.clickhouse.com/deb ${REPO_CHANNEL} main"
31-
ARG VERSION="25.3.2.39"
31+
ARG VERSION="25.3.3.42"
3232
ARG PACKAGES="clickhouse-client clickhouse-server clickhouse-common-static"
3333

3434
#docker-official-library:off

docs/changelogs/v25.3.3.42-lts.md

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
---
2+
sidebar_position: 1
3+
sidebar_label: 2025
4+
---
5+
6+
# 2025 Changelog
7+
8+
### ClickHouse release v25.3.3.42-lts (c4bfe68b052) FIXME as compared to v25.3.2.39-lts (3ec1fd3f690)
9+
10+
#### Improvement
11+
* Backported in [#78899](https://github.com/ClickHouse/ClickHouse/issues/78899): Fix `IN` clause type coercion for `BFloat16` (i.e. `SELECT toBFloat16(1) IN [1, 2, 3];` now returns `1`). Closes [#78754](https://github.com/ClickHouse/ClickHouse/issues/78754). [#78839](https://github.com/ClickHouse/ClickHouse/pull/78839) ([Raufs Dunamalijevs](https://github.com/rienath)).
12+
* Backported in [#79137](https://github.com/ClickHouse/ClickHouse/issues/79137): Remove settings during `recoverLostReplica` same as it was done in: https://github.com/ClickHouse/ClickHouse/pull/78637. [#79113](https://github.com/ClickHouse/ClickHouse/pull/79113) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
13+
14+
#### Bug Fix (user-visible misbehavior in an official stable release)
15+
* Backported in [#78790](https://github.com/ClickHouse/ClickHouse/issues/78790): Fix not working skip indexes with expression with literals in analyzer and remove trivial casts during indexes analysis. [#77229](https://github.com/ClickHouse/ClickHouse/pull/77229) ([Pavel Kruglov](https://github.com/Avogar)).
16+
* Backported in [#79285](https://github.com/ClickHouse/ClickHouse/issues/79285): Fixed refreshable materialized view in Replicated database not working on newly added replicas. [#77774](https://github.com/ClickHouse/ClickHouse/pull/77774) ([Michael Kolupaev](https://github.com/al13n321)).
17+
* Backported in [#78438](https://github.com/ClickHouse/ClickHouse/issues/78438): Fix metadata override in Database Replicated which could have happened due to a RENAME query executed right after an ALTER query. [#78107](https://github.com/ClickHouse/ClickHouse/pull/78107) ([Nikolay Degterinsky](https://github.com/evillique)).
18+
* Backported in [#78547](https://github.com/ClickHouse/ClickHouse/issues/78547): Mask azure access signature to be not visible to user or in logs. [#78189](https://github.com/ClickHouse/ClickHouse/pull/78189) ([Kseniia Sumarokova](https://github.com/kssenii)).
19+
* Backported in [#78528](https://github.com/ClickHouse/ClickHouse/issues/78528): Fix prefetch of substreams with prefixes in Wide parts. [#78205](https://github.com/ClickHouse/ClickHouse/pull/78205) ([Pavel Kruglov](https://github.com/Avogar)).
20+
* Backported in [#78952](https://github.com/ClickHouse/ClickHouse/issues/78952): Not schedule RefreshMV task if a replica's `disable_insertion_and_mutation` is true. A task is some insertion, it will failed if `disable_insertion_and_mutation` is true. [#78277](https://github.com/ClickHouse/ClickHouse/pull/78277) ([Xu Jia](https://github.com/XuJia0210)).
21+
* Backported in [#78979](https://github.com/ClickHouse/ClickHouse/issues/78979): Validate access to underlying tables for the Merge engine. [#78339](https://github.com/ClickHouse/ClickHouse/pull/78339) ([Pervakov Grigorii](https://github.com/GrigoryPervakov)).
22+
* Backported in [#78649](https://github.com/ClickHouse/ClickHouse/issues/78649): FINAL modifier can be lost for `Distributed` engine table. [#78428](https://github.com/ClickHouse/ClickHouse/pull/78428) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
23+
* Backported in [#78534](https://github.com/ClickHouse/ClickHouse/issues/78534): Revert "Apply preserve_most attribute at some places in code" since it may lead to crashes. [#78449](https://github.com/ClickHouse/ClickHouse/pull/78449) ([Azat Khuzhin](https://github.com/azat)).
24+
* Backported in [#78760](https://github.com/ClickHouse/ClickHouse/issues/78760): Set at least one stream for reading in case there are zero planned streams after applying `max_streams_to_max_threads_ratio` setting. [#78505](https://github.com/ClickHouse/ClickHouse/pull/78505) ([Eduard Karacharov](https://github.com/korowa)).
25+
* Backported in [#78614](https://github.com/ClickHouse/ClickHouse/issues/78614): ClickHouse is now able to figure out its cgroup v2 on systems with both cgroups v1 and v2 enabled. [#78566](https://github.com/ClickHouse/ClickHouse/pull/78566) ([Grigory Korolev](https://github.com/gkorolev)).
26+
* Backported in [#78772](https://github.com/ClickHouse/ClickHouse/issues/78772): ObjectStorage cluster table functions failed when used with table level-settings. [#78587](https://github.com/ClickHouse/ClickHouse/pull/78587) ([Daniil Ivanik](https://github.com/divanik)).
27+
* Backported in [#78685](https://github.com/ClickHouse/ClickHouse/issues/78685): Remove query settings during attach. [#78637](https://github.com/ClickHouse/ClickHouse/pull/78637) ([Raúl Marín](https://github.com/Algunenano)).
28+
* Backported in [#78945](https://github.com/ClickHouse/ClickHouse/issues/78945): Fix crash in REFRESHABLE MV in case of ALTER after incorrect shutdown. [#78858](https://github.com/ClickHouse/ClickHouse/pull/78858) ([Azat Khuzhin](https://github.com/azat)).
29+
* Backported in [#79272](https://github.com/ClickHouse/ClickHouse/issues/79272): Keeper fix: Avoid triggering watches on failed multi requests. [#79247](https://github.com/ClickHouse/ClickHouse/pull/79247) ([Antonio Andelic](https://github.com/antonio2368)).
30+
31+
#### NO CL CATEGORY
32+
33+
* Backported in [#78326](https://github.com/ClickHouse/ClickHouse/issues/78326):. [#78097](https://github.com/ClickHouse/ClickHouse/pull/78097) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
34+
35+
#### NOT FOR CHANGELOG / INSIGNIFICANT
36+
37+
* Backported in [#78333](https://github.com/ClickHouse/ClickHouse/issues/78333): Add Database Prefix in Kafka Table Logs for Improved Accuracy. [#76720](https://github.com/ClickHouse/ClickHouse/pull/76720) ([VicoWu](https://github.com/VicoWu)).
38+
* Backported in [#78607](https://github.com/ClickHouse/ClickHouse/issues/78607): Log invalid HTTP version string. [#78264](https://github.com/ClickHouse/ClickHouse/pull/78264) ([Christoph Wurm](https://github.com/cwurm)).
39+
* Backported in [#78400](https://github.com/ClickHouse/ClickHouse/issues/78400): CI: Fix for migration to pyjwt auth. [#78396](https://github.com/ClickHouse/ClickHouse/pull/78396) ([Max Kainov](https://github.com/maxknv)).
40+
* Backported in [#78735](https://github.com/ClickHouse/ClickHouse/issues/78735): We do not count tables from the `system` database when we check the limit of tables, so we should also not check the limits for tables in `system` database. [#78653](https://github.com/ClickHouse/ClickHouse/pull/78653) ([Nikolay Degterinsky](https://github.com/evillique)).
41+

docs/en/operations/workload-scheduling.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ CPU time is consumed by threads when they are not blocked and work on CPU-intens
237237
* Master thread — the first thread that starts working on a query or background activity like a merge or a mutation.
238238
* Worker thread — the additional threads that master can spawn to work on CPU-intensive tasks.
239239

240-
It may be desirable to use separate resources for master and worker threads to achieve better responsiveness. A high number of worker threads can easily monopolize CPU resource when high `max_thread` query setting values are used. Then incoming queries should block and wait a CPU slot for its master thread to start execution. To avoid this the following configuration could be used:
240+
It may be desirable to use separate resources for master and worker threads to achieve better responsiveness. A high number of worker threads can easily monopolize CPU resource when high `max_threads` query setting values are used. Then incoming queries should block and wait a CPU slot for its master thread to start execution. To avoid this the following configuration could be used:
241241

242242
```sql
243243
CREATE RESOURCE worker_cpu (WORKER THREAD)

0 commit comments

Comments
 (0)