X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzserver.c;h=e9fc32053c1acd669be2b50bd3e980f3e10a52ec;hb=c0c85097014e5b007075ab71d9b5bee412e28dd5;hp=8fa470f3c44f319b40eaac6236ea677af1994c06;hpb=e5652ee69c5a71f19ea16455b48d22a78fb5fcdd;p=idzebra-moved-to-github.git diff --git a/index/zserver.c b/index/zserver.c index 8fa470f..e9fc320 100644 --- a/index/zserver.c +++ b/index/zserver.c @@ -1,10 +1,163 @@ /* - * Copyright (C) 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.4 1995-09-06 10:33:04 adam + * Revision 1.47 1997-09-04 13:58:36 adam + * New retrieve/extract method tellf (added). + * Added O_BINARY for open calls. + * + * Revision 1.46 1997/07/28 08:30:47 adam + * Server returns diagnostic 14 when record doesn't exist. + * + * Revision 1.45 1996/12/23 15:30:45 adam + * Work on truncation. + * Bug fix: result sets weren't deleted after server shut down. + * + * Revision 1.44 1996/12/11 12:08:01 adam + * Added better compression. + * + * Revision 1.43 1996/11/15 15:03:58 adam + * Logging of execution speed by using the times(2) call. + * + * Revision 1.42 1996/11/08 11:10:36 adam + * Buffers used during file match got bigger. + * Compressed ISAM support everywhere. + * Bug fixes regarding masking characters in queries. + * Redesigned Regexp-2 queries. + * + * Revision 1.41 1996/10/29 14:09:56 adam + * Use of cisam system - enabled if setting isamc is 1. + * + * 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 + * Uses new record management system in both indexer and server. + * + * Revision 1.21 1995/11/01 16:25:52 quinn + * *** empty log message *** + * + * Revision 1.20 1995/10/27 14:00:12 adam + * Implemented detection of database availability. + * + * Revision 1.19 1995/10/17 18:02:11 adam + * New feature: databases. Implemented as prefix to words in dictionary. + * + * Revision 1.18 1995/10/16 14:03:09 quinn + * Changes to support element set names and espec1 + * + * Revision 1.17 1995/10/16 09:32:40 adam + * More work on relational op. + * + * Revision 1.16 1995/10/13 12:26:44 adam + * Optimization of truncation. + * + * Revision 1.15 1995/10/12 12:40:55 adam + * Bug fixes in rpn_prox. + * + * Revision 1.14 1995/10/09 16:18:37 adam + * Function dict_lookup_grep got extra client data parameter. + * + * Revision 1.13 1995/10/06 14:38:00 adam + * New result set method: r_score. + * Local no (sysno) and score is transferred to retrieveCtrl. + * + * Revision 1.12 1995/10/06 13:52:06 adam + * Bug fixes. Handler may abort further scanning. + * + * Revision 1.11 1995/10/06 10:43:57 adam + * Scan added. 'occurrences' in scan entries not set yet. + * + * Revision 1.10 1995/10/02 16:43:32 quinn + * Set default resulting record type in fetch. + * + * Revision 1.9 1995/10/02 15:18:52 adam + * New member in recRetrieveCtrl: diagnostic. + * + * Revision 1.8 1995/09/28 09:19:47 adam + * xfree/xmalloc used everywhere. + * Extract/retrieve method seems to work for text records. + * + * Revision 1.7 1995/09/27 16:17:32 adam + * More work on retrieve. + * + * Revision 1.6 1995/09/08 08:53:22 adam + * Record buffer maintained in server_info. + * + * Revision 1.5 1995/09/06 16:11:18 adam + * Option: only one word key per file. + * + * Revision 1.4 1995/09/06 10:33:04 adam * More work on present. Some log messages removed. * * Revision 1.3 1995/09/05 15:28:40 adam @@ -24,13 +177,116 @@ #include #include -#include "zserver.h" - -#include +#include +#include +#include #include +#define USE_TIMES 1 +#ifdef __linux__ +#define USE_TIMES 1 +#endif + +#if USE_TIMES +#include +#endif +#include "zserver.h" + ZServerInfo server_info; +#if USE_TIMES +static struct tms tms1; +static struct tms tms2; +#endif + +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 USE_TIMES + times (&tms1); +#endif + 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->dict); + if (zi->isam) + is_close (zi->isam); + if (zi->isamc) + isc_close (zi->isamc); + rec_close (&zi->records); + } + bf_cache (state); + zi->registerState = state; + zi->records = rec_open (0); + if (!(zi->dict = dict_open (FNAME_DICT, 40, 0))) + return -1; + zi->isam = NULL; + zi->isamc = NULL; + if (res_get_match (common_resource, "isam", "c", NULL)) + { + if (!(zi->isamc = isc_open (FNAME_ISAMC, 0, key_isamc_m()))) + return -1; + + } + else + { + if (!(zi->isam = is_open (FNAME_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 USE_TIMES + times (&tms2); + logf (LOG_LOG, "user/system: %ld/%ld", + (long) (tms2.tms_utime - tms1.tms_utime), + (long) (tms2.tms_stime - tms1.tms_stime)); +#endif + 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; @@ -40,34 +296,28 @@ bend_initresult *bend_init (bend_initrequest *q) r.errstring = 0; r.handle = name; - server_info.sets = NULL; - if (!(server_info.sys_idx_fd = open (FNAME_SYS_IDX, O_RDONLY))) - { - r.errcode = 1; - r.errstring = "dict_open fail: filedict"; - return &r; - } - if (!(server_info.fileDict = dict_open (FNAME_FILE_DICT, 5, 0))) - { - r.errcode = 1; - r.errstring = "dict_open fail: filedict"; - return &r; - } - if (!(server_info.wordDict = dict_open (FNAME_WORD_DICT, 20, 0))) - { - dict_close (server_info.fileDict); - r.errcode = 1; - r.errstring = "dict_open fail: worddict"; - return &r; - } - if (!(server_info.wordIsam = is_open (FNAME_WORD_ISAM, key_compare, 0))) + logf (LOG_DEBUG, "bend_init"); + + if (!common_resource) { - dict_close (server_info.wordDict); - dict_close (server_info.fileDict); - r.errcode = 1; - r.errstring = "is_open fail: wordisam"; - 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, "lockDir")); + data1_set_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.odr = odr_createmem (ODR_ENCODE); return &r; } @@ -79,95 +329,240 @@ 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; + + 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); + r.errstring = server_info.errString; break; default: r.errcode = 107; } + register_unlock (&server_info); return &r; } +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 off_t record_ext_tell (void *fh) +{ + return lseek (*((int*) fh), 0, SEEK_CUR) - record_offset; +} + +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 (off_t) (record_int_pos = offset); +} + +static off_t record_int_tell (void *fh) +{ + return (off_t) record_int_pos; +} + +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, + oid_value input_format, Z_RecordComposition *comp, + oid_value *output_format, char **rec_bufp, + int *rec_lenp, char **basenamep) +{ + Record rec; + char *fname, *file_type, *basename; + RecType rt; + int fd = -1; + struct recRetrieveCtrl retrieveCtrl; + char subType[128]; + + rec = rec_get (zi->records, sysno); + if (!rec) + { + logf (LOG_DEBUG, "rec_get fail on sysno=%d", sysno); + return 14; + } + file_type = rec->info[recInfo_fileType]; + fname = rec->info[recInfo_filename]; + basename = rec->info[recInfo_databaseName]; + *basenamep = odr_malloc (stream, strlen(basename)+1); + strcpy (*basenamep, basename); + + 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 (rec->size[recInfo_storeData] > 0) + { + retrieveCtrl.readf = record_int_read; + retrieveCtrl.seekf = record_int_seek; + retrieveCtrl.tellf = record_int_tell; + 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_BINARY|O_RDONLY)) == -1) + { + logf (LOG_WARN|LOG_ERRNO, "Retrieve fail; missing file: %s", + fname); + rec_rm (&rec); + return 14; + } + memcpy (&record_offset, rec->info[recInfo_offset], + sizeof(record_offset)); + + retrieveCtrl.fh = &fd; + retrieveCtrl.readf = record_ext_read; + retrieveCtrl.seekf = record_ext_seek; + retrieveCtrl.tellf = record_ext_tell; + + record_ext_seek (retrieveCtrl.fh, 0); + } + retrieveCtrl.subType = subType; + retrieveCtrl.localno = sysno; + retrieveCtrl.score = score; + retrieveCtrl.odr = stream; + retrieveCtrl.input_format = retrieveCtrl.output_format = input_format; + retrieveCtrl.comp = comp; + retrieveCtrl.diagnostic = 0; + (*rt->retrieve)(&retrieveCtrl); + *output_format = retrieveCtrl.output_format; + *rec_bufp = retrieveCtrl.rec_buf; + *rec_lenp = retrieveCtrl.rec_len; + if (fd != -1) + close (fd); + rec_rm (&rec); + + return retrieveCtrl.diagnostic; +} + bend_fetchresult *bend_fetch (void *handle, bend_fetchrequest *q, int *num) { static bend_fetchresult r; int positions[2]; - ZServerRecord *records; + ZServerSetSysno *records; + + register_lock (&server_info); r.errstring = 0; r.last_in_set = 0; r.basename = "base"; + odr_reset (server_info.odr); + server_info.errCode = 0; + positions[0] = q->number; - records = resultSetRecordGet (&server_info, q->setname, 1, positions); + records = resultSetSysnoGet (&server_info, q->setname, 1, positions); if (!records) { logf (LOG_DEBUG, "resultSetRecordGet, error"); r.errcode = 13; + register_unlock (&server_info); return &r; } - if (!records[0].buf) + if (!records[0].sysno) { r.errcode = 13; logf (LOG_DEBUG, "Out of range. pos=%d", q->number); + register_unlock (&server_info); return &r; } - r.len = records[0].size; - r.record = malloc (r.len+1); - strcpy (r.record, records[0].buf); - resultSetRecordDel (&server_info, records, 1); - r.format = VAL_SUTRS; - r.errcode = 0; + r.errcode = record_fetch (&server_info, records[0].sysno, + records[0].score, q->stream, q->format, + q->comp, &r.format, &r.record, &r.len, + &r.basename); + 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; } bend_scanresult *bend_scan (void *handle, bend_scanrequest *q, int *num) { - static struct scan_entry list[200]; - static char buf[200][200]; static bend_scanresult r; - int i; + int status; + + register_lock (&server_info); + odr_reset (server_info.odr); + server_info.errCode = 0; + server_info.errString = 0; r.term_position = q->term_position; r.num_entries = q->num_entries; - r.entries = list; - for (i = 0; i < r.num_entries; i++) - { - list[i].term = buf[i]; - sprintf(list[i].term, "term-%d", i+1); - list[i].occurrences = rand() % 100000; - } - r.errcode = 0; - r.errstring = 0; + 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); - close (server_info.sys_idx_fd); + if (server_info.records) + { + resultSetDestroy (&server_info); + dict_close (server_info.dict); + if (server_info.isam) + is_close (server_info.isam); + if (server_info.isamc) + isc_close (server_info.isamc); + 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); }