X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fkinput.c;h=b263fc76b7806a19fef60f3bcc0ade1a3dc97c8e;hb=85df66537199c30a492ad54be4fbe25fa77e18c8;hp=54f7b2fbdc163c340fb8dcb998d594a945896041;hpb=2811f2e2fb2101a75e89e8b3e0358635e86ab71d;p=idzebra-moved-to-github.git

diff --git a/index/kinput.c b/index/kinput.c
index 54f7b2f..b263fc7 100644
--- a/index/kinput.c
+++ b/index/kinput.c
@@ -4,7 +4,25 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: kinput.c,v $
- * Revision 1.7  1995-10-02 15:18:52  adam
+ * 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
@@ -46,123 +64,10 @@
 
 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;            /* file no */
     off_t offset;        /* file offset */
@@ -171,6 +76,8 @@ 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 */
 };
 
 void key_file_chunk_read (struct key_file *f)
@@ -184,6 +91,7 @@ void key_file_chunk_read (struct key_file *f)
         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, "cannot seek %s", fname);
@@ -202,13 +110,25 @@ void key_file_chunk_read (struct key_file *f)
         exit (1);
     }
     f->buf_size = nr;
+    f->buf_ptr = 0;
+    close (fd);
 }
 
-void key_file_init (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)
@@ -225,31 +145,176 @@ int key_file_getc (struct key_file *f)
         return EOF;
 }
 
-int key_file_read (struct key_file *f, char *name, char *key)
+int key_file_decode (struct key_file *f)
 {
-    int i, c;
+    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 (name, f->prev_name);
+    {
+        strcpy (key, f->prev_name);
+        i = 1+strlen (key);
+    }
     else if (c == EOF)
         return 0;
     else
     {
         i = 0;
-        name[i++] = c;
-        while ((name[i++] = key_file_getc (f)))
+        key[i++] = c;
+        while ((key[i++] = key_file_getc (f)))
             ;
-        strcpy (f->prev_name, name);
+        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);
     }
-    for (i = 0; i<KEY_SIZE; i++)
-        key[i++] = key_file_getc (f);
+    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 inp2 (Dict dict, ISAM isam, const char *name)
+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];
@@ -261,19 +326,14 @@ int inp2 (Dict dict, ISAM isam, const char *name)
     
     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;
@@ -296,11 +356,20 @@ int inp2 (Dict dict, ISAM isam, const char *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);
+            if (!isam_p2)
+            {
+                no_deletions++;
+                if (!dict_delete (dict, cur_name))
+                    abort ();
+            }
+            else 
+            {
+                no_updates++;
+                if (isam_p2 != isam_p)
+                    dict_insert (dict, cur_name, sizeof(ISAM_P), &isam_p2);
+            }
         }
         else
         {
@@ -313,15 +382,19 @@ int inp2 (Dict dict, ISAM isam, const char *name)
         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)
@@ -335,12 +408,24 @@ void key_input2 (const char *dict_fname, const char *isam_fname,
         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);
 }