X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Freclists.c;h=7912ca21b76fde18a3f181c8acbd7076337ef003;hb=2ebf0b250fd141b7a3e186e7e99bfc76e29e39d7;hp=048914d2362f30ab9b91d4979b00298881859f42;hpb=ce9af28e0299ae0ee246fa6d003ba29d374397df;p=pazpar2-moved-to-github.git

diff --git a/src/reclists.c b/src/reclists.c
index 048914d..7912ca2 100644
--- a/src/reclists.c
+++ b/src/reclists.c
@@ -1,7 +1,5 @@
-/* $Id: reclists.c,v 1.21 2007-08-13 12:42:45 adam Exp $
-   Copyright (c) 2006-2007, Index Data.
-
-This file is part of Pazpar2.
+/* This file is part of Pazpar2.
+   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
@@ -14,92 +12,50 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with Pazpar2; see the file LICENSE.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
- */
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
 
 #include <assert.h>
 
 #if HAVE_CONFIG_H
-#include <cconfig.h>
+#include <config.h>
 #endif
 
 #include <yaz/yaz-util.h>
 
-#include "pazpar2.h"
+#include "ppmutex.h"
+#include "session.h"
 #include "reclists.h"
+#include "jenkins_hash.h"
 
-extern struct parameters global_parameters;
-
-// Not threadsafe
-static struct reclist_sortparms *sortparms = 0;
-
-struct reclist_bucket
-{
-    struct record_cluster *record;
-    struct reclist_bucket *next;
-};
-
-#if 0
-struct reclist_sortparms * 
-reclist_sortparms_insert_field_id(NMEM nmem,
-                         struct reclist_sortparms **sortparms,
-                         int field_id,
-                         enum conf_sortkey_type type,
-                         int increasing)
+struct reclist
 {
-    struct reclist_sortparms * tmp_rlsp = 0;
-    // assert(nmem);
-
-    if(!sortparms || field_id < 0)
-        return 0;
-
-    // construct new reclist_sortparms
-    tmp_rlsp  = nmem_malloc(nmem, sizeof(struct reclist_sortparms));
-    tmp_rlsp->offset = field_id;
-    tmp_rlsp->type = type;
-    tmp_rlsp->increasing = increasing;
-
-
-    // insert in *sortparms place, moving *sortparms one down the list
-    tmp_rlsp->next = *sortparms;
-    *sortparms = tmp_rlsp;
-
-    return *sortparms;
+    struct reclist_bucket **hashtable;
+    unsigned hash_size;
+
+    int num_records;
+    struct reclist_bucket *sorted_list;
+    struct reclist_bucket *sorted_ptr;
+    struct reclist_bucket **last;
+    NMEM nmem;
+    YAZ_MUTEX mutex;
 };
-#endif
 
-#if 0
-struct reclist_sortparms * 
-reclist_sortparms_insert(NMEM nmem, 
-                         struct reclist_sortparms **sortparms,
-                         struct conf_service * service,
-                         const char * name,
-                         int increasing)
+struct reclist_bucket
 {
-    int field_id = 0;
-
-    if (!sortparms || !service || !name)  
-        return 0;
-    
-    field_id = conf_service_sortkey_field_id(service, name);
-
-    if (-1 == field_id)
-        return 0;
-
-    return reclist_sortparms_insert_field_id(nmem, sortparms, field_id,
-                                             service->sortkeys[field_id].type,
-                                             increasing);
+    struct record_cluster *record;
+    struct reclist_bucket *hnext;
+    struct reclist_bucket *snext;
+    struct reclist_sortparms *sort_parms;
 };
-#endif
-
 
-struct reclist_sortparms *reclist_parse_sortparms(NMEM nmem, const char *parms)
+struct reclist_sortparms *reclist_parse_sortparms(NMEM nmem, const char *parms,
+                                                  struct conf_service *service)
 {
     struct reclist_sortparms *res = 0;
     struct reclist_sortparms **rp = &res;
-    struct conf_service *service = config->servers->service;
 
     if (strlen(parms) > 256)
         return 0;
@@ -165,8 +121,10 @@ struct reclist_sortparms *reclist_parse_sortparms(NMEM nmem, const char *parms)
 
 static int reclist_cmp(const void *p1, const void *p2)
 {
-    struct record_cluster *r1 = (*(struct record_cluster**) p1);
-    struct record_cluster *r2 = (*(struct record_cluster**) 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;
 
@@ -174,113 +132,146 @@ static int reclist_cmp(const void *p1, const void *p2)
     {
         union data_types *ut1 = r1->sortkeys[s->offset];
         union data_types *ut2 = r2->sortkeys[s->offset];
+        const char *s1, *s2;
         switch (s->type)
         {
-            char *s1, *s2;
-            
-            case Metadata_sortkey_relevance:
-                res = r2->relevance - r1->relevance;
-                break;
-            case Metadata_sortkey_string:
-                s1 = ut1 ? ut1->text : "";
-                s2 = ut2 ? ut2->text : "";
-                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_FATAL, "Bad sort type: %d", s->type);
-                exit(1);
+                    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)
 {
-    sortparms = parms;
-    qsort(l->flatlist, l->num_records, 
-          sizeof(struct record_cluster*), reclist_cmp);
-    reclist_rewind(l);
+    struct reclist_bucket **flatlist = xmalloc(sizeof(*flatlist) * l->num_records);
+    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(flatlist, l->num_records, sizeof(*flatlist), reclist_cmp);
+    for (i = 0; i < l->num_records; i++)
+    {
+        *prev = flatlist[i];
+        prev = &flatlist[i]->snext;
+    }
+    *prev = 0;
+    l->last = prev;
+
+    xfree(flatlist);
+
+    reclist_leave(l);
 }
 
 struct record_cluster *reclist_read_record(struct reclist *l)
 {
-    if (l && l->pointer < l->num_records)
-        return l->flatlist[l->pointer++];
+    if (l && l->sorted_ptr)
+    {
+        struct record_cluster *t = l->sorted_ptr->record;
+        l->sorted_ptr = l->sorted_ptr->snext;
+        return t;
+    }
     else
         return 0;
 }
 
-void reclist_rewind(struct reclist *l)
+void reclist_enter(struct reclist *l)
 {
+    yaz_mutex_enter(l->mutex);
     if (l)
-        l->pointer = 0;
+        l->sorted_ptr = l->sorted_list;
 }
 
-// Jenkins one-at-a-time hash (from wikipedia)
-static unsigned int hash(const unsigned char *key)
-{
-    unsigned int hash = 0;
 
-    while (*key)
-    {
-        hash += *(key++);
-        hash += (hash << 10);
-        hash ^= (hash >> 6);
-    }
-    hash += (hash << 3);
-    hash ^= (hash >> 11);
-    hash += (hash << 15);
-    return hash;
+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, int numrecs)
-{
-    int hashsize = 1;
-    struct reclist *res;
 
-    assert(numrecs);
-    while (hashsize < numrecs)
-        hashsize <<= 1;
-    res = nmem_malloc(nmem, sizeof(struct reclist));
+struct reclist *reclist_create(NMEM nmem)
+{
+    struct reclist *res = nmem_malloc(nmem, sizeof(struct reclist));
+    res->hash_size = 399;
     res->hashtable 
-        = nmem_malloc(nmem, hashsize * sizeof(struct reclist_bucket*));
-    memset(res->hashtable, 0, hashsize * sizeof(struct reclist_bucket*));
-    res->hashtable_size = hashsize;
+        = nmem_malloc(nmem, res->hash_size * sizeof(struct reclist_bucket*));
+    memset(res->hashtable, 0, res->hash_size * sizeof(struct reclist_bucket*));
     res->nmem = nmem;
-    res->hashmask = hashsize - 1; // Creates a bitmask
 
-    res->num_records = 0;
-    res->flatlist = nmem_malloc(nmem, numrecs * sizeof(struct record_cluster*));
-    res->flatlist_size = numrecs;
+    res->sorted_ptr = 0;
+    res->sorted_list = 0;
+    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)
+        return l->num_records;
+    return 0;
+}
+
 // 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;
@@ -292,9 +283,10 @@ struct record_cluster *reclist_insert( struct reclist *l,
     assert(merge_key);
     assert(total);
 
-    bucket = hash((unsigned char*) merge_key) & l->hashmask;
+    bucket = jenkins_hash((unsigned char*) merge_key) % l->hash_size;
 
-    for (p = &l->hashtable[bucket]; *p; p = &(*p)->next)
+    yaz_mutex_enter(l->mutex);
+    for (p = &l->hashtable[bucket]; *p; p = &(*p)->hnext)
     {
         // We found a matching record. Merge them
         if (!strcmp(merge_key, (*p)->record->merge_key))
@@ -306,43 +298,53 @@ struct record_cluster *reclist_insert( struct reclist *l,
             break;
         }
     }
-    if (!cluster && l->num_records < l->flatlist_size)
+    if (!cluster)
     {
         struct reclist_bucket *new =
-            nmem_malloc(l->nmem, sizeof(struct reclist_bucket));
-        struct record_cluster *newc =
-            nmem_malloc(l->nmem, sizeof(struct record_cluster));
+            nmem_malloc(l->nmem, sizeof(*new));
+
+        cluster = nmem_malloc(l->nmem, sizeof(*cluster));
         
         record->next = 0;
-        new->record = newc;
-        new->next = 0;
-        newc->records = record;
-        newc->merge_key = merge_key;
-        newc->relevance = 0;
-        newc->term_frequency_vec = 0;
-        newc->recid = merge_key;
+        new->record = cluster;
+        new->hnext = 0;
+        cluster->records = record;
+        cluster->merge_key = nmem_strdup(l->nmem, merge_key);
+        cluster->relevance_score = 0;
+        cluster->term_frequency_vec = 0;
+        cluster->recid = nmem_strdup(l->nmem, merge_key);
         (*total)++;
-        newc->metadata = nmem_malloc(l->nmem,
-                sizeof(struct record_metadata*) * service->num_metadata);
-        memset(newc->metadata, 0, 
+        cluster->metadata =
+            nmem_malloc(l->nmem,
+                        sizeof(struct record_metadata*) * service->num_metadata);
+        memset(cluster->metadata, 0, 
                sizeof(struct record_metadata*) * service->num_metadata);
-        newc->sortkeys = nmem_malloc(l->nmem,
-                sizeof(struct record_metadata*) * service->num_sortkeys);
-        memset(newc->sortkeys, 0,
+        cluster->sortkeys = 
+            nmem_malloc(l->nmem, sizeof(struct record_metadata*) * service->num_sortkeys);
+        memset(cluster->sortkeys, 0,
                sizeof(union data_types*) * service->num_sortkeys);
+ 
+        /* attach to hash list */
+        *p = new; 
+
+        /* append to sorted_list */
+        *l->last = new;
+        l->last = &new->snext;
+        l->sorted_ptr = l->sorted_list;
+        new->snext = 0;
 
-        *p = new;
-        l->flatlist[l->num_records++] = newc;
-        cluster = newc;
+        l->num_records++;
     }
+    yaz_mutex_leave(l->mutex);
     return cluster;
 }
 
-
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  */
+