X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=index%2Fkinput.c;h=57451160a74bfda7e28c05e2822cbf3397c322f6;hp=491c2e96c2e5e7d2902e279db265c05ba732c32c;hb=97a7adeb9e5059463f039495cc01cfa448463a27;hpb=896c0427df9d8eff5de6a1735dcd992e067df844 diff --git a/index/kinput.c b/index/kinput.c index 491c2e9..5745116 100644 --- a/index/kinput.c +++ b/index/kinput.c @@ -1,8 +1,5 @@ -/* $Id: kinput.c,v 1.52 2002-08-02 19:26:55 adam Exp $ - Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002 - 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 @@ -15,17 +12,16 @@ 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 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 #ifdef WIN32 #include -#else +#endif +#if HAVE_UNISTD_H #include #endif #include @@ -37,9 +33,6 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #define KEY_SIZE (1+sizeof(struct it_key)) #define INP_NAME_MAX 768 -#define INP_BUF_START 60000 -#define INP_BUF_ADD 400000 - struct key_file { int no; /* file no */ @@ -49,8 +42,7 @@ struct key_file { 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); @@ -58,147 +50,132 @@ struct key_file { Res res; }; -void getFnameTmp (Res res, char *fname, int no) +#if 0 +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->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) +void key_file_destroy(struct key_file *f) { - xfree (f->buf); - xfree (f->prev_name); - xfree (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; - - 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 i, c; + char srcbuf[128]; + const char *src = srcbuf; + char *dst; + int j; -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; @@ -206,25 +183,34 @@ int key_file_read (struct key_file *f, char *key) { 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 < IT_MAX_WORD) + 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 { @@ -236,55 +222,65 @@ struct heap_info { int *ptr; int (*cmp)(const void *p1, const void *p2); struct zebra_register *reg; - - int no_diffs; - int no_updates; - int no_deletions; - int no_insertions; - int no_iterations; + 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); } - 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; } -void key_heap_destroy (struct heap_info *hi, int nkeys) +void key_heap_destroy(struct heap_info *hi, int nkeys) { int i; - yaz_log (LOG_LOG, "key_heap_destroy"); for (i = 0; i<=nkeys; i++) - xfree (hi->info.buf[i]); - - xfree (hi->info.buf); - xfree (hi->ptr); - xfree (hi->info.file); - xfree (hi); + 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) +static void key_heap_swap(struct heap_info *hi, int i1, int i2) { int swap; @@ -294,13 +290,13 @@ static void key_heap_swap (struct heap_info *hi, int i1, int i2) } -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 && @@ -310,7 +306,7 @@ static void key_heap_delete (struct heap_info *hi) 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; } @@ -319,26 +315,26 @@ static void key_heap_delete (struct heap_info *hi) } } -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; 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]; @@ -347,363 +343,327 @@ static int heap_read_one (struct heap_info *hi, char *name, char *key) 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); + 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; } +#define PR_KEY_LOW 0 +#define PR_KEY_TOP 0 + +/* for debugging only */ +void zebra_log_dict_entry(ZebraHandle zh, const char *s) +{ + char dst[IT_MAX_WORD+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; }; + +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 0 + 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 0 + pkey(*dst, *insertMode); +#endif + (*dst) += p->sz_1; + return 1; +} -int heap_cread_item (void *vp, char **dst, int *insertMode) +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; } -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)); - - 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)); - isamc_i->clientData = &hci; - isamc_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]; - 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]); + 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))) + 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->reg->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) { hi->no_deletions++; - if (!dict_delete (hi->reg->dict, this_name)) + if (!dict_delete(hi->reg->dict, this_name)) abort(); } else { hi->no_updates++; if (isamc_p2 != isamc_p) - dict_insert (hi->reg->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->reg->isamc, 0, isamc_i); + isamc_p = 0; + isamc_merge(hi->reg->isamc, &isamc_p, isamc_i); hi->no_insertions++; - dict_insert (hi->reg->dict, this_name, sizeof(ISAMC_P), &isamc_p); + if (isamc_p) + dict_insert(hi->reg->dict, this_name, + sizeof(ISAM_P), &isamc_p); } } - xfree (isamc_i); - xfree (hci.key); + xfree(isamc_i); return 0; } -/* for debugging only */ -static void print_dict_item (ZebraMaps zm, const char *s) +int heap_inpb(struct heap_cread_info *hci, struct heap_info *hi) { - int reg_type = s[1]; - char keybuf[IT_MAX_WORD+1]; - char *to = keybuf; - const char *from = s + 2; + ISAMC_I *isamc_i = (ISAMC_I *) xmalloc(sizeof(*isamc_i)); - while (*from) - { - const char *res = zebra_maps_output (zm, reg_type, &from); - if (!res) - *to++ = *from++; - else - while (*res) - *to++ = *res++; - } - *to = '\0'; - yaz_log (LOG_LOG, "%s", keybuf); -} + isamc_i->clientData = hci; + isamc_i->read_item = heap_cread_item2; -int heap_inpb (struct heap_info *hi) -{ - struct heap_cread_info hci; - 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_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]); + strcpy(this_name, hci->cur_name); + assert(hci->cur_name[0]); hi->no_diffs++; #if 0 - print_dict_item (hi->reg->zebra_maps, hci.cur_name); + assert(hi->zh); + zebra_log_dict_entry(hi->zh, hci->cur_name); #endif - if ((dict_info = dict_lookup (hi->reg->dict, hci.cur_name))) + if ((dict_info = dict_lookup(hi->reg->dict, hci->cur_name))) { - memcpy (&isamc_p, dict_info+1, sizeof(ISAMC_P)); - isamc_p2 = isamb_merge (hi->reg->isamb, isamc_p, isamc_i); + 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) { hi->no_deletions++; - if (!dict_delete (hi->reg->dict, this_name)) + if (!dict_delete(hi->reg->dict, this_name)) abort(); } else { hi->no_updates++; if (isamc_p2 != isamc_p) - dict_insert (hi->reg->dict, this_name, - sizeof(ISAMC_P), &isamc_p2); - } - } - else - { - isamc_p = isamb_merge (hi->reg->isamb, 0, isamc_i); - hi->no_insertions++; - dict_insert (hi->reg->dict, this_name, sizeof(ISAMC_P), &isamc_p); - } - } - xfree (isamc_i); - xfree (hci.key); - return 0; -} - -int heap_inpd (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); - - isamd_i->clientData = &hci; - isamd_i->read_item = heap_cread_item; - - while (hci.more) - { - char this_name[INP_NAME_MAX]; - char *dict_info; - char dictentry[ISAMD_MAX_DICT_LEN+1]; - char dictlen; - - strcpy (this_name, hci.cur_name); - - /* print_dict_item (hi->reg->zebra_maps, hci.cur_name); */ - /*!*/ /* FIXME: depend on isamd-debug */ - - assert (hci.cur_name[1]); - hi->no_diffs++; - if ((dict_info = dict_lookup (hi->reg->dict, hci.cur_name))) - { - dictlen=dict_info[0]; - memcpy (dictentry, dict_info+1, dictlen ); -#ifdef SKIPTHIS - logf(LOG_LOG,"dictentry before. len=%d: %d %d %d %d %d %d %d %d %d", - dictlen,dictentry[0], dictentry[1], dictentry[2], - dictentry[3], dictentry[4], dictentry[5], - dictentry[6], dictentry[7], dictentry[8]); /*!*/ -#endif - dictlen= isamd_append(hi->reg->isamd, dictentry, dictlen, isamd_i); - /* logf dictentry after */ - if (dictlen) - { - hi->no_updates++; - if ( (dictlen!=dict_info[0]) || - (0!=memcmp(dictentry, dict_info+1, dictlen)) ) - { dict_insert(hi->reg->dict, this_name, - dictlen,dictentry); - } - } - else - { - hi->no_deletions++; - if (!dict_delete (hi->reg->dict, this_name)) - { - logf (LOG_FATAL, "dict_delete failed"); - abort(); - } + sizeof(ISAM_P), &isamc_p2); } } else { - dictlen=0; - memset (dictentry, '\0', ISAMD_MAX_DICT_LEN); - dictlen= isamd_append(hi->reg->isamd, dictentry, dictlen, isamd_i); - /* logf dictentry first */ + isamc_p = 0; + isamb_merge(hi->reg->isamb, &isamc_p, isamc_i); hi->no_insertions++; - if (dictlen) - dict_insert(hi->reg->dict, this_name, - dictlen,dictentry); + if (isamc_p) + dict_insert(hi->reg->dict, this_name, + sizeof(ISAM_P), &isamc_p); } } - xfree (isamd_i); + xfree(isamc_i); return 0; } -int heap_inp (struct heap_info *hi) +int heap_inps(struct heap_cread_info *hci, 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; - } - } - hi->no_diffs++; - nmemb = key_buf_ptr / KEY_SIZE; - assert (nmemb * (int) KEY_SIZE == key_buf_ptr); - if ((info = dict_lookup (hi->reg->dict, cur_name))) - { - ISAM_P isam_p, isam_p2; - memcpy (&isam_p, info+1, sizeof(ISAM_P)); - isam_p2 = is_merge (hi->reg->isam, isam_p, nmemb, key_buf); - if (!isam_p2) - { - hi->no_deletions++; - if (!dict_delete (hi->reg->dict, cur_name)) - abort (); - } - else - { - hi->no_updates++; - if (isam_p2 != isam_p) - dict_insert (hi->reg->dict, cur_name, - sizeof(ISAM_P), &isam_p2); - } - } - else - { - ISAM_P isam_p; - hi->no_insertions++; - isam_p = is_merge (hi->reg->isam, 0, nmemb, key_buf); - dict_insert (hi->reg->dict, cur_name, sizeof(ISAM_P), &isam_p); - } - memcpy (key_buf, next_key, KEY_SIZE); - strcpy (cur_name, next_name); - } - return 0; -} - -int heap_inps (struct heap_info *hi) -{ - struct heap_cread_info hci; - 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 isams_i = (ISAMS_I) xmalloc(sizeof(*isams_i)); - 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]); + 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))) + if (!(dict_info = dict_lookup(hi->reg->dict, hci->cur_name))) { - isams_p = isams_merge (hi->reg->isams, isams_i); + isams_p = isams_merge(hi->reg->isams, isams_i); hi->no_insertions++; - dict_insert (hi->reg->dict, this_name, sizeof(ISAMS_P), &isams_p); + 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; } @@ -714,7 +674,7 @@ struct progressInfo { 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; @@ -729,10 +689,10 @@ void progressFunc (struct key_file *keyp, void *info) 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; @@ -742,14 +702,17 @@ void progressFunc (struct key_file *keyp, void *info) #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->reg->key_file_no; + int nkeys = key_block_get_no_files(zh->reg->key_block); + + if (nkeys == 0) + return; if (nkeys < 0) { @@ -757,60 +720,84 @@ void zebra_index_merge (ZebraHandle zh) 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, 8192, zh->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 = key_heap_init_file(zh, nkeys, key_qsort_compare); hi->reg = zh->reg; for (i = 1; i<=nkeys; i++) - if ((r = key_file_read (kf[i], rbuf))) - key_heap_insert (hi, rbuf, r, kf[i]); - if (zh->reg->isams) - heap_inps (hi); - if (zh->reg->isamc) - heap_inpc (hi); - if (zh->reg->isam) - heap_inp (hi); - if (zh->reg->isamd) - heap_inpd (hi); - if (zh->reg->isamb) - heap_inpb (hi); + if ((r = key_file_read(kf[i], rbuf))) + key_heap_insert(hi, rbuf, r, kf[i]); + + if (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); + } for (i = 1; i<=nkeys; i++) { - extract_get_fname_tmp (zh, rbuf, i); - unlink (rbuf); + extract_get_fname_tmp (zh, rbuf, i); + unlink(rbuf); } - logf (LOG_LOG, "Iterations . . .%7d", hi->no_iterations); - logf (LOG_LOG, "Distinct words .%7d", hi->no_diffs); - logf (LOG_LOG, "Updates. . . . .%7d", hi->no_updates); - logf (LOG_LOG, "Deletions. . . .%7d", hi->no_deletions); - logf (LOG_LOG, "Insertions . . .%7d", hi->no_insertions); - zh->reg->key_file_no = 0; - - key_heap_destroy (hi, nkeys); for (i = 1; i<=nkeys; i++) - key_file_destroy (kf[i]); - xfree (kf); + 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); + } + key_block_destroy(&zh->reg->key_block); + key_heap_destroy(hi, nkeys); } - +/* + * Local variables: + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab + */