Added several type casts and changed many types - mostly from int to zint.
[idzebra-moved-to-github.git] / index / invstat.c
index 3709ed0..a29be66 100644 (file)
@@ -1,4 +1,4 @@
-/* $Id: invstat.c,v 1.34 2002-08-05 14:08:08 adam Exp $
+/* $Id: invstat.c,v 1.37 2004-08-06 12:28:22 adam Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
    Index Data Aps
 
@@ -26,11 +26,10 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <string.h>
 
 #include "index.h"
-#include "../isamc/isamd-p.h"
 
 struct inv_stat_info {
     ZebraHandle zh;
-    int no_isam_entries[9];
+    zint no_isam_entries[9];
     int no_dict_entries;
     int no_dict_bytes;
     int isam_bounds[20];
@@ -46,7 +45,7 @@ struct inv_stat_info {
 #define SINGLETON_TYPE 8 /* the type to use for singletons that */ 
                          /* have no block and no block type */
 
-static void print_dict_item (ZebraMaps zm, const char *s, int count,
+static void print_dict_item (ZebraMaps zm, const char *s, zint count,
             int firstsys, int firstseq, int lastsys, int lastseq )
 {
     int reg_type = s[1];
@@ -72,7 +71,7 @@ static void print_dict_item (ZebraMaps zm, const char *s, int count,
 static int inv_stat_handle (char *name, const char *info, int pos,
                             void *client)
 {
-    int occur = 0;
+    zint occur = 0;
     int i = 0;
     struct inv_stat_info *stat_info = (struct inv_stat_info*) client;
     ISAMS_P isam_p;
@@ -84,11 +83,8 @@ static int inv_stat_handle (char *name, const char *info, int pos,
     stat_info->no_dict_entries++;
     stat_info->no_dict_bytes += strlen(name);
 
-    if (!stat_info->zh->reg->isamd)
-    {
-        assert (*info == sizeof(ISAMS_P));
-        memcpy (&isam_p, info+1, sizeof(ISAMS_P));
-    }
+    assert (*info == sizeof(ISAMS_P));
+    memcpy (&isam_p, info+1, sizeof(ISAMS_P));
 
     if (stat_info->zh->reg->isams)
     {
@@ -100,9 +96,11 @@ static int inv_stat_handle (char *name, const char *info, int pos,
         occur = isams_pp_num (pp);
         while (isams_pp_read(pp, &key))
        {
+            occurx++;
+#if IT_KEY_NEW
+#else
             stat_info->cksum = stat_info->cksum * 65509 + 
                 key.sysno + 11 * key.seqno;
-            occurx++;
             if (-1==firstsys)
             {
                 firstseq=key.seqno;
@@ -110,6 +108,7 @@ static int inv_stat_handle (char *name, const char *info, int pos,
             }
             lastsys=key.sysno;
             lastseq=key.seqno;
+#endif
        }
         assert (occurx == occur);
        stat_info->no_isam_entries[0] += occur;
@@ -119,7 +118,7 @@ static int inv_stat_handle (char *name, const char *info, int pos,
     {
         ISPT ispt;
 
-        ispt = is_position (stat_info->zh->reg->isam, isam_p);
+        ispt = is_position (stat_info->zh->reg->isam, (int) isam_p);
         occur = is_numkeys (ispt);
        stat_info->no_isam_entries[is_type(isam_p)] += occur;
         is_pt_free (ispt);
@@ -127,16 +126,18 @@ static int inv_stat_handle (char *name, const char *info, int pos,
     if (stat_info->zh->reg->isamc)
     {
         ISAMC_PP pp;
-        int occurx = 0;
+        zint occurx = 0;
        struct it_key key;
 
         pp = isc_pp_open (stat_info->zh->reg->isamc, isam_p);
         occur = isc_pp_num (pp);
         while (isc_pp_read(pp, &key))
        {
+            occurx++;
+#if IT_KEY_NEW
+#else
             stat_info->cksum = stat_info->cksum * 65509 + 
                 key.sysno + 11 * key.seqno;
-            occurx++;
             if (-1==firstsys)
             {
                 firstseq=key.seqno;
@@ -144,61 +145,17 @@ static int inv_stat_handle (char *name, const char *info, int pos,
             }
             lastsys=key.sysno;
             lastseq=key.seqno;
+#endif
        }
         assert (occurx == occur);
        stat_info->no_isam_entries[isc_type(isam_p)] += occur;
         isc_pp_close (pp);
     }
-    if (stat_info->zh->reg->isamd)
-    {
-        ISAMD_PP pp;
-        int occurx = 0;
-       struct it_key key;
-        /* printf("[%d: %d %d %d %d %d %d] ", */
-        /*    info[0], info[1], info[2], info[3], info[4], info[5], info[7]);*/
-        pp = isamd_pp_open (stat_info->zh->reg->isamd, info+1, info[0]);
-        
-        occur = isamd_pp_num (pp);
-        while (isamd_pp_read(pp, &key))
-       {
-            stat_info->cksum = stat_info->cksum * 65509 + 
-                key.sysno + 11 * key.seqno;
-            occurx++;
-            /* printf("%d.%d ", key.sysno, key.seqno); */ /*!*/
-            if (-1==firstsys)
-            {
-                firstseq=key.seqno;
-                firstsys=key.sysno;
-            }
-            lastsys=key.sysno;
-            lastseq=key.seqno;
-            if ( pp->is->method->debug >8 )
-              logf (LOG_LOG,"sysno=%d seqno=%d (%x/%x) oc=%d/%d ofs=%d ",
-                  key.sysno, key.seqno,
-                  key.sysno, key.seqno,
-                  occur,occurx, pp->offset);
-       }
-        /* printf("\n"); */ /*!*/
-#ifdef SKIPTHIS
-        if ( pp->is->method->debug >7 )
-          logf(LOG_LOG,"item %d=%d:%d says %d keys, counted %d",
-             isam_p, isamd_type(isam_p), isamd_block(isam_p),
-             occur, occurx); 
-#endif
-        if (occurx != occur) 
-          logf(LOG_LOG,"Count error!!! read %d, counted %d", occur, occurx);
-        assert (occurx == occur);
-        i = pp->cat;
-        if (info[1])
-            i=SINGLETON_TYPE;
-       stat_info->no_isam_entries[i] += occur;
-        isamd_pp_close (pp);
-    }
     if (stat_info->zh->reg->isamb)
     {
         ISAMB_PP pp;
         struct it_key key;
-        int cat = isam_p & 3;
+        int cat = (int) (isam_p & 3);
         int level;
         int size;
         int blocks;
@@ -207,9 +164,11 @@ static int inv_stat_handle (char *name, const char *info, int pos,
 
         while (isamb_pp_read(pp, &key))
         {
+            occur++;
+#if IT_KEY_NEW
+#else
             stat_info->cksum = stat_info->cksum * 65509 + 
                 key.sysno + 11 * key.seqno;
-            occur++;
             if (-1==firstsys)
             {
                 firstseq=key.seqno;
@@ -217,6 +176,7 @@ static int inv_stat_handle (char *name, const char *info, int pos,
             }
             lastsys=key.sysno;
             lastseq=key.seqno;
+#endif
         }
         isamb_pp_close_x (pp, &size, &blocks);
         stat_info->isamb_blocks[cat] += blocks;
@@ -236,20 +196,17 @@ static int inv_stat_handle (char *name, const char *info, int pos,
     return 0;
 }
 
-void zebra_register_statistics (ZebraHandle zh, int dumpdict)
+int zebra_register_statistics (ZebraHandle zh, int dumpdict)
 {
-    int blocks;
-    int size;
-    int count;
     int i, prev;
     int before = 0;
-    int occur;
+    zint occur;
     int after = 1000000000;
     struct inv_stat_info stat_info;
     char term_dict[2*IT_MAX_WORD+2];
 
     if (zebra_begin_read (zh))
-       return;
+       return 1;
 
     stat_info.zh = zh;
     stat_info.dumpwords=dumpdict;
@@ -303,7 +260,7 @@ void zebra_register_statistics (ZebraHandle zh, int dumpdict)
        fprintf (stdout, "   Blocks    Occur  Size KB   Bytes/Entry\n");
        for (i = 0; isc_block_used (zh->reg->isamc, i) >= 0; i++)
        {
-           fprintf (stdout, " %8d %8d", isc_block_used (zh->reg->isamc, i),
+           fprintf (stdout, " %8" ZINT_FORMAT0 " %8d", isc_block_used (zh->reg->isamc, i),
                     stat_info.no_isam_entries[i]);
 
            if (stat_info.no_isam_entries[i])
@@ -317,39 +274,6 @@ void zebra_register_statistics (ZebraHandle zh, int dumpdict)
            fprintf (stdout, "\n");
        }
     }
-    if (zh->reg->isamd)
-    {
-       fprintf (stdout, "   Blocks   Occur      KB Bytes/Entry\n");
-       if (zh->reg->isamd->method->debug >0) 
-            logf(LOG_LOG,"   Blocks   Occur      KB Bytes/Entry");
-       for (i = 0; i<=SINGLETON_TYPE; i++)
-       {
-           blocks= isamd_block_used(zh->reg->isamd,i);
-           size= isamd_block_size(zh->reg->isamd,i);
-           count=stat_info.no_isam_entries[i];
-           if (i==SINGLETON_TYPE) 
-               blocks=size=0;
-           if (stat_info.no_isam_entries[i]) 
-           {
-               fprintf (stdout, "%c %7d %7d %7d %5.2f\n",
-                        (i==SINGLETON_TYPE)?('z'):('A'+i),
-                        blocks,
-                        count,
-                        (int) ((1023.0 + (double) blocks * size)/1024),
-                        ((double) blocks * size)/count);
-               if (zh->reg->isamd->method->debug >0) 
-                   logf(LOG_LOG, "%c %7d %7d %7d %5.2f",
-                        (i==SINGLETON_TYPE)?('z'):('A'+i),
-                        blocks,
-                        count,
-                        (int) ((1023.0 + (double) blocks * size)/1024),
-                        ((double) blocks * size)/count);
-           } /* entries */
-       } /* for */
-    } /* isamd */
-    if ( (zh->reg->isamd) && (zh->reg->isamd->method->debug>0))
-        fprintf (stdout, "\n%d words using %d bytes\n",
-             stat_info.no_dict_entries, stat_info.no_dict_bytes);
 
     if (zh->reg->isamb)
     {
@@ -393,5 +317,6 @@ void zebra_register_statistics (ZebraHandle zh, int dumpdict)
              prev, stat_info.isam_occurrences[i]);
     xmalloc_trav("unfreed"); /*! while hunting memory leaks */    
     zebra_end_read (zh);
+    return 0;
 }