X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=index%2Freckeys.c;h=39a3f4a3344cc5b3bc0a6aa11f7bfd3aa049623c;hp=002e1fc075291430bc31f88fa4913ad7eb803126;hb=5d536c8cf5400b1e4da91061cf736a9ab53e5bd1;hpb=89d3a004b7c651fd5673abfc192e1472dc4d4197 diff --git a/index/reckeys.c b/index/reckeys.c index 002e1fc..39a3f4a 100644 --- a/index/reckeys.c +++ b/index/reckeys.c @@ -1,8 +1,5 @@ -/* $Id: reckeys.c,v 1.12 2007-01-15 15:10:17 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) 1994-2011 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 @@ -20,6 +17,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#if HAVE_CONFIG_H +#include +#endif #include #include #include @@ -30,31 +30,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include #include -#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; @@ -64,31 +45,14 @@ struct zebra_rec_keys_t_ { void *encode_handle; void *decode_handle; char owner_of_buffer; + zint custom_record_id; 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; ientries[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, @@ -107,7 +71,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) { @@ -133,6 +96,7 @@ zebra_rec_keys_t zebra_rec_keys_open(void) p->encode_handle = iscz1_start(); p->decode_handle = iscz1_start(); + p->custom_record_id = 0; p->nmem = nmem_create(); p->hash_size = 32767; p->entries = 0; @@ -191,65 +155,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) @@ -289,6 +194,10 @@ void zebra_rec_keys_write(zebra_rec_keys_t keys, assert(keys->owner_of_buffer); + if (key->mem[1]) /* record_id custom */ + { + keys->custom_record_id = key->mem[1]; + } #if 1 if (!zebra_rec_keys_add_hash(keys, str, slen, key)) { @@ -317,7 +226,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) { @@ -334,42 +242,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; ihash_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) @@ -410,9 +282,16 @@ int zebra_rec_keys_read(zebra_rec_keys_t keys, } return 1; } + +zint zebra_rec_keys_get_custom_record_id(zebra_rec_keys_t keys) +{ + return keys->custom_record_id; +} + /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil * End: * vim: shiftwidth=4 tabstop=8 expandtab