X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Frecindex.c;h=9b6af8823f15a62cfc3cf45665c96ea15922bb95;hb=4b4d00c51b49de97fca1d5e2ae10d943c116c916;hp=3280dfc10f65e9eef9ce8b6e7d8781fe77488116;hpb=0f78f3fe78e859d9f0d3f0d3e13fcd28085dd427;p=idzebra-moved-to-github.git

diff --git a/index/recindex.c b/index/recindex.c
index 3280dfc..9b6af88 100644
--- a/index/recindex.c
+++ b/index/recindex.c
@@ -1,5 +1,5 @@
-/* $Id: recindex.c,v 1.53 2006-11-14 08:12:08 adam Exp $
-   Copyright (C) 1995-2006
+/* $Id: recindex.c,v 1.56 2007-01-15 15:10:17 adam Exp $
+   Copyright (C) 1995-2007
    Index Data ApS
 
 This file is part of the Zebra server.
@@ -61,13 +61,13 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define USUAL_RANGE 2000000000LL
 #endif
 
-static SYSNO rec_sysno_to_ext(SYSNO sysno)
+static zint rec_sysno_to_ext(zint sysno)
 {
     assert(sysno >= 0 && sysno <= USUAL_RANGE);
     return sysno + FAKE_OFFSET;
 }
 
-SYSNO rec_sysno_to_int(SYSNO sysno)
+zint rec_sysno_to_int(zint sysno)
 {
     assert(sysno >= FAKE_OFFSET && sysno <= FAKE_OFFSET + USUAL_RANGE);
     return sysno - FAKE_OFFSET;
@@ -101,7 +101,7 @@ static void rec_tmp_expand(Records p, int size)
     }
 }
 
-static int read_indx(Records p, SYSNO sysno, void *buf, int itemsize, 
+static int read_indx(Records p, zint sysno, void *buf, int itemsize, 
                       int ignoreError)
 {
     int r;
@@ -124,7 +124,7 @@ static int read_indx(Records p, SYSNO sysno, void *buf, int itemsize,
     return r;
 }
 
-static void write_indx(Records p, SYSNO sysno, void *buf, int itemsize)
+static void write_indx(Records p, zint sysno, void *buf, int itemsize)
 {
     zint pos = (sysno-1)*itemsize;
     int off = CAST_ZINT_TO_INT(pos%RIDX_CHUNK);
@@ -139,7 +139,7 @@ static void write_indx(Records p, SYSNO sysno, void *buf, int itemsize)
 		(char*) buf + sz1);
 }
 
-static ZEBRA_RES rec_release_blocks(Records p, SYSNO sysno)
+static ZEBRA_RES rec_release_blocks(Records p, zint sysno)
 {
     struct record_index_entry entry;
     zint freeblock;
@@ -202,6 +202,8 @@ static ZEBRA_RES rec_delete_single(Records p, Record rec)
 {
     struct record_index_entry entry;
 
+    /* all data in entry must be reset, since it's written verbatim */
+    memset(&entry, '\0', sizeof(entry));
     if (rec_release_blocks(p, rec_sysno_to_int(rec->sysno)) != ZEBRA_OK)
 	return ZEBRA_FAIL;
 
@@ -212,7 +214,7 @@ static ZEBRA_RES rec_delete_single(Records p, Record rec)
     return ZEBRA_OK;
 }
 
-static ZEBRA_RES rec_write_tmp_buf(Records p, int size, SYSNO *sysnos)
+static ZEBRA_RES rec_write_tmp_buf(Records p, int size, zint *sysnos)
 {
     struct record_index_entry entry;
     int no_written = 0;
@@ -221,6 +223,9 @@ static ZEBRA_RES rec_write_tmp_buf(Records p, int size, SYSNO *sysnos)
     int dst_type = 0;
     int i;
 
+    /* all data in entry must be reset, since it's written verbatim */
+    memset(&entry, '\0', sizeof(entry));
+
     for (i = 1; i<REC_BLOCK_TYPES; i++)
         if (size >= p->head.block_move[i])
             dst_type = i;
@@ -279,6 +284,7 @@ Records rec_open(BFiles bfs, int rw, int compression_method)
     ZEBRA_RES ret = ZEBRA_OK;
 
     p = (Records) xmalloc(sizeof(*p));
+    memset(&p->head, '\0', sizeof(p->head));
     p->compression_method = compression_method;
     p->rw = rw;
     p->tmp_size = 1024;
@@ -484,8 +490,8 @@ static ZEBRA_RES rec_write_multiple(Records p, int saveCount)
     int out_size = 1000;
     int out_offset = 0;
     char *out_buf = (char *) xmalloc(out_size);
-    SYSNO *sysnos = (SYSNO *) xmalloc(sizeof(*sysnos) * (p->cache_cur + 1));
-    SYSNO *sysnop = sysnos;
+    zint *sysnos = (zint *) xmalloc(sizeof(*sysnos) * (p->cache_cur + 1));
+    zint *sysnop = sysnos;
     ZEBRA_RES ret = ZEBRA_OK;
 
     for (i = 0; i<p->cache_cur - saveCount; i++)
@@ -602,7 +608,7 @@ static ZEBRA_RES rec_cache_flush(Records p, int saveCount)
     return ret;
 }
 
-static Record *rec_cache_lookup(Records p, SYSNO sysno,
+static Record *rec_cache_lookup(Records p, zint sysno,
 				enum recordCacheFlag flag)
 {
     int i;
@@ -683,7 +689,7 @@ ZEBRA_RES rec_close(Records *pp)
     return ret;
 }
 
-static Record rec_get_int(Records p, SYSNO sysno)
+static Record rec_get_int(Records p, zint sysno)
 {
     int i, in_size, r;
     Record rec, *recp;
@@ -828,7 +834,7 @@ static Record rec_get_int(Records p, SYSNO sysno)
     return rec;
 }
 
-Record rec_get(Records p, SYSNO sysno)
+Record rec_get(Records p, zint sysno)
 {
     Record rec;
     zebra_mutex_lock(&p->mutex);
@@ -846,7 +852,7 @@ Record rec_get_root(Records p)
 static Record rec_new_int(Records p)
 {
     int i;
-    SYSNO sysno;
+    zint sysno;
     Record rec;
 
     assert(p);