From 44fe6818860e5d8b175b4bafedc8dd4eea057c50 Mon Sep 17 00:00:00 2001 From: Heikki Levanto Date: Tue, 13 Jul 1999 15:24:50 +0000 Subject: [PATCH] Removed the one-block append, it had a serious flaw. --- isamc/isamh.c | 86 +++++++++++++++++++++++++++++++++++++++++++++++++++++---- isamc/merge.c | 46 ++++-------------------------- 2 files changed, 86 insertions(+), 46 deletions(-) diff --git a/isamc/isamh.c b/isamc/isamh.c index c6c35de..0f2dbeb 100644 --- a/isamc/isamh.c +++ b/isamc/isamh.c @@ -6,7 +6,6 @@ * Isamh - append-only isam * * todo - * (get invstat to work) * implement dirty bit * implement direct address bit * (result set stuff) @@ -24,29 +23,38 @@ #include #include "isamh-p.h" +#include "../index/index.h" /* for dump */ + static void flush_block (ISAMH is, int cat); static void release_fc (ISAMH is, int cat); static void init_fc (ISAMH is, int cat); #define ISAMH_FREELIST_CHUNK 1 -#define SMALL_TEST 0 +#define SMALL_TEST 1 ISAMH_M isamh_getmethod (void) { static struct ISAMH_filecat_s def_cat[] = { #if SMALL_TEST /* blocksz, max keys before switching size */ - { 32, 40 }, - { 64, 0 }, + /* { 32, 40 }, */ + { 128, 0 }, #else { 24, 40 }, + { 2048, 2048 }, + { 16384, 0 }, + +#endif +#ifdef OLDVALUES + { 24, 40 }, { 128, 256 }, { 512, 1024 }, { 2048, 4096 }, { 8192,16384 }, { 32768, 0 }, -#endif + +#endif /* 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 */ @@ -622,11 +630,77 @@ int isamh_pp_num (ISAMH_PP pp) return pp->numKeys; } +static char *hexdump(unsigned char *p, int len, char *buff) { + static char localbuff[128]; + char bytebuff[8]; + if (!buff) buff=localbuff; + *buff='\0'; + while (len--) { + sprintf(bytebuff,"%02x",*p); + p++; + strcat(buff,bytebuff); + if (len) strcat(buff," "); + } + return buff; +} + +void isamh_pp_dump (ISAMH is, ISAMH_P ipos) +{ + ISAMH_PP pp; + ISAMH_P oldaddr=0; + struct it_key key; + int i,n; + int occur =0; + int oldoffs; + char hexbuff[64]; + + logf(LOG_LOG,"dumping isamh block %d (%d:%d)", + (int)ipos, isamh_type(ipos), isamh_block(ipos) ); + pp=isamh_pp_open(is,ipos); + logf(LOG_LOG,"numKeys=%d, last=%d (%d:%d) ofs=%d ", + pp->numKeys, + pp->lastblock, + isamh_type(pp->lastblock), isamh_block(pp->lastblock), + pp->offset); + oldoffs= pp->offset; + while(isamh_pp_read(pp, &key)) + { + if (oldaddr != isamh_addr(pp->pos,pp->cat) ) + { + oldaddr = isamh_addr(pp->pos,pp->cat); + logf(LOG_LOG,"block %d (%d:%d) sz=%d nx=%d (%d:%d) ofs=%d", + isamh_addr(pp->pos,pp->cat), + pp->cat, pp->pos, pp->size, + pp->next, isamh_type(pp->next), isamh_block(pp->next), + pp->offset); + i=0; + while (isize) { + n=pp->size-i; + if (n>8) n=8; + logf(LOG_LOG," %05x: %s",i,hexdump(pp->buf+i,n,hexbuff)); + i+=n; + } + if (oldoffs > ISAMH_BLOCK_OFFSET_N) + oldoffs=ISAMH_BLOCK_OFFSET_N; + } /* new block */ + occur++; + logf (LOG_LOG," got %d:%d=%x:%x from %s at %d=%x", + key.sysno, key.seqno, + key.sysno, key.seqno, + hexdump(pp->buf+oldoffs, pp->offset-oldoffs, hexbuff), + oldoffs, oldoffs); + oldoffs = pp->offset; + } + isamh_pp_close(pp); +} /* dump */ /* * $Log: isamh.c,v $ - * Revision 1.5 1999-07-08 14:23:27 heikki + * Revision 1.6 1999-07-13 15:24:50 heikki + * Removed the one-block append, it had a serious flaw. + * + * Revision 1.5 1999/07/08 14:23:27 heikki * Fixed a bug in isamh_pp_read and cleaned up a bit * * Revision 1.4 1999/07/07 09:36:04 heikki diff --git a/isamc/merge.c b/isamc/merge.c index 6906176..f44f84d 100644 --- a/isamc/merge.c +++ b/isamc/merge.c @@ -486,27 +486,6 @@ static char *hexdump(unsigned char *p, int len, char *buff) { * may make sense to reserve some extra space... */ - -static void isamh_reduceblock(ISAMH is, ISAMH_PP pp, int numKeys) -{ - if (pp->is->method->debug > 2) - logf(LOG_LOG,"isamh_reduce: block p=%d c=%d o=%d nk=%d ", - pp->pos, pp->cat, pp->offset, numKeys); - if (pp->pos != 0) - return; /* already allocated in some size */ - while ( ( pp->cat > 0 ) && - ( pp->offset < is->method->filecat[pp->cat-1].bsize) && - ( numKeys < is->method->filecat[pp->cat-1].mblocks) ) - pp->cat--; - pp->pos = isamh_alloc_block(is,pp->cat) ; - if (pp->is->method->debug > 2) - logf(LOG_LOG,"isamh_reduced block p=%d to c=%d o=%d nk=%d bs=%d", - pp->pos, pp->cat, pp->offset, numKeys, - is->method->filecat[pp->cat].bsize); - - -} /* reduceblock */ - ISAMC_P isamh_append (ISAMH is, ISAMH_P ipos, ISAMH_I data) { @@ -528,21 +507,14 @@ ISAMC_P isamh_append (ISAMH is, ISAMH_P ipos, ISAMH_I data) int maxkeys; int maxsize; int retval; - int maxcat; pp = firstpp = isamh_pp_open (is, ipos); assert (*is->method->code_reset); - maxcat=0; /* find the largest block size for default allocation */ - for ( newcat=0; is->method->filecat[newcat].mblocks > 0; newcat++) - if ( is->method->filecat[newcat].bsize > - is->method->filecat[maxcat].bsize) - maxcat = newcat; - if ( 0==ipos) { /* new block */ - pp->cat=maxcat; /* start large... */ - pp->pos = 0; /* not allocated yet */ + pp->cat=0; /* start small... */ + pp->pos = isamh_alloc_block(is,pp->cat); pp->size= pp->offset = ISAMH_BLOCK_OFFSET_1 ; r_clientData = (*is->method->code_start)(ISAMH_ENCODE); if (pp->is->method->debug > 2) @@ -609,13 +581,11 @@ ISAMC_P isamh_append (ISAMH is, ISAMH_P ipos, ISAMH_I data) if ( pp->offset + codelen > maxsize ) { /* oops, block full, do something */ - newcat = maxcat; /* start with a large block again */ + newcat = pp->cat; maxkeys = is->method->filecat[pp->cat].mblocks; /* max keys */ if (pp->is->method->debug > 2) logf(LOG_LOG,"isamh_append: need new block: %d > %d (k:%d/%d)", pp->offset + codelen, maxsize, firstpp->numKeys,maxkeys ); - -#ifdef SKIPTHIS if ( (maxkeys>0) && (firstpp->numKeys > maxkeys) ) { /* time to increase block size */ newcat++; @@ -624,13 +594,11 @@ ISAMC_P isamh_append (ISAMH is, ISAMH_P ipos, ISAMH_I data) if (pp->is->method->debug > 2) logf(LOG_LOG,"isamh_append: increased to cat %d ",newcat); } -#endif - newblock = 0; /* isamh_alloc_block(is,newcat);*/ + newblock = isamh_alloc_block(is,newcat); pp->next = isamh_addr(newblock,newcat); if (firstpp!=pp) { /* not first block, write to disk already now */ - isamh_reduceblock(is,pp,firstpp->numKeys); isamh_buildlaterblock(pp); isamh_write_block(is,pp->cat,pp->pos,pp->buf); } @@ -679,14 +647,12 @@ ISAMC_P isamh_append (ISAMH is, ISAMH_P ipos, ISAMH_I data) if (pp!=firstpp) { pp->next=0; /* just to be sure */ - isamh_reduceblock(is,pp,firstpp->numKeys); isamh_buildlaterblock(pp); isamh_write_block(is,pp->cat,pp->pos,pp->buf); } /* update first block and write it */ firstpp->lastblock = isamh_addr(pp->pos,pp->cat); - isamh_reduceblock(is,firstpp,firstpp->numKeys); isamh_buildfirstblock(firstpp); isamh_write_block(is,firstpp->cat,firstpp->pos,firstpp->buf); @@ -706,8 +672,8 @@ ISAMC_P isamh_append (ISAMH is, ISAMH_P ipos, ISAMH_I data) /* * $Log: merge.c,v $ - * Revision 1.17 1999-07-13 14:22:17 heikki - * Better allocation strategy in isamh_merge + * Revision 1.18 1999-07-13 15:24:50 heikki + * Removed the one-block append, it had a serious flaw. * * Revision 1.16 1999/07/08 14:23:27 heikki * Fixed a bug in isamh_pp_read and cleaned up a bit -- 1.7.10.4