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
Replace old index names "dc_*" with the actual local index names.
[idzebra-moved-to-github.git]
/
bfile
/
commit.c
diff --git
a/bfile/commit.c
b/bfile/commit.c
index
0bf304d
..
643016a
100644
(file)
--- a/
bfile/commit.c
+++ b/
bfile/commit.c
@@
-1,8
+1,5
@@
-/* $Id: commit.c,v 1.31 2006-11-14 10:03:21 adam Exp $
- Copyright (C) 1995-2006
- Index Data ApS
-
-This file is part of the Zebra server.
+/* 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
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
@@
-21,6
+18,9
@@
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 <assert.h>
#include <stdlib.h>
@@
-98,7
+98,7
@@
static int map_cache_flush(struct map_cache *m_p)
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;
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;
}
m_p->no = 0;
return 0;
}
@@
-128,11
+128,10
@@
static int map_cache_add(struct map_cache *m_p, int from, int to)
#endif
static int cf_commit_hash (CFile cf)
#endif
static int cf_commit_hash (CFile cf)
-{
+{
int r = 0;
int i;
zint bucket_no;
int r = 0;
int i;
zint bucket_no;
- int hash_bytes;
struct CFile_ph_bucket *p;
#if CF_OPTIMIZE_COMMIT
struct map_cache *m_p;
struct CFile_ph_bucket *p;
#if CF_OPTIMIZE_COMMIT
struct map_cache *m_p;
@@
-143,7
+142,6
@@
static int 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(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++)
{
@@
-264,9
+262,9
@@
int cf_commit(CFile cf)
return -1;
}
yaz_log(log_level, "cf_commit: state=%d", cf->head.state);
return -1;
}
yaz_log(log_level, "cf_commit: state=%d", cf->head.state);
- if (cf->head.state == 1)
+ if (cf->head.state == CFILE_STATE_HASH)
return cf_commit_hash(cf);
return cf_commit_hash(cf);
- else if (cf->head.state == 2)
+ else if (cf->head.state == CFILE_STATE_FLAT)
return cf_commit_flat(cf);
else
{
return cf_commit_flat(cf);
else
{
@@
-278,6
+276,7
@@
int cf_commit(CFile cf)
/*
* Local variables:
* c-basic-offset: 4
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab