X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Finvstat.c;h=7f7cca3963c3eebd2fa3ead479be3ee50a304061;hb=92bb4bdb37873f21cabe7b045e1a593ab648ae55;hp=afd0147830db19877c1abef9361d746c5cce6536;hpb=801ef4b322574c793abdc1ba81dea2da62ca60bc;p=idzebra-moved-to-github.git diff --git a/index/invstat.c b/index/invstat.c index afd0147..7f7cca3 100644 --- a/index/invstat.c +++ b/index/invstat.c @@ -1,35 +1,8 @@ /* - * 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 - * New functions isc_block_used and isc_block_size. Fixed 'leak' - * in isc_alloc_block. - * - * Revision 1.6 1998/03/06 13:54:02 adam - * Fixed two nasty bugs in isc_merge. - * - * Revision 1.5 1997/09/17 12:19:13 adam - * Zebra version corresponds to YAZ version 1.4. - * Changed Zebra server so that it doesn't depend on global common_resource. - * - * Revision 1.4 1996/11/08 11:10:21 adam - * Buffers used during file match got bigger. - * Compressed ISAM support everywhere. - * Bug fixes regarding masking characters in queries. - * Redesigned Regexp-2 queries. - * - * Revision 1.3 1996/06/04 10:18:58 adam - * Minor changes - removed include of ctype.h. - * - * Revision 1.2 1996/05/22 08:25:56 adam - * Minor change. - * - * Revision 1.1 1996/05/14 14:04:34 adam - * In zebraidx, the 'stat' command is improved. Statistics about ISAM/DICT - * is collected. + * Sebastian Hammer, Adam Dickmeiss, Heikki Levanto + * log at eof * */ #include @@ -38,11 +11,16 @@ #include "index.h" #include "recindex.h" +#include "../isamc/isamh-p.h" +#include "../isamc/isamd-p.h" struct inv_stat_info { ISAM isam; ISAMC isamc; - int no_isam_entries[8]; + ISAMS isams; + ISAMH isamh; + ISAMD isamd; + int no_isam_entries[9]; int no_dict_entries; int no_dict_bytes; int isam_bounds[20]; @@ -50,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) { @@ -64,6 +45,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 +58,91 @@ 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->isamh) + { + ISAMH_PP pp; + int occurx = 0; + struct it_key key; + + pp = isamh_pp_open (stat_info->isamh, isam_p); + + occur = isamh_pp_num (pp); + while (isamh_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); + //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); + 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) + { + 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++; @@ -96,51 +153,93 @@ static int inv_stat_handle (char *name, const char *info, int pos, void inv_prstat (BFiles bfs) { Dict dict; - ISAM isam = NULL; + ISAM isam = NULL; 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; - 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)) + { + 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"); + exit (1); + } + } + else if (res_get_match (common_resource, "isam", "h", NULL)) + { + isamh = isamh_open (bfs, FNAME_ISAMH, 0, key_isamh_m(common_resource)); + if (!isamh) + { + logf (LOG_FATAL, "isamh_open fail"); + 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 { - isam = is_open (bfs, FNAME_ISAM, key_compare, 0, - sizeof(struct it_key), common_resource); - if (!isam) + 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, "is_open fail"); + logf (LOG_FATAL, "isc_open fail"); exit (1); } } - records = rec_open (bfs, 0); + 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; stat_info.isam = isam; 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; @@ -184,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); @@ -206,5 +351,79 @@ void inv_prstat (BFiles bfs) is_close (isam); if (isamc) isc_close (isamc); - + if (isams) + 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.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 + * Updated record index structure. Format includes version ID. Compression + * algorithm ID is stored for each record block. + * + * 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. + * + * Revision 1.6 1998/03/06 13:54:02 adam + * Fixed two nasty bugs in isc_merge. + * + * Revision 1.5 1997/09/17 12:19:13 adam + * Zebra version corresponds to YAZ version 1.4. + * Changed Zebra server so that it doesn't depend on global common_resource. + * + * Revision 1.4 1996/11/08 11:10:21 adam + * Buffers used during file match got bigger. + * Compressed ISAM support everywhere. + * Bug fixes regarding masking characters in queries. + * Redesigned Regexp-2 queries. + * + * Revision 1.3 1996/06/04 10:18:58 adam + * Minor changes - removed include of ctype.h. + * + * Revision 1.2 1996/05/22 08:25:56 adam + * Minor change. + * + * Revision 1.1 1996/05/14 14:04:34 adam + * In zebraidx, the 'stat' command is improved. Statistics about ISAM/DICT + * is collected. + */