Skip to content
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

Jump to bottom

Query optimization for the Briefcase viewset #2142

Merged
merged 6 commits into from
Oct 6, 2021
Merged

Query optimization for the Briefcase viewset #2142

Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
81af06d
Calculate instance_count only when the `instances` queryset is a slice
DavisRayM Sep 14, 2021
2bbc025
Retrieve the `pk` & `uuid` fields only
DavisRayM Sep 14, 2021
031fa06
Retrieve instance_count by retrieving the length of the `instances` q…
DavisRayM Sep 29, 2021
edc1def
Update comment
DavisRayM Oct 5, 2021
f63617b
Remove trailing whitespace
DavisRayM Oct 5, 2021
b406899
Check if `instance_count` is greater than 0
DavisRayM Oct 5, 2021
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
19 changes: 13 additions & 6 deletions onadata/apps/api/viewsets/briefcase_viewset.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,9 @@ def filter_queryset(self, queryset):
xform_kwargs['user__username__iexact'] = username
xform = get_form(xform_kwargs)
self.check_object_permissions(self.request, xform)
instances = Instance.objects.filter(xform=xform,
deleted_at__isnull=True)
instances = Instance.objects.filter(
xform=xform, deleted_at__isnull=True).values(
'pk', 'uuid')
Copy link
Member

Choose a reason for hiding this comment

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

Are we using the uuid anywhere? We could just only return the pk.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, we're using it on the list endpoint https://github.com/onaio/onadata/blob/b406899b61/onadata/apps/logger/templates/submissionList.xml

Copy link
Member

Choose a reason for hiding this comment

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

Noted, forgot about that.

if xform.encrypted:
instances = instances.filter(media_all_received=True)
instances = instances.order_by('pk')
Expand All @@ -143,10 +144,16 @@ def filter_queryset(self, queryset):
if num_entries:
instances = instances[:num_entries]

if instances.count():
last_instance = instances[instances.count() - 1]
self.resumptionCursor = last_instance.pk
elif instances.count() == 0 and cursor:
# Using len() instead of .count() to prevent an extra
# database call; len() will load the instances in memory allowing
# us to pre-load the queryset before generating the response
DavisRayM marked this conversation as resolved.
Show resolved Hide resolved
# and removes the need to perform a count on the database.
instance_count = len(instances)

if instance_count:
last_instance = instances[instance_count - 1]
self.resumptionCursor = last_instance.get('pk')
elif instance_count == 0 and cursor:
DavisRayM marked this conversation as resolved.
Show resolved Hide resolved
self.resumptionCursor = cursor
else:
self.resumptionCursor = 0
Expand Down