X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=isamb%2Fisamb.c;h=7b60565a880b6ea23c0e06b740b7ce93bc4be777;hb=e5e87e3b665f390409902a8efd716cdec1b6a2a6;hp=77114239f2788119545f408d864964f48b1636be;hpb=1afbdd9135e38942201f0ad0eaae5b6903755aeb;p=idzebra-moved-to-github.git

diff --git a/isamb/isamb.c b/isamb/isamb.c
index 7711423..7b60565 100644
--- a/isamb/isamb.c
+++ b/isamb/isamb.c
@@ -1,4 +1,4 @@
-/* $Id: isamb.c,v 1.39 2004-06-02 18:50:37 heikki Exp $
+/* $Id: isamb.c,v 1.42 2004-06-03 10:29:49 heikki Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
@@ -97,6 +97,7 @@ struct ISAMB_block {
     int deleted;
     int offset;
     char *bytes;
+    char *cbuf;
     unsigned char *buf;
     void *decodeClientData;
     int log_rw;
@@ -336,6 +337,7 @@ static struct ISAMB_block *open_block (ISAMB b, ISAMC_P pos)
     p->pos = pos;
     p->cat = pos & CAT_MASK;
     p->buf = xmalloc (b->file[cat].head.block_size);
+    p->cbuf = 0;
 
     if (!get_block (b, pos, p->buf, 0))
     {
@@ -1070,6 +1072,7 @@ void isamb_dump (ISAMB b, ISAMB_P pos, void (*pr)(const char *str))
    debug the more complex pp_read that also forwards. May be deleted near end
    of 2004, if it has not shown to be useful */
 
+
 int isamb_pp_read (ISAMB_PP pp, void *buf)
 {
     char *dst = buf;
@@ -1136,9 +1139,13 @@ int isamb_pp_read (ISAMB_PP pp, void *buf)
 #endif
 
 #define NEW_FORWARD 0
-#if NEW_FORWARD
 
-#define ISAMB_DEBUG 1  /* while coding this part */
+#if NEW_FORWARD == 1
+
+/*
+#undef ISAMB_DEBUB
+#define ISAMB_DEBUG 1
+*/
 
 static int isamb_pp_read_on_leaf(ISAMB_PP pp, void *buf)
 { /* reads the next item on the current leaf, returns 0 if end of leaf*/
@@ -1169,6 +1176,11 @@ static int isamb_pp_climb_level(ISAMB_PP pp, int *pos)
     struct ISAMB_block *p = pp->block[pp->level];
     char *src;
     int item_len;
+#if ISAMB_DEBUG
+    logf(LOG_DEBUG,"isamb_pp_climb_level starting "
+                   "at level %d node %d ofs=%d sz=%d",
+                    pp->level, p->pos, p->offset, p->size);
+#endif
     assert(p->offset <= p->size);
     if (pp->level==0)
     {
@@ -1181,8 +1193,10 @@ static int isamb_pp_climb_level(ISAMB_PP pp, int *pos)
     pp->block[pp->level]=0;
     (pp->level)--;
     p=pp->block[pp->level];
-    logf(LOG_DEBUG,"isamb_pp_climb_level climbed to node %d ofs=%d",
-                    p->pos, p->offset);
+#if ISAMB_DEBUG
+    logf(LOG_DEBUG,"isamb_pp_climb_level climbed to level %d node %d ofs=%d",
+                    pp->level, p->pos, p->offset);
+#endif
     assert (!p->leaf);
     assert (p->offset <= p->size);
     if (p->offset == p->size ) {
@@ -1191,13 +1205,20 @@ static int isamb_pp_climb_level(ISAMB_PP pp, int *pos)
             return 0;
         p=pp->block[pp->level];
     }
-    /* skip the child we just came from */
-    assert (p->offset < p->size );
-    src=p->bytes + p->offset;
-    decode_ptr(&src, &item_len);
-    src += item_len;
-    decode_ptr(&src, pos);
-    p->offset=src - (char *)p->bytes;
+    else
+    {
+        /* skip the child we just came from */
+#if ISAMB_DEBUG
+        logf(LOG_DEBUG,"isam_pp_climb_level: skipping lev=%d ofs=%d sz=%d", 
+                        pp->level, p->offset, p->size);
+#endif
+        assert (p->offset < p->size );
+        src=p->bytes + p->offset;
+        decode_ptr(&src, &item_len);
+        src += item_len;
+        decode_ptr(&src, pos);
+        p->offset=src - (char *)p->bytes;
+    }
     return 1;
 } /* climb_level */
 
@@ -1215,10 +1236,21 @@ static int isamb_pp_forward_unode(ISAMB_PP pp, int pos, const void *untilbuf)
     int item_len;
     int cmp;
     int nxtpos;
+#if ISAMB_DEBUG
+    logf(LOG_DEBUG,"isamb_pp_forward_unode starting "
+                   "at level %d node %d ofs=%di sz=%d",
+                    pp->level, p->pos, p->offset, p->size);
+#endif
     assert(!p->leaf);
     assert(p->offset <= p->size);
-    if (p->offset == p->size)
+    if (p->offset == p->size) {
+#if ISAMB_DEBUG
+            logf(LOG_DEBUG,"isamb_pp_forward_unode returning at end "
+                   "at level %d node %d ofs=%di sz=%d",
+                    pp->level, p->pos, p->offset, p->size);
+#endif
         return pos; /* already at the end of it */
+    }
     while(p->offset < p->size) {
         decode_ptr(&src,&item_len);
         cmp=(*pp->isamb->method->compare_item)(untilbuf,src);
@@ -1226,11 +1258,21 @@ static int isamb_pp_forward_unode(ISAMB_PP pp, int pos, const void *untilbuf)
         decode_ptr(&src,&nxtpos);
         if (cmp<2)
         {
+#if ISAMB_DEBUG
+            logf(LOG_DEBUG,"isamb_pp_forward_unode returning a hit "
+                   "at level %d node %d ofs=%di sz=%d",
+                    pp->level, p->pos, p->offset, p->size);
+#endif
             return pos;
         } /* found one */
         pos=nxtpos;
         p->offset=src-(char*)p->bytes;
     }
+#if ISAMB_DEBUG
+            logf(LOG_DEBUG,"isamb_pp_forward_unode returning at tail "
+                   "at level %d node %d ofs=%di sz=%d",
+                    pp->level, p->pos, p->offset, p->size);
+#endif
     return pos; /* that's the last one in the line */
     
 } /* forward_unode */
@@ -1331,7 +1373,7 @@ int isamb_pp_forward (ISAMB_PP pp, void *buf, const void *untilbuf)
     }
 } /* isam_pp_forward (new version) */
 
-#else
+#elif NEW_FORWARD == 0
 
 int isamb_pp_forward (ISAMB_PP pp, void *buf, const void *untilbuf)
 {
@@ -1522,6 +1564,104 @@ int isamb_pp_forward (ISAMB_PP pp, void *buf, const void *untilbuf)
     } /* main loop */
 }
 
+#elif NEW_FORWARD == 2
+
+int isamb_pp_forward (ISAMB_PP pp, void *buf, const void *untilb)
+{
+    char *dst = buf;
+    char *src;
+    struct ISAMB_block *p = pp->block[pp->level];
+    if (!p)
+        return 0;
+
+again:
+    while (p->offset == p->size)
+    {
+        int pos, item_len;
+        while (p->offset == p->size)
+        {
+            if (pp->level == 0)
+                return 0;
+            close_block (pp->isamb, pp->block[pp->level]);
+            pp->block[pp->level] = 0;
+            (pp->level)--;
+            p = pp->block[pp->level];
+            assert (!p->leaf);  
+        }
+
+	assert(!p->leaf);
+        src = p->bytes + p->offset;
+        
+        decode_ptr (&src, &item_len);
+        src += item_len;
+        decode_ptr (&src, &pos);
+        
+        p->offset = src - (char*) p->bytes;
+
+	src = p->bytes + p->offset;
+
+	while(1)
+	{
+	    if (!untilb || p->offset == p->size)
+		break;
+	    assert(p->offset < p->size);
+	    decode_ptr (&src, &item_len);
+	    if ((*pp->isamb->method->compare_item)(untilb, src) <= 1)
+		break;
+	    src += item_len;
+	    decode_ptr (&src, &pos);
+	    p->offset = src - (char*) p->bytes;
+	}
+
+	pp->level++;
+
+        while (1)
+        {
+            pp->block[pp->level] = p = open_block (pp->isamb, pos);
+
+            pp->total_size += p->size;
+            pp->no_blocks++;
+            
+            if (p->leaf) 
+            {
+                break;
+            }
+	    
+            src = p->bytes + p->offset;
+	    while(1)
+	    {
+		decode_ptr (&src, &pos);
+		p->offset = src - (char*) p->bytes;
+		
+		if (!untilb || p->offset == p->size)
+		    break;
+		assert(p->offset < p->size);
+		decode_ptr (&src, &item_len);
+		if ((*pp->isamb->method->compare_item)(untilb, src) <= 1)
+		    break;
+		src += item_len;
+	    }
+            pp->level++;
+        }
+    }
+    assert (p->offset < p->size);
+    assert (p->leaf);
+    while(1)
+    {
+	char *dst0 = dst;
+        src = p->bytes + p->offset;
+        (*pp->isamb->method->code_item)(ISAMC_DECODE, p->decodeClientData,
+                                    &dst, &src);
+        p->offset = src - (char*) p->bytes;
+        if (!untilb || (*pp->isamb->method->compare_item)(untilb, dst0) <= 1)
+	    break;
+	dst = dst0;
+	if (p->offset == p->size) goto again;
+    }
+    /* key_logdump_txt(LOG_DEBUG,buf, "isamb_pp_read returning 1"); */
+    return 1;
+}
+
 #endif
 
 int isamb_pp_num (ISAMB_PP pp)