Skip to content

Commit c68aaca

Browse files
robot-clickhouserobot-clickhouse
authored
Merge pull request ClickHouse#79020 from ClickHouse/bump_version_25.5.1.1
Update version after release
2 parents c104ad2 + 0f0cd0d commit c68aaca

File tree

3 files changed

+41
-5
lines changed

3 files changed

+41
-5
lines changed

‎cmake/autogenerated_versions.txt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
# NOTE: VERSION_REVISION has nothing common with DBMS_TCP_PROTOCOL_VERSION,
44
# only DBMS_TCP_PROTOCOL_VERSION should be incremented on protocol changes.
5-
SET(VERSION_REVISION 54497)
5+
SET(VERSION_REVISION 54498)
66
SET(VERSION_MAJOR 25)
7-
SET(VERSION_MINOR 4)
7+
SET(VERSION_MINOR 5)
88
SET(VERSION_PATCH 1)
9-
SET(VERSION_GITHASH 6849013e378520254f8246d76460840037ee447e)
10-
SET(VERSION_DESCRIBE v25.4.1.1-testing)
11-
SET(VERSION_STRING 25.4.1.1)
9+
SET(VERSION_GITHASH 90b13185583c7d97f4a33af179684153167c4921)
10+
SET(VERSION_DESCRIBE v25.5.1.1-testing)
11+
SET(VERSION_STRING 25.5.1.1)
1212
# end of autochange

‎src/Core/SettingsChangesHistory.cpp‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,12 @@ const VersionToSettingsChangesMap & getSettingsChangesHistory()
6666
/// controls new feature and it's 'true' by default, use 'false' as previous_value).
6767
/// It's used to implement `compatibility` setting (see https://github.com/ClickHouse/ClickHouse/issues/35972)
6868
/// Note: please check if the key already exists to prevent duplicate entries.
69+
addSettingsChanges(settings_changes_history, "25.5",
70+
{
71+
});
6972
addSettingsChanges(settings_changes_history, "25.4",
7073
{
74+
/// Release closed. Please use 25.5
7175
{"allow_materialized_view_with_bad_select", true, false, "Don't allow creating MVs referencing nonexistent columns or tables"},
7276
{"query_plan_optimize_lazy_materialization", false, true, "Added new setting to use query plan for lazy materialization optimisation"},
7377
{"query_plan_max_limit_for_lazy_materialization", 10, 10, "Added new setting to control maximum limit value that allows to use query plan for lazy materialization optimisation. If zero, there is no limit"},
@@ -81,6 +85,7 @@ const VersionToSettingsChangesMap & getSettingsChangesHistory()
8185
{"distributed_cache_read_request_max_tries", 20, 20, "New setting"},
8286
{"min_os_cpu_wait_time_ratio_to_throw", 0, 2, "New setting"},
8387
{"max_os_cpu_wait_time_ratio_to_throw", 0, 6, "New setting"},
88+
/// Release closed. Please use 25.5
8489
});
8590
addSettingsChanges(settings_changes_history, "25.3",
8691
{
@@ -701,13 +706,18 @@ const VersionToSettingsChangesMap & getMergeTreeSettingsChangesHistory()
701706
static std::once_flag initialized_flag;
702707
std::call_once(initialized_flag, [&]
703708
{
709+
addSettingsChanges(merge_tree_settings_changes_history, "25.5",
710+
{
711+
});
704712
addSettingsChanges(merge_tree_settings_changes_history, "25.4",
705713
{
714+
/// Release closed. Please use 25.5
706715
{"max_merge_delayed_streams_for_parallel_write", 1000, 100, "New setting"},
707716
{"max_postpone_time_for_failed_replicated_fetches_ms", 1ULL * 60 * 1000, 1ULL * 60 * 1000, "Added new setting to enable postponing fetch tasks in the replication queue."},
708717
{"max_postpone_time_for_failed_replicated_merges_ms", 1ULL * 60 * 1000, 1ULL * 60 * 1000, "Added new setting to enable postponing merge tasks in the replication queue."},
709718
{"max_postpone_time_for_failed_replicated_tasks_ms", 5ULL * 60 * 1000, 5ULL * 60 * 1000, "Added new setting to enable postponing tasks in the replication queue."},
710719
{"allow_summing_columns_in_partition_or_order_key", true, false, "New setting to allow summing of partition or sorting key columns"},
720+
/// Release closed. Please use 25.5
711721
});
712722
addSettingsChanges(merge_tree_settings_changes_history, "25.3",
713723
{

‎src/Storages/System/StorageSystemContributors.generated.cpp‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ const char * auto_contributors[] {
128128
"Amesaru",
129129
"Amila Welihinda",
130130
"Amir Vaza",
131+
"Amol Saini",
131132
"Amos Bird",
132133
"Amr Alaa",
133134
"Amy Krishnevsky",
@@ -386,6 +387,7 @@ const char * auto_contributors[] {
386387
"DoomzD",
387388
"Dorota Szeremeta",
388389
"Dr. Strange Looker",
390+
"Drew Davis",
389391
"Duc Canh Le",
390392
"DuckSoft",
391393
"Duyet Le",
@@ -402,6 +404,7 @@ const char * auto_contributors[] {
402404
"Elghazal Ahmed",
403405
"Eliot Hautefeuille",
404406
"Elizaveta Mironyuk",
407+
"Elmi Ahmadov",
405408
"Elykov Alexandr",
406409
"Emmanuel Dias",
407410
"Emmanuel Donin de Rosière",
@@ -441,6 +444,7 @@ const char * auto_contributors[] {
441444
"Federico Ceratto",
442445
"Federico Rodriguez",
443446
"FeehanG",
447+
"Fellipe Fernandes",
444448
"Feng Kaiyu",
445449
"Fern",
446450
"FgoDt",
@@ -495,6 +499,7 @@ const char * auto_contributors[] {
495499
"Grigorii Sokolik",
496500
"Grigory",
497501
"Grigory Buteyko",
502+
"Grigory Korolev",
498503
"Grigory Pervakov",
499504
"GruffGemini",
500505
"Grégoire Pineau",
@@ -603,6 +608,7 @@ const char * auto_contributors[] {
603608
"Jens Hoevenaars",
604609
"Jesse Grodman",
605610
"Jhonso7393",
611+
"Jia Xu",
606612
"Jiading Guo",
607613
"Jianfei Hu",
608614
"Jiang Tao",
@@ -620,6 +626,7 @@ const char * auto_contributors[] {
620626
"Joey Wang",
621627
"Johannes Visintini",
622628
"John",
629+
"John Doe",
623630
"John Hummel",
624631
"John Skopis",
625632
"John Spurlock",
@@ -741,6 +748,7 @@ const char * auto_contributors[] {
741748
"Lucid Dreams",
742749
"Luck-Chang",
743750
"Luis Bosque",
751+
"Luke Gannon",
744752
"Lv Feng",
745753
"Léo Ercolanelli",
746754
"M0r64n",
@@ -882,6 +890,7 @@ const char * auto_contributors[] {
882890
"Mr.General",
883891
"Murat Kabilov",
884892
"Murat Khairulin",
893+
"Muzammil Abdul Rehman",
885894
"MyroTk",
886895
"Márcio Martins",
887896
"Mátyás Jani",
@@ -926,6 +935,7 @@ const char * auto_contributors[] {
926935
"NikitaEvs",
927936
"Nikolai Fedorovskikh",
928937
"Nikolai Kochetov",
938+
"Nikolai Ryzhov",
929939
"Nikolai Sorokin",
930940
"Nikolay",
931941
"Nikolay Degterinsky",
@@ -972,6 +982,7 @@ const char * auto_contributors[] {
972982
"Palash Goel",
973983
"PapaToemmsn",
974984
"Paramtamtam",
985+
"ParvezAhamad Kazi",
975986
"Patrick Druley",
976987
"Patrick Galbraith",
977988
"Patrick Zippenfenig",
@@ -986,6 +997,7 @@ const char * auto_contributors[] {
986997
"Pavel Medvedev",
987998
"Pavel Novitskiy",
988999
"Pavel Patrin",
1000+
"Pavel Shutsin",
9891001
"Pavel Yakunin",
9901002
"Pavlo Bashynskiy",
9911003
"Pawel Rog",
@@ -1084,8 +1096,10 @@ const char * auto_contributors[] {
10841096
"Sachin",
10851097
"SadiHassan",
10861098
"Safronov Michail",
1099+
"Saif Ullah",
10871100
"SaltTan",
10881101
"Salvatore Mesoraca",
1102+
"Samay Sharma",
10891103
"Sameer Tamsekar",
10901104
"Sami Kerola",
10911105
"Samuel Chou",
@@ -1137,6 +1151,7 @@ const char * auto_contributors[] {
11371151
"Sergio Tulentsev",
11381152
"SevaCode",
11391153
"Seyed Mehrshad Hosseini",
1154+
"Shahbaz Aamir",
11401155
"Shane Andrade",
11411156
"Shanfeng Pang",
11421157
"Shani Elharrar",
@@ -1183,6 +1198,7 @@ const char * auto_contributors[] {
11831198
"Stig Bakken",
11841199
"Storozhuk Kostiantyn",
11851200
"Stupnikov Andrey",
1201+
"Sumit",
11861202
"SuperBot",
11871203
"SuperDJY",
11881204
"SupunKavinda",
@@ -1225,6 +1241,7 @@ const char * auto_contributors[] {
12251241
"Tobias Adamson",
12261242
"Tobias Florek",
12271243
"Tobias Lins",
1244+
"Todd Yocum",
12281245
"Tom Bombadil",
12291246
"Tom Risse",
12301247
"Tomas Barton",
@@ -1292,6 +1309,7 @@ const char * auto_contributors[] {
12921309
"Vlad Arkhipov",
12931310
"Vlad Seliverstov",
12941311
"Vladimir",
1312+
"Vladimir Baikov",
12951313
"Vladimir Bunchuk",
12961314
"Vladimir C",
12971315
"Vladimir Ch",
@@ -1331,12 +1349,14 @@ const char * auto_contributors[] {
13311349
"William Schoeffel",
13321350
"William Shallum",
13331351
"Winter Zhang",
1352+
"Wudidapaopao",
13341353
"Xavier Leune",
13351354
"Xbitz29",
13361355
"XenoAmess",
13371356
"Xianda Ke",
13381357
"Xiang Zhou",
13391358
"Xiaofei Hu",
1359+
"Xiaozhe Yu",
13401360
"Xin Wang",
13411361
"Xoel Lopez Barata",
13421362
"Xu Jia",
@@ -1447,6 +1467,7 @@ const char * auto_contributors[] {
14471467
"anton",
14481468
"ap11",
14491469
"aprudaev",
1470+
"arf42",
14501471
"artem-yadr",
14511472
"artpaul",
14521473
"asiana21",
@@ -1506,6 +1527,7 @@ const char * auto_contributors[] {
15061527
"chloro",
15071528
"chou.fan",
15081529
"christophe.kalenzaga",
1530+
"cjw",
15091531
"clarkcaoliu",
15101532
"clickhouse-adrianfraguela",
15111533
"clickhouse-robot-curie",
@@ -1579,6 +1601,7 @@ const char * auto_contributors[] {
15791601
"fastio",
15801602
"favstovol",
15811603
"feihengye",
1604+
"felipeagfranceschini",
15821605
"felixoid",
15831606
"felixxdu",
15841607
"feng lv",
@@ -1723,6 +1746,7 @@ const char * auto_contributors[] {
17231746
"kothiga",
17241747
"kreuzerkrieg",
17251748
"kruglov",
1749+
"krzaq",
17261750
"ks1322",
17271751
"kshvakov",
17281752
"kssenii",
@@ -2065,6 +2089,7 @@ const char * auto_contributors[] {
20652089
"wineternity",
20662090
"woodlzm",
20672091
"wudidapaopao",
2092+
"wujianchao5",
20682093
"wuxiaobai24",
20692094
"wxybear",
20702095
"wzl",
@@ -2139,6 +2164,7 @@ const char * auto_contributors[] {
21392164
"zlx19950903",
21402165
"zombee0",
21412166
"zoomxi",
2167+
"zouyunhe",
21422168
"zvonand",
21432169
"zvrr",
21442170
"zvvr",

0 commit comments

Comments
 (0)