X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=index%2Finvstat.c;h=a29be66cf242a3bfaeb021c25fe09333f942da5d;hp=27636aecc79318abb3ca7aa99a8a97d6f1307794;hb=1bb217ab477284fd7fee47f19a6e8a780fa2bb50;hpb=6feeb67bdd353384cc16289c7db4fcb2e62cb74f diff --git a/index/invstat.c b/index/invstat.c index 27636ae..a29be66 100644 --- a/index/invstat.c +++ b/index/invstat.c @@ -1,20 +1,35 @@ -/* - * Copyright (C) 1994-1999, Index Data - * All rights reserved. - * Sebastian Hammer, Adam Dickmeiss, Heikki Levanto - * log at eof - * - */ +/* $Id: invstat.c,v 1.37 2004-08-06 12:28:22 adam Exp $ + Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002 + Index Data Aps + +This file is part of the Zebra server. + +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 +Software Foundation; either version 2, or (at your option) any later +version. + +Zebra is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or +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. +*/ + + #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]; @@ -30,7 +45,7 @@ struct inv_stat_info { #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 (ZebraMaps zm, const char *s, zint count, int firstsys, int firstseq, int lastsys, int lastseq ) { int reg_type = s[1]; @@ -56,7 +71,7 @@ static void print_dict_item (ZebraMaps zm, const char *s, int count, 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; @@ -71,7 +86,6 @@ static int inv_stat_handle (char *name, const char *info, int pos, assert (*info == sizeof(ISAMS_P)); memcpy (&isam_p, info+1, sizeof(ISAMS_P)); - if (stat_info->zh->reg->isams) { ISAMS_PP pp; @@ -82,9 +96,11 @@ static int inv_stat_handle (char *name, const char *info, int pos, occur = isams_pp_num (pp); while (isams_pp_read(pp, &key)) { + occurx++; +#if IT_KEY_NEW +#else stat_info->cksum = stat_info->cksum * 65509 + key.sysno + 11 * key.seqno; - occurx++; if (-1==firstsys) { firstseq=key.seqno; @@ -92,6 +108,7 @@ static int inv_stat_handle (char *name, const char *info, int pos, } lastsys=key.sysno; lastseq=key.seqno; +#endif } assert (occurx == occur); stat_info->no_isam_entries[0] += occur; @@ -101,7 +118,7 @@ static int inv_stat_handle (char *name, const char *info, int pos, { ISPT ispt; - ispt = is_position (stat_info->zh->reg->isam, isam_p); + ispt = is_position (stat_info->zh->reg->isam, (int) isam_p); occur = is_numkeys (ispt); stat_info->no_isam_entries[is_type(isam_p)] += occur; is_pt_free (ispt); @@ -109,16 +126,18 @@ static int inv_stat_handle (char *name, const char *info, int pos, 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)) { + occurx++; +#if IT_KEY_NEW +#else stat_info->cksum = stat_info->cksum * 65509 + key.sysno + 11 * key.seqno; - occurx++; if (-1==firstsys) { firstseq=key.seqno; @@ -126,56 +145,17 @@ static int inv_stat_handle (char *name, const char *info, int pos, } lastsys=key.sysno; lastseq=key.seqno; +#endif } 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; - - pp = isamd_pp_open (stat_info->zh->reg->isamd, isam_p); - - occur = isamd_pp_num (pp); - while (isamd_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; - 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->zh->reg->isamb) { ISAMB_PP pp; struct it_key key; - int cat = isam_p & 3; + int cat = (int) (isam_p & 3); int level; int size; int blocks; @@ -184,9 +164,11 @@ static int inv_stat_handle (char *name, const char *info, int pos, while (isamb_pp_read(pp, &key)) { + occur++; +#if IT_KEY_NEW +#else stat_info->cksum = stat_info->cksum * 65509 + key.sysno + 11 * key.seqno; - occur++; if (-1==firstsys) { firstseq=key.seqno; @@ -194,6 +176,7 @@ static int inv_stat_handle (char *name, const char *info, int pos, } lastsys=key.sysno; lastseq=key.seqno; +#endif } isamb_pp_close_x (pp, &size, &blocks); stat_info->isamb_blocks[cat] += blocks; @@ -203,7 +186,7 @@ static int inv_stat_handle (char *name, const char *info, int pos, stat_info->isamb_levels[cat][level] ++; stat_info->no_isam_entries[cat] += occur; } - + i=0; while (occur > stat_info->isam_bounds[i] && stat_info->isam_bounds[i]) i++; ++(stat_info->isam_occurrences[i]); @@ -213,20 +196,17 @@ static int inv_stat_handle (char *name, const char *info, int pos, return 0; } -void zebra_register_statistics (ZebraHandle zh, int dumpdict) +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; stat_info.zh = zh; stat_info.dumpwords=dumpdict; @@ -280,7 +260,7 @@ void zebra_register_statistics (ZebraHandle zh, int dumpdict) fprintf (stdout, " Blocks Occur Size KB Bytes/Entry\n"); for (i = 0; isc_block_used (zh->reg->isamc, i) >= 0; i++) { - fprintf (stdout, " %8d %8d", isc_block_used (zh->reg->isamc, i), + fprintf (stdout, " %8" ZINT_FORMAT0 " %8d", isc_block_used (zh->reg->isamc, i), stat_info.no_isam_entries[i]); if (stat_info.no_isam_entries[i]) @@ -294,39 +274,6 @@ void zebra_register_statistics (ZebraHandle zh, int dumpdict) 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) { @@ -370,112 +317,6 @@ void zebra_register_statistics (ZebraHandle zh, int dumpdict) prev, stat_info.isam_occurrences[i]); xmalloc_trav("unfreed"); /*! while hunting memory leaks */ zebra_end_read (zh); + return 0; } - -/* - * - * $Log: invstat.c,v $ - * 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. - */