X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Finvstat.c;h=bd8037d7c308577968e9b4105f0420d72ae2f092;hb=52824e358151328181178232866be5766dcfce6c;hp=bb537a1df33eb6fea0f28b0fb0a721556ff6d0c9;hpb=104beff061317519411d779c7c84419ccdfc70e1;p=idzebra-moved-to-github.git diff --git a/index/invstat.c b/index/invstat.c index bb537a1..bd8037d 100644 --- a/index/invstat.c +++ b/index/invstat.c @@ -1,6 +1,6 @@ -/* $Id: invstat.c,v 1.35 2003-06-20 14:21:23 heikki Exp $ - Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002 - Index Data Aps +/* $Id: invstat.c,v 1.46 2005-04-13 13:03:47 adam Exp $ + Copyright (C) 1995-2005 + Index Data ApS This file is part of the Zebra server. @@ -26,19 +26,18 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #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; }; @@ -46,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]; @@ -64,18 +63,18 @@ static void print_dict_item (ZebraMaps zm, const char *s, int count, *to++ = *res++; } *to = '\0'; - /* yaz_log (LOG_LOG, "%s", keybuf); */ - printf("%10d %s %d.%d - %d.%d\n",count, keybuf, + /* yaz_log (YLOG_LOG, "%s", keybuf); */ + printf("%10" ZINT_FORMAT0 " %s %d.%d - %d.%d\n", count, keybuf, 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 +83,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 +96,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 = (int) (isam_p & 3); int level; - int size; - int blocks; + zint size; + zint blocks; - pp = isamb_pp_open_x(stat_info->zh->reg->isamb, isam_p, &level); + 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; @@ -238,12 +153,9 @@ static int inv_stat_handle (char *name, const char *info, int pos, 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]; @@ -301,55 +213,23 @@ int 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))/ + 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 +241,11 @@ int 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 +260,7 @@ int 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++)