X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Finvstat.c;h=4781c50120a8e683e9518f4e4c90eeecdfa325e2;hb=10e178572346e8c5c3caaa43b803dd10c005cb5f;hp=afd0147830db19877c1abef9361d746c5cce6536;hpb=801ef4b322574c793abdc1ba81dea2da62ca60bc;p=idzebra-moved-to-github.git

diff --git a/index/invstat.c b/index/invstat.c
index afd0147..4781c50 100644
--- a/index/invstat.c
+++ b/index/invstat.c
@@ -1,10 +1,22 @@
 /*
- * Copyright (C) 1994-1998, Index Data I/S 
+ * Copyright (C) 1994-1999, Index Data
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: invstat.c,v $
- * Revision 1.7  1998-03-13 15:30:50  adam
+ * Revision 1.11  1999-05-15 14:36:38  adam
+ * Updated dictionary. Implemented "compression" of dictionary.
+ *
+ * Revision 1.10  1999/05/12 13:08:06  adam
+ * First version of ISAMS.
+ *
+ * Revision 1.9  1999/02/12 13:29:23  adam
+ * Implemented position-flag for registers.
+ *
+ * Revision 1.8  1999/02/02 14:50:53  adam
+ * Updated WIN32 code specific sections. Changed header.
+ *
+ * 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.
  *
@@ -42,6 +54,7 @@
 struct inv_stat_info {
     ISAM isam;
     ISAMC isamc;
+    ISAMS isams;
     int no_isam_entries[8];
     int no_dict_entries;
     int no_dict_bytes;
@@ -64,6 +77,7 @@ static int inv_stat_handle (char *name, const char *info, int pos,
     assert (*info == sizeof(ISAM_P));
     memcpy (&isam_p, info+1, sizeof(ISAM_P));
 
+    printf ("---\n");
     if (stat_info->isam)
     {
         ISPT ispt;
@@ -76,16 +90,36 @@ static int inv_stat_handle (char *name, const char *info, int pos,
     {
         ISAMC_PP pp;
         int occurx = 0;
-        char buf[128];
+	struct it_key key;
 
         pp = isc_pp_open (stat_info->isamc, isam_p);
         occur = isc_pp_num (pp);
-        while (isc_pp_read(pp, buf))
+        while (isc_pp_read(pp, &key))
+	{
+	    printf ("sysno=%d seqno=%d\n", key.sysno, key.seqno);
             occurx++;
+	}
         assert (occurx == occur);
 	stat_info->no_isam_entries[isc_type(isam_p)] += occur;
         isc_pp_close (pp);
     }
+    if (stat_info->isams)
+    {
+        ISAMS_PP pp;
+        int occurx = 0;
+	struct it_key key;
+
+        pp = isams_pp_open (stat_info->isams, isam_p);
+        occur = isams_pp_num (pp);
+        while (isams_pp_read(pp, &key))
+	{
+	    printf ("sysno=%d seqno=%d\n", key.sysno, key.seqno);
+            occurx++;
+	}
+        assert (occurx == occur);
+	stat_info->no_isam_entries[isc_type(isam_p)] += occur;
+        isams_pp_close (pp);
+    }
 
     while (occur > stat_info->isam_bounds[i] && stat_info->isam_bounds[i])
         i++;
@@ -98,6 +132,7 @@ void inv_prstat (BFiles bfs)
     Dict dict;
     ISAM isam = NULL;
     ISAMC isamc = NULL;
+    ISAMS isams = NULL;
     Records records;
     int i, prev;
     int before = 0;
@@ -108,28 +143,37 @@ void inv_prstat (BFiles bfs)
     term_dict[0] = 1;
     term_dict[1] = 0;
 
-    dict = dict_open (bfs, FNAME_DICT, 100, 0);
+    dict = dict_open (bfs, FNAME_DICT, 100, 0, 0);
     if (!dict)
     {
         logf (LOG_FATAL, "dict_open fail");
         exit (1);
     }
-    if (!res_get_match (common_resource, "isam", "i", NULL))
+    if (res_get_match (common_resource, "isam", "i", NULL))
     {
-        isamc = isc_open (bfs, FNAME_ISAMC, 0, key_isamc_m (common_resource));
-        if (!isamc)
+        isam = is_open (bfs, FNAME_ISAM, key_compare, 0,
+			sizeof(struct it_key), common_resource);
+        if (!isam)
         {
-            logf (LOG_FATAL, "isc_open fail");
+            logf (LOG_FATAL, "is_open fail");
+            exit (1);
+        }
+    }
+    else if (res_get_match (common_resource, "isam", "s", NULL))
+    {
+        isams = isams_open (bfs, FNAME_ISAMS, 0, key_isams_m(common_resource));
+        if (!isams)
+        {
+            logf (LOG_FATAL, "isams_open fail");
             exit (1);
         }
     }
     else
     {
-        isam = is_open (bfs, FNAME_ISAM, key_compare, 0,
-			sizeof(struct it_key), common_resource);
-        if (!isam)
+        isamc = isc_open (bfs, FNAME_ISAMC, 0, key_isamc_m (common_resource));
+        if (!isamc)
         {
-            logf (LOG_FATAL, "is_open fail");
+            logf (LOG_FATAL, "isc_open fail");
             exit (1);
         }
     }
@@ -141,6 +185,7 @@ void inv_prstat (BFiles bfs)
     stat_info.no_dict_bytes = 0;
     stat_info.isam = isam;
     stat_info.isamc = isamc;
+    stat_info.isams = isams;
     stat_info.isam_bounds[0] = 1;
     stat_info.isam_bounds[1] = 2;
     stat_info.isam_bounds[2] = 3;
@@ -206,5 +251,7 @@ void inv_prstat (BFiles bfs)
         is_close (isam);
     if (isamc)
         isc_close (isamc);
+    if (isams)
+        isams_close (isams);
     
 }