X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=isamc%2Fisamc.c;h=24beceba941a2d32fb243814b75602d0dacbc28c;hp=bc81c16db76c147e05df80151f22b7e9fbf1bd1b;hb=HEAD;hpb=896c0427df9d8eff5de6a1735dcd992e067df844 diff --git a/isamc/isamc.c b/isamc/isamc.c index bc81c16..24beceb 100644 --- a/isamc/isamc.c +++ b/isamc/isamc.c @@ -1,8 +1,5 @@ -/* $Id: isamc.c,v 1.22 2002-08-02 19:26:56 adam Exp $ - Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002 - Index Data Aps - -This file is part of the Zebra server. +/* 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 @@ -15,34 +12,36 @@ 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. -*/ - +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +*/ -/* +/* * TODO: - * Reduction to lower categories in isc_merge + * Reduction to lower categories in isamc_merge */ +#if HAVE_CONFIG_H +#include +#endif #include #include #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 ISAMC_FREELIST_CHUNK 0 #define SMALL_TEST 0 -void isc_getmethod (ISAMC_M m) +void isamc_getmethod (ISAMC_M *m) { static struct ISAMC_filecat_s def_cat[] = { @@ -50,7 +49,7 @@ void isc_getmethod (ISAMC_M m) { 32, 28, 0, 3 }, { 64, 54, 30, 0 }, #else - { 32, 26, 20, 10 }, + { 64, 56, 40, 5 }, { 128, 120, 100, 10 }, { 512, 490, 350, 10 }, { 2048, 1900, 1700, 10 }, @@ -60,19 +59,21 @@ void isc_getmethod (ISAMC_M m) }; m->filecat = def_cat; - m->code_start = NULL; - m->code_item = NULL; - m->code_stop = NULL; - m->code_reset = NULL; + m->codec.start = NULL; + m->codec.decode = NULL; + m->codec.encode = NULL; + m->codec.stop = NULL; + m->codec.reset = NULL; m->compare_item = NULL; + m->log_item = NULL; m->debug = 1; m->max_blocks_mem = 10; } -ISAMC isc_open (BFiles bfs, const char *name, int writeflag, ISAMC_M method) +ISAMC isamc_open (BFiles bfs, const char *name, int writeflag, ISAMC_M *method) { ISAMC is; ISAMC_filecat filecat; @@ -81,19 +82,19 @@ ISAMC isc_open (BFiles bfs, const char *name, int writeflag, ISAMC_M method) is = (ISAMC) xmalloc (sizeof(*is)); - is->method = (ISAMC_M) xmalloc (sizeof(*is->method)); + is->method = (ISAMC_M *) xmalloc (sizeof(*is->method)); memcpy (is->method, method, sizeof(*method)); filecat = is->method->filecat; assert (filecat); /* determine number of block categories */ if (is->method->debug) - logf (LOG_LOG, "isc: bsize ifill mfill mblocks"); + yaz_log (YLOG_LOG, "isc: bsize ifill mfill mblocks"); do { if (is->method->debug) - logf (LOG_LOG, "isc:%6d %6d %6d %6d", - filecat[i].bsize, filecat[i].ifill, + yaz_log (YLOG_LOG, "isc:%6d %6d %6d %6d", + filecat[i].bsize, filecat[i].ifill, filecat[i].mfill, filecat[i].mblocks); if (max_buf_size < filecat[i].mblocks * filecat[i].bsize) max_buf_size = filecat[i].mblocks * filecat[i].bsize; @@ -105,8 +106,8 @@ ISAMC isc_open (BFiles bfs, const char *name, int writeflag, ISAMC_M method) 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; if (is->method->debug) - logf (LOG_LOG, "isc: max_buf_size %d", max_buf_size); - + yaz_log (YLOG_LOG, "isc: max_buf_size %d", max_buf_size); + assert (is->no_files > 0); is->files = (ISAMC_file) xmalloc (sizeof(*is->files)*is->no_files); if (writeflag) @@ -118,21 +119,13 @@ ISAMC isc_open (BFiles bfs, const char *name, int writeflag, ISAMC_M method) is->merge_buf = NULL; for (i = 0; ino_files; i++) { - char fname[512]; - - sprintf (fname, "%s%c", name, i+'A'); - is->files[i].bf = bf_open (bfs, fname, is->method->filecat[i].bsize, - writeflag); + is->files[i].bf = 0; is->files[i].head_is_dirty = 0; - if (!bf_read (is->files[i].bf, 0, 0, sizeof(ISAMC_head), - &is->files[i].head)) - { - is->files[i].head.lastblock = 1; - is->files[i].head.freelist = 0; - } + 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->method->filecat[i].bsize / sizeof(zint) - 1; is->files[i].alloc_buf = (char *) xmalloc (is->method->filecat[i].bsize); is->files[i].no_writes = 0; @@ -150,17 +143,39 @@ ISAMC isc_open (BFiles bfs, const char *name, int writeflag, ISAMC_M method) init_fc (is, i); } + + for (i = 0; ino_files; i++) + { + char fname[FILENAME_MAX]; + int r; + + sprintf (fname, "%s%c", name, i+'A'); + is->files[i].bf = bf_open (bfs, fname, is->method->filecat[i].bsize, + writeflag); + if (!is->files[i].bf) + { + isamc_close(is); + return 0; + } + r = bf_read(is->files[i].bf, 0, 0, sizeof(ISAMC_head), + &is->files[i].head); + if (r == -1) + { + isamc_close(is); + return 0; + } + } return is; } -int isc_block_used (ISAMC is, int type) +zint isamc_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) +int isamc_block_size (ISAMC is, int type) { ISAMC_filecat filecat = is->method->filecat; if (type < 0 || type >= is->no_files) @@ -168,15 +183,15 @@ int isc_block_size (ISAMC is, int type) return filecat[type].bsize; } -int isc_close (ISAMC is) +int isamc_close (ISAMC is) { int i; if (is->method->debug) { - logf (LOG_LOG, "isc: next forw mid-f prev backw mid-b"); + yaz_log (YLOG_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", + yaz_log (YLOG_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 ? @@ -189,25 +204,28 @@ int isc_close (ISAMC is) : 0.0); } if (is->method->debug) - logf (LOG_LOG, "isc: writes reads skipped alloc released remap"); + yaz_log (YLOG_LOG, "isc: writes reads skipped alloc released remap"); for (i = 0; ino_files; i++) { release_fc (is, i); - assert (is->files[i].bf); - if (is->files[i].head_is_dirty) - bf_write (is->files[i].bf, 0, 0, sizeof(ISAMC_head), - &is->files[i].head); if (is->method->debug) - logf (LOG_LOG, "isc:%8d%8d%8d%8d%8d%8d", - is->files[i].no_writes, - is->files[i].no_reads, - is->files[i].no_skip_writes, - is->files[i].no_allocated, - 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); + yaz_log (YLOG_LOG, "isc:%8d%8d%8d%8d%8d%8d", + is->files[i].no_writes, + is->files[i].no_reads, + is->files[i].no_skip_writes, + is->files[i].no_allocated, + is->files[i].no_released, + is->files[i].no_remap); + if (is->files[i].bf) + { + if (is->files[i].head_is_dirty) + bf_write (is->files[i].bf, 0, 0, sizeof(ISAMC_head), + &is->files[i].head); + flush_block (is, i); + bf_close (is->files[i].bf); + } + xfree(is->files[i].fc_list); + xfree(is->files[i].alloc_buf); } xfree (is->files); xfree (is->merge_buf); @@ -216,50 +234,49 @@ int isc_close (ISAMC is) return 0; } -int isc_read_block (ISAMC is, int cat, int pos, char *dst) +int isamc_read_block (ISAMC is, int cat, zint pos, char *dst) { ++(is->files[cat].no_reads); return bf_read (is->files[cat].bf, pos, 0, 0, dst); } -int isc_write_block (ISAMC is, int cat, int pos, char *src) +int isamc_write_block (ISAMC is, int cat, zint pos, char *src) { ++(is->files[cat].no_writes); if (is->method->debug > 2) - logf (LOG_LOG, "isc: write_block %d %d", cat, pos); + yaz_log (YLOG_LOG, "isc: write_block %d " ZINT_FORMAT, cat, pos); return bf_write (is->files[cat].bf, pos, 0, 0, src); } -int isc_write_dblock (ISAMC is, int cat, int pos, char *src, - int nextpos, int offset) +int isamc_write_dblock (ISAMC is, int cat, zint pos, char *src, + zint nextpos, int offset) { ISAMC_BLOCK_SIZE size = offset + ISAMC_BLOCK_OFFSET_N; if (is->method->debug > 2) - logf (LOG_LOG, "isc: write_dblock. size=%d nextpos=%d", + yaz_log (YLOG_LOG, "isc: write_dblock. size=%d nextpos=" ZINT_FORMAT, (int) size, nextpos); src -= ISAMC_BLOCK_OFFSET_N; - memcpy (src, &nextpos, sizeof(int)); - memcpy (src + sizeof(int), &size, sizeof(size)); - return isc_write_block (is, cat, pos, src); + memcpy (src, &nextpos, sizeof(nextpos)); + memcpy (src + sizeof(nextpos), &size, sizeof(size)); + return isamc_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; + zint block = is->files[cat].head.freelist; if (block && is->files[cat].alloc_entries_num) { - memcpy (abuf, &is->files[cat].alloc_entries_num, sizeof(int)); + memcpy (abuf, &is->files[cat].alloc_entries_num, sizeof(block)); 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) +static zint alloc_block (ISAMC is, int cat) { - int block = is->files[cat].head.freelist; + zint block = is->files[cat].head.freelist; char *abuf = is->files[cat].alloc_buf; (is->files[cat].no_allocated)++; @@ -284,7 +301,7 @@ static int alloc_block (ISAMC is, int cat) if (!is->files[cat].alloc_entries_num) /* last one in block? */ { memcpy (&is->files[cat].head.freelist, abuf + sizeof(int), - sizeof(int)); + sizeof(zint)); is->files[cat].head_is_dirty = 1; if (is->files[cat].head.freelist) @@ -297,16 +314,16 @@ static int alloc_block (ISAMC is, int cat) } } else - memcpy (&block, abuf + sizeof(int) + sizeof(int) * - is->files[cat].alloc_entries_num, sizeof(int)); + memcpy (&block, abuf + sizeof(zint) + sizeof(int) * + is->files[cat].alloc_entries_num, sizeof(zint)); } return block; } -static void release_block (ISAMC is, int cat, int pos) +static void release_block (ISAMC is, int cat, zint pos) { char *abuf = is->files[cat].alloc_buf; - int block = is->files[cat].head.freelist; + zint block = is->files[cat].head.freelist; (is->files[cat].no_released)++; @@ -327,61 +344,60 @@ static void release_block (ISAMC is, int cat, int pos) } if (!is->files[cat].alloc_entries_num) /* make new buffer? */ { - memcpy (abuf + sizeof(int), &block, sizeof(int)); + memcpy (abuf + sizeof(int), &block, sizeof(zint)); is->files[cat].head.freelist = pos; - is->files[cat].head_is_dirty = 1; + 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*sizeof(zint), + &pos, sizeof(zint)); } 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) +static zint alloc_block (ISAMC is, int cat) { - int block; - char buf[sizeof(int)]; + zint block; + char buf[sizeof(zint)]; is->files[cat].head_is_dirty = 1; (is->files[cat].no_allocated)++; if ((block = is->files[cat].head.freelist)) { - bf_read (is->files[cat].bf, block, 0, sizeof(int), buf); - memcpy (&is->files[cat].head.freelist, buf, sizeof(int)); + bf_read (is->files[cat].bf, block, 0, sizeof(zint), buf); + memcpy (&is->files[cat].head.freelist, buf, sizeof(zint)); } else block = (is->files[cat].head.lastblock)++; return block; } -static void release_block (ISAMC is, int cat, int pos) +static void release_block (ISAMC is, int cat, zint pos) { - char buf[sizeof(int)]; - + char buf[sizeof(zint)]; + (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_is_dirty = 1; + memcpy (buf, &is->files[cat].head.freelist, sizeof(zint)); is->files[cat].head.freelist = pos; - bf_write (is->files[cat].bf, pos, 0, sizeof(int), buf); + bf_write (is->files[cat].bf, pos, 0, sizeof(zint), buf); } #endif -int isc_alloc_block (ISAMC is, int cat) +zint isamc_alloc_block (ISAMC is, int cat) { - int block = 0; + zint block = 0; if (is->files[cat].fc_list) { - int j, nb; + int j; + zint nb; for (j = 0; j < is->files[cat].fc_max; j++) if ((nb = is->files[cat].fc_list[j]) && (!block || nb < block)) { @@ -393,14 +409,14 @@ int isc_alloc_block (ISAMC is, int cat) if (!block) block = alloc_block (is, cat); if (is->method->debug > 3) - logf (LOG_LOG, "isc: alloc_block in cat %d: %d", cat, block); + yaz_log (YLOG_LOG, "isc: alloc_block in cat %d: " ZINT_FORMAT, cat, block); return block; } -void isc_release_block (ISAMC is, int cat, int pos) +void isamc_release_block (ISAMC is, int cat, zint pos) { if (is->method->debug > 3) - logf (LOG_LOG, "isc: release_block in cat %d: %d", cat, pos); + yaz_log (YLOG_LOG, "isc: release_block in cat %d:" ZINT_FORMAT, cat, pos); if (is->files[cat].fc_list) { int j; @@ -417,9 +433,9 @@ void isc_release_block (ISAMC is, int cat, int pos) static void init_fc (ISAMC is, int cat) { int j = 100; - + is->files[cat].fc_max = j; - is->files[cat].fc_list = (int *) + is->files[cat].fc_list = (zint *) xmalloc (sizeof(*is->files[0].fc_list) * j); while (--j >= 0) is->files[cat].fc_list[j] = 0; @@ -427,7 +443,8 @@ static void init_fc (ISAMC is, int cat) static void release_fc (ISAMC is, int cat) { - int b, j = is->files[cat].fc_max; + int j = is->files[cat].fc_max; + zint b; while (--j >= 0) if ((b = is->files[cat].fc_list[j])) @@ -437,22 +454,22 @@ static void release_fc (ISAMC is, int cat) } } -void isc_pp_close (ISAMC_PP pp) +void isamc_pp_close (ISAMC_PP pp) { ISAMC is = pp->is; - (*is->method->code_stop)(ISAMC_DECODE, pp->decodeClientData); + (*is->method->codec.stop)(pp->decodeClientData); xfree (pp->buf); xfree (pp); } -ISAMC_PP isc_pp_open (ISAMC is, ISAMC_P ipos) +ISAMC_PP isamc_pp_open (ISAMC is, ISAM_P ipos) { ISAMC_PP pp = (ISAMC_PP) xmalloc (sizeof(*pp)); char *src; - - pp->cat = isc_type(ipos); - pp->pos = isc_block(ipos); + + pp->cat = (int) isamc_type(ipos); + pp->pos = isamc_block(ipos); src = pp->buf = (char *) xmalloc (is->method->filecat[pp->cat].bsize); @@ -460,34 +477,40 @@ ISAMC_PP isc_pp_open (ISAMC is, ISAMC_P ipos) pp->size = 0; pp->offset = 0; pp->is = is; - pp->decodeClientData = (*is->method->code_start)(ISAMC_DECODE); + pp->decodeClientData = (*is->method->codec.start)(); pp->deleteFlag = 0; pp->numKeys = 0; if (pp->pos) { src = pp->buf; - isc_read_block (is, pp->cat, pp->pos, src); + isamc_read_block (is, pp->cat, pp->pos, src); memcpy (&pp->next, src, sizeof(pp->next)); src += sizeof(pp->next); memcpy (&pp->size, src, sizeof(pp->size)); src += sizeof(pp->size); memcpy (&pp->numKeys, src, sizeof(pp->numKeys)); src += sizeof(pp->numKeys); - assert (pp->next != pp->pos); - pp->offset = src - pp->buf; + if (pp->next == pp->pos) + { + yaz_log(YLOG_FATAL|YLOG_LOG, "pp->next = " ZINT_FORMAT, pp->next); + yaz_log(YLOG_FATAL|YLOG_LOG, "pp->pos = " ZINT_FORMAT, pp->pos); + assert (pp->next != pp->pos); + } + 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 next=%d", - pp->size, pp->cat, pp->pos, pp->next); + yaz_log (YLOG_LOG, "isc: read_block size=%d %d " ZINT_FORMAT " next=" + ZINT_FORMAT, pp->size, pp->cat, pp->pos, pp->next); } return pp; } /* returns non-zero if item could be read; 0 otherwise */ -int isc_pp_read (ISAMC_PP pp, void *buf) +int isamc_pp_read (ISAMC_PP pp, void *buf) { - return isc_read_item (pp, (char **) &buf); + char *cp = buf; + return isamc_read_item (pp, &cp); } /* read one item from file - decode and store it in *dst. @@ -495,10 +518,10 @@ int isc_pp_read (ISAMC_PP pp, void *buf) 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) +int isamc_read_item (ISAMC_PP pp, char **dst) { ISAMC is = pp->is; - char *src = pp->buf + pp->offset; + const char *src = pp->buf + pp->offset; if (pp->offset >= pp->size) { @@ -531,30 +554,46 @@ int isc_read_item (ISAMC_PP pp, char **dst) pp->pos = pp->next; src = pp->buf; /* read block and save 'next' and 'size' entry */ - isc_read_block (is, pp->cat, pp->pos, src); + isamc_read_block (is, pp->cat, pp->pos, pp->buf); memcpy (&pp->next, src, sizeof(pp->next)); src += sizeof(pp->next); memcpy (&pp->size, src, sizeof(pp->size)); src += sizeof(pp->size); /* assume block is non-empty */ assert (src - pp->buf == ISAMC_BLOCK_OFFSET_N); - assert (pp->next != pp->pos); + + if (pp->next == pp->pos) + { + yaz_log(YLOG_FATAL|YLOG_LOG, "pp->next = " ZINT_FORMAT, pp->next); + yaz_log(YLOG_FATAL|YLOG_LOG, "pp->pos = " ZINT_FORMAT, pp->pos); + assert (pp->next != pp->pos); + } + if (pp->deleteFlag) - isc_release_block (is, pp->cat, pp->pos); - (*is->method->code_item)(ISAMC_DECODE, pp->decodeClientData, dst, &src); - pp->offset = src - pp->buf; + isamc_release_block (is, pp->cat, pp->pos); + (*is->method->codec.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 next=%d", - pp->size, pp->cat, pp->pos, pp->next); + yaz_log (YLOG_LOG, "isc: read_block size=%d %d " ZINT_FORMAT " next=" + ZINT_FORMAT, pp->size, pp->cat, pp->pos, pp->next); return 2; } - (*is->method->code_item)(ISAMC_DECODE, pp->decodeClientData, dst, &src); - pp->offset = src - pp->buf; + (*is->method->codec.decode)(pp->decodeClientData, dst, &src); + pp->offset = src - pp->buf; return 1; } -int isc_pp_num (ISAMC_PP pp) +zint isamc_pp_num (ISAMC_PP pp) { return pp->numKeys; } +/* + * Local variables: + * c-basic-offset: 4 + * c-file-style: "Stroustrup" + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab + */ +