X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=index%2Fkinput.c;h=b1fb8dd27f07fe7466fb7dd4a89b7902ca8bc710;hp=781ec9a80112479667999ba08d0e5690fb1e1c76;hb=81a75ae20b5b250309a70de51bfdf8de0019f882;hpb=247f1ebfc107315f1c0b2b59bb59fe4774f3b0d4 diff --git a/index/kinput.c b/index/kinput.c index 781ec9a..b1fb8dd 100644 --- a/index/kinput.c +++ b/index/kinput.c @@ -1,107 +1,18 @@ /* - * Copyright (C) 1994-1998, Index Data I/S + * Copyright (C) 1994-2002, Index Data * All rights reserved. - * Sebastian Hammer, Adam Dickmeiss + * Sebastian Hammer, Adam Dickmeiss, Heikki Levanto * - * $Log: kinput.c,v $ - * 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. + * $Id: kinput.c,v 1.48 2002-04-05 08:46:26 adam Exp $ * + * Bugs + * - Allocates a lot of memory for the merge process, but never releases it. + * Doesn't matter, as the program terminates soon after. + */ - + #include -#ifdef WINDOWS +#ifdef WIN32 #include #else #include @@ -138,39 +49,53 @@ 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 (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); } void key_file_chunk_read (struct key_file *f) { - int nr = 0, r, fd; + 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) { @@ -181,21 +106,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 = xmalloc (sizeof(*f)); + f = (struct key_file *) xmalloc (sizeof(*f)); + f->res = res; f->sysno = 0; f->seqno = 0; f->no = no; @@ -203,8 +136,8 @@ struct key_file *key_file_init (int no, int chunk) f->offset = 0; f->length = 0; f->readHandler = NULL; - f->buf = xmalloc (f->chunk); - f->prev_name = 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); return f; @@ -297,8 +230,10 @@ struct heap_info { int *ptr; int (*cmp)(const void *p1, const void *p2); Dict dict; + ISAMS isams; ISAM isam; ISAMC isamc; + ISAMD isamd; }; struct heap_info *key_heap_init (int nkeys, @@ -307,20 +242,34 @@ struct heap_info *key_heap_init (int nkeys, struct heap_info *hi; int i; - hi = xmalloc (sizeof(*hi)); - hi->info.file = xmalloc (sizeof(*hi->info.file) * (1+nkeys)); - hi->info.buf = xmalloc (sizeof(*hi->info.buf) * (1+nkeys)); + hi = (struct heap_info *) xmalloc (sizeof(*hi)); + 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 = xmalloc (sizeof(*hi->ptr) * (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] = xmalloc (INP_NAME_MAX); + hi->info.buf[i] = (char *) xmalloc (INP_NAME_MAX); } return hi; } +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); +} + static void key_heap_swap (struct heap_info *hi, int i1, int i2) { int swap; @@ -406,7 +355,7 @@ struct heap_cread_info { int heap_cread_item (void *vp, char **dst, int *insertMode) { - struct heap_cread_info *p = vp; + struct heap_cread_info *p = (struct heap_cread_info *) vp; struct heap_info *hi = p->hi; if (p->mode == 1) @@ -434,9 +383,9 @@ 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 = xmalloc (sizeof(*isamc_i)); + ISAMC_I isamc_i = (ISAMC_I) xmalloc (sizeof(*isamc_i)); - hci.key = xmalloc (KEY_SIZE); + hci.key = (char *) xmalloc (KEY_SIZE); hci.mode = 1; hci.hi = hi; hci.more = heap_read_one (hi, hci.cur_name, hci.key); @@ -451,7 +400,6 @@ int heap_inpc (struct heap_info *hi) char *dict_info; strcpy (this_name, hci.cur_name); - logf (LOG_DEBUG, "inserting %s", 1+hci.cur_name); assert (hci.cur_name[1]); no_diffs++; if ((dict_info = dict_lookup (hi->dict, hci.cur_name))) @@ -480,6 +428,58 @@ int heap_inpc (struct heap_info *hi) } } 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]; + ISAMD_P isamd_p, isamd_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; } @@ -494,8 +494,8 @@ int heap_inp (struct heap_info *hi) char *key_buf; int more; - next_key = xmalloc (KEY_SIZE); - key_buf = xmalloc (key_buf_size); + 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 ? */ { @@ -509,10 +509,10 @@ int heap_inp (struct heap_info *hi) break; memcpy (key_buf + key_buf_ptr, next_key, KEY_SIZE); key_buf_ptr += KEY_SIZE; - if (key_buf_ptr+KEY_SIZE >= key_buf_size) + if (key_buf_ptr+(int) KEY_SIZE >= key_buf_size) { char *new_key_buf; - new_key_buf = xmalloc (key_buf_size + INP_BUF_ADD); + 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); @@ -521,11 +521,10 @@ int heap_inp (struct heap_info *hi) } no_diffs++; nmemb = key_buf_ptr / KEY_SIZE; - assert (nmemb*KEY_SIZE == key_buf_ptr); + assert (nmemb * (int) KEY_SIZE == key_buf_ptr); if ((info = dict_lookup (hi->dict, cur_name))) { ISAM_P isam_p, isam_p2; - logf (LOG_DEBUG, "updating %s", 1+cur_name); memcpy (&isam_p, info+1, sizeof(ISAM_P)); isam_p2 = is_merge (hi->isam, isam_p, nmemb, key_buf); if (!isam_p2) @@ -544,7 +543,6 @@ int heap_inp (struct heap_info *hi) else { ISAM_P isam_p; - logf (LOG_DEBUG, "inserting %s", 1+cur_name); no_insertions++; isam_p = is_merge (hi->isam, 0, nmemb, key_buf); dict_insert (hi->dict, cur_name, sizeof(ISAM_P), &isam_p); @@ -555,6 +553,44 @@ 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.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) + { + 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 + { + 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; @@ -564,7 +600,7 @@ struct progressInfo { void progressFunc (struct key_file *keyp, void *info) { - struct progressInfo *p = info; + struct progressInfo *p = (struct progressInfo *) info; time_t now, remaining; if (keyp->buf_size <= 0 || p->totalBytes <= 0) @@ -574,8 +610,8 @@ void progressFunc (struct key_file *keyp, void *info) if (now >= p->lastTime+10) { p->lastTime = now; - remaining = (now - p->startTime)* - ((double) p->totalBytes/p->totalOffset - 1.0); + 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", (100.0*p->totalOffset) / p->totalBytes, (long) remaining); @@ -590,25 +626,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; 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++; @@ -616,66 +649,41 @@ void key_input (BFiles bfs, int nkeys, int cache) if (!nkeys) return ; } - dict = dict_open (bfs, FNAME_DICT, cache, 1); - if (!dict) - { - logf (LOG_FATAL, "dict_open fail"); - exit (1); - } - if (!res_get_match (common_resource, "isam", "i", NULL)) - { - isamc = isc_open (bfs, - FNAME_ISAMC, 1, key_isamc_m (common_resource)); - if (!isamc) - { - logf (LOG_FATAL, "isc_open fail"); - exit (1); - } - } - else - { - 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); - } - } - kf = 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); 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->dict = zh->reg->dict; + hi->isams = zh->reg->isams; + hi->isam = zh->reg->isam; + hi->isamc = zh->reg->isamc; + hi->isamd = zh->reg->isamd; + for (i = 1; i<=nkeys; i++) if ((r = key_file_read (kf[i], rbuf))) key_heap_insert (hi, rbuf, r, kf[i]); - if (isamc) + if (zh->reg->isams) + heap_inps (hi); + else if (zh->reg->isamc) heap_inpc (hi); - else - heap_inp (hi); - dict_close (dict); - if (isam) - is_close (isam); - if (isamc) - isc_close (isamc); - + else if (zh->reg->isam) + heap_inp (hi); + else if (zh->reg->isamd) + heap_inpd (hi); + 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); @@ -683,6 +691,12 @@ void key_input (BFiles bfs, int nkeys, int cache) logf (LOG_LOG, "Updates. . . . .%7d", no_updates); logf (LOG_LOG, "Deletions. . . .%7d", no_deletions); logf (LOG_LOG, "Insertions . . .%7d", 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); }