X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzebraapi.c;h=58b99beb0ba1b2b490a65729840e8039d9c97134;hb=3e72747f4b28856e5f684dbe8984f8fb28680e62;hp=a84c4c1f7c118ca48f0547304ece2c9ddf85b985;hpb=2b1851bd5565e3d21f9cf9a37661a584c063b75f;p=idzebra-moved-to-github.git diff --git a/index/zebraapi.c b/index/zebraapi.c index a84c4c1..58b99be 100644 --- a/index/zebraapi.c +++ b/index/zebraapi.c @@ -2,7 +2,7 @@ * Copyright (C) 1995-2002, Index Data * All rights reserved. * - * $Id: zebraapi.c,v 1.51 2002-04-04 14:14:13 adam Exp $ + * $Id: zebraapi.c,v 1.59 2002-04-26 08:44:47 adam Exp $ */ #include @@ -35,7 +35,6 @@ static void zebra_chdir (ZebraService zh) #endif } - static void zebra_flush_reg (ZebraHandle zh) { zebraExplain_flush (zh->reg->zei, 1, zh); @@ -44,7 +43,6 @@ static void zebra_flush_reg (ZebraHandle zh) zebra_index_merge (zh); } - static struct zebra_register *zebra_register_open (ZebraService zs, const char *name, int rw, int useshadow, @@ -52,14 +50,12 @@ static struct zebra_register *zebra_register_open (ZebraService zs, 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; - assert (zs); + if (!zs) + return 0; zh = (ZebraHandle) xmalloc (sizeof(*zh)); yaz_log (LOG_LOG, "zebra_open zs=%p returns %p", zs, zh); @@ -84,6 +80,8 @@ ZebraHandle zebra_open (ZebraService zs) zh->admin_databaseName = 0; + zh->shadow_enable = 1; + zebra_mutex_cond_lock (&zs->session_lock); zh->next = zs->sessions; @@ -96,36 +94,40 @@ ZebraHandle zebra_open (ZebraService zs) ZebraService zebra_start (const char *configName) { - ZebraService zh = xmalloc (sizeof(*zh)); + Res res; yaz_log (LOG_LOG, "zebra_start %s", configName); - zh->configName = xstrdup(configName); - zh->sessions = 0; - - if (!(zh->global_res = res_open (zh->configName, 0))) - { - logf (LOG_WARN, "Failed to read resources `%s'", zh->configName); - } + if (!(res = res_open (configName, 0))) + yaz_log (LOG_WARN, "Cannot read resources `%s'", configName); else { - logf (LOG_LOG, "Read resources `%s'", zh->configName); - } - zebra_chdir (zh); + ZebraService zh = xmalloc (sizeof(*zh)); - zebra_mutex_cond_init (&zh->session_lock); - if (!res_get (zh->global_res, "passwd")) - zh->passwd_db = NULL; - else - { - zh->passwd_db = passwd_db_open (); - if (!zh->passwd_db) - logf (LOG_WARN|LOG_ERRNO, "passwd_db_open failed"); - else - passwd_db_file (zh->passwd_db, res_get (zh->global_res, "passwd")); + yaz_log (LOG_LOG, "Read resources `%s'", configName); + + zh->global_res = res; + zh->configName = xstrdup(configName); + zh->sessions = 0; + + zebra_chdir (zh); + + zebra_mutex_cond_init (&zh->session_lock); + if (!res_get (zh->global_res, "passwd")) + zh->passwd_db = NULL; + else + { + zh->passwd_db = passwd_db_open (); + if (!zh->passwd_db) + logf (LOG_WARN|LOG_ERRNO, "passwd_db_open failed"); + else + passwd_db_file (zh->passwd_db, + res_get (zh->global_res, "passwd")); + } + zh->path_root = res_get (zh->global_res, "root"); + return zh; } - zh->path_root = res_get (zh->global_res, "root"); - return zh; + return 0; } static @@ -162,10 +164,11 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name, if (useshadow) bf_cache (reg->bfs, res_get (res, "shadow")); data1_set_tabpath (reg->dh, res_get(res, "profilePath")); + data1_set_tabroot (reg->dh, reg_path); reg->recTypes = recTypes_init (reg->dh); recTypes_default_handlers (reg->recTypes); - reg->zebra_maps = zebra_maps_open (res); + reg->zebra_maps = zebra_maps_open (res, reg_path); reg->rank_classes = NULL; reg->key_buf = 0; @@ -178,11 +181,10 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name, reg->sortIdx = 0; reg->isams = 0; reg->matchDict = 0; -#if ZMBOL reg->isam = 0; reg->isamc = 0; reg->isamd = 0; -#endif + reg->isamb = 0; reg->zei = 0; reg->matchDict = 0; @@ -223,8 +225,7 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name, return 0; } } -#if ZMBOL - 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))) @@ -233,7 +234,7 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name, 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, @@ -243,7 +244,7 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name, 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; @@ -254,7 +255,17 @@ struct zebra_register *zebra_register_open (ZebraService zs, const char *name, return 0; } } -#endif + 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); @@ -297,14 +308,14 @@ static void zebra_register_close (ZebraService zs, struct zebra_register *reg) sortIdx_close (reg->sortIdx); if (reg->isams) isams_close (reg->isams); -#if ZMBOL if (reg->isam) is_close (reg->isam); if (reg->isamc) isc_close (reg->isamc); if (reg->isamd) isamd_close (reg->isamd); -#endif + if (reg->isamb) + isamb_close (reg->isamb); rec_close (®->records); } @@ -384,7 +395,7 @@ void zebra_close (ZebraHandle zh) zebra_mutex_cond_unlock (&zs->session_lock); xfree (zh->reg_name); xfree (zh); - yaz_log (LOG_LOG, "zebra_close zh=%p end", zh);} +} struct map_baseinfo { ZebraHandle zh; @@ -400,21 +411,22 @@ static Res zebra_open_res (ZebraHandle zh) { Res res = 0; char fname[512]; - if (*zh->reg_name == 0) - { - res = zh->service->global_res; - yaz_log (LOG_LOG, "local res = global res"); - } - else if (zh->path_reg) + if (zh->path_reg) { sprintf (fname, "%.200s/zebra.cfg", zh->path_reg); - yaz_log (LOG_LOG, "res_open(%s)", fname); res = res_open (fname, zh->service->global_res); if (!res) - return 0; + res = zh->service->global_res; + } + else if (*zh->reg_name == 0) + { + res = zh->service->global_res; } else + { + yaz_log (LOG_WARN, "no register root specified"); return 0; /* no path for register - fail! */ + } return res; } @@ -557,7 +569,7 @@ int zebra_select_databases (ZebraHandle zh, int num_bases, { int i; const char *cp; - size_t len = 0; + int len = 0; char *new_reg = 0; if (num_bases < 1) @@ -596,7 +608,7 @@ int zebra_select_databases (ZebraHandle zh, int num_bases, zh->errCode = 23; return -1; } - if (len != cp - basenames[i] || + if (len != cp1 - basenames[i] || memcmp (basenames[i], new_reg, len)) { zh->errCode = 23; @@ -635,7 +647,6 @@ void zebra_search_rpn (ZebraHandle zh, ODR decode, ODR stream, zebra_end_read (zh); - logf(LOG_APP,"SEARCH:%d:",zh->hits); *hits = zh->hits; } @@ -908,7 +919,7 @@ void zebra_get_state (ZebraHandle zh, char *val, int *seqno) xfree (fname); } -static int zebra_begin_read (ZebraHandle zh) +int zebra_begin_read (ZebraHandle zh) { int dirty = 0; char val; @@ -923,6 +934,9 @@ static int zebra_begin_read (ZebraHandle zh) zebra_flush_reg (zh); return 0; } +#if HAVE_SYS_TIMES_H + times (&zh->tms1); +#endif if (!zh->res) { (zh->trans_no)--; @@ -971,13 +985,21 @@ static int zebra_begin_read (ZebraHandle zh) return 0; } -static void zebra_end_read (ZebraHandle zh) +void zebra_end_read (ZebraHandle zh) { (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); } @@ -987,7 +1009,7 @@ void zebra_begin_trans (ZebraHandle zh) int pass; int seqno = 0; char val = '?'; - const char *rval; + const char *rval = 0; assert (zh->res); @@ -998,12 +1020,19 @@ void zebra_begin_trans (ZebraHandle zh) } yaz_log (LOG_LOG, "zebra_begin_trans"); + + zh->records_inserted = 0; + zh->records_updated = 0; + zh->records_deleted = 0; + zh->records_processed = 0; + #if HAVE_SYS_TIMES_H times (&zh->tms1); #endif /* lock */ - rval = res_get (zh->res, "shadow"); + if (zh->shadow_enable) + rval = res_get (zh->res, "shadow"); for (pass = 0; pass < 2; pass++) { @@ -1077,6 +1106,11 @@ void zebra_end_trans (ZebraHandle zh) zebra_register_close (zh->service, zh->reg); zh->reg = 0; + + yaz_log (LOG_LOG, "Records: %7d i/u/d %d/%d/%d", + zh->records_processed, zh->records_inserted, + zh->records_updated, zh->records_deleted); + zebra_get_state (zh, &val, &seqno); if (val != 'd') { @@ -1154,7 +1188,9 @@ int zebra_commit (ZebraHandle zh) zebra_set_state (zh, 'c', seqno); logf (LOG_LOG, "commit start"); +#ifndef WIN32 sleep (2); +#endif bf_commitExec (bfs); #ifndef WIN32 sync (); @@ -1240,3 +1276,8 @@ void zebra_result (ZebraHandle zh, int *code, char **addinfo) *addinfo = zh->errString; } +void zebra_shadow_enable (ZebraHandle zh, int value) +{ + zh->shadow_enable = value; +} +