Defer index creation

Signed-off-by: Prabhu Subramanian <[email protected]>
AppThreat · Mar 17, 2024 · 259f43b · 259f43b
1 parent 5210b26
commit 259f43b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 208 deletions.
diff --git a/test/test_db.py b/test/test_db.py
diff --git a/vdb/cli.py b/vdb/cli.py
@@ -170,7 +170,7 @@ def main():
         for s in sources:
             LOG.info("Refreshing %s", s.__class__.__name__)
             s.refresh()
-        db_lib.close_all()
+        db_lib.optimize_and_close_all()
     elif args.sync:
         for s in (GitHubSource(),):
             LOG.info("Syncing %s", s.__class__.__name__)

diff --git a/vdb/lib/db6.py b/vdb/lib/db6.py
@@ -16,16 +16,8 @@ def ensure_schemas(db_conn: sqlite3.Connection, index_conn: sqlite3.Connection):
     """Create the sqlite tables and indexes in case they don't exist"""
     db_conn.execute(
         "CREATE TABLE if not exists cve_data(cve_id TEXT NOT NULL, type TEXT NOT NULL, namespace TEXT, name TEXT NOT NULL, source_data JSON NOT NULL, override_data JSON);")
-    db_conn.execute(
-        "CREATE INDEX if not exists idx1 on cve_data(cve_id, type);")
     index_conn.execute(
         "CREATE TABLE if not exists cve_index(cve_id TEXT NOT NULL, type TEXT NOT NULL, namespace TEXT, name TEXT NOT NULL, versions JSON NOT NULL);")
-    index_conn.execute(
-        "CREATE INDEX if not exists cidx1 on cve_index(cve_id);")
-    index_conn.execute(
-        "CREATE INDEX if not exists cidx2 on cve_index(type, namespace, name);")
-    index_conn.execute(
-        "CREATE INDEX if not exists cidx3 on cve_index(namespace, name);")
 
 
 def get(db_file: str = config.VDB_BIN_FILE, index_file: str = config.VDB_BIN_INDEX, read_only=False) -> (
@@ -57,12 +49,23 @@ def clear_all():
         index_conn.commit()
 
 
-def close_all():
+def optimize_and_close_all():
+    """
+    Safely close the connections by creating indexes and vacuuming if needed.
+    """
     if db_conn:
+        db_conn.execute(
+            "CREATE INDEX if not exists idx1 on cve_data(cve_id, type);")
         db_conn.execute("VACUUM;")
         db_conn.commit()
         db_conn.close()
     if index_conn:
+        index_conn.execute(
+            "CREATE INDEX if not exists cidx1 on cve_index(cve_id);")
+        index_conn.execute(
+            "CREATE INDEX if not exists cidx2 on cve_index(type, namespace, name);")
+        index_conn.execute(
+            "CREATE INDEX if not exists cidx3 on cve_index(namespace, name);")
         index_conn.execute("VACUUM;")
         index_conn.commit()
         index_conn.close()