X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=isamc%2Fisamd.c;h=6dcf0319ca8a9c3bfb0ffca183f5b4937ca3a539;hb=e632770a0cff96f36f61f8c2d98926975ae8f72c;hp=f3f219a4a84511d45b1a49c13329fffa04f29add;hpb=b3aa0c75d2016b90e8f8219ddc907fb80649d13a;p=idzebra-moved-to-github.git diff --git a/isamc/isamd.c b/isamc/isamd.c index f3f219a..6dcf031 100644 --- a/isamc/isamd.c +++ b/isamc/isamd.c @@ -1,18 +1,17 @@ /* * Copyright (c) 1995-1998, Index Data. * See the file LICENSE for details. - * Heikki Levanto - * - * Isamd - isam with diffs + * $Id: isamd.c,v 1.10 1999-08-24 13:17:42 heikki Exp $ * - * todo: Move read_pp into merge-d - * get it to work + * Isamd - isam with diffs + * Programmed by: Heikki Levanto * + * Todo + * - Statistics are missing and/or completely wrong + * - Lots of code stolen from isamc, not all needed any more */ - - #include #include #include @@ -28,20 +27,23 @@ static void init_fc (ISAMD is, int cat); #define ISAMD_FREELIST_CHUNK 1 -#define SMALL_TEST 1 +#define SMALL_TEST 0 ISAMD_M isamd_getmethod (ISAMD_M me) { static struct ISAMD_filecat_s def_cat[] = { #if SMALL_TEST -/* blocksz, max keys before switching size */ - { 32, 40 }, - { 128, 0 }, +/* blocksz, max. Unused time being */ + { 20, 40 }, + { 32, 0 }, #else - { 24, 40 }, - { 2048, 2048 }, - { 16384, 0 }, - + { 32, 1 }, + { 128, 1 }, + { 512, 1 }, + { 2048, 1 }, + { 8192, 1 }, + { 32768, 1 }, + {131072, 0 }, #endif /* old values from isamc, long time ago... @@ -53,13 +55,9 @@ ISAMD_M isamd_getmethod (ISAMD_M me) { 32768, 0 }, */ -/* assume about 2 bytes per pointer, when compressed. The head uses */ -/* 16 bytes, and other blocks use 8 for header info... If you want 3 */ -/* blocks of 32 bytes, say max 16+24+24 = 64 keys */ - }; - ISAMD_M m = (ISAMD_M) xmalloc (sizeof(*m)); - m->filecat = def_cat; + ISAMD_M m = (ISAMD_M) xmalloc (sizeof(*m)); /* never released! */ + m->filecat = def_cat; /* ok, only alloc'd once */ m->code_start = NULL; m->code_item = NULL; @@ -68,7 +66,7 @@ ISAMD_M isamd_getmethod (ISAMD_M me) m->compare_item = NULL; - m->debug = 1; + m->debug = 0; /* default to no debug */ m->max_blocks_mem = 10; @@ -91,26 +89,21 @@ ISAMD isamd_open (BFiles bfs, const char *name, int writeflag, ISAMD_M method) assert (filecat); /* determine number of block categories */ - if (is->method->debug) + if (is->method->debug>0) logf (LOG_LOG, "isamd: bsize maxkeys"); do { - if (is->method->debug) + if (is->method->debug>0) logf (LOG_LOG, "isamd:%6d %6d", filecat[i].bsize, filecat[i].mblocks); } while (filecat[i++].mblocks); is->no_files = i; is->max_cat = --i; - + assert (is->no_files > 0); + assert (is->max_cat <=8 ); /* we have only 3 bits for it */ + is->files = (ISAMD_file) xmalloc (sizeof(*is->files)*is->no_files); - if (writeflag) - { - /* TODO - what ever needs to be done here... */ - } - else - { - } for (i = 0; ino_files; i++) { @@ -143,6 +136,13 @@ ISAMD isamd_open (BFiles bfs, const char *name, int writeflag, ISAMD_M method) is->files[i].sum_backward = 0; is->files[i].no_next = 0; is->files[i].no_prev = 0; + is->files[i].no_op_nodiff=0; + is->files[i].no_op_intdiff=0; + is->files[i].no_op_extdiff=0; + is->files[i].no_fbuilds=0; + is->files[i].no_appds=0; + is->files[i].no_merges=0; + is->files[i].no_remerges=0; init_fc (is, i); } @@ -168,11 +168,12 @@ int isamd_close (ISAMD is) { int i; - if (is->method->debug) + if (is->method->debug>0) { - logf (LOG_LOG, "isamd: next forw mid-f prev backw mid-b"); + logf (LOG_LOG, "isamd statistics"); + logf (LOG_LOG, "f nxt forw mid-f prev backw mid-b"); for (i = 0; ino_files; i++) - logf (LOG_LOG, "isamd:%8d%8d%8.1f%8d%8d%8.1f", + logf (LOG_LOG, "%d%8d%8d%8.1f%8d%8d%8.1f",i, is->files[i].no_next, is->files[i].no_forward, is->files[i].no_forward ? @@ -184,8 +185,8 @@ int isamd_close (ISAMD is) (double) is->files[i].sum_backward/is->files[i].no_backward : 0.0); } - if (is->method->debug) - logf (LOG_LOG, "isamd: writes reads skipped alloc released remap"); + if (is->method->debug>0) + logf (LOG_LOG, "f writes reads skipped alloc released "); for (i = 0; ino_files; i++) { release_fc (is, i); @@ -193,18 +194,38 @@ int isamd_close (ISAMD is) if (is->files[i].head_is_dirty) bf_write (is->files[i].bf, 0, 0, sizeof(ISAMD_head), &is->files[i].head); - if (is->method->debug) - logf (LOG_LOG, "isamd:%8d%8d%8d%8d%8d%8d", + if (is->method->debug>0) + logf (LOG_LOG, "%d%8d%8d%8d%8d%8d",i, is->files[i].no_writes, is->files[i].no_reads, is->files[i].no_skip_writes, is->files[i].no_allocated, - is->files[i].no_released, - is->files[i].no_remap); + is->files[i].no_released); xfree (is->files[i].fc_list); flush_block (is, i); bf_close (is->files[i].bf); } + + if (is->method->debug>0) + { + logf (LOG_LOG, "f opens simple int ext"); + for (i = 0; ino_files; i++) + { + logf (LOG_LOG, "%d%8d%8d%8d%8d",i, + is->files[i].no_op_nodiff+ + is->files[i].no_op_intdiff+ + is->files[i].no_op_extdiff, + is->files[i].no_op_nodiff, + is->files[i].no_op_intdiff, + is->files[i].no_op_extdiff); + } + logf (LOG_LOG, " build append merge remrg"); + logf (LOG_LOG, "=%8d%8d%8d%8d", + is->files[0].no_fbuilds, + is->files[0].no_appds, + is->files[0].no_merges, + is->files[0].no_remerges); + } xfree (is->files); xfree (is->method); xfree (is); @@ -214,13 +235,15 @@ int isamd_close (ISAMD is) int isamd_read_block (ISAMD is, int cat, int pos, char *dst) { ++(is->files[cat].no_reads); + if (is->method->debug > 6) + logf (LOG_LOG, "isamd: read_block %d %d", cat, pos); return bf_read (is->files[cat].bf, pos, 0, 0, dst); } int isamd_write_block (ISAMD is, int cat, int pos, char *src) { ++(is->files[cat].no_writes); - if (is->method->debug > 2) + if (is->method->debug > 6) logf (LOG_LOG, "isamd: write_block %d %d", cat, pos); return bf_write (is->files[cat].bf, pos, 0, 0, src); } @@ -229,7 +252,7 @@ int isamd_write_dblock (ISAMD is, int cat, int pos, char *src, int nextpos, int offset) { ISAMD_BLOCK_SIZE size = offset + ISAMD_BLOCK_OFFSET_N; - if (is->method->debug > 2) + if (is->method->debug > 4) logf (LOG_LOG, "isamd: write_dblock. size=%d nextpos=%d", (int) size, nextpos); src -= ISAMD_BLOCK_OFFSET_N; @@ -388,15 +411,17 @@ int isamd_alloc_block (ISAMD is, int cat) } if (!block) block = alloc_block (is, cat); - if (is->method->debug > 3) + if (is->method->debug > 4) logf (LOG_LOG, "isamd: alloc_block in cat %d: %d", cat, block); return block; } void isamd_release_block (ISAMD is, int cat, int pos) { - if (is->method->debug > 3) + if (is->method->debug > 4) logf (LOG_LOG, "isamd: release_block in cat %d: %d", cat, pos); + assert(pos!=0); + if (is->files[cat].fc_list) { int j; @@ -441,6 +466,10 @@ void isamd_pp_close (ISAMD_PP pp) isamd_free_diffs(pp); /* see merge-d.h */ xfree (pp->buf); xfree (pp); + if (is->method->debug > 5) + logf (LOG_LOG, "isamd_pp_close %p %d=%d:%d sz=%d n=%d=%d:%d", + pp, isamd_addr(pp->pos, pp->cat), pp->cat, pp->pos, pp->size, + pp->next, isamd_type(pp->next), isamd_block(pp->next) ); } @@ -449,18 +478,20 @@ ISAMD_PP isamd_pp_open (ISAMD is, ISAMD_P ipos) { ISAMD_PP pp = (ISAMD_PP) xmalloc (sizeof(*pp)); char *src; + int sz = is->method->filecat[is->max_cat].bsize; + /* always allocate for the largest blocks, saves trouble */ pp->cat = isamd_type(ipos); pp->pos = isamd_block(ipos); - src = pp->buf = (char *) xmalloc (is->method->filecat[is->max_cat].bsize); - /* always allocate for the largest blocks, saves trouble */ + src = pp->buf = (char *) xmalloc (sz); + memset(src,'\0',sz); /* clear the buffer, for new blocks */ + pp->next = 0; pp->size = 0; pp->offset = 0; pp->is = is; pp->decodeClientData = (*is->method->code_start)(ISAMD_DECODE); - //pp->deleteFlag = 0; pp->numKeys = 0; pp->diffs=0; @@ -482,10 +513,19 @@ ISAMD_PP isamd_pp_open (ISAMD is, ISAMD_P ipos) assert (pp->next != pp->pos); pp->offset = src - pp->buf; assert (pp->offset == ISAMD_BLOCK_OFFSET_1); - if (is->method->debug > 2) - logf (LOG_LOG, "isamd_pp_open sz=%d c=%d p=%d n=%d", - pp->size, pp->cat, pp->pos, isamd_block(pp->next)); + if (0==pp->diffs) + ++(is->files[pp->cat].no_op_nodiff); + else + if(pp->diffs&1) + ++(is->files[pp->cat].no_op_extdiff); + else + ++(is->files[pp->cat].no_op_intdiff); } + if (is->method->debug > 5) + logf (LOG_LOG, "isamd_pp_open %p %d=%d:%d sz=%d n=%d=%d:%d", + pp, isamd_addr(pp->pos, pp->cat), pp->cat, pp->pos, pp->size, + pp->next, isamd_type(pp->next), isamd_block(pp->next) ); + return pp; } @@ -505,7 +545,7 @@ void isamd_buildfirstblock(ISAMD_PP pp){ memcpy(dst, &pp->diffs, sizeof(pp->diffs)); dst += sizeof(pp->diffs); assert (dst - pp->buf == ISAMD_BLOCK_OFFSET_1); - if (pp->is->method->debug > 2) + if (pp->is->method->debug > 5) logf (LOG_LOG, "isamd: first: sz=%d p=%d/%d>%d/%d nk=%d d=%d", pp->size, pp->cat, pp->pos, @@ -522,7 +562,7 @@ void isamd_buildlaterblock(ISAMD_PP pp){ memcpy(dst, &pp->size,sizeof(pp->size)); dst += sizeof(pp->size); assert (dst - pp->buf == ISAMD_BLOCK_OFFSET_N); - if (pp->is->method->debug > 2) + if (pp->is->method->debug > 5) logf (LOG_LOG, "isamd: l8r: sz=%d p=%d/%d>%d/%d", pp->size, pp->pos, pp->cat, @@ -593,12 +633,10 @@ int isamd_read_main_item (ISAMD_PP pp, char **dst) /* assume block is non-empty */ assert (src - pp->buf == ISAMD_BLOCK_OFFSET_N); assert (pp->next != isamd_addr(pp->pos,pp->cat)); - //if (pp->deleteFlag) - // isamd_release_block (is, pp->cat, pp->pos); (*is->method->code_reset)(pp->decodeClientData); (*is->method->code_item)(ISAMD_DECODE, pp->decodeClientData, dst, &src); pp->offset = src - pp->buf; - if (is->method->debug > 2) + if (is->method->debug > 4) logf (LOG_LOG, "isamd: read_block size=%d %d %d next=%d", pp->size, pp->cat, pp->pos, pp->next); return 2; @@ -679,7 +717,22 @@ void isamd_pp_dump (ISAMD is, ISAMD_P ipos) /* * $Log: isamd.c,v $ - * Revision 1.3 1999-07-21 14:24:50 heikki + * Revision 1.10 1999-08-24 13:17:42 heikki + * Block sizes, comments + * + * Revision 1.9 1999/08/20 12:25:58 heikki + * Statistics in isamd + * + * Revision 1.8 1999/08/18 13:28:16 heikki + * Set log levels to decent values + * + * Revision 1.6 1999/08/17 19:44:25 heikki + * Fixed memory leaks + * + * Revision 1.4 1999/08/04 14:21:18 heikki + * isam-d seems to be working. + * + * Revision 1.3 1999/07/21 14:24:50 heikki * isamd write and read functions ok, except when diff block full. * (merge not yet done) *