projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added support for specification of approximative limits for whole query.
[idzebra-moved-to-github.git]
/
index
/
reckeys.c
diff --git
a/index/reckeys.c
b/index/reckeys.c
index
649ec1c
..
652b729
100644
(file)
--- a/
index/reckeys.c
+++ b/
index/reckeys.c
@@
-1,4
+1,4
@@
-/* $Id: reckeys.c,v 1.6 2006-06-07 10:14:41 adam Exp $
+/* $Id: reckeys.c,v 1.10 2006-11-21 22:17:49 adam Exp $
Copyright (C) 1995-2006
Index Data ApS
Copyright (C) 1995-2006
Index Data ApS
@@
-15,19
+15,20
@@
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
for more details.
You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra. 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 <stdio.h>
#include <stdlib.h>
*/
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include <assert.h>
#include <ctype.h>
#include <assert.h>
#include <ctype.h>
-#include <yaz/nmem.h>
-#include "index.h"
#include "reckeys.h"
#include "reckeys.h"
+#include <yaz/nmem.h>
+#include <yaz/xmalloc.h>
struct zebra_rec_key_entry {
char *buf;
struct zebra_rec_key_entry {
char *buf;
@@
-59,10
+60,14
@@
struct zebra_rec_key_entry **zebra_rec_keys_mk_hash(zebra_rec_keys_t p,
unsigned h = 0;
size_t i;
int j;
unsigned h = 0;
size_t i;
int j;
+#if 0
+ h = key->mem[key->len-1];
+#else
for (i = 0; i<len; i++)
h = h * 65509 + buf[i];
for (j = 0; j<key->len; j++)
h = h * 65509 + CAST_ZINT_TO_INT(key->mem[j]);
for (i = 0; i<len; i++)
h = h * 65509 + buf[i];
for (j = 0; j<key->len; j++)
h = h * 65509 + CAST_ZINT_TO_INT(key->mem[j]);
+#endif
return &p->entries[h % (unsigned) p->hash_size];
}
return &p->entries[h % (unsigned) p->hash_size];
}
@@
-79,7
+84,7
@@
static void init_hash(zebra_rec_keys_t p)
}
}
}
}
-zebra_rec_keys_t zebra_rec_keys_open()
+zebra_rec_keys_t zebra_rec_keys_open(void)
{
zebra_rec_keys_t p = xmalloc(sizeof(*p));
p->buf_used = 0;
{
zebra_rec_keys_t p = xmalloc(sizeof(*p));
p->buf_used = 0;
@@
-91,7
+96,7
@@
zebra_rec_keys_t zebra_rec_keys_open()
p->decode_handle = iscz1_start();
p->nmem = nmem_create();
p->decode_handle = iscz1_start();
p->nmem = nmem_create();
- p->hash_size = 1023;
+ p->hash_size = 32767;
p->entries = 0;
init_hash(p);
p->entries = 0;
init_hash(p);
@@
-152,14
+157,19
@@
int zebra_rec_keys_add_hash(zebra_rec_keys_t keys,
const char *str, size_t slen,
const struct it_key *key)
{
const char *str, size_t slen,
const struct it_key *key)
{
- struct zebra_rec_key_entry **kep = zebra_rec_keys_mk_hash(keys,
- str, slen, key);
+ struct zebra_rec_key_entry **kep_first
+ = zebra_rec_keys_mk_hash(keys, str, slen, key);
+ struct zebra_rec_key_entry **kep = kep_first;
while (*kep)
{
struct zebra_rec_key_entry *e = *kep;
if (slen == e->len && !memcmp(str, e->buf, slen) &&
!key_compare(key, &e->key))
{
while (*kep)
{
struct zebra_rec_key_entry *e = *kep;
if (slen == e->len && !memcmp(str, e->buf, slen) &&
!key_compare(key, &e->key))
{
+ *kep = (*kep)->next; /* out of queue */
+ e->next = *kep_first; /* move to front */
+ *kep_first = e;
+
return 0;
}
kep = &(*kep)->next;
return 0;
}
kep = &(*kep)->next;
@@
-182,8
+192,17
@@
void zebra_rec_keys_write(zebra_rec_keys_t keys,
assert(keys->owner_of_buffer);
assert(keys->owner_of_buffer);
+#if 1
if (!zebra_rec_keys_add_hash(keys, str, slen, key))
if (!zebra_rec_keys_add_hash(keys, str, slen, key))
+ {
+#if 0
+ yaz_log(YLOG_LOG, "dup key slen=%d %.*s "
+ "ord=" ZINT_FORMAT " seq=" ZINT_FORMAT,
+ slen, slen, str, key->mem[0], key->mem[key->len-1]);
+#endif
return; /* key already there . Omit it */
return; /* key already there . Omit it */
+ }
+#endif
if (keys->buf_used+1024 > keys->buf_max)
{
char *b = (char *) xmalloc (keys->buf_max += 128000);
if (keys->buf_used+1024 > keys->buf_max)
{
char *b = (char *) xmalloc (keys->buf_max += 128000);