From 7e4150ca3f157b094149f0393fd32c1915f8d85a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20=C3=89vrard?= Date: Tue, 10 May 2022 15:24:37 +0200 Subject: [PATCH] Read at most cache size or IN_MAX records from the database issue11468 review427111003 --- trytond/model/modelstorage.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/trytond/model/modelstorage.py b/trytond/model/modelstorage.py index 77c4704596..d656f66a11 100644 --- a/trytond/model/modelstorage.py +++ b/trytond/model/modelstorage.py @@ -1676,11 +1676,13 @@ class ModelStorage(Model): if id_ not in s: s.add(id_) yield id_ + read_size = max(1, min( + self._cache.size_limit, self._local_cache.size_limit, + self._transaction.database.IN_MAX)) index = self._ids.index(self.id) ids = chain(islice(self._ids, index, None), islice(self._ids, 0, max(index - 1, 0))) - ids = islice(unique(filter(filter_, ids)), - self._transaction.database.IN_MAX) + ids = islice(unique(filter(filter_, ids)), read_size) def instantiate(field, value, data): if field._type in ('many2one', 'one2one', 'reference'): @@ -1744,7 +1746,7 @@ class ModelStorage(Model): read_data = [] for id_ in islice(chain(islice(self._ids, index, None), islice(self._ids, 0, max(index - 1, 0))), - self._transaction.database.IN_MAX): + read_size): if id_ in self._cache: data = {'id': id_} for fname in ffields: