X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Finvstat.c;h=ce82cd69447a5dd9735a436a4702327f31b9f7b8;hb=9b4f970d2816490fa4cc850fabc51f494ee5612b;hp=e08685ac154bc8eb929ad523941b06aa0df21f0a;hpb=bceca936710690858ea162e7bc22de819f0e280f;p=idzebra-moved-to-github.git diff --git a/index/invstat.c b/index/invstat.c index e08685a..ce82cd6 100644 --- a/index/invstat.c +++ b/index/invstat.c @@ -1,44 +1,8 @@ /* * Copyright (C) 1994-1999, Index Data * All rights reserved. - * Sebastian Hammer, Adam Dickmeiss - * - * $Log: invstat.c,v $ - * 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 @@ -47,12 +11,18 @@ #include "index.h" #include "recindex.h" +#if ZMBOL +#include "../isamc/isamd-p.h" +#endif struct inv_stat_info { + ISAMS isams; +#if ZMBOL ISAM isam; ISAMC isamc; - ISAMS isams; - int no_isam_entries[8]; + ISAMD isamd; +#endif + int no_isam_entries[9]; int no_dict_entries; int no_dict_bytes; int isam_bounds[20]; @@ -60,21 +30,41 @@ 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) { int occur = 0; int i = 0; struct inv_stat_info *stat_info = (struct inv_stat_info*) client; - ISAM_P isam_p; + ISAMS_P isam_p; stat_info->no_dict_entries++; stat_info->no_dict_bytes += strlen(name); - assert (*info == sizeof(ISAM_P)); - memcpy (&isam_p, info+1, sizeof(ISAM_P)); + assert (*info == sizeof(ISAMS_P)); + memcpy (&isam_p, info+1, sizeof(ISAMS_P)); - printf ("---\n"); + 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[0] += occur; + isams_pp_close (pp); + } +#if ZMBOL if (stat_info->isam) { ISPT ispt; @@ -93,31 +83,45 @@ 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->isams) + if (stat_info->isamd) { - ISAMS_PP pp; + ISAMD_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)) + pp = isamd_pp_open (stat_info->isamd, isam_p); + + occur = isamd_pp_num (pp); + while (isamd_pp_read(pp, &key)) { - printf ("sysno=%d seqno=%d\n", key.sysno, key.seqno); 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[isc_type(isam_p)] += occur; - isams_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); } - +#endif while (occur > stat_info->isam_bounds[i] && stat_info->isam_bounds[i]) i++; ++(stat_info->isam_occurrences[i]); @@ -127,26 +131,44 @@ static int inv_stat_handle (char *name, const char *info, int pos, void inv_prstat (BFiles bfs) { Dict dict; - ISAM isam = NULL; - ISAMC isamc = NULL; ISAMS isams = NULL; +#if ZMBOL + ISAM isam = NULL; + ISAMC isamc = NULL; + ISAMD isamd = NULL; + int blocks; + int size; + int count; +#endif 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]; - + 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", "s", ISAM_DEFAULT)) + { + 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); + } + } +#if ZMBOL + else if (res_get_match (common_resource, "isam", "i", ISAM_DEFAULT)) { isam = is_open (bfs, FNAME_ISAM, key_compare, 0, sizeof(struct it_key), common_resource); @@ -156,33 +178,41 @@ void inv_prstat (BFiles bfs) exit (1); } } - else if (res_get_match (common_resource, "isam", "s", NULL)) + else if (res_get_match (common_resource, "isam", "d", ISAM_DEFAULT)) { - isams = isams_open (bfs, FNAME_ISAMS, 0, key_isams_m(common_resource)); - if (!isams) + 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, "isams_open fail"); + logf (LOG_FATAL, "isamd_open fail"); exit (1); } } - else + else if (res_get_match (common_resource, "isam", "c", ISAM_DEFAULT)) { - 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"); exit (1); } } - records = rec_open (bfs, 0); +#endif + 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.isams = isams; +#if ZMBOL stat_info.isam = isam; stat_info.isamc = isamc; - stat_info.isams = isams; + stat_info.isamd = isamd; +#endif stat_info.isam_bounds[0] = 1; stat_info.isam_bounds[1] = 2; stat_info.isam_bounds[2] = 3; @@ -208,6 +238,7 @@ void inv_prstat (BFiles bfs) dict_scan (dict, term_dict, &before, &after, &stat_info, inv_stat_handle); +#if ZMBOL if (isamc) { fprintf (stderr, " Blocks Occur Size KB Bytes/Entry\n"); @@ -226,9 +257,40 @@ void inv_prstat (BFiles bfs) fprintf (stderr, "\n"); } } - - fprintf (stderr, "\n%d words using %d bytes\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); +#endif fprintf (stderr, " Occurrences Words\n"); prev = 1; for (i = 0; stat_info.isam_bounds[i]; i++) @@ -240,15 +302,95 @@ void inv_prstat (BFiles bfs) } fprintf (stderr, "%7d- %7d\n", prev, stat_info.isam_occurrences[i]); - rec_close (&records); dict_close (dict); + if (isams) + isams_close (isams); +#if ZMBOL if (isam) is_close (isam); if (isamc) isc_close (isamc); - if (isams) - isams_close (isams); - + if (isamd) + isamd_close (isamd); +#endif + + xmalloc_trav("unfreed"); /*! while hunting memory leaks */ } + + +/* + * + * $Log: invstat.c,v $ + * Revision 1.21 2000-07-13 10:14:20 heikki + * Removed compiler warnings when making zebra + * + * Revision 1.20 1999/12/01 13:30:30 adam + * Updated configure for Zmbol/Zebra dependent settings. + * + * Revision 1.19 1999/11/30 13:48:03 adam + * Improved installation. Updated for inclusion of YAZ header files. + * + * 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. + */