X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=include%2Frset.h;h=48dfb65a4b8e1de34a924a748025acd2461236aa;hb=7c3a0352f0492609a3b6b26b63a72b0b2d207aab;hp=079acb2563a1c1b6408a573cd5e9ffc22a442ecd;hpb=5660e317ea2972ea6bb6a4f8a415f71579f71103;p=idzebra-moved-to-github.git diff --git a/include/rset.h b/include/rset.h index 079acb2..48dfb65 100644 --- a/include/rset.h +++ b/include/rset.h @@ -1,4 +1,4 @@ -/* $Id: rset.h,v 1.26 2004-08-06 10:09:27 heikki Exp $ +/* $Id: rset.h,v 1.34 2004-09-09 10:08:04 heikki Exp $ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002 Index Data Aps @@ -27,98 +27,173 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include +/* unfortunately we need the isam includes here, for the arguments for */ +/* rsisamX_create */ +#include +#include +#include + #ifdef __cplusplus extern "C" { #endif -typedef void *RSFD; -typedef struct rset *RSET; -typedef struct rset_term *RSET_TERM; +typedef struct rsfd *RSFD; /* Rset "file descriptor" */ +typedef struct rset *RSET; /* Result set */ + +struct rsfd { /* the stuff common to all rsfd's. */ + RSET rset; /* ptr to the rset this FD is opened to */ + void *priv; /* private parameters for this type */ + RSFD next; /* to keep lists of used/free rsfd's */ +}; + struct rset_control { char *desc; /* text description of set type (for debugging) */ - void *(*f_create)(RSET ct, const struct rset_control *sel, void *parms); +/* RSET rs_something_create(const struct rset_control *sel, ...); */ + void (*f_delete)(RSET ct); RSFD (*f_open)(RSET ct, int wflag); void (*f_close)(RSFD rfd); - void (*f_delete)(RSET ct); void (*f_rewind)(RSFD rfd); - int (*f_forward)(RSET ct, RSFD rfd, void *buf, int *term_index, - int (*cmpfunc)(const void *p1, const void *p2), - const void *untilbuf); + int (*f_forward)(RSFD rfd, void *buf, const void *untilbuf); void (*f_pos)(RSFD rfd, double *current, double *total); /* returns -1,-1 if pos function not implemented for this type */ - int (*f_read)(RSFD rfd, void *buf, int *term_index); + int (*f_read)(RSFD rfd, void *buf); int (*f_write)(RSFD rfd, const void *buf); }; -int rset_default_forward(RSET ct, RSFD rfd, void *buf, int *term_index, - int (*cmpfunc)(const void *p1, const void *p2), +int rset_default_forward(RSFD rfd, void *buf, const void *untilbuf); -void rset_default_pos(RSFD rfd, double *current, double *total); - -struct rset_term { - char *name; - int nn; - char *flags; - int count; - int type; + +struct key_control { + int key_size; + int scope; /* default for what level we operate (book/chapter/verse) on*/ + /* usual sysno/seqno is 2 */ + int (*cmp) (const void *p1, const void *p2); + void (*key_logdump_txt) (int logmask, const void *p, const char *txt); + zint (*getseq)(const void *p); + /* FIXME - Should not need a getseq, it won't make much sense with */ + /* higher-order keys. Use a (generalized) cmp instead, or something */ + /* FIXME - decode and encode, and lots of other stuff */ }; typedef struct rset { const struct rset_control *control; - int flags; - int count; - void *buf; - RSET_TERM *rset_terms; - int no_rset_terms; + const struct key_control *keycontrol; + int count; /* reference count */ + void *priv; /* stuff private to the given type of rset */ + NMEM nmem; /* nibble memory for various allocs */ + char my_nmem; /* Should the nmem be destroyed with the rset? */ + /* 1 if created with it, 0 if passed from above */ + RSFD free_list; /* all rfd's allocated but not currently in use */ + int scope; /* On what level do we count hits and compare them? */ } rset; +/* rset is a "virtual base class", which will never exist on its own + * all instances are rsets of some specific type, like rsisamb, or rsbool + * They keep their own stuff behind the priv pointer. */ + +/* On the old sysno-seqno type isams, the scope was hard-coded to be 2. + * This means that we count hits on the sysno level, and when matching an + * 'and', we consider it a match if both term occur within the same sysno. + * In more complex isams we can specify on what level we wish to do the + * matching and counting of hits. For example, we can have book / chapter / + * verse, and a seqno. Scope 2 means then "give me all verses that match", + * 3 would be chapters, 4 books. + * The resolution tells how much of the occurences we need to return. If we + * are doing some sort of proximity, we need to get the seqnos of all + * occurences, whereas if we are only counting hits, we do not need anything + * below the scope. Again 1 is seqnos, 2 sysnos (or verses), 3 books, etc. + */ +/* FIXME - Add a resolution, to decide on what level we want to return */ +/* hits. That can well be below scope, if we need to get seqnos for prox */ +/* or suchlike... */ + +RSFD rfd_create_base(RSET rs); +void rfd_delete_base(RSFD rfd); + +RSET rset_create_base(const struct rset_control *sel, + NMEM nmem, + const struct key_control *kcontrol, + int scope ); +void rset_delete(RSET rs); +RSET rset_dup (RSET rs); -RSET_TERM rset_term_create (const char *name, int length, const char *flags, - int type); -void rset_term_destroy (RSET_TERM t); -RSET_TERM rset_term_dup (RSET_TERM t); #define RSETF_READ 0 #define RSETF_WRITE 1 +/* RSFD rset_open(RSET rs, int wflag); */ +#define rset_open(rs, wflag) (*(rs)->control->f_open)((rs), (wflag)) -RSET rset_create(const struct rset_control *sel, void *parms); -/* parameters? */ +/* void rset_close(RSFD rfd); */ +#define rset_close(rfd) (*(rfd)->rset->control->f_close)(rfd) -/* int rset_open(RSET rs, int wflag); */ -#define rset_open(rs, wflag) (*(rs)->control->f_open)((rs), (wflag)) +/* void rset_rewind(RSFD rfd); */ +#define rset_rewind(rfd) (*(rfd)->rset->control->f_rewind)((rfd)) -/* void rset_close(RSET rs); */ -#define rset_close(rs, rfd) (*(rs)->control->f_close)(rfd) +/* int rset_forward(RSFD rfd, void *buf, void *untilbuf); */ +#define rset_forward(rfd, buf, untilbuf) \ + (*(rfd)->rset->control->f_forward)((rfd),(buf),(untilbuf)) -void rset_delete(RSET rs); +/* int rset_pos(RSFD fd, double *current, double *total); */ +#define rset_pos(rfd,cur,tot) \ + (*(rfd)->rset->control->f_pos)( (rfd),(cur),(tot)) -RSET rset_dup (RSET rs); +/* int rset_read(RSFD rfd, void *buf); */ +#define rset_read(rfd, buf) (*(rfd)->rset->control->f_read)((rfd), (buf)) + +/* int rset_write(RSFD rfd, const void *buf); */ +#define rset_write(rfd, buf) (*(rfd)->rset->control->f_write)((rfd), (buf)) -/* void rset_rewind(RSET rs); */ -#define rset_rewind(rs, rfd) (*(rs)->control->f_rewind)((rfd)) +/* int rset_type (RSET) */ +#define rset_type(rs) ((rs)->control->desc) -/* int rset_forward(RSET rs, void *buf, int *indx, void *untilbuf); */ -#define rset_forward(rs, fd, buf, indx, cmpfunc, untilbuf) \ - (*(rs)->control->f_forward)((rs), (fd), (buf), (indx), (cmpfunc), (untilbuf)) +RSET rstemp_create( NMEM nmem, const struct key_control *kcontrol, + int scope, + const char *temp_path); -/* int rset_pos(RSET rs, RSFD fd, double *current, double *total); */ -#define rset_pos(rs,fd,cur,tot) \ - (*(rs)->control->f_pos)( (fd),(cur),(tot)) +RSET rsnull_create(NMEM nmem, const struct key_control *kcontrol); -/* int rset_read(RSET rs, void *buf, int *indx); */ -#define rset_read(rs, fd, buf, indx) (*(rs)->control->f_read)((fd), (buf), indx) +RSET rsbool_create_and( NMEM nmem, const struct key_control *kcontrol, + int scope, + RSET rset_l, RSET rset_r); -/* int rset_write(RSET rs, const void *buf); */ -#define rset_write(rs, fd, buf) (*(rs)->control->f_write)((fd), (buf)) +RSET rsbool_create_or ( NMEM nmem, const struct key_control *kcontrol, + int scope, + RSET rset_l, RSET rset_r); -/* int rset_type (RSET) */ -#define rset_type(rs) ((rs)->control->desc) +RSET rsbool_create_not( NMEM nmem, const struct key_control *kcontrol, + int scope, + RSET rset_l, RSET rset_r); + +RSET rsbetween_create( NMEM nmem, const struct key_control *kcontrol, + int scope, + RSET rset_l, RSET rset_m, RSET rset_r, + RSET rset_attr); + +RSET rsmultior_create( NMEM nmem, const struct key_control *kcontrol, + int scope, + int no_rsets, RSET* rsets); + +RSET rsprox_create( NMEM nmem, const struct key_control *kcontrol, + int scope, + int rset_no, RSET *rset, + int ordered, int exclusion, + int relation, int distance); + +RSET rsisamb_create( NMEM nmem, const struct key_control *kcontrol, + int scope, + ISAMB is, ISAMB_P pos); + +RSET rsisamc_create( NMEM nmem, const struct key_control *kcontrol, + int scope, + ISAMC is, ISAMC_P pos); + +RSET rsisams_create( NMEM nmem, const struct key_control *kcontrol, + int scope, + ISAMS is, ISAMS_P pos); -#define RSET_FLAG_VOLATILE 1 -#define rset_is_volatile(rs) ((rs)->flags & RSET_FLAG_VOLATILE) #ifdef __cplusplus }