Skip to content

Cherry pick #94605 to 25.12: Add support for SQL-defined named collections in BACKUP/RESTORE#94708

Merged
robot-ch-test-poll4 merged 4 commits intobackport/25.12/94605from
cherrypick/25.12/94605
Jan 21, 2026
Merged

Cherry pick #94605 to 25.12: Add support for SQL-defined named collections in BACKUP/RESTORE#94708
robot-ch-test-poll4 merged 4 commits intobackport/25.12/94605from
cherrypick/25.12/94605

Conversation

@robot-ch-test-poll4
Copy link
Contributor

Original pull-request #94605

Do not merge this PR manually

This pull-request is a first step of an automated backporting.
It contains changes similar to calling git cherry-pick locally.
If you intend to continue backporting the changes, then resolve all conflicts if any.
Otherwise, if you do not want to backport them, then just close this pull-request.

The check results does not matter at this step - you can safely ignore them.

Troubleshooting

If the conflicts were resolved in a wrong way

If this cherry-pick PR is completely screwed by a wrong conflicts resolution, and you want to recreate it:

  • delete the pr-cherrypick label from the PR
  • delete this branch from the repository

You also need to check the Original pull-request for pr-backports-created label, and delete if it's presented there

The PR source

The PR is created in the CI job

pamarcos and others added 4 commits January 19, 2026 15:59
…3 and AzureBlobStorage

- Add BackupInfo::getNamedCollection to consolidate named collection loading, access checking,
  and key-value override handling for both S3 and Azure backup engines.
- Call NamedCollectionFactory::instance().loadIfNot() to load SQL-defined collections before lookup.
- Refactor Azure backup to reuse getAzureConnectionParams instead of duplicating connection logic.
- Add integration tests for SQL-defined named collections (with and without key-value overrides)
  for both S3 and Azure.
…backup

Add support for SQL-defined named collections in BACKUP/RESTORE
@robot-ch-test-poll4 robot-ch-test-poll4 added pr-cherrypick Cherry-pick of merge-commit before backporting. Do not use manually - automated use only! do not test disable testing on pull request labels Jan 21, 2026
@robot-ch-test-poll4 robot-ch-test-poll4 merged commit 91efbd6 into backport/25.12/94605 Jan 21, 2026
109 of 116 checks passed
@robot-ch-test-poll4 robot-ch-test-poll4 deleted the cherrypick/25.12/94605 branch January 21, 2026 11:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

do not test disable testing on pull request pr-cherrypick Cherry-pick of merge-commit before backporting. Do not use manually - automated use only!

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants