Merge lp:~camptocamp/openobject-addons/7.0_fix-document-search-order-by_rde into lp:openobject-addons/7.0

[Alexandre Fayolle - camptocamp]

[FIX] document: preserve the order in search()

[Leonardo Pistone (lepistone)]

Thanks for pointing out the performance problems of list.remove, good catch.

I suppose the list comprehension at the end is necessary because there is no "intersection" method between sets and lists that preserves order.

review: Approve (code review)

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

LGTM

Thanks

review: Approve (code review, no test)

Unmerged revisions

9957. By Romain Deheele - Camptocamp on 2014-04-04

[FIX] document: search method overload should take into account order by clause

=== modified file 'document/document.py'
--- document/document.py	2013-12-16 12:39:54 +0000
+++ document/document.py	2014-04-07 08:30:58 +0000
@@ -89,6 +89,11 @@
         if not ids:
             return 0 if count else []
 
+        # Work with a set, as list.remove() is prohibitive for large lists of documents
+        # (takes 20+ seconds on a db with 100k docs during search_count()!)
+        orig_ids = ids
+        ids = set(ids)
+
         # Filter out documents that are in directories that the user is not allowed to read.
         # Must use pure SQL to avoid access rules exceptions (we want to remove the records,
         # not fail), and the records have been filtered in parent's search() anyway.
@@ -108,7 +113,8 @@
         for parent_id in visible_parent_ids:
             ids.extend(parents[parent_id])
 
-        return len(ids) if count else ids
+        result = [id for id in orig_ids if id in ids]
+        return len(result) if count else result
 
     def copy(self, cr, uid, id, default=None, context=None):
         if not default: