align block sizes for isam sys. Better plot for test

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

diff --git a/isamb/isamb.c b/isamb/isamb.c
index 3437fc1..343e5e3 100644 (file)
--- a/isamb/isamb.c
+++ b/isamb/isamb.c
@@ -2,7 +2,7 @@
  *  Copyright (c) 2000-2002, Index Data.
  *  See the file LICENSE for details.
  *
- *  $Id: isamb.c,v 1.13 2002-04-30 19:31:09 adam Exp $
+ *  $Id: isamb.c,v 1.17 2002-06-19 10:29:17 adam Exp $
  */
 #include <yaz/xmalloc.h>
 #include <yaz/log.h>
@@ -74,29 +74,32 @@ void decode_ptr (char **src, int *pos)
 ISAMB isamb_open (BFiles bfs, const char *name, int writeflag, ISAMC_M method)
 {
     ISAMB isamb = xmalloc (sizeof(*isamb));
-    int i, b_size = 64;
+    int i, b_size = 32;
 
     isamb->bfs = bfs;
     isamb->method = (ISAMC_M) xmalloc (sizeof(*method));
     memcpy (isamb->method, method, sizeof(*method));
-    isamb->no_cat = 3;
+    isamb->no_cat = 4;
 
     isamb->file = xmalloc (sizeof(*isamb->file) * isamb->no_cat);
     for (i = 0; i<isamb->no_cat; i++)
     {
         char fname[DST_BUF_SIZE];
-        isamb->file[i].head.first_block = 1;
-        isamb->file[i].head.last_block = 1;
-        isamb->file[i].head.block_size = b_size;
-        isamb->file[i].head.block_max = b_size - ISAMB_DATA_OFFSET;
-        b_size = b_size * 4;
         isamb->file[i].head_dirty = 0;
         sprintf (fname, "%s%c", name, i+'A');
-        isamb->file[i].bf =
-            bf_open (bfs, fname, isamb->file[i].head.block_size, writeflag);
+        isamb->file[i].bf = bf_open (bfs, fname, b_size, writeflag);
     
-        bf_read (isamb->file[i].bf, 0, 0, sizeof(struct ISAMB_head),
-                 &isamb->file[i].head);
+        if (!bf_read (isamb->file[i].bf, 0, 0, sizeof(struct ISAMB_head),
+                 &isamb->file[i].head))
+       {
+            isamb->file[i].head.first_block = 1;
+            isamb->file[i].head.last_block = 1;
+            isamb->file[i].head.block_size = b_size;
+            isamb->file[i].head.block_max = b_size - ISAMB_DATA_OFFSET;
+       }
+        assert (isamb->file[i].head.block_size >= ISAMB_DATA_OFFSET);
+        isamb->file[i].head_dirty = 0;
+        b_size = b_size * 4;
     }
     return isamb;
 }
@@ -125,7 +128,12 @@ struct ISAMB_block *open_block (ISAMB b, ISAMC_P pos)
     p->pos = pos;
     p->cat = pos & 3;
     p->buf = xmalloc (b->file[cat].head.block_size);
-    bf_read (b->file[cat].bf, pos/4, 0, 0, p->buf);
+    if (!bf_read (b->file[cat].bf, pos/4, 0, 0, p->buf))
+    {
+        yaz_log (LOG_FATAL, "read failure for pos=%ld block=%ld",
+                 (long) pos, (long) pos/4);
+        abort();
+    }
     p->bytes = p->buf + ISAMB_DATA_OFFSET;
     p->leaf = p->buf[0];
     p->size = p->buf[1] + 256 * p->buf[2] - ISAMB_DATA_OFFSET;
@@ -195,7 +203,7 @@ int insert_sub (ISAMB b, struct ISAMB_block **p,
 int insert_int (ISAMB b, struct ISAMB_block *p, void *lookahead_item,
                 int *mode,
                 ISAMC_I stream, struct ISAMB_block **sp,
-                void *split_item, int *split_size)
+                void *split_item, int *split_size, void *last_max_item)
 {
     char *startp = p->bytes;
     char *src = startp;
@@ -232,7 +240,7 @@ int insert_int (ISAMB b, struct ISAMB_block *p, void *lookahead_item,
         sub_p1 = open_block (b, pos);
         assert (sub_p1);
         more = insert_sub (b, &sub_p1, lookahead_item, mode, stream, &sub_p2, 
-                           sub_item, &sub_size, 0);
+                           sub_item, &sub_size, last_max_item);
     }
     if (sub_p2)
     {
@@ -378,10 +386,10 @@ int insert_leaf (ISAMB b, struct ISAMB_block **sp1, void *lookahead_item,
                         lookahead_item = 0;
                         more = 0;
                     }
-                    if (max_item &&
+                    if (lookahead_item && max_item &&
                         (*b->method->compare_item)(max_item, lookahead_item) <= 0)
                     {
-                       yaz_log (LOG_LOG, "max_item 1");
+                        /* max_item 1 */
                         lookahead_item = 0;
                     }
                     
@@ -420,7 +428,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)
         {
-           yaz_log (LOG_LOG, "max_item 2");
+            /* max_item 2 */
             break;
         }
         if (!*lookahead_mode)
@@ -529,7 +537,7 @@ int insert_sub (ISAMB b, struct ISAMB_block **p, void *new_item,
                             sub_size, max_item);
     else
         return insert_int (b, *p, new_item, mode, stream, sp, sub_item,
-                           sub_size);
+                           sub_size, max_item);
 }
 
 int isamb_merge (ISAMB b, ISAMC_P pos, ISAMC_I stream)