X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Finvstat.c;h=16d8187f259a49234d5172989b8c5261e14ab736;hb=93fc01961d210c8ada1d3147763da8f7293dcbfb;hp=fdab6ba7812b1345debbd8d8d15f314132286b2f;hpb=f7afb145661ac2f567c60f203bf0dbe32309402f;p=idzebra-moved-to-github.git

diff --git a/index/invstat.c b/index/invstat.c
index fdab6ba..16d8187 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;
@@ -91,6 +93,31 @@ static int inv_stat_handle (char *name, const char *info, int pos,
 	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);
+	  //  printf ("  opening item %d=%d:%d \n",
+  	  //    isam_p, isamh_type(isam_p),isamh_block(isam_p));
+        while (isamd_pp_read(pp, &key))
+	{
+            occurx++;
+	    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);
+        assert (occurx == occur);
+	stat_info->no_isam_entries[isamd_type(isam_p)] += occur;
+        isamd_pp_close (pp);
+    }
     if (stat_info->isams)
     {
         ISAMS_PP pp;
@@ -122,6 +149,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;
@@ -150,7 +178,9 @@ void inv_prstat (BFiles bfs)
     }
     else if (res_get_match (common_resource, "isam", "s", NULL))
     {
-        isams = isams_open (bfs, FNAME_ISAMS, 0, key_isams_m(common_resource));
+	struct ISAMS_M_s isams_m;
+        isams = isams_open (bfs, FNAME_ISAMS, 0,
+			    key_isams_m(common_resource, &isams_m));
         if (!isams)
         {
             logf (LOG_FATAL, "isams_open fail");
@@ -166,9 +196,22 @@ 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
     {
-        isamc = isc_open (bfs, FNAME_ISAMC, 0, key_isamc_m (common_resource));
+	struct ISAMC_M_s isamc_m;
+        isamc = isc_open (bfs, FNAME_ISAMC, 0,
+			  key_isamc_m (common_resource, &isamc_m));
         if (!isamc)
         {
             logf (LOG_FATAL, "isc_open fail");
@@ -185,6 +228,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;
@@ -254,14 +298,27 @@ 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.13  1999-07-08 14:23:27  heikki
+ * 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).
+ *
+ * Revision 1.13  1999/07/08 14:23:27  heikki
  * Fixed a bug in isamh_pp_read and cleaned up a bit
  *
  * Revision 1.12  1999/07/06 12:28:04  adam