X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=isamb%2Fisamb.c;h=343e5e3794e18de0d20a4e6edac4a01625db3c30;hb=1dec188ccbdafb0ec7b7c98857d701a7b77d46a1;hp=162577486bfe4f9fc2854e663fbab9aeff1ad208;hpb=175aced6e1fba324771b361822e8a27a38e567bb;p=idzebra-moved-to-github.git diff --git a/isamb/isamb.c b/isamb/isamb.c index 1625774..343e5e3 100644 --- a/isamb/isamb.c +++ b/isamb/isamb.c @@ -2,7 +2,7 @@ * Copyright (c) 2000-2002, Index Data. * See the file LICENSE for details. * - * $Id: isamb.c,v 1.12 2002-04-30 08:28:37 adam Exp $ + * $Id: isamb.c,v 1.17 2002-06-19 10:29:17 adam Exp $ */ #include #include @@ -74,29 +74,32 @@ void decode_ptr (char **src, int *pos) ISAMB isamb_open (BFiles bfs, const char *name, int writeflag, ISAMC_M method) { ISAMB isamb = xmalloc (sizeof(*isamb)); - int i, b_size = 64; + int i, b_size = 32; isamb->bfs = bfs; isamb->method = (ISAMC_M) xmalloc (sizeof(*method)); memcpy (isamb->method, method, sizeof(*method)); - isamb->no_cat = 3; + isamb->no_cat = 4; isamb->file = xmalloc (sizeof(*isamb->file) * isamb->no_cat); for (i = 0; ino_cat; i++) { char fname[DST_BUF_SIZE]; - isamb->file[i].head.first_block = 1; - isamb->file[i].head.last_block = 1; - isamb->file[i].head.block_size = b_size; - isamb->file[i].head.block_max = b_size - ISAMB_DATA_OFFSET; - b_size = b_size * 4; isamb->file[i].head_dirty = 0; - sprintf (fname, "%s-%d", name, i); - isamb->file[i].bf = - bf_open (bfs, fname, isamb->file[i].head.block_size, writeflag); + sprintf (fname, "%s%c", name, i+'A'); + isamb->file[i].bf = bf_open (bfs, fname, b_size, writeflag); - bf_read (isamb->file[i].bf, 0, 0, sizeof(struct ISAMB_head), - &isamb->file[i].head); + if (!bf_read (isamb->file[i].bf, 0, 0, sizeof(struct ISAMB_head), + &isamb->file[i].head)) + { + isamb->file[i].head.first_block = 1; + isamb->file[i].head.last_block = 1; + isamb->file[i].head.block_size = b_size; + isamb->file[i].head.block_max = b_size - ISAMB_DATA_OFFSET; + } + assert (isamb->file[i].head.block_size >= ISAMB_DATA_OFFSET); + isamb->file[i].head_dirty = 0; + b_size = b_size * 4; } return isamb; } @@ -125,7 +128,12 @@ struct ISAMB_block *open_block (ISAMB b, ISAMC_P pos) p->pos = pos; p->cat = pos & 3; p->buf = xmalloc (b->file[cat].head.block_size); - bf_read (b->file[cat].bf, pos/4, 0, 0, p->buf); + if (!bf_read (b->file[cat].bf, pos/4, 0, 0, p->buf)) + { + yaz_log (LOG_FATAL, "read failure for pos=%ld block=%ld", + (long) pos, (long) pos/4); + abort(); + } p->bytes = p->buf + ISAMB_DATA_OFFSET; p->leaf = p->buf[0]; p->size = p->buf[1] + 256 * p->buf[2] - ISAMB_DATA_OFFSET; @@ -186,15 +194,16 @@ void close_block (ISAMB b, struct ISAMB_block *p) } int insert_sub (ISAMB b, struct ISAMB_block **p, - void *new_item, + void *new_item, int *mode, ISAMC_I stream, struct ISAMB_block **sp, void *sub_item, int *sub_size, void *max_item); int insert_int (ISAMB b, struct ISAMB_block *p, void *lookahead_item, + int *mode, ISAMC_I stream, struct ISAMB_block **sp, - void *split_item, int *split_size) + void *split_item, int *split_size, void *last_max_item) { char *startp = p->bytes; char *src = startp; @@ -218,7 +227,8 @@ int insert_int (ISAMB b, struct ISAMB_block *p, void *lookahead_item, { sub_p1 = open_block (b, pos); assert (sub_p1); - more = insert_sub (b, &sub_p1, lookahead_item, stream, &sub_p2, + more = insert_sub (b, &sub_p1, lookahead_item, mode, + stream, &sub_p2, sub_item, &sub_size, src); break; } @@ -229,8 +239,8 @@ int insert_int (ISAMB b, struct ISAMB_block *p, void *lookahead_item, { sub_p1 = open_block (b, pos); assert (sub_p1); - more = insert_sub (b, &sub_p1, lookahead_item, stream, &sub_p2, - sub_item, &sub_size, 0); + more = insert_sub (b, &sub_p1, lookahead_item, mode, stream, &sub_p2, + sub_item, &sub_size, last_max_item); } if (sub_p2) { @@ -297,7 +307,7 @@ int insert_int (ISAMB b, struct ISAMB_block *p, void *lookahead_item, int insert_leaf (ISAMB b, struct ISAMB_block **sp1, void *lookahead_item, - ISAMC_I stream, struct ISAMB_block **sp2, + int *lookahead_mode, ISAMC_I stream, struct ISAMB_block **sp2, void *sub_item, int *sub_size, void *max_item) { @@ -329,17 +339,23 @@ int insert_leaf (ISAMB b, struct ISAMB_block **sp1, void *lookahead_item, char *dst_item = 0; char *dst_0 = dst; char *lookahead_next; - int lookahead_mode; int d = -1; if (lookahead_item) d = (*b->method->compare_item)(file_item_buf, lookahead_item); - if (d > 0) + if (d > 0) + { dst_item = lookahead_item; + assert (*lookahead_mode); + } else dst_item = file_item_buf; - if (!half1 && dst > cut) + if (!*lookahead_mode && d == 0) + { + p->dirty = 1; + } + else if (!half1 && dst > cut) { char *dst_item_0 = dst_item; half1 = dst; /* candidate for splitting */ @@ -365,15 +381,15 @@ int insert_leaf (ISAMB b, struct ISAMB_block **sp1, void *lookahead_item, lookahead_next = lookahead_item; if (!(*stream->read_item)(stream->clientData, &lookahead_next, - &lookahead_mode)) + lookahead_mode)) { lookahead_item = 0; more = 0; } - if (max_item && + if (lookahead_item && max_item && (*b->method->compare_item)(max_item, lookahead_item) <= 0) { - yaz_log (LOG_LOG, "max_item 1"); + /* max_item 1 */ lookahead_item = 0; } @@ -384,7 +400,7 @@ int insert_leaf (ISAMB b, struct ISAMB_block **sp1, void *lookahead_item, { lookahead_next = lookahead_item; if (!(*stream->read_item)(stream->clientData, - &lookahead_next, &lookahead_mode)) + &lookahead_next, lookahead_mode)) { lookahead_item = 0; more = 0; @@ -406,17 +422,21 @@ int insert_leaf (ISAMB b, struct ISAMB_block **sp1, void *lookahead_item, maxp = dst_buf + b->file[b->no_cat-1].head.block_max + quater; while (lookahead_item) { - int lookahead_mode; char *dst_item = lookahead_item; char *dst_0 = dst; if (max_item && (*b->method->compare_item)(max_item, lookahead_item) <= 0) { - yaz_log (LOG_LOG, "max_item 2"); + /* max_item 2 */ break; } - if (!half1 && dst > cut) + if (!*lookahead_mode) + { + yaz_log (LOG_WARN, "Inconsistent register (2)"); + abort(); + } + else if (!half1 && dst > cut) { char *dst_item_0 = dst_item; half1 = dst; /* candidate for splitting */ @@ -440,7 +460,7 @@ int insert_leaf (ISAMB b, struct ISAMB_block **sp1, void *lookahead_item, p->dirty = 1; dst_item = lookahead_item; if (!(*stream->read_item)(stream->clientData, &dst_item, - &lookahead_mode)) + lookahead_mode)) { lookahead_item = 0; more = 0; @@ -506,16 +526,18 @@ int insert_leaf (ISAMB b, struct ISAMB_block **sp1, void *lookahead_item, } int insert_sub (ISAMB b, struct ISAMB_block **p, void *new_item, + int *mode, ISAMC_I stream, struct ISAMB_block **sp, void *sub_item, int *sub_size, void *max_item) { if (!*p || (*p)->leaf) - return insert_leaf (b, p, new_item, stream, sp, sub_item, sub_size, - max_item); + return insert_leaf (b, p, new_item, mode, stream, sp, sub_item, + sub_size, max_item); else - return insert_int (b, *p, new_item, stream, sp, sub_item, sub_size); + return insert_int (b, *p, new_item, mode, stream, sp, sub_item, + sub_size, max_item); } int isamb_merge (ISAMB b, ISAMC_P pos, ISAMC_I stream) @@ -535,7 +557,7 @@ int isamb_merge (ISAMB b, ISAMC_P pos, ISAMC_I stream) if (pos) p = open_block (b, pos); - more = insert_sub (b, &p, item_buf, stream, &sp, + more = insert_sub (b, &p, item_buf, &i_mode, stream, &sp, sub_item, &sub_size, 0); if (sp) { /* increase level of tree by one */