/*
- * Copyright (c) 1995-1996, Index Data.
+ * Copyright (c) 1995-1998, Index Data.
* See the file LICENSE for details.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: isamc.c,v $
- * Revision 1.7 1997-02-12 20:42:43 adam
+ * Revision 1.21 2002-06-19 10:29:18 adam
+ * align block sizes for isam sys. Better plot for test
+ *
+ * Revision 1.20 1999/11/30 13:48:04 adam
+ * Improved installation. Updated for inclusion of YAZ header files.
+ *
+ * Revision 1.19 1999/07/14 10:59:27 adam
+ * Changed functions isc_getmethod, isams_getmethod.
+ * Improved fatal error handling (such as missing EXPLAIN schema).
+ *
+ * Revision 1.18 1999/06/30 09:08:23 adam
+ * Added coder to reset.
+ *
+ * Revision 1.17 1999/05/26 07:49:14 adam
+ * C++ compilation.
+ *
+ * Revision 1.16 1998/05/27 14:32:03 adam
+ * Changed default block category layout.
+ *
+ * Revision 1.15 1998/05/20 10:12:25 adam
+ * Implemented automatic EXPLAIN database maintenance.
+ * Modified Zebra to work with ASN.1 compiled version of YAZ.
+ *
+ * Revision 1.14 1998/03/19 10:04:35 adam
+ * Minor changes.
+ *
+ * Revision 1.13 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.12 1998/03/16 10:37:24 adam
+ * Added more statistics.
+ *
+ * Revision 1.11 1998/03/13 15:30:50 adam
+ * New functions isc_block_used and isc_block_size. Fixed 'leak'
+ * in isc_alloc_block.
+ *
+ * Revision 1.10 1998/03/11 11:18:18 adam
+ * Changed the isc_merge to take into account the mfill (minimum-fill).
+ *
+ * Revision 1.9 1998/03/06 13:54:02 adam
+ * Fixed two nasty bugs in isc_merge.
+ *
+ * Revision 1.8 1997/09/17 12:19:20 adam
+ * Zebra version corresponds to YAZ version 1.4.
+ * Changed Zebra server so that it doesn't depend on global common_resource.
+ *
+ * Revision 1.7 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
#include <string.h>
#include <stdio.h>
-#include <log.h>
+#include <yaz/log.h>
#include "isamc-p.h"
+static void flush_block (ISAMC is, int cat);
static void release_fc (ISAMC is, int cat);
static void init_fc (ISAMC is, int cat);
-ISAMC_M isc_getmethod (void)
+#define ISAMC_FREELIST_CHUNK 1
+
+#define SMALL_TEST 0
+
+void isc_getmethod (ISAMC_M m)
{
+
static struct ISAMC_filecat_s def_cat[] = {
- { 32, 28, 0, 20 },
- { 512, 490, 100, 20 },
- { 4096, 3950, 1000, 20 },
- {32768, 32000, 10000, 0 },
+#if SMALL_TEST
+ { 32, 28, 0, 3 },
+ { 64, 54, 30, 0 },
+#else
+ { 32, 26, 20, 10 },
+ { 128, 120, 100, 10 },
+ { 512, 490, 350, 10 },
+ { 2048, 1900, 1700, 10 },
+ { 8192, 8000, 7900, 10 },
+ { 32768, 32000, 31000, 0 },
+#endif
};
- ISAMC_M m = xmalloc (sizeof(*m));
m->filecat = def_cat;
m->code_start = NULL;
m->code_item = NULL;
m->code_stop = NULL;
+ m->code_reset = NULL;
m->compare_item = NULL;
m->debug = 1;
m->max_blocks_mem = 10;
-
- return m;
}
-
-ISAMC isc_open (const char *name, int writeflag, ISAMC_M method)
+ISAMC isc_open (BFiles bfs, const char *name, int writeflag, ISAMC_M method)
{
ISAMC is;
ISAMC_filecat filecat;
int i = 0;
int max_buf_size = 0;
- is = xmalloc (sizeof(*is));
+ is = (ISAMC) xmalloc (sizeof(*is));
- is->method = xmalloc (sizeof(*is->method));
+ is->method = (ISAMC_M) xmalloc (sizeof(*is->method));
memcpy (is->method, method, sizeof(*method));
filecat = is->method->filecat;
assert (filecat);
logf (LOG_LOG, "isc: max_buf_size %d", max_buf_size);
assert (is->no_files > 0);
- is->files = xmalloc (sizeof(*is->files)*is->no_files);
+ is->files = (ISAMC_file) xmalloc (sizeof(*is->files)*is->no_files);
if (writeflag)
{
- is->merge_buf = xmalloc (max_buf_size+256);
+ is->merge_buf = (char *) xmalloc (max_buf_size+256);
memset (is->merge_buf, 0, max_buf_size+256);
}
else
char fname[512];
sprintf (fname, "%s%c", name, i+'A');
- is->files[i].bf = bf_open (fname, is->method->filecat[i].bsize,
+ is->files[i].bf = bf_open (bfs, fname, is->method->filecat[i].bsize,
writeflag);
is->files[i].head_is_dirty = 0;
if (!bf_read (is->files[i].bf, 0, 0, sizeof(ISAMC_head),
is->files[i].head.lastblock = 1;
is->files[i].head.freelist = 0;
}
+ is->files[i].alloc_entries_num = 0;
+ is->files[i].alloc_entries_max =
+ is->method->filecat[i].bsize / sizeof(int) - 1;
+ is->files[i].alloc_buf = (char *)
+ xmalloc (is->method->filecat[i].bsize);
is->files[i].no_writes = 0;
is->files[i].no_reads = 0;
is->files[i].no_skip_writes = 0;
is->files[i].no_allocated = 0;
is->files[i].no_released = 0;
is->files[i].no_remap = 0;
+ is->files[i].no_forward = 0;
+ is->files[i].no_backward = 0;
+ is->files[i].sum_forward = 0;
+ is->files[i].sum_backward = 0;
+ is->files[i].no_next = 0;
+ is->files[i].no_prev = 0;
init_fc (is, i);
}
return is;
}
+int isc_block_used (ISAMC is, int type)
+{
+ if (type < 0 || type >= is->no_files)
+ return -1;
+ return is->files[type].head.lastblock-1;
+}
+
+int isc_block_size (ISAMC is, int type)
+{
+ ISAMC_filecat filecat = is->method->filecat;
+ if (type < 0 || type >= is->no_files)
+ return -1;
+ return filecat[type].bsize;
+}
+
int isc_close (ISAMC is)
{
int i;
if (is->method->debug)
+ {
+ logf (LOG_LOG, "isc: next forw mid-f prev backw mid-b");
+ for (i = 0; i<is->no_files; i++)
+ logf (LOG_LOG, "isc:%8d%8d%8.1f%8d%8d%8.1f",
+ is->files[i].no_next,
+ is->files[i].no_forward,
+ is->files[i].no_forward ?
+ (double) is->files[i].sum_forward/is->files[i].no_forward
+ : 0.0,
+ is->files[i].no_prev,
+ is->files[i].no_backward,
+ is->files[i].no_backward ?
+ (double) is->files[i].sum_backward/is->files[i].no_backward
+ : 0.0);
+ }
+ if (is->method->debug)
logf (LOG_LOG, "isc: writes reads skipped alloc released remap");
for (i = 0; i<is->no_files; i++)
{
is->files[i].no_released,
is->files[i].no_remap);
xfree (is->files[i].fc_list);
+ flush_block (is, i);
bf_close (is->files[i].bf);
}
xfree (is->files);
xfree (is->merge_buf);
+ xfree (is->method);
xfree (is);
return 0;
}
int isc_write_dblock (ISAMC is, int cat, int pos, char *src,
int nextpos, int offset)
{
- unsigned short size = offset + ISAMC_BLOCK_OFFSET_N;
+ ISAMC_BLOCK_SIZE size = offset + ISAMC_BLOCK_OFFSET_N;
if (is->method->debug > 2)
logf (LOG_LOG, "isc: write_dblock. size=%d nextpos=%d",
(int) size, nextpos);
return isc_write_block (is, cat, pos, src);
}
+#if ISAMC_FREELIST_CHUNK
+static void flush_block (ISAMC is, int cat)
+{
+ char *abuf = is->files[cat].alloc_buf;
+ int block = is->files[cat].head.freelist;
+ if (block && is->files[cat].alloc_entries_num)
+ {
+ memcpy (abuf, &is->files[cat].alloc_entries_num, sizeof(int));
+ bf_write (is->files[cat].bf, block, 0, 0, abuf);
+ is->files[cat].alloc_entries_num = 0;
+ }
+ xfree (abuf);
+}
+
+static int alloc_block (ISAMC is, int cat)
+{
+ int block = is->files[cat].head.freelist;
+ char *abuf = is->files[cat].alloc_buf;
+
+ (is->files[cat].no_allocated)++;
+
+ if (!block)
+ {
+ block = (is->files[cat].head.lastblock)++; /* no free list */
+ is->files[cat].head_is_dirty = 1;
+ }
+ else
+ {
+ if (!is->files[cat].alloc_entries_num) /* read first time */
+ {
+ bf_read (is->files[cat].bf, block, 0, 0, abuf);
+ memcpy (&is->files[cat].alloc_entries_num, abuf,
+ sizeof(is->files[cat].alloc_entries_num));
+ assert (is->files[cat].alloc_entries_num > 0);
+ }
+ /* have some free blocks now */
+ assert (is->files[cat].alloc_entries_num > 0);
+ is->files[cat].alloc_entries_num--;
+ if (!is->files[cat].alloc_entries_num) /* last one in block? */
+ {
+ memcpy (&is->files[cat].head.freelist, abuf + sizeof(int),
+ sizeof(int));
+ is->files[cat].head_is_dirty = 1;
+
+ if (is->files[cat].head.freelist)
+ {
+ bf_read (is->files[cat].bf, is->files[cat].head.freelist,
+ 0, 0, abuf);
+ memcpy (&is->files[cat].alloc_entries_num, abuf,
+ sizeof(is->files[cat].alloc_entries_num));
+ assert (is->files[cat].alloc_entries_num);
+ }
+ }
+ else
+ memcpy (&block, abuf + sizeof(int) + sizeof(int) *
+ is->files[cat].alloc_entries_num, sizeof(int));
+ }
+ return block;
+}
+
+static void release_block (ISAMC is, int cat, int pos)
+{
+ char *abuf = is->files[cat].alloc_buf;
+ int block = is->files[cat].head.freelist;
+
+ (is->files[cat].no_released)++;
+
+ if (block && !is->files[cat].alloc_entries_num) /* must read block */
+ {
+ bf_read (is->files[cat].bf, block, 0, 0, abuf);
+ memcpy (&is->files[cat].alloc_entries_num, abuf,
+ sizeof(is->files[cat].alloc_entries_num));
+ assert (is->files[cat].alloc_entries_num > 0);
+ }
+ assert (is->files[cat].alloc_entries_num <= is->files[cat].alloc_entries_max);
+ if (is->files[cat].alloc_entries_num == is->files[cat].alloc_entries_max)
+ {
+ assert (block);
+ memcpy (abuf, &is->files[cat].alloc_entries_num, sizeof(int));
+ bf_write (is->files[cat].bf, block, 0, 0, abuf);
+ is->files[cat].alloc_entries_num = 0;
+ }
+ if (!is->files[cat].alloc_entries_num) /* make new buffer? */
+ {
+ memcpy (abuf + sizeof(int), &block, sizeof(int));
+ is->files[cat].head.freelist = pos;
+ is->files[cat].head_is_dirty = 1;
+ }
+ else
+ {
+ memcpy (abuf + sizeof(int) +
+ is->files[cat].alloc_entries_num*sizeof(int),
+ &pos, sizeof(int));
+ }
+ is->files[cat].alloc_entries_num++;
+}
+#else
+static void flush_block (ISAMC is, int cat)
+{
+ char *abuf = is->files[cat].alloc_buf;
+ xfree (abuf);
+}
+
static int alloc_block (ISAMC is, int cat)
{
int block;
return block;
}
+static void release_block (ISAMC is, int cat, int pos)
+{
+ char buf[sizeof(int)];
+
+ (is->files[cat].no_released)++;
+ is->files[cat].head_is_dirty = 1;
+ memcpy (buf, &is->files[cat].head.freelist, sizeof(int));
+ is->files[cat].head.freelist = pos;
+ bf_write (is->files[cat].bf, pos, 0, sizeof(int), buf);
+}
+#endif
+
int isc_alloc_block (ISAMC is, int cat)
{
int block = 0;
if ((nb = is->files[cat].fc_list[j]) && (!block || nb < block))
{
is->files[cat].fc_list[j] = 0;
+ block = nb;
break;
}
}
return block;
}
-static void release_block (ISAMC is, int cat, int pos)
-{
- char buf[sizeof(int)];
-
- (is->files[cat].no_released)++;
- is->files[cat].head_is_dirty = 1;
- memcpy (buf, &is->files[cat].head.freelist, sizeof(int));
- is->files[cat].head.freelist = pos;
- bf_write (is->files[cat].bf, pos, 0, sizeof(int), buf);
-}
-
void isc_release_block (ISAMC is, int cat, int pos)
{
if (is->method->debug > 3)
int j = 100;
is->files[cat].fc_max = j;
- is->files[cat].fc_list = xmalloc (sizeof(*is->files[0].fc_list) * j);
+ is->files[cat].fc_list = (int *)
+ xmalloc (sizeof(*is->files[0].fc_list) * j);
while (--j >= 0)
is->files[cat].fc_list[j] = 0;
}
ISAMC_PP isc_pp_open (ISAMC is, ISAMC_P ipos)
{
- ISAMC_PP pp = xmalloc (sizeof(*pp));
+ ISAMC_PP pp = (ISAMC_PP) xmalloc (sizeof(*pp));
char *src;
pp->cat = isc_type(ipos);
pp->pos = isc_block(ipos);
- src = pp->buf = xmalloc (is->method->filecat[pp->cat].bsize);
+ src = pp->buf = (char *) xmalloc (is->method->filecat[pp->cat].bsize);
pp->next = 0;
pp->size = 0;
pp->offset = src - pp->buf;
assert (pp->offset == ISAMC_BLOCK_OFFSET_1);
if (is->method->debug > 2)
- logf (LOG_LOG, "isc: read_block size=%d %d %d",
- pp->size, pp->cat, pp->pos);
+ logf (LOG_LOG, "isc: read_block size=%d %d %d next=%d",
+ pp->size, pp->cat, pp->pos, pp->next);
}
return pp;
}
return isc_read_item (pp, (char **) &buf);
}
-/* returns non-zero if item could be read; 0 otherwise */
+/* read one item from file - decode and store it in *dst.
+ Returns
+ 0 if end-of-file
+ 1 if item could be read ok and NO boundary
+ 2 if item could be read ok and boundary */
int isc_read_item (ISAMC_PP pp, char **dst)
{
ISAMC is = pp->is;
if (pp->offset >= pp->size)
{
+ if (!pp->next)
+ {
+ pp->pos = 0;
+ return 0; /* end of file */
+ }
+ if (pp->next > pp->pos)
+ {
+ if (pp->next == pp->pos + 1)
+ is->files[pp->cat].no_next++;
+ else
+ {
+ is->files[pp->cat].no_forward++;
+ is->files[pp->cat].sum_forward += pp->next - pp->pos;
+ }
+ }
+ else
+ {
+ if (pp->next + 1 == pp->pos)
+ is->files[pp->cat].no_prev++;
+ else
+ {
+ is->files[pp->cat].no_backward++;
+ is->files[pp->cat].sum_backward += pp->pos - pp->next;
+ }
+ }
+ /* out new block position */
pp->pos = pp->next;
- if (!pp->pos)
- return 0;
src = pp->buf;
+ /* read block and save 'next' and 'size' entry */
isc_read_block (is, pp->cat, pp->pos, src);
memcpy (&pp->next, src, sizeof(pp->next));
src += sizeof(pp->next);
(*is->method->code_item)(ISAMC_DECODE, pp->decodeClientData, dst, &src);
pp->offset = src - pp->buf;
if (is->method->debug > 2)
- logf (LOG_LOG, "isc: read_block size=%d %d %d",
- pp->size, pp->cat, pp->pos);
+ logf (LOG_LOG, "isc: read_block size=%d %d %d next=%d",
+ pp->size, pp->cat, pp->pos, pp->next);
return 2;
}
(*is->method->code_item)(ISAMC_DECODE, pp->decodeClientData, dst, &src);