Skip to content

Conversation

@ydbot
Copy link
Collaborator

@ydbot ydbot commented Dec 12, 2025

Changelog entry

Changelog category

  • Not for changelog (changelog entry is not required)

Description for reviewers

Original PR(s)

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-stable-25-3-251212-105245
# Resolve conflicts in files
git add .
git commit -m "Resolved merge conflicts"
git push

After resolving conflicts:

  1. Fix the PR title (remove [CONFLICT] if conflicts are resolved)
  2. 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

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

@ydbot
Copy link
Collaborator Author

ydbot commented Dec 12, 2025

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

▶  Run tests

Remove Uncommitted vector from TPortionsSources class.
@github-actions
Copy link

github-actions bot commented Dec 12, 2025

🟢 2025-12-12 10:58:00 UTC The validation of the Pull Request description is successful.

@XJIE6 XJIE6 changed the title [CONFLICT] [Backport stable-25-3] commit 77e7e8e: fix [Backport stable-25-3] commit 77e7e8e: fix Dec 12, 2025
@XJIE6 XJIE6 marked this pull request as ready for review December 12, 2025 10:57
@XJIE6 XJIE6 requested a review from a team as a code owner December 12, 2025 10:57
@github-actions
Copy link

github-actions bot commented Dec 12, 2025

2025-12-12 10:57:42 UTC Pre-commit check linux-x86_64-relwithdebinfo for 97a7f2a has started.
2025-12-12 10:58:58 UTC Artifacts will be uploaded here
2025-12-12 11:02:32 UTC ya make is running...
🟡 2025-12-12 12:26:54 UTC Some tests failed, follow the links below. Going to retry failed tests...

Ya make output | Test bloat

TESTS PASSED ERRORS FAILED SKIPPED MUTED?
31532 30210 0 7 1292 23

2025-12-12 12:27:02 UTC ya make is running... (failed tests rerun, try 2)
🟡 2025-12-12 12:43:53 UTC Some tests failed, follow the links below. Going to retry failed tests...

Ya make output | Test bloat | Test bloat

TESTS PASSED ERRORS FAILED SKIPPED MUTED?
574 (only retried tests) 558 0 1 1 14

2025-12-12 12:43:56 UTC ya make is running... (failed tests rerun, try 3)
🔴 2025-12-12 13:01:05 UTC Some tests failed, follow the links below.

Ya make output | Test bloat | Test bloat | Test bloat

TESTS PASSED ERRORS FAILED SKIPPED MUTED?
544 (only retried tests) 529 0 1 0 14

🟢 2025-12-12 13:01:08 UTC Build successful.
🟢 2025-12-12 13:01:31 UTC ydbd size 2.3 GiB changed* by -23.2 MiB, which is <= 0 Bytes vs main: OK

ydbd size dash main: 7fe9277 merge: 97a7f2a diff diff %
ydbd size 2 468 806 360 Bytes 2 444 469 104 Bytes -23.2 MiB -0.986%
ydbd stripped size 525 344 608 Bytes 522 565 512 Bytes -2.7 MiB -0.529%

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

@github-actions
Copy link

github-actions bot commented Dec 12, 2025

2025-12-12 11:09:25 UTC Pre-commit check linux-x86_64-release-asan for 97a7f2a has started.
2025-12-12 11:09:39 UTC Artifacts will be uploaded here
2025-12-12 11:13:09 UTC ya make is running...
🟡 2025-12-12 13:22:28 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?
15641 15168 0 184 269 20

🟢 2025-12-12 13:22:35 UTC Build successful.
🟢 2025-12-12 13:23:09 UTC ydbd size 3.8 GiB changed* by -61.3 MiB, which is <= 0 Bytes vs main: OK

ydbd size dash main: 7fe9277 merge: 97a7f2a diff diff %
ydbd size 4 134 217 592 Bytes 4 069 928 352 Bytes -61.3 MiB -1.555%
ydbd stripped size 1 534 515 928 Bytes 1 515 497 568 Bytes -18.1 MiB -1.239%

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

@XJIE6 XJIE6 added the rebase-and-check Rebase PR with the current base branch and check label Dec 12, 2025
@github-actions github-actions bot removed the rebase-and-check Rebase PR with the current base branch and check label Dec 12, 2025
@XJIE6 XJIE6 enabled auto-merge December 12, 2025 16:56
@github-actions
Copy link

github-actions bot commented Dec 12, 2025

2025-12-12 17:06:05 UTC Pre-commit check linux-x86_64-release-asan for 1e60e34 has started.
2025-12-12 17:06:20 UTC Artifacts will be uploaded here
2025-12-12 17:09:48 UTC ya make is running...
🟡 2025-12-12 19:16:21 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?
15642 15092 0 279 248 23

🟢 2025-12-12 19:16:26 UTC Build successful.
🟢 2025-12-12 19:16:56 UTC ydbd size 3.8 GiB changed* by -61.3 MiB, which is <= 0 Bytes vs main: OK

ydbd size dash main: 34c7c38 merge: 1e60e34 diff diff %
ydbd size 4 134 232 592 Bytes 4 069 928 416 Bytes -61.3 MiB -1.555%
ydbd stripped size 1 534 520 856 Bytes 1 515 497 632 Bytes -18.1 MiB -1.240%

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

@github-actions
Copy link

github-actions bot commented Dec 12, 2025

2025-12-12 17:06:42 UTC Pre-commit check linux-x86_64-relwithdebinfo for 1e60e34 has started.
2025-12-12 17:06:56 UTC Artifacts will be uploaded here
2025-12-12 17:10:25 UTC ya make is running...
🟡 2025-12-12 18:34:18 UTC Some tests failed, follow the links below. Going to retry failed tests...

Ya make output | Test bloat

TESTS PASSED ERRORS FAILED SKIPPED MUTED?
31533 30216 0 3 1293 21

2025-12-12 18:34:27 UTC ya make is running... (failed tests rerun, try 2)
🟡 2025-12-12 18:51:46 UTC Some tests failed, follow the links below. Going to retry failed tests...

Ya make output | Test bloat | Test bloat

TESTS PASSED ERRORS FAILED SKIPPED MUTED?
797 (only retried tests) 781 0 1 0 15

2025-12-12 18:51:49 UTC ya make is running... (failed tests rerun, try 3)
🔴 2025-12-12 19:10:30 UTC Some tests failed, follow the links below.

Ya make output | Test bloat | Test bloat | Test bloat

TESTS PASSED ERRORS FAILED SKIPPED MUTED?
549 (only retried tests) 531 0 1 1 16

🟢 2025-12-12 19:10:33 UTC Build successful.
🟢 2025-12-12 19:10:53 UTC ydbd size 2.3 GiB changed* by -23.2 MiB, which is <= 0 Bytes vs main: OK

ydbd size dash main: 34c7c38 merge: 1e60e34 diff diff %
ydbd size 2 468 815 512 Bytes 2 444 469 264 Bytes -23.2 MiB -0.986%
ydbd stripped size 525 346 208 Bytes 522 565 576 Bytes -2.7 MiB -0.529%

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants