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
Index statistics working again
[idzebra-moved-to-github.git]
/
index
/
zebraapi.c
diff --git
a/index/zebraapi.c
b/index/zebraapi.c
index
ecc2b32
..
58b99be
100644
(file)
--- a/
index/zebraapi.c
+++ b/
index/zebraapi.c
@@
-2,7
+2,7
@@
* Copyright (C) 1995-2002, Index Data
* All rights reserved.
*
* Copyright (C) 1995-2002, Index Data
* All rights reserved.
*
- * $Id: zebraapi.c,v 1.56 2002-04-15 14:05:43 adam Exp $
+ * $Id: zebraapi.c,v 1.59 2002-04-26 08:44:47 adam Exp $
*/
#include <assert.h>
*/
#include <assert.h>
@@
-50,9
+50,6
@@
static struct zebra_register *zebra_register_open (ZebraService zs,
const char *reg_path);
static void zebra_register_close (ZebraService zs, struct zebra_register *reg);
const char *reg_path);
static void zebra_register_close (ZebraService zs, struct zebra_register *reg);
-static int zebra_begin_read (ZebraHandle zh);
-static void zebra_end_read (ZebraHandle zh);
-
ZebraHandle zebra_open (ZebraService zs)
{
ZebraHandle zh;
ZebraHandle zebra_open (ZebraService zs)
{
ZebraHandle zh;
@@
-187,6
+184,7
@@
struct zebra_register *zebra_register_open (ZebraService zs, const char *name,
reg->isam = 0;
reg->isamc = 0;
reg->isamd = 0;
reg->isam = 0;
reg->isamc = 0;
reg->isamd = 0;
+ reg->isamb = 0;
reg->zei = 0;
reg->matchDict = 0;
reg->zei = 0;
reg->matchDict = 0;
@@
-227,7
+225,7
@@
struct zebra_register *zebra_register_open (ZebraService zs, const char *name,
return 0;
}
}
return 0;
}
}
- else if (res_get_match (res, "isam", "i", ISAM_DEFAULT))
+ if (res_get_match (res, "isam", "i", ISAM_DEFAULT))
{
if (!(reg->isam = is_open (reg->bfs, FNAME_ISAM, key_compare, rw,
sizeof (struct it_key), res)))
{
if (!(reg->isam = is_open (reg->bfs, FNAME_ISAM, key_compare, rw,
sizeof (struct it_key), res)))
@@
-236,7
+234,7
@@
struct zebra_register *zebra_register_open (ZebraService zs, const char *name,
return 0;
}
}
return 0;
}
}
- else if (res_get_match (res, "isam", "c", ISAM_DEFAULT))
+ if (res_get_match (res, "isam", "c", ISAM_DEFAULT))
{
struct ISAMC_M_s isamc_m;
if (!(reg->isamc = isc_open (reg->bfs, FNAME_ISAMC,
{
struct ISAMC_M_s isamc_m;
if (!(reg->isamc = isc_open (reg->bfs, FNAME_ISAMC,
@@
-246,7
+244,7
@@
struct zebra_register *zebra_register_open (ZebraService zs, const char *name,
return 0;
}
}
return 0;
}
}
- else if (res_get_match (res, "isam", "d", ISAM_DEFAULT))
+ if (res_get_match (res, "isam", "d", ISAM_DEFAULT))
{
struct ISAMD_M_s isamd_m;
{
struct ISAMD_M_s isamd_m;
@@
-257,6
+255,17
@@
struct zebra_register *zebra_register_open (ZebraService zs, const char *name,
return 0;
}
}
return 0;
}
}
+ if (res_get_match (res, "isam", "b", ISAM_DEFAULT))
+ {
+ struct ISAMC_M_s isamc_m;
+
+ if (!(reg->isamb = isamb_open (reg->bfs, "isamb",
+ rw, key_isamc_m(res, &isamc_m))))
+ {
+ logf (LOG_WARN, "isamb_open");
+ return 0;
+ }
+ }
reg->zei = zebraExplain_open (reg->records, reg->dh,
res, rw, reg,
explain_extract);
reg->zei = zebraExplain_open (reg->records, reg->dh,
res, rw, reg,
explain_extract);
@@
-305,6
+314,8
@@
static void zebra_register_close (ZebraService zs, struct zebra_register *reg)
isc_close (reg->isamc);
if (reg->isamd)
isamd_close (reg->isamd);
isc_close (reg->isamc);
if (reg->isamd)
isamd_close (reg->isamd);
+ if (reg->isamb)
+ isamb_close (reg->isamb);
rec_close (®->records);
}
rec_close (®->records);
}
@@
-908,7
+919,7
@@
void zebra_get_state (ZebraHandle zh, char *val, int *seqno)
xfree (fname);
}
xfree (fname);
}
-static int zebra_begin_read (ZebraHandle zh)
+int zebra_begin_read (ZebraHandle zh)
{
int dirty = 0;
char val;
{
int dirty = 0;
char val;
@@
-923,6
+934,9
@@
static int zebra_begin_read (ZebraHandle zh)
zebra_flush_reg (zh);
return 0;
}
zebra_flush_reg (zh);
return 0;
}
+#if HAVE_SYS_TIMES_H
+ times (&zh->tms1);
+#endif
if (!zh->res)
{
(zh->trans_no)--;
if (!zh->res)
{
(zh->trans_no)--;
@@
-971,13
+985,21
@@
static int zebra_begin_read (ZebraHandle zh)
return 0;
}
return 0;
}
-static void zebra_end_read (ZebraHandle zh)
+void zebra_end_read (ZebraHandle zh)
{
(zh->trans_no)--;
if (zh->trans_no != 0)
return;
{
(zh->trans_no)--;
if (zh->trans_no != 0)
return;
+#if HAVE_SYS_TIMES_H
+ times (&zh->tms2);
+ logf (LOG_LOG, "user/system: %ld/%ld",
+ (long) (zh->tms2.tms_utime - zh->tms1.tms_utime),
+ (long) (zh->tms2.tms_stime - zh->tms1.tms_stime));
+
+#endif
+
zebra_unlock (zh->lock_normal);
zebra_unlock (zh->lock_shadow);
}
zebra_unlock (zh->lock_normal);
zebra_unlock (zh->lock_shadow);
}