Skip to content

Commit 2155e32

Browse files
il9ueil9ue
authored
Merge branch 'antalya-26.1' into feature/iceberg-truncate
2 parents 47c8acc + 3addd5f commit 2155e32

275 files changed

Lines changed: 13071 additions & 2579 deletions

File tree

Some content is hidden

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

‎ci/jobs/scripts/check_style/experimental_settings_ignore.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ allow_experimental_dynamic_type
6262
allow_experimental_json_type
6363
allow_experimental_vector_similarity_index
6464
enable_vector_similarity_index
65+
allow_nullable_tuple_in_extracted_subcolumns
6566
allow_experimental_live_view
6667
allow_special_serialization_kinds_in_output_formats
6768
allow_not_comparable_types_in_comparison_functions

‎ci/jobs/scripts/workflow_hooks/filter_job.py‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,15 @@ def should_skip_job(job_name):
5858
_info_cache = Info()
5959
print(f"INFO: PR labels: {_info_cache.pr_labels}")
6060

61+
# There is no way to prevent GitHub Actions from running the PR workflow on
62+
# release branches, so we skip all jobs here. The ReleaseCI workflow is used
63+
# for testing on release branches instead.
64+
if (
65+
Labels.RELEASE in _info_cache.pr_labels
66+
or Labels.RELEASE_LTS in _info_cache.pr_labels
67+
):
68+
return True, "Skipped for release PR"
69+
6170
changed_files = _info_cache.get_kv_data("changed_files")
6271
if not changed_files:
6372
print("WARNING: no changed files found for PR - do not filter jobs")

‎cmake/autogenerated_versions.txt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
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 54509)
5+
SET(VERSION_REVISION 54511)
66
SET(VERSION_MAJOR 26)
77
SET(VERSION_MINOR 1)
8-
SET(VERSION_PATCH 4)
9-
SET(VERSION_GITHASH 5549f2acae95c6d627654f50e212a85d059a55f9)
10-
SET(VERSION_DESCRIBE v26.1.4.20001.altinityantalya)
11-
SET(VERSION_STRING 26.1.4.20001.altinityantalya)
8+
SET(VERSION_PATCH 6)
9+
SET(VERSION_GITHASH d1072851f03c9dcae0bf59f48f5ec9b00405675d)
10+
SET(VERSION_DESCRIBE v26.1.6.20001.altinityantalya)
11+
SET(VERSION_STRING 26.1.6.20001.altinityantalya)
1212
# end of autochange
1313

1414
SET(VERSION_TWEAK 20001)

‎contrib/mongo-c-driver‎

Submodule mongo-c-driver updated 943 files

‎contrib/mongo-c-driver-cmake/CMakeLists.txt‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ if(NOT USE_MONGODB)
55
endif()
66

77
set(libbson_VERSION_MAJOR 2)
8-
set(libbson_VERSION_MINOR 1)
8+
set(libbson_VERSION_MINOR 2)
99
set(libbson_VERSION_PATCH 2)
10-
set(libbson_VERSION 2.1.2)
10+
set(libbson_VERSION 2.2.2)
1111
set(libmongoc_VERSION_MAJOR 2)
12-
set(libmongoc_VERSION_MINOR 1)
12+
set(libmongoc_VERSION_MINOR 2)
1313
set(libmongoc_VERSION_PATCH 2)
14-
set(libmongoc_VERSION 2.1.2)
14+
set(libmongoc_VERSION 2.2.2)
1515

1616
set(LIBBSON_SOURCES_ROOT "${ClickHouse_SOURCE_DIR}/contrib/mongo-c-driver/src")
1717
set(LIBBSON_SOURCE_DIR "${LIBBSON_SOURCES_ROOT}/libbson/src")
@@ -136,6 +136,8 @@ set(UTF8PROC_SOURCE_DIR "${LIBBSON_SOURCES_ROOT}/utf8proc-2.8.0")
136136
set(UTF8PROC_SOURCES "${UTF8PROC_SOURCE_DIR}/utf8proc.c")
137137
set(UTHASH_SOURCE_DIR "${LIBBSON_SOURCES_ROOT}/uthash")
138138

139+
set(MONGOC_CXX_COMPILER_ID "${CMAKE_CXX_COMPILER_ID}")
140+
set(MONGOC_CXX_COMPILER_VERSION "${CMAKE_CXX_COMPILER_VERSION}")
139141
configure_file(
140142
${LIBMONGOC_SOURCE_DIR}/mongoc/mongoc-config.h.in
141143
${LIBMONGOC_BINARY_DIR}/mongoc/mongoc-config.h
@@ -144,6 +146,10 @@ configure_file(
144146
${LIBMONGOC_SOURCE_DIR}/mongoc/mongoc-version.h.in
145147
${LIBMONGOC_BINARY_DIR}/mongoc/mongoc-version.h
146148
)
149+
configure_file(
150+
${LIBMONGOC_SOURCE_DIR}/mongoc/mongoc-config-private.h.in
151+
${LIBMONGOC_BINARY_DIR}/mongoc/mongoc-config-private.h
152+
)
147153
add_library(_libmongoc ${LIBMONGOC_SOURCES} ${COMMON_SOURCES} ${UTF8PROC_SOURCES})
148154
add_library(ch_contrib::libmongoc ALIAS _libmongoc)
149155
target_include_directories(_libmongoc SYSTEM PUBLIC ${LIBMONGOC_SOURCE_DIR} ${LIBMONGOC_BINARY_DIR} ${LIBMONGOC_SOURCE_DIR}/mongoc ${LIBMONGOC_BINARY_DIR}/mongoc ${COMMON_SOURCE_DIR} ${UTF8PROC_SOURCE_DIR} ${UTHASH_SOURCE_DIR} )

‎contrib/mongo-cxx-driver-cmake/CMakeLists.txt‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,19 @@ include(GenerateExportHeader)
1212

1313
set(BSONCXX_SOURCES
1414
${BSONCXX_SOURCES_DIR}/lib/bsoncxx/private/itoa.cpp
15+
${BSONCXX_SOURCES_DIR}/lib/bsoncxx/private/version.cpp
16+
${BSONCXX_SOURCES_DIR}/lib/bsoncxx/v1/config/config.cpp
17+
${BSONCXX_SOURCES_DIR}/lib/bsoncxx/v1/config/export.cpp
18+
${BSONCXX_SOURCES_DIR}/lib/bsoncxx/v1/config/version.cpp
1519
${BSONCXX_SOURCES_DIR}/lib/bsoncxx/v1/detail/postlude.cpp
1620
${BSONCXX_SOURCES_DIR}/lib/bsoncxx/v1/detail/prelude.cpp
1721
${BSONCXX_SOURCES_DIR}/lib/bsoncxx/v_noabi/bsoncxx/array/element.cpp
1822
${BSONCXX_SOURCES_DIR}/lib/bsoncxx/v_noabi/bsoncxx/array/value.cpp
1923
${BSONCXX_SOURCES_DIR}/lib/bsoncxx/v_noabi/bsoncxx/array/view.cpp
2024
${BSONCXX_SOURCES_DIR}/lib/bsoncxx/v_noabi/bsoncxx/builder/core.cpp
25+
${BSONCXX_SOURCES_DIR}/lib/bsoncxx/v_noabi/bsoncxx/config/config.cpp
26+
${BSONCXX_SOURCES_DIR}/lib/bsoncxx/v_noabi/bsoncxx/config/export.cpp
27+
${BSONCXX_SOURCES_DIR}/lib/bsoncxx/v_noabi/bsoncxx/config/version.cpp
2128
${BSONCXX_SOURCES_DIR}/lib/bsoncxx/v_noabi/bsoncxx/decimal128.cpp
2229
${BSONCXX_SOURCES_DIR}/lib/bsoncxx/v_noabi/bsoncxx/document/element.cpp
2330
${BSONCXX_SOURCES_DIR}/lib/bsoncxx/v_noabi/bsoncxx/document/value.cpp
@@ -31,6 +38,7 @@ set(BSONCXX_SOURCES
3138
${BSONCXX_SOURCES_DIR}/lib/bsoncxx/v_noabi/bsoncxx/types/bson_value/value.cpp
3239
${BSONCXX_SOURCES_DIR}/lib/bsoncxx/v_noabi/bsoncxx/types/bson_value/view.cpp
3340
${BSONCXX_SOURCES_DIR}/lib/bsoncxx/v_noabi/bsoncxx/validate.cpp
41+
${BSONCXX_SOURCES_DIR}/lib/bsoncxx/v_noabi/bsoncxx/vector.cpp
3442
)
3543

3644
set(BSONCXX_POLY_USE_IMPLS ON)
@@ -95,6 +103,9 @@ set(MONGOCXX_SOURCES
95103
${MONGOCXX_SOURCES_DIR}/lib/mongocxx/private/conversions.cpp
96104
${MONGOCXX_SOURCES_DIR}/lib/mongocxx/private/mongoc.cpp
97105
${MONGOCXX_SOURCES_DIR}/lib/mongocxx/private/numeric_casting.cpp
106+
${MONGOCXX_SOURCES_DIR}/lib/mongocxx/v1/config/config.cpp
107+
${MONGOCXX_SOURCES_DIR}/lib/mongocxx/v1/config/export.cpp
108+
${MONGOCXX_SOURCES_DIR}/lib/mongocxx/v1/config/version.cpp
98109
${MONGOCXX_SOURCES_DIR}/lib/mongocxx/v1/detail/postlude.cpp
99110
${MONGOCXX_SOURCES_DIR}/lib/mongocxx/v1/detail/prelude.cpp
100111
${MONGOCXX_SOURCES_DIR}/lib/mongocxx/v_noabi/mongocxx/bulk_write.cpp
@@ -103,6 +114,9 @@ set(MONGOCXX_SOURCES
103114
${MONGOCXX_SOURCES_DIR}/lib/mongocxx/v_noabi/mongocxx/client_encryption.cpp
104115
${MONGOCXX_SOURCES_DIR}/lib/mongocxx/v_noabi/mongocxx/client_session.cpp
105116
${MONGOCXX_SOURCES_DIR}/lib/mongocxx/v_noabi/mongocxx/collection.cpp
117+
${MONGOCXX_SOURCES_DIR}/lib/mongocxx/v_noabi/mongocxx/config/config.cpp
118+
${MONGOCXX_SOURCES_DIR}/lib/mongocxx/v_noabi/mongocxx/config/export.cpp
119+
${MONGOCXX_SOURCES_DIR}/lib/mongocxx/v_noabi/mongocxx/config/version.cpp
106120
${MONGOCXX_SOURCES_DIR}/lib/mongocxx/v_noabi/mongocxx/cursor.cpp
107121
${MONGOCXX_SOURCES_DIR}/lib/mongocxx/v_noabi/mongocxx/database.cpp
108122
${MONGOCXX_SOURCES_DIR}/lib/mongocxx/v_noabi/mongocxx/events/command_failed_event.cpp
@@ -119,6 +133,7 @@ set(MONGOCXX_SOURCES
119133
${MONGOCXX_SOURCES_DIR}/lib/mongocxx/v_noabi/mongocxx/events/topology_closed_event.cpp
120134
${MONGOCXX_SOURCES_DIR}/lib/mongocxx/v_noabi/mongocxx/events/topology_description.cpp
121135
${MONGOCXX_SOURCES_DIR}/lib/mongocxx/v_noabi/mongocxx/events/topology_opening_event.cpp
136+
${MONGOCXX_SOURCES_DIR}/lib/mongocxx/v_noabi/mongocxx/exception/authentication_exception.cpp
122137
${MONGOCXX_SOURCES_DIR}/lib/mongocxx/v_noabi/mongocxx/exception/bulk_write_exception.cpp
123138
${MONGOCXX_SOURCES_DIR}/lib/mongocxx/v_noabi/mongocxx/exception/error_code.cpp
124139
${MONGOCXX_SOURCES_DIR}/lib/mongocxx/v_noabi/mongocxx/exception/exception.cpp

‎contrib/postgres‎

Submodule postgres updated 444 files

‎contrib/postgres-cmake/pg_config.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -593,7 +593,7 @@
593593
#define PACKAGE_NAME "PostgreSQL"
594594

595595
/* Define to the full name and version of this package. */
596-
#define PACKAGE_STRING "PostgreSQL 18.0"
596+
#define PACKAGE_STRING "PostgreSQL 18.3"
597597

598598
/* Define to the one symbol short name of this package. */
599599
#define PACKAGE_TARNAME "postgresql"
@@ -602,7 +602,7 @@
602602
#define PACKAGE_URL "https://www.postgresql.org/"
603603

604604
/* Define to the version of this package. */
605-
#define PACKAGE_VERSION "18.0"
605+
#define PACKAGE_VERSION "18.3"
606606

607607
/* Define to the name of a signed 128-bit integer type. */
608608
#define PG_INT128_TYPE __int128
@@ -618,19 +618,19 @@
618618
#define PG_MAJORVERSION_NUM 18
619619

620620
/* PostgreSQL minor version number */
621-
#define PG_MINORVERSION_NUM 0
621+
#define PG_MINORVERSION_NUM 3
622622

623623
/* Define to best printf format archetype, usually gnu_printf if available. */
624624
#define PG_PRINTF_ATTRIBUTE gnu_printf
625625

626626
/* PostgreSQL version as a string */
627-
#define PG_VERSION "18.0"
627+
#define PG_VERSION "18.3"
628628

629629
/* PostgreSQL version as a number */
630-
#define PG_VERSION_NUM 180000
630+
#define PG_VERSION_NUM 180003
631631

632632
/* A string containing the version number, platform, and C compiler */
633-
#define PG_VERSION_STR "PostgreSQL 18.0 on x86_64-pc-linux-gnu, compiled by gcc (GCC) 15.2.1 20250813, 64-bit"
633+
#define PG_VERSION_STR "PostgreSQL 18.3 on x86_64-pc-linux-gnu, compiled by gcc (GCC) 15.2.1 20250813, 64-bit"
634634

635635
/* Define to 1 to allow profiling output to be saved separately for each
636636
process. */

‎docs/en/sql-reference/functions/udf.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ A function configuration contains the following settings:
4444
| `execute_direct` | If `execute_direct` = `1`, then `command` will be searched inside user_scripts folder specified by [user_scripts_path](../../operations/server-configuration-parameters/settings.md#user_scripts_path). Additional script arguments can be specified using whitespace separator. Example: `script_name arg1 arg2`. If `execute_direct` = `0`, `command` is passed as argument for `bin/sh -c` | Optional | `1` |
4545
| `lifetime` | The reload interval of a function in seconds. If it is set to `0` then the function is not reloaded | Optional | `0` |
4646
| `deterministic` | If the function is deterministic (returns the same result for the same input) | Optional | `false` |
47+
| `stderr_reaction` | How to handle the command's stderr output. Values: `none` (ignore), `log` (log all stderr immediately), `log_first` (log first 4 KiB after exit), `log_last` (log last 4 KiB after exit), `throw` (throw exception immediately on any stderr output). When using `log_first` or `log_last` with a non-zero exit code, the stderr content is included in the exception message | Optional | `log_last` |
48+
| `check_exit_code` | If true, ClickHouse will check the exit code of the command. A non-zero exit code causes an exception | Optional | `true` |
4749

4850
The command must read arguments from `STDIN` and must output the result to `STDOUT`. The command must process arguments iteratively. That is after processing a chunk of arguments it must wait for the next chunk.
4951

‎src/AggregateFunctions/AggregateFunctionGroupNumericIndexedVectorDataBSI.h‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -463,6 +463,19 @@ class BSINumericIndexedVector
463463
*/
464464
void pointwiseAddInplace(const BSINumericIndexedVector & rhs)
465465
{
466+
/// Self-addition requires a deep copy because the full adder logic below
467+
/// performs in-place XOR on shared bitmaps (`sum->rb_xor(*addend)` where
468+
/// `sum` and `addend` alias the same Roaring bitmap via `shallowCopyFrom`),
469+
/// which triggers an assertion in CRoaring (`assert(x1 != x2)`) and would
470+
/// produce incorrect results (A XOR A = 0) in release builds.
471+
if (this == &rhs)
472+
{
473+
BSINumericIndexedVector copy;
474+
copy.deepCopyFrom(rhs);
475+
pointwiseAddInplace(copy);
476+
return;
477+
}
478+
466479
if (isEmpty())
467480
{
468481
deepCopyFrom(rhs);
@@ -539,6 +552,16 @@ class BSINumericIndexedVector
539552
*/
540553
void pointwiseSubtractInplace(const BSINumericIndexedVector & rhs)
541554
{
555+
/// Self-subtraction requires a deep copy for the same reason as
556+
/// `pointwiseAddInplace`: in-place XOR on aliased bitmaps is undefined.
557+
if (this == &rhs)
558+
{
559+
BSINumericIndexedVector copy;
560+
copy.deepCopyFrom(rhs);
561+
pointwiseSubtractInplace(copy);
562+
return;
563+
}
564+
542565
auto total_indexes = getAllIndex();
543566
total_indexes->rb_or(*rhs.getAllIndex());
544567

0 commit comments

Comments
 (0)