Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 8d481ab
Force temp_store to always be in memory and switch to temporary table instead of memory database
Baptiste Daroussin committed 14 years ago
commit 8d481ab01366ca2810174ec754fa22ed284a8bc2
parent 80dcdb8
2 files changed +4 -6
modified external/sqlite/Makefile
@@ -30,6 +30,7 @@ CFLAGS+= -DSQLITE_OMIT_AUTOVACUUM \
		-DSQLITE_OMIT_TEMPDB \

		-DUSE_PREAD \

		-DSQLITE_THREADSAFE=1 \
+ 
		-DSQLITE_TEMP_STORE=3 \

		-DNDEBUG



NO_MAN=		true
modified libpkg/pkgdb.c
@@ -1783,15 +1783,12 @@ pkgdb_query_autoremove(struct pkgdb *db)
		"message, arch, osversion, maintainer, www, prefix, "

		"flatsize FROM packages WHERE id IN (SELECT pkgid FROM autoremove);";
- 
	if (sql_exec(db->sqlite, "ATTACH ':memory:' AS memdb;") != EPKG_OK)
- 
		return (NULL);
-
- 
	sql_exec(db->sqlite, "DROP TABLE IF EXISTS memdb.autoremove; "
- 
			"CREATE TABLE IF NOT EXISTS memdb.autoremove ("
+ 
	sql_exec(db->sqlite, "DROP TABLE IF EXISTS autoremove; "
+ 
			"CREATE TEMPORARY TABLE IF NOT EXISTS autoremove ("

			"origin TEXT UNIQUE NOT NULL, pkgid INTEGER);");



	do {
- 
		sql_exec(db->sqlite, "INSERT OR IGNORE into memdb.autoremove(origin, pkgid)"
+ 
		sql_exec(db->sqlite, "INSERT OR IGNORE into autoremove(origin, pkgid)"

				"SELECT distinct origin, id 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);"