Skip to content

Commit 823b269

Browse files
committed
Merge master
2 parents 6aaa014 + fe23559 commit 823b269

File tree

260 files changed

+6333
-4473
lines changed

Some content is hidden

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

260 files changed

+6333
-4473
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ curl https://clickhouse.com/ | sh
3737
Every month we get together with the community (users, contributors, customers, those interested in learning more about ClickHouse) to discuss what is coming in the latest release.
3838
If you are interested in sharing what you've built on ClickHouse, let us know.
3939

40-
* [v25.4 Community & Release Call](https://clickhouse.com/company/events/v25-4-community-release-call) - April 22
40+
* [v25.5 Community & Release Call](https://clickhouse.com/company/events/v25-5-community-release-call) - May 22
4141

4242
## Upcoming Events
4343

base/poco/Foundation/src/URI.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -690,7 +690,7 @@ void URI::encodePath(std::string & encodedStr) const
690690
if (_enable_url_encoding)
691691
encode(_path, RESERVED_PATH, encodedStr);
692692
else
693-
encodedStr = _path;
693+
encodedStr = encodedStr + _path;
694694
}
695695

696696
void URI::decodePath(const std::string & encodedStr)

ci/defs/defs.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ class CIFiles:
103103
# ),
104104
Docker.Config(
105105
name="clickhouse/cctools",
106-
path="./docker/packager/cctools",
106+
path="./ci/docker/cctools",
107107
platforms=Docker.Platforms.arm_amd,
108108
depends_on=["clickhouse/fasttest"],
109109
),
File renamed without changes.

ci/docker/clickhouse-server/docker_related_config.xml

Lines changed: 0 additions & 12 deletions
This file was deleted.

ci/docker/clickhouse-server/entrypoint.sh

Lines changed: 0 additions & 222 deletions
This file was deleted.

ci/docker/clickhouse-server/from_binary/Dockerfile.ubuntu

Lines changed: 0 additions & 55 deletions
This file was deleted.

ci/docker/clickhouse-server/from_deb/Dockerfile.ubuntu

Lines changed: 0 additions & 58 deletions
This file was deleted.

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
@@ -2209,9 +2209,13 @@ mapAll
22092209
mapApply
22102210
mapConcat
22112211
mapContains
2212+
mapContainsKey
22122213
mapContainsKeyLike
2214+
mapContainsValue
2215+
mapContainsValueLike
22132216
mapExists
22142217
mapExtractKeyLike
2218+
mapExtractValueLike
22152219
mapFilter
22162220
mapFromArrays
22172221
mapKeys

ci/praktika/gh.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ def post_commit_status(cls, name, status, description, url):
146146
:param repo:
147147
:return: True or False in case of error
148148
"""
149+
description = description.replace("'", "'\"'\"'") # escape single quote
149150
status = cls.convert_to_gh_status(status)
150151
repo = _Environment.get().REPOSITORY
151152
command = (

0 commit comments

Comments
 (0)