X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=index%2Frpnscan.c;h=be4e765fe04a561af8520112512665f46a532bf7;hp=487075fcd3f253e6b73d3ab797d937782f328210;hb=1872e3fc60b482771bbd1cb4b0290b8d6a9ef5d0;hpb=2a0be28b861bf340b8213ad17438daf49e5cb8b0 diff --git a/index/rpnscan.c b/index/rpnscan.c index 487075f..be4e765 100644 --- a/index/rpnscan.c +++ b/index/rpnscan.c @@ -1,5 +1,5 @@ -/* $Id: rpnscan.c,v 1.2 2006-09-21 10:10:07 adam Exp $ - Copyright (C) 1995-2006 +/* $Id: rpnscan.c,v 1.7 2007-04-16 08:44:32 adam Exp $ + Copyright (C) 1995-2007 Index Data ApS This file is part of the Zebra server. @@ -33,21 +33,15 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include #include "index.h" #include +#include #include #include #include +#include -struct scan_info_entry { - char *term; - ISAM_P isam_p; -}; +#define RPN_MAX_ORDS 32 -struct scan_info { - struct scan_info_entry *list; - ODR odr; - int before, after; - char prefix[20]; -}; +int log_scan = YLOG_LOG; /* convert APT SCAN term to internal cmap */ static ZEBRA_RES trans_scan_term(ZebraHandle zh, Z_AttributesPlusTerm *zapt, @@ -112,300 +106,281 @@ static void count_set(ZebraHandle zh, RSET rset, zint *count) *count = rset->hits_count; } -static int scan_handle (char *name, const char *info, int pos, void *client) +struct scan2_info_entry { + WRBUF term; + char prefix[20]; + ISAM_P isam_p; + int pos_to_save; +}; + +static int scan_handle2(char *name, const char *info, int pos, void *client) { - int len_prefix, idx; - struct scan_info *scan_info = (struct scan_info *) client; + int len_prefix; + struct scan2_info_entry *scan_info = (struct scan2_info_entry *) client; + + if (scan_info->pos_to_save != pos) + return 0; len_prefix = strlen(scan_info->prefix); if (memcmp (name, scan_info->prefix, len_prefix)) return 1; - if (pos > 0) - idx = scan_info->after - pos + scan_info->before; - else - idx = - pos - 1; - /* skip special terms.. of no interest */ - if (name[len_prefix] < 4) + /* skip special terms such as first-in-field specials */ + if (name[len_prefix] < CHR_BASE_CHAR) return 1; - if (idx < 0) - return 0; - scan_info->list[idx].term = (char *) - odr_malloc(scan_info->odr, strlen(name + len_prefix)+1); - strcpy(scan_info->list[idx].term, name + len_prefix); + wrbuf_rewind(scan_info->term); + wrbuf_puts(scan_info->term, name+len_prefix); + assert (*info == sizeof(ISAM_P)); - memcpy (&scan_info->list[idx].isam_p, info+1, sizeof(ISAM_P)); + memcpy (&scan_info->isam_p, info+1, sizeof(ISAM_P)); return 0; } -#define RPN_MAX_ORDS 32 - -static ZEBRA_RES rpn_scan_ver1(ZebraHandle zh, ODR stream, +static int scan_save_set(ZebraHandle zh, ODR stream, NMEM nmem, + struct rset_key_control *kc, + Z_AttributesPlusTerm *zapt, + RSET limit_set, + const char *term, + int index_type, + struct scan2_info_entry *ar, int ord_no, + ZebraScanEntry *glist, int pos) +{ + int i; + RSET rset = 0; + for (i = 0; i < ord_no; i++) + { + if (ar[i].isam_p && strcmp(wrbuf_cstr(ar[i].term), term) == 0) + { + RSET rset_t = rset_trunc( + zh, &ar[i].isam_p, 1, + wrbuf_buf(ar[i].term), wrbuf_len(ar[i].term), + NULL, 0, zapt->term->which, nmem, + kc, kc->scope, 0, index_type, + 0 /* hits_limit */, + 0 /* term_ref_id_str */); + if (!rset) + rset = rset_t; + else + { + RSET rsets[2]; + + rsets[0] = rset; + rsets[1] = rset_t; + rset = rset_create_or(nmem, kc, kc->scope, 0 /* termid */, + 2, rsets); + } + ar[i].isam_p = 0; + } + } + if (rset) + { + zint count; + /* merge with limit_set if given */ + if (limit_set) + { + RSET rsets[2]; + rsets[0] = rset; + rsets[1] = rset_dup(limit_set); + + rset = rset_create_and(nmem, kc, kc->scope, 2, rsets); + } + /* count it */ + count_set(zh, rset, &count); + rset_delete(rset); + if (count > 0) + { + if (pos != -1) + { + zebra_term_untrans_iconv(zh, stream->mem, index_type, + &glist[pos].term, term); + glist[pos].occurrences = count; + } + return 1; + } + } + return 0; +} + +static ZEBRA_RES rpn_scan_ver2(ZebraHandle zh, ODR stream, NMEM nmem, + struct rset_key_control *kc, Z_AttributesPlusTerm *zapt, int *position, int *num_entries, ZebraScanEntry **list, int *is_partial, RSET limit_set, - int return_zero, int index_type, int ord_no, int *ords) { - int pos = *position; - int num = *num_entries; - int before; - int after; - int i; - struct scan_info *scan_info_array; - char termz[IT_MAX_WORD+20]; - ZebraScanEntry *glist; - NMEM rset_nmem = 0; - struct rset_key_control *kc = 0; - int ptr[RPN_MAX_ORDS]; - - before = pos-1; - if (before < 0) - before = 0; - after = 1+num-pos; - if (after < 0) - after = 0; - yaz_log(YLOG_DEBUG, "rpn_scan pos=%d num=%d before=%d " - "after=%d before+after=%d", - pos, num, before, after, before+after); - scan_info_array = (struct scan_info *) - odr_malloc(stream, ord_no * sizeof(*scan_info_array)); - for (i = 0; i < ord_no; i++) - { - int j, prefix_len = 0; - int before_tmp = before, after_tmp = after; - struct scan_info *scan_info = scan_info_array + i; - struct rpn_char_map_info rcmi; + struct scan2_info_entry *ar = nmem_malloc(nmem, sizeof(*ar) * ord_no); + struct rpn_char_map_info rcmi; + int i, dif; + int pos = 0; - rpn_char_map_prepare (zh->reg, index_type, &rcmi); + ZebraScanEntry *glist = (ZebraScanEntry *) + odr_malloc(stream, *num_entries * sizeof(*glist)); - scan_info->before = before; - scan_info->after = after; - scan_info->odr = stream; + *is_partial = 0; + if (*position > *num_entries+1) + { + *is_partial = 1; + *position = 1; + *num_entries = 0; + return ZEBRA_OK; + } + rpn_char_map_prepare (zh->reg, index_type, &rcmi); - scan_info->list = (struct scan_info_entry *) - odr_malloc(stream, (before+after) * sizeof(*scan_info->list)); - for (j = 0; jlist[j].term = NULL; + for (i = 0; i < ord_no; i++) + ar[i].term = wrbuf_alloc(); - prefix_len += key_SU_encode (ords[i], termz + prefix_len); + for (i = 0; i < ord_no; i++) + { + char termz[IT_MAX_WORD+20]; + int prefix_len = 0; + + prefix_len = key_SU_encode (ords[i], termz); termz[prefix_len] = 0; - strcpy(scan_info->prefix, termz); - + strcpy(ar[i].prefix, termz); + if (trans_scan_term(zh, zapt, termz+prefix_len, index_type) == ZEBRA_FAIL) return ZEBRA_FAIL; - - dict_scan(zh->reg->dict, termz, &before_tmp, &after_tmp, - scan_info, scan_handle); + wrbuf_rewind(ar[i].term); + wrbuf_puts(ar[i].term, termz + prefix_len); + ar[i].isam_p = 0; } - glist = (ZebraScanEntry *) - odr_malloc(stream, (before+after)*sizeof(*glist)); - - rset_nmem = nmem_create(); - kc = zebra_key_control_create(zh); - - /* consider terms after main term */ - for (i = 0; i < ord_no; i++) - ptr[i] = before; - - *is_partial = 0; - for (i = 0; i= 0; ) { - int j, j0 = -1; - const char *mterm = NULL; - const char *tst; - RSET rset = 0; - int lo = i + pos-1; /* offset in result list */ - - /* find: j0 is the first of the minimal values */ - for (j = 0; j < ord_no; j++) + const char *hi = 0; + + /* scan on all maximum terms */ + for (i = 0; i < ord_no; i++) { - if (ptr[j] < before+after && ptr[j] >= 0 && - (tst = scan_info_array[j].list[ptr[j]].term) && - (!mterm || strcmp (tst, mterm) < 0)) + if (ar[i].isam_p == 0) { - j0 = j; - mterm = tst; + char termz[IT_MAX_WORD+20]; + int before = 1; + int after = 0; + + ar[i].pos_to_save = -1; + + strcpy(termz, ar[i].prefix); + strcat(termz, wrbuf_cstr(ar[i].term)); + dict_scan(zh->reg->dict, termz, &before, &after, + ar+i, scan_handle2); } } - if (j0 == -1) - break; /* no value found, stop */ - - /* get result set for first one , but only if it's within bounds */ - if (lo >= 0) - { - /* get result set for first term */ - zebra_term_untrans_iconv(zh, stream->mem, index_type, - &glist[lo].term, mterm); - rset = rset_trunc(zh, &scan_info_array[j0].list[ptr[j0]].isam_p, 1, - glist[lo].term, strlen(glist[lo].term), - NULL, 0, zapt->term->which, rset_nmem, - kc, kc->scope, 0, index_type, 0 /* hits_limit */, - 0 /* term_ref_id_str */); - } - ptr[j0]++; /* move index for this set .. */ - /* get result set for remaining scan terms */ - for (j = j0+1; j= 0 && - (tst = scan_info_array[j].list[ptr[j]].term) && - !strcmp (tst, mterm)) - { - if (lo >= 0) - { - RSET rsets[2]; - - rsets[0] = rset; - rsets[1] = - rset_trunc( - zh, &scan_info_array[j].list[ptr[j]].isam_p, 1, - glist[lo].term, - strlen(glist[lo].term), NULL, 0, - zapt->term->which,rset_nmem, - kc, kc->scope, 0, index_type, 0 /* hits_limit */, - 0 /* term_ref_id_str */ ); - rset = rset_create_or(rset_nmem, kc, - kc->scope, 0 /* termid */, - 2, rsets); - } - ptr[j]++; - } + if (ar[i].isam_p + && (hi == 0 || strcmp(wrbuf_cstr(ar[i].term), hi) > 0)) + hi = wrbuf_cstr(ar[i].term); } - if (lo >= 0) - { - zint count; - /* merge with limit_set if given */ - if (limit_set) - { - RSET rsets[2]; - rsets[0] = rset; - rsets[1] = rset_dup(limit_set); - - rset = rset_create_and(rset_nmem, kc, kc->scope, 2, rsets); - } - /* count it */ - count_set(zh, rset, &count); - glist[lo].occurrences = count; - rset_delete(rset); - } + if (!hi) + break; + if (scan_save_set(zh, stream, nmem, kc, zapt, limit_set, hi, + index_type, ar, ord_no, glist, + (pos >= 0 && pos < *num_entries) ? pos : -1)) + --pos; } - if (i < after) + /* see if we got all terms before.. */ + dif = 1 + pos; + if (dif > 0) { - *num_entries -= (after-i); + /* did not get all terms; adjust the real position and reduce + number of entries */ + yaz_log(YLOG_LOG, "before terms dif=%d", dif); + glist = glist + dif; + *num_entries -= dif; + *position -= dif; *is_partial = 1; - if (*num_entries < 0) - { - (*kc->dec)(kc); - nmem_destroy(rset_nmem); - *num_entries = 0; - return ZEBRA_OK; - } } - /* consider terms before main term */ - for (i = 0; i= 0 && - (tst = scan_info_array[j].list[before-1-ptr[j]].term) && - (!mterm || strcmp (tst, mterm) > 0)) - { - j0 = j; - mterm = tst; - } - } - if (j0 == -1) - break; - - zebra_term_untrans_iconv(zh, stream->mem, index_type, - &glist[lo].term, mterm); - - rset = rset_trunc - (zh, &scan_info_array[j0].list[before-1-ptr[j0]].isam_p, 1, - glist[lo].term, strlen(glist[lo].term), - NULL, 0, zapt->term->which, rset_nmem, - kc, kc->scope, 0, index_type, 0 /* hits_limit */, - 0 /* term_ref_id_str */); - - ptr[j0]++; - - for (j = j0+1; j= 0 && - (tst = scan_info_array[j].list[before-1-ptr[j]].term) && - !strcmp (tst, mterm)) - { - RSET rsets[2]; - - rsets[0] = rset; - rsets[1] = rset_trunc( - zh, - &scan_info_array[j].list[before-1-ptr[j]].isam_p, 1, - glist[lo].term, - strlen(glist[lo].term), NULL, 0, - zapt->term->which, rset_nmem, - kc, kc->scope, 0, index_type, 0 /* hits_limit */, - 0 /* term_ref_id_str */); - rset = rset_create_or(rset_nmem, kc, - kc->scope, 0 /* termid */, 2, rsets); - - ptr[j]++; - } - } - if (limit_set) - { - RSET rsets[2]; - rsets[0] = rset; - rsets[1] = rset_dup(limit_set); - - rset = rset_create_and(rset_nmem, kc, kc->scope, 2, rsets); - } - count_set(zh, rset, &count); - glist[lo].occurrences = count; - rset_delete (rset); + char termz[IT_MAX_WORD+20]; + int prefix_len = 0; + + prefix_len = key_SU_encode (ords[i], termz); + termz[prefix_len] = 0; + strcpy(ar[i].prefix, termz); + + if (trans_scan_term(zh, zapt, termz+prefix_len, index_type) == + ZEBRA_FAIL) + return ZEBRA_FAIL; + wrbuf_rewind(ar[i].term); + wrbuf_puts(ar[i].term, termz + prefix_len); + ar[i].isam_p = 0; } - (*kc->dec)(kc); - nmem_destroy(rset_nmem); - i = before-i; - if (i) + + for (pos = *position-1; pos < *num_entries; ) { + const char *lo = 0; + + /* scan on all minimum terms */ + for (i = 0; i < ord_no; i++) + { + if (ar[i].isam_p == 0) + { + char termz[IT_MAX_WORD+20]; + int before = 0; + int after = (pos == *position-1) ? 1 : 2; + + ar[i].pos_to_save = 1; + + strcpy(termz, ar[i].prefix); + strcat(termz, wrbuf_cstr(ar[i].term)); + dict_scan(zh->reg->dict, termz, &before, &after, + ar+i, scan_handle2); + } + } + /* get minimum after scan */ + for (i = 0; i < ord_no; i++) + { + if (ar[i].isam_p + && (lo == 0 || strcmp(wrbuf_cstr(ar[i].term), lo) < 0)) + lo = wrbuf_cstr(ar[i].term); + } + if (!lo) + break; + if (scan_save_set(zh, stream, nmem, kc, zapt, limit_set, lo, + index_type, ar, ord_no, glist, + (pos >= 0 && pos < *num_entries) ? pos : -1)) + pos++; + + } + if (pos != *num_entries) + { + if (pos >= 0) + *num_entries = pos; + else + *num_entries = 0; *is_partial = 1; - *position -= i; - *num_entries -= i; - if (*num_entries <= 0) - { - *num_entries = 0; - return ZEBRA_OK; - } } - - *list = glist + i; /* list is set to first 'real' entry */ - - yaz_log(YLOG_DEBUG, "position = %d, num_entries = %d", - *position, *num_entries); + + *list = glist; + return ZEBRA_OK; } +struct scan1_info_entry { + char *term; + ISAM_P isam_p; +}; + +struct scan_info { + struct scan1_info_entry *list; + ODR odr; + int before, after; + char prefix[20]; +}; ZEBRA_RES rpn_scan(ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, - oid_value attributeset, + const int *attributeset, int num_bases, char **basenames, int *position, int *num_entries, ZebraScanEntry **list, - int *is_partial, RSET limit_set, int return_zero) + int *is_partial, RSET limit_set) { int base_no; int ords[RPN_MAX_ORDS], ord_no = 0; @@ -415,12 +390,15 @@ ZEBRA_RES rpn_scan(ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, char rank_type[128]; int complete_flag; int sort_flag; + NMEM nmem; + ZEBRA_RES res; + struct rset_key_control *kc = 0; *list = 0; *is_partial = 0; - if (attributeset == VAL_NONE) - attributeset = VAL_BIB1; + if (!attributeset) + attributeset = yaz_oid_attset_bib1(); if (!limit_set) /* no limit set given already */ { @@ -449,8 +427,8 @@ ZEBRA_RES rpn_scan(ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, } } - yaz_log(YLOG_DEBUG, "position = %d, num = %d set=%d", - *position, *num_entries, attributeset); + yaz_log(YLOG_DEBUG, "position = %d, num = %d", + *position, *num_entries); if (zebra_maps_attr(zh->reg->zebra_maps, zapt, &index_type, &search_type, rank_type, &complete_flag, &sort_flag)) @@ -486,15 +464,20 @@ ZEBRA_RES rpn_scan(ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt, *num_entries = 0; /* zebra_apt_get_ord should set error reason */ return ZEBRA_FAIL; } - /* prepare dictionary scanning */ if (*num_entries < 1) { *num_entries = 0; - return ZEBRA_OK; + return ZEBRA_OK; } - return rpn_scan_ver1(zh, stream, zapt, position, num_entries, list, - is_partial, limit_set, return_zero, - index_type, ord_no, ords); + nmem = nmem_create(); + kc = zebra_key_control_create(zh); + + res = rpn_scan_ver2(zh, stream, nmem, kc, zapt, position, num_entries, + list, + is_partial, limit_set, index_type, ord_no, ords); + nmem_destroy(nmem); + (*kc->dec)(kc); + return res; } /*