X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=isamc%2Fisamc.c;h=a736e42595db52cb5e48e81897a6be773597bdee;hb=be6f4de56d3ab4fd49fbea540afe2580b947cded;hp=0a0d53c3f3b90a69070ad2a987a130eae6944803;hpb=2e4e9c6def27f1e1463dcb6f205fab6a98054f38;p=idzebra-moved-to-github.git diff --git a/isamc/isamc.c b/isamc/isamc.c index 0a0d53c..a736e42 100644 --- a/isamc/isamc.c +++ b/isamc/isamc.c @@ -1,6 +1,6 @@ -/* $Id: isamc.c,v 1.25 2004-08-04 08:35:24 adam Exp $ - Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004 - Index Data Aps +/* $Id: isamc.c,v 1.31 2006-05-10 08:13:27 adam Exp $ + Copyright (C) 1995-2005 + Index Data ApS This file is part of the Zebra server. @@ -22,7 +22,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA /* * TODO: - * Reduction to lower categories in isc_merge + * Reduction to lower categories in isamc_merge */ #include #include @@ -30,6 +30,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #include +#include #include "isamc-p.h" static void flush_block (ISAMC is, int cat); @@ -40,7 +41,7 @@ static void init_fc (ISAMC is, int cat); #define SMALL_TEST 0 -void isc_getmethod (ISAMC_M *m) +void isamc_getmethod (ISAMC_M *m) { static struct ISAMC_filecat_s def_cat[] = { @@ -72,7 +73,7 @@ void isc_getmethod (ISAMC_M *m) 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; @@ -88,11 +89,11 @@ ISAMC isc_open (BFiles bfs, const char *name, int writeflag, ISAMC_M *method) /* 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", + 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) @@ -105,7 +106,7 @@ 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); @@ -153,14 +154,14 @@ ISAMC isc_open (BFiles bfs, const char *name, int writeflag, ISAMC_M *method) return is; } -zint 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 +169,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,7 +190,7 @@ 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); @@ -198,7 +199,7 @@ int isc_close (ISAMC is) 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", + 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, @@ -216,31 +217,31 @@ int isc_close (ISAMC is) return 0; } -int isc_read_block (ISAMC is, int cat, zint 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, zint 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 " ZINT_FORMAT, 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, zint pos, char *src, +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=" ZINT_FORMAT, + yaz_log (YLOG_LOG, "isc: write_dblock. size=%d nextpos=" ZINT_FORMAT, (int) size, nextpos); src -= ISAMC_BLOCK_OFFSET_N; memcpy (src, &nextpos, sizeof(nextpos)); memcpy (src + sizeof(nextpos), &size, sizeof(size)); - return isc_write_block (is, cat, pos, src); + return isamc_write_block (is, cat, pos, src); } #if ISAMC_FREELIST_CHUNK @@ -375,7 +376,7 @@ static void release_block (ISAMC is, int cat, zint pos) } #endif -zint isc_alloc_block (ISAMC is, int cat) +zint isamc_alloc_block (ISAMC is, int cat) { zint block = 0; @@ -394,14 +395,14 @@ zint 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: " ZINT_FORMAT, 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, zint 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:" ZINT_FORMAT, cat, pos); + yaz_log (YLOG_LOG, "isc: release_block in cat %d:" ZINT_FORMAT, cat, pos); if (is->files[cat].fc_list) { int j; @@ -420,7 +421,7 @@ 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; @@ -428,7 +429,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])) @@ -438,7 +440,7 @@ 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; @@ -447,13 +449,13 @@ void isc_pp_close (ISAMC_PP pp) 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); @@ -468,7 +470,7 @@ ISAMC_PP isc_pp_open (ISAMC is, ISAMC_P ipos) 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)); @@ -477,24 +479,24 @@ ISAMC_PP isc_pp_open (ISAMC is, ISAMC_P ipos) src += sizeof(pp->numKeys); if (pp->next == pp->pos) { - yaz_log(LOG_FATAL|LOG_LOG, "pp->next = " ZINT_FORMAT, pp->next); - yaz_log(LOG_FATAL|LOG_LOG, "pp->pos = " ZINT_FORMAT, 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 " ZINT_FORMAT " 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) { char *cp = buf; - return isc_read_item (pp, &cp); + return isamc_read_item (pp, &cp); } /* read one item from file - decode and store it in *dst. @@ -502,7 +504,7 @@ 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; const char *src = pp->buf + pp->offset; @@ -538,7 +540,7 @@ 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, pp->buf); + 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)); @@ -548,17 +550,17 @@ int isc_read_item (ISAMC_PP pp, char **dst) if (pp->next == pp->pos) { - yaz_log(LOG_FATAL|LOG_LOG, "pp->next = " ZINT_FORMAT, pp->next); - yaz_log(LOG_FATAL|LOG_LOG, "pp->pos = " ZINT_FORMAT, 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); + 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 " ZINT_FORMAT " 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; } @@ -567,8 +569,16 @@ int isc_read_item (ISAMC_PP pp, char **dst) return 1; } -zint isc_pp_num (ISAMC_PP pp) +zint isamc_pp_num (ISAMC_PP pp) { return pp->numKeys; } +/* + * Local variables: + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab + */ +