* Sebastian Hammer, Adam Dickmeiss
*
* $Log: kinput.c,v $
- * Revision 1.3 1995-09-06 16:11:17 adam
+ * 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
*
*/
+#include <fcntl.h>
+#include <unistd.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
{
int c;
int i = 0;
- name[0] = 0;
do
{
if ((c=getc(inf)) == EOF)
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));
logf (LOG_FATAL|LOG_ERRNO, "cannot open `%s'", name);
exit (1);
}
- read_one (inf, cur_name, key_buf);
- while (cur_name[0]) /* EOF ? */
+ more = read_one (inf, cur_name, key_buf);
+ while (more) /* EOF ? */
{
int nmemb;
key_buf_ptr = KEY_SIZE;
while (1)
{
- if (!read_one (inf, next_name, next_key))
+ if (!(more = read_one (inf, next_name, next_key)))
break;
- if (strcmp (next_name, cur_name))
+ if (*next_name && strcmp (next_name, cur_name))
break;
memcpy (key_buf + key_buf_ptr, next_key, KEY_SIZE);
key_buf_ptr += KEY_SIZE;
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 */
+ 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 */
+};
+
+void key_file_chunk_read (struct key_file *f)
+{
+ int nr = 0, r, fd;
+ 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);
+ }
+ if (lseek (fd, f->offset, SEEK_SET) == -1)
+ {
+ logf (LOG_FATAL|LOG_ERRNO, "cannot seek %s", fname);
+ exit (1);
+ }
+ while (f->chunk - nr > 0)
+ {
+ r = read (fd, f->buf + nr, f->chunk - nr);
+ if (r <= 0)
+ break;
+ nr += r;
+ }
+ if (r == -1)
+ {
+ logf (LOG_FATAL|LOG_ERRNO, "read of %s", fname);
+ exit (1);
+ }
+ f->buf_size = nr;
+}
+
+void key_file_init (struct key_file *f)
+{
+ f->buf = xmalloc (f->chunk);
+ f->prev_name = xmalloc (256);
+ *f->prev_name = '\0';
+}
+
+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 key_file_read (struct key_file *f, char *name, char *key)
+{
+ int i, c;
+
+ c = key_file_getc (f);
+ if (c == 0)
+ strcpy (name, f->prev_name);
+ else if (c == EOF)
+ return 0;
+ else
+ {
+ i = 0;
+ name[i++] = c;
+ while ((name[i++] = key_file_getc (f)))
+ ;
+ strcpy (f->prev_name, name);
+ }
+ for (i = 0; i<KEY_SIZE; i++)
+ key[i++] = key_file_getc (f);
+ return 1;
+}
+
+int inp2 (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_input2 (const char *dict_fname, const char *isam_fname,
+ int nkeys, 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);
+ }
+ inp2 (dict, isam, NULL);
+ 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);
+}
+
+