36a79ce Remove all code related to FTS it has not been used ever — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Remove all code related to FTS it has not been used ever

Baptiste Daroussin committed 9 years ago

commit 36a79ced78cf75fb6828af369751e10d2945c6fe
parent 5883b86

5 files changed +0 -20

modified external/Makefile.am

@@ -248,7 +248,6 @@ sqlite_common_cflags= -I$(top_srcdir)/external/linenoise \

 			-DUSE_PREAD \
 			-DSQLITE_THREADSAFE=0 \
 			-DSQLITE_TEMP_STORE=3 \
 			-DSQLITE_ENABLE_FTS4 \
 			-DSQLITE_SHELL_DBNAME_PROC=pkgshell_open \
 			-DNDEBUG
 libsqlite_la_SOURCES=	sqlite/sqlite3.c \

modified libpkg/pkg.h.in

@@ -193,10 +193,6 @@ typedef enum {

 	 * The argument is a WHERE clause to use as condition
 	 */
 	MATCH_CONDITION,
 	/**
 	 * Match using FTS search
 	 */
 	MATCH_FTS
 } match_t;
 /**

modified libpkg/pkgdb_query.c

@@ -125,12 +125,6 @@ pkgdb_get_pattern_query(const char *pattern, match_t match)

 	case MATCH_CONDITION:
 		comp = pattern;
 		break;
 	case MATCH_FTS:
 		if (checkorigin == NULL)
 			comp = " WHERE id IN (SELECT id FROM pkg_search WHERE name MATCH ?1)";
 		else
 			comp = " WHERE id IN (SELECT id FROM pkg_search WHERE origin MATCH ?1)";
 		break;
 	}
 	return (comp);

modified libpkg/repo/binary/query.c

@@ -321,9 +321,6 @@ pkg_repo_binary_search_how(match_t match)

 		/* Should not be called by pkgdb_get_match_how(). */
 		assert(0);
 		break;
 	case MATCH_FTS:
 		how = "id IN (SELECT id FROM pkg_search WHERE %s MATCH ?1)";
 		break;
 	}
 	return (how);

modified libpkg/repo/binary/update.c

@@ -170,12 +170,6 @@ try_again:

 	}
 	package_id = sqlite3_last_insert_rowid(sqlite);
 /*	if (pkg_repo_binary_run_prstatement (FTS_APPEND, package_id,
 			name, version, origin) != SQLITE_DONE) {
 		ERROR_SQLITE(sqlite, pkg_repo_binary_sql_prstatement(FTS_APPEND));
 		return (EPKG_FATAL);
 	}*/
 	dep = NULL;
 	while (pkg_deps(pkg, &dep) == EPKG_OK) {
 		if (pkg_repo_binary_run_prstatement(DEPS, dep->origin,