Mailing List Archive

r3738 - in trunk/c_src/KinoSearch: . Index
Author: creamyg
Date: 2008-08-19 13:04:43 -0700 (Tue, 19 Aug 2008)
New Revision: 3738

Modified:
trunk/c_src/KinoSearch/Index/LexReader.c
trunk/c_src/KinoSearch/Index/PostingsWriter.c
trunk/c_src/KinoSearch/Index/SegInfo.c
trunk/c_src/KinoSearch/Index/SegWriter.c
trunk/c_src/KinoSearch/Schema.c
Log:
Change sentinel values for field number handling routines to use 0 rather than
-1, now that 0 is an invalid field number.


Modified: trunk/c_src/KinoSearch/Index/LexReader.c
===================================================================
--- trunk/c_src/KinoSearch/Index/LexReader.c 2008-08-19 19:53:41 UTC (rev 3737)
+++ trunk/c_src/KinoSearch/Index/LexReader.c 2008-08-19 20:04:43 UTC (rev 3738)
@@ -76,7 +76,7 @@
/* Sanity check. */
CONFESS("Field num too big: %i32 %u32", field_num, self->num_fields);
}
- else if (field_num == -1) {
+ else if (!field_num) {
/* If field isn't known, bail out. */
return NULL;
}
@@ -106,7 +106,7 @@
if (field_num > (i32_t)self->num_fields) /* sanity check */
CONFESS("Field num too big: %i32 %u32", field_num, self->num_fields);

- if (field_num != -1) {
+ if (field_num) {
SegLexicon *lexicon = self->lexicons[field_num];

if (lexicon != NULL) {

Modified: trunk/c_src/KinoSearch/Index/PostingsWriter.c
===================================================================
--- trunk/c_src/KinoSearch/Index/PostingsWriter.c 2008-08-19 19:53:41 UTC (rev 3737)
+++ trunk/c_src/KinoSearch/Index/PostingsWriter.c 2008-08-19 20:04:43 UTC (rev 3738)
@@ -411,9 +411,9 @@
PostingPool *post_pool = NULL;

/* Sanity check. */
- if (old_field_num == -1)
+ if (!old_field_num)
continue; /* not in old segment */
- if (new_field_num == -1)
+ if (!new_field_num)
CONFESS("Unrecognized field: %o", field_name);

/* Init field if we've never seen it before. */

Modified: trunk/c_src/KinoSearch/Index/SegInfo.c
===================================================================
--- trunk/c_src/KinoSearch/Index/SegInfo.c 2008-08-19 19:53:41 UTC (rev 3737)
+++ trunk/c_src/KinoSearch/Index/SegInfo.c 2008-08-19 20:04:43 UTC (rev 3738)
@@ -144,25 +144,25 @@
CharBuf*
SegInfo_field_name(SegInfo *self, i32_t field_num)
{
- if (field_num == -1) {
- return (CharBuf*)∅
- }
- else {
+ if (field_num) {
CharBuf *field_name = (CharBuf*)VA_Fetch(self->by_num, field_num);
return field_name == NULL ? (CharBuf*)&EMPTY : field_name;
}
+ else {
+ return (CharBuf*)∅
+ }
}

i32_t
SegInfo_field_num(SegInfo *self, const CharBuf *field_name)
{
if (field_name == NULL) {
- return -1;
+ return 0;
}
else {
Num *num = (Num*)Hash_Fetch(self->by_name, field_name);
if (num == NULL)
- return -1;
+ return 0;
return (i32_t)num->value;
}
}

Modified: trunk/c_src/KinoSearch/Index/SegWriter.c
===================================================================
--- trunk/c_src/KinoSearch/Index/SegWriter.c 2008-08-19 19:53:41 UTC (rev 3737)
+++ trunk/c_src/KinoSearch/Index/SegWriter.c 2008-08-19 20:04:43 UTC (rev 3738)
@@ -57,7 +57,7 @@
Inverter_Iter_Init(inverter);
while (Inverter_Next(inverter)) {
ViewCharBuf *field_name = Inverter_Get_Field_Name(inverter);
- if (SegInfo_Field_Num(seg_info, (CharBuf*)field_name) == -1) {
+ if ( !SegInfo_Field_Num(seg_info, (CharBuf*)field_name) ) {
SegInfo_Add_Field(seg_info, (CharBuf*)field_name);
}
}

Modified: trunk/c_src/KinoSearch/Schema.c
===================================================================
--- trunk/c_src/KinoSearch/Schema.c 2008-08-19 19:53:41 UTC (rev 3737)
+++ trunk/c_src/KinoSearch/Schema.c 2008-08-19 20:04:43 UTC (rev 3738)
@@ -254,12 +254,12 @@
Schema_field_num(Schema *self, const CharBuf *field_name)
{
if (field_name == NULL) {
- return -1;
+ return 0;
}
else {
Num *num = (Num*)Hash_Fetch(self->by_name, field_name);
if (num == NULL)
- return -1;
+ return 0;
return (i32_t)num->value;
}
}


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