0001-sql-use-a-for-loop-to-iterate-on-cursors.patch

Benjamin Dauvergne, 06 octobre 2021 09:51

Voir les différences: en ligne côte à côte

Subject: [PATCH 1/3] sql: use a for loop to iterate on cursors

cursor.fetchone() disable prefetching by named cursors. It forces one
row at a time iterations and using a while loop is a bizarre idiom for
psycopg2 since cursor are perfectly iterable.

 wcs/sql.py | 36 ++++++++----------------------------
 1 file changed, 8 insertions(+), 28 deletions(-)

                 ('wcs\\_view\\_%',),
+            )
         view_names = []
         while True:
             row = cur.fetchone()
             if row is None:
                 break
         for row in cur:
             view_names.append(row[0])
         for view_name in view_names:
-...
             ('wcs\\_category\\_%',),
+        )
         view_names = []
         while True:
             row = cur.fetchone()
             if row is None:
                 break
         for row in cur:
             view_names.append(row[0])
         for view_name in view_names:
-...
             ('wcs\\_view\\_%',),
+        )
         existing_views = set()
         while True:
             row = cur.fetchone()
             if row is None:
                 break
         for row in cur:
             existing_views.add(row[0])
         view_names = existing_views.intersection(view_names)
-...
                 parameters['offset'] = offset
             cur.execute(sql_statement, parameters)
             try:
                 while True:
                     row = cur.fetchone()
                     if row is None:
                         break
                 for row in cur:
                     ob = cls._row2ob(row)
                     if ignore_errors and ob is None:
                         continue
-...
         @classmethod
         def get_objects_iterator(cls, cur, ignore_errors=False, extra_fields=None):
             while True:
                 row = cur.fetchone()
                 if row is None:
                     break
             for row in cur:
                 yield cls._row2ob(row, extra_fields=extra_fields)
         @classmethod
-...
             if cls._iterate_on_server:
                 conn = get_connection(isolate=True)
                 cur = conn.cursor(name='select_iterator_%s' % uuid.uuid4())
                 cur.itersize = 1
             else:
                 conn, cur = get_connection_and_cursor()
             cur.execute(sql_statement, parameters)
-...
+            )
             cur.execute(sql_statement, {'id': self.id})
             self._evolution = []
             while True:
                 row = cur.fetchone()
                 if row is None:
                     break
             for row in cur:
                 self._evolution.append(self._row2evo(row, formdata=self))
             conn.commit()
             cur.close()
-...
             for value in values:
                 value._evolution = []
             while True:
                 row = cur.fetchone()
                 if row is None:
                     break
             for row in cur:
                 formdata_id = tuple(row[:8])[7]
                 formdata = object_dict.get(formdata_id)
                 if not formdata:
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0001-sql-use-a-for-loop-to-iterate-on-cursors.patch