p
/
tdv
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix performance regression 

Avoid stepping through the entire dictionary

When looking for the first match with an empty common prefix.
This commit is contained in:
Přemysl Eric Janouch 2016-09-28 04:17:08 +02:00
parent f453b9dd43
commit a063328ac8
Signed by: p
GPG Key ID: B715679E3A361BE6
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/stardict.c
View File

@ -942,11 +942,13 @@ stardict_dict_search (StardictDict *sd, const gchar *word, gboolean *success)
#define PREFIX(i) stardict_longest_common_collation_prefix \ #define PREFIX(i) stardict_longest_common_collation_prefix \
(sd, word, g_array_index (index, StardictIndexEntry, i).name) (sd, word, g_array_index (index, StardictIndexEntry, i).name)
// We need to take care not to step through the entire dictionary
// if not a single character matches, because it can be quite costly
if (sd->priv->collator) if (sd->priv->collator)
{ {
GArray *collated = sd->priv->collated_index; GArray *collated = sd->priv->collated_index;
size_t probe, best = PREFIX (g_array_index (collated, guint32, imin)); size_t probe, best = PREFIX (g_array_index (collated, guint32, imin));
while (imin > 0 && (probe = while (best && imin > 0 && (probe =
PREFIX (g_array_index (collated, guint32, imin - 1))) >= best) PREFIX (g_array_index (collated, guint32, imin - 1))) >= best)
{ {
best = probe; best = probe;
@ -958,7 +960,7 @@ stardict_dict_search (StardictDict *sd, const gchar *word, gboolean *success)
// XXX: only looking for _better_ backward matches here, since the // XXX: only looking for _better_ backward matches here, since the
// fallback common prefix searching algorithm doesn't ignore case // fallback common prefix searching algorithm doesn't ignore case
size_t probe, best = PREFIX (imin); size_t probe, best = PREFIX (imin);
while (imin > 0 && (probe = PREFIX (imin - 1)) > best) while (best && imin > 0 && (probe = PREFIX (imin - 1)) > best)
{ {
best = probe; best = probe;
imin--; imin--;