X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fkinput.c;h=a5905873d594810f765568082a122efdbb51e27e;hb=dbd6f3a01791401472b07250bf35dcbc3ead4f92;hp=d4518c34f233eb4b5f79c51eba0dc7877a02adb5;hpb=6c2c89df968733e5c7dcae9ddc99b380672f3eb6;p=idzebra-moved-to-github.git diff --git a/index/kinput.c b/index/kinput.c index d4518c3..a590587 100644 --- a/index/kinput.c +++ b/index/kinput.c @@ -1,15 +1,26 @@ -/* - * 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.56 2003-06-23 15:35:25 adam Exp $ + Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002 + 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 Zebra; see the file LICENSE.zebra. If not, write to the +Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. +*/ + + #include #ifdef WIN32 @@ -29,11 +40,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 */ @@ -49,13 +55,22 @@ struct key_file { /* handler invoked in each read */ void (*readHandler)(struct key_file *keyp, void *rinfo); void *readInfo; + Res res; }; -void getFnameTmp (char *fname, int no) +void getFnameTmp (Res res, char *fname, int no) { const char *pre; - pre = res_get_def (common_resource, "keyTmpDir", "."); + 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 (zh->res, "keyTmpDir", "."); sprintf (fname, "%s/key%d.tmp", pre, no); } @@ -63,25 +78,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); + logf (LOG_WARN|LOG_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); + logf (LOG_WARN|LOG_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); + logf (LOG_WARN|LOG_ERRNO, "cannot seek %s", fname); + close(fd); + return ; } while (f->chunk - nr > 0) { @@ -92,21 +112,29 @@ void key_file_chunk_read (struct key_file *f) } if (r == -1) { - logf (LOG_FATAL|LOG_ERRNO, "read of %s", fname); - exit (1); + logf (LOG_WARN|LOG_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) +{ + 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->res = res; f->sysno = 0; f->seqno = 0; f->no = no; @@ -207,12 +235,13 @@ 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; + + int no_diffs; + int no_updates; + int no_deletions; + int no_insertions; + int no_iterations; }; struct heap_info *key_heap_init (int nkeys, @@ -233,9 +262,28 @@ struct heap_info *key_heap_init (int nkeys, hi->ptr[i] = i; 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) +{ + int i; + yaz_log (LOG_DEBUG, "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); +} + static void key_heap_swap (struct heap_info *hi, int i1, int i2) { int swap; @@ -306,30 +354,123 @@ 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 0 + +#if PR_KEY +static void pkey(const char *b, int mode) +{ + struct it_key *key = (struct it_key *) b; + printf ("%c %d:%d\n", mode + 48, key->sysno, key->seqno); +} +#endif + 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; }; + +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->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 (p->sz_1 == p->sz_2 && memcmp(p->key_1, p->key_2, p->sz_1) == 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; + else + *insertMode = 0; + memcpy (*dst, p->key_1, p->sz_1); +#if PR_KEY + printf ("top: "); + pkey(*dst, *insertMode); fflush(stdout); +#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 + printf ("sub1: "); + 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,11 +478,15 @@ 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 + printf ("sub2: "); + pkey(*dst, *insertMode); +#endif (*dst) += sizeof(struct it_key); return 1; } @@ -349,15 +494,18 @@ int heap_cread_item (void *vp, char **dst, int *insertMode) int heap_inpc (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.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.more = heap_read_one (hi, hci.cur_name, hci.key); isamc_i->clientData = &hci; - isamc_i->read_item = heap_cread_item; + isamc_i->read_item = heap_cread_item2; while (hci.more) { @@ -367,119 +515,120 @@ int heap_inpc (struct heap_info *hi) strcpy (this_name, hci.cur_name); assert (hci.cur_name[1]); - no_diffs++; - if ((dict_info = dict_lookup (hi->dict, hci.cur_name))) + 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); + isamc_p2 = isc_merge (hi->reg->isamc, isamc_p, 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, + dict_insert (hi->reg->dict, this_name, sizeof(ISAMC_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 = isc_merge (hi->reg->isamc, 0, isamc_i); + hi->no_insertions++; + dict_insert (hi->reg->dict, this_name, sizeof(ISAMC_P), &isamc_p); } } xfree (isamc_i); + xfree (hci.key); + xfree (hci.key_1); + xfree (hci.key_2); return 0; } -int heap_inps (struct heap_info *hi) +#if 0 +/* for debugging only */ +static void print_dict_item (ZebraMaps zm, const char *s) { - 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); + int reg_type = s[1]; + char keybuf[IT_MAX_WORD+1]; + char *to = keybuf; + const char *from = s + 2; - isams_i->clientData = &hci; - isams_i->read_item = heap_cread_item; - - while (hci.more) + while (*from) { - char this_name[INP_NAME_MAX]; - ISAMS_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))) - { - isams_p = isams_merge (hi->isams, isams_i); - no_insertions++; - dict_insert (hi->dict, this_name, sizeof(ISAMS_P), &isams_p); - } - else - abort(); + const char *res = zebra_maps_output (zm, reg_type, &from); + if (!res) + *to++ = *from++; + else + while (*res) + *to++ = *res++; } - xfree (isams_i); - return 0; -} + *to = '\0'; + yaz_log (LOG_LOG, "%s", keybuf); +} +#endif -int heap_inph (struct heap_info *hi) +int heap_inpb (struct heap_info *hi) { struct heap_cread_info hci; - ISAMH_I isamh_i = (ISAMH_I) xmalloc (sizeof(*isamh_i)); + ISAMC_I *isamc_i = (ISAMC_I *) xmalloc (sizeof(*isamc_i)); hci.key = (char *) xmalloc (KEY_SIZE); - hci.mode = 1; + 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.more = heap_read_one (hi, hci.cur_name, hci.key); - 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) { char this_name[INP_NAME_MAX]; - ISAMH_P isamh_p, isamh_p2; + ISAMC_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))) + hi->no_diffs++; + +#if 0 + print_dict_item (hi->reg->zebra_maps, 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(ISAMC_P)); + isamc_p2 = isamb_merge (hi->reg->isamb, isamc_p, 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(ISAMC_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 = isamb_merge (hi->reg->isamb, 0, isamc_i); + hi->no_insertions++; + dict_insert (hi->reg->dict, this_name, sizeof(ISAMC_P), &isamc_p); } } - xfree (isamh_i); + xfree (isamc_i); + xfree (hci.key); + xfree (hci.key_1); + xfree (hci.key_2); return 0; } @@ -489,7 +638,10 @@ int heap_inpd (struct heap_info *hi) ISAMD_I isamd_i = (ISAMD_I) xmalloc (sizeof(*isamd_i)); hci.key = (char *) xmalloc (KEY_SIZE); - hci.mode = 1; + 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.more = heap_read_one (hi, hci.cur_name, hci.key); @@ -499,44 +651,68 @@ int heap_inpd (struct heap_info *hi) while (hci.more) { char this_name[INP_NAME_MAX]; - ISAMD_P isamd_p, isamd_p2; 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]); - no_diffs++; - if ((dict_info = dict_lookup (hi->dict, hci.cur_name))) + hi->no_diffs++; + if ((dict_info = dict_lookup (hi->reg->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) + 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) { - no_deletions++; - if (!dict_delete (hi->dict, this_name)) - abort(); + 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 + else { - no_updates++; - if (isamd_p2 != isamd_p) - dict_insert (hi->dict, this_name, - sizeof(ISAMD_P), &isamd_p2); + hi->no_deletions++; + if (!dict_delete (hi->reg->dict, this_name)) + { + logf (LOG_FATAL, "dict_delete failed"); + abort(); + } } } else { - isamd_p = isamd_append (hi->isamd, 0, isamd_i); - no_insertions++; - dict_insert (hi->dict, this_name, sizeof(ISAMD_P), &isamd_p); + dictlen=0; + memset (dictentry, '\0', ISAMD_MAX_DICT_LEN); + dictlen= isamd_append(hi->reg->isamd, dictentry, dictlen, isamd_i); + /* logf dictentry first */ + hi->no_insertions++; + if (dictlen) + dict_insert(hi->reg->dict, this_name, + dictlen,dictentry); } } xfree (isamd_i); + xfree (hci.key); + xfree (hci.key_1); + xfree (hci.key_2); return 0; } - - - int heap_inp (struct heap_info *hi) { char *info; @@ -573,33 +749,34 @@ int heap_inp (struct heap_info *hi) key_buf = new_key_buf; } } - no_diffs++; + hi->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 ((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->isam, isam_p, nmemb, key_buf); + isam_p2 = is_merge (hi->reg->isam, isam_p, nmemb, key_buf); if (!isam_p2) { - no_deletions++; - if (!dict_delete (hi->dict, cur_name)) + hi->no_deletions++; + if (!dict_delete (hi->reg->dict, cur_name)) abort (); } else { - no_updates++; + hi->no_updates++; if (isam_p2 != isam_p) - dict_insert (hi->dict, cur_name, sizeof(ISAM_P), &isam_p2); + dict_insert (hi->reg->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); + 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); @@ -607,6 +784,47 @@ int heap_inp (struct heap_info *hi) 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.key_1 = (char *) xmalloc (KEY_SIZE); + hci.key_2 = (char *) xmalloc (KEY_SIZE); + hci.first_in_list = 1; + hci.ret = -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) + { + char this_name[INP_NAME_MAX]; + ISAMS_P isams_p; + char *dict_info; + + strcpy (this_name, hci.cur_name); + assert (hci.cur_name[1]); + hi->no_diffs++; + if (!(dict_info = dict_lookup (hi->reg->dict, hci.cur_name))) + { + isams_p = isams_merge (hi->reg->isams, isams_i); + hi->no_insertions++; + dict_insert (hi->reg->dict, this_name, sizeof(ISAMS_P), &isams_p); + } + else + { + logf (LOG_FATAL, "isams doesn't support this kind of update"); + break; + } + } + xfree (isams_i); + return 0; +} + struct progressInfo { time_t startTime; time_t lastTime; @@ -642,28 +860,22 @@ 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; char rbuf[1024]; int i, r; struct heap_info *hi; struct progressInfo progressInfo; - + int nkeys = zh->reg->key_file_no; + 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 +883,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 +890,45 @@ 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->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) + if (zh->reg->isams) heap_inps (hi); - else if (isam) + if (zh->reg->isamc) + heap_inpc (hi); + if (zh->reg->isam) heap_inp (hi); - else if (isamh) - heap_inph (hi); - else if (isamd) + if (zh->reg->isamd) heap_inpd (hi); + if (zh->reg->isamb) + heap_inpb (hi); - 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 */ + 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); } - -/* - * $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. - * - */ -