projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Zebra logs timing for facet results
[idzebra-moved-to-github.git]
/
index
/
retrieve.c
diff --git
a/index/retrieve.c
b/index/retrieve.c
index
ea16718
..
a1b7011
100644
(file)
--- a/
index/retrieve.c
+++ b/
index/retrieve.c
@@
-1,4
+1,4
@@
-/* $Id: retrieve.c,v 1.81 2007-12-05 09:29:52 adam Exp $
+/* $Id: retrieve.c,v 1.83 2008-01-16 11:54:28 adam Exp $
Copyright (C) 1995-2007
Index Data ApS
Copyright (C) 1995-2007
Index Data ApS
@@
-80,6
+80,7
@@
static int zebra_create_record_stream(ZebraHandle zh,
struct index_spec {
const char *index_name;
const char *index_type;
struct index_spec {
const char *index_name;
const char *index_type;
+ const char *extra;
struct index_spec *next;
};
struct index_spec *next;
};
@@
-103,6
+104,7
@@
struct index_spec *parse_index_spec(const char *elem, NMEM nmem,
struct index_spec *spec = nmem_malloc(nmem, sizeof(*spec));
spec->index_type = 0;
spec->next = 0;
struct index_spec *spec = nmem_malloc(nmem, sizeof(*spec));
spec->index_type = 0;
spec->next = 0;
+ spec->extra = 0;
if (!first)
first = spec;
if (!first)
first = spec;
@@
-119,10
+121,19
@@
struct index_spec *parse_index_spec(const char *elem, NMEM nmem,
cp++;
cp0 = cp;
cp++;
cp0 = cp;
- while (*cp != '\0' && *cp != ',')
+ while (*cp != '\0' && *cp != ',' && *cp != ':')
cp++;
spec->index_type = nmem_strdupn(nmem, cp0, cp - cp0);
}
cp++;
spec->index_type = nmem_strdupn(nmem, cp0, cp - cp0);
}
+ if (*cp == ':') /* extra arguments */
+ {
+ cp++;
+ cp0 = cp;
+
+ while (*cp != '\0' && *cp != ',' && *cp != ':')
+ cp++;
+ spec->extra = nmem_strdupn(nmem, cp0, cp - cp0);
+ }
if (*cp != ',')
break;
}
if (*cp != ',')
break;
}
@@
-710,7
+721,6
@@
static ZEBRA_RES facet_fetch(ZebraHandle zh, const char *setname,
zint *pos_array;
int i;
int num_recs = 10; /* number of records to analyze */
zint *pos_array;
int i;
int num_recs = 10; /* number of records to analyze */
- int no_collect_terms = 20; /* number of term candidates */
ZebraMetaRecord *poset;
ZEBRA_RES ret = ZEBRA_OK;
int *ord_array;
ZebraMetaRecord *poset;
ZEBRA_RES ret = ZEBRA_OK;
int *ord_array;
@@
-779,6
+789,7
@@
static ZEBRA_RES facet_fetch(ZebraHandle zh, const char *setname,
}
else
{
}
else
{
+ yaz_timing_t timing = yaz_timing_create();
zebra_strmap_t *map_array
= odr_malloc(odr, sizeof *map_array * no_ord);
for (i = 0; i < no_ord; i++)
zebra_strmap_t *map_array
= odr_malloc(odr, sizeof *map_array * no_ord);
for (i = 0; i < no_ord; i++)
@@
-837,15
+848,24
@@
static ZEBRA_RES facet_fetch(ZebraHandle zh, const char *setname,
rec_free(&rec);
}
}
rec_free(&rec);
}
}
+ yaz_timing_stop(timing);
+ yaz_log(YLOG_LOG, "facet first phase real=%4.2f",
+ yaz_timing_get_real(timing));
+ yaz_timing_start(timing);
if (use_xml)
wrbuf_puts(wr, "<facets>\n");
for (spec = spec_list, i = 0; i < no_ord; i++, spec = spec->next)
{
int j;
NMEM nmem = nmem_create();
if (use_xml)
wrbuf_puts(wr, "<facets>\n");
for (spec = spec_list, i = 0; i < no_ord; i++, spec = spec->next)
{
int j;
NMEM nmem = nmem_create();
- struct term_collect *col = term_collect_create(map_array[i],
- no_collect_terms,
- nmem);
+ struct term_collect *col;
+ int no_collect_terms = 20;
+
+ if (spec->extra)
+ no_collect_terms = atoi(spec->extra);
+ if (no_collect_terms < 1)
+ no_collect_terms = 1;
+ col = term_collect_create(map_array[i], no_collect_terms, nmem);
term_collect_freq(zh, col, no_collect_terms, ord_array[i],
resultSetRef(zh, setname));
term_collect_freq(zh, col, no_collect_terms, ord_array[i],
resultSetRef(zh, setname));
@@
-889,9
+909,11
@@
static ZEBRA_RES facet_fetch(ZebraHandle zh, const char *setname,
wrbuf_puts(wr, "</facets>\n");
for (i = 0; i < no_ord; i++)
zebra_strmap_destroy(map_array[i]);
wrbuf_puts(wr, "</facets>\n");
for (i = 0; i < no_ord; i++)
zebra_strmap_destroy(map_array[i]);
+ yaz_timing_stop(timing);
+ yaz_log(YLOG_LOG, "facet second phase real=%4.2f",
+ yaz_timing_get_real(timing));
+ yaz_timing_destroy(&timing);
}
}
-
-
*rec_bufp = odr_strdup(odr, wrbuf_cstr(wr));
wrbuf_destroy(wr);
*rec_lenp = strlen(*rec_bufp);
*rec_bufp = odr_strdup(odr, wrbuf_cstr(wr));
wrbuf_destroy(wr);
*rec_lenp = strlen(*rec_bufp);