X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Finvstat.c;h=4781c50120a8e683e9518f4e4c90eeecdfa325e2;hb=4ed5fbcd29d2a98b048d1d94510b262d352b4f7c;hp=2e14ede0fbbe29f0abb47aa43b1e24fba10989e8;hpb=b9093505b17a074e79137ed64595c8269f77d330;p=idzebra-moved-to-github.git diff --git a/index/invstat.c b/index/invstat.c index 2e14ede..4781c50 100644 --- a/index/invstat.c +++ b/index/invstat.c @@ -1,10 +1,29 @@ /* - * Copyright (C) 1994-1997, Index Data I/S + * Copyright (C) 1994-1999, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: invstat.c,v $ - * Revision 1.5 1997-09-17 12:19:13 adam + * 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. * @@ -35,6 +54,8 @@ struct inv_stat_info { ISAM isam; ISAMC isamc; + ISAMS isams; + int no_isam_entries[8]; int no_dict_entries; int no_dict_bytes; int isam_bounds[20]; @@ -45,7 +66,7 @@ struct inv_stat_info { static int inv_stat_handle (char *name, const char *info, int pos, void *client) { - int occur; + int occur = 0; int i = 0; struct inv_stat_info *stat_info = (struct inv_stat_info*) client; ISAM_P isam_p; @@ -56,6 +77,7 @@ static int inv_stat_handle (char *name, const char *info, int pos, assert (*info == sizeof(ISAM_P)); memcpy (&isam_p, info+1, sizeof(ISAM_P)); + printf ("---\n"); if (stat_info->isam) { ISPT ispt; @@ -68,22 +90,40 @@ static int inv_stat_handle (char *name, const char *info, int pos, { ISAMC_PP pp; int occurx = 0; - char buf[128]; + struct it_key key; pp = isc_pp_open (stat_info->isamc, isam_p); occur = isc_pp_num (pp); -#if 1 - while (isc_pp_read(pp, buf)) + while (isc_pp_read(pp, &key)) + { + printf ("sysno=%d seqno=%d\n", key.sysno, key.seqno); occurx++; + } assert (occurx == occur); -#endif + stat_info->no_isam_entries[isc_type(isam_p)] += occur; isc_pp_close (pp); } + if (stat_info->isams) + { + ISAMS_PP pp; + int occurx = 0; + struct it_key key; + + pp = isams_pp_open (stat_info->isams, isam_p); + occur = isams_pp_num (pp); + while (isams_pp_read(pp, &key)) + { + printf ("sysno=%d seqno=%d\n", key.sysno, key.seqno); + occurx++; + } + assert (occurx == occur); + stat_info->no_isam_entries[isc_type(isam_p)] += occur; + isams_pp_close (pp); + } while (occur > stat_info->isam_bounds[i] && stat_info->isam_bounds[i]) i++; ++(stat_info->isam_occurrences[i]); - return 0; } @@ -92,6 +132,7 @@ void inv_prstat (BFiles bfs) Dict dict; ISAM isam = NULL; ISAMC isamc = NULL; + ISAMS isams = NULL; Records records; int i, prev; int before = 0; @@ -102,41 +143,53 @@ void inv_prstat (BFiles bfs) term_dict[0] = 1; term_dict[1] = 0; - dict = dict_open (bfs, FNAME_DICT, 100, 0); + dict = dict_open (bfs, FNAME_DICT, 100, 0, 0); if (!dict) { logf (LOG_FATAL, "dict_open fail"); exit (1); } - if (res_get_match (common_resource, "isam", "c", NULL)) + if (res_get_match (common_resource, "isam", "i", NULL)) { - isamc = isc_open (bfs, FNAME_ISAMC, 0, key_isamc_m (common_resource)); - if (!isamc) + isam = is_open (bfs, FNAME_ISAM, key_compare, 0, + sizeof(struct it_key), common_resource); + if (!isam) { - logf (LOG_FATAL, "isc_open fail"); + logf (LOG_FATAL, "is_open fail"); + exit (1); + } + } + else if (res_get_match (common_resource, "isam", "s", NULL)) + { + isams = isams_open (bfs, FNAME_ISAMS, 0, key_isams_m(common_resource)); + if (!isams) + { + logf (LOG_FATAL, "isams_open fail"); exit (1); } } else { - isam = is_open (bfs, FNAME_ISAM, key_compare, 0, - sizeof(struct it_key), common_resource); - if (!isam) + isamc = isc_open (bfs, FNAME_ISAMC, 0, key_isamc_m (common_resource)); + if (!isamc) { - logf (LOG_FATAL, "is_open fail"); + logf (LOG_FATAL, "isc_open fail"); exit (1); } } records = rec_open (bfs, 0); + for (i = 0; i<8; i++) + stat_info.no_isam_entries[i] = 0; stat_info.no_dict_entries = 0; stat_info.no_dict_bytes = 0; stat_info.isam = isam; stat_info.isamc = isamc; + stat_info.isams = isams; stat_info.isam_bounds[0] = 1; stat_info.isam_bounds[1] = 2; stat_info.isam_bounds[2] = 3; - stat_info.isam_bounds[3] = 5; + stat_info.isam_bounds[3] = 6; stat_info.isam_bounds[4] = 10; stat_info.isam_bounds[5] = 20; stat_info.isam_bounds[6] = 30; @@ -158,16 +211,28 @@ void inv_prstat (BFiles bfs) dict_scan (dict, term_dict, &before, &after, &stat_info, inv_stat_handle); - rec_close (&records); - dict_close (dict); - if (isam) - is_close (isam); if (isamc) - isc_close (isamc); + { + fprintf (stderr, " Blocks Occur Size KB Bytes/Entry\n"); + for (i = 0; isc_block_used (isamc, i) >= 0; i++) + { + fprintf (stderr, " %8d %8d", isc_block_used (isamc, i), + stat_info.no_isam_entries[i]); - fprintf (stderr, "%d dictionary entries. %d bytes for strings\n", + if (stat_info.no_isam_entries[i]) + fprintf (stderr, " %8d %f", + (int) ((1023.0 + (double) isc_block_used(isamc, i) * + isc_block_size(isamc,i))/1024), + ((double) isc_block_used(isamc, i) * + isc_block_size(isamc,i))/ + stat_info.no_isam_entries[i]); + fprintf (stderr, "\n"); + } + } + + fprintf (stderr, "\n%d words using %d bytes\n", stat_info.no_dict_entries, stat_info.no_dict_bytes); - fprintf (stderr, " size occurrences\n"); + fprintf (stderr, " Occurrences Words\n"); prev = 1; for (i = 0; stat_info.isam_bounds[i]; i++) { @@ -178,4 +243,15 @@ void inv_prstat (BFiles bfs) } fprintf (stderr, "%7d- %7d\n", prev, stat_info.isam_occurrences[i]); + + rec_close (&records); + dict_close (dict); + + if (isam) + is_close (isam); + if (isamc) + isc_close (isamc); + if (isams) + isams_close (isams); + }