Skip to content

Commit 0594f51

Browse files
committed
Merge remote-tracking branch 'ClickHouse/master' into enable-query-condition-cache
2 parents 07bc6c5 + 80e8f16 commit 0594f51

File tree

371 files changed

+6393
-2316
lines changed

Some content is hidden

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

371 files changed

+6393
-2316
lines changed

.github/workflows/master.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -776,7 +776,7 @@ jobs:
776776
fi
777777
778778
build_amd_compat:
779-
runs-on: [self-hosted, builder-aarch64]
779+
runs-on: [self-hosted, builder]
780780
needs: [config_workflow, dockers_build_amd_and_merge, build_amd_tidy, build_amd_debug, build_amd_release, build_amd_asan, build_amd_tsan, build_amd_msan, build_amd_ubsan, build_amd_binary, build_arm_release, build_arm_asan]
781781
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9jb21wYXQp') }}
782782
name: "Build (amd_compat)"

.github/workflows/pull_request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -930,7 +930,7 @@ jobs:
930930
fi
931931
932932
build_amd_compat:
933-
runs-on: [self-hosted, builder-aarch64]
933+
runs-on: [self-hosted, builder]
934934
needs: [config_workflow, dockers_build_amd_and_merge, build_amd_debug, build_amd_release, build_amd_asan, build_amd_tsan, build_amd_msan, build_amd_ubsan, build_amd_binary, build_arm_release, build_arm_asan]
935935
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9jb21wYXQp') }}
936936
name: "Build (amd_compat)"

README.md

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,16 +47,18 @@ 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-
* [Sydney Meetup](https://www.meetup.com/clickhouse-australia-user-group/events/306549810/) - April 1, 2025
51-
* [Oslo Meetup](https://www.meetup.com/open-source-real-time-data-warehouse-real-time-analytics/events/306414327/) - April 8, 2025
52-
* [Ho Chi Minh Meetup with AWS & Infinite Lambda](https://www.meetup.com/clickhouse-vietnam-meetup-group/events/306810105/) - April 12, 2025
5350
* [Tokyo Meetup with Confluent](https://www.meetup.com/clickhouse-tokyo-user-group/events/306832118/) - April 15, 2025
5451
* [Kuala Lumper Meetup with CNCF](https://www.meetup.com/clickhouse-malaysia-meetup-group/events/306697678/) - April 16, 2025
5552
* [Jakarta Meetup with AWS](https://www.meetup.com/clickhouse-indonesia-user-group/events/306973747/) - April 22, 2025
53+
* [Denver Meetup](https://www.meetup.com/clickhouse-denver-user-group/events/306934991/) - April 23, 2025
54+
* [Austin Meetup](https://www.meetup.com/clickhouse-austin-user-group/events/307289908) - May 13, 2025
5655
* [London Meetup](https://www.meetup.com/clickhouse-london-user-group/events/306047172/) - May 14, 2025
5756
* [Istanbul Meetup](https://www.meetup.com/clickhouse-turkiye-meetup-group/events/306978337/) - May 15, 2025
5857

5958
Recent meetups
59+
* [Ho Chi Minh Meetup with AWS & Infinite Lambda](https://www.meetup.com/clickhouse-vietnam-meetup-group/events/306810105/) - April 12, 2025
60+
* [Oslo Meetup](https://www.meetup.com/open-source-real-time-data-warehouse-real-time-analytics/events/306414327/) - April 8, 2025
61+
* [Sydney Meetup](https://www.meetup.com/clickhouse-australia-user-group/events/306549810/) - April 1, 2025
6062
* [Washington DC Meetup](https://www.meetup.com/clickhouse-dc-user-group/events/306439995) - March 27, 2025
6163
* [New York Meetup](https://www.meetup.com/clickhouse-new-york-user-group/events/305916369) - March 26, 2025
6264
* [Tel Aviv Meetup](https://www.meetup.com/clickhouse-meetup-israel/events/306434754/) - March 26, 2025
@@ -76,11 +78,7 @@ Recent meetups
7678
* [Auckland Meetup](https://www.meetup.com/clickhouse-auckland-meetup-group/events/305666103/) - Feb 19, 2025
7779
* [Dubai Meetup](https://www.meetup.com/clickhouse-dubai-meetup-group/events/303096989/) - Feb 10, 2025
7880
* [Bangalore Meetup](https://www.meetup.com/clickhouse-bangalore-user-group/events/305497951/) - Feb 8, 2025
79-
* [London Meetup](https://www.meetup.com/clickhouse-london-user-group/events/305146729/) - Feb 5, 2025
80-
* [FOSDEM Dinner](https://clickhouse.com/company/events/202502-emea-brussels-fosdem-dinner) - Feb 1, 2025
81-
* [Mumbai Meetup](https://www.meetup.com/clickhouse-mumbai-user-group/events/305497320/) - Feb 1, 2025
82-
* [Zagreb Meetup](https://www.meetup.com/clickhouse-croatia-user-group/events/305455877/) - Jan 30, 2025
83-
* [Tokyo Meetup](https://www.meetup.com/clickhouse-tokyo-user-group/events/305126993/) - Jan 23, 2025
81+
8482

8583

8684
## Recent Recordings

base/base/BFloat16.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,11 @@ class BFloat16
155155
res.x = x ^ 0b1000000000000000;
156156
return res;
157157
}
158+
159+
constexpr const UInt16 & raw() const
160+
{
161+
return x;
162+
}
158163
};
159164

160165

base/poco/NetSSL_OpenSSL/src/Context.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -504,18 +504,18 @@ void Context::createSSLContext()
504504
* if TLS1.x was removed at OpenSSL library build time via Configure options.
505505
*/
506506
case TLSV1_1_CLIENT_USE:
507-
_pSSLContext = SSL_CTX_new(TLSv1_1_client_method());
507+
_pSSLContext = SSL_CTX_new(TLS_client_method());
508508
break;
509509
case TLSV1_1_SERVER_USE:
510-
_pSSLContext = SSL_CTX_new(TLSv1_1_server_method());
510+
_pSSLContext = SSL_CTX_new(TLS_server_method());
511511
break;
512512
#endif
513513
#if defined(SSL_OP_NO_TLSv1_2) && !defined(OPENSSL_NO_TLS1)
514514
case TLSV1_2_CLIENT_USE:
515-
_pSSLContext = SSL_CTX_new(TLSv1_2_client_method());
515+
_pSSLContext = SSL_CTX_new(TLS_client_method());
516516
break;
517517
case TLSV1_2_SERVER_USE:
518-
_pSSLContext = SSL_CTX_new(TLSv1_2_server_method());
518+
_pSSLContext = SSL_CTX_new(TLS_server_method());
519519
break;
520520
#endif
521521
default:

ci/defs/job_configs.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,14 +273,15 @@ class JobConfigs:
273273
RunnerLabels.BUILDER_ARM, # BuildTypes.ARM_V80COMPAT,
274274
RunnerLabels.BUILDER_AMD, # BuildTypes.AMD_FREEBSD,
275275
RunnerLabels.BUILDER_ARM, # BuildTypes.PPC64LE,
276-
RunnerLabels.BUILDER_ARM, # BuildTypes.AMD_COMPAT,
276+
RunnerLabels.BUILDER_AMD, # BuildTypes.AMD_COMPAT,
277277
RunnerLabels.BUILDER_AMD, # BuildTypes.AMD_MUSL,
278278
RunnerLabels.BUILDER_ARM, # BuildTypes.RISCV64,
279279
RunnerLabels.BUILDER_AMD, # BuildTypes.S390X,
280280
RunnerLabels.BUILDER_ARM, # BuildTypes.LOONGARCH64
281281
RunnerLabels.BUILDER_ARM, # fuzzers
282282
],
283283
)
284+
builds_for_tests = [b.name for b in build_jobs] + [tidy_build_jobs[0]]
284285
install_check_jobs = Job.Config(
285286
name=JobNames.INSTALL_TEST,
286287
runs_on=["..."],

ci/jobs/docs_job.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import os
22

33
from ci.praktika.result import Result
4-
from ci.praktika.utils import Shell, Utils
4+
from ci.praktika.utils import Utils
55

66
if __name__ == "__main__":
77

@@ -39,7 +39,7 @@
3939
results.append(
4040
Result.from_commands_run(
4141
name=testname,
42-
command=[f"yarn run-markdown-linter"],
42+
command=[f"yarn check-markdown"],
4343
workdir="/opt/clickhouse-docs",
4444
)
4545
)

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ Approximative
3333
ArrayJoin
3434
ArrowCompression
3535
ArrowStream
36+
aspell
3637
AsyncInsertCacheSize
3738
AsynchronousHeavyMetricsCalculationTimeSpent
3839
AsynchronousHeavyMetricsUpdateInterval
@@ -129,6 +130,7 @@ CMPLNT
129130
CMake
130131
CMakeLists
131132
CODECS
133+
codespell
132134
CORS
133135
COVID
134136
CPUFrequencyMHz
@@ -659,6 +661,7 @@ Multiqueries
659661
Multithreading
660662
Multiword
661663
MurmurHash
664+
mypy
662665
MySQLConnection
663666
MySQLDataTypesSupport
664667
MySQLDump

ci/jobs/scripts/workflow_hooks/can_be_merged.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ def check():
99
forbidden_labels = [
1010
Labels.CI_PERFORMANCE,
1111
Labels.NO_FAST_TESTS,
12+
Labels.CI_INTEGRATION_FLAKY,
13+
Labels.CI_FUNCTIONAL_FLAKY,
1214
Labels.CI_INTEGRATION,
1315
Labels.CI_FUNCTIONAL,
1416
]

ci/jobs/scripts/workflow_hooks/feature_docs.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from ci.jobs.scripts.workflow_hooks.pr_description import Labels
66

77
files_for_which_docs_autogenerated = [
8-
"src/storages/MergeTree/MergeTreeSettings.cpp",
8+
"src/Storages/MergeTree/MergeTreeSettings.cpp",
99
"src/Core/Settings.cpp",
1010
]
1111

0 commit comments

Comments
 (0)