Skip to content

Commit c0c3fe9

Browse files
zvonandzvonand
authored
Merge pull request #1193 from Altinity/antalya-merge-25.8.12
Antalya 25.8: update to 25.8.12
2 parents 947244b + 349e3f6 commit c0c3fe9

File tree

380 files changed

+6901
-2409
lines changed

Some content is hidden

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

380 files changed

+6901
-2409
lines changed

‎.github/workflows/release_branches.yml‎

Lines changed: 136 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -770,6 +770,141 @@ jobs:
770770
python3 -m praktika run 'Install packages (arm_release)' --workflow "ReleaseBranchCI" --ci |& tee ./ci/tmp/job.log
771771
fi
772772
773+
stateless_tests_amd_asan_distributed_plan_parallel_1_2:
774+
runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
775+
needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_asan]
776+
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfYXNhbiwgZGlzdHJpYnV0ZWQgcGxhbiwgcGFyYWxsZWwsIDEvMik=') }}
777+
name: "Stateless tests (amd_asan, distributed plan, parallel, 1/2)"
778+
outputs:
779+
data: ${{ steps.run.outputs.DATA }}
780+
steps:
781+
- name: Checkout code
782+
uses: actions/checkout@v4
783+
with:
784+
ref: ${{ env.CHECKOUT_REF }}
785+
786+
- name: Setup
787+
uses: ./.github/actions/runner_setup
788+
- name: Docker setup
789+
uses: ./.github/actions/docker_setup
790+
with:
791+
test_name: "Stateless tests (amd_asan, distributed plan, parallel, 1/2)"
792+
793+
- name: Prepare env script
794+
run: |
795+
rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
796+
mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
797+
cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
798+
export PYTHONPATH=./ci:.:
799+
cat > ./ci/tmp/workflow_config_releasebranchci.json << 'EOF'
800+
${{ needs.config_workflow.outputs.data }}
801+
EOF
802+
cat > ./ci/tmp/workflow_status.json << 'EOF'
803+
${{ toJson(needs) }}
804+
EOF
805+
ENV_SETUP_SCRIPT_EOF
806+
807+
- name: Run
808+
id: run
809+
run: |
810+
. ./ci/tmp/praktika_setup_env.sh
811+
set -o pipefail
812+
if command -v ts &> /dev/null; then
813+
python3 -m praktika run 'Stateless tests (amd_asan, distributed plan, parallel, 1/2)' --workflow "ReleaseBranchCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
814+
else
815+
python3 -m praktika run 'Stateless tests (amd_asan, distributed plan, parallel, 1/2)' --workflow "ReleaseBranchCI" --ci |& tee ./ci/tmp/job.log
816+
fi
817+
818+
stateless_tests_amd_asan_distributed_plan_parallel_2_2:
819+
runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
820+
needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_asan]
821+
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfYXNhbiwgZGlzdHJpYnV0ZWQgcGxhbiwgcGFyYWxsZWwsIDIvMik=') }}
822+
name: "Stateless tests (amd_asan, distributed plan, parallel, 2/2)"
823+
outputs:
824+
data: ${{ steps.run.outputs.DATA }}
825+
steps:
826+
- name: Checkout code
827+
uses: actions/checkout@v4
828+
with:
829+
ref: ${{ env.CHECKOUT_REF }}
830+
831+
- name: Setup
832+
uses: ./.github/actions/runner_setup
833+
- name: Docker setup
834+
uses: ./.github/actions/docker_setup
835+
with:
836+
test_name: "Stateless tests (amd_asan, distributed plan, parallel, 2/2)"
837+
838+
- name: Prepare env script
839+
run: |
840+
rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
841+
mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
842+
cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
843+
export PYTHONPATH=./ci:.:
844+
cat > ./ci/tmp/workflow_config_releasebranchci.json << 'EOF'
845+
${{ needs.config_workflow.outputs.data }}
846+
EOF
847+
cat > ./ci/tmp/workflow_status.json << 'EOF'
848+
${{ toJson(needs) }}
849+
EOF
850+
ENV_SETUP_SCRIPT_EOF
851+
852+
- name: Run
853+
id: run
854+
run: |
855+
. ./ci/tmp/praktika_setup_env.sh
856+
set -o pipefail
857+
if command -v ts &> /dev/null; then
858+
python3 -m praktika run 'Stateless tests (amd_asan, distributed plan, parallel, 2/2)' --workflow "ReleaseBranchCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
859+
else
860+
python3 -m praktika run 'Stateless tests (amd_asan, distributed plan, parallel, 2/2)' --workflow "ReleaseBranchCI" --ci |& tee ./ci/tmp/job.log
861+
fi
862+
863+
stateless_tests_amd_asan_distributed_plan_sequential:
864+
runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
865+
needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_asan]
866+
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfYXNhbiwgZGlzdHJpYnV0ZWQgcGxhbiwgc2VxdWVudGlhbCk=') }}
867+
name: "Stateless tests (amd_asan, distributed plan, sequential)"
868+
outputs:
869+
data: ${{ steps.run.outputs.DATA }}
870+
steps:
871+
- name: Checkout code
872+
uses: actions/checkout@v4
873+
with:
874+
ref: ${{ env.CHECKOUT_REF }}
875+
876+
- name: Setup
877+
uses: ./.github/actions/runner_setup
878+
- name: Docker setup
879+
uses: ./.github/actions/docker_setup
880+
with:
881+
test_name: "Stateless tests (amd_asan, distributed plan, sequential)"
882+
883+
- name: Prepare env script
884+
run: |
885+
rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
886+
mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
887+
cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
888+
export PYTHONPATH=./ci:.:
889+
cat > ./ci/tmp/workflow_config_releasebranchci.json << 'EOF'
890+
${{ needs.config_workflow.outputs.data }}
891+
EOF
892+
cat > ./ci/tmp/workflow_status.json << 'EOF'
893+
${{ toJson(needs) }}
894+
EOF
895+
ENV_SETUP_SCRIPT_EOF
896+
897+
- name: Run
898+
id: run
899+
run: |
900+
. ./ci/tmp/praktika_setup_env.sh
901+
set -o pipefail
902+
if command -v ts &> /dev/null; then
903+
python3 -m praktika run 'Stateless tests (amd_asan, distributed plan, sequential)' --workflow "ReleaseBranchCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
904+
else
905+
python3 -m praktika run 'Stateless tests (amd_asan, distributed plan, sequential)' --workflow "ReleaseBranchCI" --ci |& tee ./ci/tmp/job.log
906+
fi
907+
773908
integration_tests_amd_asan_1_4:
774909
runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
775910
needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_asan]
@@ -1672,7 +1807,7 @@ jobs:
16721807
16731808
finish_workflow:
16741809
runs-on: [self-hosted, altinity-on-demand, altinity-style-checker-aarch64]
1675-
needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_debug, build_amd_release, build_amd_asan, build_amd_tsan, build_amd_msan, build_amd_ubsan, build_arm_release, build_amd_darwin, build_arm_darwin, docker_server_image, docker_keeper_image, install_packages_amd_release, install_packages_arm_release, integration_tests_amd_asan_1_4, integration_tests_amd_asan_2_4, integration_tests_amd_asan_3_4, integration_tests_amd_asan_4_4, integration_tests_amd_asan_old_analyzer_1_6, integration_tests_amd_asan_old_analyzer_2_6, integration_tests_amd_asan_old_analyzer_3_6, integration_tests_amd_asan_old_analyzer_4_6, integration_tests_amd_asan_old_analyzer_5_6, integration_tests_amd_asan_old_analyzer_6_6, integration_tests_amd_tsan_1_6, integration_tests_amd_tsan_2_6, integration_tests_amd_tsan_3_6, integration_tests_amd_tsan_4_6, integration_tests_amd_tsan_5_6, integration_tests_amd_tsan_6_6, stress_test_amd_debug, stress_test_amd_tsan, stress_test_amd_ubsan, stress_test_amd_msan]
1810+
needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_debug, build_amd_release, build_amd_asan, build_amd_tsan, build_amd_msan, build_amd_ubsan, build_arm_release, build_amd_darwin, build_arm_darwin, docker_server_image, docker_keeper_image, install_packages_amd_release, install_packages_arm_release, stateless_tests_amd_asan_distributed_plan_parallel_1_2, stateless_tests_amd_asan_distributed_plan_parallel_2_2, stateless_tests_amd_asan_distributed_plan_sequential, integration_tests_amd_asan_1_4, integration_tests_amd_asan_2_4, integration_tests_amd_asan_3_4, integration_tests_amd_asan_4_4, integration_tests_amd_asan_old_analyzer_1_6, integration_tests_amd_asan_old_analyzer_2_6, integration_tests_amd_asan_old_analyzer_3_6, integration_tests_amd_asan_old_analyzer_4_6, integration_tests_amd_asan_old_analyzer_5_6, integration_tests_amd_asan_old_analyzer_6_6, integration_tests_amd_tsan_1_6, integration_tests_amd_tsan_2_6, integration_tests_amd_tsan_3_6, integration_tests_amd_tsan_4_6, integration_tests_amd_tsan_5_6, integration_tests_amd_tsan_6_6, stress_test_amd_debug, stress_test_amd_tsan, stress_test_amd_ubsan, stress_test_amd_msan]
16761811
if: ${{ !cancelled() }}
16771812
name: "Finish Workflow"
16781813
outputs:

‎base/poco/Foundation/include/Poco/Exception.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ class Foundation_API Exception : public std::exception
8484
/// The copy can later be thrown again by
8585
/// invoking rethrow() on it.
8686

87-
virtual void rethrow() const;
87+
[[noreturn]] virtual void rethrow() const;
8888
/// (Re)Throws the exception.
8989
///
9090
/// This is useful for temporarily storing a

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ namespace Net
4545
~HTTPChunkedStreamBuf();
4646
void close();
4747

48-
bool isComplete(bool read_from_device_to_check_eof = false);
48+
bool isComplete(bool read_from_device_to_check_eof = false) noexcept;
4949

5050
protected:
5151
int readFromDevice(char * buffer, std::streamsize length);

‎base/poco/Net/src/HTTPChunkedStream.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ int HTTPChunkedStreamBuf::readFromDevice(char* buffer, std::streamsize length)
140140
}
141141

142142

143-
bool HTTPChunkedStreamBuf::isComplete(bool read_from_device_to_check_eof)
143+
bool HTTPChunkedStreamBuf::isComplete(bool read_from_device_to_check_eof) noexcept
144144
{
145145
if (read_from_device_to_check_eof)
146146
{
@@ -150,7 +150,7 @@ bool HTTPChunkedStreamBuf::isComplete(bool read_from_device_to_check_eof)
150150
/// "Unexpected EOF" exception would be thrown
151151
readFromDevice(nullptr, 0);
152152
}
153-
catch (Poco::Net::MessageException &)
153+
catch (...)
154154
{
155155
return false;
156156
}

‎ci/workflows/release_branches.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
JobConfigs.docker_sever,
2525
JobConfigs.docker_keeper,
2626
*JobConfigs.install_check_master_jobs,
27+
*[job for job in JobConfigs.functional_tests_jobs if "asan" in job.name],
2728
*[
2829
job
2930
for job in JobConfigs.integration_test_asan_master_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 54512)
66
SET(VERSION_MAJOR 25)
77
SET(VERSION_MINOR 8)
8-
SET(VERSION_PATCH 9)
9-
SET(VERSION_GITHASH 8a2475033080b4a8d57b7771f52140af663dd4e0)
10-
SET(VERSION_DESCRIBE v25.8.9.20000.altinityantalya)
11-
SET(VERSION_STRING 25.8.9.20000.altinityantalya)
8+
SET(VERSION_PATCH 12)
9+
SET(VERSION_GITHASH fa393206741c830da77b8f1bcf18c753161932c8)
10+
SET(VERSION_DESCRIBE v25.8.12.20000.altinityantalya)
11+
SET(VERSION_STRING 25.8.12.20000.altinityantalya)
1212
# end of autochange
1313

1414
# This is the 'base' tweak of the version, build scripts will

‎contrib/azure‎

‎contrib/curl‎

Submodule curl updated 2951 files

‎contrib/curl-cmake/CMakeLists.txt‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ set (SRCS
1919
"${LIBRARY_DIR}/lib/cf-h2-proxy.c"
2020
"${LIBRARY_DIR}/lib/cf-haproxy.c"
2121
"${LIBRARY_DIR}/lib/cf-https-connect.c"
22+
"${LIBRARY_DIR}/lib/cf-ip-happy.c"
2223
"${LIBRARY_DIR}/lib/cf-socket.c"
2324
"${LIBRARY_DIR}/lib/cfilters.c"
2425
"${LIBRARY_DIR}/lib/conncache.c"
@@ -27,9 +28,9 @@ set (SRCS
2728
"${LIBRARY_DIR}/lib/cookie.c"
2829
"${LIBRARY_DIR}/lib/cshutdn.c"
2930
"${LIBRARY_DIR}/lib/curl_addrinfo.c"
30-
"${LIBRARY_DIR}/lib/curl_des.c"
3131
"${LIBRARY_DIR}/lib/curl_endian.c"
3232
"${LIBRARY_DIR}/lib/curl_fnmatch.c"
33+
"${LIBRARY_DIR}/lib/curl_fopen.c"
3334
"${LIBRARY_DIR}/lib/curl_get_line.c"
3435
"${LIBRARY_DIR}/lib/curl_gethostname.c"
3536
"${LIBRARY_DIR}/lib/curl_gssapi.c"
@@ -54,7 +55,6 @@ set (SRCS
5455
"${LIBRARY_DIR}/lib/fake_addrinfo.c"
5556
"${LIBRARY_DIR}/lib/file.c"
5657
"${LIBRARY_DIR}/lib/fileinfo.c"
57-
"${LIBRARY_DIR}/lib/fopen.c"
5858
"${LIBRARY_DIR}/lib/formdata.c"
5959
"${LIBRARY_DIR}/lib/ftp.c"
6060
"${LIBRARY_DIR}/lib/ftplistparser.c"
@@ -81,7 +81,6 @@ set (SRCS
8181
"${LIBRARY_DIR}/lib/idn.c"
8282
"${LIBRARY_DIR}/lib/if2ip.c"
8383
"${LIBRARY_DIR}/lib/imap.c"
84-
"${LIBRARY_DIR}/lib/krb5.c"
8584
"${LIBRARY_DIR}/lib/ldap.c"
8685
"${LIBRARY_DIR}/lib/llist.c"
8786
"${LIBRARY_DIR}/lib/macos.c"
@@ -93,6 +92,7 @@ set (SRCS
9392
"${LIBRARY_DIR}/lib/mqtt.c"
9493
"${LIBRARY_DIR}/lib/multi.c"
9594
"${LIBRARY_DIR}/lib/multi_ev.c"
95+
"${LIBRARY_DIR}/lib/multi_ntfy.c"
9696
"${LIBRARY_DIR}/lib/netrc.c"
9797
"${LIBRARY_DIR}/lib/noproxy.c"
9898
"${LIBRARY_DIR}/lib/openldap.c"
@@ -170,16 +170,18 @@ set (SRCS
170170
"${LIBRARY_DIR}/lib/vtls/x509asn1.c"
171171
"${LIBRARY_DIR}/lib/curlx/base64.c"
172172
"${LIBRARY_DIR}/lib/curlx/dynbuf.c"
173+
"${LIBRARY_DIR}/lib/curlx/fopen.c"
173174
"${LIBRARY_DIR}/lib/curlx/inet_ntop.c"
174175
"${LIBRARY_DIR}/lib/curlx/inet_pton.c"
175176
"${LIBRARY_DIR}/lib/curlx/multibyte.c"
176177
"${LIBRARY_DIR}/lib/curlx/nonblock.c"
178+
"${LIBRARY_DIR}/lib/curlx/strerr.c"
177179
"${LIBRARY_DIR}/lib/curlx/strparse.c"
178180
"${LIBRARY_DIR}/lib/curlx/timediff.c"
179181
"${LIBRARY_DIR}/lib/curlx/timeval.c"
180182
"${LIBRARY_DIR}/lib/curlx/version_win32.c"
181-
"${LIBRARY_DIR}/lib/curlx/warnless.c"
182183
"${LIBRARY_DIR}/lib/curlx/wait.c"
184+
"${LIBRARY_DIR}/lib/curlx/warnless.c"
183185
"${LIBRARY_DIR}/lib/curlx/winapi.c"
184186
)
185187

‎contrib/icu‎

Submodule icu updated 14900 files

0 commit comments

Comments
 (0)