-/*
- * Copyright (C) 1994-1999, Index Data
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss, Heikki Levanto
- *
- * (log at the end)
- *
- * Bugs
- * - Allocates a lot of memory for the merge process, but never releases it.
- * Doesn't matter, as the program terminates soon after.
-
- */
-
+/* This file is part of the Zebra server.
+ Copyright (C) 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
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+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 this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+*/
+
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <fcntl.h>
#ifdef WIN32
#include <io.h>
-#else
+#endif
+#if HAVE_UNISTD_H
#include <unistd.h>
#endif
#include <stdlib.h>
#include <assert.h>
#include "index.h"
-#include "zserver.h"
#define KEY_SIZE (1+sizeof(struct it_key))
#define INP_NAME_MAX 768
-#define INP_BUF_START 60000
-#define INP_BUF_ADD 400000
-
-static int no_diffs = 0;
-static int no_updates = 0;
-static int no_deletions = 0;
-static int no_insertions = 0;
-static int no_iterations = 0;
struct key_file {
int no; /* file no */
size_t chunk; /* number of bytes allocated */
size_t buf_ptr; /* current position in buffer */
char *prev_name; /* last word read */
- int sysno; /* last sysno */
- int seqno; /* last seqno */
+ void *decode_handle;
off_t length; /* length of file */
/* handler invoked in each read */
void (*readHandler)(struct key_file *keyp, void *rinfo);
Res res;
};
-void getFnameTmp (Res res, char *fname, int no)
+
+#define PR_KEY_LOW 0
+#define PR_KEY_TOP 0
+
+#if PR_KEY_LOW || PR_KEY_TOP
+
+static void pkey(const char *b, int mode)
+{
+ key_logdump_txt(YLOG_LOG, b, mode ? "i" : "d");
+}
+#endif
+
+
+void getFnameTmp(Res res, char *fname, int no)
{
const char *pre;
-
- pre = res_get_def (res, "keyTmpDir", ".");
- sprintf (fname, "%s/key%d.tmp", pre, no);
+
+ pre = res_get_def(res, "keyTmpDir", ".");
+ sprintf(fname, "%s/key%d.tmp", pre, no);
}
-void extract_get_fname_tmp (ZebraHandle zh, char *fname, int no)
+void extract_get_fname_tmp(ZebraHandle zh, char *fname, int no)
{
const char *pre;
-
- pre = res_get_def (zh->service->res, "keyTmpDir", ".");
- sprintf (fname, "%s/key%d.tmp", pre, no);
+
+ pre = res_get_def(zh->res, "keyTmpDir", ".");
+ sprintf(fname, "%s/key%d.tmp", pre, no);
}
-void key_file_chunk_read (struct key_file *f)
+void key_file_chunk_read(struct key_file *f)
{
int nr = 0, r = 0, fd;
char fname[1024];
- getFnameTmp (f->res, fname, f->no);
- fd = open (fname, O_BINARY|O_RDONLY);
+ getFnameTmp(f->res, fname, f->no);
+ fd = open(fname, O_BINARY|O_RDONLY);
f->buf_ptr = 0;
f->buf_size = 0;
if (fd == -1)
{
- logf (LOG_WARN|LOG_ERRNO, "cannot open %s", fname);
+ yaz_log(YLOG_WARN|YLOG_ERRNO, "cannot open %s", fname);
return ;
}
if (!f->length)
{
- if ((f->length = lseek (fd, 0L, SEEK_END)) == (off_t) -1)
+ if ((f->length = lseek(fd, 0L, SEEK_END)) == (off_t) -1)
{
- logf (LOG_WARN|LOG_ERRNO, "cannot seek %s", fname);
- close (fd);
+ yaz_log(YLOG_WARN|YLOG_ERRNO, "cannot seek %s", fname);
+ close(fd);
return ;
}
}
- if (lseek (fd, f->offset, SEEK_SET) == -1)
+ if (lseek(fd, f->offset, SEEK_SET) == -1)
{
- logf (LOG_WARN|LOG_ERRNO, "cannot seek %s", fname);
+ yaz_log(YLOG_WARN|YLOG_ERRNO, "cannot seek %s", fname);
close(fd);
return ;
}
while (f->chunk - nr > 0)
{
- r = read (fd, f->buf + nr, f->chunk - nr);
+ r = read(fd, f->buf + nr, f->chunk - nr);
if (r <= 0)
break;
nr += r;
}
if (r == -1)
{
- logf (LOG_WARN|LOG_ERRNO, "read of %s", fname);
- close (fd);
+ yaz_log(YLOG_WARN|YLOG_ERRNO, "read of %s", fname);
+ close(fd);
return;
}
f->buf_size = nr;
if (f->readHandler)
(*f->readHandler)(f, f->readInfo);
- close (fd);
+ close(fd);
+}
+
+void key_file_destroy(struct key_file *f)
+{
+ iscz1_stop(f->decode_handle);
+ xfree(f->buf);
+ xfree(f->prev_name);
+ xfree(f);
}
-struct key_file *key_file_init (int no, int chunk, Res res)
+struct key_file *key_file_init(int no, int chunk, Res res)
{
struct key_file *f;
- f = (struct key_file *) xmalloc (sizeof(*f));
+ f = (struct key_file *) xmalloc(sizeof(*f));
f->res = res;
- f->sysno = 0;
- f->seqno = 0;
+ f->decode_handle = iscz1_start();
f->no = no;
f->chunk = chunk;
f->offset = 0;
f->length = 0;
f->readHandler = NULL;
- f->buf = (unsigned char *) xmalloc (f->chunk);
- f->prev_name = (char *) xmalloc (INP_NAME_MAX);
+ f->buf = (unsigned char *) xmalloc(f->chunk);
+ f->prev_name = (char *) xmalloc(INP_NAME_MAX);
*f->prev_name = '\0';
- key_file_chunk_read (f);
+ key_file_chunk_read(f);
return f;
}
-int key_file_getc (struct key_file *f)
+int key_file_getc(struct key_file *f)
{
if (f->buf_ptr < f->buf_size)
return f->buf[(f->buf_ptr)++];
if (f->buf_size < f->chunk)
return EOF;
f->offset += f->buf_size;
- key_file_chunk_read (f);
+ key_file_chunk_read(f);
if (f->buf_ptr < f->buf_size)
return f->buf[(f->buf_ptr)++];
else
return EOF;
}
-int key_file_decode (struct key_file *f)
+int key_file_read(struct key_file *f, char *key)
{
- int c, d;
+ int i, c;
+ char srcbuf[128];
+ const char *src = srcbuf;
+ char *dst;
+ int j;
- c = key_file_getc (f);
- switch (c & 192)
- {
- case 0:
- d = c;
- break;
- case 64:
- d = ((c&63) << 8) + (key_file_getc (f) & 0xff);
- break;
- case 128:
- d = ((c&63) << 8) + (key_file_getc (f) & 0xff);
- d = (d << 8) + (key_file_getc (f) & 0xff);
- break;
- case 192:
- d = ((c&63) << 8) + (key_file_getc (f) & 0xff);
- d = (d << 8) + (key_file_getc (f) & 0xff);
- d = (d << 8) + (key_file_getc (f) & 0xff);
- break;
- }
- return d;
-}
-
-int key_file_read (struct key_file *f, char *key)
-{
- int i, d, c;
- struct it_key itkey;
-
- c = key_file_getc (f);
+ c = key_file_getc(f);
if (c == 0)
{
- strcpy (key, f->prev_name);
- i = 1+strlen (key);
+ strcpy(key, f->prev_name);
+ i = 1+strlen(key);
}
else if (c == EOF)
return 0;
{
i = 0;
key[i++] = c;
- while ((key[i++] = key_file_getc (f)))
- ;
- strcpy (f->prev_name, key);
- f->sysno = 0;
+ while ((c = key_file_getc(f)))
+ {
+ if (i < INP_NAME_MAX-2)
+ key[i++] = c;
+ }
+ key[i++] = '\0';
+ strcpy(f->prev_name, key);
+ iscz1_reset(f->decode_handle);
}
- d = key_file_decode (f);
- key[i++] = d & 1;
- d = d >> 1;
- itkey.sysno = d + f->sysno;
- if (d)
+ c = key_file_getc(f); /* length + insert/delete combined */
+ key[i++] = c & 128;
+ c = c & 127;
+ for (j = 0; j < c; j++)
+ srcbuf[j] = key_file_getc(f);
+ dst = key + i;
+ iscz1_decode(f->decode_handle, &dst, &src);
+
+#if 0
+ /* debugging */
+ if (1)
{
- f->sysno = itkey.sysno;
- f->seqno = 0;
+ struct it_key k;
+ memcpy(&k, key+i, sizeof(k));
+ if (!k.mem[1])
+ yaz_log(YLOG_LOG, "00 KEY");
}
- d = key_file_decode (f);
- itkey.seqno = d + f->seqno;
- f->seqno = itkey.seqno;
- memcpy (key + i, &itkey, sizeof(struct it_key));
- return i + sizeof (struct it_key);
+#endif
+ return i + sizeof(struct it_key);
}
struct heap_info {
int heapnum;
int *ptr;
int (*cmp)(const void *p1, const void *p2);
- Dict dict;
- ISAMS isams;
-#if ZMBOL
- ISAM isam;
- ISAMC isamc;
- ISAMD isamd;
-#endif
+ struct zebra_register *reg;
+ ZebraHandle zh;
+ zint no_diffs;
+ zint no_updates;
+ zint no_deletions;
+ zint no_insertions;
+ zint no_iterations;
};
-struct heap_info *key_heap_init (int nkeys,
- int (*cmp)(const void *p1, const void *p2))
+static struct heap_info *key_heap_malloc(void)
+{ /* malloc and clear it */
+ struct heap_info *hi;
+ hi = (struct heap_info *) xmalloc(sizeof(*hi));
+ hi->info.file = 0;
+ hi->info.buf = 0;
+ hi->heapnum = 0;
+ hi->ptr = 0;
+ hi->no_diffs = 0;
+ hi->no_diffs = 0;
+ hi->no_updates = 0;
+ hi->no_deletions = 0;
+ hi->no_insertions = 0;
+ hi->no_iterations = 0;
+ return hi;
+}
+
+struct heap_info *key_heap_init_file(ZebraHandle zh,
+ int nkeys,
+ int (*cmp)(const void *p1, const void *p2))
{
struct heap_info *hi;
int i;
- hi = (struct heap_info *) xmalloc (sizeof(*hi));
+ hi = key_heap_malloc();
+ hi->zh = zh;
hi->info.file = (struct key_file **)
- xmalloc (sizeof(*hi->info.file) * (1+nkeys));
- hi->info.buf = (char **) xmalloc (sizeof(*hi->info.buf) * (1+nkeys));
- hi->heapnum = 0;
- hi->ptr = (int *) xmalloc (sizeof(*hi->ptr) * (1+nkeys));
+ xmalloc(sizeof(*hi->info.file) * (1+nkeys));
+ hi->info.buf = (char **) xmalloc(sizeof(*hi->info.buf) * (1+nkeys));
+ hi->ptr = (int *) xmalloc(sizeof(*hi->ptr) * (1+nkeys));
hi->cmp = cmp;
for (i = 0; i<= nkeys; i++)
{
hi->ptr[i] = i;
- hi->info.buf[i] = (char *) xmalloc (INP_NAME_MAX);
+ hi->info.buf[i] = (char *) xmalloc(INP_NAME_MAX);
}
return hi;
}
-static void key_heap_swap (struct heap_info *hi, int i1, int i2)
+void key_heap_destroy(struct heap_info *hi, int nkeys)
+{
+ int i;
+ for (i = 0; i<=nkeys; i++)
+ xfree(hi->info.buf[i]);
+ xfree(hi->info.buf);
+ xfree(hi->ptr);
+ xfree(hi->info.file);
+ xfree(hi);
+}
+
+static void key_heap_swap(struct heap_info *hi, int i1, int i2)
{
int swap;
}
-static void key_heap_delete (struct heap_info *hi)
+static void key_heap_delete(struct heap_info *hi)
{
int cur = 1, child = 2;
- assert (hi->heapnum > 0);
+ assert(hi->heapnum > 0);
- key_heap_swap (hi, 1, hi->heapnum);
+ key_heap_swap(hi, 1, hi->heapnum);
hi->heapnum--;
while (child <= hi->heapnum) {
if (child < hi->heapnum &&
child++;
if ((*hi->cmp)(&hi->info.buf[hi->ptr[cur]],
&hi->info.buf[hi->ptr[child]]) > 0)
- {
- key_heap_swap (hi, cur, child);
+ {
+ key_heap_swap(hi, cur, child);
cur = child;
child = 2*cur;
}
}
}
-static void key_heap_insert (struct heap_info *hi, const char *buf, int nbytes,
+static void key_heap_insert(struct heap_info *hi, const char *buf, int nbytes,
struct key_file *kf)
{
int cur, parent;
+ assert(nbytes < INP_NAME_MAX);
+
cur = ++(hi->heapnum);
- memcpy (hi->info.buf[hi->ptr[cur]], buf, nbytes);
+ memcpy(hi->info.buf[hi->ptr[cur]], buf, nbytes);
hi->info.file[hi->ptr[cur]] = kf;
parent = cur/2;
while (parent && (*hi->cmp)(&hi->info.buf[hi->ptr[parent]],
&hi->info.buf[hi->ptr[cur]]) > 0)
{
- key_heap_swap (hi, cur, parent);
+ key_heap_swap(hi, cur, parent);
cur = parent;
parent = cur/2;
}
}
-static int heap_read_one (struct heap_info *hi, char *name, char *key)
+static int heap_read_one(struct heap_info *hi, char *name, char *key)
{
int n, r;
char rbuf[INP_NAME_MAX];
if (!hi->heapnum)
return 0;
n = hi->ptr[1];
- strcpy (name, hi->info.buf[n]);
+ strcpy(name, hi->info.buf[n]);
kf = hi->info.file[n];
r = strlen(name);
- memcpy (key, hi->info.buf[n] + r+1, KEY_SIZE);
- key_heap_delete (hi);
- if ((r = key_file_read (kf, rbuf)))
- key_heap_insert (hi, rbuf, r, kf);
- no_iterations++;
+ memcpy(key, hi->info.buf[n] + r+1, KEY_SIZE);
+ key_heap_delete(hi);
+ if ((r = key_file_read(kf, rbuf)))
+ key_heap_insert(hi, rbuf, r, kf);
+ hi->no_iterations++;
return 1;
}
+
+/* for debugging only */
+void zebra_log_dict_entry(ZebraHandle zh, const char *s)
+{
+ char dst[INP_NAME_MAX+1];
+ int ord;
+ int len = key_SU_decode(&ord, (const unsigned char *) s);
+ const char *index_type;
+
+ if (!zh)
+ yaz_log(YLOG_LOG, "ord=%d", ord);
+ else
+ {
+ const char *string_index;
+ const char *db = 0;
+ zebraExplain_lookup_ord(zh->reg->zei,
+ ord, &index_type, &db, &string_index);
+
+ zebra_term_untrans(zh, index_type, dst, s + len);
+
+ yaz_log(YLOG_LOG, "ord=%d index_type=%s index=%s term=%s",
+ ord, index_type, string_index, dst);
+ }
+}
+
struct heap_cread_info {
char prev_name[INP_NAME_MAX];
char cur_name[INP_NAME_MAX];
char *key;
+ char *key_1, *key_2;
+ int mode_1, mode_2;
+ int sz_1, sz_2;
struct heap_info *hi;
- int mode;
+ int first_in_list;
int more;
+ int ret;
+ int look_level;
};
-
-int heap_cread_item (void *vp, char **dst, int *insertMode)
+
+static int heap_cread_item(void *vp, char **dst, int *insertMode);
+
+int heap_cread_item2(void *vp, char **dst, int *insertMode)
+{
+ struct heap_cread_info *p = (struct heap_cread_info *) vp;
+ int level = 0;
+
+ if (p->look_level)
+ {
+ if (p->look_level > 0)
+ {
+ *insertMode = 1;
+ p->look_level--;
+ }
+ else
+ {
+ *insertMode = 0;
+ p->look_level++;
+ }
+ memcpy(*dst, p->key_1, p->sz_1);
+#if PR_KEY_TOP
+ yaz_log(YLOG_LOG, "DUP level=%d", p->look_level);
+ pkey(*dst, *insertMode);
+#endif
+ (*dst) += p->sz_1;
+ return 1;
+ }
+ if (p->ret == 0) /* lookahead was 0?. Return that in read next round */
+ {
+ p->ret = -1;
+ return 0;
+ }
+ else if (p->ret == -1) /* Must read new item ? */
+ {
+ char *dst_1 = p->key_1;
+ p->ret = heap_cread_item(vp, &dst_1, &p->mode_1);
+ p->sz_1 = dst_1 - p->key_1;
+ }
+ else
+ { /* lookahead in 2 . Now in 1. */
+ p->sz_1 = p->sz_2;
+ p->mode_1 = p->mode_2;
+ memcpy(p->key_1, p->key_2, p->sz_2);
+ }
+ if (p->mode_1)
+ level = 1; /* insert */
+ else
+ level = -1; /* delete */
+ while(1)
+ {
+ char *dst_2 = p->key_2;
+ p->ret = heap_cread_item(vp, &dst_2, &p->mode_2);
+ if (!p->ret)
+ {
+ if (level)
+ break;
+ p->ret = -1;
+ return 0;
+ }
+ p->sz_2 = dst_2 - p->key_2;
+
+ if (key_compare(p->key_1, p->key_2) == 0)
+ {
+ if (p->mode_2) /* adjust level according to deletes/inserts */
+ level++;
+ else
+ level--;
+ }
+ else
+ {
+ if (level)
+ break;
+ /* all the same. new round .. */
+ p->sz_1 = p->sz_2;
+ p->mode_1 = p->mode_2;
+ memcpy(p->key_1, p->key_2, p->sz_1);
+ if (p->mode_1)
+ level = 1; /* insert */
+ else
+ level = -1; /* delete */
+ }
+ }
+ /* outcome is insert (1) or delete (0) depending on final level */
+ if (level > 0)
+ {
+ *insertMode = 1;
+ level--;
+ }
+ else
+ {
+ *insertMode = 0;
+ level++;
+ }
+ p->look_level = level;
+ memcpy(*dst, p->key_1, p->sz_1);
+#if PR_KEY_TOP
+ yaz_log(YLOG_LOG, "TOP");
+ pkey(*dst, *insertMode);
+#endif
+ (*dst) += p->sz_1;
+ return 1;
+}
+
+int heap_cread_item(void *vp, char **dst, int *insertMode)
{
struct heap_cread_info *p = (struct heap_cread_info *) vp;
struct heap_info *hi = p->hi;
- if (p->mode == 1)
+ if (p->first_in_list)
{
*insertMode = p->key[0];
- memcpy (*dst, p->key+1, sizeof(struct it_key));
+ memcpy(*dst, p->key+1, sizeof(struct it_key));
+#if PR_KEY_LOW
+ zebra_log_dict_entry(hi->zh, p->cur_name);
+ pkey(*dst, *insertMode);
+#endif
(*dst) += sizeof(struct it_key);
- p->mode = 2;
+ p->first_in_list = 0;
return 1;
}
- strcpy (p->prev_name, p->cur_name);
- if (!(p->more = heap_read_one (hi, p->cur_name, p->key)))
+ strcpy(p->prev_name, p->cur_name);
+ if (!(p->more = heap_read_one(hi, p->cur_name, p->key)))
return 0;
- if (*p->cur_name && strcmp (p->cur_name, p->prev_name))
+ if (*p->cur_name && strcmp(p->cur_name, p->prev_name))
{
- p->mode = 1;
+ p->first_in_list = 1;
return 0;
}
*insertMode = p->key[0];
- memcpy (*dst, p->key+1, sizeof(struct it_key));
+ memcpy(*dst, p->key+1, sizeof(struct it_key));
+#if PR_KEY_LOW
+ zebra_log_dict_entry(hi->zh, p->cur_name);
+ pkey(*dst, *insertMode);
+#endif
(*dst) += sizeof(struct it_key);
return 1;
}
-#if ZMBOL
-int heap_inpc (struct heap_info *hi)
+int heap_inpc(struct heap_cread_info *hci, struct heap_info *hi)
{
- struct heap_cread_info hci;
- ISAMC_I isamc_i = (ISAMC_I) xmalloc (sizeof(*isamc_i));
+ ISAMC_I *isamc_i = (ISAMC_I *) xmalloc(sizeof(*isamc_i));
- hci.key = (char *) xmalloc (KEY_SIZE);
- hci.mode = 1;
- hci.hi = hi;
- hci.more = heap_read_one (hi, hci.cur_name, hci.key);
+ isamc_i->clientData = hci;
+ isamc_i->read_item = heap_cread_item2;
- isamc_i->clientData = &hci;
- isamc_i->read_item = heap_cread_item;
-
- while (hci.more)
+ while (hci->more)
{
char this_name[INP_NAME_MAX];
- ISAMC_P isamc_p, isamc_p2;
+ ISAM_P isamc_p, isamc_p2;
char *dict_info;
- strcpy (this_name, hci.cur_name);
- assert (hci.cur_name[1]);
- no_diffs++;
- if ((dict_info = dict_lookup (hi->dict, hci.cur_name)))
+ strcpy(this_name, hci->cur_name);
+ assert(hci->cur_name[0]);
+ hi->no_diffs++;
+ if ((dict_info = dict_lookup(hi->reg->dict, hci->cur_name)))
{
- memcpy (&isamc_p, dict_info+1, sizeof(ISAMC_P));
- isamc_p2 = isc_merge (hi->isamc, isamc_p, isamc_i);
+ memcpy(&isamc_p, dict_info+1, sizeof(ISAM_P));
+ isamc_p2 = isamc_p;
+ isamc_merge(hi->reg->isamc, &isamc_p2, isamc_i);
if (!isamc_p2)
{
- no_deletions++;
- if (!dict_delete (hi->dict, this_name))
+ hi->no_deletions++;
+ if (!dict_delete(hi->reg->dict, this_name))
abort();
}
- else
+ else
{
- no_updates++;
+ hi->no_updates++;
if (isamc_p2 != isamc_p)
- dict_insert (hi->dict, this_name,
- sizeof(ISAMC_P), &isamc_p2);
+ dict_insert(hi->reg->dict, this_name,
+ sizeof(ISAM_P), &isamc_p2);
}
- }
+ }
else
{
- isamc_p = isc_merge (hi->isamc, 0, isamc_i);
- no_insertions++;
- dict_insert (hi->dict, this_name, sizeof(ISAMC_P), &isamc_p);
+ isamc_p = 0;
+ isamc_merge(hi->reg->isamc, &isamc_p, isamc_i);
+ hi->no_insertions++;
+ if (isamc_p)
+ dict_insert(hi->reg->dict, this_name,
+ sizeof(ISAM_P), &isamc_p);
}
}
- xfree (isamc_i);
+ xfree(isamc_i);
return 0;
-}
+}
-int heap_inpd (struct heap_info *hi)
+int heap_inpb(struct heap_cread_info *hci, struct heap_info *hi)
{
- struct heap_cread_info hci;
- ISAMD_I isamd_i = (ISAMD_I) xmalloc (sizeof(*isamd_i));
-
- hci.key = (char *) xmalloc (KEY_SIZE);
- hci.mode = 1;
- hci.hi = hi;
- hci.more = heap_read_one (hi, hci.cur_name, hci.key);
+ ISAMC_I *isamc_i = (ISAMC_I *) xmalloc(sizeof(*isamc_i));
- isamd_i->clientData = &hci;
- isamd_i->read_item = heap_cread_item;
+ isamc_i->clientData = hci;
+ isamc_i->read_item = heap_cread_item2;
- while (hci.more)
+ while (hci->more)
{
char this_name[INP_NAME_MAX];
- ISAMD_P isamd_p, isamd_p2;
+ ISAM_P isamc_p, isamc_p2;
char *dict_info;
- strcpy (this_name, hci.cur_name);
- assert (hci.cur_name[1]);
- no_diffs++;
- if ((dict_info = dict_lookup (hi->dict, hci.cur_name)))
- {
- memcpy (&isamd_p, dict_info+1, sizeof(ISAMD_P));
- isamd_p2 = isamd_append (hi->isamd, isamd_p, isamd_i);
- if (!isamd_p2)
- {
- no_deletions++;
- if (!dict_delete (hi->dict, this_name))
- abort();
- }
- else
- {
- no_updates++;
- if (isamd_p2 != isamd_p)
- dict_insert (hi->dict, this_name,
- sizeof(ISAMD_P), &isamd_p2);
- }
- }
- else
- {
- isamd_p = isamd_append (hi->isamd, 0, isamd_i);
- no_insertions++;
- dict_insert (hi->dict, this_name, sizeof(ISAMD_P), &isamd_p);
- }
- }
- xfree (isamd_i);
- return 0;
-}
+ strcpy(this_name, hci->cur_name);
+ assert(hci->cur_name[0]);
+ hi->no_diffs++;
-int heap_inp (struct heap_info *hi)
-{
- char *info;
- char next_name[INP_NAME_MAX];
- char cur_name[INP_NAME_MAX];
- int key_buf_size = INP_BUF_START;
- int key_buf_ptr;
- char *next_key;
- char *key_buf;
- int more;
-
- next_key = (char *) xmalloc (KEY_SIZE);
- key_buf = (char *) xmalloc (key_buf_size);
- more = heap_read_one (hi, cur_name, key_buf);
- while (more) /* EOF ? */
- {
- int nmemb;
- key_buf_ptr = KEY_SIZE;
- while (1)
- {
- if (!(more = heap_read_one (hi, next_name, next_key)))
- break;
- if (*next_name && strcmp (next_name, cur_name))
- break;
- memcpy (key_buf + key_buf_ptr, next_key, KEY_SIZE);
- key_buf_ptr += KEY_SIZE;
- if (key_buf_ptr+(int) KEY_SIZE >= key_buf_size)
- {
- char *new_key_buf;
- new_key_buf = (char *) xmalloc (key_buf_size + INP_BUF_ADD);
- memcpy (new_key_buf, key_buf, key_buf_size);
- key_buf_size += INP_BUF_ADD;
- xfree (key_buf);
- key_buf = new_key_buf;
- }
- }
- no_diffs++;
- nmemb = key_buf_ptr / KEY_SIZE;
- assert (nmemb * (int) KEY_SIZE == key_buf_ptr);
- if ((info = dict_lookup (hi->dict, cur_name)))
+#if 0
+ assert(hi->zh);
+ zebra_log_dict_entry(hi->zh, hci->cur_name);
+#endif
+ if ((dict_info = dict_lookup(hi->reg->dict, hci->cur_name)))
{
- ISAM_P isam_p, isam_p2;
- memcpy (&isam_p, info+1, sizeof(ISAM_P));
- isam_p2 = is_merge (hi->isam, isam_p, nmemb, key_buf);
- if (!isam_p2)
+ memcpy(&isamc_p, dict_info+1, sizeof(ISAM_P));
+ isamc_p2 = isamc_p;
+ isamb_merge(hi->reg->isamb, &isamc_p2, isamc_i);
+ if (!isamc_p2)
{
- no_deletions++;
- if (!dict_delete (hi->dict, cur_name))
- abort ();
+ hi->no_deletions++;
+ if (!dict_delete(hi->reg->dict, this_name))
+ abort();
}
- else
+ else
{
- no_updates++;
- if (isam_p2 != isam_p)
- dict_insert (hi->dict, cur_name, sizeof(ISAM_P), &isam_p2);
+ hi->no_updates++;
+ if (isamc_p2 != isamc_p)
+ dict_insert(hi->reg->dict, this_name,
+ sizeof(ISAM_P), &isamc_p2);
}
}
else
{
- ISAM_P isam_p;
- no_insertions++;
- isam_p = is_merge (hi->isam, 0, nmemb, key_buf);
- dict_insert (hi->dict, cur_name, sizeof(ISAM_P), &isam_p);
+ isamc_p = 0;
+ isamb_merge(hi->reg->isamb, &isamc_p, isamc_i);
+ hi->no_insertions++;
+ if (isamc_p)
+ dict_insert(hi->reg->dict, this_name,
+ sizeof(ISAM_P), &isamc_p);
}
- memcpy (key_buf, next_key, KEY_SIZE);
- strcpy (cur_name, next_name);
}
+ xfree(isamc_i);
return 0;
}
-#endif
-
-int heap_inps (struct heap_info *hi)
+int heap_inps(struct heap_cread_info *hci, struct heap_info *hi)
{
- struct heap_cread_info hci;
- ISAMS_I isams_i = (ISAMS_I) xmalloc (sizeof(*isams_i));
+ ISAMS_I isams_i = (ISAMS_I) xmalloc(sizeof(*isams_i));
- hci.key = (char *) xmalloc (KEY_SIZE);
- hci.mode = 1;
- hci.hi = hi;
- hci.more = heap_read_one (hi, hci.cur_name, hci.key);
-
- isams_i->clientData = &hci;
+ isams_i->clientData = hci;
isams_i->read_item = heap_cread_item;
- while (hci.more)
+ while (hci->more)
{
char this_name[INP_NAME_MAX];
- ISAMS_P isams_p;
+ ISAM_P isams_p;
char *dict_info;
- strcpy (this_name, hci.cur_name);
- assert (hci.cur_name[1]);
- no_diffs++;
- if (!(dict_info = dict_lookup (hi->dict, hci.cur_name)))
+ strcpy(this_name, hci->cur_name);
+ assert(hci->cur_name[0]);
+ hi->no_diffs++;
+ if (!(dict_info = dict_lookup(hi->reg->dict, hci->cur_name)))
{
- isams_p = isams_merge (hi->isams, isams_i);
- no_insertions++;
- dict_insert (hi->dict, this_name, sizeof(ISAMS_P), &isams_p);
+ isams_p = isams_merge(hi->reg->isams, isams_i);
+ hi->no_insertions++;
+ dict_insert(hi->reg->dict, this_name, sizeof(ISAM_P), &isams_p);
}
else
{
- logf (LOG_FATAL, "isams doesn't support this kind of update");
+ yaz_log(YLOG_FATAL, "isams doesn't support this kind of update");
break;
}
}
- xfree (isams_i);
+ xfree(isams_i);
return 0;
-}
+}
struct progressInfo {
time_t startTime;
off_t totalOffset;
};
-void progressFunc (struct key_file *keyp, void *info)
+void progressFunc(struct key_file *keyp, void *info)
{
struct progressInfo *p = (struct progressInfo *) info;
time_t now, remaining;
remaining = (time_t) ((now - p->startTime)*
((double) p->totalBytes/p->totalOffset - 1.0));
if (remaining <= 130)
- logf (LOG_LOG, "Merge %2.1f%% completed; %ld seconds remaining",
+ yaz_log(YLOG_LOG, "Merge %2.1f%% completed; %ld seconds remaining",
(100.0*p->totalOffset) / p->totalBytes, (long) remaining);
else
- logf (LOG_LOG, "Merge %2.1f%% completed; %ld minutes remaining",
+ yaz_log(YLOG_LOG, "Merge %2.1f%% completed; %ld minutes remaining",
(100.0*p->totalOffset) / p->totalBytes, (long) remaining/60);
}
p->totalOffset += keyp->buf_size;
#define R_OK 4
#endif
-void zebra_index_merge (ZebraHandle zh)
+void zebra_index_merge(ZebraHandle zh)
{
- struct key_file **kf;
+ struct key_file **kf = 0;
char rbuf[1024];
int i, r;
struct heap_info *hi;
struct progressInfo progressInfo;
- int nkeys = zh->key_file_no;
-
+ int nkeys = key_block_get_no_files(zh->reg->key_block);
+
+ if (nkeys == 0)
+ return;
+
if (nkeys < 0)
{
char fname[1024];
nkeys = 0;
while (1)
{
- extract_get_fname_tmp (zh, fname, nkeys+1);
- if (access (fname, R_OK) == -1)
+ extract_get_fname_tmp (zh, fname, nkeys+1);
+ if (access(fname, R_OK) == -1)
break;
nkeys++;
}
if (!nkeys)
return ;
}
- kf = (struct key_file **) xmalloc ((1+nkeys) * sizeof(*kf));
+ kf = (struct key_file **) xmalloc((1+nkeys) * sizeof(*kf));
progressInfo.totalBytes = 0;
progressInfo.totalOffset = 0;
- time (&progressInfo.startTime);
- time (&progressInfo.lastTime);
+ time(&progressInfo.startTime);
+ time(&progressInfo.lastTime);
for (i = 1; i<=nkeys; i++)
{
- kf[i] = key_file_init (i, 32768, zh->service->res);
+ kf[i] = key_file_init(i, 8192, zh->res);
kf[i]->readHandler = progressFunc;
kf[i]->readInfo = &progressInfo;
progressInfo.totalBytes += kf[i]->length;
progressInfo.totalOffset += kf[i]->buf_size;
}
- hi = key_heap_init (nkeys, key_qsort_compare);
- hi->dict = zh->service->dict;
- hi->isams = zh->service->isams;
-#if ZMBOL
- hi->isam = zh->service->isam;
- hi->isamc = zh->service->isamc;
- hi->isamd = zh->service->isamd;
-#endif
-
- for (i = 1; i<=nkeys; i++)
- if ((r = key_file_read (kf[i], rbuf)))
- key_heap_insert (hi, rbuf, r, kf[i]);
- if (zh->service->isams)
- heap_inps (hi);
-#if ZMBOL
- else if (zh->service->isamc)
- heap_inpc (hi);
- else if (zh->service->isam)
- heap_inp (hi);
- else if (zh->service->isamd)
- heap_inpd (hi);
-#endif
-
- for (i = 1; i<=nkeys; i++)
- {
- extract_get_fname_tmp (zh, rbuf, i);
- unlink (rbuf);
- }
- logf (LOG_LOG, "Iterations . . .%7d", no_iterations);
- logf (LOG_LOG, "Distinct words .%7d", no_diffs);
- logf (LOG_LOG, "Updates. . . . .%7d", no_updates);
- logf (LOG_LOG, "Deletions. . . .%7d", no_deletions);
- logf (LOG_LOG, "Insertions . . .%7d", no_insertions);
- zh->key_file_no = 0;
-}
+ hi = key_heap_init_file(zh, nkeys, key_qsort_compare);
+ hi->reg = zh->reg;
-void key_input (BFiles bfs, int nkeys, int cache, Res res)
-
-{
- Dict dict;
- ISAMS isams = NULL;
-#if ZMBOL
- ISAM isam = NULL;
- ISAMC isamc = NULL;
- ISAMD isamd = NULL;
-#endif
- struct key_file **kf;
- char rbuf[1024];
- int i, r;
- struct heap_info *hi;
- struct progressInfo progressInfo;
+ for (i = 1; i<=nkeys; i++)
+ if ((r = key_file_read(kf[i], rbuf)))
+ key_heap_insert(hi, rbuf, r, kf[i]);
- if (nkeys < 0)
- {
- char fname[1024];
- nkeys = 0;
- while (1)
- {
- getFnameTmp (res, fname, nkeys+1);
- if (access (fname, R_OK) == -1)
- break;
- nkeys++;
- }
- if (!nkeys)
- return ;
- }
- dict = dict_open (bfs, FNAME_DICT, cache, 1, 0);
- if (!dict)
- {
- logf (LOG_FATAL, "dict_open fail");
- exit (1);
- }
- if (res_get_match (res, "isam", "s", ISAM_DEFAULT))
- {
- struct ISAMS_M_s isams_m;
- isams = isams_open (bfs, FNAME_ISAMS, 1,
- key_isams_m (res, &isams_m));
- if (!isams)
- {
- logf (LOG_FATAL, "isams_open fail");
- exit (1);
- }
- logf (LOG_LOG, "isams opened");
- }
-#if ZMBOL
- else if (res_get_match (res, "isam", "i", ISAM_DEFAULT))
- {
- isam = is_open (bfs, FNAME_ISAM, key_compare, 1,
- sizeof(struct it_key), res);
- if (!isam)
- {
- logf (LOG_FATAL, "is_open fail");
- exit (1);
- }
- }
- else if (res_get_match (res, "isam", "d", ISAM_DEFAULT))
- {
- struct ISAMD_M_s isamd_m;
- isamd = isamd_open (bfs, FNAME_ISAMD, 1,
- key_isamd_m (res,&isamd_m));
- if (!isamd)
- {
- logf (LOG_FATAL, "isamd_open fail");
- exit (1);
- }
- }
- else if (res_get_match (res, "isam", "c", ISAM_DEFAULT))
+ if (1)
{
- struct ISAMC_M_s isamc_m;
- isamc = isc_open (bfs, FNAME_ISAMC, 1,
- key_isamc_m (res, &isamc_m));
- if (!isamc)
- {
- logf (LOG_FATAL, "isc_open fail");
- exit (1);
- }
+ struct heap_cread_info hci;
+
+ hci.key = (char *) xmalloc(KEY_SIZE);
+ hci.key_1 = (char *) xmalloc(KEY_SIZE);
+ hci.key_2 = (char *) xmalloc(KEY_SIZE);
+ hci.ret = -1;
+ hci.first_in_list = 1;
+ hci.hi = hi;
+ hci.look_level = 0;
+ hci.more = heap_read_one(hi, hci.cur_name, hci.key);
+
+ if (zh->reg->isams)
+ heap_inps(&hci, hi);
+ if (zh->reg->isamc)
+ heap_inpc(&hci, hi);
+ if (zh->reg->isamb)
+ heap_inpb(&hci, hi);
+
+ xfree(hci.key);
+ xfree(hci.key_1);
+ xfree(hci.key_2);
}
-#endif
- kf = (struct key_file **) xmalloc ((1+nkeys) * sizeof(*kf));
- progressInfo.totalBytes = 0;
- progressInfo.totalOffset = 0;
- time (&progressInfo.startTime);
- time (&progressInfo.lastTime);
+
for (i = 1; i<=nkeys; i++)
{
- kf[i] = key_file_init (i, 32768, res);
- kf[i]->readHandler = progressFunc;
- kf[i]->readInfo = &progressInfo;
- progressInfo.totalBytes += kf[i]->length;
- progressInfo.totalOffset += kf[i]->buf_size;
+ extract_get_fname_tmp (zh, rbuf, i);
+ unlink(rbuf);
}
- hi = key_heap_init (nkeys, key_qsort_compare);
- hi->dict = dict;
- hi->isams = isams;
-#if ZMBOL
- hi->isam = isam;
- hi->isamc = isamc;
- hi->isamd = isamd;
-#endif
-
- for (i = 1; i<=nkeys; i++)
- if ((r = key_file_read (kf[i], rbuf)))
- key_heap_insert (hi, rbuf, r, kf[i]);
- if (isams)
- heap_inps (hi);
-#if ZMBOL
- else if (isamc)
- heap_inpc (hi);
- else if (isam)
- heap_inp (hi);
- else if (isamd)
- heap_inpd (hi);
-#endif
-
- dict_close (dict);
- if (isams)
- isams_close (isams);
-#if ZMBOL
- if (isam)
- is_close (isam);
- if (isamc)
- isc_close (isamc);
- if (isamd)
- isamd_close (isamd);
-#endif
-
for (i = 1; i<=nkeys; i++)
- {
- getFnameTmp (res, rbuf, i);
- unlink (rbuf);
+ key_file_destroy(kf[i]);
+ xfree(kf);
+ if (hi->no_iterations)
+ { /* do not log if nothing happened */
+ yaz_log(YLOG_LOG, "Iterations: isam/dict "
+ ZINT_FORMAT "/" ZINT_FORMAT,
+ hi->no_iterations, hi->no_diffs);
+ yaz_log(YLOG_LOG, "Dict: inserts/updates/deletions: "
+ ZINT_FORMAT "/" ZINT_FORMAT "/" ZINT_FORMAT,
+ hi->no_insertions, hi->no_updates, hi->no_deletions);
}
- logf (LOG_LOG, "Iterations . . .%7d", no_iterations);
- logf (LOG_LOG, "Distinct words .%7d", no_diffs);
- logf (LOG_LOG, "Updates. . . . .%7d", no_updates);
- logf (LOG_LOG, "Deletions. . . .%7d", no_deletions);
- logf (LOG_LOG, "Insertions . . .%7d", no_insertions);
-
- /* xmalloc_trav("unfreed"); while hunting leaks */
+ key_block_destroy(&zh->reg->key_block);
+ key_heap_destroy(hi, nkeys);
}
-
-
-
/*
- * $Log: kinput.c,v $
- * Revision 1.43 2000-03-20 19:08:36 adam
- * Added remote record import using Z39.50 extended services and Segment
- * Requests.
- *
- * Revision 1.42 1999/12/01 21:58:48 adam
- * Proper handle of illegal use of isams.
- *
- * Revision 1.41 1999/11/30 13:48:03 adam
- * Improved installation. Updated for inclusion of YAZ header files.
- *
- * Revision 1.40 1999/09/08 12:12:39 adam
- * Removed log message.
- *
- * Revision 1.39 1999/08/18 10:39:20 heikki
- * Added a comment on memory leaks
- *
- * Revision 1.38 1999/08/18 08:38:04 heikki
- * Memory leak hunting
- *
- * Revision 1.37 1999/07/14 13:21:34 heikki
- * Added isam-d files. Compiles (almost) clean. Doesn't work at all
- *
- * Revision 1.36 1999/07/14 10:59:26 adam
- * Changed functions isc_getmethod, isams_getmethod.
- * Improved fatal error handling (such as missing EXPLAIN schema).
- *
- * Revision 1.35 1999/06/30 15:07:23 heikki
- * Adding isamh stuff
- *
- * Revision 1.34 1999/05/26 07:49:13 adam
- * C++ compilation.
- *
- * Revision 1.33 1999/05/15 14:36:38 adam
- * Updated dictionary. Implemented "compression" of dictionary.
- *
- * Revision 1.32 1999/05/12 13:08:06 adam
- * First version of ISAMS.
- *
- * Revision 1.31 1999/02/02 14:50:56 adam
- * Updated WIN32 code specific sections. Changed header.
- *
- * Revision 1.30 1998/10/28 10:53:57 adam
- * Added type cast to prevent warning.
- *
- * Revision 1.29 1998/06/11 15:41:39 adam
- * Minor changes.
- *
- * Revision 1.28 1998/03/05 08:45:12 adam
- * New result set model and modular ranking system. Moved towards
- * descent server API. System information stored as "SGML" records.
- *
- * Revision 1.27 1998/02/17 10:32:52 adam
- * Fixed bug: binary files weren't opened with flag b on NT.
- *
- * Revision 1.26 1998/01/29 13:39:13 adam
- * Compress ISAM is default.
- *
- * Revision 1.25 1997/09/17 12:19:14 adam
- * Zebra version corresponds to YAZ version 1.4.
- * Changed Zebra server so that it doesn't depend on global common_resource.
- *
- * Revision 1.24 1997/09/09 13:38:07 adam
- * Partial port to WIN95/NT.
- *
- * Revision 1.23 1997/09/04 13:57:39 adam
- * Added O_BINARY for open calls.
- *
- * Revision 1.22 1997/02/12 20:39:45 adam
- * Implemented options -f <n> that limits the log to the first <n>
- * records.
- * Changed some log messages also.
- *
- * Revision 1.21 1996/11/08 11:10:23 adam
- * Buffers used during file match got bigger.
- * Compressed ISAM support everywhere.
- * Bug fixes regarding masking characters in queries.
- * Redesigned Regexp-2 queries.
- *
- * Revision 1.20 1996/11/01 08:58:41 adam
- * Interface to isamc system now includes update and delete.
- *
- * Revision 1.19 1996/10/29 14:09:46 adam
- * Use of cisam system - enabled if setting isamc is 1.
- *
- * Revision 1.18 1996/06/04 10:18:59 adam
- * Minor changes - removed include of ctype.h.
- *
- * Revision 1.17 1996/05/14 15:47:07 adam
- * Cleanup of various buffer size entities.
- *
- * Revision 1.16 1996/04/09 10:05:20 adam
- * Bug fix: prev_name buffer possibly too small; allocated in key_file_init.
- *
- * Revision 1.15 1996/03/21 14:50:09 adam
- * File update uses modify-time instead of change-time.
- *
- * Revision 1.14 1996/02/07 14:06:37 adam
- * Better progress report during register merge.
- * New command: clean - removes temporary shadow files.
- *
- * Revision 1.13 1996/02/05 12:30:00 adam
- * Logging reduced a bit.
- * The remaining running time is estimated during register merge.
- *
- * Revision 1.12 1995/12/06 17:49:19 adam
- * Uses dict_delete now.
- *
- * Revision 1.11 1995/12/06 16:06:43 adam
- * Better diagnostics. Work on 'real' dictionary deletion.
- *
- * Revision 1.10 1995/12/06 12:41:22 adam
- * New command 'stat' for the index program.
- * Filenames can be read from stdin by specifying '-'.
- * Bug fix/enhancement of the transformation from terms to regular
- * expressons in the search engine.
- *
- * Revision 1.9 1995/10/10 12:24:39 adam
- * Temporary sort files are compressed.
- *
- * Revision 1.8 1995/10/04 16:57:19 adam
- * Key input and merge sort in one pass.
- *
- * Revision 1.7 1995/10/02 15:18:52 adam
- * New member in recRetrieveCtrl: diagnostic.
- *
- * Revision 1.6 1995/09/29 15:51:56 adam
- * First work on multi-way read.
- *
- * Revision 1.5 1995/09/29 14:01:43 adam
- * Bug fixes.
- *
- * Revision 1.4 1995/09/28 14:22:57 adam
- * Sort uses smaller temporary files.
- *
- * Revision 1.3 1995/09/06 16:11:17 adam
- * Option: only one word key per file.
- *
- * Revision 1.2 1995/09/04 12:33:42 adam
- * Various cleanup. YAZ util used instead.
- *
- * Revision 1.1 1995/09/04 09:10:37 adam
- * More work on index add/del/update.
- * Merge sort implemented.
- * Initial work on z39 server.
- *
+ * Local variables:
+ * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
*/
projects / idzebra-moved-to-github.git / blobdiff