X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Frecindex.c;h=9b6af8823f15a62cfc3cf45665c96ea15922bb95;hb=a8d9ca813f29e7d1dd0e04ee5dafca2d25f38202;hp=a888c85143e62486dd41321d9d3568f5e9275871;hpb=cdcde0c689ec4b66f1884dbd455284b7a35fb425;p=idzebra-moved-to-github.git diff --git a/index/recindex.c b/index/recindex.c index a888c85..9b6af88 100644 --- a/index/recindex.c +++ b/index/recindex.c @@ -1,5 +1,5 @@ -/* $Id: recindex.c,v 1.49 2006-05-10 12:30:02 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. @@ -15,9 +15,9 @@ 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 Zebra; see the file LICENSE.zebra. If not, write to the -Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA -02111-1307, USA. +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ #define RIDX_CHUNK 128 @@ -61,13 +61,13 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #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,12 +101,12 @@ 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; zint pos = (sysno-1)*itemsize; - int off = (int) (pos%RIDX_CHUNK); + int off = CAST_ZINT_TO_INT(pos%RIDX_CHUNK); int sz1 = RIDX_CHUNK - off; /* sz1 is size of buffer to read.. */ if (sz1 > itemsize) @@ -124,10 +124,10 @@ 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 = (int) (pos%RIDX_CHUNK); + int off = CAST_ZINT_TO_INT(pos%RIDX_CHUNK); int sz1 = RIDX_CHUNK - off; /* sz1 is size of buffer to read.. */ if (sz1 > itemsize) @@ -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; @@ -152,7 +152,7 @@ static ZEBRA_RES rec_release_blocks(Records p, SYSNO sysno) freeblock = entry.next; assert(freeblock > 0); - dst_type = (int) (freeblock & 7); + dst_type = CAST_ZINT_TO_INT(freeblock & 7); assert(dst_type < REC_BLOCK_TYPES); freeblock = freeblock / 8; while (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= p->head.block_move[i]) dst_type = i; @@ -259,7 +264,8 @@ static ZEBRA_RES rec_write_tmp_buf(Records p, int size, SYSNO *sysnos) cptr = p->tmp_buf + no_written; } block_prev = block_free; - no_written += (int)(p->head.block_size[dst_type]) - sizeof(zint); + no_written += CAST_ZINT_TO_INT(p->head.block_size[dst_type]) + - sizeof(zint); p->head.block_used[dst_type]++; } assert(block_prev != -1); @@ -278,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; @@ -345,12 +352,13 @@ Records rec_open(BFiles bfs, int rw, int compression_method) } for (i = 0; idata_BFile[i] = bf_open(bfs, p->data_fname[i], - (int) (p->head.block_size[i]), - rw))) + if (!(p->data_BFile[i] = + bf_open(bfs, p->data_fname[i], + CAST_ZINT_TO_INT(p->head.block_size[i]), rw))) { yaz_log(YLOG_FATAL|YLOG_ERRNO, "bf_open %s", p->data_fname[i]); ret = ZEBRA_FAIL; + break; } } p->cache_max = 400; @@ -432,7 +440,7 @@ static void rec_cache_flush_block1(Records p, Record rec, Record last_rec, for (i = 0; isize[i] + 20 > *out_size) + if (*out_offset + CAST_ZINT_TO_INT(rec->size[i]) + 20 > *out_size) { int new_size = *out_offset + rec->size[i] + 65536; char *np = (char *) xmalloc(new_size); @@ -482,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; icache_cur - saveCount; i++) @@ -590,7 +598,7 @@ static ZEBRA_RES rec_cache_flush(Records p, int saveCount) for (i = 0; icache_cur - saveCount; i++) { struct record_cache_entry *e = p->record_cache + i; - rec_rm(&e->rec); + rec_free(&e->rec); } /* i still being used ... */ for (j = 0; jmutex); @@ -844,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); @@ -893,13 +901,13 @@ ZEBRA_RES rec_del(Records p, Record *recpp) (p->head.no_records)--; if ((recp = rec_cache_lookup(p, (*recpp)->sysno, recordFlagDelete))) { - rec_rm(recp); + rec_free(recp); *recp = *recpp; } else { ret = rec_cache_insert(p, *recpp, recordFlagDelete); - rec_rm(recpp); + rec_free(recpp); } zebra_mutex_unlock(&p->mutex); *recpp = NULL; @@ -914,20 +922,20 @@ ZEBRA_RES rec_put(Records p, Record *recpp) zebra_mutex_lock(&p->mutex); if ((recp = rec_cache_lookup(p, (*recpp)->sysno, recordFlagWrite))) { - rec_rm(recp); + rec_free(recp); *recp = *recpp; } else { ret = rec_cache_insert(p, *recpp, recordFlagWrite); - rec_rm(recpp); + rec_free(recpp); } zebra_mutex_unlock(&p->mutex); *recpp = NULL; return ret; } -void rec_rm(Record *recpp) +void rec_free(Record *recpp) { int i;