* Sebastian Hammer, Adam Dickmeiss
*
* $Log: isamc.c,v $
- * Revision 1.5 1996-11-04 14:08:57 adam
+ * Revision 1.8 1997-09-17 12:19:20 adam
+ * Zebra version corresponds to YAZ version 1.4.
+ * Changed Zebra server so that it doesn't depend on global common_resource.
+ *
+ * Revision 1.7 1997/02/12 20:42:43 adam
+ * Bug fix: during isc_merge operations, some pages weren't marked dirty
+ * even though they should be. At this point the merge operation marks
+ * a page dirty if the previous page changed at all. A better approach is
+ * to mark it dirty if the last key written changed in previous page.
+ *
+ * Revision 1.6 1996/11/08 11:15:29 adam
+ * Number of keys in chain are stored in first block and the function
+ * to retrieve this information, isc_pp_num is implemented.
+ *
+ * Revision 1.5 1996/11/04 14:08:57 adam
* Optimized free block usage.
*
* Revision 1.4 1996/11/01 13:36:46 adam
/*
* TODO:
* Reduction to lower categories in isc_merge
- * Implementation of isc_numkeys
*/
#include <stdlib.h>
#include <assert.h>
{ 512, 490, 100, 20 },
{ 4096, 3950, 1000, 20 },
{32768, 32000, 10000, 0 },
- { 0, 0, 0, 0 }
};
ISAMC_M m = xmalloc (sizeof(*m));
m->filecat = def_cat;
m->compare_item = NULL;
- m->debug = 0;
+ m->debug = 1;
m->max_blocks_mem = 10;
}
-ISAMC isc_open (const char *name, int writeflag, ISAMC_M method)
+ISAMC isc_open (BFiles bfs, const char *name, int writeflag, ISAMC_M method)
{
ISAMC is;
ISAMC_filecat filecat;
- int i, j;
+ int i = 0;
int max_buf_size = 0;
is = xmalloc (sizeof(*is));
/* determine number of block categories */
if (is->method->debug)
logf (LOG_LOG, "isc: bsize ifill mfill mblocks");
- for (i = 0; filecat[i].bsize; i++)
+ do
{
if (is->method->debug)
logf (LOG_LOG, "isc:%6d %6d %6d %6d",
filecat[i].mfill, filecat[i].mblocks);
if (max_buf_size < filecat[i].mblocks * filecat[i].bsize)
max_buf_size = filecat[i].mblocks * filecat[i].bsize;
- }
+ } while (filecat[i++].mblocks);
is->no_files = i;
is->max_cat = --i;
/* max_buf_size is the larget buffer to be used during merge */
is->files = xmalloc (sizeof(*is->files)*is->no_files);
if (writeflag)
{
- is->merge_buf = xmalloc (max_buf_size+128);
- memset (is->merge_buf, 0, max_buf_size+128);
+ is->merge_buf = xmalloc (max_buf_size+256);
+ memset (is->merge_buf, 0, max_buf_size+256);
}
else
is->merge_buf = NULL;
char fname[512];
sprintf (fname, "%s%c", name, i+'A');
- is->files[i].bf = bf_open (fname, is->method->filecat[i].bsize,
+ is->files[i].bf = bf_open (bfs, fname, is->method->filecat[i].bsize,
writeflag);
is->files[i].head_is_dirty = 0;
if (!bf_read (is->files[i].bf, 0, 0, sizeof(ISAMC_head),
int isc_read_block (ISAMC is, int cat, int pos, char *dst)
{
++(is->files[cat].no_reads);
- if (is->method->debug > 2)
- logf (LOG_LOG, "isc: read_block %d %d", cat, pos);
return bf_read (is->files[cat].bf, pos, 0, 0, dst);
}
int isc_write_dblock (ISAMC is, int cat, int pos, char *src,
int nextpos, int offset)
{
- int xoffset = offset + 2*sizeof(int);
+ unsigned short size = offset + ISAMC_BLOCK_OFFSET_N;
if (is->method->debug > 2)
logf (LOG_LOG, "isc: write_dblock. size=%d nextpos=%d",
- offset, nextpos);
- memcpy (src - sizeof(int)*2, &nextpos, sizeof(int));
- memcpy (src - sizeof(int), &xoffset, sizeof(int));
- return isc_write_block (is, cat, pos, src - sizeof(int)*2);
+ (int) size, nextpos);
+ src -= ISAMC_BLOCK_OFFSET_N;
+ memcpy (src, &nextpos, sizeof(int));
+ memcpy (src + sizeof(int), &size, sizeof(size));
+ return isc_write_block (is, cat, pos, src);
}
static int alloc_block (ISAMC is, int cat)
logf (LOG_LOG, "isc: release_block in cat %d: %d", cat, pos);
if (is->files[cat].fc_list)
{
- int b, j;
+ int j;
for (j = 0; j<is->files[cat].fc_max; j++)
if (!is->files[cat].fc_list[j])
{
char *src;
pp->cat = isc_type(ipos);
- pp->next = isc_block(ipos);
+ pp->pos = isc_block(ipos);
src = pp->buf = xmalloc (is->method->filecat[pp->cat].bsize);
- pp->pos = 0;
+ pp->next = 0;
pp->size = 0;
pp->offset = 0;
pp->is = is;
pp->decodeClientData = (*is->method->code_start)(ISAMC_DECODE);
pp->deleteFlag = 0;
+ pp->numKeys = 0;
+
+ if (pp->pos)
+ {
+ src = pp->buf;
+ isc_read_block (is, pp->cat, pp->pos, src);
+ memcpy (&pp->next, src, sizeof(pp->next));
+ src += sizeof(pp->next);
+ memcpy (&pp->size, src, sizeof(pp->size));
+ src += sizeof(pp->size);
+ memcpy (&pp->numKeys, src, sizeof(pp->numKeys));
+ src += sizeof(pp->numKeys);
+ assert (pp->next != pp->pos);
+ 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",
+ pp->size, pp->cat, pp->pos);
+ }
return pp;
}
/* returns non-zero if item could be read; 0 otherwise */
-int isc_read_key (ISAMC_PP pp, void *buf)
+int isc_pp_read (ISAMC_PP pp, void *buf)
{
return isc_read_item (pp, (char **) &buf);
}
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->deleteFlag)
isc_release_block (is, pp->cat, pp->pos);
(*is->method->code_item)(ISAMC_DECODE, pp->decodeClientData, dst, &src);
pp->offset = src - pp->buf;
+ if (is->method->debug > 2)
+ logf (LOG_LOG, "isc: read_block size=%d %d %d",
+ pp->size, pp->cat, pp->pos);
return 2;
}
(*is->method->code_item)(ISAMC_DECODE, pp->decodeClientData, dst, &src);
return 1;
}
-int isc_numkeys (ISAMC_PP pp)
+int isc_pp_num (ISAMC_PP pp)
{
- return 1;
+ return pp->numKeys;
}
projects / idzebra-moved-to-github.git / blobdiff