-/*
- * Copyright (c) 2000-2002, Index Data.
- * See the file LICENSE for details.
- *
- * $Id: isamb.c,v 1.18 2002-07-15 11:50:45 adam Exp $
- */
+/* $Id: isamb.c,v 1.25 2003-03-20 14:37:35 adam Exp $
+ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
+ 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.
+*/
+
+#include <string.h>
#include <yaz/xmalloc.h>
#include <yaz/log.h>
#include <isamb.h>
int last_block;
int block_size;
int block_max;
+ int free_list;
};
#define ISAMB_DATA_OFFSET 3
struct ISAMB_cache_entry {
ISAMB_P pos;
- char *buf;
+ unsigned char *buf;
int dirty;
int hits;
struct ISAMB_cache_entry *next;
struct ISAMB_file *file;
int no_cat;
int cache; /* 0=no cache, 1=use cache, -1=dummy isam (for testing only) */
+ int log_io; /* log level for bf_read/bf_write calls */
+ int log_freelist; /* log level for freelist handling */
};
struct ISAMB_block {
int size;
int leaf;
int dirty;
+ int deleted;
int offset;
char *bytes;
unsigned char *buf;
void *decodeClientData;
+ int log_rw;
};
struct ISAMB_PP_s {
isamb->method = (ISAMC_M) xmalloc (sizeof(*method));
memcpy (isamb->method, method, sizeof(*method));
isamb->no_cat = 4;
+ isamb->log_io = 0;
+ isamb->log_freelist = 0;
isamb->cache = cache;
+ assert (cache == 0);
isamb->file = xmalloc (sizeof(*isamb->file) * isamb->no_cat);
for (i = 0; i<isamb->no_cat; i++)
{
isamb->file[i].head.last_block = isamb->file[i].head.first_block;
isamb->file[i].head.block_size = b_size;
isamb->file[i].head.block_max = b_size - ISAMB_DATA_OFFSET;
+ isamb->file[i].head.free_list = 0;
}
assert (isamb->file[i].head.block_size >= ISAMB_DATA_OFFSET);
isamb->file[i].head_dirty = 0;
b->file[cat].cache_entries = ce_this->next;
if (ce_this->dirty)
+ {
+ yaz_log (b->log_io, "bf_write: flush_blocks");
bf_write (b->file[cat].bf, ce_this->pos, 0, 0, ce_this->buf);
+ }
xfree (ce_this->buf);
xfree (ce_this);
}
ce_this = *ce_last;
*ce_last = 0; /* remove the last entry from list */
if (ce_this->dirty)
+ {
+ yaz_log (b->log_io, "bf_write: get_block");
bf_write (b->file[cat].bf, ce_this->pos, 0, 0, ce_this->buf);
+ }
xfree (ce_this->buf);
xfree (ce_this);
}
b->file[cat].cache_entries = ce_this;
ce_this->buf = xmalloc (ISAMB_CACHE_ENTRY_SIZE);
ce_this->pos = norm;
+ yaz_log (b->log_io, "bf_read: get_block");
if (!bf_read (b->file[cat].bf, norm, 0, 0, ce_this->buf))
memset (ce_this->buf, 0, ISAMB_CACHE_ENTRY_SIZE);
if (wr)
bf_write (isamb->file[i].bf, 0, 0,
sizeof(struct ISAMB_head), &isamb->file[i].head);
+ bf_close (isamb->file[i].bf);
}
xfree (isamb->file);
xfree (isamb->method);
if (!get_block (b, pos, p->buf, 0))
{
+ yaz_log (b->log_io, "bf_read: open_block");
if (!bf_read (b->file[cat].bf, pos/4, 0, 0, p->buf))
{
yaz_log (LOG_FATAL, "read failure for pos=%ld block=%ld",
}
p->bytes = p->buf + ISAMB_DATA_OFFSET;
p->leaf = p->buf[0];
- p->size = p->buf[1] + 256 * p->buf[2] - ISAMB_DATA_OFFSET;
+ p->size = (p->buf[1] + 256 * p->buf[2]) - ISAMB_DATA_OFFSET;
+ if (p->size < 0)
+ {
+ fprintf (stderr, "pos=%d\n", pos);
+ }
+ assert (p->size >= 0);
p->offset = 0;
p->dirty = 0;
+ p->deleted = 0;
p->decodeClientData = (*b->method->code_start)(ISAMC_DECODE);
return p;
}
struct ISAMB_block *new_block (ISAMB b, int leaf, int cat)
{
struct ISAMB_block *p;
- int block_no;
-
+
p = xmalloc (sizeof(*p));
- block_no = b->file[cat].head.last_block++;
- p->cat = cat;
- p->pos = block_no * 4 + cat;
+ p->buf = xmalloc (b->file[cat].head.block_size);
+
+ if (!b->file[cat].head.free_list)
+ {
+ int block_no;
+ block_no = b->file[cat].head.last_block++;
+ p->pos = block_no * 4 + cat;
+ }
+ else
+ {
+ p->pos = b->file[cat].head.free_list;
+ assert((p->pos & 3) == cat);
+ if (!get_block (b, p->pos, p->buf, 0))
+ {
+ yaz_log (b->log_io, "bf_read: new_block");
+ if (!bf_read (b->file[cat].bf, p->pos/4, 0, 0, p->buf))
+ {
+ yaz_log (LOG_FATAL, "read failure for pos=%ld block=%ld",
+ (long) p->pos/4, (long) p->pos/4);
+ abort ();
+ }
+ }
+ yaz_log (b->log_freelist, "got block %d from freelist %d:%d", p->pos,
+ cat, p->pos/4);
+ memcpy (&b->file[cat].head.free_list, p->buf, sizeof(int));
+ }
p->cat = cat;
b->file[cat].head_dirty = 1;
- p->buf = xmalloc (b->file[cat].head.block_size);
memset (p->buf, 0, b->file[cat].head.block_size);
p->bytes = p->buf + ISAMB_DATA_OFFSET;
p->leaf = leaf;
p->size = 0;
p->dirty = 1;
+ p->deleted = 0;
p->offset = 0;
p->decodeClientData = (*b->method->code_start)(ISAMC_DECODE);
return p;
return new_block (b, 0, cat);
}
+static void check_block (ISAMB b, struct ISAMB_block *p)
+{
+ if (p->leaf)
+ {
+ ;
+ }
+ else
+ {
+ /* sanity check */
+ char *startp = p->bytes;
+ char *src = startp;
+ char *endp = p->bytes + p->size;
+ int pos;
+
+ decode_ptr (&src, &pos);
+ assert ((pos&3) == p->cat);
+ while (src != endp)
+ {
+ int item_len;
+ decode_ptr (&src, &item_len);
+ assert (item_len > 0 && item_len < 30);
+ src += item_len;
+ decode_ptr (&src, &pos);
+ assert ((pos&3) == p->cat);
+ }
+ }
+}
+
void close_block (ISAMB b, struct ISAMB_block *p)
{
if (!p)
return;
- if (p->dirty)
+ if (p->deleted)
+ {
+ yaz_log (b->log_freelist, "release block %d from freelist %d:%d",
+ p->pos, p->cat, p->pos/4);
+ memcpy (p->buf, &b->file[p->cat].head.free_list, sizeof(int));
+ b->file[p->cat].head.free_list = p->pos;
+ if (!get_block (b, p->pos, p->buf, 1))
+ {
+ yaz_log (b->log_io, "bf_write: close_block (deleted)");
+ bf_write (b->file[p->cat].bf, p->pos/4, 0, 0, p->buf);
+ }
+ }
+ else if (p->dirty)
{
int size = p->size + ISAMB_DATA_OFFSET;
+ assert (p->size >= 0);
p->buf[0] = p->leaf;
p->buf[1] = size & 255;
p->buf[2] = size >> 8;
+ check_block(b, p);
if (!get_block (b, p->pos, p->buf, 1))
+ {
+ yaz_log (b->log_io, "bf_write: close_block");
bf_write (b->file[p->cat].bf, p->pos/4, 0, 0, p->buf);
+ }
}
(*b->method->code_stop)(ISAMC_DECODE, p->decodeClientData);
xfree (p->buf);
*sp = 0;
+ assert(p->size >= 0);
decode_ptr (&src, &pos);
while (src != endp)
{
int item_len;
int d;
+ char *src0 = src;
decode_ptr (&src, &item_len);
d = (*b->method->compare_item)(src, lookahead_item);
if (d > 0)
more = insert_sub (b, &sub_p1, lookahead_item, mode,
stream, &sub_p2,
sub_item, &sub_size, src);
+ src = src0;
break;
}
src += item_len;
dst += endp - src;
}
p->size = dst - dst_buf;
+ assert (p->size >= 0);
if (p->size <= b->file[p->cat].head.block_max)
{
memcpy (startp, dst_buf, dst - dst_buf);
new_size > b->file[p->cat].head.block_max)
{
/* non-btree block will be removed */
+ p->deleted = 1;
close_block (b, p);
/* delete it too!! */
p = 0; /* make a new one anyway */
void isamb_pp_close (ISAMB_PP pp)
{
- return isamb_pp_close_x (pp, 0, 0);
+ isamb_pp_close_x (pp, 0, 0);
}
int isamb_pp_read (ISAMB_PP pp, void *buf)
projects / idzebra-moved-to-github.git / blobdiff