X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=isam%2Fphysical.c;h=65bfe19023ba42120117b4a652de24fca858aa8d;hb=49f1c8c877affdeb9e9221047c48beed3f475afb;hp=312d3e24eb18de7a8c60f48048af95f8c73262cc;hpb=260110f86881af35eecd7fe3ac9dfdda5615a365;p=idzebra-moved-to-github.git

diff --git a/isam/physical.c b/isam/physical.c
index 312d3e2..65bfe19 100644
--- a/isam/physical.c
+++ b/isam/physical.c
@@ -1,10 +1,47 @@
 /*
- * Copyright (C) 1994, Index Data I/S 
+ * Copyright (C) 1994-1999, Index Data
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: physical.c,v $
- * Revision 1.5  1994-09-28 11:29:33  quinn
+ * Revision 1.17  1999-11-30 13:48:04  adam
+ * Improved installation. Updated for inclusion of YAZ header files.
+ *
+ * Revision 1.16  1999/05/26 07:49:14  adam
+ * C++ compilation.
+ *
+ * Revision 1.15  1999/02/02 14:51:22  adam
+ * Updated WIN32 code specific sections. Changed header.
+ *
+ * Revision 1.14  1997/09/09 13:38:12  adam
+ * Partial port to WIN95/NT.
+ *
+ * Revision 1.13  1996/10/29 13:56:57  adam
+ * Include of zebrautl.h instead of alexutil.h.
+ *
+ * Revision 1.12  1996/03/20 16:17:11  quinn
+ * Bug hunting
+ *
+ * Revision 1.11  1996/03/20  13:29:17  quinn
+ * Bug-fix
+ *
+ * Revision 1.10  1996/03/19  19:22:44  quinn
+ * Fixed update-bug
+ *
+ * Revision 1.9  1996/02/06  10:19:57  quinn
+ * Attempt at fixing bug. Not all blocks were read before they were unlinked
+ * prior to a remap operation.
+ *
+ * Revision 1.8  1996/01/29  09:47:11  quinn
+ * Fixed mean little bug in the read-table code.
+ *
+ * Revision 1.7  1995/12/06  14:48:27  quinn
+ * Fixed some strange bugs.
+ *
+ * Revision 1.6  1995/09/04  12:33:47  adam
+ * Various cleanup. YAZ util used instead.
+ *
+ * Revision 1.5  1994/09/28  11:29:33  quinn
  * Added cmp parameter.
  *
  * Revision 1.4  1994/09/27  20:03:53  quinn
@@ -26,7 +63,10 @@
  */
 
 #include <assert.h>
+#include <stdio.h>
+#include <string.h>
 
+#include <yaz/log.h>
 #include <isam.h>
 
 static int is_freestore_alloc(ISAM is, int type)
@@ -39,14 +79,14 @@ static int is_freestore_alloc(ISAM is, int type)
     	if (bf_read(is->types[type].bf, tmp, 0, sizeof(tmp),
 	    &is->types[type].freelist) <=0)
 	{
-	    log(LOG_FATAL, "Failed to allocate block");
+	    logf (LOG_FATAL, "Failed to allocate block");
 	    exit(1);
 	}
     }
     else
     	tmp = is->types[type].top++;
 
-    log(LOG_DEBUG, "Allocating block #%d", tmp);
+    logf (LOG_DEBUG, "Allocating block #%d", tmp);
     return tmp;
 }
 
@@ -54,12 +94,12 @@ static void is_freestore_free(ISAM is, int type, int block)
 {
     int tmp;
 
-    log(LOG_DEBUG, "Releasing block #%d", block);
+    logf (LOG_DEBUG, "Releasing block #%d", block);
     tmp = is->types[type].freelist;
     is->types[type].freelist = block;
     if (bf_write(is->types[type].bf, block, 0, sizeof(tmp), &tmp) < 0)
     {
-    	log(LOG_FATAL, "Failed to deallocate block.");
+    	logf (LOG_FATAL, "Failed to deallocate block.");
     	exit(1);
     }
 }
@@ -71,7 +111,7 @@ int is_p_read_partial(is_mtable *tab, is_mblock *block)
     is_mbuf *buf;
 
     assert(block->state == IS_MBSTATE_UNREAD);
-    block->data = buf =  xmalloc_mbuf(IS_MBUF_TYPE_LARGE);
+    block->data = buf = xmalloc_mbuf(IS_MBUF_TYPE_LARGE);
     toread = tab->is->types[tab->pos_type].blocksize;
     if (toread > is_mbuf_size[buf->type])
     {
@@ -83,12 +123,13 @@ int is_p_read_partial(is_mtable *tab, is_mblock *block)
     if (bf_read(tab->is->types[tab->pos_type].bf, block->diskpos, 0, toread,
 	buf->data) < 0)
     {
-    	log(LOG_FATAL, "bfread failed.");
+    	logf (LOG_FATAL, "bfread failed.");
     	return -1;
     }
     /* extract header info */
     buf->offset = 0;
     memcpy(&block->num_records, buf->data, sizeof(block->num_records));
+    assert(block->num_records > 0);
     buf->offset += sizeof(block->num_records);
     memcpy(&block->nextpos, buf->data + buf->offset,
 	sizeof(block->nextpos));
@@ -99,6 +140,9 @@ int is_p_read_partial(is_mtable *tab, is_mblock *block)
 	    sizeof(tab->num_records));
 	buf->offset +=sizeof(tab->num_records);
     }
+    logf(LOG_DEBUG, "R: Block #%d: num %d nextpos %d total %d",
+        block->diskpos, block->num_records, block->nextpos,
+	block == tab->data ? tab->num_records : -1);
     buf->num = (toread - buf->offset) / is_keysize(tab->is);
     if (buf->num >= block->num_records)
     {
@@ -106,7 +150,7 @@ int is_p_read_partial(is_mtable *tab, is_mblock *block)
     	block->state = IS_MBSTATE_CLEAN;
     }
     else
-    	block->bread = buf->num * is_keysize(tab->is);
+    	block->bread = buf->offset + buf->num * is_keysize(tab->is);
     return 0;
 }
 
@@ -117,7 +161,7 @@ int is_p_read_full(is_mtable *tab, is_mblock *block)
 
     if (block->state == IS_MBSTATE_UNREAD && is_p_read_partial(tab, block) < 0)
     {
-    	log(LOG_FATAL, "partial read failed.");
+    	logf (LOG_FATAL, "partial read failed.");
     	return -1;
     }
     if (block->state == IS_MBSTATE_PARTIAL)
@@ -136,7 +180,7 @@ int is_p_read_full(is_mtable *tab, is_mblock *block)
 	    if (bf_read(tab->is->types[tab->pos_type].bf, block->diskpos, block->bread, toread *
 		is_keysize(tab->is), buf->data) < 0)
 	    {
-	    	log(LOG_FATAL, "bfread failed.");
+	    	logf (LOG_FATAL, "bfread failed.");
 	    	return -1;
 	    }
 	    buf->offset = 0;
@@ -144,8 +188,9 @@ int is_p_read_full(is_mtable *tab, is_mblock *block)
 	    dread += toread;
 	    block->bread += toread * is_keysize(tab->is);
     	}
+	block->state = IS_MBSTATE_CLEAN;
     }
-    log(LOG_DEBUG, "R: Block #%d contains %d records.", block->diskpos, block->num_records);
+    logf (LOG_DEBUG, "R: Block #%d contains %d records.", block->diskpos, block->num_records);
     return 0;
 }
 
@@ -189,19 +234,24 @@ void is_p_sync(is_mtable *tab)
 		sizeof(tab->num_records));
 	    sum += sizeof(tab->num_records);
 	}
+	logf (LOG_DEBUG, "W: Block #%d contains %d records.", p->diskpos,
+	    p->num_records);
+	assert(p->num_records > 0);
 	for (b = p->data; b; b = b->next)
 	{
-	    memcpy(type->dbuf + sum, b->data + b->offset, v = b->num *
-		is_keysize(tab->is));
+            logf(LOG_DEBUG, "   buf: offset %d, keys %d, type %d, ref %d",
+	    	b->offset, b->num, b->type, b->refcount);
+	    if ((v = b->num * is_keysize(tab->is)) > 0)
+		memcpy(type->dbuf + sum, b->data + b->offset, v);
+
 	    sum += v;
 	    assert(sum <= type->blocksize);
 	}
 	if (bf_write(type->bf, p->diskpos, 0, sum, type->dbuf) < 0)
 	{
-	    log(LOG_FATAL, "Failed to write block.");
+	    logf (LOG_FATAL, "Failed to write block.");
 	    exit(1);
 	}
-	log(LOG_DEBUG, "W: Block #%d contains %d records.", p->diskpos, p->num_records);
     }
 }
 
@@ -213,16 +263,18 @@ void is_p_unmap(is_mtable *tab)
     is_mblock *p;
 
     for (p = tab->data; p; p = p->next)
+    {
     	if (p->diskpos >= 0)
     	{
 	    is_freestore_free(tab->is, tab->pos_type, p->diskpos);
 	    p->diskpos = -1;
 	}
+    }
 }
 
 static is_mbuf *mbuf_takehead(is_mbuf **mb, int *num, int keysize)
 {
-    is_mbuf *p = 0, **pp = &p, *new;
+    is_mbuf *p = 0, **pp = &p, *inew;
     int toget = *num;
 
     if (!toget)
@@ -237,13 +289,13 @@ static is_mbuf *mbuf_takehead(is_mbuf **mb, int *num, int keysize)
     }
     if (toget > 0 && *mb)
     {
-	new = xmalloc_mbuf(IS_MBUF_TYPE_SMALL);
-	new->next = (*mb)->next;
-	(*mb)->next = new;
-	new->data = (*mb)->data;
+	inew = xmalloc_mbuf(IS_MBUF_TYPE_SMALL);
+	inew->next = (*mb)->next;
+	(*mb)->next = inew;
+	inew->data = (*mb)->data;
 	(*mb)->refcount++;
-	new->offset = (*mb)->offset + toget * keysize;
-	new->num = (*mb)->num - toget;
+	inew->offset = (*mb)->offset + toget * keysize;
+	inew->num = (*mb)->num - toget;
 	(*mb)->num = toget;
 	*pp = *mb;
 	*mb = (*mb)->next;
@@ -261,11 +313,11 @@ static is_mbuf *mbuf_takehead(is_mbuf **mb, int *num, int keysize)
  */
 void is_p_align(is_mtable *tab)
 {
-    is_mblock *mblock, *new, *last = 0, *next;
+    is_mblock *mblock, *inew, *last = 0, *next;
     is_mbuf *mbufs, *mbp;
     int blocks, recsblock;
 
-    log(LOG_DEBUG, "Realigning table.");
+    logf (LOG_DEBUG, "Realigning table.");
     for (mblock = tab->data; mblock; mblock = next)
     {
         next = mblock->next;
@@ -279,9 +331,27 @@ void is_p_align(is_mtable *tab)
 	    }
 	    else
 	    {
-	    	tab->data = tab->data->next;
-	    	tab->data->state = IS_MBSTATE_DIRTY;
-	    	next = tab->data;
+	    	next = tab->data->next;
+		if (next)
+		{
+		    if (next->state < IS_MBSTATE_CLEAN)
+		    {
+			if (is_p_read_full(tab, next) < 0)
+			{
+			    logf(LOG_FATAL, "Error during re-alignment");
+			    abort();
+			}
+			if (next->nextpos && !next->next)
+			{
+			    next->next = xmalloc_mblock();
+			    next->next->diskpos = next->nextpos;
+			    next->next->state = IS_MBSTATE_UNREAD;
+			    next->next->data = 0;
+			}
+		    }
+		    next->state = IS_MBSTATE_DIRTY; /* force re-process */
+		    tab->data = next;
+		}
 	    }
 	    if (mblock->diskpos >= 0)
 		is_freestore_free(tab->is, tab->pos_type, mblock->diskpos);
@@ -306,11 +376,11 @@ void is_p_align(is_mtable *tab)
 	    {
 	    	if (mbufs)
 	    	{
-		    new = xmalloc_mblock();
-		    new->diskpos = -1;
-		    new->state = IS_MBSTATE_DIRTY;
-		    new->next = mblock->next;
-		    mblock->next = new;
+		    inew = xmalloc_mblock();
+		    inew->diskpos = -1;
+		    inew->state = IS_MBSTATE_DIRTY;
+		    inew->next = mblock->next;
+		    mblock->next = inew;
 		}
 	    	mblock->data = mbp;
 	    	mblock->num_records = recsblock;
@@ -336,14 +406,14 @@ void is_p_remap(is_mtable *tab)
     is_mblock *blockp, **blockpp;
     int recsblock, blocks;
 
-    log(LOG_DEBUG, "Remapping table.");
+    logf (LOG_DEBUG, "Remapping table.");
     /* collect all data */
     bufpp = &mbufs;
     for (blockp = tab->data; blockp; blockp = blockp->next)
     {
     	if (blockp->state < IS_MBSTATE_CLEAN && is_m_read_full(tab, blockp) < 0)
 	{
-	    log(LOG_FATAL, "Read-full failed in remap.");
+	    logf (LOG_FATAL, "Read-full failed in remap.");
 	    exit(1);
 	}
     	*bufpp = blockp->data;