You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucy.apache.org by ma...@apache.org on 2010/11/03 18:03:50 UTC
[lucy-commits] svn commit: r1030535 - in /incubator/lucy/trunk:
core/KinoSearch/Plan/FieldType.cfh perl/xs/KinoSearch/Index/DocReader.c
perl/xs/KinoSearch/Index/Inverter.c
Author: marvin
Date: Wed Nov 3 17:03:50 2010
New Revision: 1030535
URL: http://svn.apache.org/viewvc?rev=1030535&view=rev
Log:
Migrate some manually namespaced symbols within FieldType to "Lucy" namespace.
Modified:
incubator/lucy/trunk/core/KinoSearch/Plan/FieldType.cfh
incubator/lucy/trunk/perl/xs/KinoSearch/Index/DocReader.c
incubator/lucy/trunk/perl/xs/KinoSearch/Index/Inverter.c
Modified: incubator/lucy/trunk/core/KinoSearch/Plan/FieldType.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Plan/FieldType.cfh?rev=1030535&r1=1030534&r2=1030535&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Plan/FieldType.cfh (original)
+++ incubator/lucy/trunk/core/KinoSearch/Plan/FieldType.cfh Wed Nov 3 17:03:50 2010
@@ -18,22 +18,22 @@ parcel KinoSearch;
__C__
-#define kino_FType_TEXT 1
-#define kino_FType_BLOB 2
-#define kino_FType_INT32 3
-#define kino_FType_INT64 4
-#define kino_FType_FLOAT32 5
-#define kino_FType_FLOAT64 6
-#define kino_FType_PRIMITIVE_ID_MASK 0x7
+#define lucy_FType_TEXT 1
+#define lucy_FType_BLOB 2
+#define lucy_FType_INT32 3
+#define lucy_FType_INT64 4
+#define lucy_FType_FLOAT32 5
+#define lucy_FType_FLOAT64 6
+#define lucy_FType_PRIMITIVE_ID_MASK 0x7
#ifdef LUCY_USE_SHORT_NAMES
- #define FType_TEXT kino_FType_TEXT
- #define FType_BLOB kino_FType_BLOB
- #define FType_INT32 kino_FType_INT32
- #define FType_INT64 kino_FType_INT64
- #define FType_FLOAT32 kino_FType_FLOAT32
- #define FType_FLOAT64 kino_FType_FLOAT64
- #define FType_PRIMITIVE_ID_MASK kino_FType_PRIMITIVE_ID_MASK
+ #define FType_TEXT lucy_FType_TEXT
+ #define FType_BLOB lucy_FType_BLOB
+ #define FType_INT32 lucy_FType_INT32
+ #define FType_INT64 lucy_FType_INT64
+ #define FType_FLOAT32 lucy_FType_FLOAT32
+ #define FType_FLOAT64 lucy_FType_FLOAT64
+ #define FType_PRIMITIVE_ID_MASK lucy_FType_PRIMITIVE_ID_MASK
#endif
__END_C__
Modified: incubator/lucy/trunk/perl/xs/KinoSearch/Index/DocReader.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/xs/KinoSearch/Index/DocReader.c?rev=1030535&r1=1030534&r2=1030535&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/xs/KinoSearch/Index/DocReader.c (original)
+++ incubator/lucy/trunk/perl/xs/KinoSearch/Index/DocReader.c Wed Nov 3 17:03:50 2010
@@ -69,8 +69,8 @@ kino_DefDocReader_fetch_doc(kino_Default
type = Kino_Schema_Fetch_Type(schema, (kino_CharBuf*)field_name_zcb);
// Read the field value.
- switch(Kino_FType_Primitive_ID(type) & kino_FType_PRIMITIVE_ID_MASK) {
- case kino_FType_TEXT: {
+ switch(Kino_FType_Primitive_ID(type) & lucy_FType_PRIMITIVE_ID_MASK) {
+ case lucy_FType_TEXT: {
STRLEN value_len = Kino_InStream_Read_C32(dat_in);
value_sv = newSV((value_len ? value_len : 1));
Kino_InStream_Read_Bytes(dat_in, SvPVX(value_sv), value_len);
@@ -80,7 +80,7 @@ kino_DefDocReader_fetch_doc(kino_Default
SvUTF8_on(value_sv);
break;
}
- case kino_FType_BLOB: {
+ case lucy_FType_BLOB: {
STRLEN value_len = Kino_InStream_Read_C32(dat_in);
value_sv = newSV((value_len ? value_len : 1));
Kino_InStream_Read_Bytes(dat_in, SvPVX(value_sv), value_len);
@@ -89,16 +89,16 @@ kino_DefDocReader_fetch_doc(kino_Default
SvPOK_on(value_sv);
break;
}
- case kino_FType_FLOAT32:
+ case lucy_FType_FLOAT32:
value_sv = newSVnv(Kino_InStream_Read_F32(dat_in));
break;
- case kino_FType_FLOAT64:
+ case lucy_FType_FLOAT64:
value_sv = newSVnv(Kino_InStream_Read_F64(dat_in));
break;
- case kino_FType_INT32:
+ case lucy_FType_INT32:
value_sv = newSViv((int32_t)Kino_InStream_Read_C32(dat_in));
break;
- case kino_FType_INT64:
+ case lucy_FType_INT64:
if (sizeof(IV) == 8) {
int64_t val = (int64_t)Kino_InStream_Read_C64(dat_in);
value_sv = newSViv((IV)val);
Modified: incubator/lucy/trunk/perl/xs/KinoSearch/Index/Inverter.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/xs/KinoSearch/Index/Inverter.c?rev=1030535&r1=1030534&r2=1030535&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/xs/KinoSearch/Index/Inverter.c (original)
+++ incubator/lucy/trunk/perl/xs/KinoSearch/Index/Inverter.c Wed Nov 3 17:03:50 2010
@@ -99,28 +99,28 @@ kino_Inverter_invert_doc(kino_Inverter *
// Get the field value, forcing text fields to UTF-8.
switch (
- Kino_FType_Primitive_ID(type) & kino_FType_PRIMITIVE_ID_MASK
+ Kino_FType_Primitive_ID(type) & lucy_FType_PRIMITIVE_ID_MASK
) {
- case kino_FType_TEXT: {
+ case lucy_FType_TEXT: {
STRLEN val_len;
char *val_ptr = SvPVutf8(value_sv, val_len);
kino_ViewCharBuf *value = (kino_ViewCharBuf*)inv_entry->value;
Kino_ViewCB_Assign_Str(value, val_ptr, val_len);
break;
}
- case kino_FType_BLOB: {
+ case lucy_FType_BLOB: {
STRLEN val_len;
char *val_ptr = SvPV(value_sv, val_len);
kino_ViewByteBuf *value = (kino_ViewByteBuf*)inv_entry->value;
Kino_ViewBB_Assign_Bytes(value, val_ptr, val_len);
break;
}
- case kino_FType_INT32: {
+ case lucy_FType_INT32: {
kino_Integer32* value = (kino_Integer32*)inv_entry->value;
Kino_Int32_Set_Value(value, SvIV(value_sv));
break;
}
- case kino_FType_INT64: {
+ case lucy_FType_INT64: {
kino_Integer64* value = (kino_Integer64*)inv_entry->value;
int64_t val = sizeof(IV) == 8
? SvIV(value_sv)
@@ -128,12 +128,12 @@ kino_Inverter_invert_doc(kino_Inverter *
Kino_Int64_Set_Value(value, val);
break;
}
- case kino_FType_FLOAT32: {
+ case lucy_FType_FLOAT32: {
kino_Float32* value = (kino_Float32*)inv_entry->value;
Kino_Float32_Set_Value(value, (float)SvNV(value_sv));
break;
}
- case kino_FType_FLOAT64: {
+ case lucy_FType_FLOAT64: {
kino_Float64* value = (kino_Float64*)inv_entry->value;
Kino_Float64_Set_Value(value, SvNV(value_sv));
break;