projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Moved isam headers to include/idzebra.
[idzebra-moved-to-github.git]
/
bfile
/
commit.c
diff --git
a/bfile/commit.c
b/bfile/commit.c
index
29a7312
..
c6f7422
100644
(file)
--- a/
bfile/commit.c
+++ b/
bfile/commit.c
@@
-1,4
+1,4
@@
-/* $Id: commit.c,v 1.18 2004-08-06 12:28:22 adam Exp $
+/* $Id: commit.c,v 1.22 2004-12-08 12:23:08 adam Exp $
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
@@
-21,12
+21,11
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
*/
*/
-
#include <assert.h>
#include <stdlib.h>
#include <zebrautl.h>
#include <assert.h>
#include <stdlib.h>
#include <zebrautl.h>
-#include <mfile.h>
+#include "mfile.h"
#include "cfile.h"
#define CF_OPTIMIZE_COMMIT 0
#include "cfile.h"
#define CF_OPTIMIZE_COMMIT 0
@@
-35,7
+34,7
@@
void cf_unlink (CFile cf)
{
if (cf->bucket_in_memory)
{
{
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;
exit (1);
}
cf->head.state = 0;
@@
-97,7
+96,7
@@
static void map_cache_flush (struct map_cache *m_p)
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))
{
- 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);
}
m_p->map[i].from);
exit (1);
}
@@
-156,7
+155,7
@@
static void cf_commit_hash (CFile cf)
{
if (!mf_read (cf->hash_mf, bucket_no, 0, 0, p))
{
{
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++)
exit (1);
}
for (i = 0; i<HASH_BUCKET && p->vno[i]; i++)
@@
-166,7
+165,7
@@
static void cf_commit_hash (CFile cf)
#else
if (!mf_read (cf->block_mf, p->vno[i], 0, 0, cf->iobuf))
{
#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);
exit (1);
}
mf_write (cf->rmf, p->no[i], 0, 0, cf->iobuf);
@@
-197,15
+196,16
@@
static void cf_commit_flat (CFile cf)
fp = (zint *) xmalloc (HASH_BSIZE);
for (hno = cf->head.next_bucket; hno < cf->head.flat_bucket; hno++)
{
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)
{
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 (" ZINT_FORMAT "-" ZINT_FORMAT ") 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);
}
hno, cf->head.next_bucket, cf->head.flat_bucket-1);
}
- for (i = 0; i < (int) (HASH_BSIZE/sizeof(int)); i++)
+ for (i = 0; i < (int) (HASH_BSIZE/sizeof(zint)); i++)
{
if (fp[i])
{
{
if (fp[i])
{
@@
-214,7
+214,7
@@
static void cf_commit_flat (CFile cf)
#else
if (!mf_read (cf->block_mf, fp[i], 0, 0, cf->iobuf))
{
#else
if (!mf_read (cf->block_mf, fp[i], 0, 0, cf->iobuf))
{
- logf (LOG_FATAL, "read data block hno=%d (" ZINT_FORMAT "-" ZINT_FORMAT ") "
+ 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);
"i=%d commit block at " ZINT_FORMAT " (->" ZINT_FORMAT")",
hno, cf->head.next_bucket, cf->head.flat_bucket-1,
i, fp[i], vno);
@@
-238,7
+238,7
@@
void cf_commit (CFile cf)
if (cf->bucket_in_memory)
{
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)
exit (1);
}
if (cf->head.state == 1)