X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=isamc%2Fmerge.c;h=f44f84deb1937daa71ba54b554c63481f6666ebe;hb=44fe6818860e5d8b175b4bafedc8dd4eea057c50;hp=a2653c6cf11f6c827539ff7025eab6da147a2dca;hpb=ea515bb01793545523b57be6331e9596022f1f97;p=idzebra-moved-to-github.git diff --git a/isamc/merge.c b/isamc/merge.c index a2653c6..f44f84d 100644 --- a/isamc/merge.c +++ b/isamc/merge.c @@ -576,8 +576,8 @@ ISAMC_P isamh_append (ISAMH is, ISAMH_P ipos, ISAMH_I data) assert( (codelen < 128) && (codelen>0)); if (pp->is->method->debug > 3) - logf(LOG_LOG,"isamh_append: coded into %d:%s", - codelen,hexdump(codebuffer,codelen,0)); + logf(LOG_LOG,"isamh_append: coded into %d:%s (nk=%d)", + codelen,hexdump(codebuffer,codelen,0),firstpp->numKeys); if ( pp->offset + codelen > maxsize ) { /* oops, block full, do something */ @@ -622,8 +622,8 @@ ISAMC_P isamh_append (ISAMH is, ISAMH_P ipos, ISAMH_I data) (*is->method->code_item)(ISAMH_ENCODE, r_clientData, &codeptr, &i_item_ptr); codelen = codeptr-codebuffer; if (pp->is->method->debug > 3) - logf(LOG_LOG,"isamh_append: coded again %d:%s", - codelen,hexdump(codebuffer,codelen,0)); + logf(LOG_LOG,"isamh_append: coded again %d:%s (nk=%d)", + codelen,hexdump(codebuffer,codelen,0),firstpp->numKeys); } /* block full */ @@ -672,7 +672,13 @@ ISAMC_P isamh_append (ISAMH is, ISAMH_P ipos, ISAMH_I data) /* * $Log: merge.c,v $ - * Revision 1.15 1999-07-07 09:36:04 heikki + * 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 + * + * Revision 1.15 1999/07/07 09:36:04 heikki * Fixed an assertion in isamh * * Revision 1.13 1999/07/06 09:37:05 heikki