/* This file is part of Pazpar2.
- Copyright (C) 2006-2009 Index Data
+ Copyright (C) 2006-2010 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
#include <yaz/yaz-util.h>
-#include "pazpar2.h"
+#include "ppmutex.h"
+#include "session.h"
#include "reclists.h"
#include "jenkins_hash.h"
struct reclist_bucket *sorted_ptr;
struct reclist_bucket **last;
NMEM nmem;
+ YAZ_MUTEX mutex;
};
-static struct reclist_sortparms *qsort_sortparms = 0; /* thread pr */
-
struct reclist_bucket
{
struct record_cluster *record;
struct reclist_bucket *hnext;
struct reclist_bucket *snext;
+ struct reclist_sortparms *sort_parms;
};
struct reclist_sortparms *reclist_parse_sortparms(NMEM nmem, const char *parms,
static int reclist_cmp(const void *p1, const void *p2)
{
+ struct reclist_sortparms *sortparms =
+ (*(struct reclist_bucket **) p1)->sort_parms;
struct record_cluster *r1 = (*(struct reclist_bucket**) p1)->record;
struct record_cluster *r2 = (*(struct reclist_bucket**) p2)->record;
struct reclist_sortparms *s;
int res = 0;
- for (s = qsort_sortparms; s && res == 0; s = s->next)
+ for (s = sortparms; s && res == 0; s = s->next)
{
union data_types *ut1 = r1->sortkeys[s->offset];
union data_types *ut2 = r2->sortkeys[s->offset];
+ const char *s1, *s2;
switch (s->type)
{
- const char *s1, *s2;
-
- case Metadata_sortkey_relevance:
- res = r2->relevance - r1->relevance;
- break;
- case Metadata_sortkey_string:
- s1 = ut1 ? ut1->text.sort : "";
- s2 = ut2 ? ut2->text.sort : "";
- res = strcmp(s2, s1);
- if (res)
- {
- if (s->increasing)
- res *= -1;
- }
- break;
- case Metadata_sortkey_numeric:
- if (ut1 && ut2)
- {
- if (s->increasing)
- res = ut1->number.min - ut2->number.min;
- else
- res = ut2->number.max - ut1->number.max;
- }
- else if (ut1 && !ut2)
- res = -1;
- else if (!ut1 && ut2)
- res = 1;
+ case Metadata_sortkey_relevance:
+ res = r2->relevance_score - r1->relevance_score;
+ break;
+ case Metadata_sortkey_string:
+ s1 = ut1 ? ut1->text.sort : "";
+ s2 = ut2 ? ut2->text.sort : "";
+ res = strcmp(s2, s1);
+ if (res)
+ {
+ if (s->increasing)
+ res *= -1;
+ }
+ break;
+ case Metadata_sortkey_numeric:
+ if (ut1 && ut2)
+ {
+ if (s->increasing)
+ res = ut1->number.min - ut2->number.min;
else
- res = 0;
- break;
- default:
- yaz_log(YLOG_WARN, "Bad sort type: %d", s->type);
+ res = ut2->number.max - ut1->number.max;
+ }
+ else if (ut1 && !ut2)
+ res = -1;
+ else if (!ut1 && ut2)
+ res = 1;
+ else
res = 0;
+ break;
+ default:
+ yaz_log(YLOG_WARN, "Bad sort type: %d", s->type);
+ res = 0;
}
}
+ if (res == 0)
+ res = strcmp(r1->recid, r2->recid);
return res;
}
void reclist_sort(struct reclist *l, struct reclist_sortparms *parms)
{
struct reclist_bucket **flatlist = xmalloc(sizeof(*flatlist) * l->num_records);
- struct reclist_bucket *ptr = l->sorted_list;
- struct reclist_bucket **prev = &l->sorted_list;
+ struct reclist_bucket *ptr;
+ struct reclist_bucket **prev;
int i = 0;
+
+ reclist_enter(l);
+
+ ptr = l->sorted_list;
+ prev = &l->sorted_list;
while (ptr)
{
+ ptr->sort_parms = parms;
flatlist[i] = ptr;
ptr = ptr->snext;
i++;
}
assert(i == l->num_records);
- qsort_sortparms = parms;
qsort(flatlist, l->num_records, sizeof(*flatlist), reclist_cmp);
for (i = 0; i < l->num_records; i++)
{
xfree(flatlist);
- reclist_rewind(l);
+ reclist_leave(l);
}
struct record_cluster *reclist_read_record(struct reclist *l)
return 0;
}
-void reclist_rewind(struct reclist *l)
+void reclist_enter(struct reclist *l)
+{
+ yaz_mutex_enter(l->mutex);
+ if (l)
+ l->sorted_ptr = l->sorted_list;
+}
+
+
+void reclist_leave(struct reclist *l)
{
+ yaz_mutex_leave(l->mutex);
if (l)
l->sorted_ptr = l->sorted_list;
}
+
struct reclist *reclist_create(NMEM nmem)
{
struct reclist *res = nmem_malloc(nmem, sizeof(struct reclist));
res->last = &res->sorted_list;
res->num_records = 0;
+ res->mutex = 0;
+ pazpar2_mutex_create(&res->mutex, "reclist");
return res;
}
+void reclist_destroy(struct reclist *l)
+{
+ if (l)
+ yaz_mutex_destroy(&l->mutex);
+}
+
int reclist_get_num_records(struct reclist *l)
{
if (l)
}
// Insert a record. Return record cluster (newly formed or pre-existing)
-struct record_cluster *reclist_insert( struct reclist *l,
- struct conf_service *service,
- struct record *record,
- char *merge_key, int *total)
+struct record_cluster *reclist_insert(struct reclist *l,
+ struct conf_service *service,
+ struct record *record,
+ const char *merge_key, int *total)
{
unsigned int bucket;
struct reclist_bucket **p;
bucket = jenkins_hash((unsigned char*) merge_key) % l->hash_size;
+ yaz_mutex_enter(l->mutex);
for (p = &l->hashtable[bucket]; *p; p = &(*p)->hnext)
{
// We found a matching record. Merge them
new->record = cluster;
new->hnext = 0;
cluster->records = record;
- cluster->merge_key = merge_key;
- cluster->relevance = 0;
+ cluster->merge_key = nmem_strdup(l->nmem, merge_key);
+ cluster->relevance_score = 0;
cluster->term_frequency_vec = 0;
- cluster->recid = merge_key;
+ cluster->recid = nmem_strdup(l->nmem, merge_key);
(*total)++;
cluster->metadata =
nmem_malloc(l->nmem,
l->num_records++;
}
+ yaz_mutex_leave(l->mutex);
return cluster;
}
-
/*
* Local variables:
* c-basic-offset: 4
projects / pazpar2-moved-to-github.git / blobdiff