X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fkinput.c;h=d356783a4cfcb3f710e3011c2ec0abd6f03d5bfd;hb=edf09fc5529eae3e8214a432058b4c07b2b8d2f9;hp=71f53722bc12925cfdb0a8e8e1eec0d8b6bc2ed1;hpb=ce68ef0c334af90bc25623957c1f8e72d099979b;p=idzebra-moved-to-github.git diff --git a/index/kinput.c b/index/kinput.c index 71f5372..d356783 100644 --- a/index/kinput.c +++ b/index/kinput.c @@ -1,10 +1,62 @@ /* - * Copyright (C) 1994-1995, Index Data I/S + * Copyright (C) 1994-1996, Index Data I/S * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: kinput.c,v $ - * Revision 1.8 1995-10-04 16:57:19 adam + * 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 @@ -37,135 +89,21 @@ #include #include #include -#include #include #include "index.h" #define KEY_SIZE (1+sizeof(struct it_key)) -#define INP_NAME_MAX 8192 +#define INP_NAME_MAX 768 #define INP_BUF_START 60000 #define INP_BUF_ADD 400000 static int no_diffs = 0; static int no_updates = 0; +static int no_deletions = 0; static int no_insertions = 0; static int no_iterations = 0; -static int read_one (FILE *inf, char *name, char *key) -{ - int c; - int i = 0; - do - { - if ((c=getc(inf)) == EOF) - return 0; - name[i++] = c; - } while (c); - for (i = 0; i= key_buf_size) - { - char *new_key_buf; - new_key_buf = 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*KEY_SIZE == key_buf_ptr); - if ((info = dict_lookup (dict, cur_name))) - { - ISAM_P isam_p, isam_p2; - logf (LOG_DEBUG, "updating %s", cur_name); - no_updates++; - memcpy (&isam_p, info+1, sizeof(ISAM_P)); - isam_p2 = is_merge (isam, isam_p, nmemb, key_buf); - if (isam_p2 != isam_p) - dict_insert (dict, cur_name, sizeof(ISAM_P), &isam_p2); - } - else - { - ISAM_P isam_p; - logf (LOG_DEBUG, "inserting %s", cur_name); - no_insertions++; - isam_p = is_merge (isam, 0, nmemb, key_buf); - dict_insert (dict, cur_name, sizeof(ISAM_P), &isam_p); - } - memcpy (key_buf, next_key, KEY_SIZE); - strcpy (cur_name, next_name); - } - fclose (inf); - return 0; -} - -void key_input (const char *dict_fname, const char *isam_fname, - const char *key_fname, int cache) -{ - Dict dict; - ISAM isam; - - dict = dict_open (dict_fname, cache, 1); - if (!dict) - { - logf (LOG_FATAL, "dict_open fail of `%s'", dict_fname); - exit (1); - } - isam = is_open (isam_fname, key_compare, 1, sizeof(struct it_key)); - if (!isam) - { - logf (LOG_FATAL, "is_open fail of `%s'", isam_fname); - exit (1); - } - inp (dict, isam, key_fname); - dict_close (dict); - is_close (isam); - 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, "Insertions . . .%7d", no_insertions); -} - - struct key_file { int no; /* file no */ off_t offset; /* file offset */ @@ -174,20 +112,41 @@ 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 */ + off_t length; /* length of file */ + /* handler invoked in each read */ + void (*readHandler)(struct key_file *keyp, void *rinfo); + void *readInfo; }; +void getFnameTmp (char *fname, int no) +{ + const char *pre; + + pre = res_get_def (common_resource, "keyTmpDir", "."); + sprintf (fname, "%s/key%d.tmp", pre, no); +} + void key_file_chunk_read (struct key_file *f) { int nr = 0, r, fd; - char fname[256]; - sprintf (fname, TEMP_FNAME, f->no); + char fname[1024]; + getFnameTmp (fname, f->no); fd = open (fname, O_RDONLY); if (fd == -1) { logf (LOG_FATAL|LOG_ERRNO, "cannot open %s", fname); exit (1); } - logf (LOG_LOG, "reading chunk from %s", fname); + 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); + } + } if (lseek (fd, f->offset, SEEK_SET) == -1) { logf (LOG_FATAL|LOG_ERRNO, "cannot seek %s", fname); @@ -207,6 +166,8 @@ void key_file_chunk_read (struct key_file *f) } f->buf_size = nr; f->buf_ptr = 0; + if (f->readHandler) + (*f->readHandler)(f, f->readInfo); close (fd); } @@ -215,11 +176,15 @@ struct key_file *key_file_init (int no, int chunk) struct key_file *f; f = xmalloc (sizeof(*f)); + f->sysno = 0; + f->seqno = 0; f->no = no; f->chunk = chunk; f->offset = 0; + f->length = 0; + f->readHandler = NULL; f->buf = xmalloc (f->chunk); - f->prev_name = xmalloc (256); + f->prev_name = xmalloc (INP_NAME_MAX); *f->prev_name = '\0'; key_file_chunk_read (f); return f; @@ -239,9 +204,36 @@ 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, j, c; + int i, d, c; + struct it_key itkey; c = key_file_getc (f); if (c == 0) @@ -258,10 +250,22 @@ 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; + } + d = key_file_decode (f); + key[i++] = d & 1; + d = d >> 1; + itkey.sysno = d + f->sysno; + if (d) + { + f->sysno = itkey.sysno; + f->seqno = 0; } - for (j = KEY_SIZE; --j >= 0; ) - key[i++] = key_file_getc (f); - return i; + 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); } struct heap_info { @@ -272,6 +276,9 @@ struct heap_info { int heapnum; int *ptr; int (*cmp)(const void *p1, const void *p2); + Dict dict; + ISAM isam; + ISAMC isamc; }; struct heap_info *key_heap_init (int nkeys, @@ -289,7 +296,7 @@ struct heap_info *key_heap_init (int nkeys, for (i = 0; i<= nkeys; i++) { hi->ptr[i] = i; - hi->info.buf[i] = xmalloc (512); + hi->info.buf[i] = xmalloc (INP_NAME_MAX); } return hi; } @@ -310,12 +317,8 @@ static void key_heap_delete (struct heap_info *hi) assert (hi->heapnum > 0); -#if 1 key_heap_swap (hi, 1, hi->heapnum); hi->heapnum--; -#else - hi->ptr[1] = hi->ptr[hi->heapnum--]; -#endif while (child <= hi->heapnum) { if (child < hi->heapnum && (*hi->cmp)(&hi->info.buf[hi->ptr[child]], @@ -355,7 +358,7 @@ static void key_heap_insert (struct heap_info *hi, const char *buf, int nbytes, static int heap_read_one (struct heap_info *hi, char *name, char *key) { int n, r; - char rbuf[512]; + char rbuf[INP_NAME_MAX]; struct key_file *kf; if (!hi->heapnum) @@ -372,11 +375,98 @@ static int heap_read_one (struct heap_info *hi, char *name, char *key) return 1; } -int heap_inp (Dict dict, ISAM isam, struct heap_info *hi) +struct heap_cread_info { + char prev_name[INP_NAME_MAX]; + char cur_name[INP_NAME_MAX]; + char *key; + struct heap_info *hi; + int mode; + int more; +}; + +int heap_cread_item (void *vp, char **dst, int *insertMode) +{ + struct heap_cread_info *p = vp; + struct heap_info *hi = p->hi; + + if (p->mode == 1) + { + *insertMode = p->key[0]; + memcpy (*dst, p->key+1, sizeof(struct it_key)); + (*dst) += sizeof(struct it_key); + p->mode = 2; + return 1; + } + 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)) + { + p->mode = 1; + return 0; + } + *insertMode = p->key[0]; + memcpy (*dst, p->key+1, sizeof(struct it_key)); + (*dst) += sizeof(struct it_key); + return 1; +} + +int heap_inpc (struct heap_info *hi) +{ + struct heap_cread_info hci; + ISAMC_I isamc_i = xmalloc (sizeof(*isamc_i)); + + hci.key = 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) + { + char this_name[INP_NAME_MAX]; + ISAMC_P isamc_p, isamc_p2; + char *dict_info; + + strcpy (this_name, hci.cur_name); + logf (LOG_DEBUG, "inserting %s", 1+hci.cur_name); + no_diffs++; + if ((dict_info = dict_lookup (hi->dict, hci.cur_name))) + { + memcpy (&isamc_p, dict_info+1, sizeof(ISAMC_P)); + isamc_p2 = isc_merge (hi->isamc, isamc_p, isamc_i); + if (!isamc_p2) + { + no_deletions++; + if (!dict_delete (hi->dict, this_name)) + abort(); + } + else + { + no_updates++; + if (isamc_p2 != isamc_p) + dict_insert (hi->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); + } + } + xfree (isamc_i); + return 0; +} + +int heap_inp (struct heap_info *hi) { char *info; - char next_name[INP_NAME_MAX+1]; - char cur_name[INP_NAME_MAX+1]; + 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; @@ -384,7 +474,7 @@ int heap_inp (Dict dict, ISAM isam, struct heap_info *hi) int more; next_key = xmalloc (KEY_SIZE); - key_buf = xmalloc (key_buf_size * (KEY_SIZE)); + key_buf = xmalloc (key_buf_size); more = heap_read_one (hi, cur_name, key_buf); while (more) /* EOF ? */ { @@ -411,23 +501,32 @@ int heap_inp (Dict dict, ISAM isam, struct heap_info *hi) no_diffs++; nmemb = key_buf_ptr / KEY_SIZE; assert (nmemb*KEY_SIZE == key_buf_ptr); - if ((info = dict_lookup (dict, cur_name))) + if ((info = dict_lookup (hi->dict, cur_name))) { ISAM_P isam_p, isam_p2; - logf (LOG_DEBUG, "updating %s", cur_name); - no_updates++; + logf (LOG_DEBUG, "updating %s", 1+cur_name); memcpy (&isam_p, info+1, sizeof(ISAM_P)); - isam_p2 = is_merge (isam, isam_p, nmemb, key_buf); - if (isam_p2 != isam_p) - dict_insert (dict, cur_name, sizeof(ISAM_P), &isam_p2); + 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; - logf (LOG_DEBUG, "inserting %s", cur_name); + logf (LOG_DEBUG, "inserting %s", 1+cur_name); no_insertions++; - isam_p = is_merge (isam, 0, nmemb, key_buf); - dict_insert (dict, cur_name, sizeof(ISAM_P), &isam_p); + 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); @@ -435,45 +534,127 @@ int heap_inp (Dict dict, ISAM isam, struct heap_info *hi) return 0; } -void key_input2 (const char *dict_fname, const char *isam_fname, - int nkeys, int cache) +struct progressInfo { + time_t startTime; + time_t lastTime; + off_t totalBytes; + off_t totalOffset; +}; + +void progressFunc (struct key_file *keyp, void *info) +{ + struct progressInfo *p = info; + time_t now, remaining; + + if (keyp->buf_size <= 0 || p->totalBytes <= 0) + return ; + time (&now); + + if (now >= p->lastTime+10) + { + p->lastTime = now; + remaining = (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); + else + logf (LOG_LOG, "Merge %2.1f%% completed; %ld minutes remaining", + (100.0*p->totalOffset) / p->totalBytes, (long) remaining/60); + } + p->totalOffset += keyp->buf_size; +} + +void key_input (int nkeys, int cache) + { Dict dict; - ISAM isam; + ISAM isam = NULL; + ISAMC isamc = NULL; struct key_file **kf; char rbuf[1024]; int i, r; struct heap_info *hi; + struct progressInfo progressInfo; - dict = dict_open (dict_fname, cache, 1); + if (nkeys < 0) + { + char fname[1024]; + nkeys = 0; + while (1) + { + getFnameTmp (fname, nkeys+1); + if (access (fname, R_OK) == -1) + break; + nkeys++; + } + if (!nkeys) + return ; + } + dict = dict_open (FNAME_DICT, cache, 1); if (!dict) { - logf (LOG_FATAL, "dict_open fail of `%s'", dict_fname); + logf (LOG_FATAL, "dict_open fail"); exit (1); } - isam = is_open (isam_fname, key_compare, 1, sizeof(struct it_key)); - if (!isam) + if (res_get_match (common_resource, "isam", "c", NULL)) { - logf (LOG_FATAL, "is_open fail of `%s'", isam_fname); - exit (1); + isamc = isc_open (FNAME_ISAMC, 1, key_isamc_m ()); + if (!isamc) + { + logf (LOG_FATAL, "isc_open fail"); + exit (1); + } + } + else + { + isam = is_open (FNAME_ISAM, key_compare, 1, sizeof(struct it_key)); + if (!isam) + { + logf (LOG_FATAL, "is_open fail"); + exit (1); + } } - kf = 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]->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; + for (i = 1; i<=nkeys; i++) if ((r = key_file_read (kf[i], rbuf))) key_heap_insert (hi, rbuf, r, kf[i]); - heap_inp (dict, isam, hi); - + if (isamc) + heap_inpc (hi); + else + heap_inp (hi); dict_close (dict); - is_close (isam); - + if (isam) + is_close (isam); + if (isamc) + isc_close (isamc); + + for (i = 1; i<=nkeys; i++) + { + getFnameTmp (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); }