[Secure-testing-commits] r34565 - bin lib/python

[Florian Weimer]

Author: fw
Date: 2015-05-28 20:29:44 +0000 (Thu, 28 May 2015)
New Revision: 34565

Modified:
   bin/tracker_service.py
   lib/python/security_db.py
Log:
/data/json: Work around performance issue due to SQLite planner change


Modified: bin/tracker_service.py
===================================================================
--- bin/tracker_service.py	2015-05-28 18:38:21 UTC (rev 34564)
+++ bin/tracker_service.py	2015-05-28 20:29:44 UTC (rev 34565)
@@ -1271,9 +1271,8 @@
                 """SELECT sp.name, st.bug_name,
                 (SELECT cve_desc FROM nvd_data
                 WHERE cve_name = st.bug_name),
-                (SELECT debian_cve.bug FROM debian_cve
-                WHERE debian_cve.bug_name = st.bug_name
-                ORDER BY debian_cve.bug),
+                (SELECT MIN(debian_cve.bug) FROM debian_cve
+                WHERE debian_cve.bug_name = st.bug_name),
                 sp.release, sp.subrelease,
                 sp.version,
                 (SELECT pn.fixed_version FROM package_notes AS pn

Modified: lib/python/security_db.py
===================================================================
--- lib/python/security_db.py	2015-05-28 18:38:21 UTC (rev 34564)
+++ lib/python/security_db.py	2015-05-28 20:29:44 UTC (rev 34565)
@@ -518,11 +518,10 @@
 
         cursor.execute(
             """CREATE TEMPORARY VIEW debian_cve AS
-            SELECT DISTINCT debian_bugs.bug, st.bug_name
+            SELECT debian_bugs.bug, st.bug_name
             FROM package_notes, debian_bugs, source_package_status AS st
             WHERE package_notes.bug_name = st.bug_name
-            AND debian_bugs.note = package_notes.id
-            ORDER BY debian_bugs.bug""")
+            AND debian_bugs.note = package_notes.id""")
 
     def _initFunctions(self):
         """Registers user-defined SQLite functions."""