* Sebastian Hammer, Adam Dickmeiss
*
* $Log: physical.c,v $
- * Revision 1.5 1994-09-28 11:29:33 quinn
+ * 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
*/
#include <assert.h>
+#include <stdio.h>
#include <isam.h>
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;
}
{
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);
}
}
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])
{
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 */
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;
}
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)
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;
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;
}
{
memcpy(type->dbuf + sum, b->data + b->offset, v = b->num *
is_keysize(tab->is));
+
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);
+ logf (LOG_DEBUG, "W: Block #%d contains %d records.", p->diskpos, p->num_records);
}
}
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 *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;
else
{
tab->data = tab->data->next;
- tab->data->state = IS_MBSTATE_DIRTY;
next = tab->data;
+ 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 */
+ }
}
if (mblock->diskpos >= 0)
is_freestore_free(tab->is, tab->pos_type, mblock->diskpos);
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;