-/*
- * Copyright (C) 1994-1995, Index Data I/S
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: recindex.c,v $
- * Revision 1.5 1995-11-22 17:19:18 adam
- * Record management uses the bfile system.
- *
- * Revision 1.4 1995/11/20 16:59:46 adam
- * New update method: the 'old' keys are saved for each records.
- *
- * Revision 1.3 1995/11/16 15:34:55 adam
- * Uses new record management system in both indexer and server.
- *
- * Revision 1.2 1995/11/15 19:13:08 adam
- * Work on record management.
- *
- * Revision 1.1 1995/11/15 14:46:20 adam
- * Started work on better record management system.
- *
- */
+/* This file is part of the Zebra server.
+ Copyright (C) 2004-2013 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
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+*/
+
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdio.h>
+#include <stdlib.h>
#include <assert.h>
#include <string.h>
-#include <ctype.h>
-#include <assert.h>
-#include <fcntl.h>
-#include <unistd.h>
+#include <idzebra/isamb.h>
+#include <yaz/yaz-util.h>
#include "recindex.h"
-#define USE_BF 1
-
-#if USE_BF
-#include <bfile.h>
+#define RIDX_CHUNK 128
-#define REC_BLOCK_TYPES 2
-#define REC_HEAD_MAGIC "recindx"
-
-struct records_info {
- int rw;
+struct recindex {
char *index_fname;
BFile index_BFile;
-
-
- char *data_fname[REC_BLOCK_TYPES];
- BFile data_BFile[REC_BLOCK_TYPES];
-
- char *tmp_buf;
- int tmp_size;
-
- struct record_cache_entry *record_cache;
- int cache_size;
- int cache_cur;
- int cache_max;
-
- struct records_head {
- char magic[8];
- int block_size[REC_BLOCK_TYPES];
- int block_free[REC_BLOCK_TYPES];
- int block_last[REC_BLOCK_TYPES];
- int block_used[REC_BLOCK_TYPES];
- int block_move[REC_BLOCK_TYPES];
-
- int index_last;
- int index_free;
- int no_records;
-
- } head;
-};
-
-enum recordCacheFlag { recordFlagNop, recordFlagWrite, recordFlagDelete };
-
-struct record_cache_entry {
- Record rec;
- enum recordCacheFlag flag;
+ ISAMB isamb;
+ ISAM_P isam_p;
};
struct record_index_entry {
- union {
- struct {
- int next;
- int size;
- } used;
- struct {
- int next;
- } free;
- } u;
-};
+ zint next; /* first block of record info / next free entry */
+ int size; /* size of record or 0 if free entry */
+} ent;
-static void rec_write_head (Records p)
+static void rect_log_item(int level, const void *b, const char *txt)
{
- int r;
+ zint sys;
+ int len;
- assert (p);
- assert (p->index_BFile);
- r = bf_write (p->index_BFile, 0, 0, sizeof(p->head), &p->head);
- if (r)
- {
- logf (LOG_FATAL|LOG_ERRNO, "write head of %s", p->index_fname);
- exit (1);
- }
-}
+ memcpy(&sys, b, sizeof(sys));
+ len = ((const char *) b)[sizeof(sys)];
-static void rec_tmp_expand (Records p, int size, int dst_type)
-{
- if (p->tmp_size < size + 256 ||
- p->tmp_size < p->head.block_size[dst_type]*2)
+ if (len == sizeof(struct record_index_entry))
{
- free (p->tmp_buf);
- p->tmp_size = size + p->head.block_size[dst_type]*2 +
- 256;
- if (!(p->tmp_buf = malloc (p->tmp_size)))
- {
- logf (LOG_FATAL|LOG_ERRNO, "malloc");
- exit (1);
- }
- }
-}
+ memcpy(&ent, (const char *)b + sizeof(sys) + 1, len);
+ yaz_log(YLOG_LOG, "%s " ZINT_FORMAT " next=" ZINT_FORMAT " sz=%d", txt, sys,
+ ent.next, ent.size);
-static int read_indx (Records p, int sysno, void *buf, int itemsize,
- int ignoreError)
-{
- int r;
- int pos = (sysno-1)*itemsize;
-
- r = bf_read (p->index_BFile, 1+pos/128, pos%128, itemsize, buf);
- if (r != 1 && !ignoreError)
- {
- logf (LOG_FATAL|LOG_ERRNO, "read in %s at pos %ld",
- p->index_fname, (long) pos);
- abort ();
- exit (1);
}
- return r;
+ else
+ yaz_log(YLOG_LOG, "%s " ZINT_FORMAT, txt, sys);
}
-static void write_indx (Records p, int sysno, void *buf, int itemsize)
+int rect_compare(const void *a, const void *b)
{
- int pos = (sysno-1)*itemsize;
+ zint s_a, s_b;
- bf_write (p->index_BFile, 1+pos/128, pos%128, itemsize, buf);
-}
+ memcpy(&s_a, a, sizeof(s_a));
+ memcpy(&s_b, b, sizeof(s_b));
-static void rec_release_blocks (Records p, int sysno)
-{
- struct record_index_entry entry;
- int freeblock, freenext;
- int dst_type;
-
- if (read_indx (p, sysno, &entry, sizeof(entry), 1) != 1)
- return ;
- freeblock = entry.u.used.next;
- assert (freeblock > 0);
- dst_type = freeblock & 7;
- freeblock = freeblock / 8;
- while (freeblock)
- {
- if (bf_read (p->data_BFile[dst_type], freeblock, 0, sizeof(freenext),
- &freenext) != 1)
- {
- logf (LOG_FATAL|LOG_ERRNO, "read in rec_del_single");
- exit (1);
- }
- if (bf_write (p->data_BFile[dst_type], freeblock, 0, sizeof(freenext),
- &p->head.block_free[dst_type]))
- {
- logf (LOG_FATAL|LOG_ERRNO, "write in rec_del_single");
- exit (1);
- }
- p->head.block_free[dst_type] = freeblock;
- freeblock = freenext;
- p->head.block_used[dst_type]--;
- }
+ if (s_a > s_b)
+ return 1;
+ else if (s_a < s_b)
+ return -1;
+ return 0;
}
-static void rec_delete_single (Records p, Record rec)
+void *rect_code_start(void)
{
- struct record_index_entry entry;
-
- rec_release_blocks (p, rec->sysno);
-
- entry.u.free.next = p->head.index_free;
- p->head.index_free = rec->sysno;
- write_indx (p, rec->sysno, &entry, sizeof(entry));
+ return 0;
}
-static void rec_write_single (Records p, Record rec)
+void rect_encode(void *p, char **dst, const char **src)
{
- int i, size = 0;
- char *cptr;
- int dst_type = 0;
- int no_written = 0;
- int block_prev = -1, block_free;
- struct record_index_entry entry;
-
- rec_release_blocks (p, rec->sysno);
-
- for (i = 0; i < REC_NO_INFO; i++)
- if (!rec->info[i])
- size += sizeof(*rec->size);
- else
- size += sizeof(*rec->size) + rec->size[i];
-
- for (i = 1; i<REC_BLOCK_TYPES; i++)
- if (size >= p->head.block_move[i])
- dst_type = i;
+ zint sys;
+ int len;
- rec_tmp_expand (p, size, dst_type);
+ memcpy(&sys, *src, sizeof(sys));
+ zebra_zint_encode(dst, sys);
+ (*src) += sizeof(sys);
- cptr = p->tmp_buf + sizeof(int); /* a hack! */
- for (i = 0; i < REC_NO_INFO; i++)
- {
- memcpy (cptr, &rec->size[i], sizeof(*rec->size));
- cptr += sizeof(*rec->size);
- if (rec->info[i])
- {
- memcpy (cptr, rec->info[i], rec->size[i]);
- cptr += rec->size[i];
- }
- }
- cptr = p->tmp_buf;
- while (no_written < size)
- {
- block_free = p->head.block_free[dst_type];
- if (block_free)
- {
- if (bf_read (p->data_BFile[dst_type],
- block_free, 0, sizeof(*p->head.block_free),
- &p->head.block_free[dst_type]) != 1)
- {
- logf (LOG_FATAL|LOG_ERRNO, "read in %s at free block %d",
- p->data_fname[dst_type], block_free);
- }
- }
- 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;
+ len = **src;
+ **dst = len;
+ (*src)++;
+ (*dst)++;
- write_indx (p, rec->sysno, &entry, sizeof(entry));
- }
- else
- {
- memcpy (cptr, &block_free, sizeof(int));
- bf_write (p->data_BFile[dst_type], block_prev, 0, 0, cptr);
- cptr = p->tmp_buf + no_written;
- }
- block_prev = block_free;
- no_written += p->head.block_size[dst_type] - sizeof(int);
- p->head.block_used[dst_type]++;
- }
- assert (block_prev != -1);
- block_free = 0;
- memcpy (cptr, &block_free, sizeof(int));
- bf_write (p->data_BFile[dst_type], block_prev, 0,
- sizeof(int) + (p->tmp_buf+size) - cptr, cptr);
+ memcpy(*dst, *src, len);
+ *dst += len;
+ *src += len;
}
-
-Records rec_open (int rw)
+void rect_decode(void *p, char **dst, const char **src)
{
- Records p;
- int i, r;
+ zint sys;
+ int len;
- if (!(p = malloc (sizeof(*p))))
- {
- logf (LOG_FATAL|LOG_ERRNO, "malloc");
- exit (1);
- }
- p->rw = rw;
- p->tmp_size = 1024;
- p->tmp_buf = malloc (p->tmp_size);
- if (!p->tmp_buf)
- {
- logf (LOG_FATAL|LOG_ERRNO, "malloc");
- exit (1);
- }
- p->index_fname = "recindex";
- p->index_BFile = bf_open (p->index_fname, 128, rw);
- if (p->index_BFile == NULL)
- {
- logf (LOG_FATAL|LOG_ERRNO, "open %s", p->index_fname);
- exit (1);
- }
- r = bf_read (p->index_BFile, 0, 0, 0, p->tmp_buf);
- switch (r)
- {
- case 0:
- memcpy (p->head.magic, REC_HEAD_MAGIC, sizeof(p->head.magic));
- p->head.index_free = 0;
- p->head.index_last = 1;
- p->head.no_records = 0;
- for (i = 0; i<REC_BLOCK_TYPES; i++)
- {
- p->head.block_free[i] = 0;
- p->head.block_last[i] = 1;
- p->head.block_used[i] = 0;
- }
- p->head.block_size[0] = 128;
- p->head.block_move[0] = 0;
- for (i = 1; i<REC_BLOCK_TYPES; i++)
- {
- p->head.block_size[i] = p->head.block_size[i-1] * 4;
- p->head.block_move[i] = p->head.block_size[i] * 3;
- }
- if (rw)
- rec_write_head (p);
- break;
- case 1:
- memcpy (&p->head, p->tmp_buf, sizeof(p->head));
- if (memcmp (p->head.magic, REC_HEAD_MAGIC, sizeof(p->head.magic)))
- {
- logf (LOG_FATAL, "read %s. bad header", p->index_fname);
- exit (1);
- }
- break;
- }
- for (i = 0; i<REC_BLOCK_TYPES; i++)
- {
- char str[80];
- sprintf (str, "recdata%d", i);
- p->data_fname[i] = malloc (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],
- p->head.block_size[i],
- rw)))
- {
- logf (LOG_FATAL|LOG_ERRNO, "bf_open %s", p->data_fname[i]);
- exit (1);
- }
- }
- p->cache_max = 10;
- p->cache_cur = 0;
- if (!(p->record_cache = malloc (sizeof(*p->record_cache)*p->cache_max)))
- {
- logf (LOG_FATAL|LOG_ERRNO, "malloc");
- exit (1);
- }
- return p;
-}
+ zebra_zint_decode(src, &sys);
+ memcpy(*dst, &sys, sizeof(sys));
+ *dst += sizeof(sys);
-static void rec_cache_flush (Records p)
-{
- int i;
- for (i = 0; i<p->cache_cur; i++)
- {
- struct record_cache_entry *e = p->record_cache + i;
- switch (e->flag)
- {
- case recordFlagNop:
- break;
- case recordFlagWrite:
- rec_write_single (p, e->rec);
- break;
- case recordFlagDelete:
- rec_delete_single (p, e->rec);
- break;
- }
- rec_rm (&e->rec);
- }
- p->cache_cur = 0;
-}
+ len = **src;
+ **dst = len;
+ (*src)++;
+ (*dst)++;
-static Record *rec_cache_lookup (Records p, int sysno,
- enum recordCacheFlag flag)
-{
- int i;
- for (i = 0; i<p->cache_cur; i++)
- {
- struct record_cache_entry *e = p->record_cache + i;
- if (e->rec->sysno == sysno)
- {
- if (flag != recordFlagNop)
- e->flag = flag;
- return &e->rec;
- }
- }
- return NULL;
+ memcpy(*dst, *src, len);
+ *dst += len;
+ *src += len;
}
-static void rec_cache_insert (Records p, Record rec, enum recordCacheFlag flag)
+void rect_code_reset(void *p)
{
- struct record_cache_entry *e;
-
- if (p->cache_cur == p->cache_max)
- rec_cache_flush (p);
- assert (p->cache_cur < p->cache_max);
-
- e = p->record_cache + (p->cache_cur)++;
- e->flag = flag;
- e->rec = rec_cp (rec);
}
-void rec_close (Records *pp)
+void rect_code_stop(void *p)
{
- Records p = *pp;
- int i;
-
- assert (p);
-
- rec_cache_flush (p);
- free (p->record_cache);
-
- if (p->rw)
- rec_write_head (p);
-
- if (p->index_BFile)
- bf_close (p->index_BFile);
-
- for (i = 0; i<REC_BLOCK_TYPES; i++)
- {
- if (p->data_BFile[i])
- bf_close (p->data_BFile[i]);
- free (p->data_fname[i]);
- }
- free (p->tmp_buf);
- free (p);
- *pp = NULL;
}
-Record rec_get (Records p, int sysno)
+recindex_t recindex_open(BFiles bfs, int rw, int use_isamb)
{
- int i;
- Record rec, *recp;
- struct record_index_entry entry;
- int freeblock, dst_type;
- char *nptr, *cptr;
-
- assert (sysno > 0);
- assert (p);
-
- if ((recp = rec_cache_lookup (p, sysno, recordFlagNop)))
- return rec_cp (*recp);
-
- read_indx (p, sysno, &entry, sizeof(entry), 0);
-
- dst_type = entry.u.used.next & 7;
- freeblock = entry.u.used.next / 8;
-
- assert (freeblock > 0);
-
- if (!(rec = malloc (sizeof(*rec))))
- {
- logf (LOG_FATAL|LOG_ERRNO, "malloc");
- exit (1);
- }
- rec_tmp_expand (p, entry.u.used.size, dst_type);
+ recindex_t p = xmalloc(sizeof(*p));
+ p->index_BFile = 0;
+ p->isamb = 0;
- cptr = p->tmp_buf;
- bf_read (p->data_BFile[dst_type], freeblock, 0, 0, cptr);
- memcpy (&freeblock, cptr, sizeof(freeblock));
-
- while (freeblock)
+ p->index_fname = "reci";
+ p->index_BFile = bf_open(bfs, p->index_fname, RIDX_CHUNK, rw);
+ if (p->index_BFile == NULL)
{
- int tmp;
-
- cptr += p->head.block_size[dst_type] - sizeof(freeblock);
-
- memcpy (&tmp, cptr, sizeof(tmp));
- bf_read (p->data_BFile[dst_type], freeblock, 0, 0, cptr);
- memcpy (&freeblock, cptr, sizeof(freeblock));
- memcpy (cptr, &tmp, sizeof(tmp));
+ yaz_log(YLOG_FATAL|YLOG_ERRNO, "open %s", p->index_fname);
+ xfree(p);
+ return 0;
}
- rec->sysno = sysno;
- nptr = p->tmp_buf + sizeof(freeblock);
- for (i = 0; i < REC_NO_INFO; i++)
+ if (use_isamb)
{
- memcpy (&rec->size[i], nptr, sizeof(*rec->size));
- nptr += sizeof(*rec->size);
- if (rec->size[i])
- {
- rec->info[i] = malloc (rec->size[i]);
- memcpy (rec->info[i], nptr, rec->size[i]);
- nptr += rec->size[i];
- }
- else
- rec->info[i] = NULL;
- }
- rec_cache_insert (p, rec, recordFlagNop);
- return rec;
-}
-
-Record rec_new (Records p)
-{
- int sysno, i;
- Record rec;
+ int isam_block_size = 4096;
+ ISAMC_M method;
- assert (p);
- if (!(rec = malloc (sizeof(*rec))))
- {
- logf (LOG_FATAL|LOG_ERRNO, "malloc");
- exit (1);
- }
- if (p->head.index_free == 0)
- sysno = (p->head.index_last)++;
- else
- {
- struct record_index_entry entry;
+ method.compare_item = rect_compare;
+ method.log_item = rect_log_item;
+ method.codec.start = rect_code_start;
+ method.codec.encode = rect_encode;
+ method.codec.decode = rect_decode;
+ method.codec.reset = rect_code_reset;
+ method.codec.stop = rect_code_stop;
- 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.no_records)++;
- rec->sysno = sysno;
- for (i = 0; i < REC_NO_INFO; i++)
- {
- rec->info[i] = NULL;
- rec->size[i] = 0;
- }
- rec_cache_insert (p, rec, recordFlagWrite);
- return rec;
-}
+ p->index_fname = "rect";
+ p->isamb = isamb_open2(bfs, p->index_fname, rw, &method,
+ /* cache */ 0,
+ /* no_cat */ 1, &isam_block_size,
+ /* use_root_ptr */ 1);
-void rec_del (Records p, Record *recpp)
-{
- Record *recp;
+ p->isam_p = 0;
+ if (p->isamb)
+ p->isam_p = isamb_get_root_ptr(p->isamb);
- if ((recp = rec_cache_lookup (p, (*recpp)->sysno, recordFlagDelete)))
- {
- rec_rm (recp);
- *recp = *recpp;
}
- else
- {
- rec_cache_insert (p, *recpp, recordFlagDelete);
- rec_rm (recpp);
- }
- *recpp = NULL;
+ return p;
}
-void rec_put (Records p, Record *recpp)
+static void log_pr(const char *txt)
{
- Record *recp;
-
- if ((recp = rec_cache_lookup (p, (*recpp)->sysno, recordFlagWrite)))
- {
- rec_rm (recp);
- *recp = *recpp;
- }
- else
- {
- rec_cache_insert (p, *recpp, recordFlagWrite);
- rec_rm (recpp);
- }
- *recpp = NULL;
+ yaz_log(YLOG_LOG, "%s", txt);
}
-void rec_rm (Record *recpp)
-{
- int i;
- for (i = 0; i < REC_NO_INFO; i++)
- free ((*recpp)->info[i]);
- free (*recpp);
- *recpp = NULL;
-}
-Record rec_cp (Record rec)
+void recindex_close(recindex_t p)
{
- Record n;
- int i;
-
- if (!(n = malloc (sizeof(*n))))
+ if (p)
{
- logf (LOG_FATAL|LOG_ERRNO, "malloc");
- exit (1);
- }
- n->sysno = rec->sysno;
- for (i = 0; i < REC_NO_INFO; i++)
- if (!rec->info[i])
+ if (p->index_BFile)
+ bf_close(p->index_BFile);
+ if (p->isamb)
{
- n->info[i] = NULL;
- n->size[i] = 0;
+ isamb_set_root_ptr(p->isamb, p->isam_p);
+ isamb_dump(p->isamb, p->isam_p, log_pr);
+ isamb_close(p->isamb);
}
- else
- {
- n->size[i] = rec->size[i];
- if (!(n->info[i] = malloc (rec->size[i])))
- {
- logf (LOG_FATAL|LOG_ERRNO, "malloc. rec_cp");
- exit (1);
- }
- memcpy (n->info[i], rec->info[i], rec->size[i]);
- }
- return n;
+ xfree(p);
+ }
}
-/* no BF --------------------------------------------------- */
-#else
-
-struct records_info {
- int rw;
- int index_fd;
- char *index_fname;
- int data_fd;
- char *data_fname;
- struct records_head {
- char magic[8];
- int no_records;
- int index_free;
- int index_last;
- int data_size;
- int data_slack;
- int data_used;
- } head;
- char *tmp_buf;
- int tmp_size;
- int cache_size;
- int cache_cur;
- int cache_max;
- struct record_cache_entry *record_cache;
-};
-
-struct record_cache_entry {
- Record rec;
- int dirty;
-};
-
-struct record_index_entry {
- union {
- struct {
- int offset;
- int size;
- } used;
- struct {
- int next;
- } free;
- } u;
-};
-
-#define REC_HEAD_MAGIC "rechead"
-
-static void rec_write_head (Records p)
+int recindex_read_head(recindex_t p, void *buf)
{
- int r;
-
- assert (p);
- assert (p->index_fd != -1);
- if (lseek (p->index_fd, (off_t) 0, SEEK_SET) == -1)
- {
- logf (LOG_FATAL|LOG_ERRNO, "lseek to 0 in %s", p->index_fname);
- exit (1);
- }
- r = write (p->index_fd, &p->head, sizeof(p->head));
- switch (r)
- {
- case -1:
- logf (LOG_FATAL|LOG_ERRNO, "write head of %s", p->index_fname);
- exit (1);
- case sizeof(p->head):
- break;
- default:
- logf (LOG_FATAL, "write head of %s. wrote %d", p->index_fname, r);
- exit (1);
- }
+ return bf_read(p->index_BFile, 0, 0, 0, buf);
}
-Records rec_open (int rw)
+const char *recindex_get_fname(recindex_t p)
{
- Records p;
- int r;
-
- if (!(p = malloc (sizeof(*p))))
- {
- logf (LOG_FATAL|LOG_ERRNO, "malloc");
- exit (1);
- }
- p->rw = rw;
- p->tmp_buf = NULL;
- p->tmp_size = 0;
- p->data_fname = "recdata";
- p->data_fd = -1;
- p->index_fname = "recindex";
- p->index_fd = open (p->index_fname,
- rw ? (O_RDWR|O_CREAT) : O_RDONLY, 0666);
- if (p->index_fd == -1)
- {
- logf (LOG_FATAL|LOG_ERRNO, "open %s", p->index_fname);
- exit (1);
- }
- r = read (p->index_fd, &p->head, sizeof(p->head));
- switch (r)
- {
- case -1:
- logf (LOG_FATAL|LOG_ERRNO, "read %s", p->index_fname);
- exit (1);
- case 0:
- memcpy (p->head.magic, REC_HEAD_MAGIC, sizeof(p->head.magic));
- p->head.index_free = 0;
- p->head.index_last = 1;
- p->head.no_records = 0;
- p->head.data_size = 0;
- p->head.data_slack = 0;
- p->head.data_used = 0;
- if (rw)
- rec_write_head (p);
- break;
- case sizeof(p->head):
- if (memcmp (p->head.magic, REC_HEAD_MAGIC, sizeof(p->head.magic)))
- {
- logf (LOG_FATAL, "read %s. bad header", p->index_fname);
- exit (1);
- }
- break;
- default:
- logf (LOG_FATAL, "read head of %s. expected %d. got %d",
- p->index_fname, sizeof(p->head), r);
- exit (1);
- }
- p->data_fd = open (p->data_fname,
- rw ? (O_RDWR|O_CREAT) : O_RDONLY, 0666);
- if (p->data_fd == -1)
- {
- logf (LOG_FATAL|LOG_ERRNO, "open %s", p->data_fname);
- exit (1);
- }
- p->cache_max = 10;
- p->cache_cur = 0;
- if (!(p->record_cache = malloc (sizeof(*p->record_cache)*p->cache_max)))
- {
- logf (LOG_FATAL|LOG_ERRNO, "malloc");
- exit (1);
- }
- return p;
+ return p->index_fname;
}
-static void read_indx (Records p, int sysno, void *buf, int itemsize)
+ZEBRA_RES recindex_write_head(recindex_t p, const void *buf, size_t len)
{
int r;
- off_t pos = (sysno-1)*itemsize + sizeof(p->head);
- if (lseek (p->index_fd, pos, SEEK_SET) == (pos) -1)
- {
- logf (LOG_FATAL|LOG_ERRNO, "seek in %s to pos %ld",
- p->index_fname, (long) pos);
- exit (1);
- }
- r = read (p->index_fd, buf, itemsize);
- if (r != itemsize)
- {
- if (r == -1)
- logf (LOG_FATAL|LOG_ERRNO, "read in %s at pos %ld",
- p->index_fname, (long) pos);
- else
- logf (LOG_FATAL, "read in %s at pos %ld",
- p->index_fname, (long) pos);
- exit (1);
- }
-}
+ assert(p);
-static void rec_write_single (Records p, Record rec)
-{
- struct record_index_entry entry;
- int r, i, size = 0, got;
- char *cptr;
- off_t pos = (rec->sysno-1)*sizeof(entry) + sizeof(p->head);
-
- for (i = 0; i < REC_NO_INFO; i++)
- if (!rec->info[i])
- size += sizeof(*rec->size);
- else
- size += sizeof(*rec->size) + rec->size[i];
-
- entry.u.used.offset = p->head.data_size;
- entry.u.used.size = size;
- p->head.data_size += size;
- p->head.data_used += size;
-
- if (lseek (p->index_fd, pos, SEEK_SET) == (pos) -1)
- {
- logf (LOG_FATAL|LOG_ERRNO, "seek in %s to pos %ld",
- p->index_fname, (long) pos);
- exit (1);
- }
- r = write (p->index_fd, &entry, sizeof(entry));
- if (r != sizeof(entry))
- {
- if (r == -1)
- logf (LOG_FATAL|LOG_ERRNO, "write of %s at pos %ld",
- p->index_fname, (long) pos);
- else
- logf (LOG_FATAL, "write of %s at pos %ld",
- p->index_fname, (long) pos);
- exit (1);
- }
- if (lseek (p->data_fd, entry.u.used.offset, SEEK_SET) == -1)
- {
- logf (LOG_FATAL|LOG_ERRNO, "lseek in %s to pos %ld",
- p->data_fname, entry.u.used.offset);
- exit (1);
- }
- if (p->tmp_size < entry.u.used.size)
- {
- free (p->tmp_buf);
- p->tmp_size = entry.u.used.size + 16384;
- if (!(p->tmp_buf = malloc (p->tmp_size)))
- {
- logf (LOG_FATAL|LOG_ERRNO, "malloc");
- exit (1);
- }
- }
- cptr = p->tmp_buf;
- for (i = 0; i < REC_NO_INFO; i++)
- {
- memcpy (cptr, &rec->size[i], sizeof(*rec->size));
- cptr += sizeof(*rec->size);
- if (rec->info[i])
- {
- memcpy (cptr, rec->info[i], rec->size[i]);
- cptr += rec->size[i];
- }
- }
- for (got = 0; got < entry.u.used.size; got += r)
- {
- r = write (p->data_fd, p->tmp_buf + got, entry.u.used.size - got);
- if (r <= 0)
- {
- logf (LOG_FATAL|LOG_ERRNO, "write of %s", p->data_fname);
- exit (1);
- }
- }
-}
+ assert(p->index_BFile);
-static void rec_cache_flush (Records p)
-{
- int i;
- for (i = 0; i<p->cache_cur; i++)
+ r = bf_write(p->index_BFile, 0, 0, len, buf);
+ if (r)
{
- struct record_cache_entry *e = p->record_cache + i;
- if (e->dirty)
- rec_write_single (p, e->rec);
- rec_rm (&e->rec);
+ yaz_log(YLOG_FATAL|YLOG_ERRNO, "write head of %s", p->index_fname);
+ return ZEBRA_FAIL;
}
- p->cache_cur = 0;
+ return ZEBRA_OK;
}
-static Record *rec_cache_lookup (Records p, int sysno, int dirty)
+int recindex_read_indx(recindex_t p, zint sysno, void *buf, int itemsize,
+ int ignoreError)
{
- int i;
- for (i = 0; i<p->cache_cur; i++)
+ int r = 0;
+ if (p->isamb)
{
- struct record_cache_entry *e = p->record_cache + i;
- if (e->rec->sysno == sysno)
+ if (p->isam_p)
{
- if (dirty)
- e->dirty = 1;
- return &e->rec;
- }
- }
- return NULL;
-}
+ char item[256];
+ char *st = item;
+ char untilbuf[sizeof(zint) + 1];
-static void rec_cache_insert (Records p, Record rec, int dirty)
-{
- struct record_cache_entry *e;
+ ISAMB_PP isam_pp = isamb_pp_open(p->isamb, p->isam_p, 1);
- if (p->cache_cur == p->cache_max)
- rec_cache_flush (p);
- assert (p->cache_cur < p->cache_max);
+ memcpy(untilbuf, &sysno, sizeof(sysno));
+ untilbuf[sizeof(sysno)] = 0;
+ r = isamb_pp_forward(isam_pp, st, untilbuf);
- e = p->record_cache + (p->cache_cur)++;
- e->dirty = dirty;
- e->rec = rec_cp (rec);
-}
+ isamb_pp_close(isam_pp);
+ if (!r)
+ return 0;
-void rec_close (Records *p)
-{
- assert (*p);
-
- rec_cache_flush (*p);
- free ((*p)->record_cache);
-
- if ((*p)->rw)
- rec_write_head (*p);
-
- if ((*p)->index_fd != -1)
- close ((*p)->index_fd);
-
- if ((*p)->data_fd != -1)
- close ((*p)->data_fd);
-
- free ((*p)->tmp_buf);
-
- free (*p);
- *p = NULL;
-}
-
-Record rec_get (Records p, int sysno)
-{
- int i;
- Record rec, *recp;
- struct record_index_entry entry;
- int r, got;
- char *nptr;
-
- assert (sysno > 0);
- assert (p);
-
- if ((recp = rec_cache_lookup (p, sysno, 0)))
- return rec_cp (*recp);
-
- read_indx (p, sysno, &entry, sizeof(entry));
-
- if (!(rec = malloc (sizeof(*rec))))
- {
- logf (LOG_FATAL|LOG_ERRNO, "malloc");
- exit (1);
- }
- if (lseek (p->data_fd, entry.u.used.offset, SEEK_SET) == -1)
- {
- logf (LOG_FATAL|LOG_ERRNO, "lseek in %s to pos %ld",
- p->data_fname, entry.u.used.offset);
- exit (1);
- }
- if (p->tmp_size < entry.u.used.size)
- {
- free (p->tmp_buf);
- p->tmp_size = entry.u.used.size + 16384;
- if (!(p->tmp_buf = malloc (p->tmp_size)))
- {
- logf (LOG_FATAL|LOG_ERRNO, "malloc");
- exit (1);
+ if (item[sizeof(sysno)] != itemsize)
+ {
+ yaz_log(YLOG_WARN, "unexpected entry size %d != %d",
+ item[sizeof(sysno)], itemsize);
+ return 0;
+ }
+ memcpy(buf, item + sizeof(sysno) + 1, itemsize);
}
}
- for (got = 0; got < entry.u.used.size; got += r)
+ else
{
- r = read (p->data_fd, p->tmp_buf + got, entry.u.used.size - got);
- if (r <= 0)
+ zint pos = (sysno-1)*itemsize;
+ int off = CAST_ZINT_TO_INT(pos%RIDX_CHUNK);
+ int sz1 = RIDX_CHUNK - off; /* sz1 is size of buffer to read.. */
+
+ if (sz1 > itemsize)
+ sz1 = itemsize; /* no more than itemsize bytes */
+
+ r = bf_read(p->index_BFile, 1+pos/RIDX_CHUNK, off, sz1, buf);
+ if (r == 1 && sz1 < itemsize) /* boundary? - must read second part */
+ r = bf_read(p->index_BFile, 2+pos/RIDX_CHUNK, 0, itemsize - sz1,
+ (char*) buf + sz1);
+ if (r != 1 && !ignoreError)
{
- logf (LOG_FATAL|LOG_ERRNO, "read of %s", p->data_fname);
- exit (1);
+ yaz_log(YLOG_FATAL|YLOG_ERRNO, "read in %s at pos %ld",
+ p->index_fname, (long) pos);
}
}
- rec->sysno = sysno;
-
- nptr = p->tmp_buf;
- for (i = 0; i < REC_NO_INFO; i++)
+#if 0
{
- memcpy (&rec->size[i], nptr, sizeof(*rec->size));
- nptr += sizeof(*rec->size);
- if (rec->size[i])
- {
- rec->info[i] = malloc (rec->size[i]);
- memcpy (rec->info[i], nptr, rec->size[i]);
- nptr += rec->size[i];
- }
- else
- rec->info[i] = NULL;
+ struct record_index_entry *ep = buf;
+ yaz_log(YLOG_LOG, "read r=%d sysno=" ZINT_FORMAT " next=" ZINT_FORMAT
+ " sz=%d", r, sysno, ep->next, ep->size);
}
- rec_cache_insert (p, rec, 0);
- return rec;
+#endif
+ return r;
}
-Record rec_new (Records p)
+struct code_read_data {
+ int no;
+ zint sysno;
+ void *buf;
+ int itemsize;
+ int insert_flag;
+};
+
+int bt_code_read(void *vp, char **dst, int *insertMode)
{
- int sysno, i;
- Record rec;
+ struct code_read_data *s = (struct code_read_data *) vp;
- assert (p);
- if (!(rec = malloc (sizeof(*rec))))
- {
- logf (LOG_FATAL|LOG_ERRNO, "malloc");
- exit (1);
- }
- if (p->head.index_free == 0)
- sysno = (p->head.index_last)++;
- else
- {
- struct record_index_entry entry;
+ if (s->no == 0)
+ return 0;
- read_indx (p, p->head.index_free, &entry, sizeof(entry));
- sysno = p->head.index_free;
- p->head.index_free = entry.u.free.next;
- }
- (p->head.no_records)++;
- rec->sysno = sysno;
- for (i = 0; i < REC_NO_INFO; i++)
- {
- rec->info[i] = NULL;
- rec->size[i] = 0;
- }
- rec_cache_insert (p, rec, 1);
- return rec;
+ (s->no)--;
+
+ memcpy(*dst, &s->sysno, sizeof(zint));
+ *dst += sizeof(zint);
+ **dst = s->itemsize;
+ (*dst)++;
+ memcpy(*dst, s->buf, s->itemsize);
+ *dst += s->itemsize;
+ *insertMode = s->insert_flag;
+ return 1;
}
-void rec_put (Records p, Record *recpp)
+void recindex_write_indx(recindex_t p, zint sysno, void *buf, int itemsize)
{
- Record *recp;
-
- if ((recp = rec_cache_lookup (p, (*recpp)->sysno, 1)))
+#if 0
+ yaz_log(YLOG_LOG, "write_indx sysno=" ZINT_FORMAT, sysno);
+#endif
+ if (p->isamb)
{
- rec_rm (recp);
- *recp = *recpp;
+ struct code_read_data input;
+ ISAMC_I isamc_i;
+
+ input.sysno = sysno;
+ input.buf = buf;
+ input.itemsize = itemsize;
+
+ isamc_i.clientData = &input;
+ isamc_i.read_item = bt_code_read;
+
+ input.no = 1;
+ input.insert_flag = 2;
+ isamb_merge(p->isamb, &p->isam_p, &isamc_i);
}
else
{
- rec_cache_insert (p, *recpp, 1);
- rec_rm (recpp);
- }
- *recpp = NULL;
-}
+ zint pos = (sysno-1)*itemsize;
+ int off = CAST_ZINT_TO_INT(pos%RIDX_CHUNK);
+ int sz1 = RIDX_CHUNK - off; /* sz1 is size of buffer to read.. */
-void rec_rm (Record *recpp)
-{
- int i;
- for (i = 0; i < REC_NO_INFO; i++)
- free ((*recpp)->info[i]);
- free (*recpp);
- *recpp = NULL;
-}
-
-Record rec_cp (Record rec)
-{
- Record n;
- int i;
+ if (sz1 > itemsize)
+ sz1 = itemsize; /* no more than itemsize bytes */
- if (!(n = malloc (sizeof(*n))))
- {
- logf (LOG_FATAL|LOG_ERRNO, "malloc");
- exit (1);
+ bf_write(p->index_BFile, 1+pos/RIDX_CHUNK, off, sz1, buf);
+ if (sz1 < itemsize) /* boundary? must write second part */
+ bf_write(p->index_BFile, 2+pos/RIDX_CHUNK, 0, itemsize - sz1,
+ (char*) buf + sz1);
}
- n->sysno = rec->sysno;
- for (i = 0; i < REC_NO_INFO; i++)
- if (!rec->info[i])
- {
- n->info[i] = NULL;
- n->size[i] = 0;
- }
- else
- {
- n->size[i] = rec->size[i];
- if (!(n->info[i] = malloc (rec->size[i])))
- {
- logf (LOG_FATAL|LOG_ERRNO, "malloc. rec_cp");
- exit (1);
- }
- memcpy (n->info[i], rec->info[i], rec->size[i]);
- }
- return n;
}
-void rec_del (Records p, Record *recpp)
-{
- assert (0);
-}
-
-
-#endif
-
-char *rec_strdup (const char *s, size_t *len)
-{
- char *p;
- if (!s)
- {
- *len = 0;
- return NULL;
- }
- *len = strlen(s)+1;
- p = malloc (*len);
- if (!p)
- {
- logf (LOG_FATAL|LOG_ERRNO, "malloc");
- exit (1);
- }
- strcpy (p, s);
- return p;
-}
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
projects / idzebra-moved-to-github.git / blobdiff