X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzsets.c;h=9eee590663308f34755df122c47f84354215fe51;hb=290a65e5f45f2c5c774489e4175beaec23f5ea23;hp=643ba2cfeacebfc6310acecda1477bfb0cfb0284;hpb=c401b3a1421e31b3d6b77bc7bac6ffb934207df1;p=idzebra-moved-to-github.git diff --git a/index/zsets.c b/index/zsets.c index 643ba2c..9eee590 100644 --- a/index/zsets.c +++ b/index/zsets.c @@ -1,5 +1,5 @@ -/* $Id: zsets.c,v 1.112 2006-10-29 17:20:01 adam Exp $ - Copyright (C) 1995-2006 +/* $Id: zsets.c,v 1.125 2007-11-01 15:59:47 adam Exp $ + Copyright (C) 1995-2007 Index Data ApS This file is part of the Zebra server. @@ -58,6 +58,7 @@ struct zebra_set { int term_entries_max; struct zebra_set *next; int locked; + int estimated_hit_count; zint cache_position; /* last position */ RSFD cache_rfd; /* rfd (NULL if not existing) */ @@ -94,17 +95,15 @@ static void loglevels(void) log_level_set = 1; } -ZEBRA_RES resultSetSearch(ZebraHandle zh, NMEM nmem, NMEM rset_nmem, - Z_RPNQuery *rpn, ZebraSet sset) + +static ZEBRA_RES resultSetSearch(ZebraHandle zh, NMEM nmem, NMEM rset_nmem, + Z_RPNQuery *rpn, ZebraSet sset) { RSET rset = 0; - oident *attrset; Z_SortKeySpecList *sort_sequence; int sort_status, i; ZEBRA_RES res = ZEBRA_OK; - zh->hits = 0; - sort_sequence = (Z_SortKeySpecList *) nmem_malloc(nmem, sizeof(*sort_sequence)); sort_sequence->num_specs = 10; /* FIXME - Hard-coded number */ @@ -114,8 +113,9 @@ ZEBRA_RES resultSetSearch(ZebraHandle zh, NMEM nmem, NMEM rset_nmem, for (i = 0; inum_specs; i++) sort_sequence->specs[i] = 0; - attrset = oid_getentbyoid (rpn->attributeSetId); - res = rpn_search_top(zh, rpn->RPNStructure, attrset->value, + rpn_get_top_approx_limit(zh, rpn->RPNStructure, &sset->approx_limit); + + res = rpn_search_top(zh, rpn->RPNStructure, rpn->attributeSetId, nmem, rset_nmem, sort_sequence, sset->num_bases, sset->basenames, @@ -131,11 +131,11 @@ ZEBRA_RES resultSetSearch(ZebraHandle zh, NMEM nmem, NMEM rset_nmem, rset->hits_limit = sset->approx_limit; if (!i) { - res = resultSetRank (zh, sset, rset, rset_nmem); + res = resultSetRank(zh, sset, rset, rset_nmem); } else { - res = resultSetSortSingle (zh, nmem, sset, rset, + res = resultSetSortSingle(zh, nmem, sset, rset, sort_sequence, &sort_status); } sset->rset = rset; @@ -143,15 +143,17 @@ ZEBRA_RES resultSetSearch(ZebraHandle zh, NMEM nmem, NMEM rset_nmem, } -ZEBRA_RES resultSetAddRPN (ZebraHandle zh, NMEM m, Z_RPNQuery *rpn, - int num_bases, char **basenames, - const char *setname) +ZEBRA_RES resultSetAddRPN(ZebraHandle zh, NMEM m, Z_RPNQuery *rpn, + int num_bases, char **basenames, + const char *setname, + zint *hits, int *estimated_hit_count) { ZebraSet zebraSet; int i; ZEBRA_RES res; - zh->hits = 0; + *hits = 0; + *estimated_hit_count = 0; zebraSet = resultSetAdd(zh, setname, 1); if (!zebraSet) @@ -163,13 +165,16 @@ ZEBRA_RES resultSetAddRPN (ZebraHandle zh, NMEM m, Z_RPNQuery *rpn, zebraSet->num_bases = num_bases; zebraSet->basenames = - nmem_malloc (zebraSet->nmem, num_bases * sizeof(*zebraSet->basenames)); + nmem_malloc(zebraSet->nmem, num_bases * sizeof(*zebraSet->basenames)); for (i = 0; ibasenames[i] = nmem_strdup(zebraSet->nmem, basenames[i]); res = resultSetSearch(zh, zebraSet->nmem, zebraSet->rset_nmem, rpn, zebraSet); - zh->hits = zebraSet->hits; + *hits = zebraSet->hits; + if (zebraSet->estimated_hit_count) + *estimated_hit_count = 1; + if (zebraSet->rset) zebraSet->rpn = rpn; zebraSet->locked = 0; @@ -184,13 +189,13 @@ void resultSetAddTerm(ZebraHandle zh, ZebraSet s, int reg_type, { assert(zh); /* compiler shut up */ if (!s->nmem) - s->nmem = nmem_create (); + s->nmem = nmem_create(); if (!s->term_entries) { int i; s->term_entries_max = 1000; s->term_entries = - nmem_malloc (s->nmem, s->term_entries_max * + nmem_malloc(s->nmem, s->term_entries_max * sizeof(*s->term_entries)); for (i = 0; i < s->term_entries_max; i++) s->term_entries[i].term = 0; @@ -198,7 +203,7 @@ void resultSetAddTerm(ZebraHandle zh, ZebraSet s, int reg_type, if (s->hits < s->term_entries_max) { 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].db = nmem_strdup(s->nmem, db); s->term_entries[s->hits].index_name = nmem_strdup(s->nmem, index_name); s->term_entries[s->hits].term = nmem_strdup(s->nmem, term); } @@ -211,7 +216,7 @@ ZebraSet resultSetAdd(ZebraHandle zh, const char *name, int ov) int i; for (s = zh->sets; s; s = s->next) - if (!strcmp (s->name, name)) + if (!strcmp(s->name, name)) break; if (!log_level_set) @@ -225,35 +230,34 @@ ZebraSet resultSetAdd(ZebraHandle zh, const char *name, int ov) { if (s->cache_rfd) rset_close(s->cache_rfd); - rset_delete (s->rset); + rset_delete(s->rset); } if (s->rset_nmem) - nmem_destroy (s->rset_nmem); + nmem_destroy(s->rset_nmem); if (s->nmem) - nmem_destroy (s->nmem); + nmem_destroy(s->nmem); } else { const char *sort_max_str = zebra_get_resource(zh, "sortmax", "1000"); yaz_log(log_level_resultsets, "adding result set %s", name); - s = (ZebraSet) xmalloc (sizeof(*s)); + s = (ZebraSet) xmalloc(sizeof(*s)); s->next = zh->sets; zh->sets = s; - s->name = (char *) xmalloc (strlen(name)+1); - strcpy (s->name, name); + s->name = xstrdup(name); s->sort_info = (struct zset_sort_info *) - xmalloc (sizeof(*s->sort_info)); + xmalloc(sizeof(*s->sort_info)); s->sort_info->max_entries = atoi(sort_max_str); if (s->sort_info->max_entries < 2) s->sort_info->max_entries = 2; s->sort_info->entries = (struct zset_sort_entry **) - xmalloc (sizeof(*s->sort_info->entries) * + xmalloc(sizeof(*s->sort_info->entries) * s->sort_info->max_entries); s->sort_info->all_entries = (struct zset_sort_entry *) - xmalloc (sizeof(*s->sort_info->all_entries) * + xmalloc(sizeof(*s->sort_info->all_entries) * s->sort_info->max_entries); for (i = 0; i < s->sort_info->max_entries; i++) s->sort_info->entries[i] = s->sort_info->all_entries + i; @@ -269,6 +273,7 @@ ZebraSet resultSetAdd(ZebraHandle zh, const char *name, int ov) s->cache_position = 0; s->cache_rfd = 0; s->approx_limit = zh->approx_limit; + s->estimated_hit_count = 0; return s; } @@ -277,30 +282,30 @@ ZebraSet resultSetGet(ZebraHandle zh, const char *name) ZebraSet s; for (s = zh->sets; s; s = s->next) - if (!strcmp (s->name, name)) + if (!strcmp(s->name, name)) { if (!s->term_entries && !s->rset && s->rpn) { - NMEM nmem = nmem_create (); + NMEM nmem = nmem_create(); yaz_log(log_level_resultsets, "research %s", name); if (!s->rset_nmem) - s->rset_nmem=nmem_create(); + 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, + resultSetSortSingle(zh, nmem, s, s->rset, s->sortSpec, &sort_status); } - nmem_destroy (nmem); + nmem_destroy(nmem); } return s; } return NULL; } -void resultSetInvalidate (ZebraHandle zh) +void resultSetInvalidate(ZebraHandle zh) { ZebraSet s = zh->sets; @@ -311,7 +316,7 @@ void resultSetInvalidate (ZebraHandle zh) { if (s->cache_rfd) rset_close(s->cache_rfd); - rset_delete (s->rset); + rset_delete(s->rset); } s->rset = 0; s->cache_rfd = 0; @@ -337,7 +342,7 @@ void resultSetDestroy(ZebraHandle zh, int num, char **names,int *statuses) if (num >= 0) { for (i = 0; iname, names[i])) + if (!strcmp(s->name, names[i])) { if (statuses) statuses[i] = Z_DeleteStatus_success; @@ -349,22 +354,22 @@ void resultSetDestroy(ZebraHandle zh, int num, char **names,int *statuses) { *ss = s->next; - xfree (s->sort_info->all_entries); - xfree (s->sort_info->entries); - xfree (s->sort_info); + xfree(s->sort_info->all_entries); + xfree(s->sort_info->entries); + xfree(s->sort_info); if (s->nmem) - nmem_destroy (s->nmem); + nmem_destroy(s->nmem); if (s->rset) { if (s->cache_rfd) rset_close(s->cache_rfd); - rset_delete (s->rset); + rset_delete(s->rset); } if (s->rset_nmem) nmem_destroy(s->rset_nmem); - xfree (s->name); - xfree (s); + xfree(s->name); + xfree(s); } else ss = &s->next; @@ -411,13 +416,13 @@ ZebraMetaRecord *zebra_meta_records_create(ZebraHandle zh, const char *name, if (!log_level_set) loglevels(); - if (!(sset = resultSetGet (zh, name))) + if (!(sset = resultSetGet(zh, name))) return NULL; if (!(rset = sset->rset)) { if (!sset->term_entries) return 0; - sr = (ZebraMetaRecord *) xmalloc (sizeof(*sr) * num); + sr = (ZebraMetaRecord *) xmalloc(sizeof(*sr) * num); for (i = 0; icache_rfd) rset_close(sset->cache_rfd); - rfd = rset_open (rset, RSETF_READ); + rfd = rset_open(rset, RSETF_READ); } - while (num_i < num && rset_read (rfd, &key, 0)) + while (num_i < num && rset_read(rfd, &key, 0)) { zint this_sys = key.mem[sysno_mem_index]; if (this_sys != psysno) @@ -507,7 +512,7 @@ ZebraMetaRecord *zebra_meta_records_create(ZebraHandle zh, const char *name, continue; } position++; - assert (num_i < num); + assert(num_i < num); if (position == positions[num_i]) { sr[num_i].sysno = psysno; @@ -525,18 +530,18 @@ ZebraMetaRecord *zebra_meta_records_create(ZebraHandle zh, const char *name, return sr; } -void zebra_meta_records_destroy (ZebraHandle zh, ZebraMetaRecord *records, +void zebra_meta_records_destroy(ZebraHandle zh, ZebraMetaRecord *records, int num) { assert(zh); /* compiler shut up about unused arg */ - xfree (records); + xfree(records); } struct sortKeyInfo { int relation; int ord; int numerical; - int index_type; + const char *index_type; }; void resultSetInsertSort(ZebraHandle zh, ZebraSet sset, @@ -548,15 +553,15 @@ void resultSetInsertSort(ZebraHandle zh, ZebraSet sset, struct zset_sort_info *sort_info = sset->sort_info; int i, j; - sortIdx_sysno (zh->reg->sortIdx, sysno); + zebra_sort_sysno(zh->reg->sort_index, sysno); for (i = 0; ireg->sortIdx, criteria[i].ord); - sortIdx_read(zh->reg->sortIdx, this_entry_buf); + zebra_sort_type(zh->reg->sort_index, criteria[i].ord); + zebra_sort_read(zh->reg->sort_index, this_entry_buf); } } i = sort_info->num_entries; @@ -573,7 +578,7 @@ void resultSetInsertSort(ZebraHandle zh, ZebraSet sset, char this_entry_org[1024]; char other_entry_org[1024]; double diff; - int index_type = criteria[j].index_type; + const char *index_type = criteria[j].index_type; zebra_term_untrans(zh, index_type, this_entry_org, this_entry_buf); zebra_term_untrans(zh, index_type, other_entry_org, @@ -631,7 +636,7 @@ void resultSetInsertSort(ZebraHandle zh, ZebraSet sset, --j; } sort_info->entries[i] = new_entry; - assert (new_entry); + assert(new_entry); for (i = 0; ientries[i] = new_entry; - assert (new_entry); + assert(new_entry); new_entry->sysno = sysno; new_entry->score = score; } @@ -749,7 +754,7 @@ ZebraSet resultSetClone(ZebraHandle zh, const char *setname, nset->num_bases = rset->num_bases; nset->basenames = - nmem_malloc (nset->nmem, nset->num_bases * sizeof(*rset->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]); @@ -782,7 +787,7 @@ ZEBRA_RES resultSetSort(ZebraHandle zh, NMEM nmem, loglevels(); yaz_log(log_level_sort, "result set sort input=%s output=%s", *input_setnames, output_setname); - sset = resultSetGet (zh, input_setnames[0]); + sset = resultSetGet(zh, input_setnames[0]); if (!sset) { zebra_setError(zh, YAZ_BIB1_SPECIFIED_RESULT_SET_DOES_NOT_EXIST, @@ -795,7 +800,7 @@ ZEBRA_RES resultSetSort(ZebraHandle zh, NMEM nmem, input_setnames[0]); return ZEBRA_FAIL; } - if (strcmp (output_setname, input_setnames[0])) + if (strcmp(output_setname, input_setnames[0])) sset = resultSetClone(zh, output_setname, sset); sset->sortSpec = copy_SortKeySpecList(sort_sequence, sset->nmem); return resultSetSortSingle (zh, nmem, sset, rset, sort_sequence, @@ -879,7 +884,7 @@ ZEBRA_RES resultSetSortSingle(ZebraHandle zh, NMEM nmem, sort_criteria[i].ord = zebraExplain_lookup_attr_str(zh->reg->zei, zinfo_index_category_sort, - -1, sk->u.sortField); + 0, sk->u.sortField); if (sks->which != Z_SortKeySpec_null && sort_criteria[i].ord == -1) { @@ -918,8 +923,8 @@ ZEBRA_RES resultSetSortSingle(ZebraHandle zh, NMEM nmem, * SORT_IDX_ENTRYSIZE); tmp_cmp_buf[i] = xmalloc(SORT_IDX_ENTRYSIZE); } - rfd = rset_open (rset, RSETF_READ); - while (rset_read (rfd, &key, &termid)) + rfd = rset_open(rset, RSETF_READ); + while (rset_read(rfd, &key, &termid)) { zint this_sys = key.mem[sysno_mem_index]; if (log_level_searchhits) @@ -927,6 +932,14 @@ ZEBRA_RES resultSetSortSingle(ZebraHandle zh, NMEM nmem, kno++; if (this_sys != psysno) { + if ((sset->hits & 255) == 0 && zh->break_handler_func) + { + if (zh->break_handler_func(zh->break_handler_data)) + { + rset_set_hits_limit(rset, 0); + break; + } + } (sset->hits)++; psysno = this_sys; resultSetInsertSort(zh, sset, @@ -934,7 +947,7 @@ ZEBRA_RES resultSetSortSingle(ZebraHandle zh, NMEM nmem, tmp_cmp_buf); } } - rset_close (rfd); + rset_close(rfd); for (i = 0; irset; return NULL; } @@ -983,11 +996,11 @@ ZEBRA_RES resultSetRank(ZebraHandle zh, ZebraSet zebraSet, sort_info = zebraSet->sort_info; sort_info->num_entries = 0; zebraSet->hits = 0; + zebraSet->estimated_hit_count = 0; rset_getterms(rset, 0, 0, &n); terms = (TERMID *) nmem_malloc(nmem, sizeof(*terms)*n); rset_getterms(rset, terms, n, &numTerms); - rank_class = zebraRankLookup(zh, rank_handler_name); if (!rank_class) { @@ -1001,10 +1014,8 @@ ZEBRA_RES resultSetRank(ZebraHandle zh, ZebraSet zebraSet, struct rank_control *rc = rank_class->control; int score; zint count = 0; - - void *handle = - (*rc->begin) (zh->reg, rank_class->class_handle, rset, nmem, - terms, numTerms); + void *handle = (*rc->begin) (zh->reg, rank_class->class_handle, rset, + nmem, terms, numTerms); zint psysno = 0; /* previous doc id / sys no */ zint pstaticrank = 0; /* previous static rank */ int stop_flag = 0; @@ -1018,23 +1029,35 @@ ZEBRA_RES resultSetRank(ZebraHandle zh, ZebraSet zebraSet, key_logdump_txt(log_level_searchhits, &key, termid->name); if (this_sys != psysno) { /* new record .. */ + if (!(rfd->counted_items & 255) && zh->break_handler_func) + { + if (zh->break_handler_func(zh->break_handler_data)) + { + yaz_log(YLOG_LOG, "Aborted search"); + stop_flag = 1; + } + } if (rfd->counted_items > rset->hits_limit) - break; + stop_flag = 1; if (psysno) { /* only if we did have a previous record */ - score = (*rc->calc) (handle, psysno, pstaticrank, + score = (*rc->calc)(handle, psysno, pstaticrank, &stop_flag); /* insert the hit. A=Ascending */ - resultSetInsertRank (zh, sort_info, psysno, score, 'A'); + resultSetInsertRank(zh, sort_info, psysno, score, 'A'); count++; - if (stop_flag) - break; } + if (stop_flag) + { + zebraSet->estimated_hit_count = 1; + rset_set_hits_limit(rset, 0); + break; + } psysno = this_sys; if (zh->m_staticrank) pstaticrank = key.mem[0]; } - (*rc->add) (handle, CAST_ZINT_TO_INT(seqno), termid); + (*rc->add)(handle, CAST_ZINT_TO_INT(seqno), termid); } /* no more items */ if (psysno) @@ -1044,8 +1067,8 @@ ZEBRA_RES resultSetRank(ZebraHandle zh, ZebraSet zebraSet, resultSetInsertRank(zh, sort_info, psysno, score, 'A'); count++; } - (*rc->end) (zh->reg, handle); - rset_close (rfd); + (*rc->end)(zh->reg, handle); + rset_close(rfd); } zebraSet->hits = rset->hits_count; @@ -1063,7 +1086,7 @@ ZEBRA_RES resultSetRank(ZebraHandle zh, ZebraSet zebraSet, ZebraRankClass zebraRankLookup(ZebraHandle zh, const char *name) { ZebraRankClass p = zh->reg->rank_classes; - while (p && strcmp (p->control->name, name)) + while (p && strcmp(p->control->name, name)) p = p->next; if (p && !p->init_flag) { @@ -1076,10 +1099,10 @@ ZebraRankClass zebraRankLookup(ZebraHandle zh, const char *name) void zebraRankInstall(struct zebra_register *reg, struct rank_control *ctrl) { - ZebraRankClass p = (ZebraRankClass) xmalloc (sizeof(*p)); - p->control = (struct rank_control *) xmalloc (sizeof(*p->control)); - memcpy (p->control, ctrl, sizeof(*p->control)); - p->control->name = xstrdup (ctrl->name); + ZebraRankClass p = (ZebraRankClass) xmalloc(sizeof(*p)); + p->control = (struct rank_control *) xmalloc(sizeof(*p->control)); + memcpy(p->control, ctrl, sizeof(*p->control)); + p->control->name = xstrdup(ctrl->name); p->init_flag = 0; p->next = reg->rank_classes; reg->rank_classes = p; @@ -1180,7 +1203,11 @@ ZEBRA_RES zebra_result_set_term_info(ZebraHandle zh, const char *setname, if (ret == (size_t)(-1)) *termlen = 0; else + { + yaz_iconv(zh->iconv_from_utf8, 0, 0, + &outbuf, &outleft); *termlen = outbuf - termbuf; + } } else { @@ -1218,7 +1245,7 @@ ZEBRA_RES zebra_snippets_hit_vector(ZebraHandle zh, const char *setname, struct it_key key; RSET rsets[2], rset_comb; RSET rset_temp = rset_create_temp(nmem, kc, kc->scope, - res_get (zh->res, "setTmpDir"),0 ); + res_get(zh->res, "setTmpDir"),0 ); TERMID termid; RSFD rsfd = rset_open(rset_temp, RSETF_WRITE); @@ -1228,8 +1255,8 @@ ZEBRA_RES zebra_snippets_hit_vector(ZebraHandle zh, const char *setname, key.mem[2] = 0; key.mem[3] = 0; key.len = 2; - rset_write (rsfd, &key); - rset_close (rsfd); + rset_write(rsfd, &key); + rset_close(rsfd); rsets[0] = rset_temp; rsets[1] = rset_dup(sset->rset); @@ -1245,7 +1272,7 @@ ZEBRA_RES zebra_snippets_hit_vector(ZebraHandle zh, const char *setname, struct ord_list *ol; for (ol = termid->ol; ol; ol = ol->next) { - zebra_snippets_append(snippets, key.mem[key.len-1], + zebra_snippets_append(snippets, key.mem[key.len-1], 0, ol->ord, termid->name); } }