X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzserver.h;h=a1bee7e41fc4d2ae74a66955066ebec6823b6636;hb=e5ebc859654d84aa9098142b34015648d8e333de;hp=31ef9c7759421021ec4b83f3b56f268e732b7026;hpb=85a2a0b28cb516d28ac70b7824f2b7d4b07e56ae;p=idzebra-moved-to-github.git diff --git a/index/zserver.h b/index/zserver.h index 31ef9c7..a1bee7e 100644 --- a/index/zserver.h +++ b/index/zserver.h @@ -1,10 +1,76 @@ /* - * Copyright (C) 1994-1998, Index Data I/S + * Copyright (C) 1994-2000, Index Data * All rights reserved. * Sebastian Hammer, Adam Dickmeiss * * $Log: zserver.h,v $ - * Revision 1.31 1998-05-20 10:12:23 adam + * Revision 1.50 2000-11-29 14:24:01 adam + * Script configure uses yaz pthreads options. Added locking for + * zebra_register_{lock,unlock}. + * + * Revision 1.49 2000/05/18 12:01:36 adam + * System call times(2) used again. More 64-bit fixes. + * + * Revision 1.48 2000/04/05 09:49:35 adam + * On Unix, zebra/z'mbol uses automake. + * + * Revision 1.47 2000/03/20 19:08:36 adam + * Added remote record import using Z39.50 extended services and Segment + * Requests. + * + * Revision 1.46 2000/03/15 15:00:31 adam + * First work on threaded version. + * + * Revision 1.45 1999/11/30 13:48:04 adam + * Improved installation. Updated for inclusion of YAZ header files. + * + * Revision 1.44 1999/11/04 15:00:45 adam + * Implemented delete result set(s). + * + * Revision 1.43 1999/07/14 10:59:27 adam + * Changed functions isc_getmethod, isams_getmethod. + * Improved fatal error handling (such as missing EXPLAIN schema). + * + * Revision 1.42 1999/05/26 07:49:13 adam + * C++ compilation. + * + * Revision 1.41 1999/05/12 13:08:06 adam + * First version of ISAMS. + * + * Revision 1.40 1998/11/16 16:03:45 adam + * Moved loggin utilities to Yaz. Was implemented in file zlogs.c. + * + * Revision 1.39 1998/10/16 08:14:35 adam + * Updated record control system. + * + * Revision 1.38 1998/09/22 10:03:44 adam + * Changed result sets to be persistent in the sense that they can + * be re-searched if needed. + * Fixed memory leak in rsm_or. + * + * Revision 1.37 1998/09/02 13:53:22 adam + * Extra parameter decode added to search routines to implement + * persistent queries. + * + * Revision 1.36 1998/06/24 12:16:16 adam + * Support for relations on text operands. Open range support in + * DFA module (i.e. [-j], [g-]). + * + * Revision 1.35 1998/06/23 15:33:35 adam + * Added feature to specify sort criteria in query (type 7 specifies + * sort flags). + * + * Revision 1.34 1998/06/22 11:36:50 adam + * Added authentication check facility to zebra. + * + * Revision 1.33 1998/06/12 12:22:14 adam + * Work on Zebra API. + * + * Revision 1.32 1998/05/27 16:57:47 adam + * Zebra returns surrogate diagnostic for single records when + * appropriate. + * + * Revision 1.31 1998/05/20 10:12:23 adam * Implemented automatic EXPLAIN database maintenance. * Modified Zebra to work with ASN.1 compiled version of YAZ. * @@ -110,26 +176,25 @@ * */ - -#ifndef USE_TIMES -#ifdef __linux__ -#define USE_TIMES 1 -#else -#define USE_TIMES 0 -#endif +#if HAVE_SYS_TIMES_H +#include #endif -#if USE_TIMES -#include +#if HAVE_PTHREADS_H +#include #endif -#include +#include #include #include +#include #include "index.h" +#include "zebraapi.h" #include "zinfo.h" +YAZ_BEGIN_CDECL + typedef struct { int sysno; int score; @@ -144,93 +209,133 @@ typedef struct zebra_rank_class { struct zebra_rank_class *next; } *ZebraRankClass; -struct zebra_info { - int registerState; /* 0 (no commit pages), 1 (use commit pages) */ - time_t registerChange; - ZebraSet sets; - Dict dict; - SortIdx sortIdx; +struct zebra_service { + char *configName; + struct zebra_session *sessions; + ISAMS isams; +#if ZMBOL ISAM isam; ISAMC isamc; + ISAMD isamd; +#endif + Dict dict; + SortIdx sortIdx; + int registerState; /* 0 (no commit pages), 1 (use commit pages) */ + time_t registerChange; + BFiles bfs; Records records; - int errCode; - int hits; - char *errString; ZebraExplainInfo zei; - data1_handle dh; - BFiles bfs; Res res; - ZebraLockHandle server_lock_cmt; ZebraLockHandle server_lock_org; char *server_path_prefix; -#if USE_TIMES - struct tms tms1; - struct tms tms2; -#endif + data1_handle dh; ZebraMaps zebra_maps; ZebraRankClass rank_classes; + RecTypes recTypes; + Passwd_db passwd_db; + Zebra_mutex_cond session_lock; + int stop_flag; + int active; /* 0=shutdown, 1=enabled and inactive, 2=activated */ }; -typedef struct zebra_info *ZebraHandle; +struct recKeys { + int buf_used; + int buf_max; + char *buf; + char prevAttrSet; + short prevAttrUse; + int prevSeqNo; +}; + +struct sortKey { + char *string; + int length; + int attrSet; + int attrUse; + struct sortKey *next; +}; + +struct zebra_session { + struct zebra_session *next; + struct zebra_service *service; + + struct recKeys keys; + struct sortKey *sortKeys; + + char **key_buf; + size_t ptr_top; + size_t ptr_i; + size_t key_buf_used; + int key_file_no; + char *admin_databaseName; + + int destroyed; + ZebraSet sets; + int errCode; + int hits; + char *errString; +#if HAVE_SYS_TIMES_H + struct tms tms1; + struct tms tms2; +#endif +}; struct rank_control { char *name; - void *(*create)(ZebraHandle zh); - void (*destroy)(ZebraHandle zh, void *class_handle); + void *(*create)(ZebraService zh); + void (*destroy)(ZebraService zh, void *class_handle); void *(*begin)(ZebraHandle zh, void *class_handle, RSET rset); void (*end)(ZebraHandle zh, void *set_handle); int (*calc)(void *set_handle, int sysno); void (*add)(void *set_handle, int seqno, int term_index); }; -void rpn_search (ZebraHandle zh, ODR stream, +RSET rpn_search (ZebraHandle zh, NMEM mem, Z_RPNQuery *rpn, int num_bases, char **basenames, - const char *setname); + const char *setname, ZebraSet sset); -typedef struct { - int occurrences; - char *term; -} ZebraScanEntry; - void rpn_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, oid_value attributeset, int num_bases, char **basenames, int *position, int *num_entries, ZebraScanEntry **list, int *is_partial); -RSET rset_trunc (ZebraHandle zh, ISAM_P *isam_p, int no, +RSET rset_trunc (ZebraHandle zh, ISAMS_P *isam_p, int no, const char *term, int length_term, const char *flags); -ZebraSet resultSetAdd (ZebraHandle zh, const char *name, - int ov, RSET rset, int *hits); +ZebraSet resultSetAdd (ZebraHandle zh, const char *name, int ov); ZebraSet resultSetGet (ZebraHandle zh, const char *name); +ZebraSet resultSetAddRPN (ZebraHandle zh, ODR stream, ODR decode, Z_RPNQuery *rpn, int num_bases, char **basenames, + const char *setname); RSET resultSetRef (ZebraHandle zh, Z_ResultSetId *resultSetId); -void resultSetDestroy (ZebraHandle zh); +void resultSetDestroy (ZebraHandle zh, int num_names, char **names, + int *statuses); ZebraPosSet zebraPosSetCreate (ZebraHandle zh, const char *name, int num, int *positions); void zebraPosSetDestroy (ZebraHandle zh, ZebraPosSet records, int num); -void resultSetSort (ZebraHandle zh, ODR stream, - int num_input_setnames, char **input_setnames, - char *output_setname, Z_SortKeySpecList *sort_sequence, - int *sort_status); +void resultSetSort (ZebraHandle zh, NMEM nmem, + int num_input_setnames, const char **input_setnames, + const char *output_setname, + Z_SortKeySpecList *sort_sequence, int *sort_status); +void resultSetSortSingle (ZebraHandle zh, NMEM nmem, + ZebraSet sset, RSET rset, + Z_SortKeySpecList *sort_sequence, int *sort_status); +void resultSetRank (ZebraHandle zh, ZebraSet zebraSet, RSET rset); void zebra_sort (ZebraHandle zh, ODR stream, - int num_input_setnames, char **input_setnames, - char *output_setname, Z_SortKeySpecList *sort_sequence, + int num_input_setnames, const char **input_setnames, + const char *output_setname, Z_SortKeySpecList *sort_sequence, int *sort_status); -void zlog_rpn (Z_RPNQuery *rpn); -void zlog_scan (Z_AttributesPlusTerm *zapt, oid_value ast); - -int zebra_server_lock_init (ZebraHandle zh); -int zebra_server_lock_destroy (ZebraHandle zh); -int zebra_server_lock (ZebraHandle zh, int lockCommit); -void zebra_server_unlock (ZebraHandle zh, int commitPhase); -int zebra_server_lock_get_state (ZebraHandle zh, time_t *timep); +int zebra_server_lock_init (ZebraService zh); +int zebra_server_lock_destroy (ZebraService zh); +int zebra_server_lock (ZebraService zh, int lockCommit); +void zebra_server_unlock (ZebraService zh, int commitPhase); +int zebra_server_lock_get_state (ZebraService zh, time_t *timep); typedef struct attent { @@ -238,42 +343,38 @@ typedef struct attent data1_local_attribute *local_attributes; } attent; -void zebraRankInstall (ZebraHandle zh, struct rank_control *ctrl); +void zebraRankInstall (ZebraService zh, struct rank_control *ctrl); ZebraRankClass zebraRankLookup (ZebraHandle zh, const char *name); -void zebraRankDestroy (ZebraHandle zh); +void zebraRankDestroy (ZebraService zh); int att_getentbyatt(ZebraHandle zh, attent *res, oid_value set, int att); extern struct rank_control *rank1_class; -ZebraHandle zebra_open (const char *host, const char *configName); -void zebra_search_rpn (ZebraHandle zh, ODR stream, - Z_RPNQuery *query, int num_bases, char **basenames, - const char *setname); - -typedef struct { - int position; - char *buf; - int len; - oid_value format; - char *base; -} ZebraRetrievalRecord; - -void zebra_records_retrieve (ZebraHandle zh, ODR stream, - const char *setname, Z_RecordComposition *comp, - oid_value input_format, - int num_recs, ZebraRetrievalRecord *recs); - int zebra_record_fetch (ZebraHandle zh, 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); -void zebra_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, - oid_value attributeset, - int num_bases, char **basenames, - int *position, int *num_entries, ZebraScanEntry **list, - int *is_partial); +void extract_get_fname_tmp (ZebraHandle zh, char *fname, int no); +void zebra_index_merge (ZebraHandle zh); + + +struct zebra_fetch_control { + off_t offset_end; + off_t record_offset; + off_t record_int_pos; + const char *record_int_buf; + int record_int_len; + int fd; +}; -void zebra_close (ZebraHandle zh); +int zebra_record_ext_read (void *fh, char *buf, size_t count); +off_t zebra_record_ext_seek (void *fh, off_t offset); +off_t zebra_record_ext_tell (void *fh); +off_t zebra_record_int_seek (void *fh, off_t offset); +off_t zebra_record_int_tell (void *fh); +int zebra_record_int_read (void *fh, char *buf, size_t count); +void zebra_record_int_end (void *fh, off_t offset); +YAZ_END_CDECL