*
* Isamh - append-only isam
*
- * TODO
- * All of it
- * Define structures
- * Get append to work
+ * todo
+ * implement dirty bit
+ * implement direct address bit
+ * (result set stuff)
+ *
*/
#include <log.h>
#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);
{
static struct ISAMH_filecat_s def_cat[] = {
#if SMALL_TEST
- { 32, 3 },
- { 64, 0 },
+/* blocksz, max keys before switching size */
+ /* { 32, 40 }, */
+ { 128, 0 },
#else
- { 24, 10 },
- { 128, 10 },
- { 512, 10 },
- { 2048, 10 },
- { 8192, 10 },
- { 32768, 0 },
+ { 24, 40 },
+ { 2048, 2048 },
+ { 16384, 0 },
+
#endif
+#ifdef OLDVALUES
+ { 24, 40 },
+ { 128, 256 },
+ { 512, 1024 },
+ { 2048, 4096 },
+ { 8192,16384 },
+ { 32768, 0 },
+
+#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 */
+
};
ISAMH_M m = (ISAMH_M) xmalloc (sizeof(*m));
m->filecat = def_cat;
}
+
ISAMH isamh_open (BFiles bfs, const char *name, int writeflag, ISAMH_M method)
{
ISAMH is;
/* determine number of block categories */
if (is->method->debug)
- logf (LOG_LOG, "isc: bsize ifill mfill mblocks");
+ logf (LOG_LOG, "isc: bsize maxkeys");
do
{
if (is->method->debug)
logf (LOG_LOG, "isc:%6d %6d",
filecat[i].bsize, filecat[i].mblocks);
- if (max_buf_size < filecat[i].mblocks * filecat[i].bsize)
- max_buf_size = filecat[i].mblocks * filecat[i].bsize;
+ if (max_buf_size < filecat[i].bsize)
+ max_buf_size = filecat[i].bsize;
} while (filecat[i++].mblocks);
is->no_files = i;
is->max_cat = --i;
+#ifdef SKIPTHIS
/* max_buf_size is the larget buffer to be used during merge */
max_buf_size = (1 + max_buf_size / filecat[i].bsize) * filecat[i].bsize;
if (max_buf_size < (1+is->method->max_blocks_mem) * filecat[i].bsize)
max_buf_size = (1+is->method->max_blocks_mem) * filecat[i].bsize;
+#endif
+
if (is->method->debug)
logf (LOG_LOG, "isc: max_buf_size %d", max_buf_size);
is->files = (ISAMH_file) xmalloc (sizeof(*is->files)*is->no_files);
if (writeflag)
{
+#ifdef SKIPTHIS
is->merge_buf = (char *) xmalloc (max_buf_size+256);
memset (is->merge_buf, 0, max_buf_size+256);
+#else
+ is->startblock = (char *) xmalloc (max_buf_size+256);
+ memset (is->startblock, 0, max_buf_size+256);
+ is->lastblock = (char *) xmalloc (max_buf_size+256);
+ memset (is->lastblock, 0, max_buf_size+256);
+ /* The spare 256 bytes should not be needed! */
+#endif
}
else
- is->merge_buf = NULL;
+ is->startblock = is->lastblock = NULL;
+
for (i = 0; i<is->no_files; i++)
{
char fname[512];
bf_close (is->files[i].bf);
}
xfree (is->files);
- xfree (is->merge_buf);
+ xfree (is->startblock);
+ xfree (is->lastblock);
xfree (is->method);
xfree (is);
return 0;
pp->decodeClientData = (*is->method->code_start)(ISAMH_DECODE);
pp->deleteFlag = 0;
pp->numKeys = 0;
-
+ pp->lastblock=0;
+
if (pp->pos)
{
src = pp->buf;
src += sizeof(pp->size);
memcpy (&pp->numKeys, src, sizeof(pp->numKeys));
src += sizeof(pp->numKeys);
+ memcpy (&pp->lastblock, src, sizeof(pp->lastblock));
+ src += sizeof(pp->lastblock);
assert (pp->next != pp->pos);
pp->offset = src - pp->buf;
assert (pp->offset == ISAMH_BLOCK_OFFSET_1);
if (is->method->debug > 2)
- logf (LOG_LOG, "isc: read_block size=%d %d %d next=%d",
- pp->size, pp->cat, pp->pos, pp->next);
+ logf (LOG_LOG, "isamh_pp_open sz=%d c=%d p=%d n=%d",
+ pp->size, pp->cat, pp->pos, isamh_block(pp->next));
}
return pp;
}
+
+
+void isamh_buildfirstblock(ISAMH_PP pp){
+ char *dst=pp->buf;
+ assert(pp->buf);
+ assert(pp->next != pp->pos);
+ memcpy(dst, &pp->next, sizeof(pp->next) );
+ dst += sizeof(pp->next);
+ memcpy(dst, &pp->size,sizeof(pp->size));
+ dst += sizeof(pp->size);
+ memcpy(dst, &pp->numKeys, sizeof(pp->numKeys));
+ dst += sizeof(pp->numKeys);
+ memcpy(dst, &pp->lastblock, sizeof(pp->lastblock));
+ dst += sizeof(pp->lastblock);
+ assert (dst - pp->buf == ISAMH_BLOCK_OFFSET_1);
+ if (pp->is->method->debug > 2)
+ logf (LOG_LOG, "isamh: first: sz=%d p=%d/%d>%d/%d>%d/%d nk=%d",
+ pp->size,
+ pp->pos, pp->cat,
+ isamh_block(pp->next), isamh_type(pp->next),
+ isamh_block(pp->lastblock), isamh_type(pp->lastblock),
+ pp->numKeys);
+}
+
+void isamh_buildlaterblock(ISAMH_PP pp){
+ char *dst=pp->buf;
+ assert(pp->buf);
+ assert(pp->next != isamh_addr(pp->pos,pp->cat));
+ memcpy(dst, &pp->next, sizeof(pp->next) );
+ dst += sizeof(pp->next);
+ memcpy(dst, &pp->size,sizeof(pp->size));
+ dst += sizeof(pp->size);
+ assert (dst - pp->buf == ISAMH_BLOCK_OFFSET_N);
+ if (pp->is->method->debug > 2)
+ logf (LOG_LOG, "isamh: l8r: sz=%d p=%d/%d>%d/%d",
+ pp->size,
+ pp->pos, pp->cat,
+ isamh_block(pp->next), isamh_type(pp->next) );
+}
+
+
+
/* returns non-zero if item could be read; 0 otherwise */
int isamh_pp_read (ISAMH_PP pp, void *buf)
{
{
ISAMH is = pp->is;
char *src = pp->buf + pp->offset;
+ int newcat;
if (pp->offset >= pp->size)
{
}
}
/* out new block position */
- pp->pos = pp->next;
+ newcat = isamh_type(pp->next);
+ if (pp->cat != newcat ) {
+ pp->buf = xrealloc(pp->buf, is->method->filecat[newcat].bsize);
+ }
+ pp->pos = isamh_block(pp->next);
+ pp->cat = isamh_type(pp->next);
+
src = pp->buf;
/* read block and save 'next' and 'size' entry */
isamh_read_block (is, pp->cat, pp->pos, src);
src += sizeof(pp->size);
/* assume block is non-empty */
assert (src - pp->buf == ISAMH_BLOCK_OFFSET_N);
- assert (pp->next != pp->pos);
+ assert (pp->next != isamh_addr(pp->pos,pp->cat));
if (pp->deleteFlag)
isamh_release_block (is, pp->cat, pp->pos);
+ (*is->method->code_reset)(pp->decodeClientData);
(*is->method->code_item)(ISAMH_DECODE, pp->decodeClientData, dst, &src);
pp->offset = src - pp->buf;
if (is->method->debug > 2)
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 (i<pp->size) {
+ 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.1 1999-06-30 15:04:54 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
+ * Fixed an assertion in isamh
+ *
+ * Revision 1.2 1999/07/06 09:37:05 heikki
+ * Working on isamh - not ready yet.
+ *
+ * Revision 1.1 1999/06/30 15:04:54 heikki
* Copied from isamc.c, slowly starting to simplify...
*
*/
\ No newline at end of file
projects / idzebra-moved-to-github.git / blobdiff