projects
/
pazpar2-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
[pazpar2-moved-to-github.git]
/
src
/
session.c
diff --git
a/src/session.c
b/src/session.c
index
b5a3d8f
..
64920da
100644
(file)
--- a/
src/session.c
+++ b/
src/session.c
@@
-637,12
+637,12
@@
void session_sort(struct session *se, const char *field, int increasing)
}
if (sr)
{
}
if (sr)
{
- yaz_log(YLOG_LOG, "search_sort: field=%s increasing=%d already fetched",
+ session_log(se, YLOG_DEBUG, "search_sort: field=%s increasing=%d already fetched",
field, increasing);
session_leave(se);
return;
}
field, increasing);
session_leave(se);
return;
}
- yaz_log(YLOG_LOG, "search_sort: field=%s increasing=%d must fetch",
+ session_log(se, YLOG_DEBUG, "search_sort: field=%s increasing=%d must fetch",
field, increasing);
sr = nmem_malloc(se->nmem, sizeof(*sr));
sr->field = nmem_strdup(se->nmem, field);
field, increasing);
sr = nmem_malloc(se->nmem, sizeof(*sr));
sr->field = nmem_strdup(se->nmem, field);
@@
-692,6
+692,8
@@
enum pazpar2_error_code session_search(struct session *se,
se->reclist = 0;
se->settings_modified = 0;
relevance_destroy(&se->relevance);
se->reclist = 0;
se->settings_modified = 0;
relevance_destroy(&se->relevance);
+ if (nmem_total(se->nmem))
+ session_log(se, YLOG_DEBUG, "NMEN operation usage %zd", nmem_total(se->nmem));
nmem_reset(se->nmem);
se->total_records = se->total_merged = 0;
se->num_termlists = 0;
nmem_reset(se->nmem);
se->total_records = se->total_merged = 0;
se->num_termlists = 0;
@@
-749,12
+751,12
@@
enum pazpar2_error_code session_search(struct session *se,
&tval);
if (parse_ret == 1 && r == 2)
{
&tval);
if (parse_ret == 1 && r == 2)
{
- session_log(se, YLOG_LOG, "client REUSE %s", client_get_id(cl));
+ session_log(se, YLOG_LOG, "client %s REUSE result", client_get_id(cl));
client_reingest(cl);
}
else if (r)
{
client_reingest(cl);
}
else if (r)
{
- session_log(se, YLOG_LOG, "client NEW %s", client_get_id(cl));
+ session_log(se, YLOG_LOG, "client %s NEW search", client_get_id(cl));
client_start_search(cl);
}
no_working++;
client_start_search(cl);
}
no_working++;
@@
-778,7
+780,7
@@
enum pazpar2_error_code session_search(struct session *se,
else
return PAZPAR2_NO_TARGETS;
}
else
return PAZPAR2_NO_TARGETS;
}
- yaz_log(YLOG_LOG, "session_start_search done");
+ session_log(se, YLOG_LOG, "session_start_search done");
return PAZPAR2_NO_ERROR;
}
return PAZPAR2_NO_ERROR;
}
@@
-888,6
+890,10
@@
void session_destroy(struct session *se)
normalize_cache_destroy(se->normalize_cache);
relevance_destroy(&se->relevance);
reclist_destroy(se->reclist);
normalize_cache_destroy(se->normalize_cache);
relevance_destroy(&se->relevance);
reclist_destroy(se->reclist);
+ if (nmem_total(se->nmem))
+ session_log(se, YLOG_DEBUG, "NMEN operation usage %zd", nmem_total(se->nmem));
+ if (nmem_total(se->session_nmem))
+ session_log(se, YLOG_DEBUG, "NMEN session usage %zd", nmem_total(se->session_nmem));
nmem_destroy(se->nmem);
service_destroy(se->service);
yaz_mutex_destroy(&se->session_mutex);
nmem_destroy(se->nmem);
service_destroy(se->service);
yaz_mutex_destroy(&se->session_mutex);
@@
-1620,7
+1626,7
@@
static int check_limit_local(struct client *cl,
}
ser_md = &service->metadata[md_field_id];
rec_md = record->metadata[md_field_id];
}
ser_md = &service->metadata[md_field_id];
rec_md = record->metadata[md_field_id];
- yaz_log(YLOG_LOG, "check limit local %s", name);
+ yaz_log(YLOG_DEBUG, "check limit local %s", name);
for (i = 0; i < num_v; )
{
if (rec_md)
for (i = 0; i < num_v; )
{
if (rec_md)
@@
-1635,7
+1641,7
@@
static int check_limit_local(struct client *cl,
}
else
{
}
else
{
- yaz_log(YLOG_LOG, "cmp: '%s' '%s'", rec_md->data.text.disp, values[i]);
+ yaz_log(YLOG_DEBUG, "cmp: '%s' '%s'", rec_md->data.text.disp, values[i]);
if (!strcmp(rec_md->data.text.disp, values[i]))
{
// Value equals, should not be filtered.
if (!strcmp(rec_md->data.text.disp, values[i]))
{
// Value equals, should not be filtered.