X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzserver.c;h=93767a89da81731a738cea3b4b3c95f1d5b12508;hb=5997f85a9dbeab93bae3492139ed20fea878372c;hp=2bfe9c88b09eda4f5373369ae7b2b9f2974b64e2;hpb=162fa86044b5aa303c03fa26f1ecf140b34060d5;p=idzebra-moved-to-github.git diff --git a/index/zserver.c b/index/zserver.c index 2bfe9c8..93767a8 100644 --- a/index/zserver.c +++ b/index/zserver.c @@ -4,7 +4,31 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: zserver.c,v $ - * Revision 1.28 1995-11-28 09:09:48 adam + * Revision 1.33 1996-01-17 14:57:56 adam + * Prototype changed for reader functions in extract/retrieve. File + * is identified by 'void *' instead of 'int. + * + * Revision 1.32 1995/12/11 09:12:58 adam + * The rec_get function returns NULL if record doesn't exist - will + * happen in the server if the result set records have been deleted since + * the creation of the set (i.e. the search). + * The server saves a result temporarily if it is 'volatile', i.e. the + * set is register dependent. + * + * Revision 1.31 1995/12/08 16:22:56 adam + * Work on update while servers are running. Three lock files introduced. + * The servers reload their registers when necessary, but they don't + * reestablish result sets yet. + * + * Revision 1.30 1995/12/07 17:38:48 adam + * Work locking mechanisms for concurrent updates/commit. + * + * Revision 1.29 1995/12/04 14:22:32 adam + * Extra arg to recType_byName. + * Started work on new regular expression parsed input to + * structured records. + * + * Revision 1.28 1995/11/28 09:09:48 adam * Zebra config renamed. * Use setting 'recordId' to identify record now. * Bug fix in recindex.c: rec_release_blocks was invokeded even @@ -111,6 +135,68 @@ ZServerInfo server_info; +static int register_lock (ZServerInfo *zi) +{ + time_t lastChange; + int state = zebraServerLockGetState(&lastChange); + + switch (state) + { + case 'c': + state = 1; + break; + default: + state = 0; + } + zebraServerLock (state); + if (zi->registerState == state) + { + if (zi->registerChange >= lastChange) + return 0; + logf (LOG_LOG, "Register completely updated since last access"); + } + else if (zi->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", + zi->registerState, state); + zi->registerChange = lastChange; + if (zi->records) + { + dict_close (zi->wordDict); + is_close (zi->wordIsam); + rec_close (&zi->records); + } + bf_cache (state); + zi->registerState = state; + zi->records = rec_open (0); + if (!(zi->wordDict = dict_open (FNAME_WORD_DICT, 40, 0))) + return -1; + if (!(zi->wordIsam = is_open (FNAME_WORD_ISAM, key_compare, 0, + sizeof (struct it_key)))) + return -1; + return 0; +} + +static void register_unlock (ZServerInfo *zi) +{ + static int waitSec = -1; + + if (waitSec == -1) + { + char *s = res_get (common_resource, "debugRequestWait"); + if (s) + waitSec = atoi (s); + else + waitSec = 0; + } + if (waitSec > 0) + sleep (waitSec); + if (zi->registerState != -1) + zebraServerUnlock (zi->registerState); +} + bend_initresult *bend_init (bend_initrequest *q) { static bend_initresult r; @@ -134,27 +220,14 @@ bend_initresult *bend_init (bend_initrequest *q) exit (1); } } - data1_tabpath = res_get(common_resource, "profilePath"); server_info.sets = NULL; + server_info.registerState = -1; /* trigger open of registers! */ + server_info.registerChange = 0; - server_info.records = rec_open (0); - if (!(server_info.wordDict = dict_open (FNAME_WORD_DICT, 40, 0))) - { - logf (LOG_WARN, "dict_open fail: word dict"); - r.errcode = 1; - r.errstring = "dict_open fail: word dict"; - return &r; - } - if (!(server_info.wordIsam = is_open (FNAME_WORD_ISAM, key_compare, 0, - sizeof (struct it_key)))) - { - logf (LOG_WARN, "is_open fail: word isam"); - dict_close (server_info.wordDict); - r.errcode = 1; - r.errstring = "is_open fail: word isam"; - return &r; - } + server_info.records = NULL; + server_info.wordDict = NULL; + server_info.wordIsam = NULL; server_info.odr = odr_createmem (ODR_ENCODE); return &r; } @@ -167,7 +240,7 @@ bend_searchresult *bend_search (void *handle, bend_searchrequest *q, int *fd) r.errstring = 0; r.hits = 0; - + register_lock (&server_info); odr_reset (server_info.odr); server_info.errCode = 0; server_info.errString = NULL; @@ -184,19 +257,20 @@ bend_searchresult *bend_search (void *handle, bend_searchrequest *q, int *fd) default: r.errcode = 107; } + register_unlock (&server_info); return &r; } -static int record_ext_read (int fd, char *buf, size_t count) +static int record_ext_read (void *fh, char *buf, size_t count) { - return read (fd, buf, count); + return read (*((int*) fh), buf, count); } static int record_int_pos; static char *record_int_buf; static int record_int_len; -static int record_int_read (int fd, char *buf, size_t count) +static int record_int_read (void *fh, char *buf, size_t count) { int l = record_int_len - record_int_pos; if (l <= 0) @@ -215,13 +289,23 @@ static int record_fetch (ZServerInfo *zi, int sysno, int score, ODR stream, Record rec; char *fname, *file_type; RecType rt; + int fd = -1; struct recRetrieveCtrl retrieveCtrl; + char subType[128]; rec = rec_get (zi->records, sysno); + if (!rec) + { + char *msg = "Record is deleted\n"; + *output_format = VAL_SUTRS; + *rec_bufp = msg; + *rec_lenp = strlen (msg); + return 0; + } file_type = rec->info[recInfo_fileType]; fname = rec->info[recInfo_filename]; - if (!(rt = recType_byName (file_type))) + if (!(rt = recType_byName (file_type, subType))) { logf (LOG_FATAL|LOG_ERRNO, "Retrieve: Cannot handle type %s", file_type); @@ -238,9 +322,9 @@ static int record_fetch (ZServerInfo *zi, int sysno, int score, ODR stream, } else { - if ((retrieveCtrl.fd = open (fname, O_RDONLY)) == -1) + if ((fd = open (fname, O_RDONLY)) == -1) { - char *msg = "Record doesn't exist"; + char *msg = "Record doesn't exist\n"; logf (LOG_WARN|LOG_ERRNO, "Retrieve: Open record file %s", fname); *output_format = VAL_SUTRS; *rec_bufp = msg; @@ -248,8 +332,10 @@ static int record_fetch (ZServerInfo *zi, int sysno, int score, ODR stream, rec_rm (&rec); return 0; /* or 14: System error in presenting records */ } + retrieveCtrl.fh = &fd; retrieveCtrl.readf = record_ext_read; } + retrieveCtrl.subType = subType; retrieveCtrl.localno = sysno; retrieveCtrl.score = score; retrieveCtrl.odr = stream; @@ -260,7 +346,8 @@ static int record_fetch (ZServerInfo *zi, int sysno, int score, ODR stream, *output_format = retrieveCtrl.output_format; *rec_bufp = retrieveCtrl.rec_buf; *rec_lenp = retrieveCtrl.rec_len; - close (retrieveCtrl.fd); + if (fd != -1) + close (fd); rec_rm (&rec); return retrieveCtrl.diagnostic; @@ -272,6 +359,8 @@ bend_fetchresult *bend_fetch (void *handle, bend_fetchrequest *q, int *num) int positions[2]; ZServerSetSysno *records; + register_lock (&server_info); + r.errstring = 0; r.last_in_set = 0; r.basename = "base"; @@ -285,23 +374,28 @@ bend_fetchresult *bend_fetch (void *handle, bend_fetchrequest *q, int *num) { logf (LOG_DEBUG, "resultSetRecordGet, error"); r.errcode = 13; + register_unlock (&server_info); return &r; } if (!records[0].sysno) { r.errcode = 13; logf (LOG_DEBUG, "Out of range. pos=%d", q->number); + register_unlock (&server_info); return &r; } r.errcode = record_fetch (&server_info, records[0].sysno, records[0].score, q->stream, q->format, q->comp, &r.format, &r.record, &r.len); resultSetSysnoDel (&server_info, records, 1); + register_unlock (&server_info); return &r; } bend_deleteresult *bend_delete (void *handle, bend_deleterequest *q, int *num) { + register_lock (&server_info); + register_unlock (&server_info); return 0; } @@ -310,6 +404,7 @@ bend_scanresult *bend_scan (void *handle, bend_scanrequest *q, int *num) static bend_scanresult r; int status; + register_lock (&server_info); odr_reset (server_info.odr); server_info.errCode = 0; server_info.errString = 0; @@ -322,14 +417,19 @@ bend_scanresult *bend_scan (void *handle, bend_scanrequest *q, int *num) &r.num_entries, &r.entries, &status); r.errstring = server_info.errString; r.status = status; + register_unlock (&server_info); return &r; } void bend_close (void *handle) { - dict_close (server_info.wordDict); - is_close (server_info.wordIsam); - rec_close (&server_info.records); + if (server_info.records) + { + dict_close (server_info.wordDict); + is_close (server_info.wordIsam); + rec_close (&server_info.records); + register_unlock (&server_info); + } return; }