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
Bump copyright year
[idzebra-moved-to-github.git]
/
isamb
/
tstisamb.c
diff --git
a/isamb/tstisamb.c
b/isamb/tstisamb.c
index
7fe7d59
..
dd25b29
100644
(file)
--- a/
isamb/tstisamb.c
+++ b/
isamb/tstisamb.c
@@
-1,8
+1,5
@@
-/* $Id: tstisamb.c,v 1.27 2006-12-09 08:03:57 adam Exp $
- Copyright (C) 1995-2006
- Index Data ApS
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+ Copyright (C) 2004-2013 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
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
@@
-20,6
+17,9
@@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
#if HAVE_SYS_TIMES_H
#include <sys/times.h>
#endif
#if HAVE_SYS_TIMES_H
#include <sys/times.h>
#endif
@@
-130,7
+130,7
@@
void tst_insert(ISAMB isb, int n)
isamc_i.clientData = &ri;
isamc_i.read_item = code_read;
isamc_i.clientData = &ri;
isamc_i.read_item = code_read;
-
+
isamc_p = 0; /* new list */
isamb_merge (isb, &isamc_p , &isamc_i);
isamc_p = 0; /* new list */
isamb_merge (isb, &isamc_p , &isamc_i);
@@
-174,7
+174,7
@@
void tst_insert(ISAMB isb, int n)
isamc_i.clientData = &ri;
isamc_i.read_item = code_read;
isamc_i.clientData = &ri;
isamc_i.read_item = code_read;
-
+
isamb_merge (isb, &isamc_p , &isamc_i);
/* delete a number of entries (odd ones) */
isamb_merge (isb, &isamc_p , &isamc_i);
/* delete a number of entries (odd ones) */
@@
-187,7
+187,7
@@
void tst_insert(ISAMB isb, int n)
isamc_i.clientData = &ri;
isamc_i.read_item = code_read;
isamc_i.clientData = &ri;
isamc_i.read_item = code_read;
-
+
isamb_merge (isb, &isamc_p, &isamc_i);
if (isamc_p)
isamb_merge (isb, &isamc_p, &isamc_i);
if (isamc_p)
@@
-216,13
+216,13
@@
void tst_forward(ISAMB isb, int n)
isamc_i.clientData = &ri;
isamc_i.read_item = code_read;
isamc_i.clientData = &ri;
isamc_i.read_item = code_read;
-
+
isamc_p = 0;
isamb_merge (isb, &isamc_p, &isamc_i);
/* read the entries */
pp = isamb_pp_open (isb, isamc_p, 1);
isamc_p = 0;
isamb_merge (isb, &isamc_p, &isamc_i);
/* read the entries */
pp = isamb_pp_open (isb, isamc_p, 1);
-
+
for (i = 0; i<ri.max; i +=2 )
{
int x = -1;
for (i = 0; i<ri.max; i +=2 )
{
int x = -1;
@@
-237,7
+237,7
@@
void tst_forward(ISAMB isb, int n)
ri.no++;
}
isamb_pp_close(pp);
ri.no++;
}
isamb_pp_close(pp);
-
+
pp = isamb_pp_open (isb, isamc_p, 1);
for (i = 0; i<ri.max; i += 100)
{
pp = isamb_pp_open (isb, isamc_p, 1);
for (i = 0; i<ri.max; i += 100)
{
@@
-301,10
+301,10
@@
void tst_append(ISAMB isb, int n)
ri.val = 0;
ri.step = 1;
ri.insertMode = 1;
ri.val = 0;
ri.step = 1;
ri.insertMode = 1;
-
+
isamc_i.clientData = &ri;
isamc_i.read_item = code_read;
isamc_i.clientData = &ri;
isamc_i.read_item = code_read;
-
+
isamb_merge (isb, &isamb_p , &isamc_i);
}
}
isamb_merge (isb, &isamb_p , &isamc_i);
}
}
@@
-329,7
+329,7
@@
int tst_random_read(void *vp, char **dst, int *insertMode)
}
if (ri->idx >= ri->max)
return 0;
}
if (ri->idx >= ri->max)
return 0;
-
+
if (ri->delta[ri->idx] > 0)
{
ri->level++;
if (ri->delta[ri->idx] > 0)
{
ri->level++;
@@
-357,7
+357,7
@@
void tst_random(ISAMB isb, int n, int rounds, int max_dups)
int i, j;
for (i = 0; i<n; i++)
freq[i] = 0;
int i, j;
for (i = 0; i<n; i++)
freq[i] = 0;
-
+
for (j = 0; j<rounds; j++)
{
yaz_log(YLOG_DEBUG, "round %d", j);
for (j = 0; j<rounds; j++)
{
yaz_log(YLOG_DEBUG, "round %d", j);
@@
-372,18
+372,18
@@
void tst_random(ISAMB isb, int n, int rounds, int max_dups)
{
ISAMC_I isamc_i;
struct random_read_info ri;
{
ISAMC_I isamc_i;
struct random_read_info ri;
-
+
ri.delta = delta;
ri.idx = 0;
ri.max = n;
ri.level = 0;
ri.delta = delta;
ri.idx = 0;
ri.max = n;
ri.level = 0;
-
+
isamc_i.clientData = &ri;
isamc_i.read_item = tst_random_read;
isamb_merge (isb, &isamb_p , &isamc_i);
}
isamc_i.clientData = &ri;
isamc_i.read_item = tst_random_read;
isamb_merge (isb, &isamb_p , &isamc_i);
}
-
+
yaz_log(YLOG_DEBUG, "dump %d", j);
isamb_dump(isb, isamb_p, log_pr);
yaz_log(YLOG_DEBUG, "dump %d", j);
isamb_dump(isb, isamb_p, log_pr);
@@
-464,7
+464,7
@@
void tst_minsert(ISAMB isb, int n)
isamc_i.clientData = &ri;
/* all have same value = 1 */
isamc_i.clientData = &ri;
/* all have same value = 1 */
- ri.val = 1;
+ ri.val = 1;
ri.step = 0;
isamc_i.read_item = code_read;
ri.step = 0;
isamc_i.read_item = code_read;
@@
-477,7
+477,7
@@
void tst_minsert(ISAMB isb, int n)
isamb_merge (isb, &isamb_p , &isamc_i);
isamb_dump(isb, isamb_p, log_pr);
isamb_merge (isb, &isamb_p , &isamc_i);
isamb_dump(isb, isamb_p, log_pr);
-
+
ri.no = 0;
ri.max = n - n/2;
ri.no = 0;
ri.max = n - n/2;
@@
-535,10
+535,10
@@
int main(int argc, char **argv)
BFiles bfs;
ISAMB isb;
ISAMC_M method;
BFiles bfs;
ISAMB isb;
ISAMC_M method;
-
+
if (argc == 2)
yaz_log_init_level(YLOG_ALL);
if (argc == 2)
yaz_log_init_level(YLOG_ALL);
-
+
/* setup method (attributes) */
method.compare_item = compare_item;
method.log_item = log_item;
/* setup method (attributes) */
method.compare_item = compare_item;
method.log_item = log_item;
@@
-580,7
+580,7
@@
int main(int argc, char **argv)
if (0)
identical_keys_tests(isb);
if (0)
identical_keys_tests(isb);
-
+
isamb_close(isb);
/* exit block system */
isamb_close(isb);
/* exit block system */
@@
-591,6
+591,7
@@
int main(int argc, char **argv)
/*
* Local variables:
* c-basic-offset: 4
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab