Skip to content

Commit fa87f7b

Browse files
nihalzpnihalzp
authored
Merge branch 'master' into parquet-json-support
2 parents 768ed8e + 759349e commit fa87f7b

File tree

485 files changed

+7921
-13241
lines changed

Some content is hidden

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

485 files changed

+7921
-13241
lines changed

‎.gitmodules‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -369,3 +369,6 @@
369369
[submodule "contrib/SHA3IUF"]
370370
path = contrib/SHA3IUF
371371
url = https://github.com/brainhub/SHA3IUF.git
372+
[submodule "contrib/chdig"]
373+
path = contrib/chdig
374+
url = https://github.com/azat/chdig.git

‎README.md‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,20 +47,23 @@ 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-
* [London Meetup](https://www.meetup.com/clickhouse-london-user-group/events/306047172/) - May 14, 2025
51-
* [Istanbul Meetup](https://www.meetup.com/clickhouse-turkiye-meetup-group/events/306978337/) - May 15, 2025
52-
* [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
54-
* [Seattle Meetup](https://www.meetup.com/clickhouse-seattle-user-group/events/307622716/) - May 20, 2025
5550
* [Tokyo Meetup](https://www.meetup.com/clickhouse-tokyo-user-group/events/307689645/) - June 5, 2025
5651
* [Cyprus Meetup](https://www.meetup.com/clickhouse-cyprus-user-group/events/307819236) - June 10, 2025
5752
* [Washington DC Meetup](https://www.meetup.com/clickhouse-dc-user-group/events/307622954/) - June 12, 2025
5853
* [Tel Aviv Meetup](https://www.meetup.com/clickhouse-meetup-israel/events/307820741/) - June 17, 2025
54+
* [Paris Meetup](https://www.meetup.com/clickhouse-france-user-group/events/308053030/) - June 19, 2025
55+
* [Berlin Meetup](https://www.meetup.com/clickhouse-berlin-user-group/events/307866586/) - June 24, 2025
56+
* [Amsterdam Meetup](https://www.meetup.com/clickhouse-netherlands-user-group/events/308053051/) - June 25, 2025
5957
* [Atlanta Meetup](https://www.meetup.com/clickhouse-atlanta-meetup-group/events/307627590/) - July 8, 2025
6058
* [New York Meetup](https://www.meetup.com/clickhouse-new-york-user-group/events/307627675/) - July 15, 2025
6159

6260

6361
Recent meetups
62+
* [London Meetup](https://www.meetup.com/clickhouse-london-user-group/events/306047172/) - May 14, 2025
63+
* [Istanbul Meetup](https://www.meetup.com/clickhouse-turkiye-meetup-group/events/306978337/) - May 15, 2025
64+
* [Shenzhen Meetup](https://www.huodongxing.com/event/7803892350511) - May 17, 2025
65+
* [Belgium Meetup](https://www.meetup.com/clickhouse-belgium-user-group/events/307818346/) - May 20, 2025
66+
* [Seattle Meetup](https://www.meetup.com/clickhouse-seattle-user-group/events/307622716/) - May 20, 2025
6467
* [Austin Meetup](https://www.meetup.com/clickhouse-austin-user-group/events/307289908) - May 13, 2025
6568
* [Denver Meetup](https://www.meetup.com/clickhouse-denver-user-group/events/306934991/) - April 23, 2025
6669
* [Jakarta Meetup with AWS](https://www.meetup.com/clickhouse-indonesia-user-group/events/306973747/) - April 22, 2025

‎base/base/Decimal.h‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ namespace DB
1010
{
1111
template <class> struct Decimal;
1212
class DateTime64;
13-
class Time64;
1413

1514
#define FOR_EACH_UNDERLYING_DECIMAL_TYPE(M) \
1615
M(Int32) \
@@ -143,16 +142,6 @@ class DateTime64 : public Decimal64
143142

144143
constexpr DateTime64(const Base & v): Base(v) {} // NOLINT(google-explicit-constructor)
145144
};
146-
147-
class Time64 : public Decimal64
148-
{
149-
public:
150-
using Base = Decimal64;
151-
using Base::Base;
152-
using NativeType = Base::NativeType;
153-
154-
constexpr Time64(const Base & v): Base(v) {} // NOLINT(google-explicit-constructor)
155-
};
156145
}
157146

158147
constexpr UInt64 max_uint_mask = std::numeric_limits<UInt64>::max();
@@ -184,15 +173,6 @@ namespace std
184173
}
185174
};
186175

187-
template <>
188-
struct hash<DB::Time64>
189-
{
190-
size_t operator()(const DB::Time64 & x) const
191-
{
192-
return std::hash<DB::Time64::NativeType>()(x);
193-
}
194-
};
195-
196176
template <>
197177
struct hash<DB::Decimal256>
198178
{

‎base/base/Decimal_fwd.h‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,14 @@ using Decimal128 = Decimal<Int128>;
2727
using Decimal256 = Decimal<Int256>;
2828

2929
class DateTime64;
30-
class Time64;
3130

3231
template <class T>
3332
concept is_decimal =
3433
std::is_same_v<T, Decimal32>
3534
|| std::is_same_v<T, Decimal64>
3635
|| std::is_same_v<T, Decimal128>
3736
|| std::is_same_v<T, Decimal256>
38-
|| std::is_same_v<T, DateTime64>
39-
|| std::is_same_v<T, Time64>;
37+
|| std::is_same_v<T, DateTime64>;
4038

4139
template <class T>
4240
concept is_over_big_int =

‎base/base/TypeName.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ TN_MAP(Decimal64)
4444
TN_MAP(Decimal128)
4545
TN_MAP(Decimal256)
4646
TN_MAP(DateTime64)
47-
TN_MAP(Time64)
4847
TN_MAP(Array)
4948
TN_MAP(Tuple)
5049
TN_MAP(Map)

‎base/base/extended_types.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ template <typename T> concept is_floating_point =
7474
M(DataTypeDate) \
7575
M(DataTypeDate32) \
7676
M(DataTypeDateTime) \
77-
M(DataTypeTime) \
7877
M(DataTypeInt8) \
7978
M(DataTypeUInt8) \
8079
M(DataTypeInt16) \
@@ -95,7 +94,6 @@ template <typename T> concept is_floating_point =
9594
M(DataTypeDate, X) \
9695
M(DataTypeDate32, X) \
9796
M(DataTypeDateTime, X) \
98-
M(DataTypeTime, X) \
9997
M(DataTypeInt8, X) \
10098
M(DataTypeUInt8, X) \
10199
M(DataTypeInt16, X) \

‎ci/docker/fasttest/requirements.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
Jinja2==3.1.3
1+
Jinja2==3.1.6
22
numpy==1.26.4
33
requests==2.32.3
44
pandas==1.5.3
55
scipy==1.12.0
6-
urllib3==1.26.5
6+
urllib3==1.26.20

‎ci/docker/integration/integration-test/requirements.txt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
blinker==1.4
2-
cryptography==3.4.8
2+
cryptography==43.0.1
33
dbus-python==1.2.18
44
distro==1.7.0
55
httplib2==0.20.2
@@ -10,16 +10,16 @@ launchpadlib==1.10.16
1010
lazr.restfulclient==0.14.4
1111
lazr.uri==1.0.6
1212
more-itertools==8.10.0
13-
oauthlib==3.2.0
13+
oauthlib==3.2.2
1414
packaging==24.1
15-
pip==24.1.1
15+
pip==25.0.1
1616
pipdeptree==2.23.0
1717
pycurl==7.45.3
18-
PyJWT==2.3.0
18+
PyJWT==2.10.1
1919
pyparsing==2.4.7
2020
SecretStorage==3.3.1
2121
setuptools==78.1.1
2222
six==1.16.0
2323
wadllib==1.3.6
2424
wheel==0.46.1
25-
zipp==1.0.0
25+
zipp==3.19.1

‎ci/docker/stateless-test/requirements.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
Jinja2==3.1.3
1+
Jinja2==3.1.6
22
numpy==1.26.4
33
requests==2.32.3
44
pandas==1.5.3
55
scipy==1.12.0
66
pyarrow==18.0.0
7-
grpcio==1.47.0
7+
grpcio==1.60.0
88
protobuf==4.25.3
99

1010
# performance tests >>

‎ci/jobs/performance_tests.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ def main():
319319
f"cp ./programs/server/config.xml {perf_right_config}",
320320
f"cp ./programs/server/users.xml {perf_right_config}",
321321
f"cp -r --dereference ./programs/server/config.d {perf_right_config}",
322-
# f"cp ./tests/performance/scripts/config/config.d/*.xml {perf_right_config}/config.d/",
322+
f"cp ./tests/performance/scripts/config/config.d/*xml {perf_right_config}/config.d/",
323323
f"cp -r ./tests/performance/scripts/config/users.d {perf_right_config}/users.d",
324324
f"cp -r ./tests/config/top_level_domains {perf_wd}",
325325
# f"cp -r ./tests/performance {perf_right}",

0 commit comments

Comments
 (0)