-/* $Id: commit.c,v 1.16 2002-08-02 19:26:55 adam Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
- Index Data Aps
+/* $Id: commit.c,v 1.30 2006-11-14 08:12:06 adam Exp $
+ Copyright (C) 1995-2006
+ Index Data ApS
This file is part of the Zebra server.
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
+*/
#include <assert.h>
#include <stdlib.h>
-#include <zebrautl.h>
-#include <mfile.h>
+#include <idzebra/util.h>
+#include <yaz/xmalloc.h>
+#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);
-}
-
-
#if CF_OPTIMIZE_COMMIT
struct map_cache_entity {
int from;
((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;
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);
+ return -1;
}
m_p->map[i].from = i;
}
m_p->buf + m_p->map[i].from * m_p->cf->head.block_size);
}
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;
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 i, bucket_no;
+ int r = 0;
+ int i;
+ zint bucket_no;
int hash_bytes;
struct CFile_ph_bucket *p;
#if CF_OPTIMIZE_COMMIT
#endif
p = (struct CFile_ph_bucket *) xmalloc (sizeof(*p));
- hash_bytes = cf->head.hash_size * sizeof(int);
+ 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))
+ 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; i<HASH_BUCKET && p->vno[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)
{
- logf (LOG_FATAL, "read commit block");
- exit (1);
+ yaz_log (YLOG_FATAL, "read commit block");
+ 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)
{
- 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;
#if CF_OPTIMIZE_COMMIT
m_p = map_cache_init (cf);
#endif
- fp = (int *) xmalloc (HASH_BSIZE);
+ fp = (zint *) xmalloc (HASH_BSIZE);
for (hno = cf->head.next_bucket; hno < cf->head.flat_bucket; hno++)
{
- for (i = 0; i < (int) (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 < (int) (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))
{
- 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) != 1)
+ {
+ 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);
+ 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;
}
if (cf->head.state == 1)
- cf_commit_hash (cf);
+ return cf_commit_hash (cf);
else if (cf->head.state == 2)
- cf_commit_flat (cf);
+ return cf_commit_flat (cf);
+ else
+ {
+ yaz_log(YLOG_FATAL, "cf_commit: bad state=%d", cf->head.state);
+ return -1;
+ }
}
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+
projects / idzebra-moved-to-github.git / blobdiff