X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fkinput.c;h=b9d7305803dedfe3ee886cdb58d1459f8905b419;hb=23b1af194b14847f3ba187e3c5c3015797ad3c4a;hp=e8d154a8a712bb2c5b0dda2260db3782591154be;hpb=764b78fb481cf1084a5a583ffefbe8a0f32af28c;p=idzebra-moved-to-github.git

diff --git a/index/kinput.c b/index/kinput.c
index e8d154a..b9d7305 100644
--- a/index/kinput.c
+++ b/index/kinput.c
@@ -1,15 +1,26 @@
-/*
- * Copyright (C) 1994-2002, Index Data
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss, Heikki Levanto
- *
- * $Id: kinput.c,v 1.49 2002-04-16 22:31:42 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.  
- 
- */
+/* $Id: kinput.c,v 1.57 2004-01-22 15:40:25 heikki Exp $
+   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+   Index Data Aps
+
+This file is part of the Zebra server.
+
+Zebra is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with Zebra; see the file LICENSE.zebra.  If not, write to the
+Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
+*/
+
+
  
 #include <fcntl.h>
 #ifdef WIN32
@@ -225,7 +236,7 @@ struct heap_info {
     int    *ptr;
     int    (*cmp)(const void *p1, const void *p2);
     struct zebra_register *reg;
-
+    ZebraHandle zh; /* only used for raw reading that bypasses the heaps */
     int no_diffs;
     int no_updates;
     int no_deletions;
@@ -233,17 +244,34 @@ struct heap_info {
     int no_iterations;
 };
 
+static struct heap_info *key_heap_malloc()
+{  /* malloc and clear it */
+    struct heap_info *hi;
+    hi = (struct heap_info *) xmalloc (sizeof(*hi));
+    hi->info.file = 0;
+    hi->info.buf = 0;
+    hi->heapnum = 0;
+    hi->ptr = 0;
+    hi->zh=0;
+    hi->no_diffs = 0;
+    hi->no_diffs = 0;
+    hi->no_updates = 0;
+    hi->no_deletions = 0;
+    hi->no_insertions = 0;
+    hi->no_iterations = 0;
+    return hi;
+}
+
 struct heap_info *key_heap_init (int nkeys,
                                  int (*cmp)(const void *p1, const void *p2))
 {
     struct heap_info *hi;
     int i;
 
-    hi = (struct heap_info *) xmalloc (sizeof(*hi));
+    hi = key_heap_malloc();
     hi->info.file = (struct key_file **)
-	xmalloc (sizeof(*hi->info.file) * (1+nkeys));
+        xmalloc (sizeof(*hi->info.file) * (1+nkeys));
     hi->info.buf = (char **) xmalloc (sizeof(*hi->info.buf) * (1+nkeys));
-    hi->heapnum = 0;
     hi->ptr = (int *) xmalloc (sizeof(*hi->ptr) * (1+nkeys));
     hi->cmp = cmp;
     for (i = 0; i<= nkeys; i++)
@@ -251,21 +279,26 @@ struct heap_info *key_heap_init (int nkeys,
         hi->ptr[i] = i;
         hi->info.buf[i] = (char *) xmalloc (INP_NAME_MAX);
     }
-    hi->no_diffs = 0;
-    hi->no_diffs = 0;
-    hi->no_updates = 0;
-    hi->no_deletions = 0;
-    hi->no_insertions = 0;
-    hi->no_iterations = 0;
+    return hi;
+}
+
+struct heap_info *key_heap_init_buff ( ZebraHandle zh,
+                                 int (*cmp)(const void *p1, const void *p2))
+{
+    struct heap_info *hi=key_heap_malloc();
+    hi->cmp=cmp;
+    hi->zh=zh;
     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]);
+    yaz_log (LOG_DEBUG, "key_heap_destroy");
+    yaz_log (LOG_DEBUG, "key_heap_destroy nk=%d",nkeys);
+    if (!hi->zh)
+        for (i = 0; i<=nkeys; i++)
+            xfree (hi->info.buf[i]);
     
     xfree (hi->info.buf);
     xfree (hi->ptr);
@@ -327,12 +360,30 @@ static void key_heap_insert (struct heap_info *hi, const char *buf, int nbytes,
     }
 }
 
+static int heap_read_one_raw (struct heap_info *hi, char *name, char *key)
+{
+    ZebraHandle zh=hi->zh;
+    int ptr_i = zh->reg->ptr_i--;
+    char *cp;
+    if (!ptr_i)
+        return 0;
+    cp=(zh->reg->key_buf)[zh->reg->ptr_top - ptr_i];
+    logf (LOG_DEBUG, " raw: i=%d top=%d cp=%p", ptr_i, zh->reg->ptr_top,cp);
+    strcpy(name, cp);
+    memcpy(key, cp+strlen(name)+1, KEY_SIZE);
+    hi->no_iterations++;
+    return 1;
+}
+
 static int heap_read_one (struct heap_info *hi, char *name, char *key)
 {
     int n, r;
     char rbuf[INP_NAME_MAX];
     struct key_file *kf;
 
+    if (hi->zh) /* bypass the heap stuff, we have a readymade buffer */
+        return heap_read_one_raw(hi, name, key);
+
     if (!hi->heapnum)
         return 0;
     n = hi->ptr[1];
@@ -347,26 +398,119 @@ static int heap_read_one (struct heap_info *hi, char *name, char *key)
     return 1;
 }
 
+#define PR_KEY 0
+
+#if PR_KEY
+static void pkey(const char *b, int mode)
+{
+    struct it_key *key = (struct it_key *) b;
+    printf ("%c %d:%d\n", mode + 48, key->sysno, key->seqno);
+}
+#endif
+
 struct heap_cread_info {
     char prev_name[INP_NAME_MAX];
     char cur_name[INP_NAME_MAX];
     char *key;
+    char *key_1, *key_2;
+    int mode_1, mode_2;
+    int sz_1, sz_2;
     struct heap_info *hi;
-    int mode;
+    int first_in_list;
     int more;
+    int ret;
 };
+
+static int heap_cread_item (void *vp, char **dst, int *insertMode);
+
+int heap_cread_item2 (void *vp, char **dst, int *insertMode)
+{
+    struct heap_cread_info *p = (struct heap_cread_info *) vp;
+    int level = 0;
+
+    if (p->ret == 0)    /* lookahead was 0?. Return that in read next round */
+    {
+        p->ret = -1;
+        return 0;
+    }
+    else if (p->ret == -1) /* Must read new item ? */
+    {
+        char *dst_1 = p->key_1;
+        p->ret = heap_cread_item(vp, &dst_1, &p->mode_1);
+        p->sz_1 = dst_1 - p->key_1;
+    }
+    else
+    {        /* lookahead in 2 . Now in 1. */
+        p->sz_1 = p->sz_2;
+        p->mode_1 = p->mode_2;
+        memcpy (p->key_1, p->key_2, p->sz_2);
+    }
+    if (p->mode_1)
+        level = 1;     /* insert */
+    else
+        level = -1;    /* delete */
+    while(1)
+    {
+        char *dst_2 = p->key_2;
+        p->ret = heap_cread_item(vp, &dst_2, &p->mode_2);
+        if (!p->ret)
+        {
+            if (level)
+                break;
+            p->ret = -1;
+            return 0;
+        }
+        p->sz_2 = dst_2 - p->key_2;
+        if (p->sz_1 == p->sz_2 && memcmp(p->key_1, p->key_2, p->sz_1) == 0)
+        {
+            if (p->mode_2) /* adjust level according to deletes/inserts */
+                level++;
+            else
+                level--;
+        }
+        else
+        {
+            if (level)
+                break;
+            /* all the same. new round .. */
+            p->sz_1 = p->sz_2;
+            p->mode_1 = p->mode_2;
+            memcpy (p->key_1, p->key_2, p->sz_1);
+            if (p->mode_1)
+                level = 1;     /* insert */
+            else
+                level = -1;    /* delete */
+        }
+    }
+    /* outcome is insert (1) or delete (0) depending on final level */
+    if (level > 0)
+        *insertMode = 1;
+    else
+        *insertMode = 0;
+    memcpy (*dst, p->key_1, p->sz_1);
+#if PR_KEY
+    printf ("top: ");
+    pkey(*dst, *insertMode); fflush(stdout);
+#endif
+    (*dst) += p->sz_1;
+    return 1;
+}
       
 int heap_cread_item (void *vp, char **dst, int *insertMode)
 {
     struct heap_cread_info *p = (struct heap_cread_info *) vp;
     struct heap_info *hi = p->hi;
 
-    if (p->mode == 1)
+    if (p->first_in_list)
     {
         *insertMode = p->key[0];
         memcpy (*dst, p->key+1, sizeof(struct it_key));
+#if PR_KEY
+        printf ("sub1: ");
+        pkey(*dst, *insertMode);
+#endif
         (*dst) += sizeof(struct it_key);
-        p->mode = 2;
+        p->first_in_list = 0;
         return 1;
     }
     strcpy (p->prev_name, p->cur_name);
@@ -374,11 +518,15 @@ int heap_cread_item (void *vp, char **dst, int *insertMode)
         return 0;
     if (*p->cur_name && strcmp (p->cur_name, p->prev_name))
     {
-        p->mode = 1;
+        p->first_in_list = 1;
         return 0;
     }
     *insertMode = p->key[0];
     memcpy (*dst, p->key+1, sizeof(struct it_key));
+#if PR_KEY
+    printf ("sub2: ");
+    pkey(*dst, *insertMode);
+#endif
     (*dst) += sizeof(struct it_key);
     return 1;
 }
@@ -386,15 +534,18 @@ 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 = (ISAMC_I) xmalloc (sizeof(*isamc_i));
+    ISAMC_I *isamc_i = (ISAMC_I *) xmalloc (sizeof(*isamc_i));
 
     hci.key = (char *) xmalloc (KEY_SIZE);
-    hci.mode = 1;
+    hci.key_1 = (char *) xmalloc (KEY_SIZE);
+    hci.key_2 = (char *) xmalloc (KEY_SIZE);
+    hci.ret = -1;
+    hci.first_in_list = 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;
+    isamc_i->read_item = heap_cread_item2;
 
     while (hci.more)
     {
@@ -432,21 +583,49 @@ int heap_inpc (struct heap_info *hi)
     }
     xfree (isamc_i);
     xfree (hci.key);
+    xfree (hci.key_1);
+    xfree (hci.key_2);
     return 0;
 } 
 
+#if 0
+/* for debugging only */
+static void print_dict_item (ZebraMaps zm, const char *s)
+{
+    int reg_type = s[1];
+    char keybuf[IT_MAX_WORD+1];
+    char *to = keybuf;
+    const char *from = s + 2;
+
+    while (*from)
+    {
+        const char *res = zebra_maps_output (zm, reg_type, &from);
+        if (!res)
+            *to++ = *from++;
+        else
+            while (*res)
+                *to++ = *res++;
+    }
+    *to = '\0';
+    yaz_log (LOG_LOG, "%s", keybuf);
+}
+#endif
+
 int heap_inpb (struct heap_info *hi)
 {
     struct heap_cread_info hci;
-    ISAMC_I isamc_i = (ISAMC_I) xmalloc (sizeof(*isamc_i));
+    ISAMC_I *isamc_i = (ISAMC_I *) xmalloc (sizeof(*isamc_i));
 
     hci.key = (char *) xmalloc (KEY_SIZE);
-    hci.mode = 1;
+    hci.key_1 = (char *) xmalloc (KEY_SIZE);
+    hci.key_2 = (char *) xmalloc (KEY_SIZE);
+    hci.ret = -1;
+    hci.first_in_list = 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;
+    isamc_i->read_item = heap_cread_item2;
 
     while (hci.more)
     {
@@ -457,6 +636,10 @@ int heap_inpb (struct heap_info *hi)
         strcpy (this_name, hci.cur_name);
 	assert (hci.cur_name[1]);
         hi->no_diffs++;
+
+#if 0
+        print_dict_item (hi->reg->zebra_maps, hci.cur_name);
+#endif
         if ((dict_info = dict_lookup (hi->reg->dict, hci.cur_name)))
         {
             memcpy (&isamc_p, dict_info+1, sizeof(ISAMC_P));
@@ -484,6 +667,8 @@ int heap_inpb (struct heap_info *hi)
     }
     xfree (isamc_i);
     xfree (hci.key);
+    xfree (hci.key_1);
+    xfree (hci.key_2);
     return 0;
 } 
 
@@ -493,7 +678,10 @@ int heap_inpd (struct heap_info *hi)
     ISAMD_I isamd_i = (ISAMD_I) xmalloc (sizeof(*isamd_i));
 
     hci.key = (char *) xmalloc (KEY_SIZE);
-    hci.mode = 1;
+    hci.key_1 = (char *) xmalloc (KEY_SIZE);
+    hci.key_2 = (char *) xmalloc (KEY_SIZE);
+    hci.ret = -1;
+    hci.first_in_list = 1;
     hci.hi = hi;
     hci.more = heap_read_one (hi, hci.cur_name, hci.key);
 
@@ -503,38 +691,65 @@ int heap_inpd (struct heap_info *hi)
     while (hci.more)
     {
         char this_name[INP_NAME_MAX];
-        ISAMD_P isamd_p, isamd_p2;
         char *dict_info;
+        char dictentry[ISAMD_MAX_DICT_LEN+1];
+        char dictlen;
 
         strcpy (this_name, hci.cur_name);
+        
+        /* print_dict_item (hi->reg->zebra_maps, hci.cur_name); */
+        /*!*/ /* FIXME: depend on isamd-debug */
+
 	assert (hci.cur_name[1]);
         hi->no_diffs++;
         if ((dict_info = dict_lookup (hi->reg->dict, hci.cur_name)))
         {
-            memcpy (&isamd_p, dict_info+1, sizeof(ISAMD_P));
-            isamd_p2 = isamd_append (hi->reg->isamd, isamd_p, isamd_i);
-            if (!isamd_p2)
+            dictlen=dict_info[0];
+            memcpy (dictentry, dict_info+1, dictlen );
+#ifdef SKIPTHIS
+            logf(LOG_LOG,"dictentry before. len=%d: %d %d %d %d %d %d %d %d %d",
+               dictlen,dictentry[0], dictentry[1], dictentry[2],
+                       dictentry[3], dictentry[4], dictentry[5],
+                       dictentry[6], dictentry[7], dictentry[8]); /*!*/
+#endif
+            dictlen= isamd_append(hi->reg->isamd, dictentry, dictlen, isamd_i);
+             /* logf dictentry after */
+            if (dictlen)
             {
-                hi->no_deletions++;
-                if (!dict_delete (hi->reg->dict, this_name))
-                    abort();
+                hi->no_updates++;
+                if ( (dictlen!=dict_info[0]) ||
+                     (0!=memcmp(dictentry, dict_info+1, dictlen)) )
+                {
+                    dict_insert(hi->reg->dict, this_name,
+                                dictlen,dictentry);
+                }
             }
-            else 
+            else
             {
-                hi->no_updates++;
-                if (isamd_p2 != isamd_p)
-                    dict_insert (hi->reg->dict, this_name,
-                                 sizeof(ISAMD_P), &isamd_p2);
+                hi->no_deletions++;
+                if (!dict_delete (hi->reg->dict, this_name)) 
+                {
+	            logf (LOG_FATAL, "dict_delete failed");
+                    abort();
+                }
             }
         } 
         else
         {
-            isamd_p = isamd_append (hi->reg->isamd, 0, isamd_i);
+            dictlen=0;
+            memset (dictentry, '\0', ISAMD_MAX_DICT_LEN);
+            dictlen= isamd_append(hi->reg->isamd, dictentry, dictlen, isamd_i);
+             /* logf dictentry first */
             hi->no_insertions++;
-            dict_insert (hi->reg->dict, this_name, sizeof(ISAMD_P), &isamd_p);
+            if (dictlen)
+                dict_insert(hi->reg->dict, this_name,
+                                dictlen,dictentry);
         }
     }
     xfree (isamd_i);
+    xfree (hci.key);
+    xfree (hci.key_1);
+    xfree (hci.key_2);
     return 0;
 } 
 
@@ -615,7 +830,10 @@ int heap_inps (struct heap_info *hi)
     ISAMS_I isams_i = (ISAMS_I) xmalloc (sizeof(*isams_i));
 
     hci.key = (char *) xmalloc (KEY_SIZE);
-    hci.mode = 1;
+    hci.key_1 = (char *) xmalloc (KEY_SIZE);
+    hci.key_2 = (char *) xmalloc (KEY_SIZE);
+    hci.first_in_list = 1;
+    hci.ret = -1;
     hci.hi = hi;
     hci.more = heap_read_one (hi, hci.cur_name, hci.key);
 
@@ -690,40 +908,56 @@ void zebra_index_merge (ZebraHandle zh)
     struct heap_info *hi;
     struct progressInfo progressInfo;
     int nkeys = zh->reg->key_file_no;
+    int usefile; 
+    
+    logf (LOG_DEBUG, " index_merge called with nk=%d b=%p", 
+                    nkeys, zh->reg->key_buf);
+    if ( (nkeys==0) && (zh->reg->key_buf==0) )
+        return; /* nothing to merge - probably flush after end-trans */
     
-    if (nkeys < 0)
+    usefile = (nkeys!=0); 
+
+    if (usefile)
     {
-        char fname[1024];
-        nkeys = 0;
-        while (1)
+        if (nkeys < 0)
         {
-            extract_get_fname_tmp  (zh, fname, nkeys+1);
-            if (access (fname, R_OK) == -1)
-                break;
-            nkeys++;
+            char fname[1024];
+            nkeys = 0;
+            while (1)
+            {
+                extract_get_fname_tmp  (zh, fname, nkeys+1);
+                if (access (fname, R_OK) == -1)
+                        break;
+                nkeys++;
+            }
+            if (!nkeys)
+                return ;
         }
-        if (!nkeys)
-            return ;
-    }
-    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, 8192, zh->res);
-        kf[i]->readHandler = progressFunc;
-        kf[i]->readInfo = &progressInfo;
-        progressInfo.totalBytes += kf[i]->length;
-        progressInfo.totalOffset += kf[i]->buf_size;
+        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, 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->reg = zh->reg;
+        
+        for (i = 1; i<=nkeys; i++)
+            if ((r = key_file_read (kf[i], rbuf)))
+                key_heap_insert (hi, rbuf, r, kf[i]);
+    }  /* use file */
+    else 
+    { /* do not use file, read straight from buffer */
+        hi = key_heap_init_buff (zh,key_qsort_compare);
+        hi->reg = zh->reg;
     }
-    hi = key_heap_init (nkeys, key_qsort_compare);
-    hi->reg = zh->reg;
-    
-    for (i = 1; i<=nkeys; i++)
-        if ((r = key_file_read (kf[i], rbuf)))
-            key_heap_insert (hi, rbuf, r, kf[i]);
     if (zh->reg->isams)
 	heap_inps (hi);
     if (zh->reg->isamc)
@@ -735,22 +969,28 @@ void zebra_index_merge (ZebraHandle zh)
     if (zh->reg->isamb)
 	heap_inpb (hi);
 	
-    for (i = 1; i<=nkeys; i++)
+    if (usefile)
     {
-        extract_get_fname_tmp  (zh, rbuf, i);
-        unlink (rbuf);
+        for (i = 1; i<=nkeys; i++)
+        {
+            extract_get_fname_tmp  (zh, rbuf, i);
+            unlink (rbuf);
+        }
+        for (i = 1; i<=nkeys; i++)
+            key_file_destroy (kf[i]);
+        xfree (kf);
+    }
+    if (hi->no_iterations)
+    { /* do not log if nothing happened */
+        logf (LOG_LOG, "Iterations . . .%7d", hi->no_iterations);
+        logf (LOG_LOG, "Distinct words .%7d", hi->no_diffs);
+        logf (LOG_LOG, "Updates. . . . .%7d", hi->no_updates);
+        logf (LOG_LOG, "Deletions. . . .%7d", hi->no_deletions);
+        logf (LOG_LOG, "Insertions . . .%7d", hi->no_insertions);
     }
-    logf (LOG_LOG, "Iterations . . .%7d", hi->no_iterations);
-    logf (LOG_LOG, "Distinct words .%7d", hi->no_diffs);
-    logf (LOG_LOG, "Updates. . . . .%7d", hi->no_updates);
-    logf (LOG_LOG, "Deletions. . . .%7d", hi->no_deletions);
-    logf (LOG_LOG, "Insertions . . .%7d", hi->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);
 }