X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Finvstat.c;h=39cf04ab36eedb3cac5050aeb06ba09aa9a1c96c;hb=c0a1c79e55f706009113b2de3c11a6f13d4a0e7d;hp=30a5e90feea00094163ca3873810ae8a90db9f08;hpb=f3425fb457792aae865096cf9acf5cb41798b1d1;p=idzebra-moved-to-github.git diff --git a/index/invstat.c b/index/invstat.c index 30a5e90..39cf04a 100644 --- a/index/invstat.c +++ b/index/invstat.c @@ -1,51 +1,8 @@ /* * Copyright (C) 1994-1999, Index Data * All rights reserved. - * Sebastian Hammer, Adam Dickmeiss - * - * $Log: invstat.c,v $ - * 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. + * Sebastian Hammer, Adam Dickmeiss, Heikki Levanto + * log at eof * */ #include @@ -54,11 +11,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; + ISAMD isamd; int no_isam_entries[8]; int no_dict_entries; int no_dict_bytes; @@ -81,7 +42,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"); + //printf ("---\n"); if (stat_info->isam) { ISPT ispt; @@ -100,13 +61,67 @@ 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); 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); + // 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 ", + // 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[isamd_type(isam_p)] += occur; + isamd_pp_close (pp); + } if (stat_info->isams) { ISAMS_PP pp; @@ -117,7 +132,7 @@ static int inv_stat_handle (char *name, const char *info, int pos, occur = isams_pp_num (pp); while (isams_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); @@ -134,9 +149,11 @@ 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; @@ -165,16 +182,40 @@ 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"); 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 { - 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"); @@ -190,6 +231,8 @@ void inv_prstat (BFiles bfs) 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; @@ -257,5 +300,74 @@ void inv_prstat (BFiles bfs) 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.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. + */