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
Stats result from nmem test
[pazpar2-moved-to-github.git]
/
src
/
session.c
diff --git
a/src/session.c
b/src/session.c
index
207f47c
..
b37b358
100644
(file)
--- a/
src/session.c
+++ b/
src/session.c
@@
-689,6
+689,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;
@@
-821,8
+823,7
@@
void session_init_databases(struct session *se)
static struct session_database *load_session_database(struct session *se,
char *id)
{
static struct session_database *load_session_database(struct session *se,
char *id)
{
- struct database *db = new_database(id, se->session_nmem);
-
+ struct database *db = new_database_inherit_settings(id, se->session_nmem, se->service->settings);
session_init_databases_fun((void*) se, db);
// New sdb is head of se->databases list
session_init_databases_fun((void*) se, db);
// New sdb is head of se->databases list
@@
-886,6
+887,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);
@@
-1787,6
+1792,8
@@
static int ingest_to_cluster(struct client *cl,
struct record_metadata *rec_md = 0;
int md_field_id = -1;
int sk_field_id = -1;
struct record_metadata *rec_md = 0;
int md_field_id = -1;
int sk_field_id = -1;
+ int rank = 0;
+ xmlChar *rank_str = 0;
type = xmlGetProp(n, (xmlChar *) "type");
value = xmlNodeListGetString(xdoc, n->children, 1);
type = xmlGetProp(n, (xmlChar *) "type");
value = xmlNodeListGetString(xdoc, n->children, 1);
@@
-1800,6
+1807,15
@@
static int ingest_to_cluster(struct client *cl,
continue;
ser_md = &service->metadata[md_field_id];
continue;
ser_md = &service->metadata[md_field_id];
+
+ rank_str = xmlGetProp(n, (xmlChar *) "rank");
+ if (rank_str)
+ {
+ rank = atoi((const char *) rank_str);
+ xmlFree(rank_str);
+ }
+ else
+ rank = ser_md->rank;
if (ser_md->sortkey_offset >= 0)
{
if (ser_md->sortkey_offset >= 0)
{
@@
-1899,10
+1915,11
@@
static int ingest_to_cluster(struct client *cl,
// ranking of _all_ fields enabled ...
// ranking of _all_ fields enabled ...
- if (ser_md->rank)
+ if (rank)
+ {
relevance_countwords(se->relevance, cluster,
relevance_countwords(se->relevance, cluster,
- (char *) value, ser_md->rank,
- ser_md->name);
+ (char *) value, rank, ser_md->name);
+ }
// construct facets ... unless the client already has reported them
if (ser_md->termlist && !client_has_facet(cl, (char *) type))
// construct facets ... unless the client already has reported them
if (ser_md->termlist && !client_has_facet(cl, (char *) type))