X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=isamc%2Fmerge.c;h=e0b7fce8e07602125d8bb00ce7f42f0350572f7b;hb=ef696645cc3b7e0f4027008d1dc589c0f0f90c1f;hp=28aa2bf74a4a764279ab9c8494e4159ec98d4af8;hpb=f35acdb246c32bc8330fd77104f952711ad1bff5;p=idzebra-moved-to-github.git diff --git a/isamc/merge.c b/isamc/merge.c index 28aa2bf..e0b7fce 100644 --- a/isamc/merge.c +++ b/isamc/merge.c @@ -4,7 +4,16 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: merge.c,v $ - * Revision 1.8 1998-03-18 09:23:55 adam + * Revision 1.11 1999-05-26 07:49:14 adam + * C++ compilation. + * + * Revision 1.10 1998/03/19 12:22:09 adam + * Minor change. + * + * Revision 1.9 1998/03/19 10:04:38 adam + * Minor changes. + * + * Revision 1.8 1998/03/18 09:23:55 adam * Blocks are stored in chunks on free list - up to factor 2 in speed. * Fixed bug that could occur in block category rearrangemen. * @@ -52,13 +61,14 @@ struct isc_merge_block { int dirty; /* block is different from that on file */ }; -static void opt_blocks (ISAMC is, struct isc_merge_block *mb, int ptr) +static void opt_blocks (ISAMC is, struct isc_merge_block *mb, int ptr, + int last) { int i, no_dirty = 0; for (i = 0; imethod->debug; struct isc_merge_block mb[200]; @@ -199,7 +213,7 @@ ISAMC_P isc_merge (ISAMC is, ISAMC_P ipos, ISAMC_I data) f_more = 1; cat = pp->cat; - if (is->method->debug > 1) + if (debug > 1) logf (LOG_LOG, "isc: isc_merge begin %d %d", cat, pp->pos); /* read first item from i */ @@ -230,12 +244,13 @@ ISAMC_P isc_merge (ISAMC is, ISAMC_P ipos, ISAMC_I data) /* the resulting output block is too small/empty. Delete the original (if any) */ - if (is->method->debug > 3) + if (debug > 3) logf (LOG_LOG, "isc: release A"); if (mb[ptr].block) isc_release_block (is, pp->cat, mb[ptr].block); mb[ptr].block = pp->pos; - mb[ptr].dirty = 1; + if (!mb[ptr].dirty) + mb[ptr].dirty = 1; if (ptr > 0) mb[ptr-1].dirty = 1; } @@ -243,9 +258,9 @@ ISAMC_P isc_merge (ISAMC is, ISAMC_P ipos, ISAMC_I data) { /* indicate new boundary based on the original file */ mb[++ptr].block = pp->pos; - mb[ptr].dirty = (mb[ptr-1].dirty > 1) ? 1 : 0; + mb[ptr].dirty = last_dirty; mb[ptr].offset = r_offset; - if (is->method->debug > 3) + if (debug > 3) logf (LOG_LOG, "isc: bound ptr=%d,offset=%d", ptr, r_offset); if (cat==is->max_cat && ptr >= is->method->max_blocks_mem) @@ -253,7 +268,7 @@ ISAMC_P isc_merge (ISAMC is, ISAMC_P ipos, ISAMC_I data) /* We are dealing with block(s) of max size. Block(s) except 1 will be flushed. */ - if (is->method->debug > 2) + if (debug > 2) logf (LOG_LOG, "isc: flush A %d sections", ptr); flush_blocks (is, mb, ptr-1, r_buf, &firstpos, cat, 0, &pp->numKeys); @@ -273,6 +288,7 @@ ISAMC_P isc_merge (ISAMC is, ISAMC_P ipos, ISAMC_I data) } border = get_border (is, mb, ptr, cat, firstpos); } + last_dirty = 0; if (!f_more) cmp = -1; else if (!i_more) @@ -302,6 +318,7 @@ ISAMC_P isc_merge (ISAMC is, ISAMC_P ipos, ISAMC_I data) { /* no! delete the item */ r_item = NULL; + last_dirty = 1; mb[ptr].dirty = 2; } } @@ -335,6 +352,7 @@ ISAMC_P isc_merge (ISAMC is, ISAMC_P ipos, ISAMC_I data) } memcpy (r_item, i_item, i_item_ptr - i_item); mb[ptr].dirty = 2; + last_dirty = 1; /* move i */ i_item_ptr = i_item; i_more = (*data->read_item)(data->clientData, &i_item_ptr, @@ -353,7 +371,7 @@ ISAMC_P isc_merge (ISAMC is, ISAMC_P ipos, ISAMC_I data) if (border < new_offset && border >= r_offset) { - if (is->method->debug > 2) + if (debug > 2) logf (LOG_LOG, "isc: border %d %d", ptr, border); /* Max size of current block category reached ... make new virtual block entry */ @@ -366,7 +384,7 @@ ISAMC_P isc_merge (ISAMC is, ISAMC_P ipos, ISAMC_I data) except one will be flushed. Note: the block(s) are surely not the last one(s). */ - if (is->method->debug > 2) + if (debug > 2) logf (LOG_LOG, "isc: flush B %d sections", ptr-1); flush_blocks (is, mb, ptr-1, r_buf, &firstpos, cat, 0, &pp->numKeys); @@ -413,23 +431,23 @@ 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 (is->method->debug > 3) + if (debug > 3) logf (LOG_LOG, "isc: remap %d border=%d", i, border); if (mb[i+1].offset > border && mb[i].offset <= border) { - if (is->method->debug > 3) + if (debug > 3) logf (LOG_LOG, "isc: to %d %d", j, mb[i].offset); mb[++j].dirty = 1; mb[j].block = 0; mb[j].offset = mb[i].offset; } } - if (is->method->debug > 2) + if (debug > 2) logf (LOG_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 (is->method->debug > 3) + if (debug > 3) logf (LOG_LOG, "isc: border=%d r_offset=%d", border, r_offset); } } @@ -443,7 +461,7 @@ ISAMC_P isc_merge (ISAMC is, ISAMC_P ipos, ISAMC_I data) { /* empty output. Release last block if any */ if (cat == pp->cat && mb[ptr].block) { - if (is->method->debug > 3) + if (debug > 3) logf (LOG_LOG, "isc: release C"); isc_release_block (is, pp->cat, mb[ptr].block); mb[ptr].block = 0; @@ -452,7 +470,7 @@ ISAMC_P isc_merge (ISAMC is, ISAMC_P ipos, ISAMC_I data) } } - if (is->method->debug > 2) + if (debug > 2) logf (LOG_LOG, "isc: flush C, %d sections", ptr); if (firstpos) @@ -461,7 +479,7 @@ ISAMC_P isc_merge (ISAMC is, ISAMC_P ipos, ISAMC_I data) has changed */ if (numKeys != isc_pp_num (pp)) { - if (is->method->debug > 2) + if (debug > 2) logf (LOG_LOG, "isc: patch num keys firstpos=%d num=%d", firstpos, numKeys); bf_write (is->files[cat].bf, firstpos, ISAMC_BLOCK_OFFSET_N, @@ -480,7 +498,7 @@ ISAMC_P isc_merge (ISAMC is, ISAMC_P ipos, ISAMC_I data) (*is->method->code_stop)(ISAMC_ENCODE, r_clientData); if (!firstpos) cat = 0; - if (is->method->debug > 1) + if (debug > 1) logf (LOG_LOG, "isc: isc_merge return %d %d", cat, firstpos); isc_pp_close (pp); return cat + firstpos * 8;