X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=index%2Finvstat.c;h=253a88a5babda17935193f6b5efa4131dc0beabd;hp=a72f8ace81969bfe69e602353d9ca45159ae0a71;hb=c3ff843e467932c6027a8b3b2ebda7b44612447e;hpb=896c0427df9d8eff5de6a1735dcd992e067df844 diff --git a/index/invstat.c b/index/invstat.c index a72f8ac..253a88a 100644 --- a/index/invstat.c +++ b/index/invstat.c @@ -1,8 +1,5 @@ -/* $Id: invstat.c,v 1.33 2002-08-02 19:26:55 adam Exp $ - Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002 - Index Data Aps - -This file is part of the Zebra server. +/* This file is part of the Zebra server. + Copyright (C) Index Data Zebra is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free @@ -15,67 +12,67 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with Zebra; see the file LICENSE.zebra. If not, write to the -Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA -02111-1307, USA. +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ +#if HAVE_CONFIG_H +#include +#endif #include #include #include #include "index.h" -#include "../isamc/isamd-p.h" struct inv_stat_info { ZebraHandle zh; - int no_isam_entries[9]; + zint no_isam_entries[9]; int no_dict_entries; int no_dict_bytes; int isam_bounds[20]; int isam_occurrences[20]; char tmp[128]; int isamb_levels[10][5]; - int isamb_sizes[10]; - int isamb_blocks[10]; + zint isamb_sizes[10]; + zint isamb_blocks[10]; unsigned long cksum; int dumpwords; }; -#define SINGLETON_TYPE 8 /* the type to use for singletons that */ +#define SINGLETON_TYPE 8 /* the type to use for singletons that */ /* have no block and no block type */ -static void print_dict_item (ZebraMaps zm, const char *s, int count, +static void print_dict_item (ZebraHandle zh, const char *s, zint count, int firstsys, int firstseq, int lastsys, int lastseq ) { - int reg_type = s[1]; - char keybuf[IT_MAX_WORD+1]; - char *to = keybuf; - const char *from = s + 2; - - while (*from) + char dst[IT_MAX_WORD+1]; + int ord; + int len = key_SU_decode(&ord, (const unsigned char *) s); + const char *index_type; + const char *db = 0; + + if (!zh) + *dst = '\0'; + else { - const char *res = zebra_maps_output (zm, reg_type, &from); - if (!res) - *to++ = *from++; - else - while (*res) - *to++ = *res++; + zebraExplain_lookup_ord (zh->reg->zei, ord, &index_type, &db, 0); + + zebra_term_untrans(zh, index_type, dst, s + len); } - *to = '\0'; - /* yaz_log (LOG_LOG, "%s", keybuf); */ - printf("%10d %s %d.%d - %d.%d\n",count, keybuf, - firstsys,firstseq, lastsys,lastseq); + printf("%02d:%10" ZINT_FORMAT0 " %s %d.%d - %d.%d\n", ord, count, dst, + firstsys, firstseq, lastsys, lastseq); } static int inv_stat_handle (char *name, const char *info, int pos, void *client) { - int occur = 0; + zint occur = 0; int i = 0; struct inv_stat_info *stat_info = (struct inv_stat_info*) client; - ISAMS_P isam_p; + ISAM_P isam_p; int firstsys=-1; int firstseq=-1; int lastsys=-1; @@ -84,11 +81,8 @@ static int inv_stat_handle (char *name, const char *info, int pos, stat_info->no_dict_entries++; stat_info->no_dict_bytes += strlen(name); - if (!stat_info->zh->reg->isamd) - { - assert (*info == sizeof(ISAMS_P)); - memcpy (&isam_p, info+1, sizeof(ISAMS_P)); - } + assert (*info == sizeof(ISAM_P)); + memcpy (&isam_p, info+1, sizeof(ISAM_P)); if (stat_info->zh->reg->isams) { @@ -100,123 +94,42 @@ static int inv_stat_handle (char *name, const char *info, int pos, occur = isams_pp_num (pp); while (isams_pp_read(pp, &key)) { - stat_info->cksum = stat_info->cksum * 65509 + - key.sysno + 11 * key.seqno; occurx++; - if (-1==firstsys) - { - firstseq=key.seqno; - firstsys=key.sysno; - } - lastsys=key.sysno; - lastseq=key.seqno; } assert (occurx == occur); stat_info->no_isam_entries[0] += occur; isams_pp_close (pp); } - if (stat_info->zh->reg->isam) - { - ISPT ispt; - - ispt = is_position (stat_info->zh->reg->isam, isam_p); - occur = is_numkeys (ispt); - stat_info->no_isam_entries[is_type(isam_p)] += occur; - is_pt_free (ispt); - } if (stat_info->zh->reg->isamc) { ISAMC_PP pp; - int occurx = 0; + zint occurx = 0; struct it_key key; - pp = isc_pp_open (stat_info->zh->reg->isamc, isam_p); - occur = isc_pp_num (pp); - while (isc_pp_read(pp, &key)) - { - stat_info->cksum = stat_info->cksum * 65509 + - key.sysno + 11 * key.seqno; - occurx++; - if (-1==firstsys) - { - firstseq=key.seqno; - firstsys=key.sysno; - } - lastsys=key.sysno; - lastseq=key.seqno; - } - assert (occurx == occur); - stat_info->no_isam_entries[isc_type(isam_p)] += occur; - isc_pp_close (pp); - } - if (stat_info->zh->reg->isamd) - { - ISAMD_PP pp; - int occurx = 0; - struct it_key key; - /* printf("[%d: %d %d %d %d %d %d] ", */ - /* info[0], info[1], info[2], info[3], info[4], info[5], info[7]);*/ - pp = isamd_pp_open (stat_info->zh->reg->isamd, info+1, info[0]); - - occur = isamd_pp_num (pp); - while (isamd_pp_read(pp, &key)) + pp = isamc_pp_open (stat_info->zh->reg->isamc, isam_p); + occur = isamc_pp_num (pp); + while (isamc_pp_read(pp, &key)) { - stat_info->cksum = stat_info->cksum * 65509 + - key.sysno + 11 * key.seqno; occurx++; - /* printf("%d.%d ", key.sysno, key.seqno); */ /*!*/ - if (-1==firstsys) - { - firstseq=key.seqno; - firstsys=key.sysno; - } - lastsys=key.sysno; - lastseq=key.seqno; - 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); } - /* printf("\n"); */ /*!*/ -#ifdef SKIPTHIS - 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); -#endif - if (occurx != occur) - logf(LOG_LOG,"Count error!!! read %d, counted %d", occur, occurx); assert (occurx == occur); - i = pp->cat; - if (info[1]) - i=SINGLETON_TYPE; - stat_info->no_isam_entries[i] += occur; - isamd_pp_close (pp); + stat_info->no_isam_entries[isamc_type(isam_p)] += occur; + isamc_pp_close (pp); } if (stat_info->zh->reg->isamb) { ISAMB_PP pp; struct it_key key; - int cat = isam_p & 3; + int cat = CAST_ZINT_TO_INT(isam_p & 3); int level; - int size; - int blocks; - - pp = isamb_pp_open_x(stat_info->zh->reg->isamb, isam_p, &level); + zint size; + zint blocks; + + pp = isamb_pp_open_x(stat_info->zh->reg->isamb, isam_p, &level, 0); while (isamb_pp_read(pp, &key)) { - stat_info->cksum = stat_info->cksum * 65509 + - key.sysno + 11 * key.seqno; occur++; - if (-1==firstsys) - { - firstseq=key.seqno; - firstsys=key.sysno; - } - lastsys=key.sysno; - lastseq=key.seqno; } isamb_pp_close_x (pp, &size, &blocks); stat_info->isamb_blocks[cat] += blocks; @@ -231,25 +144,46 @@ static int inv_stat_handle (char *name, const char *info, int pos, i++; ++(stat_info->isam_occurrences[i]); if (stat_info->dumpwords) - print_dict_item(stat_info->zh->reg->zebra_maps, name, occur, - firstsys,firstseq, lastsys, lastseq); + print_dict_item(stat_info->zh, name, occur, + firstsys, firstseq, lastsys, lastseq); return 0; } -void zebra_register_statistics (ZebraHandle zh, int dumpdict) +static void show_bfs_stats(BFiles bfs) +{ + int i = 0; + const char *directory = 0; + double used_bytes, max_bytes; + printf("Register:\n"); + while (bfs_register_directory_stat(bfs, i, &directory, + &used_bytes, &max_bytes)) + { + printf ("%s %10.0lf %10.0lf\n", directory, used_bytes, max_bytes); + i++; + } + i = 0; + printf("Shadow:\n"); + while (bfs_shadow_directory_stat(bfs, i, &directory, + &used_bytes, &max_bytes)) + { + printf ("%s %10.0lf %10.0lf\n", directory, used_bytes, max_bytes); + i++; + } +} + +int zebra_register_statistics (ZebraHandle zh, int dumpdict) { - int blocks; - int size; - int count; int i, prev; int before = 0; - int occur; + zint occur; int after = 1000000000; struct inv_stat_info stat_info; char term_dict[2*IT_MAX_WORD+2]; if (zebra_begin_read (zh)) - return; + return 1; + + show_bfs_stats(zebra_get_bfs(zh)); stat_info.zh = zh; stat_info.dumpwords=dumpdict; @@ -301,55 +235,23 @@ void zebra_register_statistics (ZebraHandle zh, int dumpdict) if (zh->reg->isamc) { fprintf (stdout, " Blocks Occur Size KB Bytes/Entry\n"); - for (i = 0; isc_block_used (zh->reg->isamc, i) >= 0; i++) + for (i = 0; isamc_block_used (zh->reg->isamc, i) >= 0; i++) { - fprintf (stdout, " %8d %8d", isc_block_used (zh->reg->isamc, i), + fprintf (stdout, " %8" ZINT_FORMAT0 " %8" ZINT_FORMAT0, + isamc_block_used (zh->reg->isamc, i), stat_info.no_isam_entries[i]); if (stat_info.no_isam_entries[i]) - fprintf (stdout, " %8d %f", - (int) ((1023.0 + (double) - isc_block_used(zh->reg->isamc, i) * - isc_block_size(zh->reg->isamc,i))/1024), - ((double) isc_block_used(zh->reg->isamc, i) * - isc_block_size(zh->reg->isamc,i))/ - stat_info.no_isam_entries[i]); + fprintf(stdout, " %8d %f", + (int) ((1023.0 + (double) + isamc_block_used(zh->reg->isamc, i) * + isamc_block_size(zh->reg->isamc,i))/1024), + ((double) isamc_block_used(zh->reg->isamc, i) * + isamc_block_size(zh->reg->isamc,i))/ + stat_info.no_isam_entries[i]); fprintf (stdout, "\n"); } } - if (zh->reg->isamd) - { - fprintf (stdout, " Blocks Occur KB Bytes/Entry\n"); - if (zh->reg->isamd->method->debug >0) - logf(LOG_LOG," Blocks Occur KB Bytes/Entry"); - for (i = 0; i<=SINGLETON_TYPE; i++) - { - blocks= isamd_block_used(zh->reg->isamd,i); - size= isamd_block_size(zh->reg->isamd,i); - count=stat_info.no_isam_entries[i]; - if (i==SINGLETON_TYPE) - blocks=size=0; - if (stat_info.no_isam_entries[i]) - { - fprintf (stdout, "%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 (zh->reg->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 ( (zh->reg->isamd) && (zh->reg->isamd->method->debug>0)) - fprintf (stdout, "\n%d words using %d bytes\n", - stat_info.no_dict_entries, stat_info.no_dict_bytes); if (zh->reg->isamb) { @@ -361,10 +263,11 @@ void zebra_register_statistics (ZebraHandle zh, int dumpdict) break; fprintf (stdout, "Category %d\n", i); fprintf (stdout, "Block size %d\n", bsize); - fprintf (stdout, "Blocks: %d\n", stat_info.isamb_blocks[i]); - fprintf (stdout, "Size: %d\n", stat_info.isamb_sizes[i]); - fprintf (stdout, "Entries: %d\n", stat_info.no_isam_entries[i]); - fprintf (stdout, "Total %d\n", stat_info.isamb_blocks[i]* + fprintf (stdout, "Blocks: " ZINT_FORMAT "\n", stat_info.isamb_blocks[i]); + fprintf (stdout, "Size: " ZINT_FORMAT "\n", stat_info.isamb_sizes[i]); + fprintf (stdout, "Entries: " ZINT_FORMAT "\n", + stat_info.no_isam_entries[i]); + fprintf (stdout, "Total " ZINT_FORMAT "\n", stat_info.isamb_blocks[i]* bsize); for (j = 0; j<5; j++) if (stat_info.isamb_levels[i][j]) @@ -379,7 +282,7 @@ void zebra_register_statistics (ZebraHandle zh, int dumpdict) occur = 0; for (i = 0; i<9; i++) occur += stat_info.no_isam_entries[i]; - fprintf (stdout, "Word pos %d\n", occur); + fprintf (stdout, "Word pos " ZINT_FORMAT "\n", occur); fprintf (stdout, " Occurrences Words\n"); prev = 1; for (i = 0; stat_info.isam_bounds[i]; i++) @@ -391,121 +294,18 @@ void zebra_register_statistics (ZebraHandle zh, int dumpdict) } fprintf (stdout, "%7d- %7d\n", prev, stat_info.isam_occurrences[i]); - xmalloc_trav("unfreed"); /*! while hunting memory leaks */ + rec_prstat(zh->reg->records, 0); + xmalloc_trav("unfreed"); /*! while hunting memory leaks */ zebra_end_read (zh); + return 0; } - /* - * - * $Log: invstat.c,v $ - * Revision 1.33 2002-08-02 19:26:55 adam - * Towards GPL - * - * Revision 1.32 2002/07/12 18:12:22 heikki - * Isam-D now stores small entries directly in the dictionary. - * Needs more tuning and cleaning... - * - * Revision 1.31 2002/07/11 16:16:00 heikki - * Fixed a bug in isamd, failed to store a single key when its bits - * did not fit into a singleton. - * - * Revision 1.30 2002/07/11 13:03:01 heikki - * Added dumpdict command line option to dump the - * dictionary before doing the usual stats - * - * Revision 1.29 2002/06/19 10:29:17 adam - * align block sizes for isam sys. Better plot for test - * - * Revision 1.28 2002/04/30 19:31:09 adam - * isamb delete; more statistics - * - * Revision 1.27 2002/04/30 08:28:37 adam - * isamb fixes for pp_read. Statistics - * - * Revision 1.26 2002/04/29 18:03:46 adam - * More isamb statistics - * - * Revision 1.25 2002/04/26 08:44:47 adam - * Index statistics working again - * - * Revision 1.24 2002/04/05 08:46:26 adam - * Zebra with full functionality - * - * Revision 1.23 2002/04/04 14:14:13 adam - * Multiple registers (alpha early) - * - * Revision 1.22 2002/02/20 17:30:01 adam - * Work on new API. Locking system re-implemented - * - * 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. + * Local variables: + * c-basic-offset: 4 + * c-file-style: "Stroustrup" + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab */ +