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
Fixed bug #203, rank-1 crashed with isam-c
[idzebra-moved-to-github.git]
/
bfile
/
commit.c
diff --git
a/bfile/commit.c
b/bfile/commit.c
index
5727679
..
9182537
100644
(file)
--- a/
bfile/commit.c
+++ b/
bfile/commit.c
@@
-1,5
+1,5
@@
-/* $Id: commit.c,v 1.16 2002-08-02 19:26:55 adam Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+/* $Id: commit.c,v 1.20 2004-09-13 08:43:28 adam Exp $
+ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
Index Data Aps
This file is part of the Zebra server.
Index Data Aps
This file is part of the Zebra server.
@@
-137,7
+137,8
@@
static void map_cache_add (struct map_cache *m_p, int from, int to)
static void cf_commit_hash (CFile cf)
{
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
int hash_bytes;
struct CFile_ph_bucket *p;
#if CF_OPTIMIZE_COMMIT
@@
-149,7
+150,7
@@
static void cf_commit_hash (CFile cf)
#endif
p = (struct CFile_ph_bucket *) xmalloc (sizeof(*p));
#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++)
{
bucket_no = cf->head.first_bucket;
for (; bucket_no < cf->head.next_bucket; bucket_no++)
{
@@
-180,9
+181,10
@@
static void cf_commit_hash (CFile cf)
static void cf_commit_flat (CFile cf)
{
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
struct map_cache *m_p;
@@
-192,18
+194,19
@@
static void cf_commit_flat (CFile cf)
#if CF_OPTIMIZE_COMMIT
m_p = map_cache_init (cf);
#endif
#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 (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 (%d-%d) commit",
+ logf (LOG_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])
{
@@
-212,8
+215,8
@@
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 (%d-%d) "
- "i=%d commit block at %d (->%d)",
+ logf (LOG_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);
hno, cf->head.next_bucket, cf->head.flat_bucket-1,
i, fp[i], vno);
exit (1);