Merge branch 'master' of github.com:ClickHouse/ClickHouse into better-string-to-variant

Author: Avogar

.github/PULL_REQUEST_TEMPLATE.md

@@ -44,22 +44,35 @@ At a minimum, the following information should be added (but add more as needed)
 ---
 ### Modify your CI run:
 **NOTE:** If your merge the PR with modified CI you **MUST KNOW** what you are doing
-**NOTE:** Set desired options before CI starts or re-push after updates
-
-#### Run only:
-- [ ] <!---ci_set_integration--> Integration tests
-- [ ] <!---ci_set_arm--> Integration tests (arm64)
-- [ ] <!---ci_set_stateless--> Stateless tests (release)
-- [ ] <!---ci_set_stateless_asan--> Stateless tests (asan)
-- [ ] <!---ci_set_stateful--> Stateful tests (release)
-- [ ] <!---ci_set_stateful_asan--> Stateful tests (asan)
-- [ ] <!---ci_set_reduced--> No sanitizers
-- [ ] <!---ci_set_analyzer--> Tests with analyzer
-- [ ] <!---ci_set_fast--> Fast tests
-- [ ] <!---job_package_debug--> Only package_debug build
-- [ ] <!---PLACE_YOUR_TAG_CONFIGURED_IN_ci_config.py_FILE_HERE--> Add your CI variant description here
-
-#### CI options:
+**NOTE:** Checked options will be applied if set before CI RunConfig/PrepareRunConfig step
+
+#### Include tests (required builds will be added automatically):
+- [ ] <!---ci_include_fast--> Fast test
+- [ ] <!---ci_include_integration--> Integration Tests
+- [ ] <!---ci_include_stateless--> Stateless tests
+- [ ] <!---ci_include_stateful--> Stateful tests
+- [ ] <!---ci_include_unit--> Unit tests
+- [ ] <!---ci_include_performance--> Performance tests
+- [ ] <!---ci_include_asan--> All with ASAN
+- [ ] <!---ci_include_tsan--> All with TSAN
+- [ ] <!---ci_include_analyzer--> All with Analyzer
+- [ ] <!---ci_include_KEYWORD--> Add your option here
+
+#### Exclude tests:
+- [ ] <!---ci_exclude_fast--> Fast test
+- [ ] <!---ci_exclude_integration--> Integration Tests
+- [ ] <!---ci_exclude_stateless--> Stateless tests
+- [ ] <!---ci_exclude_stateful--> Stateful tests
+- [ ] <!---ci_exclude_performance--> Performance tests
+- [ ] <!---ci_exclude_asan--> All with ASAN
+- [ ] <!---ci_exclude_tsan--> All with TSAN
+- [ ] <!---ci_exclude_msan--> All with MSAN
+- [ ] <!---ci_exclude_ubsan--> All with UBSAN
+- [ ] <!---ci_exclude_coverage--> All with Coverage
+- [ ] <!---ci_exclude_aarch64--> All with Aarch64
+- [ ] <!---ci_exclude_KEYWORD--> Add your option here
+
+#### Extra options:
 - [ ] <!---do_not_test--> do not test (only style check)
 - [ ] <!---no_merge_commit--> disable merge-commit (no merge from master before tests)
 - [ ] <!---no_ci_cache--> disable CI cache (job reuse)

.github/workflows/master.yml

@@ -374,7 +374,7 @@ jobs:
     if: ${{ !failure() && !cancelled() }}
     uses: ./.github/workflows/reusable_test.yml
     with:
-      test_name: Stateless tests (release, analyzer, s3, DatabaseReplicated)
+      test_name: Stateless tests (release, old analyzer, s3, DatabaseReplicated)
       runner_type: func-tester
       data: ${{ needs.RunConfig.outputs.data }}
   FunctionalStatelessTestS3Debug:
@@ -632,7 +632,7 @@ jobs:
     if: ${{ !failure() && !cancelled() }}
     uses: ./.github/workflows/reusable_test.yml
     with:
-      test_name: Integration tests (asan, analyzer)
+      test_name: Integration tests (asan, old analyzer)
       runner_type: stress-tester
       data: ${{ needs.RunConfig.outputs.data }}
   IntegrationTestsTsan:

.github/workflows/release_branches.yml

@@ -436,7 +436,7 @@ jobs:
     if: ${{ !failure() && !cancelled() }}
     uses: ./.github/workflows/reusable_test.yml
     with:
-      test_name: Integration tests (asan, analyzer)
+      test_name: Integration tests (asan, old analyzer)
       runner_type: stress-tester
       data: ${{ needs.RunConfig.outputs.data }}
   IntegrationTestsTsan:

.gitignore

@@ -164,6 +164,9 @@ tests/queries/0_stateless/*.generated-expect
 tests/queries/0_stateless/*.expect.history
 tests/integration/**/_gen
 
+# pytest --pdb history
+.pdb_history
+
 # rust
 /rust/**/target*
 # It is autogenerated from *.in

CHANGELOG.md

@@ -6,7 +6,7 @@
 
 # 2024 Changelog
 
-### <a id="243"></a> ClickHouse release 24.3 LTS, 2024-03-26
+### <a id="243"></a> ClickHouse release 24.3 LTS, 2024-03-27
 
 #### Upgrade Notes
 * The setting `allow_experimental_analyzer` is enabled by default and it switches the query analysis to a new implementation, which has better compatibility and feature completeness. The feature "analyzer" is considered beta instead of experimental. You can turn the old behavior by setting the `compatibility` to `24.2` or disabling the `allow_experimental_analyzer` setting. Watch the [video on YouTube](https://www.youtube.com/watch?v=zhrOYQpgvkk).
@@ -123,7 +123,6 @@
 * Something was wrong with Apache Hive, which is experimental and not supported. [#60262](https://github.com/ClickHouse/ClickHouse/pull/60262) ([shanfengp](https://github.com/Aed-p)).
 * An improvement for experimental parallel replicas: force reanalysis if parallel replicas changed [#60362](https://github.com/ClickHouse/ClickHouse/pull/60362) ([Raúl Marín](https://github.com/Algunenano)).
 * Fix usage of plain metadata type with new disks configuration option [#60396](https://github.com/ClickHouse/ClickHouse/pull/60396) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Don't allow to set max_parallel_replicas to 0 as it doesn't make sense [#60430](https://github.com/ClickHouse/ClickHouse/pull/60430) ([Kruglov Pavel](https://github.com/Avogar)).
 * Try to fix logical error 'Cannot capture column because it has incompatible type' in mapContainsKeyLike [#60451](https://github.com/ClickHouse/ClickHouse/pull/60451) ([Kruglov Pavel](https://github.com/Avogar)).
 * Avoid calculation of scalar subqueries for CREATE TABLE. [#60464](https://github.com/ClickHouse/ClickHouse/pull/60464) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
 * Fix deadlock in parallel parsing when lots of rows are skipped due to errors [#60516](https://github.com/ClickHouse/ClickHouse/pull/60516) ([Kruglov Pavel](https://github.com/Avogar)).

SECURITY.md

@@ -13,18 +13,16 @@ The following versions of ClickHouse server are currently being supported with s
 
 | Version | Supported |
 |:-|:-|
+| 24.3 | ✔️ |
 | 24.2 | ✔️ |
 | 24.1 | ✔️ |
-| 23.12 | ✔️ |
-| 23.11 | ❌ |
-| 23.10 | ❌ |
-| 23.9 | ❌ |
+| 23.* | ❌ |
 | 23.8 | ✔️ |
 | 23.7 | ❌ |
 | 23.6 | ❌ |
 | 23.5 | ❌ |
 | 23.4 | ❌ |
-| 23.3 | ✔️ |
+| 23.3 | ❌ |
 | 23.2 | ❌ |
 | 23.1 | ❌ |
 | 22.* | ❌ |

base/poco/JSON/src/pdjson.c

@@ -314,13 +314,13 @@ static int read_unicode(json_stream *json)
 
         if (l < 0xdc00 || l > 0xdfff) {
             json_error(json, "invalid surrogate pair continuation \\u%04lx out "
-                             "of range (dc00-dfff)", l);
+                             "of range (dc00-dfff)", (unsigned long)l);
             return -1;
         }
 
         cp = ((h - 0xd800) * 0x400) + ((l - 0xdc00) + 0x10000);
     } else if (cp >= 0xdc00 && cp <= 0xdfff) {
-            json_error(json, "dangling surrogate \\u%04lx", cp);
+            json_error(json, "dangling surrogate \\u%04lx", (unsigned long)cp);
             return -1;
     }
 

cmake/autogenerated_versions.txt

@@ -2,11 +2,11 @@
 
 # NOTE: has nothing common with DBMS_TCP_PROTOCOL_VERSION,
 # only DBMS_TCP_PROTOCOL_VERSION should be incremented on protocol changes.
-SET(VERSION_REVISION 54484)
+SET(VERSION_REVISION 54485)
 SET(VERSION_MAJOR 24)
-SET(VERSION_MINOR 3)
+SET(VERSION_MINOR 4)
 SET(VERSION_PATCH 1)
-SET(VERSION_GITHASH 891689a41506d00aa169548f5b4a8774351242c4)
-SET(VERSION_DESCRIBE v24.3.1.1-testing)
-SET(VERSION_STRING 24.3.1.1)
+SET(VERSION_GITHASH 2c5c589a882ceec35439650337b92db3e76f0081)
+SET(VERSION_DESCRIBE v24.4.1.1-testing)
+SET(VERSION_STRING 24.4.1.1)
 # end of autochange

contrib/NuRaft

@@ -32,6 +32,7 @@ set(SRCS
     "${LIBRARY_DIR}/src/handle_custom_notification.cxx"
     "${LIBRARY_DIR}/src/handle_vote.cxx"
     "${LIBRARY_DIR}/src/launcher.cxx"
+    "${LIBRARY_DIR}/src/log_entry.cxx"
     "${LIBRARY_DIR}/src/srv_config.cxx"
     "${LIBRARY_DIR}/src/snapshot_sync_req.cxx"
     "${LIBRARY_DIR}/src/snapshot_sync_ctx.cxx"