X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=bfile%2Fcommit.c;h=643016ada0a4bc1ef922ea9387ec9b8b84b811eb;hp=f2816a5fcaf9758a0675feb3a7d31638e47cc1d2;hb=HEAD;hpb=75573f447b51a5d666a115fbf445af3d2717be48 diff --git a/bfile/commit.c b/bfile/commit.c index f2816a5..643016a 100644 --- a/bfile/commit.c +++ b/bfile/commit.c @@ -1,78 +1,37 @@ -/* - * Copyright (C) 1995-1998, Index Data - * All rights reserved. - * Sebastian Hammer, Adam Dickmeiss - * - * $Log: commit.c,v $ - * Revision 1.14 1998-08-07 15:07:16 adam - * Fixed but in cf_commit_flat. - * - * Revision 1.13 1996/10/29 13:56:16 adam - * Include of zebrautl.h instead of alexutil.h. - * - * Revision 1.12 1996/04/24 13:29:16 adam - * Work on optimized on commit operation. - * - * Revision 1.11 1996/04/23 12:36:41 adam - * Started work on more efficient commit operation. - * - * Revision 1.10 1996/04/18 16:02:56 adam - * Changed logging a bit. - * Removed warning message when commiting flat shadow files. - * - * Revision 1.9 1996/04/12 07:01:57 adam - * Yet another bug fix (next_block was initialized to 0; now set to 1). - * - * Revision 1.8 1996/02/07 14:03:49 adam - * Work on flat indexed shadow files. - * - * Revision 1.7 1996/02/07 10:08:46 adam - * Work on flat shadow (not finished yet). - * - * Revision 1.6 1995/12/15 12:36:53 adam - * Moved hash file information to union. - * Renamed commit files. - * - * Revision 1.5 1995/12/12 15:57:55 adam - * Implemented mf_unlink. cf_unlink uses mf_unlink. - * - * Revision 1.4 1995/12/11 09:03:55 adam - * New function: cf_unlink. - * New member of commit file head: state (0) deleted, (1) hash file. - * - * Revision 1.3 1995/12/01 16:24:29 adam - * Commit files use separate meta file area. - * - * Revision 1.2 1995/12/01 11:37:24 adam - * Cached/commit files implemented as meta-files. - * - * Revision 1.1 1995/11/30 08:33:13 adam - * Started work on commit facility. - * - */ +/* 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 +Software Foundation; either version 2, or (at your option) any later +version. + +Zebra is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or +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 this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +*/ + + +#if HAVE_CONFIG_H +#include +#endif #include #include -#include -#include +#include +#include +#include "mfile.h" #include "cfile.h" #define CF_OPTIMIZE_COMMIT 0 -void cf_unlink (CFile cf) -{ - if (cf->bucket_in_memory) - { - logf (LOG_FATAL, "Cannot unlink potential dirty cache"); - exit (1); - } - cf->head.state = 0; - cf->dirty = 1; - mf_unlink (cf->block_mf); - mf_unlink (cf->hash_mf); -} - +static int log_level = 0; #if CF_OPTIMIZE_COMMIT struct map_cache_entity { @@ -109,13 +68,13 @@ static int map_cache_cmp_from (const void *p1, const void *p2) ((struct map_cache_entity*) p2)->from; } -static int map_cache_cmp_to (const void *p1, const void *p2) +static int map_cache_cmp_to(const void *p1, const void *p2) { return ((struct map_cache_entity*) p1)->to - ((struct map_cache_entity*) p2)->to; } -static void map_cache_flush (struct map_cache *m_p) +static int map_cache_flush(struct map_cache *m_p) { int i; @@ -123,12 +82,12 @@ static void map_cache_flush (struct map_cache *m_p) assert (m_p->no < 2 || m_p->map[0].from < m_p->map[1].from); for (i = 0; ino; i++) { - if (!mf_read (m_p->cf->block_mf, m_p->map[i].from, 0, 0, - m_p->buf + i * m_p->cf->head.block_size)) + if (mf_read(m_p->cf->block_mf, m_p->map[i].from, 0, 0, + m_p->buf + i * m_p->cf->head.block_size) != 1) { - logf (LOG_FATAL, "read commit block at position %d", - m_p->map[i].from); - exit (1); + yaz_log (YLOG_FATAL, "read commit block at position %d", + m_p->map[i].from); + return -1; } m_p->map[i].from = i; } @@ -136,21 +95,24 @@ static void map_cache_flush (struct map_cache *m_p) assert (m_p->no < 2 || m_p->map[0].to < m_p->map[1].to); for (i = 0; ino; i++) { - mf_write (m_p->cf->rmf, m_p->map[i].to, 0, 0, - m_p->buf + m_p->map[i].from * m_p->cf->head.block_size); - } + if (mf_write(m_p->cf->rmf, m_p->map[i].to, 0, 0, + m_p->buf + m_p->map[i].from * m_p->cf->head.block_size)) + return -1; + } m_p->no = 0; + return 0; } -static void map_cache_del (struct map_cache *m_p) +static int map_cache_del(struct map_cache *m_p) { - map_cache_flush (m_p); + int r = map_cache_flush(m_p); xfree (m_p->map); xfree (m_p->buf); xfree (m_p); + return r; } -static void map_cache_add (struct map_cache *m_p, int from, int to) +static int map_cache_add(struct map_cache *m_p, int from, int to) { int i = m_p->no; @@ -158,16 +120,18 @@ static void map_cache_add (struct map_cache *m_p, int from, int to) m_p->map[i].to = to; m_p->no = ++i; if (i == m_p->max) - map_cache_flush (m_p); + return map_cache_flush(m_p); + return 0; } /* CF_OPTIMIZE_COMMIT */ #endif -static void cf_commit_hash (CFile cf) -{ - int i, bucket_no; - int hash_bytes; +static int cf_commit_hash (CFile cf) +{ + int r = 0; + int i; + zint bucket_no; struct CFile_ph_bucket *p; #if CF_OPTIMIZE_COMMIT struct map_cache *m_p; @@ -177,41 +141,56 @@ static void cf_commit_hash (CFile cf) m_p = map_cache_init (cf); #endif - p = xmalloc (sizeof(*p)); - hash_bytes = cf->head.hash_size * sizeof(int); + p = (struct CFile_ph_bucket *) xmalloc (sizeof(*p)); bucket_no = cf->head.first_bucket; for (; bucket_no < cf->head.next_bucket; bucket_no++) { - if (!mf_read (cf->hash_mf, bucket_no, 0, 0, p)) + if (mf_read (cf->hash_mf, bucket_no, 0, 0, p) != 1) { - logf (LOG_FATAL, "read commit hash"); - exit (1); + yaz_log (YLOG_FATAL, "read commit hash"); + r = -1; + goto out; } for (i = 0; ivno[i]; i++) { #if CF_OPTIMIZE_COMMIT - map_cache_add (m_p, p->vno[i], p->no[i]); + if (map_cache_add(m_p, p->vno[i], p->no[i])) + { + r = -1; + goto out; + } #else - if (!mf_read (cf->block_mf, p->vno[i], 0, 0, cf->iobuf)) + if (mf_read(cf->block_mf, p->vno[i], 0, 0, cf->iobuf) != 1) + { + yaz_log (YLOG_FATAL, "read commit block"); + r = -1; + goto out; + } + if (mf_write(cf->rmf, p->no[i], 0, 0, cf->iobuf)) { - logf (LOG_FATAL, "read commit block"); - exit (1); + yaz_log (YLOG_FATAL, "write commit block"); + r = -1; + goto out; } - mf_write (cf->rmf, p->no[i], 0, 0, cf->iobuf); #endif } } + out: #if CF_OPTIMIZE_COMMIT - map_cache_del (m_p); + if (map_cache_del(m_p)) + r = -1; #endif - xfree (p); + xfree(p); + return r; } -static void cf_commit_flat (CFile cf) +static int cf_commit_flat(CFile cf) { - int *fp; - int hno; - int i, vno = 0; + zint *fp; + zint hno; + int i; + int r = 0; + zint vno = 0; #if CF_OPTIMIZE_COMMIT struct map_cache *m_p; @@ -221,56 +200,85 @@ static void cf_commit_flat (CFile cf) #if CF_OPTIMIZE_COMMIT m_p = map_cache_init (cf); #endif - fp = xmalloc (HASH_BSIZE); + fp = (zint *) xmalloc (HASH_BSIZE); for (hno = cf->head.next_bucket; hno < cf->head.flat_bucket; hno++) { - for (i = 0; i < (HASH_BSIZE/sizeof(int)); i++) + for (i = 0; i < (int) (HASH_BSIZE/sizeof(zint)); i++) fp[i] = 0; if (!mf_read (cf->hash_mf, hno, 0, 0, fp) && hno != cf->head.flat_bucket-1) { - logf (LOG_FATAL, "read index block hno=%d (%d-%d) commit", - hno, cf->head.next_bucket, cf->head.flat_bucket-1); + yaz_log (YLOG_FATAL, "read index block hno=" ZINT_FORMAT + " (" ZINT_FORMAT "-" ZINT_FORMAT ") commit", + hno, cf->head.next_bucket, cf->head.flat_bucket-1); + r = -1; + goto out; } - for (i = 0; i < (HASH_BSIZE/sizeof(int)); i++) + for (i = 0; i < (int) (HASH_BSIZE/sizeof(zint)); i++) { if (fp[i]) { #if CF_OPTIMIZE_COMMIT - map_cache_add (m_p, fp[i], vno); + if (map_cache_add(m_p, fp[i], vno)) + { + r = -1; + goto out; + } #else - if (!mf_read (cf->block_mf, fp[i], 0, 0, cf->iobuf)) + if (mf_read (cf->block_mf, fp[i], 0, 0, cf->iobuf) != 1) { - logf (LOG_FATAL, "read data block hno=%d (%d-%d) " - "i=%d commit block at %d (->%d)", - hno, cf->head.next_bucket, cf->head.flat_bucket-1, - i, fp[i], vno); - exit (1); + yaz_log (YLOG_FATAL, "read data block hno=" ZINT_FORMAT " (" ZINT_FORMAT "-" ZINT_FORMAT ") " + "i=%d commit block at " ZINT_FORMAT " (->" ZINT_FORMAT")", + hno, cf->head.next_bucket, cf->head.flat_bucket-1, + i, fp[i], vno); + r = -1; + goto out; + } + if (mf_write(cf->rmf, vno, 0, 0, cf->iobuf)) + { + r = -1; + goto out; } - mf_write (cf->rmf, vno, 0, 0, cf->iobuf); - #endif } vno++; } } + out: #if CF_OPTIMIZE_COMMIT - map_cache_del (m_p); + if (map_cache_del(m_p)) + r = -1; #endif - xfree (fp); + yaz_log(log_level, "cf_commit_flat r=%d", r); + xfree(fp); + return r; } -void cf_commit (CFile cf) +int cf_commit(CFile cf) { - if (cf->bucket_in_memory) { - logf (LOG_FATAL, "Cannot commit potential dirty cache"); - exit (1); + yaz_log(YLOG_FATAL, "cf_commit: dirty cache"); + return -1; + } + yaz_log(log_level, "cf_commit: state=%d", cf->head.state); + if (cf->head.state == CFILE_STATE_HASH) + return cf_commit_hash(cf); + else if (cf->head.state == CFILE_STATE_FLAT) + return cf_commit_flat(cf); + else + { + yaz_log(YLOG_FATAL, "cf_commit: bad state=%d", cf->head.state); + return -1; } - if (cf->head.state == 1) - cf_commit_hash (cf); - else if (cf->head.state == 2) - cf_commit_flat (cf); } +/* + * Local variables: + * c-basic-offset: 4 + * c-file-style: "Stroustrup" + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab + */ +