X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzserver.c;h=faae52090d0a7287d165be56d7f671f18ff5698b;hb=f4c557cfebb4fa779a858c7d305081d4d92578da;hp=61d6154335c6e0af4d36753606caf015843cda42;hpb=040a8961a659f7768fac348093bb807c413d785f;p=idzebra-moved-to-github.git diff --git a/index/zserver.c b/index/zserver.c index 61d6154..faae520 100644 --- a/index/zserver.c +++ b/index/zserver.c @@ -1,10 +1,78 @@ /* - * Copyright (C) 1994-1995, Index Data I/S + * Copyright (C) 1995-1996, Index Data I/S * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: zserver.c,v $ - * Revision 1.23 1995-11-16 17:00:56 adam + * Revision 1.40 1996-06-04 10:19:02 adam + * Minor changes - removed include of ctype.h. + * + * Revision 1.39 1996/05/31 09:07:05 quinn + * Work on character-set handling + * + * Revision 1.38 1996/05/14 11:34:01 adam + * Scan support in multiple registers/databases. + * + * Revision 1.37 1996/05/14 06:16:48 adam + * Compact use/set bytes used in search service. + * + * Revision 1.36 1996/05/01 13:46:37 adam + * First work on multiple records in one file. + * New option, -offset, to the "unread" command in the filter module. + * + * Revision 1.35 1996/03/26 16:01:14 adam + * New setting lockPath: directory of various lock files. + * + * Revision 1.34 1996/03/20 09:36:46 adam + * Function dict_lookup_grep got extra parameter, init_pos, which marks + * from which position in pattern approximate pattern matching should occur. + * Approximate pattern matching is used in relevance=re-2. + * + * 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 + * though the blocks were already released. + * File traversal properly deletes records when needed. + * + * Revision 1.27 1995/11/27 13:58:54 adam + * New option -t. storeStore data implemented in server. + * + * Revision 1.26 1995/11/25 10:24:07 adam + * More record fields - they are enumerated now. + * New options: flagStoreData flagStoreKey. + * + * Revision 1.25 1995/11/21 15:29:13 adam + * Config file 'base' read by default by both indexer and server. + * + * Revision 1.24 1995/11/20 16:59:47 adam + * New update method: the 'old' keys are saved for each records. + * + * Revision 1.23 1995/11/16 17:00:56 adam * Better logging of rpn query. * * Revision 1.22 1995/11/16 15:34:55 adam @@ -91,6 +159,71 @@ 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) + { + zebTargetInfo_close (zi->zti, 0); + 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; + zi->zti = zebTargetInfo_open (zi->records, 0); + init_charmap (); + 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; @@ -101,44 +234,28 @@ bend_initresult *bend_init (bend_initrequest *q) r.handle = name; logf (LOG_DEBUG, "bend_init"); - data1_tabpath = res_get(common_resource, "data1_tabpath"); - server_info.sets = NULL; -#if RECORD_BASE - server_info.records = rec_open (0); -#else - if (!(server_info.sys_idx_fd = open (FNAME_SYS_IDX, O_RDONLY))) - { - logf (LOG_WARN|LOG_ERRNO, "sys_idx open fail"); - r.errcode = 1; - r.errstring = "sys_idx open fail"; - return &r; - } -#endif - if (!(server_info.fileDict = dict_open (FNAME_FILE_DICT, 10, 0))) - { - logf (LOG_WARN, "dict_open fail: fname dict"); - r.errcode = 1; - r.errstring = "dict_open fail: fname dict"; - return &r; - } - if (!(server_info.wordDict = dict_open (FNAME_WORD_DICT, 40, 0))) - { - logf (LOG_WARN, "dict_open fail: word dict"); - dict_close (server_info.fileDict); - 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)))) + + if (!common_resource) { - logf (LOG_WARN, "is_open fail: word isam"); - dict_close (server_info.wordDict); - dict_close (server_info.fileDict); - r.errcode = 1; - r.errstring = "is_open fail: word isam"; - return &r; + struct statserv_options_block *sob; + + sob = statserv_getcontrol (); + logf (LOG_LOG, "Reading resources from %s", sob->configname); + if (!(common_resource = res_open (sob->configname))) + { + logf (LOG_FATAL, "Cannot open resource `%s'", sob->configname); + exit (1); + } + bf_lockDir (res_get (common_resource, "lockPath")); + 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 = NULL; + server_info.wordDict = NULL; + server_info.wordIsam = NULL; server_info.odr = odr_createmem (ODR_ENCODE); return &r; } @@ -151,7 +268,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; @@ -159,7 +276,7 @@ bend_searchresult *bend_search (void *handle, bend_searchrequest *q, int *fd) logf (LOG_LOG, "ResultSet '%s'", q->setname); switch (q->query->which) { - case Z_Query_type_1: + case Z_Query_type_1: case Z_Query_type_101: r.errcode = rpn_search (&server_info, q->query->u.type_1, q->num_bases, q->basenames, q->setname, &r.hits); @@ -168,12 +285,40 @@ bend_searchresult *bend_search (void *handle, bend_searchrequest *q, int *fd) default: r.errcode = 107; } + register_unlock (&server_info); return &r; } -static int record_read (int fd, char *buf, size_t count) +static int record_offset; + +static int record_ext_read (void *fh, char *buf, size_t count) +{ + return read (*((int*) fh), buf, count); +} + +static off_t record_ext_seek (void *fh, off_t offset) +{ + return lseek (*((int*) fh), offset + record_offset, SEEK_SET); +} + +static int record_int_pos; +static char *record_int_buf; +static int record_int_len; + +static off_t record_int_seek (void *fh, off_t offset) { - return read (fd, buf, count); + return (off_t) (record_int_pos = offset); +} + +static int record_int_read (void *fh, char *buf, size_t count) +{ + int l = record_int_len - record_int_pos; + if (l <= 0) + return 0; + l = (l < count) ? l : count; + memcpy (buf, record_int_buf + record_int_pos, l); + record_int_pos += l; + return l; } static int record_fetch (ZServerInfo *zi, int sysno, int score, ODR stream, @@ -181,58 +326,68 @@ static int record_fetch (ZServerInfo *zi, int sysno, int score, ODR stream, oid_value *output_format, char **rec_bufp, int *rec_lenp) { -#if RECORD_BASE Record rec; -#else - char record_info[SYS_IDX_ENTRY_LEN]; -#endif char *fname, *file_type; RecType rt; + int fd = -1; struct recRetrieveCtrl retrieveCtrl; + char subType[128]; -#if RECORD_BASE rec = rec_get (zi->records, sysno); - file_type = rec->info[0]; - fname = rec->info[1]; -#else - if (lseek (zi->sys_idx_fd, sysno * SYS_IDX_ENTRY_LEN, - SEEK_SET) == -1) - { - logf (LOG_FATAL|LOG_ERRNO, "Retrieve: lseek of sys_idx"); - exit (1); - } - if (read (zi->sys_idx_fd, record_info, SYS_IDX_ENTRY_LEN) == -1) + if (!rec) { - logf (LOG_FATAL|LOG_ERRNO, "Retrieve: read of sys_idx"); - exit (1); + char *msg = "Record is deleted\n"; + *output_format = VAL_SUTRS; + *rec_bufp = msg; + *rec_lenp = strlen (msg); + logf (LOG_DEBUG, "rec_get fail on sysno=%d", sysno); + return 0; } - file_type = record_info; - fname = record_info + strlen(record_info) + 1; -#endif + 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); exit (1); } logf (LOG_DEBUG, "retrieve localno=%d score=%d", sysno, score); - if ((retrieveCtrl.fd = open (fname, O_RDONLY)) == -1) + if (rec->size[recInfo_storeData] > 0) { - char *msg = "Record doesn't exist"; - logf (LOG_WARN|LOG_ERRNO, "Retrieve: Open record file %s", fname); - *output_format = VAL_SUTRS; - *rec_bufp = msg; - *rec_lenp = strlen (msg); -#if RECORD_BASE - rec_rm (rec); -#endif - return 0; /* or 14: System error in presenting records */ + retrieveCtrl.readf = record_int_read; + retrieveCtrl.seekf = record_int_seek; + record_int_len = rec->size[recInfo_storeData]; + record_int_buf = rec->info[recInfo_storeData]; + record_int_pos = 0; + logf (LOG_DEBUG, "Internal retrieve. %d bytes", record_int_len); } + else + { + if ((fd = open (fname, O_RDONLY)) == -1) + { + 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; + *rec_lenp = strlen (msg); + rec_rm (&rec); + return 0; /* or 14: System error in presenting records */ + } + + memcpy (&record_offset, rec->info[recInfo_offset], + sizeof(record_offset)); + + retrieveCtrl.fh = &fd; + retrieveCtrl.readf = record_ext_read; + retrieveCtrl.seekf = record_ext_seek; + + record_ext_seek (retrieveCtrl.fh, 0); + } + retrieveCtrl.subType = subType; retrieveCtrl.localno = sysno; retrieveCtrl.score = score; retrieveCtrl.odr = stream; - retrieveCtrl.readf = record_read; retrieveCtrl.input_format = retrieveCtrl.output_format = input_format; retrieveCtrl.comp = comp; retrieveCtrl.diagnostic = 0; @@ -240,10 +395,10 @@ 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 RECORD_BASE - rec_rm (rec); -#endif + if (fd != -1) + close (fd); + rec_rm (&rec); + return retrieveCtrl.diagnostic; } @@ -253,6 +408,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"; @@ -266,23 +423,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; } @@ -291,6 +453,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; @@ -298,35 +461,35 @@ bend_scanresult *bend_scan (void *handle, bend_scanrequest *q, int *num) r.term_position = q->term_position; r.num_entries = q->num_entries; r.errcode = rpn_scan (&server_info, q->term, + q->attributeset, q->num_bases, q->basenames, &r.term_position, &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.fileDict); - dict_close (server_info.wordDict); - is_close (server_info.wordIsam); -#if RECORD_BASE - rec_close (&server_info.records); -#else - close (server_info.sys_idx_fd); -#endif + if (server_info.records) + { + dict_close (server_info.wordDict); + is_close (server_info.wordIsam); + rec_close (&server_info.records); + register_unlock (&server_info); + } return; } int main (int argc, char **argv) { - char *base_name = "base"; + struct statserv_options_block *sob; + + sob = statserv_getcontrol (); + strcpy (sob->configname, FNAME_CONFIG); + statserv_setcontrol (sob); - if (!(common_resource = res_open (base_name))) - { - logf (LOG_FATAL, "Cannot open resource `%s'", base_name); - exit (1); - } return statserv_main (argc, argv); }