X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=bfile%2Fcommit.c;h=a4dacda1ef102bbd63535360e5bd2f925d58a2f7;hp=97f123bfe444e2a88f171f835db40c1e94f8f1e0;hb=4478d785b7769691261005c98063b98a5a5971b3;hpb=9f76b710c8510b06ac9cb4a58c5efde4daf85de8 diff --git a/bfile/commit.c b/bfile/commit.c index 97f123b..a4dacda 100644 --- a/bfile/commit.c +++ b/bfile/commit.c @@ -1,59 +1,41 @@ -/* - * Copyright (C) 1995, Index Data I/S - * All rights reserved. - * Sebastian Hammer, Adam Dickmeiss - * - * $Log: commit.c,v $ - * 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. - * - */ +/* $Id: commit.c,v 1.28 2006-08-14 10:40:05 adam Exp $ + Copyright (C) 1995-2006 + Index Data ApS + +This file is part of the Zebra server. + +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 + +*/ + #include #include -#include -#include +#include +#include +#include "mfile.h" #include "cfile.h" -void cf_unlink (CFile cf) +#define CF_OPTIMIZE_COMMIT 0 + +void cf_unlink(CFile cf) { if (cf->bucket_in_memory) { - logf (LOG_FATAL, "Cannot unlink potential dirty cache"); + yaz_log (YLOG_FATAL, "Cannot unlink potential dirty cache"); exit (1); } cf->head.state = 0; @@ -63,6 +45,7 @@ void cf_unlink (CFile cf) } +#if CF_OPTIMIZE_COMMIT struct map_cache_entity { int from; int to; @@ -91,13 +74,6 @@ static struct map_cache *map_cache_init (CFile cf) return m_p; } -static void map_cache_del (struct map_cache *m_p) -{ - xfree (m_p->map); - xfree (m_p->buf); - xfree (m_p); -} - static int map_cache_cmp_from (const void *p1, const void *p2) { return ((struct map_cache_entity*) p1)->from - @@ -115,22 +91,34 @@ static void map_cache_flush (struct map_cache *m_p) int i; qsort (m_p->map, m_p->no, sizeof(*m_p->map), map_cache_cmp_from); + 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)) { - logf (LOG_FATAL, "read commit block"); + yaz_log (YLOG_FATAL, "read commit block at position %d", + m_p->map[i].from); exit (1); } m_p->map[i].from = i; } qsort (m_p->map, m_p->no, sizeof(*m_p->map), map_cache_cmp_to); + 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); } + m_p->no = 0; +} + +static void map_cache_del (struct map_cache *m_p) +{ + map_cache_flush (m_p); + xfree (m_p->map); + xfree (m_p->buf); + xfree (m_p); } static void map_cache_add (struct map_cache *m_p, int from, int to) @@ -143,73 +131,106 @@ static void map_cache_add (struct map_cache *m_p, int from, int to) if (i == m_p->max) map_cache_flush (m_p); } - + +/* CF_OPTIMIZE_COMMIT */ +#endif + static void cf_commit_hash (CFile cf) { - int i, bucket_no; + int i; + zint bucket_no; int hash_bytes; struct CFile_ph_bucket *p; +#if CF_OPTIMIZE_COMMIT + struct map_cache *m_p; +#endif - p = xmalloc (sizeof(*p)); - hash_bytes = cf->head.hash_size * sizeof(int); +#if CF_OPTIMIZE_COMMIT + m_p = map_cache_init (cf); +#endif + + p = (struct CFile_ph_bucket *) xmalloc (sizeof(*p)); + hash_bytes = cf->head.hash_size * sizeof(zint); 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)) { - logf (LOG_FATAL, "read commit hash"); + yaz_log (YLOG_FATAL, "read commit hash"); exit (1); } for (i = 0; ivno[i]; i++) { +#if CF_OPTIMIZE_COMMIT + map_cache_add (m_p, p->vno[i], p->no[i]); +#else if (!mf_read (cf->block_mf, p->vno[i], 0, 0, cf->iobuf)) { - logf (LOG_FATAL, "read commit block"); + yaz_log (YLOG_FATAL, "read commit block"); exit (1); } mf_write (cf->rmf, p->no[i], 0, 0, cf->iobuf); +#endif } } +#if CF_OPTIMIZE_COMMIT + map_cache_del (m_p); +#endif xfree (p); } static void cf_commit_flat (CFile cf) { - int *fp; - int hno; - int i, vno = 0; + zint *fp; + zint hno; + int i; + zint vno = 0; - fp = xmalloc (HASH_BSIZE); +#if CF_OPTIMIZE_COMMIT + struct map_cache *m_p; +#endif + + +#if CF_OPTIMIZE_COMMIT + m_p = map_cache_init (cf); +#endif + fp = (zint *) xmalloc (HASH_BSIZE); for (hno = cf->head.next_bucket; hno < cf->head.flat_bucket; hno++) { - if (hno == cf->head.flat_bucket-1) - { - for (i = 0; i < (HASH_BSIZE/sizeof(int)); i++) - fp[i] = 0; - } + 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", + 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); } - 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); +#else if (!mf_read (cf->block_mf, fp[i], 0, 0, cf->iobuf)) { - logf (LOG_FATAL, "read data block hno=%d (%d-%d) " - "i=%d commit block at %d (->%d)", + 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); } mf_write (cf->rmf, vno, 0, 0, cf->iobuf); + +#endif } vno++; } } +#if CF_OPTIMIZE_COMMIT + map_cache_del (m_p); +#endif xfree (fp); } @@ -218,7 +239,7 @@ void cf_commit (CFile cf) if (cf->bucket_in_memory) { - logf (LOG_FATAL, "Cannot commit potential dirty cache"); + yaz_log (YLOG_FATAL, "Cannot commit potential dirty cache"); exit (1); } if (cf->head.state == 1) @@ -227,3 +248,11 @@ void cf_commit (CFile cf) cf_commit_flat (cf); } +/* + * Local variables: + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab + */ +