arno/etesync-server
1
0
Fork 0
mirror of https://github.com/etesync/server synced 2024-12-28 02:08:08 +00:00
Code Issues Releases Wiki Activity

Optimize stoken-using functions to only account for current revisions.

Browse Source 
No need to account for revisions that are not current when calculating stokens
because those, by definition, are not the latest ones, and therefore won't have
the most recent stokens.

This becomes a problem when collections have many associated revisions.
This commit is contained in:
Tom Hacohen 2023-08-15 20:21:23 -04:00
parent 4293acb3a3
commit a54afd5210
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etebase_server/django/models.py
View File

@ -66,7 +66,7 @@ class Collection(models.Model):
@cached_property @cached_property
def stoken(self) -> str: def stoken(self) -> str:
stoken_id = ( stoken_id = (
self.__class__.objects.filter(main_item=self.main_item) self.__class__.objects.filter(main_item=self.main_item, items__revisions__current=True)
.annotate(max_stoken=self.stoken_annotation) .annotate(max_stoken=self.stoken_annotation)
.values("max_stoken") .values("max_stoken")
.first()["max_stoken"] .first()["max_stoken"]

4
etebase_server/fastapi/routers/collection.py
View File

@ -208,7 +208,7 @@ def collection_list_common(
prefetch: Prefetch, prefetch: Prefetch,
) -> CollectionListResponse: ) -> CollectionListResponse:
result, new_stoken_obj, done = filter_by_stoken_and_limit( result, new_stoken_obj, done = filter_by_stoken_and_limit(
stoken, limit, queryset, models.Collection.stoken_annotation stoken, limit, queryset.filter(items__revisions__current=True), models.Collection.stoken_annotation
) )
new_stoken = new_stoken_obj and new_stoken_obj.uid new_stoken = new_stoken_obj and new_stoken_obj.uid
context = Context(user, prefetch) context = Context(user, prefetch)
@ -428,7 +428,7 @@ def item_list_common(
prefetch: Prefetch, prefetch: Prefetch,
) -> CollectionItemListResponse: ) -> CollectionItemListResponse:
result, new_stoken_obj, done = filter_by_stoken_and_limit( result, new_stoken_obj, done = filter_by_stoken_and_limit(
stoken, limit, queryset, models.CollectionItem.stoken_annotation stoken, limit, queryset.filter(revisions__current=True), models.CollectionItem.stoken_annotation
) )
new_stoken = new_stoken_obj and new_stoken_obj.uid new_stoken = new_stoken_obj and new_stoken_obj.uid
context = Context(user, prefetch) context = Context(user, prefetch)