X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=isamc%2Fisamc.c;h=28b71ce5c56f19d43c324666ac6a68ed2e3b8278;hb=9b4f970d2816490fa4cc850fabc51f494ee5612b;hp=b1e8fe22187f500e8577bee94d7e361f2b8cd114;hpb=1d81c32c736b0b108f1739b25cd46efec0cec34c;p=idzebra-moved-to-github.git diff --git a/isamc/isamc.c b/isamc/isamc.c index b1e8fe2..28b71ce 100644 --- a/isamc/isamc.c +++ b/isamc/isamc.c @@ -4,7 +4,44 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: isamc.c,v $ - * Revision 1.9 1998-03-06 13:54:02 adam + * 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 @@ -50,44 +87,47 @@ #include #include -#include +#include #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); +#define ISAMC_FREELIST_CHUNK 1 + #define SMALL_TEST 0 -ISAMC_M isc_getmethod (void) +void isc_getmethod (ISAMC_M m) { + static struct ISAMC_filecat_s def_cat[] = { #if SMALL_TEST - { 32, 28, 0, 3 }, - { 64, 54, 30, 0 }, + { 32, 28, 0, 3 }, + { 64, 54, 30, 0 }, #else - { 32, 28, 0, 20 }, - { 512, 490, 100, 20 }, - { 4096, 3950, 1000, 20 }, - {32768, 32000, 10000, 0 }, + { 24, 22, 18, 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 (BFiles bfs, const char *name, int writeflag, ISAMC_M method) { ISAMC is; @@ -95,9 +135,9 @@ ISAMC isc_open (BFiles bfs, const char *name, int writeflag, ISAMC_M method) 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); @@ -124,10 +164,10 @@ ISAMC isc_open (BFiles bfs, const char *name, int writeflag, ISAMC_M method) 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 @@ -146,23 +186,65 @@ ISAMC isc_open (BFiles bfs, const char *name, int writeflag, ISAMC_M method) 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; ino_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; ino_files; i++) { @@ -180,10 +262,12 @@ int isc_close (ISAMC is) 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; } @@ -205,7 +289,7 @@ int isc_write_block (ISAMC is, int cat, int pos, char *src) 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); @@ -215,6 +299,109 @@ int isc_write_dblock (ISAMC is, int cat, int pos, char *src, 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; @@ -232,6 +419,18 @@ static int alloc_block (ISAMC is, int cat) 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; @@ -243,6 +442,7 @@ int isc_alloc_block (ISAMC is, int cat) if ((nb = is->files[cat].fc_list[j]) && (!block || nb < block)) { is->files[cat].fc_list[j] = 0; + block = nb; break; } } @@ -253,17 +453,6 @@ int isc_alloc_block (ISAMC is, int cat) 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) @@ -286,7 +475,8 @@ static void init_fc (ISAMC is, int cat) 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; } @@ -314,13 +504,13 @@ void isc_pp_close (ISAMC_PP pp) 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; @@ -368,10 +558,33 @@ int isc_read_item (ISAMC_PP pp, char **dst) 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; /* end of file */ src = pp->buf; /* read block and save 'next' and 'size' entry */ isc_read_block (is, pp->cat, pp->pos, src);