0001-misc-limit-query-to-recent-sessions-when-checking-fo.patch

Frédéric Péters, 19 juin 2019 15:53

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

Subject: [PATCH] misc: limit query to recent sessions when checking for locked
 objects (#34097)

 wcs/sessions.py | 21 ++++++++++++++++++---
 wcs/sql.py      | 26 ++++++++++++++++++++++----
 2 files changed, 40 insertions(+), 7 deletions(-)

     # You should have received a copy of the GNU General Public License
     # along with this program; if not, see <http://www.gnu.org/licenses/>.
     import os
     import time
     import uuid
-...
                     del self.visiting_objects[object_key]
             self.visiting_objects[key] = current_timestamp
         @classmethod
         def select_recent(cls, seconds=30*60, **kwargs):
             objects_dir = cls.get_objects_dir()
             if not os.path.exists(objects_dir):
                 return []
             ids = []
             time_limit = time.time() - seconds
             for filename in os.listdir(objects_dir):
                 if filename[0] == '.':
                     continue
                 if os.stat(os.path.join(objects_dir, filename)).st_mtime > time_limit:
                     ids.append(filename)
             return cls.get_ids(ids, **kwargs)
         @classmethod
         def get_visited_objects(cls, exclude_user=None):
             # return the list of visited objects
             current_timestamp = time.time()
             visited_objects = {}
             for session in cls.select(ignore_errors=True):
             for session in cls.select_recent(ignore_errors=True):
                 if session.user and session.user == exclude_user:
                     continue
                 visiting_objects = getattr(session, 'visiting_objects', None)
-...
         @classmethod
         def get_sessions_with_visited_object(cls, object_key):
             for session in cls.select(ignore_errors=True):
             for session in cls.select_recent(ignore_errors=True):
                 visiting_objects = getattr(session, 'visiting_objects', None)
                 if not visiting_objects:
                     continue
-...
             if object_key in (getattr(self, 'visiting_objects', None) or {}):
                 del self.visiting_objects[object_key]
             # and from others
             for session in self.__class__.select(ignore_errors=True):
             for session in self.__class__.select_recent(ignore_errors=True):
                 if session.id == self.id:
                     continue
                 visiting_objects = getattr(session, 'visiting_objects', None)

                           AND table_name = %s''', (table_name,))
         existing_fields = set([x[0] for x in cur.fetchall()])
         needed_fields = set(['id', 'session_data', 'name_identifier', 'visiting_objects_keys'])
         needed_fields = set(['id', 'session_data', 'name_identifier',
             'visiting_objects_keys', 'last_update_time'])
         # migrations
         if not 'last_update_time' in existing_fields:
             cur.execute('''ALTER TABLE %s ADD COLUMN last_update_time timestamp DEFAULT NOW()''' % table_name)
             cur.execute('''CREATE INDEX %s_ts ON %s (last_update_time)''' % (
                                     table_name, table_name))
         # delete obsolete fields
         for field in (existing_fields - needed_fields):
-...
             ('session_data', 'bytea'),
+        ]
         @classmethod
         @guard_postgres
         def select_recent(cls, seconds=30*60, **kwargs):
             clause = [GreaterOrEqual('last_update_time', datetime.datetime.now() - datetime.timedelta(seconds=seconds))]
             return cls.select(clause=clause, **kwargs)
         @guard_postgres
         def store(self):
             sql_dict = {
-...
                 # table, they are ignored when loading the data.
                 'name_identifier': self.name_identifier,
                 'visiting_objects_keys': self.visiting_objects.keys() if getattr(self, 'visiting_objects') else None,
                 'last_update_time': datetime.datetime.now(),
+            }
             conn, cur = get_connection_and_cursor()
-...
             sql_statement = '''SELECT %s
                                  FROM %s
                                 WHERE %%(value)s = ANY(visiting_objects_keys)''' % (
                                 WHERE %%(value)s = ANY(visiting_objects_keys)
                                   AND last_update_time > (now() - interval '30 minutes')
                             ''' % (
                                         ', '.join([x[0] for x in cls._table_static_fields]
                                                   + cls.get_data_fields()),
                                         cls._table_name)
-...
         return result
     SQL_LEVEL = 31
     SQL_LEVEL = 32
     def migrate_global_views(conn, cur):
         cur.execute('''SELECT COUNT(*) FROM information_schema.tables
-...
             # 24: add index on evolution(formdata_id)
             for formdef in FormDef.select():
                 do_formdef_indexes(formdef, created=False, conn=conn, cur=cur)
         if sql_level < 25:
         if sql_level < 32:
             # 25: create session_table
             # 32: add last_update_time column to session table
             do_session_table()
         if sql_level < 30:
             # 30: actually remove evo.who on anonymised formdatas
+    -

Projet

Général

Profil

Produits Entr'ouvert » w.c.s.

0001-misc-limit-query-to-recent-sessions-when-checking-fo.patch