Ticket #2619: sqlquery_optimization.diff

LogViewer.py

@@ -230 +230 @@
         t1 = time.time()
         for (stamp, name, account, data) in self.logger.query('\
         select e.stamp, e.name, u.account, ue.data \
-        from event e, user_event ue, user u \
+        from user u, event e, user_event ue \
         where ue.id_event = e.id and \
         ue.id_user = u.id and \
         u.account in (%s) and \

plugins_base/Logger.py

@@ -91 +91 @@
         data TEXT
  )
     '''
+    CREATE_USER_EVENT_INDEX_EVENT = 'CREATE INDEX ueidevent ON user_event(id_event)'
+    CREATE_USER_EVENT_INDEX_USER = 'CREATE INDEX ueiduser ON user_event(id_user)'
 
     USER_EXISTS = 'SELECT id FROM user WHERE account = ?'
     USER_ADD = 'INSERT INTO user(id, account) VALUES(null, ?)'
@@ -131 +133 @@
         self.cursor.execute(Logger.CREATE_CONVERSATION)
         self.cursor.execute(Logger.CREATE_EVENT)
         self.cursor.execute(Logger.CREATE_USER_EVENT)
+        self.cursor.execute(Logger.CREATE_USER_EVENT_INDEX_EVENT)
+        self.cursor.execute(Logger.CREATE_USER_EVENT_INDEX_USER)
         self.cursor.execute(Logger.CREATE_CONVERSATION_EVENT)
         self.connection.commit()
         
@@ -226 +230 @@
     def get_user_events(self):
         '''return a list of unique user events found on the logs'''
         return [item[0] for item in \
-            self.query('select distinct name from event, user_event where \
+            self.query('select distinct name from user_event, event where \
             id_event = id order by name')]
 
     def get_nick_stamp(self, contact, timestamp):
@@ -234 +238 @@
         if no stamp is available'''
 
         result = self.query('select e.stamp \
-        from event e, user_event ue, user u \
+        from user u, event e, user_event ue \
         where ue.id_user = u.id and \
         ue.id_event = e.id and \
         e.stamp < %s and \
@@ -255 +259 @@
         return None if no result'''
 
         result = self.query('select e.stamp \
-        from event e, user_event ue, user u \
+        from user u, event e, user_event ue \
         where ue.id_user = u.id and \
         ue.id_event = e.id and \
         e.stamp >= %s and \
@@ -278 +282 @@
             return contact
 
         return self.query('select ue.data \
-        from user_event ue, event e \
+        from event e, user_event ue \
         where e.stamp = %f and \
         ue.id_event = e.id' % (stamp,))[0][0]
     
@@ -479 +483 @@
 
         query = '''
         select e.stamp, ue.data 
-        from event e, user_event ue, user u
+        from user u, event e, user_event ue
         where e.id = ue.id_event and
         u.id = ue.id_user and
         e.name = "status-changed" and
@@ -497 +501 @@
 
         query = '''
         select e.stamp, ue.data 
-        from event e, user_event ue, user u
+        from user u, event e, user_event ue
         where e.id = ue.id_event and
         u.id = ue.id_user and
         e.name = "nick-changed" and
@@ -515 +519 @@
 
         query = '''
         select e.stamp, ue.data 
-        from event e, user_event ue, user u
+        from user u, event e, user_event ue
         where e.id = ue.id_event and
         u.id = ue.id_user and
         e.name = "personal-message-changed" and
@@ -566 +570 @@
 
         query = '''
         select e.stamp, ce.data 
-        from event e, conversation_event ce, user u
+        from user u, event e, conversation_event ce
         where e.id = ce.id_event and
         u.id = ce.id_user and
         e.name = "message" and
@@ -584 +588 @@
 
         query = '''
         select e.stamp, ue.data 
-        from event e, user_event ue, user u
+        from user u, event e, user_event ue
         where e.id = ue.id_event and
         u.id = ue.id_user and
         e.name = "display-picture" and
@@ -602 +606 @@
 
         query = '''
         select e.stamp, ce.data 
-        from event e, conversation_event ce, user u
+        from user u, event e, conversation_event ce
         where e.id = ce.id_event and
         u.id = ce.id_user and
         e.name = "custom-emoticon" and