* See the file LICENSE for details.
* Heikki Levanto
*
- * $Id: merge-d.c,v 1.22 1999-09-23 18:01:18 heikki Exp $
+ * $Id: merge-d.c,v 1.25 1999-11-30 13:48:04 adam Exp $
*
* bugs
- * (none)
+ * sinleton-bit has to be in the high end, not low, so as not to confuse
+ * ordinary small numbers, like in the next pointer..
*
* missing
*
#include <assert.h>
#include <string.h>
#include <stdio.h>
-#include <log.h>
+#include <yaz/log.h>
#include "../index/index.h"
#include "isamd-p.h"
#define DEC_SEQBITS 15
#define DEC_MASK(n) ((1<<(n))-1)
+#define SINGLETON_BIT (1<<(DEC_SYSBITS+DEC_SEQBITS+1))
+
int is_singleton(ISAMD_P ipos)
{
- return ( ipos != 0 ) && ( ipos & 1 );
+ return ( ipos != 0 ) && ( ipos & SINGLETON_BIT );
}
return 0; /* no room dor sysno */
if ( (k->seqno & DEC_MASK(DEC_SYSBITS) ) != k->seqno )
return 0; /* no room dor sysno */
- return ( (k->sysno | (k->seqno << DEC_SYSBITS) ) << 1) | 1;
+ return (k->sysno | (k->seqno << DEC_SYSBITS) ) | SINGLETON_BIT;
}
void singleton_decode (int code, struct it_key *k)
{
- assert ((code & 1) == 1 );
- code = code >> 1;
+ assert (code & SINGLETON_BIT);
k->sysno = code & DEC_MASK(DEC_SYSBITS);
- k->seqno = code >> DEC_SYSBITS ;
+ code = code >> DEC_SYSBITS;
+ k->seqno = code & DEC_MASK(DEC_SEQBITS);
}
assert(winner==0); /* if nothing found, nothing comes from a diff */
cmp= 0; /* eof */
}
- if (pp->is->method->debug >9)
- logf(LOG_LOG,"mergeDB4: sysno[1]=%d", pp->diffinfo[1].key.sysno); /*!*/
+ if (cmp)
+ ++(pp->is->no_read_keys);
+ else
+ ++(pp->is->no_read_eof);
+
return cmp;
} /* isamd_read_item */
/* resize later. Saves disk, but will lead */
/* into bad seeks. */
- ++(readpp->is->files[0].no_merges);
+ ++(readpp->is->no_merges);
/* set up diffs as they should be for reading */
diffidx = ISAMD_BLOCK_OFFSET_1;
if (readpp->is->method->debug >5)
logf(LOG_LOG,"isamd_merge:all data has been deleted (nk=%d) ",
readpp->numKeys);
- //assert (readpp->numKeys == 0); /* no longer true! */
}
firstpp=isamd_pp_open(is, isamd_addr(0,0) );
firstpp->size=firstpp->offset=ISAMD_BLOCK_OFFSET_1;
/* create in smallest category, will expand later */
- ++(is->files[0].no_fbuilds);
+ ++(is->no_fbuilds);
}
else
{
firstpp=isamd_pp_open(is, ipos);
- ++(is->files[0].no_appds);
+ ++(is->no_appds);
}
if (is->method->debug >2)
if (diffidx + codelen > maxsize )
{ /* block full */
- if (firstpp->cat < firstpp->is->max_cat)
- { /* just increase the block size */
+ while ( (firstpp->cat < firstpp->is->max_cat) &&
+ (diffidx + codelen > maxsize) )
+ { /* try to increase the block size */
if (firstpp->pos > 0) /* free the old block if allocated */
isamd_release_block(is, firstpp->cat, firstpp->pos);
++firstpp->cat;
maxsize = is->method->filecat[firstpp->cat].bsize;
firstpp->pos=0; /* need to allocate it when saving */
if (is->method->debug >3)
- logf(LOG_LOG,"isamd_appd: increased diff block to %d (%d)",
+ logf(LOG_LOG,"isamd_appd: increased diff block sz to %d (%d)",
firstpp->cat, maxsize);
}
- else
- { /* max size already - can't help, need to merge it */
+ if ((firstpp->cat >= firstpp->is->max_cat) &&
+ (diffidx + codelen > maxsize) )
+ { /* max size - can't help, need to merge it */
if (is->method->debug >7)
- logf(LOG_LOG,"isamd_appd: block full");
+ logf(LOG_LOG,"isamd_appd: need to merge");
if (is->method->debug >9) //!!!!!
logf(LOG_LOG,"isamd_appd: going to merge with m=%d %d.%d",
i_mode, i_key.sysno, i_key.seqno);
assert(!"merge returned zero ??");
} /* need to merge */
} /* block full */
-
+
+ if (!( diffidx+codelen <= maxsize ))
+ { /* bug hunting */
+ logf(LOG_LOG,"OOPS, diffidx problem: d=%d c=%d s=%d > m=%d",
+ diffidx, codelen, diffidx+codelen, maxsize);
+ logf(LOG_LOG,"ipos=%d f=%d=%d:%d",
+ ipos,
+ isamd_addr(firstpp->pos, firstpp->cat),
+ firstpp->cat, firstpp->pos );
+ }
assert ( diffidx+codelen <= maxsize );
/* save the diff */
FILTER F = filter_open(is,data);
ISAMD_P rc=0;
+ int olddebug= is->method->debug;
+ if (ipos == 7320)
+ is->method->debug = 99; /*!*/
+
if ( filter_isempty(F) ) /* can be, if del-ins of the same */
{
- if (is->method->debug >9)
- logf(LOG_LOG,"isamd_appd: nothing to do");
+ if (is->method->debug >3)
+ logf(LOG_LOG,"isamd_appd: nothing to do for %d=",ipos);
filter_close(F);
+ ++(is->no_non);
return ipos; /* without doing anything at all */
}
if (is->method->debug >9)
logf(LOG_LOG,"isamd_appd: singleton %d (%x)",
rc,rc);
+ if (rc)
+ is->no_singles++;
assert ( (rc==0) || is_singleton(rc) );
}
if ( 0==rc) /* either not single, or it did not fit */
{
- rc = append_diffs(is,ipos,F)<<1; /* not singleton */
- assert ( ! is_singleton(rc) ); /*!*/
+ rc = append_diffs(is,ipos,F);
+ assert ( ! is_singleton(rc) );
+ /* can happen if we run out of bits, so that block numbers overflow */
+ /* to SINGLETON_BIT */
}
filter_close(F);
- if (is->method->debug >9)
+ if (is->method->debug >2)
logf(LOG_LOG,"isamd_appd: ret %d=%x (%d=%x)",
rc,rc,ipos,ipos);
-
+ is->method->debug=olddebug; /*!*/
return rc;
} /* isamd_append */
/*
* $Log: merge-d.c,v $
- * Revision 1.22 1999-09-23 18:01:18 heikki
+ * Revision 1.25 1999-11-30 13:48:04 adam
+ * Improved installation. Updated for inclusion of YAZ header files.
+ *
+ * Revision 1.24 1999/10/05 09:57:40 heikki
+ * Tuning the isam-d (and fixed a small "detail")
+ *
+ * Revision 1.23 1999/09/27 14:36:36 heikki
+ * singletons
+ *
+ * Revision 1.22 1999/09/23 18:01:18 heikki
* singleton optimising
*
* Revision 1.21 1999/09/21 17:36:43 heikki
projects / idzebra-moved-to-github.git / blobdiff