projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make equivalent work with trunc=104, 105. Added test for it.
[idzebra-moved-to-github.git]
/
index
/
invstat.c
diff --git
a/index/invstat.c
b/index/invstat.c
index
ca1427d
..
bd8037d
100644
(file)
--- a/
index/invstat.c
+++ b/
index/invstat.c
@@
-1,6
+1,6
@@
-/* $Id: invstat.c,v 1.40 2004-09-09 10:08:05 heikki Exp $
- Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
- 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.
This file is part of the Zebra server.
@@
-36,8
+36,8
@@
struct inv_stat_info {
int isam_occurrences[20];
char tmp[128];
int isamb_levels[10][5];
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;
};
unsigned long cksum;
int dumpwords;
};
@@
-63,7
+63,7
@@
static void print_dict_item (ZebraMaps zm, const char *s, zint count,
*to++ = *res++;
}
*to = '\0';
*to++ = *res++;
}
*to = '\0';
- /* yaz_log (LOG_LOG, "%s", keybuf); */
+ /* yaz_log (YLOG_LOG, "%s", keybuf); */
printf("%10" ZINT_FORMAT0 " %s %d.%d - %d.%d\n", count, keybuf,
firstsys,firstseq, lastsys,lastseq);
}
printf("%10" ZINT_FORMAT0 " %s %d.%d - %d.%d\n", count, keybuf,
firstsys,firstseq, lastsys,lastseq);
}
@@
-74,7
+74,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;
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;
int firstsys=-1;
int firstseq=-1;
int lastsys=-1;
@@
-83,8
+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);
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)
{
if (stat_info->zh->reg->isams)
{
@@
-97,18
+97,6
@@
static int inv_stat_handle (char *name, const char *info, int pos,
while (isams_pp_read(pp, &key))
{
occurx++;
while (isams_pp_read(pp, &key))
{
occurx++;
-#if IT_KEY_NEW
-#else
- stat_info->cksum = stat_info->cksum * 65509 +
- key.sysno + 11 * key.seqno;
- if (-1==firstsys)
- {
- firstseq=key.seqno;
- firstsys=key.sysno;
- }
- lastsys=key.sysno;
- lastseq=key.seqno;
-#endif
}
assert (occurx == occur);
stat_info->no_isam_entries[0] += occur;
}
assert (occurx == occur);
stat_info->no_isam_entries[0] += occur;
@@
-120,27
+108,15
@@
static int inv_stat_handle (char *name, const char *info, int pos,
zint occurx = 0;
struct it_key key;
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++;
{
occurx++;
-#if IT_KEY_NEW
-#else
- stat_info->cksum = stat_info->cksum * 65509 +
- key.sysno + 11 * key.seqno;
- if (-1==firstsys)
- {
- firstseq=key.seqno;
- firstsys=key.sysno;
- }
- lastsys=key.sysno;
- lastseq=key.seqno;
-#endif
}
assert (occurx == occur);
}
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)
{
}
if (stat_info->zh->reg->isamb)
{
@@
-148,26
+124,14
@@
static int inv_stat_handle (char *name, const char *info, int pos,
struct it_key key;
int cat = (int) (isam_p & 3);
int level;
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);
while (isamb_pp_read(pp, &key))
{
occur++;
pp = isamb_pp_open_x(stat_info->zh->reg->isamb, isam_p, &level, 0);
while (isamb_pp_read(pp, &key))
{
occur++;
-#if IT_KEY_NEW
-#else
- stat_info->cksum = stat_info->cksum * 65509 +
- key.sysno + 11 * key.seqno;
- if (-1==firstsys)
- {
- firstseq=key.seqno;
- firstsys=key.sysno;
- }
- lastsys=key.sysno;
- lastseq=key.seqno;
-#endif
}
isamb_pp_close_x (pp, &size, &blocks);
stat_info->isamb_blocks[cat] += blocks;
}
isamb_pp_close_x (pp, &size, &blocks);
stat_info->isamb_blocks[cat] += blocks;
@@
-249,19
+213,19
@@
int zebra_register_statistics (ZebraHandle zh, int dumpdict)
if (zh->reg->isamc)
{
fprintf (stdout, " Blocks Occur Size KB Bytes/Entry\n");
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,
{
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)
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");
}
stat_info.no_isam_entries[i]);
fprintf (stdout, "\n");
}
@@
-277,11
+241,11
@@
int zebra_register_statistics (ZebraHandle zh, int dumpdict)
break;
fprintf (stdout, "Category %d\n", i);
fprintf (stdout, "Block size %d\n", bsize);
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, "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])
bsize);
for (j = 0; j<5; j++)
if (stat_info.isamb_levels[i][j])