X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Findex.h;h=a71660157a548ab758aa704ed31b617a7451788a;hb=cc74bd253ed898cd5b94826912cbc1ca1c940387;hp=c50a1b28a93aac834e016924660c4765bb08edaf;hpb=fee10afdae5bbc7cd0ea61dd6e74df579a20106f;p=idzebra-moved-to-github.git diff --git a/index/index.h b/index/index.h index c50a1b2..a716601 100644 --- a/index/index.h +++ b/index/index.h @@ -1,4 +1,4 @@ -/* $Id: index.h,v 1.134 2005-04-25 11:54:08 adam Exp $ +/* $Id: index.h,v 1.157 2006-03-26 14:17:01 adam Exp $ Copyright (C) 1995-2005 Index Data ApS @@ -27,6 +27,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #include #include +#include #include #if HAVE_SYS_TIMES_H @@ -54,7 +55,7 @@ YAZ_BEGIN_CDECL #define IT_MAX_WORD 256 -#define IT_KEY_LEVEL_MAX 4 +#define IT_KEY_LEVEL_MAX 5 struct it_key { int len; zint mem[IT_KEY_LEVEL_MAX]; @@ -78,7 +79,7 @@ struct dirs_entry { void getFnameTmp (Res res, char *fname, int no); struct dirs_info *dirs_open (Dict dict, const char *rep, int rw); -struct dirs_info *dirs_fopen (Dict dict, const char *path); +struct dirs_info *dirs_fopen (Dict dict, const char *path, int rw); struct dirs_entry *dirs_read (struct dirs_info *p); struct dirs_entry *dirs_last (struct dirs_info *p); void dirs_mkdir (struct dirs_info *p, const char *src, time_t mtime); @@ -141,25 +142,13 @@ void zebraIndexUnlock (ZebraHandle zh); int zebraIndexLock (BFiles bfs, ZebraHandle zh, int commitNow, const char *rval); int zebraIndexWait (ZebraHandle zh, int commitPhase); +void zebra_lock_prefix (Res res, char *dst); + #define FNAME_MAIN_LOCK "zebraidx.LCK" #define FNAME_COMMIT_LOCK "zebracmt.LCK" #define FNAME_ORG_LOCK "zebraorg.LCK" #define FNAME_TOUCH_TIME "zebraidx.time" -typedef struct zebra_lock_info *ZebraLockHandle; -ZebraLockHandle zebra_lock_create(const char *dir, - const char *file, int excl_flag); -void zebra_lock_destroy (ZebraLockHandle h); -int zebra_lock (ZebraLockHandle h); -int zebra_lock_nb (ZebraLockHandle h); -int zebra_unlock (ZebraLockHandle h); -int zebra_lock_fd (ZebraLockHandle h); -void zebra_lock_prefix (Res res, char *dst); -char *zebra_mk_fname (const char *dir, const char *name); - -int zebra_lock_w (ZebraLockHandle h); -int zebra_lock_r (ZebraLockHandle h); - void zebra_load_atts (data1_handle dh, Res res); int key_SU_decode (int *ch, const unsigned char *out); @@ -175,6 +164,7 @@ struct encode_info { int prevcmd; int keylen; /* tells if we have an unwritten key in buf, and how long*/ void *encode_handle; + void *decode_handle; char buf[ENCODE_BUFLEN]; }; @@ -192,18 +182,17 @@ typedef struct zebra_rank_class { struct zebra_rank_class *next; } *ZebraRankClass; -struct recKeys { - int buf_used; - int buf_max; - char *buf; - void *codec_handle; -}; +#include "reckeys.h" + +#if NATTR +#else struct sortKeys { int buf_used; int buf_max; char *buf; }; +#endif struct zebra_register { char *name; @@ -228,13 +217,13 @@ struct zebra_register { int seqno; int last_val; int stop_flag; - int active; /* 0=shutdown, 1=enabled and inactive, 2=activated */ - struct recKeys keys; -#if 1 - struct sortKeys sortKeys; + zebra_rec_keys_t keys; + +#if NATTR + zebra_rec_keys_t sortKeys; #else - struct sortKey *sortKeys; + struct sortKeys sortKeys; #endif char **key_buf; size_t ptr_top; @@ -246,11 +235,11 @@ struct zebra_register { struct zebra_service { int stop_flag; Res global_res; - char *configName; struct zebra_session *sessions; struct zebra_register *regs; Zebra_mutex_cond session_lock; Passwd_db passwd_db; + Res dbaccess; const char *path_root; RecTypeClass record_classes; NMEM nmem; @@ -266,6 +255,7 @@ struct zebra_session { char **basenames; int num_basenames; + zint approx_limit; char *reg_name; char *path_reg; @@ -278,7 +268,9 @@ struct zebra_session { int destroyed; ZebraSet sets; Res res; + Res session_res; char *user_perm; + char *dbaccesslist; int errCode; zint hits; char *errString; @@ -288,6 +280,8 @@ struct zebra_session { #endif int shadow_enable; + int m_staticrank; + zint records_inserted; zint records_updated; zint records_deleted; @@ -306,6 +300,12 @@ struct zebra_session { int m_explain_database; int m_flag_rw; int m_file_verbose_limit; + + void *store_data_buf; + size_t store_data_size; + NMEM nmem_error; + + struct zebra_limit *m_limit; }; struct rank_control { @@ -321,7 +321,8 @@ struct rank_control { * int rssize; // number of records in result set (estimate?) */ void (*end)(struct zebra_register *reg, void *set_handle); - int (*calc)(void *set_handle, zint sysno); + int (*calc)(void *set_handle, zint sysno, zint staticrank, + int *stop_flag); void (*add)(void *set_handle, int seqno, TERMID term); }; @@ -335,6 +336,16 @@ struct term_set_list { struct term_set_entry *last; }; + +void zebra_limit_destroy(struct zebra_limit *zl); +struct zebra_limit *zebra_limit_create(int exclude_flag, zint *ids); +void zebra_limit_for_rset(struct zebra_limit *zl, + int (**filter_func)(const void *buf, void *data), + void (**filter_destroy)(void *data), + void **filter_data); + +struct rset_key_control *zebra_key_control_create(ZebraHandle zh); + ZEBRA_RES rpn_search_top(ZebraHandle zh, Z_RPNStructure *zs, oid_value attributeSet, NMEM stream, NMEM rset_nmem, @@ -348,10 +359,12 @@ ZEBRA_RES rpn_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, int *position, int *num_entries, ZebraScanEntry **list, int *is_partial, RSET limit_set, int return_zero); -RSET rset_trunc (ZebraHandle zh, ISAM_P *isam_p, int no, - const char *term, int length_term, const char *flags, - int preserve_position, int term_type, NMEM rset_nmem, - const struct key_control *kctrl, int scope); +RSET rset_trunc(ZebraHandle zh, ISAM_P *isam_p, int no, + const char *term, int length_term, const char *flags, + int preserve_position, int term_type, NMEM rset_nmem, + struct rset_key_control *kctrl, int scope, + struct ord_list *ol, int reg_type, + zint hits_limit, const char *term_ref_id); void resultSetAddTerm (ZebraHandle zh, ZebraSet s, int reg_type, const char *db, int set, @@ -364,14 +377,16 @@ ZEBRA_RES resultSetAddRPN (ZebraHandle zh, NMEM m, Z_RPNQuery *rpn, RSET resultSetRef (ZebraHandle zh, const char *resultSetId); void resultSetDestroy (ZebraHandle zh, int num_names, char **names, int *statuses); -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, NMEM nmem); +ZEBRA_RES resultSetSort (ZebraHandle zh, NMEM nmem, + int num_input_setnames, const char **input_setnames, + const char *output_setname, + Z_SortKeySpecList *sort_sequence, int *sort_status); +ZEBRA_RES resultSetSortSingle (ZebraHandle zh, NMEM nmem, + ZebraSet sset, RSET rset, + Z_SortKeySpecList *sort_sequence, + int *sort_status); +ZEBRA_RES resultSetRank (ZebraHandle zh, ZebraSet zebraSet, RSET rset, + NMEM nmem); void resultSetInvalidate (ZebraHandle zh); int zebra_server_lock_init (ZebraService zh); @@ -393,11 +408,12 @@ void zebraRankDestroy (struct zebra_register *reg); int att_getentbyatt(ZebraHandle zh, attent *res, oid_value set, int att, const char *sattr); -extern struct rank_control *rank1_class; -extern struct rank_control *rankzv_class; -extern struct rank_control *rankliv_class; +extern struct rank_control *rank_1_class; +extern struct rank_control *rank_zv_class; +extern struct rank_control *rank_static_class; -int zebra_record_fetch (ZebraHandle zh, SYSNO sysno, int score, ODR stream, +int zebra_record_fetch (ZebraHandle zh, SYSNO sysno, int score, + zebra_snippets *hit_snippet, ODR stream, oid_value input_format, Z_RecordComposition *comp, oid_value *output_format, char **rec_bufp, int *rec_lenp, char **basenamep, @@ -445,10 +461,23 @@ 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); +void print_rec_keys(ZebraHandle zh, zebra_rec_keys_t reckeys); + +ZEBRA_RES zebra_snippets_rec_keys(ZebraHandle zh, zebra_rec_keys_t reckeys, + zebra_snippets *snippets); +ZEBRA_RES zebra_snippets_hit_vector(ZebraHandle zh, const char *setname, + zint sysno, zebra_snippets *snippets); + void extract_flushRecordKeys (ZebraHandle zh, SYSNO sysno, - int cmd, struct recKeys *reckeys); + int cmd, zebra_rec_keys_t reckeys, + zint staticrank); +#if NATTR +void extract_flushSortKeys (ZebraHandle zh, SYSNO sysno, + int cmd, zebra_rec_keys_t skp); +#else void extract_flushSortKeys (ZebraHandle zh, SYSNO sysno, int cmd, struct sortKeys *skp); +#endif void extract_schema_add (struct recExtractCtrl *p, Odr_oid *oid); void extract_token_add (RecWord *p); int explain_extract (void *handle, Record rec, data1_node *n); @@ -473,6 +502,17 @@ void iscz1_encode (void *vp, char **dst, const char **src); Dict dict_open_res (BFiles bfs, const char *name, int cache, int rw, int compact_flag, Res res); +void zebra_setError(ZebraHandle zh, int code, const char *addinfo); +void zebra_setError_zint(ZebraHandle zh, int code, zint i); + +void zebra_term_untrans_iconv(ZebraHandle zh, NMEM stream, int reg_type, + char **dst, const char *src); + +ZEBRA_RES zebra_get_hit_vector(ZebraHandle zh, const char *setname, zint sysno); + +void zebra_term_untrans(ZebraHandle zh, int reg_type, + char *dst, const char *src); + YAZ_END_CDECL #endif