X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=bfile%2Fcommit.c;h=aca8a14d3ffac1a2a6c654a64c7ecc6645cdf853;hp=2461834f8fe0fdfece399fd55dd34a1a183989aa;hb=89d16cf15eda0e4802d18b8ad09bd3653508ebfc;hpb=deff57cfa9d9b39c4a4f1c9b82a64c6e61d821a4 diff --git a/bfile/commit.c b/bfile/commit.c index 2461834..aca8a14 100644 --- a/bfile/commit.c +++ b/bfile/commit.c @@ -1,8 +1,5 @@ -/* $Id: commit.c,v 1.24 2005-03-30 09:25:23 adam Exp $ - Copyright (C) 1995-2005 - Index Data ApS - -This file is part of the Zebra server. +/* This file is part of the Zebra server. + Copyright (C) 1994-2009 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,9 +12,9 @@ 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 + */ @@ -25,24 +22,13 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #include +#include #include "mfile.h" #include "cfile.h" #define CF_OPTIMIZE_COMMIT 0 -void cf_unlink (CFile cf) -{ - if (cf->bucket_in_memory) - { - yaz_log (YLOG_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 { @@ -79,13 +65,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; @@ -93,12 +79,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) { yaz_log (YLOG_FATAL, "read commit block at position %d", - m_p->map[i].from); - exit (1); + m_p->map[i].from); + return -1; } m_p->map[i].from = i; } @@ -106,21 +92,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; @@ -128,14 +117,16 @@ 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) +static int cf_commit_hash (CFile cf) { + int r = 0; int i; zint bucket_no; int hash_bytes; @@ -153,36 +144,51 @@ static void cf_commit_hash (CFile cf) 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) { yaz_log (YLOG_FATAL, "read commit hash"); - exit (1); + 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"); - exit (1); + r = -1; + goto out; + } + if (mf_write(cf->rmf, p->no[i], 0, 0, cf->iobuf)) + { + 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) { zint *fp; zint hno; int i; + int r = 0; zint vno = 0; #if CF_OPTIMIZE_COMMIT @@ -202,48 +208,75 @@ static void cf_commit_flat (CFile cf) hno != 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); + " (" ZINT_FORMAT "-" ZINT_FORMAT ") commit", + hno, cf->head.next_bucket, cf->head.flat_bucket-1); + r = -1; + goto out; } 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) { 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); - exit (1); + "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) { - yaz_log (YLOG_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 + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab + */ +