[IMP] orm: parallel iter_browse

src/base/tests/test_util.py

@@ -18,6 +18,11 @@
 from odoo import modules
 from odoo.tools import mute_logger
 
+try:
+    from odoo.sql_db import db_connect
+except ImportError:
+    from openerp.sql_db import db_connect
+
 from odoo.addons.base.maintenance.migrations import util
 from odoo.addons.base.maintenance.migrations.testing import UnitTestCase, parametrize
 from odoo.addons.base.maintenance.migrations.util import snippets
@@ -1494,6 +1499,27 @@ def test_iter(self):
         self.assertEqual(result, expected)
 
 
+class TestQueryIds(UnitTestCase):
+    def test_straight(self):
+        result = list(util.query_ids(self.env.cr, "SELECT * FROM (VALUES (1), (2)) AS x(x)", itersize=2))
+        self.assertEqual(result, [1, 2])
+
+    def test_chunks(self):
+        with util.query_ids(self.env.cr, "SELECT * FROM (VALUES (1), (2)) AS x(x)") as ids:
+            result = list(util.chunks(ids, 100, fmt=list))
+        self.assertEqual(result, [[1, 2]])
+
+    def test_destructor(self):
+        ids = util.query_ids(self.env.cr, "SELECT id from res_users")
+        del ids
+
+    def test_pk_violation(self):
+        with db_connect(self.env.cr.dbname).cursor() as cr, mute_logger("odoo.sql_db"), self.assertRaises(
+            ValueError
+        ), util.query_ids(cr, "SELECT * FROM (VALUES (1), (1)) AS x(x)") as ids:
+            list(ids)
+
+
 class TestRecords(UnitTestCase):
     def test_rename_xmlid(self):
         cr = self.env.cr

src/util/models.py

@@ -27,6 +27,7 @@
     get_m2m_tables,
     get_value_or_en_translation,
     parallel_execute,
+    query_ids,
     table_exists,
     update_m2m_tables,
     view_exists,
@@ -128,17 +129,17 @@ def remove_model(cr, model, drop_table=True, ignore_m2m=()):
                 'SELECT id FROM "{}" r WHERE {}'.format(ir.table, ir.model_filter(prefix="r.")), [model]
             ).decode()
 
-        cr.execute(query)
-        if ir.table == "ir_ui_view":
-            for (view_id,) in cr.fetchall():
-                remove_view(cr, view_id=view_id, silent=True)
-        else:
-            # remove in batch
-            size = (cr.rowcount + chunk_size - 1) / chunk_size
-            it = chunks([id for (id,) in cr.fetchall()], chunk_size, fmt=tuple)
-            for sub_ids in log_progress(it, _logger, qualifier=ir.table, size=size):
-                remove_records(cr, ref_model, sub_ids)
-                _rm_refs(cr, ref_model, sub_ids)
+        with query_ids(cr, query, itersize=chunk_size) as ids_:
+            if ir.table == "ir_ui_view":
+                for view_id in ids_:
+                    remove_view(cr, view_id=view_id, silent=True)
+            else:
+                # remove in batch
+                size = (len(ids_) + chunk_size - 1) / chunk_size
+                it = chunks(ids_, chunk_size, fmt=tuple)
+                for sub_ids in log_progress(it, _logger, qualifier=ir.table, size=size):
+                    remove_records(cr, ref_model, sub_ids)
+                    _rm_refs(cr, ref_model, sub_ids)
 
         if ir.set_unknown:
             # Link remaining records not linked to a XMLID