91fc5a0 Speed up autoremove — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Speed up autoremove

Baptiste Daroussin committed 14 years ago

commit 91fc5a0b91aa36ac66001d9c667950bc540cdf31
parent 8c12350

2 files changed +7 -4

modified libpkg/db_upgrades.h

@@ -113,6 +113,9 @@ static struct db_upgrades {

 	"ALTER TABLE pkg_directories ADD try INTEGER;"
 	"UPDATE pkg_directories SET try = 1;"
 	},
 	{7,
 	"CREATE INDEX deporigini on deps(origin);"
 	},
 	/* Mark the end of the array */
 	{ -1, NULL },

modified libpkg/pkgdb.c

@@ -19,7 +19,7 @@

 #include "pkg_util.h"
 #include "db_upgrades.h"
 #define DBVERSION 6
 #define DBVERSION 7
 static struct pkgdb_it * pkgdb_it_new(struct pkgdb *, sqlite3_stmt *, int);
 static void pkgdb_regex(sqlite3_context *, int, sqlite3_value **, int);

@@ -425,7 +425,8 @@ pkgdb_init(sqlite3 *sdb)

 			" ON UPDATE RESTRICT,"
 		"UNIQUE(package_id, group_id)"
 	");"
 	"PRAGMA user_version = 6;"
 	"CREATE INDEX deporigini on deps(origin);"
 	"PRAGMA user_version = 7;"
 	"COMMIT;"
 	;

@@ -2003,9 +2004,8 @@ pkgdb_query_autoremove(struct pkgdb *db)

 		sql_exec(db->sqlite, "INSERT OR IGNORE into autoremove(origin, pkgid, weight) "
 				"SELECT distinct origin, id, %d FROM packages WHERE automatic=1 AND "
 				"origin NOT IN (SELECT DISTINCT deps.origin FROM deps WHERE "
 				"deps.package_id not in (select pkgid from  autoremove) and deps.origin = packages.origin);"
 				" deps.origin = packages.origin);"
 				, weight);
 		weight++;
 	} while (sqlite3_changes(db->sqlite) != 0);
 	if (sqlite3_prepare_v2(db->sqlite, sql, -1, &stmt, NULL) != SQLITE_OK) {