X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Finvstat.c;h=afa8b817b83bf6004fbe59b1b24b6d5a5a9e93b4;hb=0ec1c21af9238b4aab7ae0343ad6476ea79842b0;hp=c4bc74fc4fef5270c12313efc126da210fb0c206;hpb=6c9fcd3b5d3108702fa1ffc92dab4ab6060f9a19;p=idzebra-moved-to-github.git diff --git a/index/invstat.c b/index/invstat.c index c4bc74f..afa8b81 100644 --- a/index/invstat.c +++ b/index/invstat.c @@ -1,4 +1,4 @@ -/* $Id: invstat.c,v 1.43 2005-01-15 19:38:25 adam Exp $ +/* $Id: invstat.c,v 1.48 2006-03-30 09:52:15 adam Exp $ Copyright (C) 1995-2005 Index Data ApS @@ -36,8 +36,8 @@ struct inv_stat_info { 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; }; @@ -45,27 +45,25 @@ 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, zint 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); + int 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, 0, 0); + + zebra_term_untrans(zh, index_type, dst, s + len); } - *to = '\0'; - /* yaz_log (YLOG_LOG, "%s", keybuf); */ - printf("%10" ZINT_FORMAT0 " %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, @@ -74,7 +72,7 @@ static int inv_stat_handle (char *name, const char *info, int pos, 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; @@ -83,8 +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); - 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) { @@ -108,15 +106,15 @@ static int inv_stat_handle (char *name, const char *info, int pos, 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)) + pp = isamc_pp_open (stat_info->zh->reg->isamc, isam_p); + occur = isamc_pp_num (pp); + while (isamc_pp_read(pp, &key)) { occurx++; } assert (occurx == occur); - stat_info->no_isam_entries[isc_type(isam_p)] += occur; - isc_pp_close (pp); + stat_info->no_isam_entries[isamc_type(isam_p)] += occur; + isamc_pp_close (pp); } if (stat_info->zh->reg->isamb) { @@ -124,8 +122,8 @@ static int inv_stat_handle (char *name, const char *info, int pos, struct it_key key; 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, 0); @@ -146,8 +144,8 @@ 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; } @@ -213,19 +211,19 @@ 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, " %8" ZINT_FORMAT0 " %8" ZINT_FORMAT0, - isc_block_used (zh->reg->isamc, i), + 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"); } @@ -241,11 +239,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, "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 %d\n", stat_info.isamb_blocks[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])