Mailing List Archive

Author: creamyg
Date: 2008-08-23 15:43:59 -0700 (Sat, 23 Aug 2008)
New Revision: 3751

Modified:
trunk/c_src/KinoSearch/Index/MultiReader.bp
trunk/c_src/KinoSearch/Index/MultiReader.c
Log:
Reduce scope of MultiReader_sub_reader_tick() to MultiReader.c.


Modified: trunk/c_src/KinoSearch/Index/MultiReader.bp
===================================================================
--- trunk/c_src/KinoSearch/Index/MultiReader.bp 2008-08-23 19:36:52 UTC (rev 3750)
+++ trunk/c_src/KinoSearch/Index/MultiReader.bp 2008-08-23 22:43:59 UTC (rev 3751)
@@ -17,12 +17,6 @@
init(MultiReader *self, InvIndex *invindex, Snapshot *snapshot = NULL,
LockFactory *lock_factory = NULL, VArray *sub_readers);

- /* Determine which sub-reader a document resides in. (Should be private,
- * but needed by binding.)
- */
- u32_t
- Sub_Reader_Tick(MultiReader *self, u32_t doc_num);
-
public u32_t
Max_Docs(MultiReader *self);


Modified: trunk/c_src/KinoSearch/Index/MultiReader.c
===================================================================
--- trunk/c_src/KinoSearch/Index/MultiReader.c 2008-08-23 19:36:52 UTC (rev 3750)
+++ trunk/c_src/KinoSearch/Index/MultiReader.c 2008-08-23 22:43:59 UTC (rev 3751)
@@ -16,6 +16,12 @@
#include "KinoSearch/Util/I32Array.h"
#include "KinoSearch/Util/Native.h"

+/* Determine which sub-reader a document resides in. (Should be private, but
+ * needed by binding.)
+ */
+static u32_t
+sub_reader_tick(MultiReader *self, u32_t doc_num);
+
MultiReader*
MultiReader_new(InvIndex *invindex, Snapshot *snapshot,
LockFactory *lock_factory, VArray *sub_readers)
@@ -100,7 +106,7 @@
bool_t
MultiReader_is_deleted(MultiReader *self, u32_t doc_num)
{
- u32_t tick = MultiReader_sub_reader_tick(self, doc_num);
+ u32_t tick = sub_reader_tick(self, doc_num);
SegReader *sub_reader = (SegReader*)VA_Fetch(self->sub_readers, tick);
u32_t offset = I32Arr_Get(self->starts, tick);
doc_num -= offset;
@@ -166,7 +172,7 @@
HitDoc*
MultiReader_fetch_doc(MultiReader *self, u32_t doc_num)
{
- u32_t tick = MultiReader_sub_reader_tick(self, doc_num);
+ u32_t tick = sub_reader_tick(self, doc_num);
SegReader *sub_reader = (SegReader*)VA_Fetch(self->sub_readers, tick);
u32_t offset = I32Arr_Get(self->starts, tick);
HitDoc *doc = SegReader_Fetch_Doc(sub_reader, doc_num - offset);
@@ -177,7 +183,7 @@
DocVector*
MultiReader_fetch_doc_vec(MultiReader *self, u32_t doc_num)
{
- u32_t tick = MultiReader_sub_reader_tick(self, doc_num);
+ u32_t tick = sub_reader_tick(self, doc_num);
SegReader *sub_reader = (SegReader*)VA_Fetch(self->sub_readers, tick);
u32_t offset = I32Arr_Get(self->starts, tick);
doc_num -= offset;
@@ -196,8 +202,8 @@
return (VArray*)VA_Shallow_Copy(self->sub_readers);
}

-u32_t
-MultiReader_sub_reader_tick(MultiReader *self, u32_t doc_num)
+static u32_t
+sub_reader_tick(MultiReader *self, u32_t doc_num)
{
I32Array *const starts = self->starts;
u32_t lo = 0;


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