X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=isamc%2Fisamd.c;h=f6d17dce39ba8daa83646c08448c0c9ca2d36bb3;hp=191a51cd37b8deb3e7b905304d78f242f886b4c1;hb=05259bf944ff61befc9bee89b7377bf365b25099;hpb=72ca1631366b5196106ac777e492b6a70c273651 diff --git a/isamc/isamd.c b/isamc/isamd.c index 191a51c..f6d17dc 100644 --- a/isamc/isamd.c +++ b/isamc/isamd.c @@ -1,23 +1,31 @@ -/* - * Copyright (c) 1995-1998, Index Data. - * See the file LICENSE for details. - * $Id: isamd.c,v 1.16 1999-10-05 09:57:40 heikki Exp $ - * - * 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 - */ - +/* $Id: isamd.c,v 1.27 2004-06-01 12:56:39 adam Exp $ + Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003 + Index Data Aps + +This file is part of the Zebra server. + +Zebra is free software; you can redistribute it and/or modify it under +the terms of the GNU General Public License as published by the Free +Software Foundation; either version 2, or (at your option) any later +version. + +Zebra is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received a copy of the GNU General Public License +along with Zebra; see the file LICENSE.zebra. If not, write to the +Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. +*/ #include #include #include #include -#include +#include #include "../index/index.h" /* isamd uses the internal structure of it_key */ #include "isamd-p.h" @@ -29,7 +37,7 @@ static void init_fc (ISAMD is, int cat); #define SMALL_TEST 0 -ISAMD_M isamd_getmethod (ISAMD_M me) +ISAMD_M *isamd_getmethod (ISAMD_M *me) { static struct ISAMD_filecat_s def_cat[] = { #if SMALL_TEST @@ -38,12 +46,13 @@ ISAMD_M isamd_getmethod (ISAMD_M me) { 64, 0 }, #else { 32, 1 }, - { 64, 1 }, { 128, 1 }, - { 512, 1 }, + { 256, 1 }, + { 512, 1 }, + { 1024, 1 }, { 2048, 1 }, - { 8192, 1 }, - { 32768, 0 }, + { 4096, 1 }, + { 8192, 0 }, #endif #ifdef SKIPTHIS @@ -69,7 +78,7 @@ ISAMD_M isamd_getmethod (ISAMD_M me) #endif }; - ISAMD_M m = (ISAMD_M) xmalloc (sizeof(*m)); /* never released! */ + ISAMD_M *m = (ISAMD_M *) xmalloc (sizeof(*m)); /* never released! */ m->filecat = def_cat; /* ok, only alloc'd once */ m->code_start = NULL; @@ -78,6 +87,7 @@ ISAMD_M isamd_getmethod (ISAMD_M me) m->code_reset = NULL; m->compare_item = NULL; + m->log_item = NULL; m->debug = 0; /* default to no debug */ @@ -88,7 +98,7 @@ ISAMD_M isamd_getmethod (ISAMD_M me) -ISAMD isamd_open (BFiles bfs, const char *name, int writeflag, ISAMD_M method) +ISAMD isamd_open (BFiles bfs, const char *name, int writeflag, ISAMD_M *method) { ISAMD is; ISAMD_filecat filecat; @@ -96,7 +106,7 @@ ISAMD isamd_open (BFiles bfs, const char *name, int writeflag, ISAMD_M method) is = (ISAMD) xmalloc (sizeof(*is)); - is->method = (ISAMD_M) xmalloc (sizeof(*is->method)); + is->method = (ISAMD_M *) xmalloc (sizeof(*is->method)); memcpy (is->method, method, sizeof(*method)); filecat = is->method->filecat; assert (filecat); @@ -179,6 +189,8 @@ ISAMD isamd_open (BFiles bfs, const char *name, int writeflag, ISAMD_M method) int isamd_block_used (ISAMD is, int type) { + if ( type==-1) /* singleton */ + return 0; if (type < 0 || type >= is->no_files) return -1; return is->files[type].head.lastblock-1; @@ -187,6 +199,8 @@ int isamd_block_used (ISAMD is, int type) int isamd_block_size (ISAMD is, int type) { ISAMD_filecat filecat = is->method->filecat; + if ( type==-1) /* singleton */ + return 0; /* no bytes used */ if (type < 0 || type >= is->no_files) return -1; return filecat[type].bsize; @@ -246,14 +260,14 @@ int isamd_close (ISAMD is) is->files[i].no_op_main, is->files[i].no_op_diffonly); } - logf(LOG_LOG,"single %8d", is->no_op_single); - logf(LOG_LOG,"new %8d", is->no_op_new); + logf(LOG_LOG,"open single %8d", is->no_op_single); + logf(LOG_LOG,"open new %8d", is->no_op_new); logf(LOG_LOG, "new build %8d", is->no_fbuilds); logf(LOG_LOG, "append %8d", is->no_appds); logf(LOG_LOG, " merges %8d", is->no_merges); logf(LOG_LOG, " singles %8d", is->no_singles); - logf(LOG_LOG, " non %8d", is->no_non); + logf(LOG_LOG, " no-ops %8d", is->no_non); logf(LOG_LOG, "read blocks %8d", is->no_read); logf(LOG_LOG, "read keys: %8d %8.1f k/bl", @@ -542,26 +556,50 @@ void isamd_pp_close (ISAMD_PP pp) (*is->method->code_stop)(ISAMD_DECODE, pp->decodeClientData); 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", + logf (LOG_LOG, "isamd_pp_close %p %d=%d:%d sz=%d n=%d=%d:%d nk=%d", pp, isamd_addr(pp->pos, pp->cat), pp->cat, pp->pos, pp->size, - pp->next, isamd_type(pp->next), isamd_block(pp->next) ); + pp->next, isamd_type(pp->next), isamd_block(pp->next), + pp->numKeys ); + xfree (pp->buf); + xfree (pp); } +ISAMD_PP isamd_pp_create (ISAMD is, int cat) +/* creates a pp_buff without data in it. pos=0, cat as given */ +{ + ISAMD_PP pp = (ISAMD_PP) xmalloc (sizeof(*pp)); + int sz = is->method->filecat[is->max_cat].bsize; + + pp->numKeys = 0; + pp->buf = (char *) xmalloc (sz); + memset(pp->buf,'\0',sz); /* clear the buffer, for new blocks */ + + pp->next = 0; + pp->size = 0; + pp->offset = 0; + pp->is = is; + pp->diffs=0; + pp->diffbuf=0; + pp->diffinfo=0; + pp->decodeClientData = (*is->method->code_start)(ISAMD_DECODE); + pp->cat = cat; + pp->pos = 0; + is->no_op_new++; + return pp; + +} + -ISAMD_PP isamd_pp_open (ISAMD is, ISAMD_P ipos) +ISAMD_PP isamd_pp_open (ISAMD is, const char *dictbuf, int dictlen) { + 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 */ - struct it_key singlekey; - char *c_ptr; /* for fake encoding the singlekey */ - char *i_ptr; - int ofs; + int dictnum; pp->numKeys = 0; src = pp->buf = (char *) xmalloc (sz); @@ -576,36 +614,24 @@ ISAMD_PP isamd_pp_open (ISAMD is, ISAMD_P ipos) pp->diffinfo=0; pp->decodeClientData = (*is->method->code_start)(ISAMD_DECODE); - if ( is_singleton(ipos) ) + dictnum=*dictbuf; /* numkeys for internals, 0 for externals */ + + if (0==dictnum) + { + memcpy(&ipos, dictbuf+1, sizeof(ISAMD_P) ); + } + else /* dictionary block, fake a real one */ { pp->cat=0; pp->pos=0; 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) ); - singleton_decode(ipos, &singlekey ); - pp->offset=ISAMD_BLOCK_OFFSET_1; - pp->numKeys = 1; - ofs=pp->offset+sizeof(int); /* reserve length of diffsegment */ - singlekey.seqno = singlekey.seqno * 2 + 1; /* make an insert diff */ - c_ptr=&(pp->buf[ofs]); - i_ptr=(char*)(&singlekey); - (*is->method->code_item)(ISAMD_ENCODE, pp->decodeClientData, - &c_ptr, &i_ptr); - (*is->method->code_reset)(pp->decodeClientData); - ofs += c_ptr-&(pp->buf[ofs]); - memcpy( &(pp->buf[pp->offset]), &ofs, sizeof(int) ); - /* since we memset buf earlier, we already have a zero endmark! */ - pp->size = ofs; - if (is->method->debug > 5) - logf (LOG_LOG, "isamd_pp_open single %d=%x: %d.%d sz=%d", - ipos,ipos, - singlekey.sysno, singlekey.seqno/2, - pp->size ); + logf (LOG_LOG, "isamd_pp_open dict"); + pp->numKeys=(unsigned char) dictbuf[0]; + memcpy(pp->buf+ISAMD_BLOCK_OFFSET_1, dictbuf+1,dictlen-1); + pp->size=pp->offset=dictlen+ISAMD_BLOCK_OFFSET_1-1; is->no_op_single++; return pp; - } /* singleton */ + } /* dict block */ pp->cat = isamd_type(ipos); pp->pos = isamd_block(ipos); @@ -766,6 +792,8 @@ int isamd_pp_num (ISAMD_PP pp) return pp->numKeys; } +#if 0 +/* for testing .. */ static char *hexdump(unsigned char *p, int len, char *buff) { static char localbuff[128]; char bytebuff[8]; @@ -779,8 +807,10 @@ static char *hexdump(unsigned char *p, int len, char *buff) { } return buff; } +#endif - +#ifdef SKIPTHIS + /* needs different arguments, or something */ void isamd_pp_dump (ISAMD is, ISAMD_P ipos) { ISAMD_PP pp; @@ -843,47 +873,5 @@ void isamd_pp_dump (ISAMD is, ISAMD_P ipos) is->method->debug=olddebug; } /* dump */ -/* - * $Log: isamd.c,v $ - * Revision 1.16 1999-10-05 09:57:40 heikki - * Tuning the isam-d (and fixed a small "detail") - * - * Revision 1.15 1999/09/27 14:36:36 heikki - * singletons - * - * Revision 1.14 1999/09/23 18:01:18 heikki - * singleton optimising - * - * Revision 1.13 1999/09/20 15:48:06 heikki - * Small changes - * - * Revision 1.12 1999/09/13 13:28:28 heikki - * isam-d optimizing: merging input data in the same go - * - * Revision 1.11 1999/08/25 18:09:24 heikki - * Starting to optimize - * - * 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) - * - * Revision 1.1 1999/07/14 12:34:43 heikki - * Copied from isamh, starting to change things... - * - * - */ \ No newline at end of file +#endif +