ef1cba8 Finish killing FTS — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Finish killing FTS

Baptiste Daroussin committed 9 years ago

commit ef1cba829b992aab237763449219c62302c5177c
parent 9c02125

5 files changed +9 -29

modified libpkg/pkgdb.c

@@ -89,7 +89,7 @@

 */
 #define DB_SCHEMA_MAJOR	0
 #define DB_SCHEMA_MINOR	33
 #define DB_SCHEMA_MINOR	34
 #define DBVERSION (DB_SCHEMA_MAJOR * 1000 + DB_SCHEMA_MINOR)

@@ -584,10 +584,6 @@ pkgdb_init(sqlite3 *sdb)

 			" ON UPDATE CASCADE"
 	");"
 	/* FTS search table */
 	"CREATE VIRTUAL TABLE pkg_search USING fts4(id, name, origin);"
 	/* Mark the end of the array */
 	"CREATE INDEX deporigini on deps(origin);"

@@ -1285,7 +1281,6 @@ typedef enum _sql_prstmt_index {

 	CONFLICT,
 	PKG_PROVIDE,
 	PROVIDE,
 	FTS_APPEND,
 	UPDATE_DIGEST,
 	CONFIG_FILES,
 	UPDATE_CONFIG_FILE,

@@ -1488,12 +1483,6 @@ static sql_prstmt sql_prepared_statements[PRSTMT_LAST] = {

 		"INSERT OR IGNORE INTO provides(provide) VALUES(?1)",
 		"T",
 	},
 	[FTS_APPEND] = {
 		NULL,
 		"INSERT OR ROLLBACK INTO pkg_search(id, name, origin) "
 		"VALUES (?1, ?2 || '-' || ?3, ?4);",
 		"ITTT"
 	},
 	[UPDATE_DIGEST] = {
 		NULL,
 		"UPDATE packages SET manifestdigest=?1 WHERE id=?2;",

@@ -1654,12 +1643,6 @@ pkgdb_register_pkg(struct pkgdb *db, struct pkg *pkg, int forced)

 	package_id = sqlite3_last_insert_rowid(s);
 	if (run_prstmt(FTS_APPEND, package_id, pkg->name, pkg->version,
 	    pkg->origin) != SQLITE_DONE) {
 		ERROR_SQLITE(s, SQL(FTS_APPEND));
 		goto cleanup;
 	}
 	/*
 	 * update dep informations on packages that depends on the insert
 	 * package

modified libpkg/private/db_upgrades.h

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

 	{33,
 	"ALTER TABLE packages ADD COLUMN vital INTEGER NOT NULL DEFAULT 0;"
 	},
 	{34,
 	"DROP TABLE pkg_search;"
 	},
 	/* Mark the end of the array */
 	{ -1, NULL }

modified libpkg/repo/binary/binary_private.h

@@ -183,8 +183,6 @@ static const char binary_repo_initsql[] = ""

 	"CREATE INDEX packages_uid ON packages(name, origin);"
 	"CREATE INDEX packages_version ON packages(name, version);"
 	"CREATE UNIQUE INDEX packages_digest ON packages(manifestdigest);"*/
 	/* FTS search table */
 	"CREATE VIRTUAL TABLE pkg_search USING fts4(id, name, origin);"
 	"PRAGMA user_version=%d;"
 	;

@@ -376,6 +374,10 @@ static const struct repo_changes repo_upgrades[] = {

 	 "ALTER TABLE packages ADD COLUMN vital INTEGER NOT NULL DEFAULT 0;"
 	},
 	{2013,
 ,
 	 "DROP TABLE pkg_search;"
 	},
 	/* Mark the end of the array */
 	{ -1, -1, NULL, NULL, }

@@ -629,7 +631,7 @@ static const struct repo_changes repo_downgrades[] = {

 /* The package repo schema minor revision.
    Minor schema changes don't prevent older pkgng
    versions accessing the repo. */
 #define REPO_SCHEMA_MINOR 13
 #define REPO_SCHEMA_MINOR 14
 #define REPO_SCHEMA_VERSION (REPO_SCHEMA_MAJOR * 1000 + REPO_SCHEMA_MINOR)

@@ -652,7 +654,6 @@ typedef enum _sql_prstmt_index {

 	EXISTS,
 	REPO_VERSION,
 	DELETE,
 	FTS_APPEND,
 	PROVIDE,
 	PROVIDES,
 	REQUIRE,

modified libpkg/repo/binary/common.c

@@ -132,12 +132,6 @@ static sql_prstmt sql_prepared_statements[PRSTMT_LAST] = {

 		"DELETE FROM pkg_search WHERE origin=?1;",
 		"TT",
 	},
 	[FTS_APPEND] = {
 		NULL,
 		"INSERT OR IGNORE INTO pkg_search(id, name, origin) "
 		"VALUES (?1, ?2 || '-' || ?3, ?4);",
 		"ITTT"
 	},
 	[PROVIDE] = {
 		NULL,
 		"INSERT OR IGNORE INTO provides(provide) VALUES(?1)",

modified libpkg/repo/binary/update.c

@@ -545,7 +545,6 @@ pkg_repo_binary_update_proceed(const char *name, struct pkg_repo *repo,

 		pkg_emit_incremental_update(repo->name, cnt);
 	sql_exec(sqlite, ""
 	 "INSERT INTO pkg_search SELECT id, name || '-' || version, origin FROM packages;"
 	"CREATE INDEX packages_origin ON packages(origin COLLATE NOCASE);"
 	"CREATE INDEX packages_name ON packages(name COLLATE NOCASE);"
 	"CREATE INDEX packages_uid_nocase ON packages(name COLLATE NOCASE, origin COLLATE NOCASE);"