isamb fixes for pp_read. Statistics

[idzebra-moved-to-github.git] / isamb / isamb.c

diff --git a/isamb/isamb.c b/isamb/isamb.c
index 4f55b02..1625774 100644 (file)
--- a/isamb/isamb.c
+++ b/isamb/isamb.c
@@ -1,8 +1,8 @@
 /*
- *  Copyright (c) 1995-1998, Index Data.
+ *  Copyright (c) 2000-2002, Index Data.
  *  See the file LICENSE for details.
  *
- *  $Id: isamb.c,v 1.8 2002-04-23 13:39:10 adam Exp $
+ *  $Id: isamb.c,v 1.12 2002-04-30 08:28:37 adam Exp $
  */
 #include <yaz/xmalloc.h>
 #include <yaz/log.h>
@@ -39,7 +39,7 @@ struct ISAMB_s {
 };
 
 struct ISAMB_block {
-    int pos;
+    ISAMB_P pos;
     int cat;
     int size;
     int leaf;
@@ -52,7 +52,10 @@ struct ISAMB_block {
 
 struct ISAMB_PP_s {
     ISAMB isamb;
+    ISAMB_P pos;
     int level;
+    int total_size;
+    int no_blocks;
     struct ISAMB_block **block;
 };
 
@@ -76,7 +79,7 @@ ISAMB isamb_open (BFiles bfs, const char *name, int writeflag, ISAMC_M method)
     isamb->bfs = bfs;
     isamb->method = (ISAMC_M) xmalloc (sizeof(*method));
     memcpy (isamb->method, method, sizeof(*method));
-    isamb->no_cat = 4;
+    isamb->no_cat = 3;
 
     isamb->file = xmalloc (sizeof(*isamb->file) * isamb->no_cat);
     for (i = 0; i<isamb->no_cat; i++)
@@ -283,8 +286,6 @@ int insert_int (ISAMB b, struct ISAMB_block *p, void *lookahead_item,
             (*sp)->size = endp - src;
             memcpy ((*sp)->bytes, src, (*sp)->size);
 
-            yaz_log (LOG_LOG, "i split %d -> %d %d",
-                     p->size, p_new_size, (*sp)->size);
             p->size = p_new_size;
         }
         p->dirty = 1;
@@ -372,7 +373,7 @@ int insert_leaf (ISAMB b, struct ISAMB_block **sp1, void *lookahead_item,
                     if (max_item &&
                         (*b->method->compare_item)(max_item, lookahead_item) <= 0)
                     {
-                        assert (0);
+                       yaz_log (LOG_LOG, "max_item 1");
                         lookahead_item = 0;
                     }
                     
@@ -412,7 +413,7 @@ int insert_leaf (ISAMB b, struct ISAMB_block **sp1, void *lookahead_item,
         if (max_item &&
             (*b->method->compare_item)(max_item, lookahead_item) <= 0)
         {
-            assert (0);
+           yaz_log (LOG_LOG, "max_item 2");
             break;
         }
         if (!half1 && dst > cut)   
@@ -492,8 +493,6 @@ int insert_leaf (ISAMB b, struct ISAMB_block **sp1, void *lookahead_item,
         p->dirty = 1;
         memcpy (sub_item, cut_item_buf, cut_item_size);
         *sub_size = cut_item_size;
-
-        yaz_log (LOG_LOG, "l split %d / %d", p->size, (*sp2)->size);
     }
     else
     {
@@ -562,21 +561,27 @@ int isamb_merge (ISAMB b, ISAMC_P pos, ISAMC_I stream)
     return pos;
 }
 
-ISAMB_PP isamb_pp_open (ISAMB isamb, ISAMB_P pos)
+ISAMB_PP isamb_pp_open_x (ISAMB isamb, ISAMB_P pos, int *level)
 {
     ISAMB_PP pp = xmalloc (sizeof(*pp));
 
     pp->isamb = isamb;
     pp->block = xmalloc (10 * sizeof(*pp->block));
 
+    pp->pos = pos;
     pp->level = 0;
+    pp->total_size = 0;
+    pp->no_blocks = 0;
     while (1)
     {
         struct ISAMB_block *p = open_block (isamb, pos);
         char *src = p->bytes + p->offset;
         pp->block[pp->level] = p;
 
-        if (p->bytes[0]) /* leaf */
+        pp->total_size += p->size;
+        pp->no_blocks++;
+
+        if (p->leaf)
             break;
 
         decode_ptr (&src, &pos);
@@ -584,20 +589,43 @@ ISAMB_PP isamb_pp_open (ISAMB isamb, ISAMB_P pos)
         pp->level++;
     }
     pp->block[pp->level+1] = 0;
+    if (level)
+        *level = pp->level;
     return pp;
 }
 
-void isamb_pp_close (ISAMB_PP pp)
+ISAMB_PP isamb_pp_open (ISAMB isamb, ISAMB_P pos)
+{
+    return isamb_pp_open_x (isamb, pos, 0);
+}
+
+void isamb_pp_close_x (ISAMB_PP pp, int *size, int *blocks)
 {
     int i;
     if (!pp)
         return;
+    if (size)
+        *size = pp->total_size;
+    if (blocks)
+        *blocks = pp->no_blocks;
     for (i = 0; i <= pp->level; i++)
         close_block (pp->isamb, pp->block[i]);
     xfree (pp->block);
     xfree (pp);
 }
 
+int isamb_block_info (ISAMB isamb, int cat)
+{
+    if (cat >= 0 && cat < isamb->no_cat)
+        return isamb->file[cat].head.block_size;
+    return -1;
+}
+
+void isamb_pp_close (ISAMB_PP pp)
+{
+    return isamb_pp_close_x (pp, 0, 0);
+}
+
 int isamb_pp_read (ISAMB_PP pp, void *buf)
 {
     char *dst = buf;
@@ -617,7 +645,7 @@ int isamb_pp_read (ISAMB_PP pp, void *buf)
             pp->block[pp->level] = 0;
             (pp->level)--;
             p = pp->block[pp->level];
-            assert (p->bytes[0] == 0);  /* must be int */
+            assert (!p->leaf);  /* must be int */
         }
         src = p->bytes + p->offset;
         
@@ -632,6 +660,9 @@ int isamb_pp_read (ISAMB_PP pp, void *buf)
         while (1)
         {
             pp->block[pp->level] = p = open_block (pp->isamb, pos);
+
+            pp->total_size += p->size;
+            pp->no_blocks++;
             
             if (p->leaf) /* leaf */
             {
@@ -644,7 +675,7 @@ int isamb_pp_read (ISAMB_PP pp, void *buf)
         }
     }
     assert (p->offset < p->size);
-    assert (p->bytes[0]);
+    assert (p->leaf);
     src = p->bytes + p->offset;
     (*pp->isamb->method->code_item)(ISAMC_DECODE, p->decodeClientData,
                                     &dst, &src);