X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Freckeys.c;h=adea244e5461264724f3b6390ea6084f731f5898;hb=7598c76f1a4989a91003bd4fbd90f30a7c7255ef;hp=58582672a9dce844033960f7b942bb97c23ec7fd;hpb=3731bdaf94aeba2550fc553aebe34831c203dc36;p=idzebra-moved-to-github.git

diff --git a/index/reckeys.c b/index/reckeys.c
index 5858267..adea244 100644
--- a/index/reckeys.c
+++ b/index/reckeys.c
@@ -1,8 +1,5 @@
-/* $Id: reckeys.c,v 1.13 2007-11-30 12:19:08 adam Exp $
-   Copyright (C) 1995-2007
-   Index Data ApS
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+   Copyright (C) 1995-2008 Index Data
 
 Zebra 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
@@ -30,31 +27,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <yaz/nmem.h>
 #include <yaz/xmalloc.h>
 
-#define NEW 0
-
-#if NEW
-struct zebra_rec_word_entry {
-    char *buf;
-    size_t len;
-    int ord;
-    int max_seq;
-    struct zebra_rec_word_entry *next;
-    struct zebra_rec_key_entry *keys;
-    struct zebra_rec_key_entry **last_key;
-};
-
-struct zebra_rec_key_entry {
-    struct it_key key;
-    struct zebra_rec_key_entry *next;
-};
-#else
 struct zebra_rec_key_entry {
     char *buf;
     size_t len;
     struct it_key key;
     struct zebra_rec_key_entry *next;
 };
-#endif
 
 struct zebra_rec_keys_t_ {
     size_t buf_used;
@@ -68,28 +46,10 @@ struct zebra_rec_keys_t_ {
 
     NMEM nmem;
     size_t hash_size;
-#if NEW
-    struct zebra_rec_word_entry **entries;
-#else
     struct zebra_rec_key_entry **entries;
-#endif
 };
 
 
-#if NEW
-struct zebra_rec_word_entry **zebra_rec_keys_mk_hash(zebra_rec_keys_t p,
-                                                     const char *buf,
-                                                     size_t len,
-                                                     int ord)
-{
-    int i;
-    unsigned h = ord;
-
-    for (i = 0; i<len; i++)
-	h = h * 65509 + buf[i];
-    return &p->entries[h % (unsigned) p->hash_size];
-}
-#else
 struct zebra_rec_key_entry **zebra_rec_keys_mk_hash(zebra_rec_keys_t p,
 						    const char *buf,
 						    size_t len,
@@ -108,7 +68,6 @@ struct zebra_rec_key_entry **zebra_rec_keys_mk_hash(zebra_rec_keys_t p,
 #endif
     return &p->entries[h % (unsigned) p->hash_size];
 }
-#endif
 
 static void init_hash(zebra_rec_keys_t p)
 {
@@ -193,65 +152,6 @@ void zebra_rec_keys_close(zebra_rec_keys_t p)
     xfree(p);
 }
 
-#if NEW
-void zebra_rec_keys_write(zebra_rec_keys_t keys, 
-			  const char *str, size_t slen,
-			  const struct it_key *key)
-{
-    char *dst;
-    const char *src = (char*) key;
-    
-    struct zebra_rec_word_entry **wep;
-    struct zebra_rec_key_entry **kep;
-    int ord = key->mem[0];
-    int seq = key->mem[key->len-1];
-    
-    assert(keys->owner_of_buffer);
-
-    wep = zebra_rec_keys_mk_hash(keys, str, slen, ord);
-
-    while (*wep)
-    {
-	struct zebra_rec_word_entry *e = *wep;
-	if (ord == e->ord && slen == e->len && !memcmp(str, e->buf, slen))
-            break;
-	wep = &(*wep)->next;
-    }
-    
-    if (!*wep)
-    {
-        *wep = nmem_malloc(keys->nmem, sizeof(**wep));
-        (*wep)->buf = nmem_malloc(keys->nmem, slen);
-        memcpy((*wep)->buf, str, slen);
-        (*wep)->len = slen;
-        (*wep)->ord = ord;
-        (*wep)->next = 0;
-        (*wep)->keys = 0;
-        (*wep)->max_seq = 0;
-        (*wep)->last_key = &(*wep)->keys;
-    }
-    if (seq > (*wep)->max_seq)
-        kep = (*wep)->last_key;
-    else
-    {
-        kep = &(*wep)->keys;
-        while (*kep)
-        {
-            if (!key_compare(key, &(*kep)->key))
-                return;
-            kep = &(*kep)->next;
-        }
-    }
-    *kep = nmem_malloc(keys->nmem, sizeof(**kep));
-    (*kep)->next = 0;
-    (*wep)->last_key = &(*kep)->next;
-    memcpy(&(*kep)->key, key, sizeof(*key));
-    if (seq > (*wep)->max_seq)
-    {
-        (*wep)->max_seq = seq;
-    }
-}
-#else
 int zebra_rec_keys_add_hash(zebra_rec_keys_t keys, 
 			    const char *str, size_t slen,
 			    const struct it_key *key)
@@ -323,7 +223,6 @@ void zebra_rec_keys_write(zebra_rec_keys_t keys,
     *dst++ = '\0';
     keys->buf_used = dst - keys->buf;
 }
-#endif
 
 void zebra_rec_keys_reset(zebra_rec_keys_t keys)
 {
@@ -340,42 +239,6 @@ int zebra_rec_keys_rewind(zebra_rec_keys_t keys)
     assert(keys);
     iscz1_reset(keys->decode_handle);
 
-#if NEW
-    if (keys->buf_used == 0)
-    {
-        size_t i;
-        for (i = 0; i<keys->hash_size; i++)
-        {
-            struct zebra_rec_word_entry *we = keys->entries[i];
-            for (; we; we = we->next)
-            {
-                struct zebra_rec_key_entry *ke = we->keys;
-                for (; ke; ke = ke->next)
-                {
-                    const char *src = (char*) &ke->key;
-                    char *dst;
-                    if (keys->buf_used+1024 > keys->buf_max)
-                    {
-                        char *b = (char *) xmalloc (keys->buf_max += 128000);
-                        if (keys->buf_used > 0)
-                            memcpy (b, keys->buf, keys->buf_used);
-                        xfree (keys->buf);
-                        keys->buf = b;
-                    }
-                    
-                    dst = keys->buf + keys->buf_used;
-                    
-                    iscz1_encode(keys->encode_handle, &dst, &src);
-                    
-                    memcpy (dst, we->buf, we->len);
-                    dst += we->len;
-                    *dst++ = '\0';
-                    keys->buf_used = dst - keys->buf;
-                }
-            }
-        }
-    }
-#endif
 
     keys->fetch_offset = 0;
     if (keys->buf_used == 0)