/*
- * Copyright (C) 1994-1995, Index Data I/S
+ * Copyright (C) 1994-1999, Index Data
* All rights reserved.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: recindex.c,v $
- * Revision 1.10 1995-12-06 12:41:24 adam
+ * Revision 1.23 1999-05-26 07:49:13 adam
+ * C++ compilation.
+ *
+ * Revision 1.22 1999/02/18 12:49:34 adam
+ * Changed file naming scheme for register files as well as record
+ * store/index files.
+ *
+ * Revision 1.21 1999/02/02 14:51:03 adam
+ * Updated WIN32 code specific sections. Changed header.
+ *
+ * Revision 1.20 1998/01/12 15:04:08 adam
+ * The test option (-s) only uses read-lock (and not write lock).
+ *
+ * Revision 1.19 1997/09/17 12:19:16 adam
+ * Zebra version corresponds to YAZ version 1.4.
+ * Changed Zebra server so that it doesn't depend on global common_resource.
+ *
+ * Revision 1.18 1997/07/15 16:28:42 adam
+ * Bug fix: storeData didn't work with files with multiple records.
+ * Bug fix: fixed memory management with records; not really well
+ * thought through.
+ *
+ * Revision 1.17 1997/02/12 20:39:46 adam
+ * Implemented options -f <n> that limits the log to the first <n>
+ * records.
+ * Changed some log messages also.
+ *
+ * Revision 1.16 1996/06/04 10:19:00 adam
+ * Minor changes - removed include of ctype.h.
+ *
+ * Revision 1.15 1996/05/13 14:23:06 adam
+ * Work on compaction of set/use bytes in dictionary.
+ *
+ * Revision 1.14 1996/02/01 20:48:15 adam
+ * The total size of records are always checked in rec_cache_insert to
+ * reduce memory usage.
+ *
+ * Revision 1.13 1995/12/11 09:12:49 adam
+ * The rec_get function returns NULL if record doesn't exist - will
+ * happen in the server if the result set records have been deleted since
+ * the creation of the set (i.e. the search).
+ * The server saves a result temporarily if it is 'volatile', i.e. the
+ * set is register dependent.
+ *
+ * Revision 1.12 1995/12/07 17:38:47 adam
+ * Work locking mechanisms for concurrent updates/commit.
+ *
+ * Revision 1.11 1995/12/06 13:58:26 adam
+ * Improved flushing of records - all flushes except the last one
+ * don't write the last accessed. Also flush takes place if record
+ * info occupy more than about 256k.
+ *
+ * Revision 1.10 1995/12/06 12:41:24 adam
* New command 'stat' for the index program.
* Filenames can be read from stdin by specifying '-'.
* Bug fix/enhancement of the transformation from terms to regular
#include <stdio.h>
#include <assert.h>
#include <string.h>
-#include <ctype.h>
#include "recindxp.h"
static void rec_tmp_expand (Records p, int size, int dst_type)
{
- if (p->tmp_size < size + 256 ||
+ if (p->tmp_size < size + 2048 ||
p->tmp_size < p->head.block_size[dst_type]*2)
{
xfree (p->tmp_buf);
- p->tmp_size = size + p->head.block_size[dst_type]*2 + 256;
- p->tmp_buf = xmalloc (p->tmp_size);
+ p->tmp_size = size + p->head.block_size[dst_type]*2 + 2048;
+ p->tmp_buf = (char *) xmalloc (p->tmp_size);
}
}
{
logf (LOG_FATAL|LOG_ERRNO, "read in %s at pos %ld",
p->index_fname, (long) pos);
- abort ();
exit (1);
}
return r;
if (read_indx (p, sysno, &entry, sizeof(entry), 1) != 1)
return ;
- p->head.total_bytes -= entry.u.used.size;
- freeblock = entry.u.used.next;
+ p->head.total_bytes -= entry.size;
+ freeblock = entry.next;
assert (freeblock > 0);
dst_type = freeblock & 7;
assert (dst_type < REC_BLOCK_TYPES);
rec_release_blocks (p, rec->sysno);
- entry.u.free.next = p->head.index_free;
+ entry.next = p->head.index_free;
+ entry.size = 0;
p->head.index_free = rec->sysno;
write_indx (p, rec->sysno, &entry, sizeof(entry));
}
{
logf (LOG_FATAL|LOG_ERRNO, "read in %s at free block %d",
p->data_fname[dst_type], block_free);
+ exit (1);
}
}
else
block_free = p->head.block_last[dst_type]++;
if (block_prev == -1)
{
- entry.u.used.next = block_free*8 + dst_type;
- entry.u.used.size = size;
+ entry.next = block_free*8 + dst_type;
+ entry.size = size;
p->head.total_bytes += size;
write_indx (p, rec->sysno, &entry, sizeof(entry));
}
rec_write_single (p, rec);
}
-Records rec_open (int rw)
+Records rec_open (BFiles bfs, int rw)
{
Records p;
int i, r;
- p = xmalloc (sizeof(*p));
+ p = (Records) xmalloc (sizeof(*p));
p->rw = rw;
p->tmp_size = 1024;
- p->tmp_buf = xmalloc (p->tmp_size);
- p->index_fname = "recindex";
- p->index_BFile = bf_open (p->index_fname, 128, rw);
+ p->tmp_buf = (char *) xmalloc (p->tmp_size);
+ p->index_fname = "reci";
+ p->index_BFile = bf_open (bfs, p->index_fname, 128, rw);
if (p->index_BFile == NULL)
{
logf (LOG_FATAL|LOG_ERRNO, "open %s", p->index_fname);
for (i = 0; i<REC_BLOCK_TYPES; i++)
{
char str[80];
- sprintf (str, "recdata%c", i + 'A');
- p->data_fname[i] = xmalloc (strlen(str)+1);
+ sprintf (str, "recd%c", i + 'A');
+ p->data_fname[i] = (char *) xmalloc (strlen(str)+1);
strcpy (p->data_fname[i], str);
p->data_BFile[i] = NULL;
}
for (i = 0; i<REC_BLOCK_TYPES; i++)
{
- if (!(p->data_BFile[i] = bf_open (p->data_fname[i],
+ if (!(p->data_BFile[i] = bf_open (bfs, p->data_fname[i],
p->head.block_size[i],
rw)))
{
}
p->cache_max = 10;
p->cache_cur = 0;
- p->record_cache = xmalloc (sizeof(*p->record_cache)*p->cache_max);
+ p->record_cache = (struct record_cache_entry *)
+ xmalloc (sizeof(*p->record_cache)*p->cache_max);
return p;
}
-static void rec_cache_flush (Records p)
+static void rec_cache_flush (Records p, int saveCount)
{
- int i;
- for (i = 0; i<p->cache_cur; i++)
+ int i, j;
+
+ if (saveCount >= p->cache_cur)
+ saveCount = 0;
+ for (i = 0; i<p->cache_cur - saveCount; i++)
{
struct record_cache_entry *e = p->record_cache + i;
switch (e->flag)
}
rec_rm (&e->rec);
}
- p->cache_cur = 0;
+ for (j = 0; j<saveCount; j++, i++)
+ memcpy (p->record_cache+j, p->record_cache+i,
+ sizeof(*p->record_cache));
+ p->cache_cur = saveCount;
}
static Record *rec_cache_lookup (Records p, int sysno,
struct record_cache_entry *e;
if (p->cache_cur == p->cache_max)
- rec_cache_flush (p);
+ rec_cache_flush (p, 1);
+ else if (p->cache_cur > 0)
+ {
+ int i, j;
+ int used = 0;
+ for (i = 0; i<p->cache_cur; i++)
+ {
+ Record r = (p->record_cache + i)->rec;
+ for (j = 0; j<REC_NO_INFO; j++)
+ used += r->size[j];
+ }
+ if (used > 256000)
+ rec_cache_flush (p, 1);
+ }
assert (p->cache_cur < p->cache_max);
e = p->record_cache + (p->cache_cur)++;
assert (p);
- rec_cache_flush (p);
+ rec_cache_flush (p, 0);
xfree (p->record_cache);
if (p->rw)
if ((recp = rec_cache_lookup (p, sysno, recordFlagNop)))
return rec_cp (*recp);
- read_indx (p, sysno, &entry, sizeof(entry), 0);
+ if (!read_indx (p, sysno, &entry, sizeof(entry), 1))
+ return NULL; /* record is not there! */
- dst_type = entry.u.used.next & 7;
+ if (!entry.size)
+ return NULL; /* record is deleted */
+
+ dst_type = entry.next & 7;
assert (dst_type < REC_BLOCK_TYPES);
- freeblock = entry.u.used.next / 8;
+ freeblock = entry.next / 8;
assert (freeblock > 0);
- rec = xmalloc (sizeof(*rec));
- rec_tmp_expand (p, entry.u.used.size, dst_type);
+ rec = (Record) xmalloc (sizeof(*rec));
+ rec_tmp_expand (p, entry.size, dst_type);
cptr = p->tmp_buf;
bf_read (p->data_BFile[dst_type], freeblock, 0, 0, cptr);
nptr += sizeof(*rec->size);
if (rec->size[i])
{
- rec->info[i] = xmalloc (rec->size[i]);
+ rec->info[i] = (char *) xmalloc (rec->size[i]);
memcpy (rec->info[i], nptr, rec->size[i]);
nptr += rec->size[i];
}
Record rec;
assert (p);
- rec = xmalloc (sizeof(*rec));
- if (p->head.index_free == 0)
+ rec = (Record) xmalloc (sizeof(*rec));
+ if (1 || p->head.index_free == 0)
sysno = (p->head.index_last)++;
else
{
read_indx (p, p->head.index_free, &entry, sizeof(entry), 0);
sysno = p->head.index_free;
- p->head.index_free = entry.u.free.next;
+ p->head.index_free = entry.next;
}
(p->head.no_records)++;
rec->sysno = sysno;
{
Record *recp;
+ (p->head.no_records)--;
if ((recp = rec_cache_lookup (p, (*recpp)->sysno, recordFlagDelete)))
{
rec_rm (recp);
void rec_rm (Record *recpp)
{
int i;
+
+ if (!*recpp)
+ return ;
for (i = 0; i < REC_NO_INFO; i++)
xfree ((*recpp)->info[i]);
xfree (*recpp);
Record n;
int i;
- n = xmalloc (sizeof(*n));
+ n = (Record) xmalloc (sizeof(*n));
n->sysno = rec->sysno;
for (i = 0; i < REC_NO_INFO; i++)
if (!rec->info[i])
else
{
n->size[i] = rec->size[i];
- n->info[i] = xmalloc (rec->size[i]);
+ n->info[i] = (char *) xmalloc (rec->size[i]);
memcpy (n->info[i], rec->info[i], rec->size[i]);
}
return n;
return NULL;
}
*len = strlen(s)+1;
- p = xmalloc (*len);
+ p = (char *) xmalloc (*len);
strcpy (p, s);
return p;
}
projects / idzebra-moved-to-github.git / blobdiff