X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=index%2Finvstat.c;h=253a88a5babda17935193f6b5efa4131dc0beabd;hp=4f87064d244b49f9620352a1c9bbebb4ace8e672;hb=c3ff843e467932c6027a8b3b2ebda7b44612447e;hpb=a9e90f22d2cefbafc9d490a03a3bc7d1b75d57ee diff --git a/index/invstat.c b/index/invstat.c index 4f87064..253a88a 100644 --- a/index/invstat.c +++ b/index/invstat.c @@ -1,8 +1,5 @@ -/* $Id: invstat.c,v 1.45 2005-03-09 12:14:42 adam Exp $ - Copyright (C) 1995-2005 - 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,12 +12,15 @@ 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 @@ -42,30 +42,28 @@ struct inv_stat_info { 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, 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); + 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 (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,25 +106,25 @@ 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) { ISAMB_PP pp; struct it_key key; - int cat = (int) (isam_p & 3); + int cat = CAST_ZINT_TO_INT(isam_p & 3); int 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)) @@ -146,11 +144,33 @@ 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; } +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 i, prev; @@ -163,6 +183,8 @@ int zebra_register_statistics (ZebraHandle zh, int dumpdict) if (zebra_begin_read (zh)) return 1; + show_bfs_stats(zebra_get_bfs(zh)); + stat_info.zh = zh; stat_info.dumpwords=dumpdict; @@ -213,20 +235,20 @@ 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))/ - 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"); } } @@ -272,8 +294,18 @@ int 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; } +/* + * Local variables: + * c-basic-offset: 4 + * c-file-style: "Stroustrup" + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab + */ +