X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Finvstat.c;h=7f7cca3963c3eebd2fa3ead479be3ee50a304061;hb=92bb4bdb37873f21cabe7b045e1a593ab648ae55;hp=fdab6ba7812b1345debbd8d8d15f314132286b2f;hpb=f7afb145661ac2f567c60f203bf0dbe32309402f;p=idzebra-moved-to-github.git diff --git a/index/invstat.c b/index/invstat.c index fdab6ba..7f7cca3 100644 --- a/index/invstat.c +++ b/index/invstat.c @@ -12,13 +12,15 @@ #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; - int no_isam_entries[8]; + ISAMD isamd; + int no_isam_entries[9]; int no_dict_entries; int no_dict_bytes; int isam_bounds[20]; @@ -26,6 +28,9 @@ struct inv_stat_info { char tmp[128]; }; +#define SINGLETON_TYPE 8 /* the type to use for singletons that */ + /* have no block and no block type */ + static int inv_stat_handle (char *name, const char *info, int pos, void *client) { @@ -59,7 +64,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); @@ -75,21 +80,51 @@ static int inv_stat_handle (char *name, const char *info, int pos, pp = isamh_pp_open (stat_info->isamh, isam_p); occur = isamh_pp_num (pp); - // printf (" opening item %d=%d:%d \n", - // isam_p, isamh_type(isam_p),isamh_block(isam_p)); 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); + if ( is_singleton(isam_p) ) + stat_info->no_isam_entries[SINGLETON_TYPE] += occur; + else + stat_info->no_isam_entries[isamd_type(isam_p)] += occur; + isamd_pp_close (pp); } if (stat_info->isams) { @@ -122,13 +157,17 @@ 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; int after = 1000000000; struct inv_stat_info stat_info; char term_dict[2*IT_MAX_WORD+2]; - + int blocks; + int size; + int count; + term_dict[0] = 1; term_dict[1] = 0; @@ -150,7 +189,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 +207,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"); @@ -177,7 +231,7 @@ void inv_prstat (BFiles bfs) } records = rec_open (bfs, 0, 0); - for (i = 0; i<8; i++) + for (i = 0; i<=SINGLETON_TYPE; i++) stat_info.no_isam_entries[i] = 0; stat_info.no_dict_entries = 0; stat_info.no_dict_bytes = 0; @@ -185,6 +239,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; @@ -228,21 +283,67 @@ void inv_prstat (BFiles bfs) fprintf (stderr, "\n"); } } - + if (isamd) + { + fprintf (stderr, " Blocks Occur KB Bytes/Entry\n"); + if (isamd->method->debug >0) + logf(LOG_LOG," Blocks Occur KB Bytes/Entry"); + for (i = 0; i<=SINGLETON_TYPE; i++) + { + blocks= isamd_block_used(isamd,i); + size= isamd_block_size(isamd,i); + count=stat_info.no_isam_entries[i]; + if (i==SINGLETON_TYPE) + blocks=size=0; + if (stat_info.no_isam_entries[i]) + { + fprintf (stderr, "%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 (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 ( (isamd) && (isamd->method->debug>0)) fprintf (stderr, "\n%d words using %d bytes\n", stat_info.no_dict_entries, stat_info.no_dict_bytes); fprintf (stderr, " Occurrences Words\n"); + if ( (isamd) && (isamd->method->debug>0) ) + { + logf(LOG_LOG, "%d words using %d bytes", + stat_info.no_dict_entries, stat_info.no_dict_bytes); + logf(LOG_LOG, " Occurrences Words"); + } prev = 1; for (i = 0; stat_info.isam_bounds[i]; i++) { int here = stat_info.isam_bounds[i]; fprintf (stderr, "%7d-%-7d %7d\n", prev, here, stat_info.isam_occurrences[i]); + if ( (isamd) && (isamd->method->debug>0) && + stat_info.isam_occurrences[i] ) + { + logf(LOG_LOG,"%7d-%-7d %7d", + prev, here, stat_info.isam_occurrences[i]); + } prev = here+1; } fprintf (stderr, "%7d- %7d\n", prev, stat_info.isam_occurrences[i]); - + if ( (isamd) && (isamd->method->debug>0) && + ( stat_info.isam_occurrences[i] || + stat_info.isam_occurrences[i+1]) ) + logf(LOG_LOG,"%7d- %7d", + prev, stat_info.isam_occurrences[i]); rec_close (&records); dict_close (dict); @@ -254,14 +355,33 @@ 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.18 1999-10-06 11:46:36 heikki + * mproved statistics on isam-d + * + * 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). + * + * 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