0001-sql-rework-the-rebuild_security-function-66315.patch

Pierre Ducroquet, 20 juin 2022 12:56

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

Subject: [PATCH] sql: rework the rebuild_security function (#66315)

The function rewrote the whole table without checking if updates were really required.
Instead, we now check before updating, and we commit every 100 rows to prevent any
long lock

 wcs/formdata.py  |  2 +-
 wcs/sql.py       | 38 +++++++++++++++++++++++++++++---------
 wcs/workflows.py |  2 +-
 3 files changed, 31 insertions(+), 11 deletions(-)

             return variables
         @classmethod
         def rebuild_security(cls):
         def rebuild_security(cls, must_update=False):
             with get_publisher().substitutions.temporary_feed(cls._formdef):
                 cls.rebuild_indexes(indexes=['concerned_roles', 'actions_roles'])

             cur.close()
         @classmethod
         def rebuild_security(cls):
         def rebuild_security(cls, must_update=False):
             formdatas = cls.select(order_by='id', iterator=True)
             conn, cur = get_connection_and_cursor()
             i = 0
             for formdata in formdatas:
                 sql_statement = (
                     '''UPDATE %s
                           SET concerned_roles_array = %%(roles)s,
                               actions_roles_array = %%(actions_roles)s,
                               workflow_merged_roles_dict = %%(workflow_merged_roles_dict)s
                         WHERE id = %%(id)s'''
                     % cls._table_name
+                )
                 # don't update all formdata before commiting
                 # this will make us hold locks for much longer than required
                 i += 1
                 if i % 100 == 0:
                     conn.commit()
                 if not must_update:
                     sql_statement = (
                         '''UPDATE %s
                               SET concerned_roles_array = %%(roles)s,
                                   actions_roles_array = %%(actions_roles)s,
                                   workflow_merged_roles_dict = %%(workflow_merged_roles_dict)s
                             WHERE id = %%(id)s
                               AND (concerned_roles_array <> %%(roles)s OR
                                   actions_roles_array <> %%(actions_roles)s OR
                                   workflow_merged_roles_dict <> %%(workflow_merged_roles_dict)s)'''
                         % cls._table_name
+                    )
                 else:
                     sql_statement = (
                         '''UPDATE %s
                               SET concerned_roles_array = %%(roles)s,
                                   actions_roles_array = %%(actions_roles)s,
                                   workflow_merged_roles_dict = %%(workflow_merged_roles_dict)s
                             WHERE id = %%(id)s'''
                         % cls._table_name
+                    )
                 with get_publisher().substitutions.temporary_feed(formdata):
                     # formdata is already added to sources list in individual
                     # {concerned,actions}_roles but adding it first here will

                             formdef.geolocations = {'base': str(_('Geolocation'))}
                             formdef.store(comment=_('Geolocation enabled by workflow'))
                         formdef.update_storage()
                     formdef.data_class().rebuild_security()
                     formdef.data_class().rebuild_security(must_update)
             if not migration_update:
                 if get_response():
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0001-sql-rework-the-rebuild_security-function-66315.patch