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
Disable shared objects by default
[idzebra-moved-to-github.git]
/
isamc
/
isamc.c
diff --git
a/isamc/isamc.c
b/isamc/isamc.c
index
6f91fa9
..
d15ba1e
100644
(file)
--- a/
isamc/isamc.c
+++ b/
isamc/isamc.c
@@
-1,5
+1,5
@@
-/* $Id: isamc.c,v 1.23 2003-06-23 15:36:11 adam Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003
+/* $Id: isamc.c,v 1.26 2004-08-06 12:28:23 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.
@@
-20,8
+20,6
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
02111-1307, USA.
*/
02111-1307, USA.
*/
-
-
/*
* TODO:
* Reduction to lower categories in isc_merge
/*
* TODO:
* Reduction to lower categories in isc_merge
@@
-38,7
+36,7
@@
static void flush_block (ISAMC is, int cat);
static void release_fc (ISAMC is, int cat);
static void init_fc (ISAMC is, int cat);
static void release_fc (ISAMC is, int cat);
static void init_fc (ISAMC is, int cat);
-#define ISAMC_FREELIST_CHUNK 1
+#define ISAMC_FREELIST_CHUNK 0
#define SMALL_TEST 0
#define SMALL_TEST 0
@@
-50,7
+48,7
@@
void isc_getmethod (ISAMC_M *m)
{ 32, 28, 0, 3 },
{ 64, 54, 30, 0 },
#else
{ 32, 28, 0, 3 },
{ 64, 54, 30, 0 },
#else
- { 32, 26, 20, 10 },
+ { 64, 56, 40, 5 },
{ 128, 120, 100, 10 },
{ 512, 490, 350, 10 },
{ 2048, 1900, 1700, 10 },
{ 128, 120, 100, 10 },
{ 512, 490, 350, 10 },
{ 2048, 1900, 1700, 10 },
@@
-60,12
+58,14
@@
void isc_getmethod (ISAMC_M *m)
};
m->filecat = def_cat;
};
m->filecat = def_cat;
- m->code_start = NULL;
- m->code_item = NULL;
- m->code_stop = NULL;
- m->code_reset = NULL;
+ m->codec.start = NULL;
+ m->codec.decode = NULL;
+ m->codec.encode = NULL;
+ m->codec.stop = NULL;
+ m->codec.reset = NULL;
m->compare_item = NULL;
m->compare_item = NULL;
+ m->log_item = NULL;
m->debug = 1;
m->debug = 1;
@@
-132,7
+132,7
@@
ISAMC isc_open (BFiles bfs, const char *name, int writeflag, ISAMC_M *method)
}
is->files[i].alloc_entries_num = 0;
is->files[i].alloc_entries_max =
}
is->files[i].alloc_entries_num = 0;
is->files[i].alloc_entries_max =
- is->method->filecat[i].bsize / sizeof(int) - 1;
+ is->method->filecat[i].bsize / sizeof(zint) - 1;
is->files[i].alloc_buf = (char *)
xmalloc (is->method->filecat[i].bsize);
is->files[i].no_writes = 0;
is->files[i].alloc_buf = (char *)
xmalloc (is->method->filecat[i].bsize);
is->files[i].no_writes = 0;
@@
-153,7
+153,7
@@
ISAMC isc_open (BFiles bfs, const char *name, int writeflag, ISAMC_M *method)
return is;
}
return is;
}
-int isc_block_used (ISAMC is, int type)
+zint isc_block_used (ISAMC is, int type)
{
if (type < 0 || type >= is->no_files)
return -1;
{
if (type < 0 || type >= is->no_files)
return -1;
@@
-216,30
+216,30
@@
int isc_close (ISAMC is)
return 0;
}
return 0;
}
-int isc_read_block (ISAMC is, int cat, int pos, char *dst)
+int isc_read_block (ISAMC is, int cat, zint pos, char *dst)
{
++(is->files[cat].no_reads);
return bf_read (is->files[cat].bf, pos, 0, 0, dst);
}
{
++(is->files[cat].no_reads);
return bf_read (is->files[cat].bf, pos, 0, 0, dst);
}
-int isc_write_block (ISAMC is, int cat, int pos, char *src)
+int isc_write_block (ISAMC is, int cat, zint pos, char *src)
{
++(is->files[cat].no_writes);
if (is->method->debug > 2)
{
++(is->files[cat].no_writes);
if (is->method->debug > 2)
- logf (LOG_LOG, "isc: write_block %d %d", cat, pos);
+ logf (LOG_LOG, "isc: write_block %d " ZINT_FORMAT, cat, pos);
return bf_write (is->files[cat].bf, pos, 0, 0, src);
}
return bf_write (is->files[cat].bf, pos, 0, 0, src);
}
-int isc_write_dblock (ISAMC is, int cat, int pos, char *src,
- int nextpos, int offset)
+int isc_write_dblock (ISAMC is, int cat, zint pos, char *src,
+ zint nextpos, int offset)
{
ISAMC_BLOCK_SIZE size = offset + ISAMC_BLOCK_OFFSET_N;
if (is->method->debug > 2)
{
ISAMC_BLOCK_SIZE size = offset + ISAMC_BLOCK_OFFSET_N;
if (is->method->debug > 2)
- logf (LOG_LOG, "isc: write_dblock. size=%d nextpos=%d",
+ logf (LOG_LOG, "isc: write_dblock. size=%d nextpos=" ZINT_FORMAT,
(int) size, nextpos);
src -= ISAMC_BLOCK_OFFSET_N;
(int) size, nextpos);
src -= ISAMC_BLOCK_OFFSET_N;
- memcpy (src, &nextpos, sizeof(int));
- memcpy (src + sizeof(int), &size, sizeof(size));
+ memcpy (src, &nextpos, sizeof(nextpos));
+ memcpy (src + sizeof(nextpos), &size, sizeof(size));
return isc_write_block (is, cat, pos, src);
}
return isc_write_block (is, cat, pos, src);
}
@@
-247,19
+247,19
@@
int isc_write_dblock (ISAMC is, int cat, int pos, char *src,
static void flush_block (ISAMC is, int cat)
{
char *abuf = is->files[cat].alloc_buf;
static void flush_block (ISAMC is, int cat)
{
char *abuf = is->files[cat].alloc_buf;
- int block = is->files[cat].head.freelist;
+ zint block = is->files[cat].head.freelist;
if (block && is->files[cat].alloc_entries_num)
{
if (block && is->files[cat].alloc_entries_num)
{
- memcpy (abuf, &is->files[cat].alloc_entries_num, sizeof(int));
+ memcpy (abuf, &is->files[cat].alloc_entries_num, sizeof(block));
bf_write (is->files[cat].bf, block, 0, 0, abuf);
is->files[cat].alloc_entries_num = 0;
}
xfree (abuf);
}
bf_write (is->files[cat].bf, block, 0, 0, abuf);
is->files[cat].alloc_entries_num = 0;
}
xfree (abuf);
}
-static int alloc_block (ISAMC is, int cat)
+static zint alloc_block (ISAMC is, int cat)
{
{
- int block = is->files[cat].head.freelist;
+ zint block = is->files[cat].head.freelist;
char *abuf = is->files[cat].alloc_buf;
(is->files[cat].no_allocated)++;
char *abuf = is->files[cat].alloc_buf;
(is->files[cat].no_allocated)++;
@@
-284,7
+284,7
@@
static int alloc_block (ISAMC is, int cat)
if (!is->files[cat].alloc_entries_num) /* last one in block? */
{
memcpy (&is->files[cat].head.freelist, abuf + sizeof(int),
if (!is->files[cat].alloc_entries_num) /* last one in block? */
{
memcpy (&is->files[cat].head.freelist, abuf + sizeof(int),
- sizeof(int));
+ sizeof(zint));
is->files[cat].head_is_dirty = 1;
if (is->files[cat].head.freelist)
is->files[cat].head_is_dirty = 1;
if (is->files[cat].head.freelist)
@@
-297,16
+297,16
@@
static int alloc_block (ISAMC is, int cat)
}
}
else
}
}
else
- memcpy (&block, abuf + sizeof(int) + sizeof(int) *
- is->files[cat].alloc_entries_num, sizeof(int));
+ memcpy (&block, abuf + sizeof(zint) + sizeof(int) *
+ is->files[cat].alloc_entries_num, sizeof(zint));
}
return block;
}
}
return block;
}
-static void release_block (ISAMC is, int cat, int pos)
+static void release_block (ISAMC is, int cat, zint pos)
{
char *abuf = is->files[cat].alloc_buf;
{
char *abuf = is->files[cat].alloc_buf;
- int block = is->files[cat].head.freelist;
+ zint block = is->files[cat].head.freelist;
(is->files[cat].no_released)++;
(is->files[cat].no_released)++;
@@
-327,15
+327,15
@@
static void release_block (ISAMC is, int cat, int pos)
}
if (!is->files[cat].alloc_entries_num) /* make new buffer? */
{
}
if (!is->files[cat].alloc_entries_num) /* make new buffer? */
{
- memcpy (abuf + sizeof(int), &block, sizeof(int));
+ memcpy (abuf + sizeof(int), &block, sizeof(zint));
is->files[cat].head.freelist = pos;
is->files[cat].head_is_dirty = 1;
}
else
{
memcpy (abuf + sizeof(int) +
is->files[cat].head.freelist = pos;
is->files[cat].head_is_dirty = 1;
}
else
{
memcpy (abuf + sizeof(int) +
- is->files[cat].alloc_entries_num*sizeof(int),
- &pos, sizeof(int));
+ is->files[cat].alloc_entries_num*sizeof(zint),
+ &pos, sizeof(zint));
}
is->files[cat].alloc_entries_num++;
}
}
is->files[cat].alloc_entries_num++;
}
@@
-346,42
+346,43
@@
static void flush_block (ISAMC is, int cat)
xfree (abuf);
}
xfree (abuf);
}
-static int alloc_block (ISAMC is, int cat)
+static zint alloc_block (ISAMC is, int cat)
{
{
- int block;
- char buf[sizeof(int)];
+ zint block;
+ char buf[sizeof(zint)];
is->files[cat].head_is_dirty = 1;
(is->files[cat].no_allocated)++;
if ((block = is->files[cat].head.freelist))
{
is->files[cat].head_is_dirty = 1;
(is->files[cat].no_allocated)++;
if ((block = is->files[cat].head.freelist))
{
- bf_read (is->files[cat].bf, block, 0, sizeof(int), buf);
- memcpy (&is->files[cat].head.freelist, buf, sizeof(int));
+ bf_read (is->files[cat].bf, block, 0, sizeof(zint), buf);
+ memcpy (&is->files[cat].head.freelist, buf, sizeof(zint));
}
else
block = (is->files[cat].head.lastblock)++;
return block;
}
}
else
block = (is->files[cat].head.lastblock)++;
return block;
}
-static void release_block (ISAMC is, int cat, int pos)
+static void release_block (ISAMC is, int cat, zint pos)
{
{
- char buf[sizeof(int)];
+ char buf[sizeof(zint)];
(is->files[cat].no_released)++;
is->files[cat].head_is_dirty = 1;
(is->files[cat].no_released)++;
is->files[cat].head_is_dirty = 1;
- memcpy (buf, &is->files[cat].head.freelist, sizeof(int));
+ memcpy (buf, &is->files[cat].head.freelist, sizeof(zint));
is->files[cat].head.freelist = pos;
is->files[cat].head.freelist = pos;
- bf_write (is->files[cat].bf, pos, 0, sizeof(int), buf);
+ bf_write (is->files[cat].bf, pos, 0, sizeof(zint), buf);
}
#endif
}
#endif
-int isc_alloc_block (ISAMC is, int cat)
+zint isc_alloc_block (ISAMC is, int cat)
{
{
- int block = 0;
+ zint block = 0;
if (is->files[cat].fc_list)
{
if (is->files[cat].fc_list)
{
- int j, nb;
+ int j;
+ zint nb;
for (j = 0; j < is->files[cat].fc_max; j++)
if ((nb = is->files[cat].fc_list[j]) && (!block || nb < block))
{
for (j = 0; j < is->files[cat].fc_max; j++)
if ((nb = is->files[cat].fc_list[j]) && (!block || nb < block))
{
@@
-393,14
+394,14
@@
int isc_alloc_block (ISAMC is, int cat)
if (!block)
block = alloc_block (is, cat);
if (is->method->debug > 3)
if (!block)
block = alloc_block (is, cat);
if (is->method->debug > 3)
- logf (LOG_LOG, "isc: alloc_block in cat %d: %d", cat, block);
+ logf (LOG_LOG, "isc: alloc_block in cat %d: " ZINT_FORMAT, cat, block);
return block;
}
return block;
}
-void isc_release_block (ISAMC is, int cat, int pos)
+void isc_release_block (ISAMC is, int cat, zint pos)
{
if (is->method->debug > 3)
{
if (is->method->debug > 3)
- logf (LOG_LOG, "isc: release_block in cat %d: %d", cat, pos);
+ logf (LOG_LOG, "isc: release_block in cat %d:" ZINT_FORMAT, cat, pos);
if (is->files[cat].fc_list)
{
int j;
if (is->files[cat].fc_list)
{
int j;
@@
-419,7
+420,7
@@
static void init_fc (ISAMC is, int cat)
int j = 100;
is->files[cat].fc_max = j;
int j = 100;
is->files[cat].fc_max = j;
- is->files[cat].fc_list = (int *)
+ is->files[cat].fc_list = (zint *)
xmalloc (sizeof(*is->files[0].fc_list) * j);
while (--j >= 0)
is->files[cat].fc_list[j] = 0;
xmalloc (sizeof(*is->files[0].fc_list) * j);
while (--j >= 0)
is->files[cat].fc_list[j] = 0;
@@
-427,7
+428,8
@@
static void init_fc (ISAMC is, int cat)
static void release_fc (ISAMC is, int cat)
{
static void release_fc (ISAMC is, int cat)
{
- int b, j = is->files[cat].fc_max;
+ int j = is->files[cat].fc_max;
+ zint b;
while (--j >= 0)
if ((b = is->files[cat].fc_list[j]))
while (--j >= 0)
if ((b = is->files[cat].fc_list[j]))
@@
-441,7
+443,7
@@
void isc_pp_close (ISAMC_PP pp)
{
ISAMC is = pp->is;
{
ISAMC is = pp->is;
- (*is->method->code_stop)(ISAMC_DECODE, pp->decodeClientData);
+ (*is->method->codec.stop)(pp->decodeClientData);
xfree (pp->buf);
xfree (pp);
}
xfree (pp->buf);
xfree (pp);
}
@@
-451,7
+453,7
@@
ISAMC_PP isc_pp_open (ISAMC is, ISAMC_P ipos)
ISAMC_PP pp = (ISAMC_PP) xmalloc (sizeof(*pp));
char *src;
ISAMC_PP pp = (ISAMC_PP) xmalloc (sizeof(*pp));
char *src;
- pp->cat = isc_type(ipos);
+ pp->cat = (int) isc_type(ipos);
pp->pos = isc_block(ipos);
src = pp->buf = (char *) xmalloc (is->method->filecat[pp->cat].bsize);
pp->pos = isc_block(ipos);
src = pp->buf = (char *) xmalloc (is->method->filecat[pp->cat].bsize);
@@
-460,7
+462,7
@@
ISAMC_PP isc_pp_open (ISAMC is, ISAMC_P ipos)
pp->size = 0;
pp->offset = 0;
pp->is = is;
pp->size = 0;
pp->offset = 0;
pp->is = is;
- pp->decodeClientData = (*is->method->code_start)(ISAMC_DECODE);
+ pp->decodeClientData = (*is->method->codec.start)();
pp->deleteFlag = 0;
pp->numKeys = 0;
pp->deleteFlag = 0;
pp->numKeys = 0;
@@
-474,12
+476,17
@@
ISAMC_PP isc_pp_open (ISAMC is, ISAMC_P ipos)
src += sizeof(pp->size);
memcpy (&pp->numKeys, src, sizeof(pp->numKeys));
src += sizeof(pp->numKeys);
src += sizeof(pp->size);
memcpy (&pp->numKeys, src, sizeof(pp->numKeys));
src += sizeof(pp->numKeys);
- assert (pp->next != pp->pos);
+ if (pp->next == pp->pos)
+ {
+ yaz_log(LOG_FATAL|LOG_LOG, "pp->next = " ZINT_FORMAT, pp->next);
+ yaz_log(LOG_FATAL|LOG_LOG, "pp->pos = " ZINT_FORMAT, pp->pos);
+ assert (pp->next != pp->pos);
+ }
pp->offset = src - pp->buf;
assert (pp->offset == ISAMC_BLOCK_OFFSET_1);
if (is->method->debug > 2)
pp->offset = src - pp->buf;
assert (pp->offset == ISAMC_BLOCK_OFFSET_1);
if (is->method->debug > 2)
- logf (LOG_LOG, "isc: read_block size=%d %d %d next=%d",
- pp->size, pp->cat, pp->pos, pp->next);
+ logf (LOG_LOG, "isc: read_block size=%d %d " ZINT_FORMAT " next="
+ ZINT_FORMAT, pp->size, pp->cat, pp->pos, pp->next);
}
return pp;
}
}
return pp;
}
@@
-487,7
+494,8
@@
ISAMC_PP isc_pp_open (ISAMC is, ISAMC_P ipos)
/* returns non-zero if item could be read; 0 otherwise */
int isc_pp_read (ISAMC_PP pp, void *buf)
{
/* returns non-zero if item could be read; 0 otherwise */
int isc_pp_read (ISAMC_PP pp, void *buf)
{
- return isc_read_item (pp, (char **) &buf);
+ char *cp = buf;
+ return isc_read_item (pp, &cp);
}
/* read one item from file - decode and store it in *dst.
}
/* read one item from file - decode and store it in *dst.
@@
-498,7
+506,7
@@
int isc_pp_read (ISAMC_PP pp, void *buf)
int isc_read_item (ISAMC_PP pp, char **dst)
{
ISAMC is = pp->is;
int isc_read_item (ISAMC_PP pp, char **dst)
{
ISAMC is = pp->is;
- char *src = pp->buf + pp->offset;
+ const char *src = pp->buf + pp->offset;
if (pp->offset >= pp->size)
{
if (pp->offset >= pp->size)
{
@@
-531,29
+539,36
@@
int isc_read_item (ISAMC_PP pp, char **dst)
pp->pos = pp->next;
src = pp->buf;
/* read block and save 'next' and 'size' entry */
pp->pos = pp->next;
src = pp->buf;
/* read block and save 'next' and 'size' entry */
- isc_read_block (is, pp->cat, pp->pos, src);
+ isc_read_block (is, pp->cat, pp->pos, pp->buf);
memcpy (&pp->next, src, sizeof(pp->next));
src += sizeof(pp->next);
memcpy (&pp->size, src, sizeof(pp->size));
src += sizeof(pp->size);
/* assume block is non-empty */
assert (src - pp->buf == ISAMC_BLOCK_OFFSET_N);
memcpy (&pp->next, src, sizeof(pp->next));
src += sizeof(pp->next);
memcpy (&pp->size, src, sizeof(pp->size));
src += sizeof(pp->size);
/* assume block is non-empty */
assert (src - pp->buf == ISAMC_BLOCK_OFFSET_N);
- assert (pp->next != pp->pos);
+
+ if (pp->next == pp->pos)
+ {
+ yaz_log(LOG_FATAL|LOG_LOG, "pp->next = " ZINT_FORMAT, pp->next);
+ yaz_log(LOG_FATAL|LOG_LOG, "pp->pos = " ZINT_FORMAT, pp->pos);
+ assert (pp->next != pp->pos);
+ }
+
if (pp->deleteFlag)
isc_release_block (is, pp->cat, pp->pos);
if (pp->deleteFlag)
isc_release_block (is, pp->cat, pp->pos);
- (*is->method->code_item)(ISAMC_DECODE, pp->decodeClientData, dst, &src);
+ (*is->method->codec.decode)(pp->decodeClientData, dst, &src);
pp->offset = src - pp->buf;
if (is->method->debug > 2)
pp->offset = src - pp->buf;
if (is->method->debug > 2)
- logf (LOG_LOG, "isc: read_block size=%d %d %d next=%d",
- pp->size, pp->cat, pp->pos, pp->next);
+ logf (LOG_LOG, "isc: read_block size=%d %d " ZINT_FORMAT " next="
+ ZINT_FORMAT, pp->size, pp->cat, pp->pos, pp->next);
return 2;
}
return 2;
}
- (*is->method->code_item)(ISAMC_DECODE, pp->decodeClientData, dst, &src);
+ (*is->method->codec.decode)(pp->decodeClientData, dst, &src);
pp->offset = src - pp->buf;
return 1;
}
pp->offset = src - pp->buf;
return 1;
}
-int isc_pp_num (ISAMC_PP pp)
+zint isc_pp_num (ISAMC_PP pp)
{
return pp->numKeys;
}
{
return pp->numKeys;
}