Mailing List Archive

Author: creamyg
Date: 2008-07-29 18:20:41 -0700 (Tue, 29 Jul 2008)
New Revision: 3670

Modified:
trunk/c_src/KinoSearch/Search/MultiSearcher.bp
trunk/c_src/KinoSearch/Search/MultiSearcher.c
trunk/c_src/KinoSearch/Search/Searchable.bp
trunk/c_src/KinoSearch/Searcher.bp
trunk/c_src/KinoSearch/Searcher.c
Log:
Kill off unused num_wanted param to Searchable_Collect().


Modified: trunk/c_src/KinoSearch/Search/MultiSearcher.bp
===================================================================
--- trunk/c_src/KinoSearch/Search/MultiSearcher.bp 2008-07-30 01:13:30 UTC (rev 3669)
+++ trunk/c_src/KinoSearch/Search/MultiSearcher.bp 2008-07-30 01:20:41 UTC (rev 3670)
@@ -41,8 +41,7 @@
Doc_Freq(MultiSearcher *self, const CharBuf *field, Obj *term);

void
- Collect(MultiSearcher *self, Query *query, HitCollector *collector,
- u32_t num_wanted = 0x7FFFFFFF);
+ Collect(MultiSearcher *self, Query *query, HitCollector *collector);

incremented TopDocs*
Top_Docs(MultiSearcher *self, Query *query, u32_t num_wanted,

Modified: trunk/c_src/KinoSearch/Search/MultiSearcher.c
===================================================================
--- trunk/c_src/KinoSearch/Search/MultiSearcher.c 2008-07-30 01:13:30 UTC (rev 3669)
+++ trunk/c_src/KinoSearch/Search/MultiSearcher.c 2008-07-30 01:20:41 UTC (rev 3670)
@@ -212,7 +212,7 @@

void
MultiSearcher_collect(MultiSearcher *self, Query *query,
- HitCollector *collector, u32_t num_wanted)
+ HitCollector *collector)
{
u32_t i;
VArray *searchables = self->searchables;
@@ -222,8 +222,7 @@
u32_t start = (u32_t)IntMap_Get(starts, i);
Searchable *searchable = (Searchable*)VA_Fetch(searchables, i);
OffsetCollector *offset_coll = OffsetColl_new(collector, start);
- Searchable_Collect(searchable, query, (HitCollector*)offset_coll,
- num_wanted);
+ Searchable_Collect(searchable, query, (HitCollector*)offset_coll);
REFCOUNT_DEC(offset_coll);
}
}

Modified: trunk/c_src/KinoSearch/Search/Searchable.bp
===================================================================
--- trunk/c_src/KinoSearch/Search/Searchable.bp 2008-07-30 01:13:30 UTC (rev 3669)
+++ trunk/c_src/KinoSearch/Search/Searchable.bp 2008-07-30 01:20:41 UTC (rev 3670)
@@ -69,8 +69,7 @@
* @param collector A HitCollector.
*/
abstract void
- Collect(Searchable *self, Query *query, HitCollector *collector,
- u32_t num_wanted = 0x7FFFFFFF);
+ Collect(Searchable *self, Query *query, HitCollector *collector);

/** Return a TopDocs object with up to num_wanted hits.
*/

Modified: trunk/c_src/KinoSearch/Searcher.bp
===================================================================
--- trunk/c_src/KinoSearch/Searcher.bp 2008-07-30 01:13:30 UTC (rev 3669)
+++ trunk/c_src/KinoSearch/Searcher.bp 2008-07-30 01:20:41 UTC (rev 3670)
@@ -34,8 +34,7 @@
Doc_Freq(Searcher *self, const CharBuf *field, Obj *term);

void
- Collect(Searcher *self, Query *query, HitCollector *collector,
- u32_t num_wanted = 0x7FFFFFFF);
+ Collect(Searcher *self, Query *query, HitCollector *collector);

incremented TopDocs*
Top_Docs(Searcher *self, Query *query, u32_t num_wanted,

Modified: trunk/c_src/KinoSearch/Searcher.c
===================================================================
--- trunk/c_src/KinoSearch/Searcher.c 2008-07-30 01:13:30 UTC (rev 3669)
+++ trunk/c_src/KinoSearch/Searcher.c 2008-07-30 01:20:41 UTC (rev 3670)
@@ -83,7 +83,7 @@
collector = TDColl_new(num_wanted);
}

- Searcher_Collect(self, query, (HitCollector*)collector, num_wanted);
+ Searcher_Collect(self, query, (HitCollector*)collector);
score_docs = HitQ_Pop_All(collector->hit_q);
if (score_docs->size) {
ScoreDoc *score_doc = (ScoreDoc*)VA_Fetch(score_docs, 0);
@@ -100,8 +100,7 @@
}

void
-Searcher_collect(Searcher *self, Query *query, HitCollector *collector,
- u32_t num_wanted)
+Searcher_collect(Searcher *self, Query *query, HitCollector *collector)
{
IndexReader *reader = self->reader;
IntMap *seg_starts = NULL;


_______________________________________________
kinosearch-commits mailing list
kinosearch-commits@rectangular.com
http://www.rectangular.com/mailman/listinfo/kinosearch-commits