* Sebastian Hammer, Adam Dickmeiss
*
* $Log: kinput.c,v $
- * Revision 1.6 1995-09-29 15:51:56 adam
+ * 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
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_SIZE; i++)
- ((char *)key)[i] = getc (inf);
- ++no_iterations;
- return 1;
-}
-
-static int inp (Dict dict, ISAM isam, const char *name)
-{
- FILE *inf;
- char *info;
- char next_name[INP_NAME_MAX+1];
- char cur_name[INP_NAME_MAX+1];
- int key_buf_size = INP_BUF_START;
- int key_buf_ptr;
- char *next_key;
- char *key_buf;
- int more;
-
- next_key = xmalloc (KEY_SIZE);
- key_buf = xmalloc (key_buf_size * (KEY_SIZE));
- if (!(inf = fopen (name, "r")))
- {
- logf (LOG_FATAL|LOG_ERRNO, "cannot open `%s'", name);
- exit (1);
- }
- more = read_one (inf, cur_name, key_buf);
- while (more) /* EOF ? */
- {
- int nmemb;
- key_buf_ptr = KEY_SIZE;
- while (1)
- {
- if (!(more = read_one (inf, 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+KEY_SIZE >= 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;
- off_t offset;
- char *buf;
- size_t buf_size;
- size_t chunk;
- size_t buf_ptr;
+ int no; /* file no */
+ off_t offset; /* file offset */
+ unsigned char *buf; /* buffer block */
+ size_t buf_size; /* number of read bytes in block */
+ 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 key_file_chunk_read (struct key_file *f)
{
int nr = 0, r, fd;
- char fname[256];
+ char fname[256];
sprintf (fname, TEMP_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 (lseek (fd, f->offset, SEEK_SET) == -1)
{
- logf (LOG_FATAL|LOG_ERRNO, "lseek to %ld in file %s",
- (long) f->offset, fname);
+ logf (LOG_FATAL|LOG_ERRNO, "cannot seek %s", fname);
exit (1);
}
- f->buf = xmalloc (f->chunk);
while (f->chunk - nr > 0)
{
r = read (fd, f->buf + nr, f->chunk - nr);
exit (1);
}
f->buf_size = nr;
+ f->buf_ptr = 0;
+ close (fd);
}
-void key_file_chunk_discard (struct key_file *f)
+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->buf = xmalloc (f->chunk);
+ f->prev_name = xmalloc (256);
+ *f->prev_name = '\0';
+ key_file_chunk_read (f);
+ return 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);
+ if (f->buf_ptr < f->buf_size)
+ return f->buf[(f->buf_ptr)++];
+ else
+ return EOF;
}
-int inp2 (Dict dict, ISAM isam, const char *name)
+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;
+
+ c = key_file_getc (f);
+ if (c == 0)
+ {
+ strcpy (key, f->prev_name);
+ i = 1+strlen (key);
+ }
+ else if (c == EOF)
+ return 0;
+ else
+ {
+ i = 0;
+ key[i++] = c;
+ 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;
+ }
+ 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 {
+ struct {
+ struct key_file **file;
+ char **buf;
+ } info;
+ int heapnum;
+ int *ptr;
+ int (*cmp)(const void *p1, const void *p2);
+};
+
+struct heap_info *key_heap_init (int nkeys,
+ int (*cmp)(const void *p1, const void *p2))
+{
+ 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->heapnum = 0;
+ hi->ptr = xmalloc (sizeof(*hi->ptr) * (1+nkeys));
+ hi->cmp = cmp;
+ for (i = 0; i<= nkeys; i++)
+ {
+ hi->ptr[i] = i;
+ hi->info.buf[i] = xmalloc (512);
+ }
+ return hi;
+}
+
+static void key_heap_swap (struct heap_info *hi, int i1, int i2)
+{
+ int swap;
+
+ swap = hi->ptr[i1];
+ hi->ptr[i1] = hi->ptr[i2];
+ hi->ptr[i2] = swap;
+}
+
+
+static void key_heap_delete (struct heap_info *hi)
+{
+ int cur = 1, child = 2;
+
+ assert (hi->heapnum > 0);
+
+ key_heap_swap (hi, 1, hi->heapnum);
+ hi->heapnum--;
+ while (child <= hi->heapnum) {
+ if (child < hi->heapnum &&
+ (*hi->cmp)(&hi->info.buf[hi->ptr[child]],
+ &hi->info.buf[hi->ptr[child+1]]) > 0)
+ child++;
+ if ((*hi->cmp)(&hi->info.buf[hi->ptr[cur]],
+ &hi->info.buf[hi->ptr[child]]) > 0)
+ {
+ key_heap_swap (hi, cur, child);
+ cur = child;
+ child = 2*cur;
+ }
+ else
+ break;
+ }
+}
+
+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);
+ 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);
+ cur = parent;
+ parent = cur/2;
+ }
+}
+
+static int heap_read_one (struct heap_info *hi, char *name, char *key)
+{
+ int n, r;
+ char rbuf[512];
+ struct key_file *kf;
+
+ if (!hi->heapnum)
+ return 0;
+ n = hi->ptr[1];
+ 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);
+ no_iterations++;
+ return 1;
+}
+
+int heap_inp (Dict dict, ISAM isam, struct heap_info *hi)
{
- FILE *inf;
char *info;
char next_name[INP_NAME_MAX+1];
char cur_name[INP_NAME_MAX+1];
next_key = xmalloc (KEY_SIZE);
key_buf = xmalloc (key_buf_size * (KEY_SIZE));
- if (!(inf = fopen (name, "r")))
- {
- logf (LOG_FATAL|LOG_ERRNO, "cannot open `%s'", name);
- exit (1);
- }
- more = read_one (inf, cur_name, key_buf);
+ more = heap_read_one (hi, cur_name, key_buf);
while (more) /* EOF ? */
{
int nmemb;
key_buf_ptr = KEY_SIZE;
while (1)
{
- if (!(more = read_one (inf, next_name, next_key)))
+ if (!(more = heap_read_one (hi, next_name, next_key)))
break;
if (*next_name && strcmp (next_name, cur_name))
break;
{
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);
+#if 0
+ if (!isam_p2)
+ {
+ no_deletions++;
+ dict_delete (dict, cur_name);
+ }
+ else
+#endif
+ {
+ no_updates++;
+ if (isam_p2 != isam_p)
+ dict_insert (dict, cur_name, sizeof(ISAM_P), &isam_p2);
+ }
}
else
{
memcpy (key_buf, next_key, KEY_SIZE);
strcpy (cur_name, next_name);
}
- fclose (inf);
return 0;
}
-void key_input2 (const char *dict_fname, const char *isam_fname,
- int nkeys, int cache)
+void key_input (const char *dict_fname, const char *isam_fname,
+ int nkeys, int cache)
+
{
Dict dict;
ISAM isam;
+ struct key_file **kf;
+ char rbuf[1024];
+ int i, r;
+ struct heap_info *hi;
dict = dict_open (dict_fname, cache, 1);
if (!dict)
logf (LOG_FATAL, "is_open fail of `%s'", isam_fname);
exit (1);
}
- inp2 (dict, isam, NULL);
+
+ kf = xmalloc ((1+nkeys) * sizeof(*kf));
+ for (i = 1; i<=nkeys; i++)
+ kf[i] = key_file_init (i, 32768);
+
+ hi = key_heap_init (nkeys, key_qsort_compare);
+ 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);
+
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, "Deletions. . . .%7d", no_deletions);
logf (LOG_LOG, "Insertions . . .%7d", no_insertions);
}