X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=isamc%2Fmerge.c;h=e8d92473df904c832b700c93320e073beccd9ce6;hb=0e56fa84bb4a5985c19a21926e86862c08d84689;hp=5b5669fe14f6641fb5b5830d5bcb1674beacac6b;hpb=2e4e9c6def27f1e1463dcb6f205fab6a98054f38;p=idzebra-moved-to-github.git diff --git a/isamc/merge.c b/isamc/merge.c index 5b5669f..e8d9247 100644 --- a/isamc/merge.c +++ b/isamc/merge.c @@ -1,4 +1,4 @@ -/* $Id: merge.c,v 1.24 2004-08-04 08:35:24 adam Exp $ +/* $Id: merge.c,v 1.27 2004-11-19 10:27:09 heikki Exp $ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004 Index Data Aps @@ -24,7 +24,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #include #include -#include +#include #include "isamc-p.h" struct isc_merge_block { @@ -103,7 +103,7 @@ static void flush_blocks (ISAMC is, struct isc_merge_block *mb, int ptr, if (!*firstpos) *firstpos = mb[i].block; if (is->method->debug > 2) - logf (LOG_LOG, "isc: skip ptr=%d size=%d %d " ZINT_FORMAT, + yaz_log (YLOG_LOG, "isc: skip ptr=%d size=%d %d " ZINT_FORMAT, i, ssize, cat, mb[i].block); ++(is->files[cat].no_skip_writes); continue; @@ -118,7 +118,7 @@ static void flush_blocks (ISAMC is, struct isc_merge_block *mb, int ptr, memcpy (src+sizeof(zint)+sizeof(ssize), numkeys, sizeof(*numkeys)); if (is->method->debug > 2) - logf (LOG_LOG, "isc: flush ptr=%d numk=" ZINT_FORMAT " size=%d nextpos=" + yaz_log (YLOG_LOG, "isc: flush ptr=%d numk=" ZINT_FORMAT " size=%d nextpos=" ZINT_FORMAT, i, *numkeys, (int) ssize, mb[i+1].block); } else @@ -126,7 +126,7 @@ static void flush_blocks (ISAMC is, struct isc_merge_block *mb, int ptr, src = r_buf + mb[i].offset - ISAMC_BLOCK_OFFSET_N; ssize += ISAMC_BLOCK_OFFSET_N; if (is->method->debug > 2) - logf (LOG_LOG, "isc: flush ptr=%d size=%d nextpos=" ZINT_FORMAT, + yaz_log (YLOG_LOG, "isc: flush ptr=%d size=%d nextpos=" ZINT_FORMAT, i, (int) ssize, mb[i+1].block); } memcpy (src, &mb[i+1].block, sizeof(zint)); @@ -135,8 +135,8 @@ static void flush_blocks (ISAMC is, struct isc_merge_block *mb, int ptr, } } -static int get_border (ISAMC is, struct isc_merge_block *mb, int ptr, - int cat, int firstpos) +static int get_border (ISAMC is, struct isc_merge_block *mb, zint ptr, + int cat, zint firstpos) { /* Border set to initial fill or block size depending on whether we are creating a new one or updating and old one. @@ -172,7 +172,7 @@ ISAMC_P isc_merge (ISAMC is, ISAMC_P ipos, ISAMC_I *data) int r_offset = 0; /* current offset in r_buf */ int ptr = 0; /* pointer */ void *r_clientData; /* encode client data */ - int border; + zint border; zint numKeys = 0; r_clientData = (*is->method->codec.start)(); @@ -187,7 +187,7 @@ ISAMC_P isc_merge (ISAMC is, ISAMC_P ipos, ISAMC_I *data) cat = pp->cat; if (debug > 1) - logf (LOG_LOG, "isc: isc_merge begin %d " ZINT_FORMAT, cat, pp->pos); + yaz_log (YLOG_LOG, "isc: isc_merge begin %d " ZINT_FORMAT, cat, pp->pos); /* read first item from i */ i_item_ptr = i_item; @@ -218,7 +218,7 @@ ISAMC_P isc_merge (ISAMC is, ISAMC_P ipos, ISAMC_I *data) the original (if any) */ if (debug > 3) - logf (LOG_LOG, "isc: release A"); + yaz_log (YLOG_LOG, "isc: release A"); if (mb[ptr].block) isc_release_block (is, pp->cat, mb[ptr].block); mb[ptr].block = pp->pos; @@ -234,7 +234,7 @@ ISAMC_P isc_merge (ISAMC is, ISAMC_P ipos, ISAMC_I *data) mb[ptr].dirty = last_dirty; mb[ptr].offset = r_offset; if (debug > 3) - logf (LOG_LOG, "isc: bound ptr=%d,offset=%d", + yaz_log (YLOG_LOG, "isc: bound ptr=%d,offset=%d", ptr, r_offset); if (cat==is->max_cat && ptr >= is->method->max_blocks_mem) { @@ -242,7 +242,7 @@ ISAMC_P isc_merge (ISAMC is, ISAMC_P ipos, ISAMC_I *data) except 1 will be flushed. */ if (debug > 2) - logf (LOG_LOG, "isc: flush A %d sections", ptr); + yaz_log (YLOG_LOG, "isc: flush A %d sections", ptr); flush_blocks (is, mb, ptr-1, r_buf, &firstpos, cat, 0, &pp->numKeys); mb[0].block = mb[ptr-1].block; @@ -319,7 +319,7 @@ ISAMC_P isc_merge (ISAMC is, ISAMC_P ipos, ISAMC_I *data) { if (!i_mode) /* delete item which isn't there? */ { - logf (LOG_FATAL, "Inconsistent register at offset %d", + yaz_log (YLOG_FATAL, "Inconsistent register at offset %d", r_offset); abort (); } @@ -345,7 +345,8 @@ ISAMC_P isc_merge (ISAMC is, ISAMC_P ipos, ISAMC_I *data) if (border < new_offset && border >= r_offset) { if (debug > 2) - logf (LOG_LOG, "isc: border %d %d", ptr, border); + yaz_log (YLOG_LOG, "isc: border %d " ZINT_FORMAT, + ptr, border); /* Max size of current block category reached ... make new virtual block entry */ mb[++ptr].block = 0; @@ -358,7 +359,7 @@ ISAMC_P isc_merge (ISAMC is, ISAMC_P ipos, ISAMC_I *data) surely not the last one(s). */ if (debug > 2) - logf (LOG_LOG, "isc: flush B %d sections", ptr-1); + yaz_log (YLOG_LOG, "isc: flush B %d sections", ptr-1); flush_blocks (is, mb, ptr-1, r_buf, &firstpos, cat, 0, &pp->numKeys); mb[0].block = mb[ptr-1].block; @@ -405,23 +406,24 @@ ISAMC_P isc_merge (ISAMC is, ISAMC_P ipos, ISAMC_I *data) int border = is->method->filecat[cat].ifill - ISAMC_BLOCK_OFFSET_1 + mb[j].offset; if (debug > 3) - logf (LOG_LOG, "isc: remap %d border=%d", i, border); + yaz_log (YLOG_LOG, "isc: remap %d border=%d", i, border); if (mb[i+1].offset > border && mb[i].offset <= border) { if (debug > 3) - logf (LOG_LOG, "isc: to %d %d", j, mb[i].offset); + yaz_log (YLOG_LOG, "isc: to %d %d", j, mb[i].offset); mb[++j].dirty = 1; mb[j].block = 0; mb[j].offset = mb[i].offset; } } if (debug > 2) - logf (LOG_LOG, "isc: remap from %d to %d sections to cat %d", + yaz_log (YLOG_LOG, "isc: remap from %d to %d sections to cat %d", ptr, j, cat); ptr = j; border = get_border (is, mb, ptr, cat, firstpos); if (debug > 3) - logf (LOG_LOG, "isc: border=%d r_offset=%d", border, r_offset); + yaz_log (YLOG_LOG, "isc: border=" ZINT_FORMAT " r_offset=%d", + border, r_offset); } } if (mb[ptr].offset < r_offset) @@ -435,7 +437,7 @@ ISAMC_P isc_merge (ISAMC is, ISAMC_P ipos, ISAMC_I *data) if (cat == pp->cat && mb[ptr].block) { if (debug > 3) - logf (LOG_LOG, "isc: release C"); + yaz_log (YLOG_LOG, "isc: release C"); isc_release_block (is, pp->cat, mb[ptr].block); mb[ptr].block = 0; if (ptr > 0) @@ -444,7 +446,7 @@ ISAMC_P isc_merge (ISAMC is, ISAMC_P ipos, ISAMC_I *data) } if (debug > 2) - logf (LOG_LOG, "isc: flush C, %d sections", ptr); + yaz_log (YLOG_LOG, "isc: flush C, %d sections", ptr); if (firstpos) { @@ -453,7 +455,7 @@ ISAMC_P isc_merge (ISAMC is, ISAMC_P ipos, ISAMC_I *data) if (numKeys != isc_pp_num (pp)) { if (debug > 2) - logf (LOG_LOG, "isc: patch num keys firstpos=" ZINT_FORMAT " num=" ZINT_FORMAT, + yaz_log (YLOG_LOG, "isc: patch num keys firstpos=" ZINT_FORMAT " num=" ZINT_FORMAT, firstpos, numKeys); bf_write (is->files[cat].bf, firstpos, ISAMC_BLOCK_OFFSET_N, sizeof(numKeys), &numKeys); @@ -472,7 +474,7 @@ ISAMC_P isc_merge (ISAMC is, ISAMC_P ipos, ISAMC_I *data) if (!firstpos) cat = 0; if (debug > 1) - logf (LOG_LOG, "isc: isc_merge return %d " ZINT_FORMAT, cat, firstpos); + yaz_log (YLOG_LOG, "isc: isc_merge return %d " ZINT_FORMAT, cat, firstpos); isc_pp_close (pp); return cat + firstpos * 8; }