X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Frecords.c;h=1414ddd6999da6c9a52330610d3f73988c5ee069;hb=38b8c213f9be6890ddba9d5564dc978c2ae2bc3d;hp=c09339b2bf921fad7ef446a810bb59556424950e;hpb=980ed96922282e7d6e20df51c14a7bb6e97246e8;p=idzebra-moved-to-github.git

diff --git a/index/records.c b/index/records.c
index c09339b..1414ddd 100644
--- a/index/records.c
+++ b/index/records.c
@@ -1,8 +1,5 @@
-/* $Id: records.c,v 1.2 2007-11-23 13:59:14 adam Exp $
-   Copyright (C) 1995-2007
-   Index Data ApS
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+   Copyright (C) 1994-2009 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
@@ -69,6 +66,8 @@ struct records_info {
     int cache_cur;
     int cache_max;
 
+    int compression_chunk_size;
+
     Zebra_mutex mutex;
 
     struct records_head {
@@ -172,6 +171,7 @@ static ZEBRA_RES rec_release_blocks(Records p, zint sysno)
 	    memcpy(block_and_ref + sizeof(freeblock), &ref, sizeof(ref));
 	    if (ref)
 	    {
+                /* there is still a reference to this block.. */
 		if (bf_write(p->data_BFile[dst_type], freeblock, 0,
 			      sizeof(block_and_ref), block_and_ref))
 		{
@@ -180,7 +180,8 @@ static ZEBRA_RES rec_release_blocks(Records p, zint sysno)
 		}
 		return ZEBRA_OK;
 	    }
-	    first = 0;
+            /* the list of blocks can all be removed (ref == 0) */
+            first = 0;
 	}
 	
         if (bf_write(p->data_BFile[dst_type], freeblock, 0, sizeof(freeblock),
@@ -288,8 +289,9 @@ Records rec_open(BFiles bfs, int rw, int compression_method)
     p->compression_method = compression_method;
     p->rw = rw;
     p->tmp_size = 1024;
-    p->recindex = recindex_open(bfs, rw);
     p->tmp_buf = (char *) xmalloc(p->tmp_size);
+    p->compression_chunk_size = 0;
+    p->recindex = recindex_open(bfs, rw, 0 /* 1=isamb for recindex */);
     r = recindex_read_head(p->recindex, p->tmp_buf);
     switch (r)
     {
@@ -336,6 +338,7 @@ Records rec_open(BFiles bfs, int rw, int compression_method)
                     recindex_get_fname(p->recindex), version, REC_VERSION);
 	    ret = ZEBRA_FAIL;
 	}
+        p->compression_chunk_size = 90000; /* good for BZIP2 */
         break;
     }
     for (i = 0; i<REC_BLOCK_TYPES; i++)
@@ -521,8 +524,10 @@ static ZEBRA_RES rec_write_multiple(Records p, int saveCount)
 
 	    e->flag = recordFlagNop;
             break;
-	default:
+        case recordFlagNop:
 	    break;
+	default:
+            break;
         }
     }
 
@@ -638,7 +643,7 @@ static ZEBRA_RES rec_cache_insert(Records p, Record rec, enum recordCacheFlag fl
             for (j = 0; j<REC_NO_INFO; j++)
                 used += r->size[j];
         }
-        if (used > 90000)
+        if (used > p->compression_chunk_size)
             ret = rec_cache_flush(p, 1);
     }
     assert(p->cache_cur < p->cache_max);
@@ -981,7 +986,7 @@ char *rec_strdup(const char *s, size_t *len)
     return p;
 }
 
-void rec_prstat(Records records)
+void rec_prstat(Records records, int verbose)
 {
     int i;
     zint total_bytes = 0;
@@ -1001,6 +1006,34 @@ void rec_prstat(Records records)
               records->head.block_used[i] * records->head.block_size[i]);
         total_bytes +=
             records->head.block_used[i] * records->head.block_size[i];
+
+        yaz_log(YLOG_LOG, " Block Last " ZINT_FORMAT, records->head.block_last[i]);
+        if (verbose)
+        {   /* analyse free lists */
+            zint no_free = 0;
+            zint block_free = records->head.block_free[i];
+            WRBUF w = wrbuf_alloc();
+            while (block_free)
+            {
+                zint nblock;
+                no_free++;
+                wrbuf_printf(w, " " ZINT_FORMAT, block_free);
+                if (bf_read(records->data_BFile[i],
+                            block_free, 0, sizeof(nblock), &nblock) != 1)
+                {
+                    yaz_log(YLOG_FATAL|YLOG_ERRNO, "read in %s at free block "
+                            ZINT_FORMAT,
+                            records->data_fname[i], block_free);
+                    break;
+                }
+                block_free = nblock;
+            }
+            yaz_log (YLOG_LOG,
+                     " Number in free list       %8" ZINT_FORMAT0, no_free);
+            if (no_free)
+                yaz_log(YLOG_LOG, "%s", wrbuf_cstr(w));
+            wrbuf_destroy(w);
+        }
     }
     yaz_log (YLOG_LOG,
           "Total size of record index in bytes  %8" ZINT_FORMAT0,
@@ -1013,6 +1046,7 @@ void rec_prstat(Records records)
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab