Skip to content

Fix RepositoryVersion.content query failing when >65K units #6784

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dkliban merged 1 commit into from
Jul 15, 2025
Merged

Fix RepositoryVersion.content query failing when >65K units #6784

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGES/6772.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fixed the new content set optimization failing when the RepositoryVersion grew larger than 65K content units.
10 changes: 9 additions & 1 deletion pulpcore/app/models/repository.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -890,7 +890,15 @@ def get_content(self, content_qs=None):
if content_qs is None:
content_qs = Content.objects

return content_qs.filter(pk__in=self._get_content_ids())
content_ids = self._get_content_ids()
if isinstance(content_ids, list) and len(content_ids) >= 65535:

@jobselko jobselko Jul 14, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What about making a constant from this number, e.g. POSTGRESQL_MAX_PARAMS?

@bmbouter bmbouter Jul 14, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From reading this I think it's a hard-limit

# Workaround for PostgreSQL's limit on the number of parameters in a query
content_ids = (
RepositoryVersion.objects.filter(pk=self.pk)
.annotate(cids=Func(F("content_ids"), function="unnest"))
.values_list("cids", flat=True)
)
Comment thread
jobselko marked this conversation as resolved.
return content_qs.filter(pk__in=content_ids)

@property
def content(self):
Expand Down