projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Somewhat improved diagnostics for update with opaque record ID
[idzebra-moved-to-github.git]
/
index
/
zsets.c
diff --git
a/index/zsets.c
b/index/zsets.c
index
999f443
..
949ace4
100644
(file)
--- a/
index/zsets.c
+++ b/
index/zsets.c
@@
-1,4
+1,4
@@
-/* $Id: zsets.c,v 1.90 2005-06-22 19:42:38 adam Exp $
+/* $Id: zsets.c,v 1.96 2005-10-28 07:25:30 adam Exp $
Copyright (C) 1995-2005
Index Data ApS
Copyright (C) 1995-2005
Index Data ApS
@@
-398,6
+398,10
@@
ZebraMetaRecord *zebra_meta_records_create(ZebraHandle zh, const char *name,
RSET rset;
int i;
struct zset_sort_info *sort_info;
RSET rset;
int i;
struct zset_sort_info *sort_info;
+ size_t sysno_mem_index = 0;
+
+ if (zh->m_staticrank)
+ sysno_mem_index = 1;
if (!log_level_set)
loglevels();
if (!log_level_set)
loglevels();
@@
-483,7
+487,7
@@
ZebraMetaRecord *zebra_meta_records_create(ZebraHandle zh, const char *name,
}
while (num_i < num && rset_read (rfd, &key, 0))
{
}
while (num_i < num && rset_read (rfd, &key, 0))
{
- zint this_sys = key.mem[0];
+ zint this_sys = key.mem[sysno_mem_index];
if (this_sys != psysno)
{
psysno = this_sys;
if (this_sys != psysno)
{
psysno = this_sys;
@@
-711,6
+715,11
@@
ZEBRA_RES resultSetSortSingle(ZebraHandle zh, NMEM nmem,
TERMID termid;
TERMID *terms;
int numTerms = 0;
TERMID termid;
TERMID *terms;
int numTerms = 0;
+ size_t sysno_mem_index = 0;
+
+ if (zh->m_staticrank)
+ sysno_mem_index = 1;
+
assert(nmem); /* compiler shut up about unused param */
sset->sort_info->num_entries = 0;
assert(nmem); /* compiler shut up about unused param */
sset->sort_info->num_entries = 0;
@@
-785,7
+794,7
@@
ZEBRA_RES resultSetSortSingle(ZebraHandle zh, NMEM nmem,
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[0];
+ zint this_sys = key.mem[sysno_mem_index];
if (log_level_searchhits)
key_logdump_txt(log_level_searchhits, &key, termid->name);
kno++;
if (log_level_searchhits)
key_logdump_txt(log_level_searchhits, &key, termid->name);
kno++;
@@
-829,6
+838,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");
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();
if (!log_level_set)
loglevels();
@@
-839,6
+852,7
@@
ZEBRA_RES resultSetRank(ZebraHandle zh, ZebraSet zebraSet,
terms = (TERMID *) nmem_malloc(nmem, sizeof(*terms)*n);
rset_getterms(rset, terms, n, &numTerms);
terms = (TERMID *) nmem_malloc(nmem, sizeof(*terms)*n);
rset_getterms(rset, terms, n, &numTerms);
+
rank_class = zebraRankLookup(zh, rank_handler_name);
if (!rank_class)
{
rank_class = zebraRankLookup(zh, rank_handler_name);
if (!rank_class)
{
@@
-856,31
+870,42
@@
ZEBRA_RES resultSetRank(ZebraHandle zh, ZebraSet zebraSet,
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;
+ zint psysno = 0; /* previous doc id / sys no */
+ zint pstaticrank = 0; /* previous static rank */
+ int stop_flag = 0;
while (rset_read(rfd, &key, &termid))
{
while (rset_read(rfd, &key, &termid))
{
- zint this_sys = key.mem[0];
+ 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);
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)
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++;
resultSetInsertRank (zh, sort_info, psysno, score, 'A');
count++;
+ if (stop_flag)
+ break;
}
psysno = this_sys;
}
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)
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++;
}
resultSetInsertRank(zh, sort_info, psysno, score, 'A');
count++;
}
@@
-1047,7
+1072,7
@@
ZEBRA_RES zebra_snippets_hit_vector(ZebraHandle zh, const char *setname,
zint sysno, zebra_snippets *snippets)
{
ZebraSet sset = resultSetGet(zh, 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;
setname, sysno);
if (!sset)
return ZEBRA_FAIL;
@@
-1086,7
+1111,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],
for (ol = termid->ol; ol; ol = ol->next)
{
zebra_snippets_append(snippets, key.mem[key.len-1],
- termid->reg_type,
ol->ord, termid->name);
}
}
ol->ord, termid->name);
}
}
@@
-1095,6
+1119,7
@@
ZEBRA_RES zebra_snippets_hit_vector(ZebraHandle zh, const char *setname,
rset_delete(rset_comb);
nmem_destroy(nmem);
rset_delete(rset_comb);
nmem_destroy(nmem);
+ kc->dec(kc);
}
return ZEBRA_OK;
}
}
return ZEBRA_OK;
}