X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Finvstat.c;h=b810496daca61cd9add4c05e798e882a614b096c;hb=224005e2f3362ed680003a3d028dd17afa13994a;hp=7f7cca3963c3eebd2fa3ead479be3ee50a304061;hpb=500505a8413687c67b6be99ff1ae9c1460d35e25;p=idzebra-moved-to-github.git diff --git a/index/invstat.c b/index/invstat.c index 7f7cca3..b810496 100644 --- a/index/invstat.c +++ b/index/invstat.c @@ -10,15 +10,12 @@ #include #include "index.h" -#include "recindex.h" -#include "../isamc/isamh-p.h" #include "../isamc/isamd-p.h" struct inv_stat_info { + ISAMS isams; ISAM isam; ISAMC isamc; - ISAMS isams; - ISAMH isamh; ISAMD isamd; int no_isam_entries[9]; int no_dict_entries; @@ -37,15 +34,31 @@ static int inv_stat_handle (char *name, const char *info, int pos, int occur = 0; int i = 0; struct inv_stat_info *stat_info = (struct inv_stat_info*) client; - ISAM_P isam_p; + ISAMS_P isam_p; stat_info->no_dict_entries++; stat_info->no_dict_bytes += strlen(name); - assert (*info == sizeof(ISAM_P)); - memcpy (&isam_p, info+1, sizeof(ISAM_P)); + assert (*info == sizeof(ISAMS_P)); + memcpy (&isam_p, info+1, sizeof(ISAMS_P)); - //printf ("---\n"); + 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[0] += occur; + isams_pp_close (pp); + } if (stat_info->isam) { ISPT ispt; @@ -71,30 +84,6 @@ static int inv_stat_handle (char *name, const char *info, int pos, stat_info->no_isam_entries[isc_type(isam_p)] += occur; isc_pp_close (pp); } - if (stat_info->isamh) - { - ISAMH_PP pp; - int occurx = 0; - struct it_key key; - - pp = isamh_pp_open (stat_info->isamh, isam_p); - - occur = isamh_pp_num (pp); - while (isamh_pp_read(pp, &key)) - { - occurx++; - //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 (occurx != occur) { - logf(LOG_LOG,"Count error!!! read %d, counted %d", occur, occurx); - //isamh_pp_dump(stat_info->isamh, isam_p); - } - stat_info->no_isam_entries[isamh_type(isam_p)] += occur; - isamh_pp_close (pp); - } if (stat_info->isamd) { ISAMD_PP pp; @@ -126,47 +115,35 @@ static int inv_stat_handle (char *name, const char *info, int pos, stat_info->no_isam_entries[isamd_type(isam_p)] += occur; isamd_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; } -void inv_prstat (BFiles bfs) +void inv_prstat (ZebraHandle zh) { + Res res = zh->res; + BFiles bfs; Dict dict; + ISAMS isams = NULL; ISAM isam = NULL; ISAMC isamc = NULL; - ISAMS isams = NULL; - ISAMH isamh = NULL; ISAMD isamd = NULL; + int blocks; + int size; + int count; Records records; int i, prev; int before = 0; int after = 1000000000; struct inv_stat_info stat_info; char term_dict[2*IT_MAX_WORD+2]; - int blocks; - int size; - int count; + + if (!res || !zh->reg) + return; + + bfs = zh->reg->bfs; term_dict[0] = 1; term_dict[1] = 0; @@ -177,52 +154,43 @@ void inv_prstat (BFiles bfs) logf (LOG_FATAL, "dict_open fail"); exit (1); } - if (res_get_match (common_resource, "isam", "i", NULL)) - { - isam = is_open (bfs, FNAME_ISAM, key_compare, 0, - sizeof(struct it_key), common_resource); - if (!isam) - { - logf (LOG_FATAL, "is_open fail"); - exit (1); - } - } - else if (res_get_match (common_resource, "isam", "s", NULL)) + if (res_get_match (res, "isam", "s", ISAM_DEFAULT)) { struct ISAMS_M_s isams_m; isams = isams_open (bfs, FNAME_ISAMS, 0, - key_isams_m(common_resource, &isams_m)); + key_isams_m(res, &isams_m)); if (!isams) { logf (LOG_FATAL, "isams_open fail"); exit (1); } } - else if (res_get_match (common_resource, "isam", "h", NULL)) + else if (res_get_match (res, "isam", "i", ISAM_DEFAULT)) { - isamh = isamh_open (bfs, FNAME_ISAMH, 0, key_isamh_m(common_resource)); - if (!isamh) + isam = is_open (bfs, FNAME_ISAM, key_compare, 0, + sizeof(struct it_key), res); + if (!isam) { - logf (LOG_FATAL, "isamh_open fail"); + logf (LOG_FATAL, "is_open fail"); exit (1); } } - else if (res_get_match (common_resource, "isam", "d", NULL)) + else if (res_get_match (res, "isam", "d", ISAM_DEFAULT)) { struct ISAMD_M_s isamd_m; isamd = isamd_open (bfs, FNAME_ISAMD, 0, - key_isamd_m(common_resource,&isamd_m)); + key_isamd_m(res,&isamd_m)); if (!isamd) { logf (LOG_FATAL, "isamd_open fail"); exit (1); } } - else + else if (res_get_match (res, "isam", "c", ISAM_DEFAULT)) { struct ISAMC_M_s isamc_m; isamc = isc_open (bfs, FNAME_ISAMC, 0, - key_isamc_m (common_resource, &isamc_m)); + key_isamc_m (res, &isamc_m)); if (!isamc) { logf (LOG_FATAL, "isc_open fail"); @@ -235,10 +203,9 @@ void inv_prstat (BFiles bfs) stat_info.no_isam_entries[i] = 0; stat_info.no_dict_entries = 0; stat_info.no_dict_bytes = 0; + stat_info.isams = isams; stat_info.isam = isam; stat_info.isamc = isamc; - stat_info.isams = isams; - stat_info.isamh = isamh; stat_info.isamd = isamd; stat_info.isam_bounds[0] = 1; stat_info.isam_bounds[1] = 2; @@ -314,50 +281,30 @@ void inv_prstat (BFiles bfs) } /* for */ } /* isamd */ if ( (isamd) && (isamd->method->debug>0)) - fprintf (stderr, "\n%d words using %d bytes\n", + fprintf (stderr, "\n%d words using %d bytes\n", stat_info.no_dict_entries, stat_info.no_dict_bytes); fprintf (stderr, " Occurrences Words\n"); - if ( (isamd) && (isamd->method->debug>0) ) - { - logf(LOG_LOG, "%d words using %d bytes", - stat_info.no_dict_entries, stat_info.no_dict_bytes); - logf(LOG_LOG, " Occurrences Words"); - } prev = 1; for (i = 0; stat_info.isam_bounds[i]; i++) { int here = stat_info.isam_bounds[i]; fprintf (stderr, "%7d-%-7d %7d\n", prev, here, stat_info.isam_occurrences[i]); - if ( (isamd) && (isamd->method->debug>0) && - stat_info.isam_occurrences[i] ) - { - logf(LOG_LOG,"%7d-%-7d %7d", - prev, here, stat_info.isam_occurrences[i]); - } prev = here+1; } fprintf (stderr, "%7d- %7d\n", prev, stat_info.isam_occurrences[i]); - if ( (isamd) && (isamd->method->debug>0) && - ( stat_info.isam_occurrences[i] || - stat_info.isam_occurrences[i+1]) ) - logf(LOG_LOG,"%7d- %7d", - prev, stat_info.isam_occurrences[i]); rec_close (&records); dict_close (dict); + if (isams) + isams_close (isams); if (isam) is_close (isam); if (isamc) isc_close (isamc); - if (isams) - isams_close (isams); - if (isamh) - isamh_close (isamh); if (isamd) isamd_close (isamd); - xmalloc_trav("unfreed"); /*! while hunting memory leaks */ } @@ -365,7 +312,25 @@ void inv_prstat (BFiles bfs) /* * * $Log: invstat.c,v $ - * Revision 1.18 1999-10-06 11:46:36 heikki + * 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