-/*
- * Copyright (C) 1995, Index Data I/S
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: commit.c,v $
- * 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.
- *
- */
+/* $Id: commit.c,v 1.23 2005-01-15 19:38:17 adam Exp $
+ Copyright (C) 1995-2005
+ 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 Zebra; see the file LICENSE.zebra. If not, write to the
+Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
+*/
+
#include <assert.h>
#include <stdlib.h>
#include <zebrautl.h>
-#include <mfile.h>
+#include "mfile.h"
#include "cfile.h"
#define CF_OPTIMIZE_COMMIT 0
{
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;
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 at position %d",
+ yaz_log (YLOG_FATAL, "read commit block at position %d",
m_p->map[i].from);
exit (1);
}
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
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));
+ 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; i<HASH_BUCKET && p->vno[i]; 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);
static void cf_commit_flat (CFile cf)
{
- int *fp;
- int hno;
- int i, vno = 0;
+ zint *fp;
+ zint hno;
+ int i;
+ zint vno = 0;
#if CF_OPTIMIZE_COMMIT
struct map_cache *m_p;
#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++)
{
- 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])
{
#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);
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)