/* This file is part of Pazpar2.
- Copyright (C) 2006-2012 Index Data
+ Copyright (C) 2006-2013 Index Data
Pazpar2 is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
xmlFree(result);
}
-static void session_enter(struct session *s, const char *caller)
+void session_enter_ro(struct session *s, const char *caller)
{
+ assert(s);
if (caller)
- session_log(s, YLOG_DEBUG, "Session lock by %s", caller);
- yaz_mutex_enter(s->session_mutex);
+ session_log(s, YLOG_LOG, "Session read lock by %s", caller);
+ pazpar2_lock_rdwr_rlock(&s->lock);
}
-static void session_leave(struct session *s, const char *caller)
+void session_enter_rw(struct session *s, const char *caller)
{
- yaz_mutex_leave(s->session_mutex);
+ assert(s);
+ if (caller)
+ session_log(s, YLOG_LOG, "Session write lock by %s", caller);
+ pazpar2_lock_rdwr_wlock(&s->lock);
+}
+
+void session_upgrade(struct session *s, const char *caller)
+{
+ assert(s);
if (caller)
- session_log(s, YLOG_DEBUG, "Session unlock by %s", caller);
+ session_log(s, YLOG_LOG, "Session upgrade lock by %s", caller);
+ pazpar2_lock_rdwr_upgrade(&s->lock);
+}
+
+void session_leave_ro(struct session *s, const char *caller)
+{
+ assert(s);
+ if (caller)
+ session_log(s, YLOG_LOG, "Session read unlock by %s", caller);
+ pazpar2_lock_rdwr_runlock(&s->lock);
+}
+
+void session_leave_rw(struct session *s, const char *caller)
+{
+ assert(s);
+ if (caller)
+ session_log(s, YLOG_LOG, "Session write unlock by %s", caller);
+ pazpar2_lock_rdwr_wunlock(&s->lock);
+}
+
+void session_downgrade(struct session *s, const char *caller)
+{
+ assert(s);
+ if (caller)
+ session_log(s, YLOG_LOG, "Session write unlock by %s", caller);
+ pazpar2_lock_rdwr_downgrade(&s->lock);
}
static void session_normalize_facet(struct session *s, const char *type,
struct http_channel *chan)
{
int ret;
- session_enter(s, "session_set_watch");
if (s->watchlist[what].fun)
ret = -1;
else
session_watch_cancel);
ret = 0;
}
- session_leave(s, "session_set_watch");
return ret;
}
void session_alert_watch(struct session *s, int what)
{
assert(s);
- session_enter(s, "session_alert_watch");
if (s->watchlist[what].fun)
{
/* our watch is no longer associated with http_channel */
s->watchlist[what].data = 0;
s->watchlist[what].obs = 0;
- session_leave(s, "session_alert_watch");
session_log(s, YLOG_DEBUG,
"Alert Watch: %d calling function: %p", what, fun);
fun(data);
}
- else
- session_leave(s,"session_alert_watch");
}
//callback for grep_databases
{
struct client_list *l;
- session_enter(se, "session_reset_active_clients");
l = se->clients_active;
se->clients_active = new_list;
- session_leave(se, "session_reset_active_clients");
while (l)
{
struct client_list *l_next = l->next;
- client_lock(l->client);
client_set_session(l->client, 0); /* mark client inactive */
- client_unlock(l->client);
xfree(l);
l = l_next;
session_reset_active_clients(se, 0);
- session_enter(se, "session_remove_cached_clients");
l = se->clients_cached;
se->clients_cached = 0;
- session_leave(se, "session_remove_cached_clients");
while (l)
{
struct client_list *l_next = l->next;
- client_lock(l->client);
client_set_session(l->client, 0);
client_set_database(l->client, 0);
- client_unlock(l->client);
client_destroy(l->client);
xfree(l);
l = l_next;
se->reclist = reclist_create(se->nmem);
}
-static void session_sort_unlocked(struct session *se, struct reclist_sortparms *sp)
+static void session_sort_unlocked(struct session *se,
+ struct reclist_sortparms *sp)
{
struct reclist_sortparms *sr;
struct client_list *l;
int type = sp->type;
int clients_research = 0;
- yaz_log(YLOG_LOG, "session_sort field=%s increasing=%d type=%d", field, increasing, type);
+ yaz_log(YLOG_DEBUG, "session_sort field=%s increasing=%d type=%d", field, increasing, type);
/* see if we already have sorted for this criteria */
for (sr = se->sorted_results; sr; sr = sr->next)
{
}
}
-void session_sort(struct session *se, struct reclist_sortparms *sp) {
- //session_enter(se, "session_sort");
+void session_sort(struct session *se, struct reclist_sortparms *sp)
+{
+ session_enter_rw(se, "session_sort");
session_sort_unlocked(se, sp);
- //session_leave(se, "session_sort");
+ session_leave_rw(se, "session_sort");
}
-
-enum pazpar2_error_code session_search(struct session *se,
- const char *query,
- const char *startrecs,
- const char *maxrecs,
- const char *filter,
- const char *limit,
- const char **addinfo,
- struct reclist_sortparms *sp)
+static
+enum pazpar2_error_code session_search_unlocked(struct session *se,
+ const char *query,
+ const char *startrecs,
+ const char *maxrecs,
+ const char *filter,
+ const char *limit,
+ const char **addinfo,
+ struct reclist_sortparms *sp)
{
int live_channels = 0;
int no_working = 0;
int no_failed_query = 0;
int no_failed_limit = 0;
struct client_list *l, *l0;
- facet_limits_t facet_limits;
- int same_sort_order = 0;
session_log(se, YLOG_DEBUG, "Search");
*addinfo = 0;
- if (se->settings_modified) {
+ if (se->settings_modified)
session_remove_cached_clients(se);
- }
else
session_reset_active_clients(se, 0);
- session_enter(se, "session_search");
se->settings_modified = 0;
- if (se->sorted_results) {
- if (!reclist_sortparms_cmp(se->sorted_results, sp))
- same_sort_order = 1;
- }
session_clear_set(se, sp);
relevance_destroy(&se->relevance);
live_channels = select_targets(se, filter);
if (!live_channels)
- {
- session_leave(se, "session_search");
return PAZPAR2_NO_TARGETS;
- }
- facet_limits = facet_limits_create(limit);
- if (!facet_limits)
+ facet_limits_destroy(se->facet_limits);
+ se->facet_limits = facet_limits_create(limit);
+ if (!se->facet_limits)
{
*addinfo = "limit";
- session_leave(se, "session_search");
return PAZPAR2_MALFORMED_PARAMETER_VALUE;
}
l0 = se->clients_active;
se->clients_active = 0;
- session_leave(se, "session_search");
for (l = l0; l; l = l->next)
{
if (prepare_map(se, client_get_database(cl)) < 0)
continue;
- parse_ret = client_parse_query(cl, query, facet_limits, se->service->ccl_bibset);
+ parse_ret = client_parse_query(cl, query, se->facet_limits);
if (parse_ret == -1)
no_failed_query++;
else if (parse_ret == -2)
no_working++;
}
}
- facet_limits_destroy(facet_limits);
session_reset_active_clients(se, l0);
if (no_working == 0)
else
return PAZPAR2_NO_TARGETS;
}
- session_log(se, YLOG_LOG, "session_start_search done");
return PAZPAR2_NO_ERROR;
}
+enum pazpar2_error_code session_search(struct session *se,
+ const char *query,
+ const char *startrecs,
+ const char *maxrecs,
+ const char *filter,
+ const char *limit,
+ const char **addinfo,
+ struct reclist_sortparms *sp)
+{
+ enum pazpar2_error_code c;
+ session_enter_rw(se, "session_search");
+ c = session_search_unlocked(se, query, startrecs, maxrecs, filter,
+ limit, addinfo, sp);
+ session_leave_rw(se, "session_search");
+ return c;
+}
+
// Creates a new session_database object for a database
static void session_init_databases_fun(void *context, struct database *db)
{
void session_destroy(struct session *se)
{
struct session_database *sdb;
+
+ session_enter_rw(se, "session_destroy");
session_log(se, YLOG_DEBUG, "Destroying");
session_use(-1);
session_remove_cached_clients(se);
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));
+ facet_limits_destroy(se->facet_limits);
nmem_destroy(se->nmem);
service_destroy(se->service);
- yaz_mutex_destroy(&se->session_mutex);
+
+ session_leave_rw(se, "session_destroy");
+ pazpar2_lock_rdwr_destroy(&se->lock);
}
size_t session_get_memory_status(struct session *session) {
size_t session_nmem;
if (session == 0)
return 0;
- session_enter(session, "session_get_memory_status");
+ session_enter_ro(session, "session_get_memory_status");
session_nmem = nmem_total(session->nmem);
- session_leave(session, "session_get_memory_status");
+ session_leave_ro(session, "session_get_memory_status");
return session_nmem;
}
-struct session *new_session(NMEM nmem, struct conf_service *service,
- unsigned session_id)
+struct session *session_create(NMEM nmem, struct conf_service *service,
+ unsigned session_id)
{
int i;
struct session *session = nmem_malloc(nmem, sizeof(*session));
sprintf(tmp_str, "session#%u", session_id);
session->session_id = session_id;
- session_log(session, YLOG_DEBUG, "New");
+ session_log(session, YLOG_LOG, "new");
session->service = service;
session->relevance = 0;
session->total_records = 0;
session->nmem = nmem_create();
session->databases = 0;
session->sorted_results = 0;
+ session->facet_limits = 0;
for (i = 0; i <= SESSION_WATCH_MAX; i++)
{
session->watchlist[i].fun = 0;
}
session->normalize_cache = normalize_cache_create();
- session->session_mutex = 0;
- pazpar2_mutex_create(&session->session_mutex, tmp_str);
+
+ pazpar2_lock_rdwr_init(&session->lock);
+
session_use(1);
return session;
}
res[*count].records = client_get_num_records(cl);
res[*count].filtered = client_get_num_records_filtered(cl);
res[*count].diagnostic =
- client_get_diagnostic(cl, &res[*count].addinfo);
+ client_get_diagnostic(cl, &res[*count].message,
+ &res[*count].addinfo);
res[*count].state = client_get_state_str(cl);
res[*count].connected = client_get_connection(cl) ? 1 : 0;
session_settings_dump(se, client_get_database(cl), w);
struct hitsbytarget *get_hitsbytarget(struct session *se, int *count, NMEM nmem)
{
struct hitsbytarget *p;
- session_enter(se, "get_hitsbytarget");
p = hitsbytarget_nb(se, count, nmem);
- session_leave(se, "get_hitsbytarget");
return p;
}
nmem_strsplit(nmem_tmp, ",", name, &names, &num_names);
- session_enter(se, "perform_termlist");
+ session_enter_ro(se, "perform_termlist");
for (j = 0; j < num_names; j++)
{
wrbuf_puts(c->wrbuf, "\"/>\n");
}
}
- session_leave(se, "perform_termlist");
+ session_leave_ro(se, "perform_termlist");
nmem_destroy(nmem_tmp);
}
{
struct record_cluster *r = 0;
- session_enter(se, "show_single_start");
+ session_enter_ro(se, "show_single_start");
*prev_r = 0;
*next_r = 0;
if (se->reclist)
{
+ reclist_limit(se->reclist, se);
+
reclist_enter(se->reclist);
while ((r = reclist_read_record(se->reclist)))
{
reclist_leave(se->reclist);
}
if (!r)
- session_leave(se, "show_single_start");
+ session_leave_ro(se, "show_single_start");
return r;
}
void show_single_stop(struct session *se, struct record_cluster *rec)
{
- session_leave(se, "show_single_stop");
+ session_leave_ro(se, "show_single_stop");
+}
+
+
+int session_fetch_more(struct session *se)
+{
+ struct client_list *l;
+ int ret = 0;
+
+ for (l = se->clients_active; l; l = l->next)
+ {
+ struct client *cl = l->client;
+ if (client_get_state(cl) == Client_Idle)
+ {
+ if (client_fetch_more(cl))
+ {
+ session_log(se, YLOG_LOG, "%s: more to fetch",
+ client_get_id(cl));
+ ret = 1;
+ }
+ else
+ {
+ session_log(se, YLOG_LOG, "%s: no more to fetch",
+ client_get_id(cl));
+ }
+ }
+ else
+ {
+ session_log(se, YLOG_LOG, "%s: no fetch due to state=%s",
+ client_get_id(cl), client_get_state_str(cl));
+ }
+
+ }
+ return ret;
}
struct record_cluster **show_range_start(struct session *se,
struct reclist_sortparms *sp,
- int start, int *num, int *total, Odr_int *sumhits, Odr_int *approx_hits)
+ int start, int *num, int *total,
+ Odr_int *sumhits, Odr_int *approx_hits,
+ void (*show_records_ready)(void *data),
+ struct http_channel *chan)
{
- struct record_cluster **recs;
+ struct record_cluster **recs = 0;
struct reclist_sortparms *spp;
+ struct client_list *l;
int i;
#if USE_TIMING
yaz_timing_t t = yaz_timing_create();
#endif
- session_enter(se, "show_range_start");
- recs = nmem_malloc(se->nmem, *num * sizeof(struct record_cluster *));
- if (!se->relevance)
- {
- *num = 0;
- *total = 0;
- *sumhits = 0;
- *approx_hits = 0;
- recs = 0;
- }
- else
+ *sumhits = 0;
+ *approx_hits = 0;
+ *total = 0;
+ reclist_limit(se->reclist, se);
+ if (se->relevance)
{
- struct client_list *l;
-
for (spp = sp; spp; spp = spp->next)
if (spp->type == Metadata_sortkey_relevance)
{
relevance_prepare_read(se->relevance, se->reclist);
break;
}
- reclist_sort(se->reclist, sp);
-
- reclist_enter(se->reclist);
- *total = reclist_get_num_records(se->reclist);
-
- *sumhits = 0;
- *approx_hits = 0;
for (l = se->clients_active; l; l = l->next) {
*sumhits += client_get_hits(l->client);
*approx_hits += client_get_approximation(l->client);
}
- for (i = 0; i < start; i++)
- if (!reclist_read_record(se->reclist))
- {
- *num = 0;
- recs = 0;
- break;
- }
+ }
+ reclist_sort(se->reclist, sp);
+
+ reclist_enter(se->reclist);
+ *total = reclist_get_num_records(se->reclist);
+
+ for (l = se->clients_active; l; l = l->next)
+ client_update_show_stat(l->client, 0);
- for (i = 0; i < *num; i++)
+ for (i = 0; i < start; i++)
+ {
+ struct record_cluster *r = reclist_read_record(se->reclist);
+ if (!r)
{
- struct record_cluster *r = reclist_read_record(se->reclist);
- if (!r)
- {
- *num = i;
- break;
- }
+ *num = 0;
+ break;
+ }
+ else
+ {
+ struct record *rec = r->records;
+ for (;rec; rec = rec->next)
+ client_update_show_stat(rec->client, 1);
+ }
+ }
+ if (*num > 0)
+ recs =
+ nmem_malloc(se->nmem, *num * sizeof(struct record_cluster *));
+ for (i = 0; i < *num; i++)
+ {
+ struct record_cluster *r = reclist_read_record(se->reclist);
+ if (!r)
+ {
+ *num = i;
+ break;
+ }
+ else
+ {
+ struct record *rec = r->records;
+ for (;rec; rec = rec->next)
+ client_update_show_stat(rec->client, 1);
recs[i] = r;
}
- reclist_leave(se->reclist);
}
+ reclist_leave(se->reclist);
#if USE_TIMING
yaz_timing_stop(t);
yaz_log(YLOG_LOG, "show %6.5f %3.2f %3.2f",
yaz_timing_get_sys(t));
yaz_timing_destroy(&t);
#endif
+
+ if (!session_fetch_more(se))
+ session_log(se, YLOG_LOG, "can not fetch more");
+ else
+ {
+ session_log(se, YLOG_LOG, "fetching more in progress");
+ if (session_set_watch(se, SESSION_WATCH_SHOW,
+ show_records_ready, chan, chan))
+ {
+ session_log(se, YLOG_WARN, "Ignoring show block");
+ }
+ else
+ {
+ show_range_stop(se, recs);
+ session_log(se, YLOG_LOG, "session watch OK");
+ return 0;
+ }
+ }
return recs;
}
void show_range_stop(struct session *se, struct record_cluster **recs)
{
- session_leave(se, "show_range_stop");
}
void statistics(struct session *se, struct statistics *stat)
xmlFreeDoc(xdoc);
return -1;
}
- session_enter(se, "ingest_record");
- if (client_get_session(cl) == se)
- ret = ingest_to_cluster(cl, xdoc, root, record_no, mergekey_norm);
- session_leave(se, "ingest_record");
+ assert(client_get_session(cl) == se);
+
+ ret = ingest_to_cluster(cl, xdoc, root, record_no, mergekey_norm);
xmlFreeDoc(xdoc);
return ret;
}
+// struct conf_metadata *ser_md = &service->metadata[md_field_id];
+// struct record_metadata *rec_md = record->metadata[md_field_id];
+static int match_metadata_local(struct conf_metadata *ser_md,
+ struct record_metadata *rec_md0,
+ char **values, int num_v)
+{
+ int i;
+ struct record_metadata *rec_md = rec_md0;
+ for (i = 0; i < num_v; )
+ {
+ if (rec_md)
+ {
+ if (ser_md->type == Metadata_type_year
+ || ser_md->type == Metadata_type_date)
+ {
+ int y = atoi(values[i]);
+ if (y >= rec_md->data.number.min
+ && y <= rec_md->data.number.max)
+ break;
+ }
+ else
+ {
+ 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.
+ break;
+ }
+ }
+ rec_md = rec_md->next;
+ }
+ else
+ {
+ rec_md = rec_md0;
+ i++;
+ }
+ }
+ return i < num_v ? 1 : 0;
+}
+
+int session_check_cluster_limit(struct session *se, struct record_cluster *rec)
+{
+ int i;
+ struct conf_service *service = se->service;
+ int ret = 1;
+ const char *name;
+ const char *value;
+ NMEM nmem_tmp = nmem_create();
+
+ for (i = 0; (name = facet_limits_get(se->facet_limits, i, &value)); i++)
+ {
+ int j;
+ for (j = 0; j < service->num_metadata; j++)
+ {
+ struct conf_metadata *md = service->metadata + j;
+ if (!strcmp(md->name, name) && md->limitcluster)
+ {
+ char **values = 0;
+ int num = 0;
+ int md_field_id =
+ conf_service_metadata_field_id(service,
+ md->limitcluster);
+
+ if (md_field_id < 0)
+ {
+ ret = 0;
+ break;
+ }
+
+ nmem_strsplit_escape2(nmem_tmp, "|", value, &values,
+ &num, 1, '\\', 1);
+
+ if (!match_metadata_local(&service->metadata[md_field_id],
+ rec->metadata[md_field_id],
+ values, num))
+ {
+ ret = 0;
+ break;
+ }
+ }
+ }
+ }
+ nmem_destroy(nmem_tmp);
+ return ret;
+}
+
// Skip record on non-zero
static int check_limit_local(struct client *cl,
struct record *record,
int l = 0;
while (!skip_record)
{
- struct conf_metadata *ser_md = 0;
- struct record_metadata *rec_md = 0;
int md_field_id;
char **values = 0;
- int i, num_v = 0;
-
- const char *name = client_get_facet_limit_local(cl, sdb, &l, nmem_tmp, &num_v, &values);
+ int num_v = 0;
+ const char *name =
+ client_get_facet_limit_local(cl, sdb, &l, nmem_tmp,
+ &num_v, &values);
if (!name)
break;
- md_field_id = conf_service_metadata_field_id(service, name);
- if (md_field_id < 0)
+ if (!strcmp(name, "*"))
{
- skip_record = 1;
- break;
+ for (md_field_id = 0; md_field_id < service->num_metadata;
+ md_field_id++)
+ {
+ if (match_metadata_local(
+ &service->metadata[md_field_id],
+ record->metadata[md_field_id],
+ values, num_v))
+ break;
+ }
+ if (md_field_id == service->num_metadata)
+ skip_record = 1;
}
- ser_md = &service->metadata[md_field_id];
- rec_md = record->metadata[md_field_id];
- yaz_log(YLOG_DEBUG, "check limit local %s", name);
- for (i = 0; i < num_v; )
+ else
{
- if (rec_md)
+ md_field_id = conf_service_metadata_field_id(service, name);
+ if (md_field_id < 0)
{
- if (ser_md->type == Metadata_type_year
- || ser_md->type == Metadata_type_date)
- {
- int y = atoi(values[i]);
- if (y >= rec_md->data.number.min
- && y <= rec_md->data.number.max)
- break;
- }
- else
- {
- 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.
- break;
- }
- }
- rec_md = rec_md->next;
+ skip_record = 1;
+ break;
}
- else
+ if (!match_metadata_local(
+ &service->metadata[md_field_id],
+ record->metadata[md_field_id],
+ values, num_v))
{
- rec_md = record->metadata[md_field_id];
- i++;
+ skip_record = 1;
}
}
- // At end , not match
- if (i == num_v)
- {
- skip_record = 1;
- break;
- }
}
nmem_destroy(nmem_tmp);
return skip_record;
struct conf_service *service = se->service;
int term_factor = 1;
struct record_cluster *cluster;
+ struct record_metadata **metadata0;
struct session_database *sdb = client_get_database(cl);
struct record *record = record_create(se->nmem,
service->num_metadata,
cluster = reclist_insert(se->reclist, service, record,
mergekey_norm, &se->total_merged);
if (!cluster)
- return -1;
+ return 0; // complete match with existing record
{
const char *use_term_factor_str =
relevance_newrec(se->relevance, cluster);
+ // original metadata, to check if first existence of a field
+ metadata0 = xmalloc(sizeof(*metadata0) * service->num_metadata);
+ memcpy(metadata0, cluster->metadata,
+ sizeof(*metadata0) * service->num_metadata);
+
// now parsing XML record and adding data to cluster or record metadata
for (n = root->children; n; n = n->next)
{
// merged metadata
rec_md = record_metadata_init(se->nmem, (const char *) value,
ser_md->type, 0);
+
+ // see if the field was not in cluster already (from beginning)
+
if (!rec_md)
continue;
wheretoput = &cluster->metadata[md_field_id];
- // and polulate with data:
- // assign cluster or record based on merge action
- if (ser_md->merge == Metadata_merge_unique)
+ if (ser_md->merge == Metadata_merge_first)
+ {
+ if (!metadata0[md_field_id])
+ {
+ while (*wheretoput)
+ wheretoput = &(*wheretoput)->next;
+ *wheretoput = rec_md;
+ }
+ }
+ else if (ser_md->merge == Metadata_merge_unique)
{
while (*wheretoput)
{
if (value)
xmlFree(value);
+ xfree(metadata0);
relevance_donerecord(se->relevance, cluster);
se->total_records++;
projects / pazpar2-moved-to-github.git / blobdiff