-/* $Id: isamb.c,v 1.67 2005-01-15 18:43:05 adam Exp $
+/* $Id: isamb.c,v 1.73 2005-03-08 14:02:15 adam Exp $
Copyright (C) 1995-2005
- Index Data Aps
+ Index Data ApS
This file is part of the Zebra server.
02111-1307, USA.
*/
+#include <stdlib.h>
#include <string.h>
#include <yaz/log.h>
#include <yaz/xmalloc.h>
int block_offset;
};
-/* if 1, interior nodes items are encoded; 0 if not encoded */
+/* if 1, upper nodes items are encoded; 0 if not encoded */
#define INT_ENCODE 1
/* maximum size of encoded buffer */
while (pos > 127)
{
- *bp++ = 128 | (pos & 127);
+ *bp++ = (unsigned char) (128 | (pos & 127));
pos = pos >> 7;
}
- *bp++ = pos;
+ *bp++ = (unsigned char) pos;
*dst = (char *) bp;
}
#else
isamb->bfs = bfs;
isamb->method = (ISAMC_M *) xmalloc(sizeof(*method));
- memcpy (isamb->method, method, sizeof(*method));
+ memcpy(isamb->method, method, sizeof(*method));
isamb->no_cat = CAT_NO;
isamb->log_io = 0;
isamb->log_freelist = 0;
isamb->cache = cache;
isamb->skipped_numbers = 0;
isamb->returned_numbers = 0;
- for (i = 0;i<ISAMB_MAX_LEVEL;i++)
- isamb->skipped_nodes[i]= isamb->accessed_nodes[i]=0;
+ for (i = 0; i<ISAMB_MAX_LEVEL; i++)
+ isamb->skipped_nodes[i] = isamb->accessed_nodes[i] = 0;
assert(cache == 0);
isamb->file = xmalloc(sizeof(*isamb->file) * isamb->no_cat);
decode_ptr(&src, &isamb->file[i].head.first_block);
decode_ptr(&src, &isamb->file[i].head.last_block);
decode_ptr(&src, &zint_tmp);
- isamb->file[i].head.block_size = zint_tmp;
+ isamb->file[i].head.block_size = (int) zint_tmp;
decode_ptr(&src, &zint_tmp);
- isamb->file[i].head.block_max = zint_tmp;
+ isamb->file[i].head.block_max = (int) zint_tmp;
decode_ptr(&src, &isamb->file[i].head.free_list);
}
assert (isamb->file[i].head.block_size >= isamb->file[i].head.block_offset);
}
}
-static int get_block (ISAMB b, ISAMC_P pos, char *userbuf, int wr)
+static int cache_block (ISAMB b, ISAMC_P pos, char *userbuf, int wr)
{
int cat = (int) (pos&CAT_MASK);
int off = (int) (((pos/CAT_MAX) &
*ce_last = 0; /* remove the last entry from list */
if (ce_this->dirty)
{
- yaz_log(b->log_io, "bf_write: get_block");
+ yaz_log(b->log_io, "bf_write: cache_block");
bf_write(b->file[cat].bf, ce_this->pos, 0, 0, ce_this->buf);
}
xfree(ce_this->buf);
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");
+ yaz_log(b->log_io, "bf_read: cache_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)
void isamb_close (ISAMB isamb)
{
int i;
- for (i = 0;isamb->accessed_nodes[i];i++)
+ for (i = 0; isamb->accessed_nodes[i]; i++)
yaz_log(YLOG_DEBUG, "isamb_close level leaf-%d: "ZINT_FORMAT" read, "
ZINT_FORMAT" skipped",
i, isamb->accessed_nodes[i], isamb->skipped_nodes[i]);
p->buf = xmalloc(b->file[cat].head.block_size);
p->cbuf = 0;
- if (!get_block (b, pos, p->buf, 0))
+ if (!cache_block (b, pos, p->buf, 0))
{
yaz_log(b->log_io, "bf_read: open_block");
if (!bf_read(b->file[cat].bf, pos/CAT_MAX, 0, 0, p->buf))
{
p->pos = b->file[cat].head.free_list;
assert((p->pos & CAT_MASK) == cat);
- if (!get_block (b, p->pos, p->buf, 0))
+ if (!cache_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/CAT_MAX, 0, 0, p->buf))
p->pos, p->cat, p->pos/CAT_MAX);
memcpy (p->buf, &b->file[p->cat].head.free_list, sizeof(zint));
b->file[p->cat].head.free_list = p->pos;
- if (!get_block (b, p->pos, p->buf, 1))
+ if (!cache_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/CAT_MAX, 0, 0, p->buf);
p->buf[2] = size >> 8;
encode_ptr(&dst, p->no_items);
check_block(b, p);
- if (!get_block (b, p->pos, p->buf, 1))
+ if (!cache_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/CAT_MAX, 0, 0, p->buf);
/* there was a split - must insert pointer in this one */
char dst_buf[DST_BUF_SIZE];
char *dst = dst_buf;
-
+#if INT_ENCODE
+ const char *sub_item_ptr = sub_item;
+#endif
assert (sub_size < 80 && sub_size > 1);
memcpy (dst, startp, src - startp);
dst += src - startp;
#if INT_ENCODE
- const char *sub_item_ptr = sub_item;
(*b->method->codec.reset)(c1);
(*b->method->codec.encode)(c1, &dst, &sub_item_ptr);
#else
/* must split _this_ block as well .. */
struct ISAMB_block *sub_p3;
#if INT_ENCODE
+ char file_item_buf[DST_ITEM_MAX];
+ char *file_item = file_item_buf;
#else
zint split_size_tmp;
#endif
while (src <= half)
{
#if INT_ENCODE
- char file_item_buf[DST_ITEM_MAX];
- char *file_item = file_item_buf;
+ file_item = file_item_buf;
(*b->method->codec.reset)(c1);
(*b->method->codec.decode)(c1, &file_item, &src);
#else
memcpy (p->bytes, dst_buf, p_new_size);
#if INT_ENCODE
- char file_item_buf[DST_ITEM_MAX];
- char *file_item = file_item_buf;
+ file_item = file_item_buf;
(*b->method->codec.reset)(c1);
(*b->method->codec.decode)(c1, &file_item, &src);
*split_size = file_item - file_item_buf;
{
zint sub_p;
const char *src = p1->bytes + p1->offset;
-
+#if INT_ENCODE
+ void *c1 = (*b->method->codec.start)();
+#endif
decode_ptr(&src, &sub_p);
isamb_unlink(b, sub_p);
- void *c1 = (*b->method->codec.start)();
while (src != p1->bytes + p1->size)
{
decode_ptr(&src, &sub_p);
isamb_unlink(b, sub_p);
}
+#if INT_ENCODE
(*b->method->codec.stop)(c1);
+#endif
}
close_block(b, p1);
return 0;
{ /* increase level of tree by one */
struct ISAMB_block *p2 = new_int (b, p->cat);
char *dst = p2->bytes + p2->size;
+#if INT_ENCODE
void *c1 = (*b->method->codec.start)();
-
+ const char *sub_item_ptr = sub_item;
+#endif
+
encode_ptr(&dst, p->pos);
assert (sub_size < 80 && sub_size > 1);
#if INT_ENCODE
- const char *sub_item_ptr = sub_item;
(*b->method->codec.reset)(c1);
(*b->method->codec.encode)(c1, &dst, &sub_item_ptr);
#else
pos = p2->pos; /* return new super page */
close_block(b, sp);
close_block(b, p2);
+#if INT_ENCODE
(*b->method->codec.stop)(c1);
+#endif
}
else
{
pp->skipped_numbers = 0;
pp->returned_numbers = 0;
pp->scope = scope;
- for (i = 0;i<ISAMB_MAX_LEVEL;i++)
- pp->skipped_nodes[i] = pp->accessed_nodes[i]=0;
+ for (i = 0; i<ISAMB_MAX_LEVEL; i++)
+ pp->skipped_nodes[i] = pp->accessed_nodes[i] = 0;
while (1)
{
struct ISAMB_block *p = open_block(isamb, pos);
return isamb_pp_open_x(isamb, pos, 0, scope);
}
-void isamb_pp_close_x(ISAMB_PP pp, int *size, int *blocks)
+void isamb_pp_close_x(ISAMB_PP pp, zint *size, zint *blocks)
{
int i;
if (!pp)
yaz_log(YLOG_DEBUG, "isamb_pp_close lev=%d returned "ZINT_FORMAT" values, "
"skipped "ZINT_FORMAT,
pp->maxlevel, pp->skipped_numbers, pp->returned_numbers);
- for (i = pp->maxlevel;i>=0;i--)
+ for (i = pp->maxlevel; i>=0; i--)
if (pp->skipped_nodes[i] || pp->accessed_nodes[i])
yaz_log(YLOG_DEBUG, "isamb_pp_close level leaf-%d: "
ZINT_FORMAT" read, "ZINT_FORMAT" skipped", i,
pp->accessed_nodes[i], pp->skipped_nodes[i]);
pp->isamb->skipped_numbers += pp->skipped_numbers;
pp->isamb->returned_numbers += pp->returned_numbers;
- for (i = pp->maxlevel;i>=0;i--)
+ for (i = pp->maxlevel; i>=0; i--)
{
pp->isamb->accessed_nodes[i] += pp->accessed_nodes[i];
pp->isamb->skipped_nodes[i] += pp->skipped_nodes[i];
/* returns the node to (consider to) descend to in *pos) */
struct ISAMB_block *p = pp->block[pp->level];
const char *src;
- ISAMB b = pp->isamb;
#if ISAMB_DEBUG
yaz_log(YLOG_DEBUG, "isamb_pp_climb_level starting "
"at level %d node %d ofs=%d sz=%d",
}
assert(pp->level>0);
close_block(pp->isamb, pp->block[pp->level]);
- pp->block[pp->level]=0;
+ pp->block[pp->level] = 0;
(pp->level)--;
p = pp->block[pp->level];
#if ISAMB_DEBUG
}
else
{
+#if INT_ENCODE
+ char file_item_buf[DST_ITEM_MAX];
+ char *file_item = file_item_buf;
+ ISAMB b = pp->isamb;
+ void *c1 = (*b->method->codec.start)();
+#else
+ zint item_len;
+#endif
/* skip the child we just came from */
#if ISAMB_DEBUG
yaz_log(YLOG_DEBUG, "isam_pp_climb_level: skipping lev=%d ofs=%d sz=%d",
assert (p->offset < p->size);
src = p->bytes + p->offset;
#if INT_ENCODE
- char file_item_buf[DST_ITEM_MAX];
- char *file_item = file_item_buf;
- void *c1 = (*b->method->codec.start)();
(*b->method->codec.decode)(c1, &file_item, &src);
(*b->method->codec.stop)(c1);
#else
- zint item_len;
decode_item_len(&src, &item_len);
src += item_len;
#endif
if (isamb_pp_forward_on_leaf(pp, buf, untilbuf))
{
#if ISAMB_DEBUG
- yaz_log(YLOG_DEBUG, "isamb_pp_forward (f) returning (C) "
- "at level %d node %d ofs=%d sz=%d",
- pp->level, p->pos, p->offset, p->size);
+ yaz_log(YLOG_DEBUG, "isamb_pp_forward (f) returning (c) "
+ "at level %d node %d ofs=%d sz=%d",
+ pp->level, p->pos, p->offset, p->size);
#endif
return 1;
}
assert(current);
assert(p->leaf);
- *total = pp->block[0]->no_items;
+ *total = (double) (pp->block[0]->no_items);
*current = (double) pp->returned_numbers;
#if ISAMB_DEBUG
yaz_log(YLOG_LOG, "isamb_pp_pos returning: cur= %0.1f tot=%0.1f rn="