X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzebraapi.c;h=a2c2d550d2b963c78e9c830d8377994ebc8e1f9f;hb=087298c5eeb7746a1d0ded9067b1d582bd641a25;hp=21784de503595c0fd9bb8ed19b51bd6f02a54f99;hpb=1c3797bc503c1e7a109c8887d89d3ddda93bba71;p=idzebra-moved-to-github.git diff --git a/index/zebraapi.c b/index/zebraapi.c index 21784de..a2c2d55 100644 --- a/index/zebraapi.c +++ b/index/zebraapi.c @@ -3,7 +3,29 @@ * All rights reserved. * * $Log: zebraapi.c,v $ - * Revision 1.35 2000-07-07 12:49:20 adam + * Revision 1.41 2000-12-01 17:59:08 adam + * Fixed bug regarding online updates on WIN32. + * When zebra.cfg is not available the server will not abort. + * + * Revision 1.40 2000/11/29 15:21:31 adam + * Fixed problem with passwd db. + * + * Revision 1.39 2000/11/29 14:24:01 adam + * Script configure uses yaz pthreads options. Added locking for + * zebra_register_{lock,unlock}. + * + * Revision 1.38 2000/11/08 13:46:58 adam + * Fixed scan: server could break if bad attribute/database was selected. + * Work on remote update. + * + * Revision 1.37 2000/10/17 12:37:09 adam + * Fixed notification of live-updates. Fixed minor problem with mf_init + * where it didn't handle shadow area file names correctly. + * + * Revision 1.36 2000/09/06 08:59:36 adam + * Using read-only (for now) for server. + * + * Revision 1.35 2000/07/07 12:49:20 adam * Optimized resultSetInsert{Rank,Sort}. * * Revision 1.34 2000/06/09 13:56:38 ian @@ -159,8 +181,13 @@ static void extract_index (ZebraHandle zh); static void zebra_register_unlock (ZebraHandle zh); -static int zebra_register_lock (ZebraHandle zh) +static int zebra_register_activate (ZebraService zh, int rw); +static int zebra_register_deactivate (ZebraService zh); + +static int zebra_register_lock (ZebraHandle zh, int rw) { + time_t lastChange; + int state; zh->errCode = 0; zh->errString = 0; if (!zh->service->active) @@ -168,14 +195,59 @@ static int zebra_register_lock (ZebraHandle zh) zh->errCode = 1019; return 1; } + #if HAVE_SYS_TIMES_H times (&zh->tms1); #endif + + zebra_mutex_cond_lock (&zh->service->session_lock); + + state = zebra_server_lock_get_state(zh->service, &lastChange); + + zebra_server_lock (zh->service, state); + + switch (state) + { + case 'c': + state = 1; + break; + default: + state = 0; + } + if (rw) + logf (LOG_LOG, "Register in read/write mode"); + else if (zh->service->registerState == state) + { + logf (LOG_LOG, "registerChange = %ld lastChange = %ld", + (long) zh->service->registerChange, (long)lastChange); + if (zh->service->registerChange >= lastChange) + { + return 0; + } + logf (LOG_LOG, "Register completely updated since last access"); + } + else if (zh->service->registerState == -1) + logf (LOG_LOG, "Reading register using state %d pid=%ld", state, + (long) getpid()); + else + logf (LOG_LOG, "Register has changed state from %d to %d", + zh->service->registerState, state); + zh->service->registerChange = lastChange; + + zebra_register_deactivate (zh->service); + + zh->service->registerState = state; + + zebra_register_activate (zh->service, rw); return 0; } + static void zebra_register_unlock (ZebraHandle zh) { + if (zh->service->registerState != -1) + zebra_server_unlock (zh->service, zh->service->registerState); + zebra_mutex_cond_unlock (&zh->service->session_lock); #if HAVE_SYS_TIMES_H times (&zh->tms2); logf (LOG_LOG, "user/system: %ld/%ld", @@ -194,6 +266,7 @@ ZebraHandle zebra_open (ZebraService zs) return 0; zh = (ZebraHandle) xmalloc (sizeof(*zh)); + yaz_log (LOG_LOG, "zebra_open zs=%p returns %p", zs, zh); zh->service = zs; zh->sets = 0; @@ -211,13 +284,9 @@ ZebraHandle zebra_open (ZebraService zs) zebra_mutex_cond_unlock (&zs->session_lock); - logf(LOG_APP,"CONNECT:"); - return zh; } -static int zebra_register_activate (ZebraService zh); -static int zebra_register_deactivate (ZebraService zh); ZebraService zebra_start (const char *configName) { @@ -228,23 +297,44 @@ ZebraService zebra_start (const char *configName) zh->configName = xstrdup(configName); zh->sessions = 0; zh->stop_flag = 0; - zh->active = 0; + zh->active = 1; + + zh->registerState = -1; + zh->registerChange = 0; + + if (!(zh->res = res_open (zh->configName))) + { + logf (LOG_WARN, "Failed to read resources `%s'", zh->configName); +// return zh; + } + zebra_chdir (zh); + zebra_server_lock_init (zh); zebra_mutex_cond_init (&zh->session_lock); - zebra_register_activate (zh); + if (!res_get (zh->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->res, "passwd")); + } + return zh; } -static int zebra_register_activate (ZebraService zh) +static int zebra_register_activate (ZebraService zh, int rw) { - if (zh->active) - return 0; - yaz_log (LOG_LOG, "zebra_register_activate"); - if (!(zh->res = res_open (zh->configName))) + if (zh->active > 1) { - logf (LOG_WARN, "Failed to read resources `%s'", zh->configName); - return -1; + yaz_log (LOG_LOG, "zebra_register_activate (ignored since active=%d)", + zh->active); + return 0; } - zebra_chdir (zh); + yaz_log (LOG_LOG, "zebra_register_activate shadow=%s", + zh->registerState ? "yes" : "no"); + zh->dh = data1_create (); if (!zh->dh) return -1; @@ -255,9 +345,8 @@ static int zebra_register_activate (ZebraService zh) return -1; } bf_lockDir (zh->bfs, res_get (zh->res, "lockDir")); + bf_cache (zh->bfs, zh->registerState ? res_get (zh->res, "shadow") : NULL); data1_set_tabpath (zh->dh, res_get(zh->res, "profilePath")); - zh->registerState = -1; /* trigger open of registers! */ - zh->registerChange = 0; zh->recTypes = recTypes_init (zh->dh); recTypes_default_handlers (zh->recTypes); @@ -278,28 +367,17 @@ static int zebra_register_activate (ZebraService zh) zebraRankInstall (zh, rank1_class); - if (!res_get (zh->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->res, "passwd")); - } - - if (!(zh->records = rec_open (zh->bfs, 1, 0))) + if (!(zh->records = rec_open (zh->bfs, rw, 0))) { logf (LOG_WARN, "rec_open"); return -1; } - if (!(zh->dict = dict_open (zh->bfs, FNAME_DICT, 80, 1, 0))) + if (!(zh->dict = dict_open (zh->bfs, FNAME_DICT, 80, rw, 0))) { logf (LOG_WARN, "dict_open"); return -1; } - if (!(zh->sortIdx = sortIdx_open (zh->bfs, 0))) + if (!(zh->sortIdx = sortIdx_open (zh->bfs, rw))) { logf (LOG_WARN, "sortIdx_open"); return -1; @@ -307,7 +385,7 @@ static int zebra_register_activate (ZebraService zh) if (res_get_match (zh->res, "isam", "s", ISAM_DEFAULT)) { struct ISAMS_M_s isams_m; - if (!(zh->isams = isams_open (zh->bfs, FNAME_ISAMS, 1, + if (!(zh->isams = isams_open (zh->bfs, FNAME_ISAMS, rw, key_isams_m(zh->res, &isams_m)))) { logf (LOG_WARN, "isams_open"); @@ -317,7 +395,7 @@ static int zebra_register_activate (ZebraService zh) #if ZMBOL else if (res_get_match (zh->res, "isam", "i", ISAM_DEFAULT)) { - if (!(zh->isam = is_open (zh->bfs, FNAME_ISAM, key_compare, 1, + if (!(zh->isam = is_open (zh->bfs, FNAME_ISAM, key_compare, rw, sizeof (struct it_key), zh->res))) { logf (LOG_WARN, "is_open"); @@ -328,7 +406,7 @@ static int zebra_register_activate (ZebraService zh) { struct ISAMC_M_s isamc_m; if (!(zh->isamc = isc_open (zh->bfs, FNAME_ISAMC, - 1, key_isamc_m(zh->res, &isamc_m)))) + rw, key_isamc_m(zh->res, &isamc_m)))) { logf (LOG_WARN, "isc_open"); return -1; @@ -339,7 +417,7 @@ static int zebra_register_activate (ZebraService zh) struct ISAMD_M_s isamd_m; if (!(zh->isamd = isamd_open (zh->bfs, FNAME_ISAMD, - 1, key_isamd_m(zh->res, &isamd_m)))) + rw, key_isamd_m(zh->res, &isamd_m)))) { logf (LOG_WARN, "isamd_open"); return -1; @@ -347,27 +425,25 @@ static int zebra_register_activate (ZebraService zh) } #endif zh->zei = zebraExplain_open (zh->records, zh->dh, - zh->res, 1, 0 /* rGroup */, + zh->res, rw, 0 /* rGroup */, explain_extract); if (!zh->zei) { logf (LOG_WARN, "Cannot obtain EXPLAIN information"); return -1; } - zh->active = 1; + zh->active = 2; yaz_log (LOG_LOG, "zebra_register_activate ok"); return 0; } void zebra_admin_shutdown (ZebraHandle zh) { - zebraExplain_flush (zh->service->zei, 1, zh); - extract_index (zh); - zebra_mutex_cond_lock (&zh->service->session_lock); zh->service->stop_flag = 1; if (!zh->service->sessions) zebra_register_deactivate(zh->service); + zh->service->active = 0; zebra_mutex_cond_unlock (&zh->service->session_lock); } @@ -377,66 +453,76 @@ void zebra_admin_start (ZebraHandle zh) zh->errCode = 0; zebra_mutex_cond_lock (&zs->session_lock); if (!zs->stop_flag) - zebra_register_activate(zs); + zh->service->active = 1; zebra_mutex_cond_unlock (&zs->session_lock); } -static int zebra_register_deactivate (ZebraService zh) +static int zebra_register_deactivate (ZebraService zs) { - zh->stop_flag = 0; - if (!zh->active) + zs->stop_flag = 0; + if (zs->active <= 1) + { + yaz_log(LOG_LOG, "zebra_register_deactivate (ignored since active=%d)", + zs->active); return 0; + } yaz_log(LOG_LOG, "zebra_register_deactivate"); - zebra_chdir (zh); - if (zh->records) + zebra_chdir (zs); + if (zs->records) { - zebraExplain_close (zh->zei, 0); - dict_close (zh->dict); - sortIdx_close (zh->sortIdx); - if (zh->isams) - isams_close (zh->isams); + zebraExplain_close (zs->zei, 0); + dict_close (zs->dict); + sortIdx_close (zs->sortIdx); + if (zs->isams) + isams_close (zs->isams); #if ZMBOL - if (zh->isam) - is_close (zh->isam); - if (zh->isamc) - isc_close (zh->isamc); - if (zh->isamd) - isamd_close (zh->isamd); + if (zs->isam) + is_close (zs->isam); + if (zs->isamc) + isc_close (zs->isamc); + if (zs->isamd) + isamd_close (zs->isamd); #endif - rec_close (&zh->records); + rec_close (&zs->records); } - recTypes_destroy (zh->recTypes); - zebra_maps_close (zh->zebra_maps); - zebraRankDestroy (zh); - bfs_destroy (zh->bfs); - data1_destroy (zh->dh); - - if (zh->passwd_db) - passwd_db_close (zh->passwd_db); - res_close (zh->res); - zh->active = 0; + recTypes_destroy (zs->recTypes); + zebra_maps_close (zs->zebra_maps); + zebraRankDestroy (zs); + bfs_destroy (zs->bfs); + data1_destroy (zs->dh); + + if (zs->passwd_db) + passwd_db_close (zs->passwd_db); + zs->active = 1; return 0; } -void zebra_stop(ZebraService zh) +void zebra_stop(ZebraService zs) { - if (!zh) + if (!zs) return ; yaz_log (LOG_LOG, "zebra_stop"); - assert (!zh->sessions); + zebra_mutex_cond_lock (&zs->session_lock); + while (zs->sessions) + zebra_close (zs->sessions); - zebra_mutex_cond_destroy (&zh->session_lock); + zebra_mutex_cond_unlock (&zs->session_lock); - zebra_register_deactivate(zh); - xfree (zh->configName); - xfree (zh); + zebra_mutex_cond_destroy (&zs->session_lock); + + zebra_register_deactivate(zs); + res_close (zs->res); + xfree (zs->configName); + xfree (zs); } void zebra_close (ZebraHandle zh) { ZebraService zs = zh->service; struct zebra_session **sp; + + yaz_log (LOG_LOG, "zebra_close zh=%p", zh); if (!zh) return ; resultSetDestroy (zh, -1, 0, 0); @@ -538,7 +624,7 @@ void zebra_search_rpn (ZebraHandle zh, ODR stream, ODR decode, const char *setname) { zh->hits = 0; - if (zebra_register_lock (zh)) + if (zebra_register_lock (zh, 0)) return; map_basenames (zh, stream, &num_bases, &basenames); resultSetAddRPN (zh, stream, decode, query, num_bases, basenames, setname); @@ -556,7 +642,7 @@ void zebra_records_retrieve (ZebraHandle zh, ODR stream, ZebraPosSet poset; int i, *pos_array; - if (zebra_register_lock (zh)) + if (zebra_register_lock (zh, 0)) return; pos_array = (int *) xmalloc (num_recs * sizeof(*pos_array)); for (i = 0; imem, num_input_setnames, input_setnames, output_setname, sort_sequence, sort_status); @@ -634,7 +720,7 @@ int zebra_deleleResultSet(ZebraHandle zh, int function, int *statuses) { int i, status; - if (zebra_register_lock (zh)) + if (zebra_register_lock (zh, 0)) return Z_DeleteStatus_systemProblemAtTarget; switch (function) { @@ -687,24 +773,24 @@ int zebra_auth (ZebraService zh, const char *user, const char *pass) void zebra_admin_import_begin (ZebraHandle zh, const char *database) { - if (zebra_register_lock (zh)) + if (zebra_register_lock (zh, 1)) return; xfree (zh->admin_databaseName); zh->admin_databaseName = xstrdup(database); - zebra_register_unlock(zh); } void zebra_admin_import_end (ZebraHandle zh) { zebraExplain_flush (zh->service->zei, 1, zh); extract_index (zh); + zebra_register_unlock (zh); } void zebra_admin_import_segment (ZebraHandle zh, Z_Segment *segment) { int sysno; int i; - if (zebra_register_lock (zh)) + if (zh->service->active < 2) return; for (i = 0; inum_segmentRecords; i++) { @@ -736,13 +822,12 @@ void zebra_admin_import_segment (ZebraHandle zh, Z_Segment *segment) } } } - zebra_register_unlock(zh); } void zebra_admin_create (ZebraHandle zh, const char *database) { ZebraService zs = zh->service; - if (zebra_register_lock(zh)) + if (zebra_register_lock(zh, 1)) { zh->errCode = 1019; return; @@ -753,6 +838,8 @@ void zebra_admin_create (ZebraHandle zh, const char *database) zh->errCode = 224; zh->errString = "Database already exist"; } + zebraExplain_flush (zh->service->zei, 1, zh); + extract_index (zh); zebra_register_unlock(zh); }