X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Finvstat.c;h=39cf04ab36eedb3cac5050aeb06ba09aa9a1c96c;hb=01ddc55fd5a59535e229c09440cfdadccadf3555;hp=5c9779dd4395bf6be4b4a83bc6ad25963d89338b;hpb=3726bf6622da6a8b983bb4cbb7d654e84c3216d7;p=idzebra-moved-to-github.git

diff --git a/index/invstat.c b/index/invstat.c
index 5c9779d..39cf04a 100644
--- a/index/invstat.c
+++ b/index/invstat.c
@@ -12,12 +12,14 @@
 #include "index.h"
 #include "recindex.h"
 #include "../isamc/isamh-p.h"
+#include "../isamc/isamd-p.h"
 
 struct inv_stat_info {
     ISAM isam;
     ISAMC isamc;
     ISAMS isams;
     ISAMH isamh;
+    ISAMD isamd;
     int no_isam_entries[8];
     int no_dict_entries;
     int no_dict_bytes;
@@ -59,7 +61,7 @@ static int inv_stat_handle (char *name, const char *info, int pos,
         occur = isc_pp_num (pp);
         while (isc_pp_read(pp, &key))
 	{
-	    printf ("sysno=%d seqno=%d\n", key.sysno, key.seqno);
+	    //printf ("sysno=%d seqno=%d\n", key.sysno, key.seqno);
             occurx++;
 	}
         assert (occurx == occur);
@@ -80,16 +82,45 @@ static int inv_stat_handle (char *name, const char *info, int pos,
         while (isamh_pp_read(pp, &key))
 	{
             occurx++;
-	    logf (LOG_LOG,"sysno=%d seqno=%d (%x/%x) oc=%d/%d ofs=%d ",
+	    //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);
+	}
+        if (occurx != occur) {
+          logf(LOG_LOG,"Count error!!! read %d, counted %d", occur, occurx);
+          //isamh_pp_dump(stat_info->isamh, isam_p);
+          }
+	stat_info->no_isam_entries[isamh_type(isam_p)] += occur;
+        isamh_pp_close (pp);
+    }
+    if (stat_info->isamd)
+    {
+        ISAMD_PP pp;
+        int occurx = 0;
+	struct it_key key;
+
+        pp = isamd_pp_open (stat_info->isamd, isam_p);
+        
+        occur = isamd_pp_num (pp);
+        while (isamd_pp_read(pp, &key))
+	{
+            occurx++;
+            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);
 	}
+        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); 
         if (occurx != occur) 
           logf(LOG_LOG,"Count error!!! read %d, counted %d", occur, occurx);
         assert (occurx == occur);
-	stat_info->no_isam_entries[isamh_type(isam_p)] += occur;
-        isamh_pp_close (pp);
+	stat_info->no_isam_entries[isamd_type(isam_p)] += occur;
+        isamd_pp_close (pp);
     }
     if (stat_info->isams)
     {
@@ -122,6 +153,7 @@ void inv_prstat (BFiles bfs)
     ISAMC isamc = NULL;
     ISAMS isams = NULL;
     ISAMH isamh = NULL;
+    ISAMD isamd = NULL;
     Records records;
     int i, prev;
     int before = 0;
@@ -168,6 +200,17 @@ void inv_prstat (BFiles bfs)
             exit (1);
         }
     }
+    else if (res_get_match (common_resource, "isam", "d", NULL))
+    {
+	struct ISAMD_M_s isamd_m;
+        isamd = isamd_open (bfs, FNAME_ISAMD, 0, 
+                            key_isamd_m(common_resource,&isamd_m));
+        if (!isamd)
+        {
+            logf (LOG_FATAL, "isamd_open fail");
+            exit (1);
+        }
+    }
     else
     {
 	struct ISAMC_M_s isamc_m;
@@ -189,6 +232,7 @@ void inv_prstat (BFiles bfs)
     stat_info.isamc = isamc;
     stat_info.isams = isams;
     stat_info.isamh = isamh;
+    stat_info.isamd = isamd;
     stat_info.isam_bounds[0] = 1;
     stat_info.isam_bounds[1] = 2;
     stat_info.isam_bounds[2] = 3;
@@ -258,14 +302,26 @@ void inv_prstat (BFiles bfs)
         isams_close (isams);
     if (isamh)
         isamh_close (isamh);
-    
+    if (isamd)
+        isamd_close (isamd);
+
+    xmalloc_trav("unfreed"); /*! while hunting memory leaks */    
 }
 
 
 /*
  *
  * $Log: invstat.c,v $
- * Revision 1.14  1999-07-14 10:59:26  adam
+ * Revision 1.17  1999-08-20 08:28:37  heikki
+ * Log levels
+ *
+ * Revision 1.16  1999/08/18 08:38:22  heikki
+ * Memory leak hunting
+ *
+ * Revision 1.15  1999/08/18 08:34:53  heikki
+ * isamd
+ *
+ * Revision 1.14  1999/07/14 10:59:26  adam
  * Changed functions isc_getmethod, isams_getmethod.
  * Improved fatal error handling (such as missing EXPLAIN schema).
  *