Commit 2ff59b7c authored by Timo Teräs's avatar Timo Teräs

search: speed up searching exact package names

parent f4ce2bf4
...@@ -97,7 +97,7 @@ static int search_parse(void *ctx, struct apk_db_options *dbopts, ...@@ -97,7 +97,7 @@ static int search_parse(void *ctx, struct apk_db_options *dbopts,
return 0; return 0;
} }
static void print_result(struct search_ctx *ctx, struct apk_package *pkg) static void print_result_pkg(struct search_ctx *ctx, struct apk_package *pkg)
{ {
int i; int i;
...@@ -117,23 +117,13 @@ static void print_result(struct search_ctx *ctx, struct apk_package *pkg) ...@@ -117,23 +117,13 @@ static void print_result(struct search_ctx *ctx, struct apk_package *pkg)
ctx->print_result(ctx, pkg); ctx->print_result(ctx, pkg);
} }
static int match_names(apk_hash_item item, void *pctx) static void print_result(struct search_ctx *ctx, struct apk_name *name)
{ {
struct search_ctx *ctx = (struct search_ctx *) pctx;
struct apk_name *name = (struct apk_name *) item;
int i; int i;
if (!ctx->search_description) {
for (i = 0; i < ctx->argc; i++)
if (fnmatch(ctx->argv[i], name->name, FNM_CASEFOLD) == 0)
break;
if (ctx->argc > 0 && i >= ctx->argc)
return 0;
}
if (ctx->show_all) { if (ctx->show_all) {
for (i = 0; i < name->providers->num; i++) for (i = 0; i < name->providers->num; i++)
print_result(ctx, name->providers->item[i].pkg); print_result_pkg(ctx, name->providers->item[i].pkg);
} else { } else {
struct apk_package *pkg = NULL; struct apk_package *pkg = NULL;
struct apk_provider *p; struct apk_provider *p;
...@@ -144,8 +134,25 @@ static int match_names(apk_hash_item item, void *pctx) ...@@ -144,8 +134,25 @@ static int match_names(apk_hash_item item, void *pctx)
apk_version_compare_blob(*p->version, *version) == APK_VERSION_GREATER) apk_version_compare_blob(*p->version, *version) == APK_VERSION_GREATER)
pkg = p->pkg; pkg = p->pkg;
} }
print_result(ctx, pkg); print_result_pkg(ctx, pkg);
} }
}
static int match_names(apk_hash_item item, void *pctx)
{
struct search_ctx *ctx = (struct search_ctx *) pctx;
struct apk_name *name = (struct apk_name *) item;
int i;
if (!ctx->search_description) {
for (i = 0; i < ctx->argc; i++)
if (fnmatch(ctx->argv[i], name->name, FNM_CASEFOLD) == 0)
break;
if (ctx->argc > 0 && i >= ctx->argc)
return 0;
}
print_result(ctx, name);
return 0; return 0;
} }
...@@ -175,8 +182,11 @@ static int search_main(void *pctx, struct apk_database *db, int argc, char **arg ...@@ -175,8 +182,11 @@ static int search_main(void *pctx, struct apk_database *db, int argc, char **arg
} }
} else { } else {
ctx->argv = argv; ctx->argv = argv;
/* FIXME: if not searching descriptions, we can just if (!ctx->search_description) {
* do direct name lookups here */ for (i = 0; i < argc; i++)
print_result(ctx, apk_db_get_name(db, APK_BLOB_STR(argv[i])));
return 0;
}
} }
return apk_hash_foreach(&db->available.names, match_names, ctx); return apk_hash_foreach(&db->available.names, match_names, ctx);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment