X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=index%2Fkinput.c;h=44c44eab07943913987e2bb43927e63e91e7fe11;hp=d4518c34f233eb4b5f79c51eba0dc7877a02adb5;hb=ab97a59cbf609730cbc674885832fd5bb1dc64fb;hpb=6c2c89df968733e5c7dcae9ddc99b380672f3eb6 diff --git a/index/kinput.c b/index/kinput.c index d4518c3..44c44ea 100644 --- a/index/kinput.c +++ b/index/kinput.c @@ -1,20 +1,30 @@ -/* - * 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. - - */ +/* $Id: kinput.c,v 1.80 2006-12-06 22:52:38 adam Exp $ + Copyright (C) 1995-2006 + Index Data ApS + +This file is part of the Zebra server. + +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 + +*/ #include #ifdef WIN32 #include -#else +#endif +#if HAVE_UNISTD_H #include #endif #include @@ -29,12 +39,6 @@ #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 */ off_t offset; /* file offset */ @@ -43,19 +47,35 @@ 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); void *readInfo; + Res res; }; -void getFnameTmp (char *fname, int no) +#if 1 +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); +} + +void extract_get_fname_tmp (ZebraHandle zh, char *fname, int no) { const char *pre; - pre = res_get_def (common_resource, "keyTmpDir", "."); + pre = res_get_def (zh->res, "keyTmpDir", "."); sprintf (fname, "%s/key%d.tmp", pre, no); } @@ -63,25 +83,30 @@ void key_file_chunk_read (struct key_file *f) { int nr = 0, r = 0, fd; char fname[1024]; - getFnameTmp (fname, f->no); + 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_FATAL|LOG_ERRNO, "cannot open %s", fname); - exit (1); + 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) { - logf (LOG_FATAL|LOG_ERRNO, "cannot seek %s", fname); - exit (1); + yaz_log(YLOG_WARN|YLOG_ERRNO, "cannot seek %s", fname); + close (fd); + return ; } } if (lseek (fd, f->offset, SEEK_SET) == -1) { - logf (LOG_FATAL|LOG_ERRNO, "cannot seek %s", fname); - exit (1); + yaz_log(YLOG_WARN|YLOG_ERRNO, "cannot seek %s", fname); + close(fd); + return ; } while (f->chunk - nr > 0) { @@ -92,23 +117,31 @@ void key_file_chunk_read (struct key_file *f) } if (r == -1) { - logf (LOG_FATAL|LOG_ERRNO, "read of %s", fname); - exit (1); + yaz_log(YLOG_WARN|YLOG_ERRNO, "read of %s", fname); + close (fd); + return; } f->buf_size = nr; - f->buf_ptr = 0; if (f->readHandler) (*f->readHandler)(f, f->readInfo); close (fd); } -struct key_file *key_file_init (int no, int chunk) +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 *f; f = (struct key_file *) xmalloc (sizeof(*f)); - f->sysno = 0; - f->seqno = 0; + f->res = res; + f->decode_handle = iscz1_start(); f->no = no; f->chunk = chunk; f->offset = 0; @@ -135,36 +168,13 @@ int key_file_getc (struct key_file *f) return EOF; } -int key_file_decode (struct key_file *f) -{ - 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 key_file_read (struct key_file *f, char *key) { - int i, d, c; - struct it_key itkey; + int i, c; + char srcbuf[128]; + const char *src = srcbuf; + char *dst; + int j; c = key_file_getc (f); if (c == 0) @@ -181,22 +191,27 @@ int key_file_read (struct key_file *f, char *key) while ((key[i++] = key_file_getc (f))) ; strcpy (f->prev_name, key); - f->sysno = 0; + 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 { @@ -207,25 +222,46 @@ struct heap_info { int heapnum; int *ptr; int (*cmp)(const void *p1, const void *p2); - Dict dict; - ISAM isam; - ISAMC isamc; - ISAMS isams; - ISAMH isamh; - ISAMD isamd; + struct zebra_register *reg; + ZebraHandle zh; + int raw_reading; /* 1=raw /mem read. 0=file reading */ + 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->raw_reading = 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)); + 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)); hi->cmp = cmp; for (i = 0; i<= nkeys; i++) @@ -236,6 +272,29 @@ struct heap_info *key_heap_init (int nkeys, return hi; } +struct heap_info *key_heap_init_raw(ZebraHandle zh, + int (*cmp)(const void *p1, const void *p2)) +{ + struct heap_info *hi=key_heap_malloc(); + hi->cmp = cmp; + hi->zh = zh; + hi->raw_reading = 1; + return hi; +} + +void key_heap_destroy (struct heap_info *hi, int nkeys) +{ + int i; + if (!hi->raw_reading) + 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; @@ -306,30 +365,168 @@ static int heap_read_one (struct heap_info *hi, char *name, char *key) key_heap_delete (hi); if ((r = key_file_read (kf, rbuf))) key_heap_insert (hi, rbuf, r, kf); - no_iterations++; + 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); + int 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=%c 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) { 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)); +#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); @@ -337,276 +534,174 @@ int heap_cread_item (void *vp, char **dst, int *insertMode) return 0; 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)); +#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]); - 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 { - 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); return 0; } -int heap_inps (struct heap_info *hi) +int heap_inp0(struct heap_cread_info *hci, 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->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; - char *dict_info; + char mybuf[1024]; + char *dst = mybuf; + int mode; - strcpy (this_name, hci.cur_name); - assert (hci.cur_name[1]); - no_diffs++; - if (!(dict_info = dict_lookup (hi->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); - } - else - abort(); + strcpy (this_name, hci->cur_name); + assert (hci->cur_name[0]); + hi->no_diffs++; + + while (heap_cread_item2(hci, &dst, &mode)) + ; } - xfree (isams_i); return 0; } -int heap_inph (struct heap_info *hi) -{ - struct heap_cread_info hci; - ISAMH_I isamh_i = (ISAMH_I) xmalloc (sizeof(*isamh_i)); - hci.key = (char *) xmalloc (KEY_SIZE); - hci.mode = 1; - hci.hi = hi; - hci.more = heap_read_one (hi, hci.cur_name, hci.key); +int heap_inpb(struct heap_cread_info *hci, struct heap_info *hi) +{ + ISAMC_I *isamc_i = (ISAMC_I *) xmalloc (sizeof(*isamc_i)); - isamh_i->clientData = &hci; - isamh_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]; - ISAMH_P isamh_p, isamh_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 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))) { - memcpy (&isamh_p, dict_info+1, sizeof(ISAMH_P)); - isamh_p2 = isamh_append (hi->isamh, isamh_p, isamh_i); - if (!isamh_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, this_name)) + hi->no_deletions++; + if (!dict_delete (hi->reg->dict, this_name)) abort(); } else { - no_updates++; - if (isamh_p2 != isamh_p) - dict_insert (hi->dict, this_name, - sizeof(ISAMH_P), &isamh_p2); + hi->no_updates++; + if (isamc_p2 != isamc_p) + dict_insert (hi->reg->dict, this_name, + sizeof(ISAM_P), &isamc_p2); } } else { - isamh_p = isamh_append (hi->isamh, 0, isamh_i); - no_insertions++; - dict_insert (hi->dict, this_name, sizeof(ISAMH_P), &isamh_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); } } - xfree (isamh_i); + xfree(isamc_i); return 0; } -int heap_inpd (struct heap_info *hi) +int heap_inps (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); + ISAMS_I isams_i = (ISAMS_I) xmalloc (sizeof(*isams_i)); - isamd_i->clientData = &hci; - isamd_i->read_item = heap_cread_item; + isams_i->clientData = hci; + isams_i->read_item = heap_cread_item; - while (hci.more) + while (hci->more) { char this_name[INP_NAME_MAX]; - ISAMD_P isamd_p, isamd_p2; + 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))) - { - 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 + 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))) { - isamd_p = isamd_append (hi->isamd, 0, isamd_i); - no_insertions++; - dict_insert (hi->dict, this_name, sizeof(ISAMD_P), &isamd_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 + { + yaz_log(YLOG_FATAL, "isams doesn't support this kind of update"); + break; + } } - xfree (isamd_i); + xfree (isams_i); return 0; } - - - -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))) - { - 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) - { - no_deletions++; - if (!dict_delete (hi->dict, cur_name)) - abort (); - } - else - { - no_updates++; - if (isam_p2 != isam_p) - dict_insert (hi->dict, cur_name, sizeof(ISAM_P), &isam_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); - } - memcpy (key_buf, next_key, KEY_SIZE); - strcpy (cur_name, next_name); - } - return 0; -} - struct progressInfo { time_t startTime; time_t lastTime; @@ -629,10 +724,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; @@ -642,28 +737,25 @@ void progressFunc (struct key_file *keyp, void *info) #define R_OK 4 #endif -void key_input (BFiles bfs, int nkeys, int cache) - +void zebra_index_merge (ZebraHandle zh) { - Dict dict; - ISAM isam = NULL; - ISAMC isamc = NULL; - ISAMS isams = NULL; - ISAMH isamh = NULL; - ISAMD isamd = NULL; - struct key_file **kf; + struct key_file **kf = 0; char rbuf[1024]; int i, r; struct heap_info *hi; struct progressInfo progressInfo; + 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) { - getFnameTmp (fname, nkeys+1); + extract_get_fname_tmp (zh, fname, nkeys+1); if (access (fname, R_OK) == -1) break; nkeys++; @@ -671,65 +763,6 @@ void key_input (BFiles bfs, int nkeys, int cache) 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 (common_resource, "isam", "s", NULL)) - { - struct ISAMS_M_s isams_m; - isams = isams_open (bfs, FNAME_ISAMS, 1, - key_isams_m (common_resource, &isams_m)); - if (!isams) - { - logf (LOG_FATAL, "isams_open fail"); - exit (1); - } - } - else if (res_get_match (common_resource, "isam", "i", NULL)) - { - isam = is_open (bfs, FNAME_ISAM, key_compare, 1, - sizeof(struct it_key), common_resource); - if (!isam) - { - logf (LOG_FATAL, "is_open fail"); - exit (1); - } - } - else if (res_get_match (common_resource, "isam", "h", NULL)) - { - isamh = isamh_open (bfs, FNAME_ISAMH, 1, - key_isamh_m (common_resource)); - if (!isamh) - { - logf (LOG_FATAL, "isamh_open fail"); - exit (1); - } - } - else if (res_get_match (common_resource, "isam", "d", NULL)) - { - struct ISAMD_M_s isamd_m; - isamd = isamd_open (bfs, FNAME_ISAMD, 1, - key_isamd_m (common_resource,&isamd_m)); - if (!isamd) - { - logf (LOG_FATAL, "isamd_open fail"); - exit (1); - } - } - else - { - struct ISAMC_M_s isamc_m; - isamc = isc_open (bfs, FNAME_ISAMC, 1, - key_isamc_m (common_resource, &isamc_m)); - if (!isamc) - { - logf (LOG_FATAL, "isc_open fail"); - exit (1); - } - } kf = (struct key_file **) xmalloc ((1+nkeys) * sizeof(*kf)); progressInfo.totalBytes = 0; progressInfo.totalOffset = 0; @@ -737,195 +770,68 @@ void key_input (BFiles bfs, int nkeys, int cache) time (&progressInfo.lastTime); for (i = 1; i<=nkeys; i++) { - kf[i] = key_file_init (i, 32768); + 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 = dict; - hi->isam = isam; - hi->isamc = isamc; - hi->isams = isams; - hi->isamh = isamh; - hi->isamd = isamd; + 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 (isamc) - heap_inpc (hi); - else if (isams) - heap_inps (hi); - else if (isam) - heap_inp (hi); - else if (isamh) - heap_inph (hi); - else if (isamd) - heap_inpd (hi); + + 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); + } - dict_close (dict); - if (isam) - is_close (isam); - if (isamc) - isc_close (isamc); - if (isams) - isams_close (isams); - if (isamh) - isamh_close (isamh); - if (isamd) - isamd_close (isamd); - for (i = 1; i<=nkeys; i++) { - getFnameTmp (rbuf, 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); - - xmalloc_trav("unfreed"); /* while hunting leaks */ + for (i = 1; i<=nkeys; i++) + key_file_destroy (kf[i]); + xfree (kf); + if (hi->no_iterations) + { /* do not log if nothing happened */ + yaz_log(YLOG_LOG, "Iterations %9" ZINT_FORMAT0, hi->no_iterations); + yaz_log(YLOG_LOG, "Distinct words %9" ZINT_FORMAT0, hi->no_diffs); + yaz_log(YLOG_LOG, "Updates %9" ZINT_FORMAT0, hi->no_updates); + yaz_log(YLOG_LOG, "Deletions %9" ZINT_FORMAT0, hi->no_deletions); + yaz_log(YLOG_LOG, "Insertions %9" ZINT_FORMAT0, hi->no_insertions); + } + key_block_destroy(&zh->reg->key_block); + key_heap_destroy(hi, nkeys); } - - - /* - * $Log: kinput.c,v $ - * 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 that limits the log to the first - * 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 + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab */