X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=isam%2Fphysical.c;h=48b04c5c49e92a9e2e28c2c2e69a7d14adbf17f2;hb=bad06dda453543b8dd716ee54e9b7cb2b015b6e5;hp=ae1f58463e547335e0c97af41853ea2a7ffd903c;hpb=a5545de18b5d3762a1f29569a4b10ca5017506db;p=idzebra-moved-to-github.git diff --git a/isam/physical.c b/isam/physical.c index ae1f584..48b04c5 100644 --- a/isam/physical.c +++ b/isam/physical.c @@ -1,29 +1,36 @@ -/* - * Copyright (C) 1994, Index Data I/S - * All rights reserved. - * Sebastian Hammer, Adam Dickmeiss - * - * $Log: physical.c,v $ - * Revision 1.4 1994-09-27 20:03:53 quinn - * Seems relatively bug-free. - * - * Revision 1.3 1994/09/26 17:11:31 quinn - * Trivial - * - * Revision 1.2 1994/09/26 17:06:36 quinn - * Back again... - * - * Revision 1.1 1994/09/26 16:07:57 quinn - * Most of the functionality in place. - * - */ +/* $Id: physical.c,v 1.18 2002-08-02 19:26:56 adam Exp $ + Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002 + Index Data Aps + +This file is part of the Zebra server. + +Zebra is free software; you can redistribute it and/or modify it under +the terms of the GNU General Public License as published by the Free +Software Foundation; either version 2, or (at your option) any later +version. + +Zebra is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received a copy of the GNU General Public License +along with Zebra; see the file LICENSE.zebra. If not, write to the +Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. +*/ + + /* * This module handles the representation of tables in the bfiles. */ #include +#include +#include +#include #include static int is_freestore_alloc(ISAM is, int type) @@ -36,14 +43,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; } @@ -51,12 +58,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); } } @@ -68,7 +75,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]) { @@ -80,12 +87,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)); @@ -96,6 +104,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) { @@ -103,7 +114,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; } @@ -114,7 +125,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) @@ -133,7 +144,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; @@ -141,8 +152,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; } @@ -160,11 +172,6 @@ void is_p_sync(is_mtable *tab) type = &tab->is->types[tab->pos_type]; for (p = tab->data; p; p = p->next) { - int fummy; -/* -if (p->num_records == 0) - fummy = 1/0; -*/ if (p->state < IS_MBSTATE_DIRTY) continue; /* make sure that blocks are allocated. */ @@ -191,19 +198,24 @@ if (p->num_records == 0) 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); } } @@ -215,16 +227,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) @@ -239,13 +253,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; @@ -263,11 +277,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; @@ -281,9 +295,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); @@ -308,11 +340,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; @@ -338,14 +370,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;