-/*
- * Copyright (c) 1996-1998, Index Data.
- * See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss, Heikki Levanto
- *
- */
+/* This file is part of the Zebra server.
+ Copyright (C) Index Data
+
+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 this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+*/
+
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdlib.h>
#include <assert.h>
#include <string.h>
#include <stdio.h>
-#include <log.h>
+#include <yaz/log.h>
#include "isamc-p.h"
-#include "isamh-p.h"
-struct isc_merge_block {
- int offset; /* offset in r_buf */
- int block; /* block number of file (0 if none) */
- int dirty; /* block is different from that on file */
+struct isamc_merge_block {
+ int offset; /* offset in r_buf */
+ zint block; /* block number of file (0 if none) */
+ int dirty; /* block is different from that on file */
};
-static void opt_blocks (ISAMC is, struct isc_merge_block *mb, int ptr,
+#if 0
+static void opt_blocks (ISAMC is, struct isamc_merge_block *mb, int ptr,
int last)
{
int i, no_dirty = 0;
if (!last)
mb[i].dirty = 1;
}
+#endif
-static void flush_blocks (ISAMC is, struct isc_merge_block *mb, int ptr,
- char *r_buf, int *firstpos, int cat, int last,
- int *numkeys)
+static void flush_blocks (ISAMC is, struct isamc_merge_block *mb, int ptr,
+ char *r_buf, zint *firstpos, int cat, int last,
+ zint *numkeys)
{
int i;
for (i = 0; i<ptr; i++)
{
/* consider this block number */
- if (!mb[i].block)
+ if (!mb[i].block)
{
- mb[i].block = isc_alloc_block (is, cat);
+ mb[i].block = isamc_alloc_block (is, cat);
mb[i].dirty = 1;
}
/* consider next block pointer */
if (last && i == ptr-1)
mb[i+1].block = 0;
- else if (!mb[i+1].block)
+ else if (!mb[i+1].block)
{
- mb[i+1].block = isc_alloc_block (is, cat);
+ mb[i+1].block = isamc_alloc_block (is, cat);
mb[i+1].dirty = 1;
mb[i].dirty = 1;
}
if (!*firstpos)
*firstpos = mb[i].block;
if (is->method->debug > 2)
- logf (LOG_LOG, "isc: skip ptr=%d size=%d %d %d",
+ yaz_log (YLOG_LOG, "isc: skip ptr=%d size=%d %d " ZINT_FORMAT,
i, ssize, cat, mb[i].block);
++(is->files[cat].no_skip_writes);
continue;
src = r_buf + mb[i].offset - ISAMC_BLOCK_OFFSET_1;
ssize += ISAMC_BLOCK_OFFSET_1;
- memcpy (src+sizeof(int)+sizeof(ssize), numkeys,
- sizeof(*numkeys));
+ memcpy (src+sizeof(zint)+sizeof(ssize), numkeys, sizeof(*numkeys));
if (is->method->debug > 2)
- logf (LOG_LOG, "isc: flush ptr=%d numk=%d size=%d nextpos=%d",
- i, *numkeys, (int) ssize, mb[i+1].block);
+ yaz_log (YLOG_LOG, "isc: flush ptr=%d numk=" ZINT_FORMAT " size=%d nextpos="
+ ZINT_FORMAT, i, *numkeys, (int) ssize, mb[i+1].block);
}
else
{
src = r_buf + mb[i].offset - ISAMC_BLOCK_OFFSET_N;
ssize += ISAMC_BLOCK_OFFSET_N;
if (is->method->debug > 2)
- logf (LOG_LOG, "isc: flush ptr=%d size=%d nextpos=%d",
+ yaz_log (YLOG_LOG, "isc: flush ptr=%d size=%d nextpos=" ZINT_FORMAT,
i, (int) ssize, mb[i+1].block);
}
- memcpy (src, &mb[i+1].block, sizeof(int));
- memcpy (src+sizeof(int), &ssize, sizeof(ssize));
- isc_write_block (is, cat, mb[i].block, src);
+ memcpy (src, &mb[i+1].block, sizeof(zint));
+ memcpy (src+sizeof(zint), &ssize, sizeof(ssize));
+ isamc_write_block (is, cat, mb[i].block, src);
}
}
-static int get_border (ISAMC is, struct isc_merge_block *mb, int ptr,
- int cat, int firstpos)
+static int get_border (ISAMC is, struct isamc_merge_block *mb, zint ptr,
+ int cat, zint firstpos)
{
/* Border set to initial fill or block size depending on
whether we are creating a new one or updating and old one.
*/
-
+
int fill = mb[ptr].block ? is->method->filecat[cat].bsize :
is->method->filecat[cat].ifill;
int off = (ptr||firstpos) ? ISAMC_BLOCK_OFFSET_N : ISAMC_BLOCK_OFFSET_1;
-
+
assert (ptr < 199);
return mb[ptr].offset + fill - off;
}
-ISAMC_P isc_merge (ISAMC is, ISAMC_P ipos, ISAMC_I data)
+void isamc_merge (ISAMC is, ISAM_P *ipos, ISAMC_I *data)
{
char i_item[128], *i_item_ptr;
int i_more, i_mode, i;
- ISAMC_PP pp;
+ ISAMC_PP pp;
char f_item[128], *f_item_ptr;
int f_more;
int last_dirty = 0;
int debug = is->method->debug;
-
- struct isc_merge_block mb[200];
- int firstpos = 0;
+ struct isamc_merge_block mb[200];
+
+ zint firstpos = 0;
int cat = 0;
char r_item_buf[128]; /* temporary result output */
char *r_buf; /* block with resulting data */
int r_offset = 0; /* current offset in r_buf */
int ptr = 0; /* pointer */
void *r_clientData; /* encode client data */
- int border;
- int numKeys = 0;
+ zint border;
+ zint numKeys = 0;
- r_clientData = (*is->method->code_start)(ISAMC_ENCODE);
+ r_clientData = (*is->method->codec.start)();
r_buf = is->merge_buf + 128;
- pp = isc_pp_open (is, ipos);
+ pp = isamc_pp_open (is, *ipos);
/* read first item from file. make sure f_more indicates no boundary */
f_item_ptr = f_item;
- f_more = isc_read_item (pp, &f_item_ptr);
+ f_more = isamc_read_item (pp, &f_item_ptr);
if (f_more > 0)
f_more = 1;
cat = pp->cat;
if (debug > 1)
- logf (LOG_LOG, "isc: isc_merge begin %d %d", cat, pp->pos);
+ yaz_log (YLOG_LOG, "isc: isamc_merge begin %d " ZINT_FORMAT, cat, pp->pos);
/* read first item from i */
i_item_ptr = i_item;
{
/* block to block boundary in the original file. */
f_more = 1;
- if (cat == pp->cat)
+ if (cat == pp->cat)
{
/* the resulting output is of the same category as the
- the original
+ the original
*/
if (r_offset <= mb[ptr].offset +is->method->filecat[cat].mfill)
{
the original (if any)
*/
if (debug > 3)
- logf (LOG_LOG, "isc: release A");
+ yaz_log (YLOG_LOG, "isc: release A");
if (mb[ptr].block)
- isc_release_block (is, pp->cat, mb[ptr].block);
+ isamc_release_block (is, pp->cat, mb[ptr].block);
mb[ptr].block = pp->pos;
if (!mb[ptr].dirty)
mb[ptr].dirty = 1;
mb[ptr].dirty = last_dirty;
mb[ptr].offset = r_offset;
if (debug > 3)
- logf (LOG_LOG, "isc: bound ptr=%d,offset=%d",
+ yaz_log (YLOG_LOG, "isc: bound ptr=%d,offset=%d",
ptr, r_offset);
if (cat==is->max_cat && ptr >= is->method->max_blocks_mem)
{
except 1 will be flushed.
*/
if (debug > 2)
- logf (LOG_LOG, "isc: flush A %d sections", ptr);
+ yaz_log (YLOG_LOG, "isc: flush A %d sections", ptr);
flush_blocks (is, mb, ptr-1, r_buf, &firstpos, cat,
0, &pp->numKeys);
mb[0].block = mb[ptr-1].block;
}
/* move f */
f_item_ptr = f_item;
- f_more = isc_read_item (pp, &f_item_ptr);
+ f_more = isamc_read_item (pp, &f_item_ptr);
}
else if (cmp > 0) /* insert f */
{
memcpy (r_item, f_item, f_item_ptr - f_item);
/* move f */
f_item_ptr = f_item;
- f_more = isc_read_item (pp, &f_item_ptr);
+ f_more = isamc_read_item (pp, &f_item_ptr);
}
else /* insert i */
{
if (!i_mode) /* delete item which isn't there? */
{
- logf (LOG_FATAL, "Inconsistent register at offset %d",
+ yaz_log (YLOG_FATAL, "Inconsistent register at offset %d",
r_offset);
abort ();
}
if (r_item) /* insert resulting item? */
{
char *r_out_ptr = r_buf + r_offset;
+ const char *src = r_item;
int new_offset;
- (*is->method->code_item)(ISAMC_ENCODE, r_clientData,
- &r_out_ptr, &r_item);
- new_offset = r_out_ptr - r_buf;
+ (*is->method->codec.encode)(r_clientData, &r_out_ptr, &src);
+ new_offset = r_out_ptr - r_buf;
numKeys++;
if (border < new_offset && border >= r_offset)
{
if (debug > 2)
- logf (LOG_LOG, "isc: border %d %d", ptr, border);
+ yaz_log (YLOG_LOG, "isc: border %d " ZINT_FORMAT,
+ ptr, border);
/* Max size of current block category reached ...
make new virtual block entry */
mb[++ptr].block = 0;
surely not the last one(s).
*/
if (debug > 2)
- logf (LOG_LOG, "isc: flush B %d sections", ptr-1);
+ yaz_log (YLOG_LOG, "isc: flush B %d sections", ptr-1);
flush_blocks (is, mb, ptr-1, r_buf, &firstpos, cat,
0, &pp->numKeys);
mb[0].block = mb[ptr-1].block;
if (cat < is->max_cat && ptr >= is->method->filecat[cat].mblocks)
{
/* Max number blocks in current category reached ->
- must switch to next category (with larger block size)
+ must switch to next category (with larger block size)
*/
int j = 0;
/* delete all original block(s) read so far */
for (i = 0; i < ptr; i++)
if (mb[i].block)
- isc_release_block (is, pp->cat, mb[i].block);
+ isamc_release_block (is, pp->cat, mb[i].block);
/* also delete all block to be read in the future */
pp->deleteFlag = 1;
int border = is->method->filecat[cat].ifill -
ISAMC_BLOCK_OFFSET_1 + mb[j].offset;
if (debug > 3)
- logf (LOG_LOG, "isc: remap %d border=%d", i, border);
+ yaz_log (YLOG_LOG, "isc: remap %d border=%d", i, border);
if (mb[i+1].offset > border && mb[i].offset <= border)
{
if (debug > 3)
- logf (LOG_LOG, "isc: to %d %d", j, mb[i].offset);
+ yaz_log (YLOG_LOG, "isc: to %d %d", j, mb[i].offset);
mb[++j].dirty = 1;
mb[j].block = 0;
mb[j].offset = mb[i].offset;
}
}
if (debug > 2)
- logf (LOG_LOG, "isc: remap from %d to %d sections to cat %d",
+ yaz_log (YLOG_LOG, "isc: remap from %d to %d sections to cat %d",
ptr, j, cat);
ptr = j;
border = get_border (is, mb, ptr, cat, firstpos);
if (debug > 3)
- logf (LOG_LOG, "isc: border=%d r_offset=%d", border, r_offset);
+ yaz_log (YLOG_LOG, "isc: border=" ZINT_FORMAT " r_offset=%d",
+ border, r_offset);
}
}
if (mb[ptr].offset < r_offset)
{ /* make the final boundary offset */
- mb[++ptr].dirty = 1;
- mb[ptr].block = 0;
+ mb[++ptr].dirty = 1;
+ mb[ptr].block = 0;
mb[ptr].offset = r_offset;
}
else
if (cat == pp->cat && mb[ptr].block)
{
if (debug > 3)
- logf (LOG_LOG, "isc: release C");
- isc_release_block (is, pp->cat, mb[ptr].block);
+ yaz_log (YLOG_LOG, "isc: release C");
+ isamc_release_block (is, pp->cat, mb[ptr].block);
mb[ptr].block = 0;
if (ptr > 0)
mb[ptr-1].dirty = 1;
}
if (debug > 2)
- logf (LOG_LOG, "isc: flush C, %d sections", ptr);
+ yaz_log (YLOG_LOG, "isc: flush C, %d sections", ptr);
if (firstpos)
{
/* we have to patch initial block with num keys if that
has changed */
- if (numKeys != isc_pp_num (pp))
+ if (numKeys != isamc_pp_num (pp))
{
if (debug > 2)
- logf (LOG_LOG, "isc: patch num keys firstpos=%d num=%d",
+ yaz_log (YLOG_LOG, "isc: patch num keys firstpos=" ZINT_FORMAT " num=" ZINT_FORMAT,
firstpos, numKeys);
bf_write (is->files[cat].bf, firstpos, ISAMC_BLOCK_OFFSET_N,
sizeof(numKeys), &numKeys);
else if (ptr > 0)
{ /* we haven't flushed initial block yet and there surely are some
blocks to flush. Make first block dirty if numKeys differ */
- if (numKeys != isc_pp_num (pp))
+ if (numKeys != isamc_pp_num (pp))
mb[0].dirty = 1;
}
/* flush rest of block(s) in r_buf */
flush_blocks (is, mb, ptr, r_buf, &firstpos, cat, 1, &numKeys);
- (*is->method->code_stop)(ISAMC_ENCODE, r_clientData);
+ (*is->method->codec.stop)(r_clientData);
if (!firstpos)
cat = 0;
if (debug > 1)
- logf (LOG_LOG, "isc: isc_merge return %d %d", cat, firstpos);
- isc_pp_close (pp);
- return cat + firstpos * 8;
-}
-
-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;
+ yaz_log (YLOG_LOG, "isc: isamc_merge return %d " ZINT_FORMAT, cat, firstpos);
+ isamc_pp_close (pp);
+ *ipos = cat + firstpos * 8;
}
-
-/* isamh - heikki's append-only isam
- * missing:
- * read the code from an existing block, to synch encoding
- * append to single-block entries
- * append to multi-block entries
-*/
-
-ISAMC_P isamh_append (ISAMH is, ISAMH_P ipos, ISAMH_I data)
-{
-
- ISAMH_PP pp;
-
- char i_item[128];
- char *i_item_ptr;
- int i_more=1, i_mode;
-
- char codebuffer[128];
- char *codeptr;
- char *bufptr;
- int codelen;
-
- ISAMH_PP firstpp;
- void *r_clientData; /* encode client data */
- int newblock;
- int newcat;
- int maxkeys;
- int maxsize;
- int retval;
-
- pp = firstpp = isamh_pp_open (is, ipos);
- assert (*is->method->code_reset);
-
- if ( 0==ipos)
- { /* new block */
- 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);
- logf(LOG_LOG,"isamh_append: starting with new block %d",pp->pos);
- }
- else
- { /* existing block */
- if (isamh_block(firstpp->lastblock) == firstpp->pos)
- { /* only one block, we have it already */
- pp->offset=ISAMH_BLOCK_OFFSET_1;
- logf(LOG_LOG,"isamh_append: starting with one block %d",pp->pos);
- }
- else
- {
- logf(LOG_LOG,"isamh_append: starting with multiple blocks %d>%d>%d",
- firstpp->pos,isamh_block(firstpp->next),isamh_block(firstpp->lastblock));
- pp=isamh_pp_open(is,firstpp->lastblock);
- /* dirty, but this can also read a N-block. Just clear extra values*/
- pp->lastblock=0;
- pp->offset=ISAMH_BLOCK_OFFSET_N;
- } /* get last */
- /* read pointers in it to synchronize the encoder ??!! */
- r_clientData = (*is->method->code_start)(ISAMH_ENCODE);
- logf(LOG_LOG,"isamh_append: scanning to end of block %d %d->%d",
- pp->pos, pp->offset, pp->size);
- codeptr=codebuffer;
- while (pp->offset<pp->size) {
- codeptr=codebuffer;
- bufptr=pp->buf + pp->offset;
- (*is->method->code_item)(ISAMH_DECODE, r_clientData, &codeptr, &bufptr);
- codelen = bufptr - (pp->buf+pp->offset) ;
- logf(LOG_LOG,"isamh_append: dec at %d %d/%d:%s",
- pp->offset, codelen, codeptr-codebuffer,
- hexdump(codebuffer,codeptr-codebuffer,0) );
- pp->offset += codelen;
- }
- } /* existing block */
-
-
- i_item_ptr = i_item;
- i_more = (*data->read_item)(data->clientData,&i_item_ptr,&i_mode);
- logf(LOG_LOG,"isamh_append 1: m=%d l=%d %s",
- i_mode, i_item_ptr-i_item, hexdump(i_item,i_item_ptr-i_item,0));
-
- maxsize = is->method->filecat[pp->cat].bsize;
-
- while(i_more) {
- if (i_mode)
- { /* insert key, ignore all delete keys time being... */
- codeptr = codebuffer;
- i_item_ptr=i_item;
- (*is->method->code_item)(ISAMH_ENCODE, r_clientData, &codeptr, &i_item_ptr);
- codelen = codeptr-codebuffer;
-
- assert( (codelen < 128) && (codelen>0));
-
- logf(LOG_LOG,"isamh_append: coded into %d:%s",
- codelen,hexdump(codebuffer,codelen,0));
-
- if ( pp->offset + codelen > maxsize )
- {
- newcat = pp->cat;
- maxkeys = is->method->filecat[pp->cat].mblocks; /* max keys */
- logf(LOG_LOG,"isamh_append: need new block: %d > %d (k:%d/%d)",
- pp->offset + codelen, maxsize, firstpp->numKeys,maxkeys );
- if ( (maxkeys>0) && (firstpp->numKeys > maxkeys) )
- { /* time to increase block size */
- newcat++;
- maxsize = is->method->filecat[newcat].bsize;
- pp->buf=xrealloc(pp->buf,maxsize);
- logf(LOG_LOG,"isamh_append: increased to cat %d ",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_buildlaterblock(pp);
- isamh_write_block(is,pp->cat,pp->pos,pp->buf);
- //if (cat != newcat)
- // realloc buf !!!!
- }
- else
- { /* we had only one block, allocate a second buffer */
- pp = isamh_pp_open(is,0);
- }
- pp->cat = newcat;
- pp->pos = newblock;
-
- pp->size=pp->offset=ISAMH_BLOCK_OFFSET_N ;
- pp->next=0;
- pp->lastblock=0;
- logf(LOG_LOG,"isamh_append: got a new block %d:%d",pp->cat,pp->pos);
-
- /* reset the encoding, and code again */
- (*is->method->code_reset)(r_clientData);
- codeptr = codebuffer;
- i_item_ptr=i_item;
- (*is->method->code_item)(ISAMH_ENCODE, r_clientData, &codeptr, &i_item_ptr);
- codelen = codeptr-codebuffer;
- logf(LOG_LOG,"isamh_append: coded again %d:%s",
- codelen,hexdump(codebuffer,codelen,0));
-
- } /* new block needed */
-
- /* ok, now we can write it */
- memcpy(&(pp->buf[pp->offset]), codebuffer, codelen);
- pp->offset += codelen;
- pp->size += codelen;
- firstpp->numKeys++;
- } /* not a delete */
-
- /* try to read the next element */
- i_item_ptr = i_item;
- i_more = (*data->read_item)(data->clientData,&i_item_ptr,&i_mode);
- logf(LOG_LOG,"isamh_append 2: m=%d l=%d %s",
- i_mode, i_item_ptr-i_item, hexdump(i_item,i_item_ptr-i_item,0));
-
- } /* while */
-
- /* Write the last (partial) block, if needed. */
- if (pp!=firstpp)
- {
- 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_buildfirstblock(firstpp);
- isamh_write_block(is,firstpp->cat,firstpp->pos,firstpp->buf);
-
- /* release the second block, if we allocated one */
- if ( firstpp != pp )
- isamh_pp_close(pp);
-
- /* get return value (before it disappears at close! */
- retval = isamh_addr(firstpp->pos,firstpp->cat);
-
- isamh_pp_close(firstpp);
-
- return retval;
-
-} /* isamh_append */
-
-
/*
- * $Log: merge.c,v $
- * Revision 1.14 1999-07-06 16:30:20 heikki
- * IsamH startss to work - at least it builds indexes. Can not search yet...
- *
- * Revision 1.13 1999/07/06 09:37:05 heikki
- * Working on isamh - not ready yet.
- *
- * Revision 1.12 1999/06/30 15:03:55 heikki
- * first take on isamh, the append-only isam structure
- *
- * Revision 1.11 1999/05/26 07:49:14 adam
- * C++ compilation.
- *
- * Revision 1.10 1998/03/19 12:22:09 adam
- * Minor change.
- *
- * Revision 1.9 1998/03/19 10:04:38 adam
- * Minor changes.
- *
- * Revision 1.8 1998/03/18 09:23:55 adam
- * Blocks are stored in chunks on free list - up to factor 2 in speed.
- * Fixed bug that could occur in block category rearrangemen.
- *
- * Revision 1.7 1998/03/11 11:18:18 adam
- * Changed the isc_merge to take into account the mfill (minimum-fill).
- *
- * Revision 1.6 1998/03/06 13:54:03 adam
- * Fixed two nasty bugs in isc_merge.
- *
- * Revision 1.5 1997/02/12 20:42:43 adam
- * Bug fix: during isc_merge operations, some pages weren't marked dirty
- * even though they should be. At this point the merge operation marks
- * a page dirty if the previous page changed at all. A better approach is
- * to mark it dirty if the last key written changed in previous page.
- *
- * Revision 1.4 1996/11/08 11:15:31 adam
- * Number of keys in chain are stored in first block and the function
- * to retrieve this information, isc_pp_num is implemented.
- *
- * Revision 1.3 1996/11/04 14:08:59 adam
- * Optimized free block usage.
- *
- * Revision 1.2 1996/11/01 13:36:46 adam
- * New element, max_blocks_mem, that control how many blocks of max size
- * to store in memory during isc_merge.
- * Function isc_merge now ignores delete/update of identical keys and
- * the proper blocks are then non-dirty and not written in flush_blocks.
- *
- * Revision 1.1 1996/11/01 08:59:15 adam
- * First version of isc_merge that supports update/delete.
- *
+ * Local variables:
+ * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
*/
-
projects / idzebra-moved-to-github.git / blobdiff