X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Finvstat.c;h=afd0147830db19877c1abef9361d746c5cce6536;hb=beda7a0a471cf2c19abb42dd9d1dad0d2aa28069;hp=8929c44e0e644a98b3dd3f46b3fdcf7c1cefd571;hpb=0b5d38bc84d5261aaed3bce3be748c5d7008f2ff;p=idzebra-moved-to-github.git

diff --git a/index/invstat.c b/index/invstat.c
index 8929c44..afd0147 100644
--- a/index/invstat.c
+++ b/index/invstat.c
@@ -1,10 +1,21 @@
 /*
- * Copyright (C) 1994-1996, Index Data I/S 
+ * Copyright (C) 1994-1998, Index Data I/S 
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: invstat.c,v $
- * Revision 1.4  1996-11-08 11:10:21  adam
+ * Revision 1.7  1998-03-13 15:30:50  adam
+ * New functions isc_block_used and isc_block_size. Fixed 'leak'
+ * in isc_alloc_block.
+ *
+ * Revision 1.6  1998/03/06 13:54:02  adam
+ * Fixed two nasty bugs in isc_merge.
+ *
+ * Revision 1.5  1997/09/17 12:19:13  adam
+ * Zebra version corresponds to YAZ version 1.4.
+ * Changed Zebra server so that it doesn't depend on global common_resource.
+ *
+ * Revision 1.4  1996/11/08 11:10:21  adam
  * Buffers used during file match got bigger.
  * Compressed ISAM support everywhere.
  * Bug fixes regarding masking characters in queries.
@@ -31,6 +42,7 @@
 struct inv_stat_info {
     ISAM isam;
     ISAMC isamc;
+    int no_isam_entries[8];
     int no_dict_entries;
     int no_dict_bytes;
     int isam_bounds[20];
@@ -41,7 +53,7 @@ struct inv_stat_info {
 static int inv_stat_handle (char *name, const char *info, int pos,
                             void *client)
 {
-    int occur;
+    int occur = 0;
     int i = 0;
     struct inv_stat_info *stat_info = (struct inv_stat_info*) client;
     ISAM_P isam_p;
@@ -68,22 +80,20 @@ static int inv_stat_handle (char *name, const char *info, int pos,
 
         pp = isc_pp_open (stat_info->isamc, isam_p);
         occur = isc_pp_num (pp);
-#if 1
         while (isc_pp_read(pp, buf))
             occurx++;
         assert (occurx == occur);
-#endif
+	stat_info->no_isam_entries[isc_type(isam_p)] += occur;
         isc_pp_close (pp);
     }
 
     while (occur > stat_info->isam_bounds[i] && stat_info->isam_bounds[i])
         i++;
     ++(stat_info->isam_occurrences[i]);
-
     return 0;
 }
 
-void inv_prstat (void)
+void inv_prstat (BFiles bfs)
 {
     Dict dict;
     ISAM isam = NULL;
@@ -98,15 +108,15 @@ void inv_prstat (void)
     term_dict[0] = 1;
     term_dict[1] = 0;
 
-    dict = dict_open (FNAME_DICT, 100, 0);
+    dict = dict_open (bfs, FNAME_DICT, 100, 0);
     if (!dict)
     {
         logf (LOG_FATAL, "dict_open fail");
         exit (1);
     }
-    if (res_get_match (common_resource, "isam", "c", NULL))
+    if (!res_get_match (common_resource, "isam", "i", NULL))
     {
-        isamc = isc_open (FNAME_ISAMC, 0, key_isamc_m ());
+        isamc = isc_open (bfs, FNAME_ISAMC, 0, key_isamc_m (common_resource));
         if (!isamc)
         {
             logf (LOG_FATAL, "isc_open fail");
@@ -115,15 +125,18 @@ void inv_prstat (void)
     }
     else
     {
-        isam = is_open (FNAME_ISAM, key_compare, 0, sizeof(struct it_key));
+        isam = is_open (bfs, FNAME_ISAM, key_compare, 0,
+			sizeof(struct it_key), common_resource);
         if (!isam)
         {
             logf (LOG_FATAL, "is_open fail");
             exit (1);
         }
     }
-    records = rec_open (0);
+    records = rec_open (bfs, 0);
 
+    for (i = 0; i<8; i++)
+	stat_info.no_isam_entries[i] = 0;
     stat_info.no_dict_entries = 0;
     stat_info.no_dict_bytes = 0;
     stat_info.isam = isam;
@@ -131,7 +144,7 @@ void inv_prstat (void)
     stat_info.isam_bounds[0] = 1;
     stat_info.isam_bounds[1] = 2;
     stat_info.isam_bounds[2] = 3;
-    stat_info.isam_bounds[3] = 5;
+    stat_info.isam_bounds[3] = 6;
     stat_info.isam_bounds[4] = 10;
     stat_info.isam_bounds[5] = 20;
     stat_info.isam_bounds[6] = 30;
@@ -153,16 +166,28 @@ void inv_prstat (void)
 
     dict_scan (dict, term_dict, &before, &after, &stat_info, inv_stat_handle);
 
-    rec_close (&records);
-    dict_close (dict);
-    if (isam)
-        is_close (isam);
     if (isamc)
-        isc_close (isamc);
-
-    fprintf (stderr, "%d dictionary entries. %d bytes for strings\n",
+    {
+	fprintf (stderr, "   Blocks    Occur  Size KB   Bytes/Entry\n");
+	for (i = 0; isc_block_used (isamc, i) >= 0; i++)
+	{
+	    fprintf (stderr, " %8d %8d", isc_block_used (isamc, i),
+		     stat_info.no_isam_entries[i]);
+
+	    if (stat_info.no_isam_entries[i])
+		fprintf (stderr, " %8d   %f",
+			 (int) ((1023.0 + (double) isc_block_used(isamc, i) *
+				 isc_block_size(isamc,i))/1024),
+			 ((double) isc_block_used(isamc, i) *
+			  isc_block_size(isamc,i))/
+			 stat_info.no_isam_entries[i]);
+	    fprintf (stderr, "\n");
+	}
+    }
+	
+    fprintf (stderr, "\n%d words using %d bytes\n",
              stat_info.no_dict_entries, stat_info.no_dict_bytes);
-    fprintf (stderr, " size   occurrences\n");
+    fprintf (stderr, "    Occurrences     Words\n");
     prev = 1;
     for (i = 0; stat_info.isam_bounds[i]; i++)
     {
@@ -173,4 +198,13 @@ void inv_prstat (void)
     }
     fprintf (stderr, "%7d-        %7d\n",
              prev, stat_info.isam_occurrences[i]);
+
+    rec_close (&records);
+    dict_close (dict);
+
+    if (isam)
+        is_close (isam);
+    if (isamc)
+        isc_close (isamc);
+    
 }