ydb [Backport main] commit 77e7e8e: fix

Changelog entry

Changelog category

Not for changelog (changelog entry is not required)

Description for reviewers

Original PR(s)

commit https://github.com/ydb-platform/ydb/commit/77e7e8e7ccdeccfa5695e9dde3f6704c6441870d

Metadata

Original PR author(s): @XJIE6
Cherry-picked by: @XJIE6
Related issues: None

Conflicts Require Manual Resolution

This PR contains merge conflicts that require manual resolution.

Files with conflicts:

How to resolve conflicts:

git fetch origin
git checkout --track origin/cherry-pick-main-251212-120749
# Resolve conflicts in files
git add .
git commit -m "Resolved merge conflicts"
git push

After resolving conflicts:

Fix the PR title (remove [CONFLICT] if conflicts are resolved)
Mark PR as ready for review

Git Cherry-Pick Log

=== Cherry-picking 77e7e8e ===
Auto-merging ydb/core/tx/columnshard/engines/reader/simple_reader/iterator/collections/constructors.h
CONFLICT (content): Merge conflict in ydb/core/tx/columnshard/engines/reader/simple_reader/iterator/collections/constructors.h
Auto-merging ydb/core/tx/columnshard/engines/reader/simple_reader/iterator/sync_points/limit.cpp
CONFLICT (content): Merge conflict in ydb/core/tx/columnshard/engines/reader/simple_reader/iterator/sync_points/limit.cpp
Auto-merging ydb/core/tx/columnshard/engines/reader/simple_reader/iterator/sync_points/limit.h
CONFLICT (content): Merge conflict in ydb/core/tx/columnshard/engines/reader/simple_reader/iterator/sync_points/limit.h

error: could not apply 77e7e8e7ccd... fix
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

PR was created by cherry-pick workflow run

Dec 12 '25 12:12 ydbot

Run Extra Tests

Run additional tests for this PR. You can customize:

Test Size: small, medium, large (default: all)
Test Targets: any directory path (default: ydb/)
Sanitizers: ASAN, MSAN, TSAN
Coredumps: enable for debugging (default: off)
Additional args: custom ya make arguments

Dec 12 '25 12:12 ydbot

:green_circle: 2025-12-12 12:19:38 UTC The validation of the Pull Request description is successful.

Dec 12 '25 12:12 github-actions[bot]

:white_circle: 2025-12-12 12:13:27 UTC Pre-commit check linux-x86_64-relwithdebinfo for 9796a8defe34f2219b39524351a160bf9aa50f86 has started. :white_circle: 2025-12-12 12:14:04 UTC Artifacts will be uploaded here :white_circle: 2025-12-12 12:16:26 UTC ya make is running... :black_circle: 2025-12-12 12:18:25 UTC Check cancelled

Dec 12 '25 12:12 github-actions[bot]

:white_circle: 2025-12-12 12:14:52 UTC Pre-commit check linux-x86_64-release-asan for 9796a8defe34f2219b39524351a160bf9aa50f86 has started. :white_circle: 2025-12-12 12:15:08 UTC Artifacts will be uploaded here :white_circle: 2025-12-12 12:17:13 UTC ya make is running... :black_circle: 2025-12-12 12:18:27 UTC Check cancelled

Dec 12 '25 12:12 github-actions[bot]

:white_circle: 2025-12-12 12:18:52 UTC Pre-commit check linux-x86_64-relwithdebinfo for 47eb6cc60126fce59a6759748a80fa5ae905f3bf has started. :white_circle: 2025-12-12 12:19:00 UTC Artifacts will be uploaded here :white_circle: 2025-12-12 12:20:20 UTC ya make is running... :red_circle: 2025-12-12 12:23:06 UTC Build failed, see the logs. Also see fail summary

Dec 12 '25 12:12 github-actions[bot]

:white_circle: 2025-12-12 12:18:53 UTC Pre-commit check linux-x86_64-release-asan for 47eb6cc60126fce59a6759748a80fa5ae905f3bf has started. :white_circle: 2025-12-12 12:18:59 UTC Artifacts will be uploaded here :white_circle: 2025-12-12 12:20:13 UTC ya make is running... :red_circle: 2025-12-12 12:23:34 UTC Build failed, see the logs. Also see fail summary

Dec 12 '25 12:12 github-actions[bot]

:white_circle: 2025-12-12 12:58:51 UTC Pre-commit check linux-x86_64-relwithdebinfo for fd31f2164a94122ae15548430ae02a15898531f5 has started. :white_circle: 2025-12-12 12:59:08 UTC Artifacts will be uploaded here :white_circle: 2025-12-12 13:01:13 UTC ya make is running... :yellow_circle: 2025-12-12 14:32:57 UTC Some tests failed, follow the links below. Going to retry failed tests...

Ya make output | Test bloat

TESTS	PASSED	ERRORS	FAILED	SKIPPED	MUTED^?
32426	30968	0	10	1420	28

:white_circle: 2025-12-12 14:33:08 UTC ya make is running... (failed tests rerun, try 2) :green_circle: 2025-12-12 14:48:54 UTC Tests successful.

Ya make output | Test bloat | Test bloat

TESTS	PASSED	ERRORS	FAILED	SKIPPED	MUTED^?
73 (only retried tests)	60	0	0	0	13

:green_circle: 2025-12-12 14:49:01 UTC Build successful. :green_circle: 2025-12-12 14:49:24 UTC ydbd size 2.3 GiB changed* by +6.9 KiB, which is < 100.0 KiB vs main: OK

ydbd size dash	main: 3c7edea4dc2f22301e0f3f054b92eddc5b67ce91	merge: fd31f2164a94122ae15548430ae02a15898531f5	diff	diff %
ydbd size	2 468 811 232 Bytes	2 468 818 336 Bytes	+6.9 KiB	+0.000%
ydbd stripped size	525 338 784 Bytes	525 340 384 Bytes	+1.6 KiB	+0.000%

^{*please be aware that the difference is based on comparing your commit and the last completed build from the post-commit, check comparation}

Dec 12 '25 12:12 github-actions[bot]

:white_circle: 2025-12-12 12:59:04 UTC Pre-commit check linux-x86_64-release-asan for fd31f2164a94122ae15548430ae02a15898531f5 has started. :white_circle: 2025-12-12 12:59:08 UTC Artifacts will be uploaded here :white_circle: 2025-12-12 13:00:24 UTC ya make is running... :yellow_circle: 2025-12-12 14:07:35 UTC Some tests failed, follow the links below. This fail is not in blocking policy yet

Ya make output | Test bloat

TESTS	PASSED	ERRORS	FAILED	SKIPPED	MUTED^?
11767	11581	0	166	10	10

:green_circle: 2025-12-12 14:07:44 UTC Build successful. :green_circle: 2025-12-12 14:08:16 UTC ydbd size 3.9 GiB changed* by +5.9 KiB, which is < 100.0 KiB vs main: OK

ydbd size dash	main: 34c7c388762269a17b8a91a67c405ff750d82c64	merge: fd31f2164a94122ae15548430ae02a15898531f5	diff	diff %
ydbd size	4 134 232 592 Bytes	4 134 238 592 Bytes	+5.9 KiB	+0.000%
ydbd stripped size	1 534 520 856 Bytes	1 534 502 040 Bytes	-18.4 KiB	-0.001%

^{*please be aware that the difference is based on comparing your commit and the last completed build from the post-commit, check comparation}

Dec 12 '25 12:12 github-actions[bot]

Backport

To backport this PR, click the button next to the target branch and then click "Run workflow" in the Run Actions UI.

Branch	Run
`stable-25-2, stable-25-2-1, stable-25-3, stable-25-3-1`
`stable-25-3, stable-25-3-1`
`stable-25-3`

Dec 12 '25 16:12 ydbot