-/*
- * Copyright (C) 1995, Index Data I/S
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: commit.c,v $
- * 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 <config.h>
+#endif
#include <assert.h>
#include <stdlib.h>
-#include <alexutil.h>
-#include <mfile.h>
+#include <idzebra/util.h>
+#include <yaz/xmalloc.h>
+#include "mfile.h"
#include "cfile.h"
-void cf_unlink (CFile cf)
+#define CF_OPTIMIZE_COMMIT 0
+
+static int log_level = 0;
+
+#if CF_OPTIMIZE_COMMIT
+struct map_cache_entity {
+ int from;
+ int to;
+};
+
+struct map_cache {
+ int max;
+ int no;
+
+ struct map_cache_entity *map;
+ char *buf;
+ CFile cf;
+};
+
+static struct map_cache *map_cache_init (CFile cf)
{
- if (cf->bucket_in_memory)
+ int mem_max = 2000000;
+ struct map_cache *m_p;
+
+ m_p = xmalloc (sizeof(*m_p));
+ m_p->cf = cf;
+ m_p->max = mem_max / cf->head.block_size;
+ m_p->buf = xmalloc (mem_max);
+ m_p->no = 0;
+ m_p->map = xmalloc (sizeof(*m_p->map) * m_p->max);
+ return m_p;
+}
+
+static int map_cache_cmp_from (const void *p1, const void *p2)
+{
+ return ((struct map_cache_entity*) p1)->from -
+ ((struct map_cache_entity*) p2)->from;
+}
+
+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 int 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; i<m_p->no; i++)
{
- logf (LOG_FATAL, "Cannot unlink potential dirty cache");
- exit (1);
+ 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);
+ return -1;
+ }
+ m_p->map[i].from = i;
}
- cf->head.state = 0;
- cf->dirty = 1;
- mf_unlink (cf->block_mf);
- mf_unlink (cf->hash_mf);
+ 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; i<m_p->no; i++)
+ {
+ 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 int map_cache_del(struct map_cache *m_p)
+{
+ int r = map_cache_flush(m_p);
+ xfree (m_p->map);
+ xfree (m_p->buf);
+ xfree (m_p);
+ return r;
}
-void cf_commit (CFile cf)
+static int map_cache_add(struct map_cache *m_p, int from, int to)
{
- int i, bucket_no;
- int hash_bytes;
+ int i = m_p->no;
+
+ m_p->map[i].from = from;
+ m_p->map[i].to = to;
+ m_p->no = ++i;
+ if (i == m_p->max)
+ return map_cache_flush(m_p);
+ return 0;
+}
+
+/* CF_OPTIMIZE_COMMIT */
+#endif
+
+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;
+#endif
- if (cf->bucket_in_memory)
- {
- logf (LOG_FATAL, "Cannot commit potential dirty cache");
- exit (1);
- }
- p = xmalloc (sizeof(*p));
- hash_bytes = cf->head.hash_size * sizeof(int);
- bucket_no = (hash_bytes+sizeof(cf->head))/HASH_BSIZE + 2;
+#if CF_OPTIMIZE_COMMIT
+ m_p = map_cache_init (cf);
+#endif
+
+ 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; i<HASH_BUCKET && p->vno[i]; i++)
{
- if (!mf_read (cf->block_mf, p->vno[i], 0, 0, cf->iobuf))
+#if CF_OPTIMIZE_COMMIT
+ 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) != 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;
+ }
+#endif
+ }
+ }
+ out:
+#if CF_OPTIMIZE_COMMIT
+ if (map_cache_del(m_p))
+ r = -1;
+#endif
+ xfree(p);
+ return r;
+}
+
+static int cf_commit_flat(CFile cf)
+{
+ zint *fp;
+ zint hno;
+ int i;
+ int r = 0;
+ zint vno = 0;
+
+#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++)
+ {
+ 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)
+ {
+ 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(zint)); i++)
+ {
+ if (fp[i])
{
- logf (LOG_FATAL, "read commit block");
- exit (1);
+#if CF_OPTIMIZE_COMMIT
+ 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) != 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;
+ }
+#endif
}
- mf_write (cf->rmf, p->no[i], 0, 0, cf->iobuf);
+ vno++;
}
}
- xfree (p);
+ out:
+#if CF_OPTIMIZE_COMMIT
+ if (map_cache_del(m_p))
+ r = -1;
+#endif
+ yaz_log(log_level, "cf_commit_flat r=%d", r);
+ xfree(fp);
+ return r;
}
+int cf_commit(CFile cf)
+{
+ if (cf->bucket_in_memory)
+ {
+ 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;
+ }
+}
+
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+
projects / idzebra-moved-to-github.git / blobdiff