X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzsets.c;h=5dd1eefe426a5bc07665c6171d0a319b0995a0e4;hb=296574b8e825da3594047d8d63c9639d90866047;hp=260f567018e1eb13e775fbdf709339d94abbf82e;hpb=44082770642275dd993aa621d9dc5c5b0dc454d3;p=idzebra-moved-to-github.git diff --git a/index/zsets.c b/index/zsets.c index 260f567..5dd1eef 100644 --- a/index/zsets.c +++ b/index/zsets.c @@ -1,5 +1,5 @@ -/* $Id: zsets.c,v 1.91 2005-08-18 12:50:18 adam Exp $ - Copyright (C) 1995-2005 +/* $Id: zsets.c,v 1.104 2006-05-19 23:20:24 adam Exp $ + Copyright (C) 1995-2006 Index Data ApS This file is part of the Zebra server. @@ -30,6 +30,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #endif #include "index.h" +#include "rank.h" #include #include @@ -39,8 +40,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA struct zebra_set_term_entry { int reg_type; char *db; - int set; - int use; + char *index_name; char *term; }; @@ -53,6 +53,7 @@ struct zebra_set { int num_bases; char **basenames; Z_RPNQuery *rpn; + Z_SortKeySpecList *sortSpec; struct zset_sort_info *sort_info; struct zebra_set_term_entry *term_entries; int term_entries_max; @@ -179,9 +180,9 @@ ZEBRA_RES resultSetAddRPN (ZebraHandle zh, NMEM m, Z_RPNQuery *rpn, return res; } -void resultSetAddTerm (ZebraHandle zh, ZebraSet s, int reg_type, - const char *db, int set, - int use, const char *term) +void resultSetAddTerm(ZebraHandle zh, ZebraSet s, int reg_type, + const char *db, const char *index_name, + const char *term) { assert(zh); /* compiler shut up */ if (!s->nmem) @@ -200,9 +201,8 @@ void resultSetAddTerm (ZebraHandle zh, ZebraSet s, int reg_type, { s->term_entries[s->hits].reg_type = reg_type; s->term_entries[s->hits].db = nmem_strdup (s->nmem, db); - s->term_entries[s->hits].set = set; - s->term_entries[s->hits].use = use; - s->term_entries[s->hits].term = nmem_strdup (s->nmem, term); + s->term_entries[s->hits].index_name = nmem_strdup(s->nmem, index_name); + s->term_entries[s->hits].term = nmem_strdup(s->nmem, term); } (s->hits)++; } @@ -267,6 +267,7 @@ ZebraSet resultSetAdd(ZebraHandle zh, const char *name, int ov) s->rset_nmem = 0; s->nmem = 0; s->rpn = 0; + s->sortSpec = 0; s->cache_position = 0; s->cache_rfd = 0; s->approx_limit = zh->approx_limit; @@ -287,6 +288,13 @@ ZebraSet resultSetGet(ZebraHandle zh, const char *name) if (!s->rset_nmem) s->rset_nmem=nmem_create(); resultSetSearch(zh, nmem, s->rset_nmem, s->rpn, s); + if (s->rset && s->sortSpec) + { + int sort_status; + yaz_log(log_level_resultsets, "resort %s", name); + resultSetSortSingle (zh, nmem, s, s->rset, s->sortSpec, + &sort_status); + } nmem_destroy (nmem); } return s; @@ -528,7 +536,11 @@ void zebra_meta_records_destroy (ZebraHandle zh, ZebraMetaRecord *records, struct sortKeyInfo { int relation; +#if 0 int attrUse; +#else + int ord; +#endif int numerical; }; @@ -544,7 +556,7 @@ void resultSetInsertSort (ZebraHandle zh, ZebraSet sset, sortIdx_sysno (zh->reg->sortIdx, sysno); for (i = 0; ireg->sortIdx, criteria[i].attrUse); + sortIdx_type (zh->reg->sortIdx, criteria[i].ord); sortIdx_read (zh->reg->sortIdx, this_entry.buf[i]); } i = sort_info->num_entries; @@ -654,6 +666,77 @@ void resultSetInsertRank (ZebraHandle zh, struct zset_sort_info *sort_info, new_entry->score = score; } +static Z_RPNQuery *copy_RPNQuery(Z_RPNQuery *src, NMEM nmem) +{ + Z_RPNQuery *dst = 0; + ODR encode = odr_createmem(ODR_ENCODE); + ODR decode = odr_createmem(ODR_DECODE); + + if (z_RPNQuery(encode, &src, 0, 0)) + { + int len; + char *buf = odr_getbuf(encode, &len, 0); + + if (buf) + { + odr_setbuf(decode, buf, len, 0); + z_RPNQuery(decode, &dst, 0, 0); + } + } + nmem_transfer(nmem, decode->mem); + odr_destroy(encode); + odr_destroy(decode); + return dst; +} + +static Z_SortKeySpecList *copy_SortKeySpecList(Z_SortKeySpecList *src, NMEM nmem) +{ + Z_SortKeySpecList *dst = 0; + ODR encode = odr_createmem(ODR_ENCODE); + ODR decode = odr_createmem(ODR_DECODE); + + if (z_SortKeySpecList(encode, &src, 0, 0)) + { + int len; + char *buf = odr_getbuf(encode, &len, 0); + + if (buf) + { + odr_setbuf(decode, buf, len, 0); + z_SortKeySpecList(decode, &dst, 0, 0); + } + } + nmem_transfer(nmem, decode->mem); + odr_destroy(encode); + odr_destroy(decode); + return dst; +} + +ZebraSet resultSetClone(ZebraHandle zh, const char *setname, + ZebraSet rset) +{ + ZebraSet nset; + int i; + + nset = resultSetAdd(zh, setname, 1); + if (!nset) + return 0; + + nset->nmem = nmem_create(); + + nset->num_bases = rset->num_bases; + nset->basenames = + nmem_malloc (nset->nmem, nset->num_bases * sizeof(*rset->basenames)); + for (i = 0; inum_bases; i++) + nset->basenames[i] = nmem_strdup(nset->nmem, rset->basenames[i]); + + if (rset->rset) + nset->rset = rset_dup(rset->rset); + if (rset->rpn) + nset->rpn = copy_RPNQuery(rset->rpn, nset->nmem); + return nset; +} + ZEBRA_RES resultSetSort(ZebraHandle zh, NMEM nmem, int num_input_setnames, const char **input_setnames, const char *output_setname, @@ -690,11 +773,8 @@ ZEBRA_RES resultSetSort(ZebraHandle zh, NMEM nmem, return ZEBRA_FAIL; } if (strcmp (output_setname, input_setnames[0])) - { - rset = rset_dup (rset); - sset = resultSetAdd (zh, output_setname, 1); - sset->rset = rset; - } + sset = resultSetClone(zh, output_setname, sset); + sset->sortSpec = copy_SortKeySpecList(sort_sequence, sset->nmem); return resultSetSortSingle (zh, nmem, sset, rset, sort_sequence, sort_status); } @@ -720,7 +800,6 @@ ZEBRA_RES resultSetSortSingle(ZebraHandle zh, NMEM nmem, if (zh->m_staticrank) sysno_mem_index = 1; - assert(nmem); /* compiler shut up about unused param */ sset->sort_info->num_entries = 0; @@ -762,8 +841,17 @@ ZEBRA_RES resultSetSortSingle(ZebraHandle zh, NMEM nmem, case Z_SortKey_sortField: yaz_log(log_level_sort, "key %d is of type sortField", i+1); - zebra_setError(zh, YAZ_BIB1_CANNOT_SORT_ACCORDING_TO_SEQUENCE, 0); - return ZEBRA_FAIL; + sort_criteria[i].numerical = 0; + sort_criteria[i].ord = + zebraExplain_lookup_attr_str(zh->reg->zei, 's', + sk->u.sortField); + if (sort_criteria[i].ord == -1) + { + zebra_setError(zh, + YAZ_BIB1_CANNOT_SORT_ACCORDING_TO_SEQUENCE, 0); + return ZEBRA_FAIL; + } + break; case Z_SortKey_elementSpec: yaz_log(log_level_sort, "key %d is of type elementSpec", i+1); @@ -771,23 +859,11 @@ ZEBRA_RES resultSetSortSingle(ZebraHandle zh, NMEM nmem, return ZEBRA_FAIL; case Z_SortKey_sortAttributes: yaz_log(log_level_sort, "key %d is of type sortAttributes", i+1); - sort_criteria[i].attrUse = - zebra_maps_sort (zh->reg->zebra_maps, - sk->u.sortAttributes, - &sort_criteria[i].numerical); - yaz_log(log_level_sort, "use value = %d", sort_criteria[i].attrUse); - if (sort_criteria[i].attrUse == -1) - { - zebra_setError( - zh, YAZ_BIB1_USE_ATTRIBUTE_REQUIRED_BUT_NOT_SUPPLIED, 0); + if (zebra_sort_get_ord(zh, sk->u.sortAttributes, + &sort_criteria[i].ord, + &sort_criteria[i].numerical) + != ZEBRA_OK) return ZEBRA_FAIL; - } - if (sortIdx_type (zh->reg->sortIdx, sort_criteria[i].attrUse)) - { - zebra_setError( - zh, YAZ_BIB1_CANNOT_SORT_ACCORDING_TO_SEQUENCE, 0); - return ZEBRA_FAIL; - } break; } } @@ -838,6 +914,10 @@ ZEBRA_RES resultSetRank(ZebraHandle zh, ZebraSet zebraSet, ZebraRankClass rank_class; struct zset_sort_info *sort_info; const char *rank_handler_name = res_get_def(zh->res, "rank", "rank-1"); + size_t sysno_mem_index = 0; + + if (zh->m_staticrank) + sysno_mem_index = 1; if (!log_level_set) loglevels(); @@ -847,10 +927,7 @@ ZEBRA_RES resultSetRank(ZebraHandle zh, ZebraSet zebraSet, rset_getterms(rset, 0, 0, &n); terms = (TERMID *) nmem_malloc(nmem, sizeof(*terms)*n); rset_getterms(rset, terms, n, &numTerms); - size_t sysno_mem_index = 0; - if (zh->m_staticrank) - sysno_mem_index = 1; rank_class = zebraRankLookup(zh, rank_handler_name); if (!rank_class) @@ -869,31 +946,42 @@ ZEBRA_RES resultSetRank(ZebraHandle zh, ZebraSet zebraSet, void *handle = (*rc->begin) (zh->reg, rank_class->class_handle, rset, nmem, terms, numTerms); - zint psysno = 0; + zint psysno = 0; /* previous doc id / sys no */ + zint pstaticrank = 0; /* previous static rank */ + int stop_flag = 0; while (rset_read(rfd, &key, &termid)) { zint this_sys = key.mem[sysno_mem_index]; + zint seqno = key.mem[key.len-1]; kno++; if (log_level_searchhits) key_logdump_txt(log_level_searchhits, &key, termid->name); - if (this_sys != psysno) - { + if (this_sys != psysno) + { /* new record .. */ if (rfd->counted_items > rset->hits_limit) break; if (psysno) - { - score = (*rc->calc) (handle, psysno); + { /* only if we did have a previous record */ + score = (*rc->calc) (handle, psysno, pstaticrank, + &stop_flag); + /* insert the hit. A=Ascending */ resultSetInsertRank (zh, sort_info, psysno, score, 'A'); count++; + if (stop_flag) + break; } psysno = this_sys; + if (zh->m_staticrank) + pstaticrank = key.mem[0]; } (*rc->add) (handle, CAST_ZINT_TO_INT(seqno), termid); } + /* no more items */ if (psysno) - { - score = (*rc->calc)(handle, psysno); + { /* we had - at least - one record */ + score = (*rc->calc)(handle, psysno, pstaticrank, &stop_flag); + /* insert the hit. A=Ascending */ resultSetInsertRank(zh, sort_info, psysno, score, 'A'); count++; } @@ -1060,7 +1148,7 @@ ZEBRA_RES zebra_snippets_hit_vector(ZebraHandle zh, const char *setname, zint sysno, zebra_snippets *snippets) { ZebraSet sset = resultSetGet(zh, setname); - yaz_log(YLOG_LOG, "zebra_get_hit_vector setname=%s zysno=" ZINT_FORMAT, + yaz_log(YLOG_DEBUG, "zebra_get_hit_vector setname=%s zysno=" ZINT_FORMAT, setname, sysno); if (!sset) return ZEBRA_FAIL; @@ -1099,7 +1187,6 @@ ZEBRA_RES zebra_snippets_hit_vector(ZebraHandle zh, const char *setname, for (ol = termid->ol; ol; ol = ol->next) { zebra_snippets_append(snippets, key.mem[key.len-1], - termid->reg_type, ol->ord, termid->name); } } @@ -1108,7 +1195,16 @@ ZEBRA_RES zebra_snippets_hit_vector(ZebraHandle zh, const char *setname, rset_delete(rset_comb); nmem_destroy(nmem); + kc->dec(kc); } return ZEBRA_OK; } +/* + * Local variables: + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab + */ +