Skip to content

Commit 5f762ef

Browse files
al13n321al13n321
committed
Merge remote-tracking branch 'origin/master' into negging
2 parents b9a9775 + f246944 commit 5f762ef

File tree

686 files changed

+12983
-15969
lines changed

Some content is hidden

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

686 files changed

+12983
-15969
lines changed

‎.gitmodules‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,12 @@
230230
[submodule "contrib/minizip-ng"]
231231
path = contrib/minizip-ng
232232
url = https://github.com/zlib-ng/minizip-ng
233+
[submodule "contrib/qpl"]
234+
path = contrib/qpl
235+
url = https://github.com/intel/qpl
236+
[submodule "contrib/idxd-config"]
237+
path = contrib/idxd-config
238+
url = https://github.com/ClickHouse/idxd-config.git
233239
[submodule "contrib/QAT-ZSTD-Plugin"]
234240
path = contrib/QAT-ZSTD-Plugin
235241
url = https://github.com/intel/QAT-ZSTD-Plugin

‎CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.20)
1+
cmake_minimum_required(VERSION 3.25)
22

33
project(ClickHouse LANGUAGES C CXX ASM)
44

@@ -47,7 +47,7 @@ if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/sysroot/README.md")
4747
endif ()
4848

4949
# Take care to add prlimit in command line before ccache, or else ccache thinks that
50-
# prlimit is compiler, and clang++ is its input file, and refuses to work with
50+
# prlimit is compiler, and clang++ is its input file, and refuses to work with
5151
# multiple inputs, e.g in ccache log:
5252
# [2021-03-31T18:06:32.655327 36900] Command line: /usr/bin/ccache prlimit --as=10000000000 --data=5000000000 --cpu=600 /usr/bin/clang++-11 - ...... std=gnu++2a -MD -MT src/CMakeFiles/dbms.dir/Storages/MergeTree/IMergeTreeDataPart.cpp.o -MF src/CMakeFiles/dbms.dir/Storages/MergeTree/IMergeTreeDataPart.cpp.o.d -o src/CMakeFiles/dbms.dir/Storages/MergeTree/IMergeTreeDataPart.cpp.o -c ../src/Storages/MergeTree/IMergeTreeDataPart.cpp
5353
#

‎README.md‎

Lines changed: 3 additions & 8 deletions
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.1 Community Call](https://clickhouse.com/company/events/v25-1-community-release-call) - Jan 28
40+
* [v25.2 Community Call](https://clickhouse.com/company/events/v25-2-community-release-call) - Feb 27
4141

4242
## Upcoming Events
4343

@@ -47,8 +47,6 @@ 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-
* [Bangalore Meetup](https://www.meetup.com/clickhouse-bangalore-user-group/events/305497951/) - Feb 8, 2025
51-
* [Dubai Meetup](https://www.meetup.com/clickhouse-dubai-meetup-group/events/303096989/) - Feb 10, 2025
5250
* [Auckland Meetup](https://www.meetup.com/clickhouse-auckland-meetup-group/events/305666103/) - Feb 19, 2025
5351
* [Wellington Meetup](https://www.meetup.com/clickhouse-wellington-user-group/events/305666164/) - Feb 20, 2025
5452
* [Los Angeles Meetup (with DevOpsDays)](https://www.meetup.com/clickhouse-los-angeles-user-group/events/305952193) - Feb 20, 2025
@@ -59,16 +57,13 @@ Upcoming meetups
5957
* [New York Meetup](https://www.meetup.com/clickhouse-new-york-user-group/events/305916369) - March 26, 2025
6058

6159
Recent meetups
60+
* [Dubai Meetup](https://www.meetup.com/clickhouse-dubai-meetup-group/events/303096989/) - Feb 10, 2025
61+
* [Bangalore Meetup](https://www.meetup.com/clickhouse-bangalore-user-group/events/305497951/) - Feb 8, 2025
6262
* [London Meetup](https://www.meetup.com/clickhouse-london-user-group/events/305146729/) - Feb 5, 2025
6363
* [FOSDEM Dinner](https://clickhouse.com/company/events/202502-emea-brussels-fosdem-dinner) - Feb 1, 2025
6464
* [Mumbai Meetup](https://www.meetup.com/clickhouse-mumbai-user-group/events/305497320/) - Feb 1, 2025
6565
* [Zagreb Meetup](https://www.meetup.com/clickhouse-croatia-user-group/events/305455877/) - Jan 30, 2025
6666
* [Tokyo Meetup](https://www.meetup.com/clickhouse-tokyo-user-group/events/305126993/) - Jan 23, 2025
67-
* [San Francisco Meetup](https://www.meetup.com/clickhouse-silicon-valley-meetup-group/events/304286951/) - Dec 12, 2024
68-
* [Kuala Lampur Meetup](https://www.meetup.com/clickhouse-malaysia-meetup-group/events/304576472/) - Dec 11, 2024
69-
* [Stockholm Meetup](https://www.meetup.com/clickhouse-stockholm-user-group/events/304382411) - Dec 9, 2024
70-
* [New York Meetup](https://www.meetup.com/clickhouse-new-york-user-group/events/304268174) - Dec 9, 2024
71-
* [Amsterdam Meetup](https://www.meetup.com/clickhouse-netherlands-user-group/events/303638814) - Dec 3, 2024
7267

7368

7469
## Recent Recordings

‎base/base/CMakeLists.txt‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@ if (USE_CLANG_TIDY)
44
set (CMAKE_CXX_CLANG_TIDY "${CLANG_TIDY_PATH}")
55
endif ()
66

7-
# TODO: Remove this. We like to compile with C++23 (set by top-level CMakeLists) but Clang crashes with our libcxx
8-
# when instantiated from JSON.cpp. Try again when libcxx(abi) and Clang are upgraded to 16.
9-
set (CMAKE_CXX_STANDARD 20)
10-
117
configure_file(GitHash.cpp.in GitHash.generated.cpp)
128

139
set (SRCS

‎base/base/cgroupsv2.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
#pragma once
22

3+
#include <optional>
34
#include <filesystem>
45
#include <string_view>
56

7+
68
#if defined(OS_LINUX)
79
/// I think it is possible to mount the cgroups hierarchy somewhere else (e.g. when in containers).
810
/// /sys/fs/cgroup was still symlinked to the actual mount in the cases that I have seen.

‎base/base/coverage.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
#include <span>
44
#include <cstdint>
5+
#include <string>
56

67
/// Flush coverage report to file, depending on coverage system
78
/// proposed by compiler (llvm for clang and gcov for gcc).

‎base/base/find_symbols.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -370,9 +370,9 @@ inline const char * find_first_symbols_dispatch(const std::string_view haystack,
370370
{
371371
#if defined(__SSE4_2__)
372372
if (symbols.str.size() >= 5)
373-
return find_first_symbols_sse42<positive, return_mode>(haystack.begin(), haystack.end(), symbols);
373+
return find_first_symbols_sse42<positive, return_mode>(haystack.data(), haystack.data() + haystack.size(), symbols);
374374
#endif
375-
return find_first_symbols_sse2<positive, return_mode>(haystack.begin(), haystack.end(), symbols.str.data(), symbols.str.size());
375+
return find_first_symbols_sse2<positive, return_mode>(haystack.data(), haystack.data() + haystack.size(), symbols.str.data(), symbols.str.size());
376376
}
377377

378378
template <bool positive, ReturnMode return_mode, char... symbols>
@@ -385,7 +385,7 @@ inline const char * find_last_symbols_dispatch(const char * begin, const char *
385385
template <bool positive, ReturnMode return_mode>
386386
inline const char * find_last_symbols_dispatch(const std::string_view haystack, const SearchSymbols & symbols)
387387
{
388-
return find_last_symbols_sse2<positive, return_mode>(haystack.begin(), haystack.end(), symbols.str.data(), symbols.str.size());
388+
return find_last_symbols_sse2<positive, return_mode>(haystack.data(), haystack.data() + haystack.size(), symbols.str.data(), symbols.str.size());
389389
}
390390

391391
}

‎base/poco/Data/include/Poco/Data/LOB.h‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -63,20 +63,12 @@ namespace Data
6363
{
6464
}
6565

66-
LOB(const std::basic_string<T> & content) : _pContent(new std::vector<T>(content.begin(), content.end()))
67-
/// Creates a LOB from a string.
68-
{
69-
}
70-
7166
LOB(const LOB & other) : _pContent(other._pContent)
7267
/// Creates a LOB by copying another one.
7368
{
7469
}
7570

76-
~LOB()
77-
/// Destroys the LOB.
78-
{
79-
}
71+
~LOB() = default;
8072

8173
LOB & operator=(const LOB & other)
8274
/// Assignment operator.
@@ -197,14 +189,14 @@ namespace std
197189
{
198190
template <>
199191
inline void swap<Poco::Data::BLOB>(Poco::Data::BLOB & b1, Poco::Data::BLOB & b2)
200-
/// Full template specalization of std:::swap for BLOB
192+
/// Full template specalization of std::swap for BLOB
201193
{
202194
b1.swap(b2);
203195
}
204196

205197
template <>
206198
inline void swap<Poco::Data::CLOB>(Poco::Data::CLOB & c1, Poco::Data::CLOB & c2)
207-
/// Full template specalization of std:::swap for CLOB
199+
/// Full template specalization of std::swap for CLOB
208200
{
209201
c1.swap(c2);
210202
}

‎base/poco/MongoDB/include/Poco/MongoDB/QueryRequest.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ namespace MongoDB
4141

4242
QUERY_TAILABLE_CURSOR = 2,
4343
/// Tailable means cursor is not closed when the last data is retrieved.
44-
/// Rather, the cursor marks the final object’s position.
44+
/// Rather, the cursor marks the final object's position.
4545
/// You can resume using the cursor later, from where it was located,
4646
/// if more data were received. Like any "latent cursor", the cursor may
4747
/// become invalid at some point (CursorNotFound) – for example if the final

‎base/poco/Net/include/Poco/Net/NameValueCollection.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020

2121
#include <cstddef>
22+
#include <vector>
2223
#include "Poco/ListMap.h"
2324
#include "Poco/Net/Net.h"
2425
#include "Poco/String.h"

0 commit comments

Comments
 (0)