[IMP] util/pg: allow multiple parallel filters

When exploding a query we may need to add the same parallel filter in
multiple places.

closes #38

Signed-off-by: Christophe Simonis (chs) <chs@odoo.com>

Author: aj-fuentes

src/base/tests/test_util.py

@@ -435,6 +435,35 @@ def test_pg_text2html(self, value, expected):
         result = cr.fetchone()[0]
         self.assertEqual(result, expected)
 
+    def test_explode_mult_filters(self):
+        cr = self.env.cr
+        queries = util.explode_query_range(
+            cr,
+            """
+            WITH cte1 AS (
+                SELECT id,
+                       login
+                  FROM res_users
+                 WHERE {parallel_filter}
+            ), cte2 AS (
+                SELECT id,
+                       login
+                  FROM res_users
+                 WHERE {parallel_filter}
+            ) SELECT u.login = cte1.login AND u.login = cte2.login
+                FROM cte1
+           LEFT JOIN cte2
+                  ON cte2.id = cte1.id
+                JOIN res_users u
+                  ON u.id = cte1.id
+            """,
+            table="res_users",
+            bucket_size=4,
+        )
+        for q in queries:
+            cr.execute(q)
+            self.assertTrue(all(x for (x,) in cr.fetchall()))
+
     def test_parallel_rowcount(self):
         cr = self.env.cr
         cr.execute("SELECT count(*) FROM res_lang")

src/util/pg.py

@@ -212,10 +212,11 @@ def explode_query_range(cr, query, table, alias=None, bucket_size=10000, prefix=
         parallel_filter = "{alias}.id IS NOT NULL".format(alias=alias)
         return [query.format(parallel_filter=parallel_filter)]
 
-    parallel_filter = "{alias}.id BETWEEN %s AND %s".format(alias=alias)
+    parallel_filter = "{alias}.id BETWEEN %(lower-bound)s AND %(upper-bound)s".format(alias=alias)
     query = query.replace("%", "%%").format(parallel_filter=parallel_filter)
     return [
-        cr.mogrify(query, [index, index + bucket_size - 1]).decode() for index in range(min_id, max_id, bucket_size)
+        cr.mogrify(query, {"lower-bound": index, "upper-bound": index + bucket_size - 1}).decode()
+        for index in range(min_id, max_id, bucket_size)
     ]