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/04 06:36:56 UTC
[lucy-commits] svn commit: r1030838 [3/12] - in /incubator/lucy/trunk: ./
clownfish/lib/Clownfish/Binding/ clownfish/lib/Clownfish/Binding/Core/
clownfish/lib/Clownfish/Binding/Perl/ core/KinoSearch/ core/Lucy/
core/Lucy/Analysis/ core/Lucy/Docs/ core/Lucy/Document/ ...
Modified: incubator/lucy/trunk/core/Lucy/Index/SkipStepper.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Index/SkipStepper.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Index/SkipStepper.c (original)
+++ incubator/lucy/trunk/core/Lucy/Index/SkipStepper.c Thu Nov 4 05:36:36 2010
@@ -17,12 +17,12 @@
#define C_LUCY_SKIPSTEPPER
#include <stdio.h>
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
-#include "KinoSearch/Index/SkipStepper.h"
-#include "KinoSearch/Store/Folder.h"
-#include "KinoSearch/Store/InStream.h"
-#include "KinoSearch/Store/OutStream.h"
+#include "Lucy/Index/SkipStepper.h"
+#include "Lucy/Store/Folder.h"
+#include "Lucy/Store/InStream.h"
+#include "Lucy/Store/OutStream.h"
SkipStepper*
SkipStepper_new()
Modified: incubator/lucy/trunk/core/Lucy/Index/SkipStepper.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Index/SkipStepper.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Index/SkipStepper.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Index/SkipStepper.cfh Thu Nov 4 05:36:36 2010
@@ -16,7 +16,7 @@
parcel Lucy;
-class KinoSearch::Index::SkipStepper inherits KinoSearch::Util::Stepper {
+class Lucy::Index::SkipStepper inherits Lucy::Util::Stepper {
int32_t doc_id;
int64_t filepos;
Modified: incubator/lucy/trunk/core/Lucy/Index/Snapshot.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Index/Snapshot.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Index/Snapshot.c (original)
+++ incubator/lucy/trunk/core/Lucy/Index/Snapshot.c Thu Nov 4 05:36:36 2010
@@ -15,14 +15,14 @@
*/
#define C_LUCY_SNAPSHOT
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
-#include "KinoSearch/Index/Snapshot.h"
-#include "KinoSearch/Index/Segment.h"
-#include "KinoSearch/Store/Folder.h"
-#include "KinoSearch/Util/StringHelper.h"
-#include "KinoSearch/Util/IndexFileNames.h"
-#include "KinoSearch/Util/Json.h"
+#include "Lucy/Index/Snapshot.h"
+#include "Lucy/Index/Segment.h"
+#include "Lucy/Store/Folder.h"
+#include "Lucy/Util/StringHelper.h"
+#include "Lucy/Util/IndexFileNames.h"
+#include "Lucy/Util/Json.h"
static VArray*
S_clean_segment_contents(VArray *orig);
Modified: incubator/lucy/trunk/core/Lucy/Index/Snapshot.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Index/Snapshot.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Index/Snapshot.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Index/Snapshot.cfh Thu Nov 4 05:36:36 2010
@@ -22,11 +22,11 @@ parcel Lucy;
* written, are never modified, a Snapshot defines a point-in-time view of the
* data in an index.
*
- * L<IndexReader|KinoSearch::Index::IndexReader> objects interpret the data
+ * L<IndexReader|Lucy::Index::IndexReader> objects interpret the data
* associated with a single Snapshot.
*/
-class KinoSearch::Index::Snapshot inherits KinoSearch::Object::Obj : dumpable {
+class Lucy::Index::Snapshot inherits Lucy::Object::Obj : dumpable {
Hash *entries;
CharBuf *path;
Modified: incubator/lucy/trunk/core/Lucy/Index/SortCache.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Index/SortCache.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Index/SortCache.c (original)
+++ incubator/lucy/trunk/core/Lucy/Index/SortCache.c Thu Nov 4 05:36:36 2010
@@ -15,10 +15,10 @@
*/
#define C_LUCY_SORTCACHE
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
-#include "KinoSearch/Index/SortCache.h"
-#include "KinoSearch/Plan/FieldType.h"
+#include "Lucy/Index/SortCache.h"
+#include "Lucy/Plan/FieldType.h"
SortCache*
SortCache_init(SortCache *self, const CharBuf *field, FieldType *type,
Modified: incubator/lucy/trunk/core/Lucy/Index/SortCache.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Index/SortCache.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Index/SortCache.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Index/SortCache.cfh Thu Nov 4 05:36:36 2010
@@ -18,7 +18,7 @@ parcel Lucy;
/** Read a segment's sort caches.
*/
-class KinoSearch::Index::SortCache inherits KinoSearch::Object::Obj {
+class Lucy::Index::SortCache inherits Lucy::Object::Obj {
CharBuf *field;
FieldType *type;
Modified: incubator/lucy/trunk/core/Lucy/Index/SortCache/NumericSortCache.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Index/SortCache/NumericSortCache.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Index/SortCache/NumericSortCache.c (original)
+++ incubator/lucy/trunk/core/Lucy/Index/SortCache/NumericSortCache.c Thu Nov 4 05:36:36 2010
@@ -19,15 +19,15 @@
#define C_LUCY_INT64SORTCACHE
#define C_LUCY_FLOAT32SORTCACHE
#define C_LUCY_FLOAT64SORTCACHE
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
-#include "KinoSearch/Index/SortCache/NumericSortCache.h"
-#include "KinoSearch/Index/Segment.h"
-#include "KinoSearch/Plan/FieldType.h"
-#include "KinoSearch/Plan/NumericType.h"
-#include "KinoSearch/Plan/Schema.h"
-#include "KinoSearch/Store/InStream.h"
-#include "KinoSearch/Store/Folder.h"
+#include "Lucy/Index/SortCache/NumericSortCache.h"
+#include "Lucy/Index/Segment.h"
+#include "Lucy/Plan/FieldType.h"
+#include "Lucy/Plan/NumericType.h"
+#include "Lucy/Plan/Schema.h"
+#include "Lucy/Store/InStream.h"
+#include "Lucy/Store/Folder.h"
NumericSortCache*
NumSortCache_init(NumericSortCache *self, const CharBuf *field,
Modified: incubator/lucy/trunk/core/Lucy/Index/SortCache/NumericSortCache.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Index/SortCache/NumericSortCache.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Index/SortCache/NumericSortCache.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Index/SortCache/NumericSortCache.cfh Thu Nov 4 05:36:36 2010
@@ -16,8 +16,8 @@
parcel Lucy;
-class KinoSearch::Index::SortCache::NumericSortCache cnick NumSortCache
- inherits KinoSearch::Index::SortCache {
+class Lucy::Index::SortCache::NumericSortCache cnick NumSortCache
+ inherits Lucy::Index::SortCache {
InStream *ord_in;
InStream *dat_in;
@@ -31,8 +31,8 @@ class KinoSearch::Index::SortCache::Nume
Destroy(NumericSortCache *self);
}
-class KinoSearch::Index::SortCache::Float64SortCache cnick F64SortCache
- inherits KinoSearch::Index::SortCache::NumericSortCache {
+class Lucy::Index::SortCache::Float64SortCache cnick F64SortCache
+ inherits Lucy::Index::SortCache::NumericSortCache {
public inert incremented Float64SortCache*
new(const CharBuf *field, FieldType *type, int32_t cardinality,
@@ -51,8 +51,8 @@ class KinoSearch::Index::SortCache::Floa
Make_Blank(Float64SortCache *self);
}
-class KinoSearch::Index::SortCache::Float32SortCache cnick F32SortCache
- inherits KinoSearch::Index::SortCache::NumericSortCache {
+class Lucy::Index::SortCache::Float32SortCache cnick F32SortCache
+ inherits Lucy::Index::SortCache::NumericSortCache {
public inert incremented Float32SortCache*
new(const CharBuf *field, FieldType *type, int32_t cardinality,
@@ -71,8 +71,8 @@ class KinoSearch::Index::SortCache::Floa
Make_Blank(Float32SortCache *self);
}
-class KinoSearch::Index::SortCache::Int32SortCache cnick I32SortCache
- inherits KinoSearch::Index::SortCache::NumericSortCache {
+class Lucy::Index::SortCache::Int32SortCache cnick I32SortCache
+ inherits Lucy::Index::SortCache::NumericSortCache {
public inert incremented Int32SortCache*
new(const CharBuf *field, FieldType *type, int32_t cardinality,
@@ -91,8 +91,8 @@ class KinoSearch::Index::SortCache::Int3
Make_Blank(Int32SortCache *self);
}
-class KinoSearch::Index::SortCache::Int64SortCache cnick I64SortCache
- inherits KinoSearch::Index::SortCache::NumericSortCache {
+class Lucy::Index::SortCache::Int64SortCache cnick I64SortCache
+ inherits Lucy::Index::SortCache::NumericSortCache {
public inert incremented Int64SortCache*
new(const CharBuf *field, FieldType *type, int32_t cardinality,
Modified: incubator/lucy/trunk/core/Lucy/Index/SortCache/TextSortCache.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Index/SortCache/TextSortCache.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Index/SortCache/TextSortCache.c (original)
+++ incubator/lucy/trunk/core/Lucy/Index/SortCache/TextSortCache.c Thu Nov 4 05:36:36 2010
@@ -15,14 +15,14 @@
*/
#define C_LUCY_TEXTSORTCACHE
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
-#include "KinoSearch/Index/SortCache/TextSortCache.h"
-#include "KinoSearch/Index/Segment.h"
-#include "KinoSearch/Plan/FieldType.h"
-#include "KinoSearch/Plan/Schema.h"
-#include "KinoSearch/Store/InStream.h"
-#include "KinoSearch/Store/Folder.h"
+#include "Lucy/Index/SortCache/TextSortCache.h"
+#include "Lucy/Index/Segment.h"
+#include "Lucy/Plan/FieldType.h"
+#include "Lucy/Plan/Schema.h"
+#include "Lucy/Store/InStream.h"
+#include "Lucy/Store/Folder.h"
TextSortCache*
TextSortCache_new(const CharBuf *field, FieldType *type, int32_t cardinality,
Modified: incubator/lucy/trunk/core/Lucy/Index/SortCache/TextSortCache.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Index/SortCache/TextSortCache.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Index/SortCache/TextSortCache.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Index/SortCache/TextSortCache.cfh Thu Nov 4 05:36:36 2010
@@ -18,8 +18,8 @@ parcel Lucy;
/** SortCache for TextType fields.
*/
-class KinoSearch::Index::SortCache::TextSortCache
- inherits KinoSearch::Index::SortCache {
+class Lucy::Index::SortCache::TextSortCache
+ inherits Lucy::Index::SortCache {
InStream *ord_in;
InStream *ix_in;
Modified: incubator/lucy/trunk/core/Lucy/Index/SortFieldWriter.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Index/SortFieldWriter.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Index/SortFieldWriter.c (original)
+++ incubator/lucy/trunk/core/Lucy/Index/SortFieldWriter.c Thu Nov 4 05:36:36 2010
@@ -15,28 +15,28 @@
*/
#define C_LUCY_SORTFIELDWRITER
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
#include <math.h>
-#include "KinoSearch/Index/SortFieldWriter.h"
-#include "KinoSearch/Index/Inverter.h"
-#include "KinoSearch/Index/PolyReader.h"
-#include "KinoSearch/Index/Segment.h"
-#include "KinoSearch/Index/SegReader.h"
-#include "KinoSearch/Index/Snapshot.h"
-#include "KinoSearch/Index/SortCache.h"
-#include "KinoSearch/Index/SortCache/NumericSortCache.h"
-#include "KinoSearch/Index/SortCache/TextSortCache.h"
-#include "KinoSearch/Index/SortReader.h"
-#include "KinoSearch/Index/ZombieKeyedHash.h"
-#include "KinoSearch/Plan/FieldType.h"
-#include "KinoSearch/Plan/Schema.h"
-#include "KinoSearch/Store/Folder.h"
-#include "KinoSearch/Store/InStream.h"
-#include "KinoSearch/Store/OutStream.h"
-#include "KinoSearch/Util/Memory.h"
-#include "KinoSearch/Util/MemoryPool.h"
-#include "KinoSearch/Util/SortUtils.h"
+#include "Lucy/Index/SortFieldWriter.h"
+#include "Lucy/Index/Inverter.h"
+#include "Lucy/Index/PolyReader.h"
+#include "Lucy/Index/Segment.h"
+#include "Lucy/Index/SegReader.h"
+#include "Lucy/Index/Snapshot.h"
+#include "Lucy/Index/SortCache.h"
+#include "Lucy/Index/SortCache/NumericSortCache.h"
+#include "Lucy/Index/SortCache/TextSortCache.h"
+#include "Lucy/Index/SortReader.h"
+#include "Lucy/Index/ZombieKeyedHash.h"
+#include "Lucy/Plan/FieldType.h"
+#include "Lucy/Plan/Schema.h"
+#include "Lucy/Store/Folder.h"
+#include "Lucy/Store/InStream.h"
+#include "Lucy/Store/OutStream.h"
+#include "Lucy/Util/Memory.h"
+#include "Lucy/Util/MemoryPool.h"
+#include "Lucy/Util/SortUtils.h"
// Prepare to read back a run.
static void
Modified: incubator/lucy/trunk/core/Lucy/Index/SortFieldWriter.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Index/SortFieldWriter.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Index/SortFieldWriter.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Index/SortFieldWriter.cfh Thu Nov 4 05:36:36 2010
@@ -16,8 +16,8 @@
parcel Lucy;
-class KinoSearch::Index::SortFieldWriter
- inherits KinoSearch::Util::SortExternal {
+class Lucy::Index::SortFieldWriter
+ inherits Lucy::Util::SortExternal {
CharBuf *field;
Hash *uniq_vals;
Schema *schema;
Modified: incubator/lucy/trunk/core/Lucy/Index/SortReader.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Index/SortReader.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Index/SortReader.c (original)
+++ incubator/lucy/trunk/core/Lucy/Index/SortReader.c Thu Nov 4 05:36:36 2010
@@ -16,18 +16,18 @@
#define C_LUCY_SORTREADER
#define C_LUCY_DEFAULTSORTREADER
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
-#include "KinoSearch/Index/SortReader.h"
-#include "KinoSearch/Index/Segment.h"
-#include "KinoSearch/Index/Snapshot.h"
-#include "KinoSearch/Index/SortCache/NumericSortCache.h"
-#include "KinoSearch/Index/SortCache/TextSortCache.h"
-#include "KinoSearch/Index/SortWriter.h"
-#include "KinoSearch/Plan/FieldType.h"
-#include "KinoSearch/Plan/Schema.h"
-#include "KinoSearch/Store/Folder.h"
-#include "KinoSearch/Store/InStream.h"
+#include "Lucy/Index/SortReader.h"
+#include "Lucy/Index/Segment.h"
+#include "Lucy/Index/Snapshot.h"
+#include "Lucy/Index/SortCache/NumericSortCache.h"
+#include "Lucy/Index/SortCache/TextSortCache.h"
+#include "Lucy/Index/SortWriter.h"
+#include "Lucy/Plan/FieldType.h"
+#include "Lucy/Plan/Schema.h"
+#include "Lucy/Store/Folder.h"
+#include "Lucy/Store/InStream.h"
SortReader*
SortReader_init(SortReader *self, Schema *schema, Folder *folder,
Modified: incubator/lucy/trunk/core/Lucy/Index/SortReader.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Index/SortReader.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Index/SortReader.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Index/SortReader.cfh Thu Nov 4 05:36:36 2010
@@ -18,8 +18,8 @@ parcel Lucy;
/** Read a segment's sort caches.
*/
-abstract class KinoSearch::Index::SortReader
- inherits KinoSearch::Index::DataReader {
+abstract class Lucy::Index::SortReader
+ inherits Lucy::Index::DataReader {
inert SortReader*
init(SortReader *self, Schema *schema = NULL, Folder *folder = NULL,
@@ -37,8 +37,8 @@ abstract class KinoSearch::Index::SortRe
}
-class KinoSearch::Index::DefaultSortReader cnick DefSortReader
- inherits KinoSearch::Index::SortReader {
+class Lucy::Index::DefaultSortReader cnick DefSortReader
+ inherits Lucy::Index::SortReader {
Hash *caches;
Hash *counts;
Modified: incubator/lucy/trunk/core/Lucy/Index/SortWriter.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Index/SortWriter.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Index/SortWriter.c (original)
+++ incubator/lucy/trunk/core/Lucy/Index/SortWriter.c Thu Nov 4 05:36:36 2010
@@ -15,26 +15,26 @@
*/
#define C_LUCY_SORTWRITER
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
#include <math.h>
-#include "KinoSearch/Index/SortWriter.h"
-#include "KinoSearch/Index/Inverter.h"
-#include "KinoSearch/Index/PolyReader.h"
-#include "KinoSearch/Index/Segment.h"
-#include "KinoSearch/Index/SegReader.h"
-#include "KinoSearch/Index/Snapshot.h"
-#include "KinoSearch/Index/SortCache.h"
-#include "KinoSearch/Index/SortFieldWriter.h"
-#include "KinoSearch/Index/SortReader.h"
-#include "KinoSearch/Plan/FieldType.h"
-#include "KinoSearch/Plan/Schema.h"
-#include "KinoSearch/Store/Folder.h"
-#include "KinoSearch/Store/InStream.h"
-#include "KinoSearch/Store/OutStream.h"
-#include "KinoSearch/Util/Memory.h"
-#include "KinoSearch/Util/MemoryPool.h"
-#include "KinoSearch/Util/SortUtils.h"
+#include "Lucy/Index/SortWriter.h"
+#include "Lucy/Index/Inverter.h"
+#include "Lucy/Index/PolyReader.h"
+#include "Lucy/Index/Segment.h"
+#include "Lucy/Index/SegReader.h"
+#include "Lucy/Index/Snapshot.h"
+#include "Lucy/Index/SortCache.h"
+#include "Lucy/Index/SortFieldWriter.h"
+#include "Lucy/Index/SortReader.h"
+#include "Lucy/Plan/FieldType.h"
+#include "Lucy/Plan/Schema.h"
+#include "Lucy/Store/Folder.h"
+#include "Lucy/Store/InStream.h"
+#include "Lucy/Store/OutStream.h"
+#include "Lucy/Util/Memory.h"
+#include "Lucy/Util/MemoryPool.h"
+#include "Lucy/Util/SortUtils.h"
int32_t SortWriter_current_file_format = 3;
Modified: incubator/lucy/trunk/core/Lucy/Index/SortWriter.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Index/SortWriter.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Index/SortWriter.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Index/SortWriter.cfh Thu Nov 4 05:36:36 2010
@@ -26,7 +26,7 @@ parcel Lucy;
* ".ix" file instead of -1.
*/
-class KinoSearch::Index::SortWriter inherits KinoSearch::Index::DataWriter {
+class Lucy::Index::SortWriter inherits Lucy::Index::DataWriter {
VArray *field_writers;
Hash *counts;
Modified: incubator/lucy/trunk/core/Lucy/Index/TermInfo.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Index/TermInfo.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Index/TermInfo.c (original)
+++ incubator/lucy/trunk/core/Lucy/Index/TermInfo.c Thu Nov 4 05:36:36 2010
@@ -15,10 +15,10 @@
*/
#define C_LUCY_TERMINFO
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
-#include "KinoSearch/Index/TermInfo.h"
-#include "KinoSearch/Util/StringHelper.h"
+#include "Lucy/Index/TermInfo.h"
+#include "Lucy/Util/StringHelper.h"
TermInfo*
TInfo_new(int32_t doc_freq)
Modified: incubator/lucy/trunk/core/Lucy/Index/TermInfo.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Index/TermInfo.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Index/TermInfo.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Index/TermInfo.cfh Thu Nov 4 05:36:36 2010
@@ -26,7 +26,7 @@ parcel Lucy;
* .lexx stream; it is a filepointer to a locations in the main .lex file.
*/
-class KinoSearch::Index::TermInfo cnick TInfo inherits KinoSearch::Object::Obj {
+class Lucy::Index::TermInfo cnick TInfo inherits Lucy::Object::Obj {
int32_t doc_freq;
int64_t post_filepos;
Modified: incubator/lucy/trunk/core/Lucy/Index/TermStepper.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Index/TermStepper.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Index/TermStepper.c (original)
+++ incubator/lucy/trunk/core/Lucy/Index/TermStepper.c Thu Nov 4 05:36:36 2010
@@ -15,13 +15,13 @@
*/
#define C_LUCY_TERMSTEPPER
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
-#include "KinoSearch/Index/TermStepper.h"
-#include "KinoSearch/Plan/Schema.h"
-#include "KinoSearch/Store/InStream.h"
-#include "KinoSearch/Store/OutStream.h"
-#include "KinoSearch/Util/StringHelper.h"
+#include "Lucy/Index/TermStepper.h"
+#include "Lucy/Plan/Schema.h"
+#include "Lucy/Store/InStream.h"
+#include "Lucy/Store/OutStream.h"
+#include "Lucy/Util/StringHelper.h"
TermStepper*
TermStepper_init(TermStepper *self)
Modified: incubator/lucy/trunk/core/Lucy/Index/TermStepper.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Index/TermStepper.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Index/TermStepper.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Index/TermStepper.cfh Thu Nov 4 05:36:36 2010
@@ -16,8 +16,8 @@
parcel Lucy;
-abstract class KinoSearch::Index::TermStepper
- inherits KinoSearch::Util::Stepper {
+abstract class Lucy::Index::TermStepper
+ inherits Lucy::Util::Stepper {
Obj *value;
Modified: incubator/lucy/trunk/core/Lucy/Index/TermVector.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Index/TermVector.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Index/TermVector.c (original)
+++ incubator/lucy/trunk/core/Lucy/Index/TermVector.c Thu Nov 4 05:36:36 2010
@@ -16,11 +16,11 @@
#define C_LUCY_TERMVECTOR
#define C_LUCY_I32ARRAY
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
-#include "KinoSearch/Index/TermVector.h"
-#include "KinoSearch/Store/InStream.h"
-#include "KinoSearch/Store/OutStream.h"
+#include "Lucy/Index/TermVector.h"
+#include "Lucy/Store/InStream.h"
+#include "Lucy/Store/OutStream.h"
TermVector*
TV_new(const CharBuf *field, const CharBuf *text, I32Array *positions,
Modified: incubator/lucy/trunk/core/Lucy/Index/TermVector.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Index/TermVector.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Index/TermVector.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Index/TermVector.cfh Thu Nov 4 05:36:36 2010
@@ -19,8 +19,8 @@ parcel Lucy;
/** Term freq and positional data.
*/
-class KinoSearch::Index::TermVector cnick TV
- inherits KinoSearch::Object::Obj {
+class Lucy::Index::TermVector cnick TV
+ inherits Lucy::Object::Obj {
CharBuf *field;
CharBuf *text;
Modified: incubator/lucy/trunk/core/Lucy/Index/ZombieKeyedHash.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Index/ZombieKeyedHash.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Index/ZombieKeyedHash.c (original)
+++ incubator/lucy/trunk/core/Lucy/Index/ZombieKeyedHash.c Thu Nov 4 05:36:36 2010
@@ -15,11 +15,11 @@
*/
#define C_LUCY_ZOMBIEKEYEDHASH
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
-#include "KinoSearch/Index/ZombieKeyedHash.h"
-#include "KinoSearch/Plan/FieldType.h"
-#include "KinoSearch/Util/MemoryPool.h"
+#include "Lucy/Index/ZombieKeyedHash.h"
+#include "Lucy/Plan/FieldType.h"
+#include "Lucy/Util/MemoryPool.h"
ZombieKeyedHash*
ZKHash_new(MemoryPool *memory_pool, uint8_t primitive_id)
Modified: incubator/lucy/trunk/core/Lucy/Index/ZombieKeyedHash.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Index/ZombieKeyedHash.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Index/ZombieKeyedHash.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Index/ZombieKeyedHash.cfh Thu Nov 4 05:36:36 2010
@@ -18,8 +18,8 @@ parcel Lucy;
/** Hash which creates keys allocated from a MemoryPool rather than malloc.
*/
-class KinoSearch::Index::SortFieldWriter::ZombieKeyedHash cnick ZKHash
- inherits KinoSearch::Object::Hash {
+class Lucy::Index::SortFieldWriter::ZombieKeyedHash cnick ZKHash
+ inherits Lucy::Object::Hash {
MemoryPool *mem_pool;
uint8_t prim_id;
Modified: incubator/lucy/trunk/core/Lucy/Object/BitVector.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Object/BitVector.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Object/BitVector.c (original)
+++ incubator/lucy/trunk/core/Lucy/Object/BitVector.c Thu Nov 4 05:36:36 2010
@@ -15,11 +15,11 @@
*/
#define C_LUCY_BITVECTOR
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
#include <math.h>
-#include "KinoSearch/Object/BitVector.h"
+#include "Lucy/Object/BitVector.h"
// Shared subroutine for performing both OR and XOR ops.
#define DO_OR 1
Modified: incubator/lucy/trunk/core/Lucy/Object/BitVector.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Object/BitVector.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Object/BitVector.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Object/BitVector.cfh Thu Nov 4 05:36:36 2010
@@ -21,8 +21,8 @@ parcel Lucy;
* BitVector is a growable array of bits. All bits are initially zero.
*/
-class KinoSearch::Object::BitVector cnick BitVec
- inherits KinoSearch::Object::Obj {
+class Lucy::Object::BitVector cnick BitVec
+ inherits Lucy::Object::Obj {
uint32_t cap;
uint8_t *bits;
Modified: incubator/lucy/trunk/core/Lucy/Object/ByteBuf.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Object/ByteBuf.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Object/ByteBuf.c (original)
+++ incubator/lucy/trunk/core/Lucy/Object/ByteBuf.c Thu Nov 4 05:36:36 2010
@@ -24,12 +24,12 @@
#include <stdio.h>
#include <ctype.h>
-#include "KinoSearch/Object/VTable.h"
-#include "KinoSearch/Object/ByteBuf.h"
-#include "KinoSearch/Object/Err.h"
-#include "KinoSearch/Store/InStream.h"
-#include "KinoSearch/Store/OutStream.h"
-#include "KinoSearch/Util/Memory.h"
+#include "Lucy/Object/VTable.h"
+#include "Lucy/Object/ByteBuf.h"
+#include "Lucy/Object/Err.h"
+#include "Lucy/Store/InStream.h"
+#include "Lucy/Store/OutStream.h"
+#include "Lucy/Util/Memory.h"
static void
S_grow(ByteBuf *self, size_t size);
Modified: incubator/lucy/trunk/core/Lucy/Object/ByteBuf.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Object/ByteBuf.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Object/ByteBuf.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Object/ByteBuf.cfh Thu Nov 4 05:36:36 2010
@@ -20,7 +20,7 @@ parcel Lucy;
* Growable buffer holding arbitrary bytes.
*/
-class KinoSearch::Object::ByteBuf cnick BB inherits KinoSearch::Object::Obj {
+class Lucy::Object::ByteBuf cnick BB inherits Lucy::Object::Obj {
char *buf;
size_t size; /* number of valid bytes */
@@ -130,8 +130,8 @@ class KinoSearch::Object::ByteBuf cnick
/**
* A ByteBuf that doesn't own its own string.
*/
-class KinoSearch::Object::ViewByteBuf cnick ViewBB
- inherits KinoSearch::Object::ByteBuf {
+class Lucy::Object::ViewByteBuf cnick ViewBB
+ inherits Lucy::Object::ByteBuf {
/** Return a pointer to a new "view" ByteBuf, offing a persective on the
* passed-in string.
Modified: incubator/lucy/trunk/core/Lucy/Object/CharBuf.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Object/CharBuf.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Object/CharBuf.c (original)
+++ incubator/lucy/trunk/core/Lucy/Object/CharBuf.c Thu Nov 4 05:36:36 2010
@@ -25,14 +25,14 @@
#include <stdlib.h>
#include <ctype.h>
-#include "KinoSearch/Object/VTable.h"
-#include "KinoSearch/Object/CharBuf.h"
+#include "Lucy/Object/VTable.h"
+#include "Lucy/Object/CharBuf.h"
-#include "KinoSearch/Object/Err.h"
-#include "KinoSearch/Store/InStream.h"
-#include "KinoSearch/Store/OutStream.h"
-#include "KinoSearch/Util/Memory.h"
-#include "KinoSearch/Util/StringHelper.h"
+#include "Lucy/Object/Err.h"
+#include "Lucy/Store/InStream.h"
+#include "Lucy/Store/OutStream.h"
+#include "Lucy/Util/Memory.h"
+#include "Lucy/Util/StringHelper.h"
// Helper function for throwing invalid UTF-8 error. Since THROW uses
// a CharBuf internally, calling THROW with invalid UTF-8 would create an
Modified: incubator/lucy/trunk/core/Lucy/Object/CharBuf.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Object/CharBuf.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Object/CharBuf.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Object/CharBuf.cfh Thu Nov 4 05:36:36 2010
@@ -24,8 +24,8 @@ __END_C__
* Growable buffer holding Unicode characters.
*/
-class KinoSearch::Object::CharBuf cnick CB
- inherits KinoSearch::Object::Obj {
+class Lucy::Object::CharBuf cnick CB
+ inherits Lucy::Object::Obj {
char *ptr;
size_t size;
@@ -308,8 +308,8 @@ class KinoSearch::Object::CharBuf cnick
Cat_Trusted_Str(CharBuf *self, const char *ptr, size_t size);
}
-class KinoSearch::Object::ViewCharBuf cnick ViewCB
- inherits KinoSearch::Object::CharBuf {
+class Lucy::Object::ViewCharBuf cnick ViewCB
+ inherits Lucy::Object::CharBuf {
inert incremented ViewCharBuf*
new_from_utf8(const char *utf8, size_t size);
@@ -343,8 +343,8 @@ class KinoSearch::Object::ViewCharBuf cn
Destroy(ViewCharBuf *self);
}
-class KinoSearch::Object::ZombieCharBuf cnick ZCB
- inherits KinoSearch::Object::ViewCharBuf {
+class Lucy::Object::ZombieCharBuf cnick ZCB
+ inherits Lucy::Object::ViewCharBuf {
/** Return a ZombieCharBuf with a blank string.
*/
Modified: incubator/lucy/trunk/core/Lucy/Object/Err.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Object/Err.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Object/Err.c (original)
+++ incubator/lucy/trunk/core/Lucy/Object/Err.c Thu Nov 4 05:36:36 2010
@@ -24,10 +24,10 @@
#include <stdio.h>
#include <ctype.h>
-#include "KinoSearch/Object/Err.h"
-#include "KinoSearch/Object/CharBuf.h"
-#include "KinoSearch/Object/VTable.h"
-#include "KinoSearch/Util/Memory.h"
+#include "Lucy/Object/Err.h"
+#include "Lucy/Object/CharBuf.h"
+#include "Lucy/Object/VTable.h"
+#include "Lucy/Util/Memory.h"
Err*
Err_new(CharBuf *mess)
Modified: incubator/lucy/trunk/core/Lucy/Object/Err.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Object/Err.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Object/Err.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Object/Err.cfh Thu Nov 4 05:36:36 2010
@@ -20,7 +20,7 @@ parcel Lucy;
* Exception.
*
* Most of the time when Lucy encounters an error, it tries to raise a
- * KinoSearch::Object::Err exception with an error message and context
+ * Lucy::Object::Err exception with an error message and context
* information.
*
* At present, it is only safe to catch exceptions which are specifically
@@ -32,7 +32,7 @@ parcel Lucy;
* temporarily, so that calling code may choose how to handle a particular
* error condition.
*/
-class KinoSearch::Object::Err inherits KinoSearch::Object::Obj {
+class Lucy::Object::Err inherits Lucy::Object::Obj {
CharBuf *mess;
Modified: incubator/lucy/trunk/core/Lucy/Object/Hash.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Object/Hash.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Object/Hash.c (original)
+++ incubator/lucy/trunk/core/Lucy/Object/Hash.c Thu Nov 4 05:36:36 2010
@@ -22,16 +22,16 @@
#include <string.h>
#include <stdlib.h>
-#include "KinoSearch/Object/VTable.h"
+#include "Lucy/Object/VTable.h"
-#include "KinoSearch/Object/Hash.h"
-#include "KinoSearch/Object/CharBuf.h"
-#include "KinoSearch/Object/Err.h"
-#include "KinoSearch/Object/VArray.h"
-#include "KinoSearch/Store/InStream.h"
-#include "KinoSearch/Store/OutStream.h"
-#include "KinoSearch/Util/Freezer.h"
-#include "KinoSearch/Util/Memory.h"
+#include "Lucy/Object/Hash.h"
+#include "Lucy/Object/CharBuf.h"
+#include "Lucy/Object/Err.h"
+#include "Lucy/Object/VArray.h"
+#include "Lucy/Store/InStream.h"
+#include "Lucy/Store/OutStream.h"
+#include "Lucy/Util/Freezer.h"
+#include "Lucy/Util/Memory.h"
static HashTombStone TOMBSTONE = {
HASHTOMBSTONE,
Modified: incubator/lucy/trunk/core/Lucy/Object/Hash.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Object/Hash.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Object/Hash.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Object/Hash.cfh Thu Nov 4 05:36:36 2010
@@ -24,7 +24,7 @@ parcel Lucy;
* this behavior can be changed by overridding Make_Key(), e.g. to implement
* efficient hash sets.
*/
-class KinoSearch::Object::Hash inherits KinoSearch::Object::Obj {
+class Lucy::Object::Hash inherits Lucy::Object::Obj {
void *entries;
uint32_t capacity;
@@ -146,8 +146,8 @@ class KinoSearch::Object::Hash inherits
Destroy(Hash *self);
}
-class KinoSearch::Object::Hash::HashTombStone
- inherits KinoSearch::Object::Obj {
+class Lucy::Object::Hash::HashTombStone
+ inherits Lucy::Object::Obj {
uint32_t
Get_RefCount(HashTombStone* self);
Modified: incubator/lucy/trunk/core/Lucy/Object/Host.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Object/Host.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Object/Host.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Object/Host.cfh Thu Nov 4 05:36:36 2010
@@ -63,7 +63,7 @@ __END_C__
* If the invoker is a VTable, it will be used to make a class
* callback rather than an object callback.
*/
-inert class KinoSearch::Object::Host {
+inert class Lucy::Object::Host {
/** Invoke an object method in a void context.
*/
Modified: incubator/lucy/trunk/core/Lucy/Object/I32Array.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Object/I32Array.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Object/I32Array.c (original)
+++ incubator/lucy/trunk/core/Lucy/Object/I32Array.c Thu Nov 4 05:36:36 2010
@@ -15,9 +15,9 @@
*/
#define C_LUCY_I32ARRAY
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
-#include "KinoSearch/Object/I32Array.h"
+#include "Lucy/Object/I32Array.h"
I32Array*
I32Arr_new(int32_t *ints, uint32_t size)
Modified: incubator/lucy/trunk/core/Lucy/Object/I32Array.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Object/I32Array.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Object/I32Array.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Object/I32Array.cfh Thu Nov 4 05:36:36 2010
@@ -16,7 +16,7 @@
parcel Lucy;
-class KinoSearch::Object::I32Array cnick I32Arr inherits KinoSearch::Object::Obj {
+class Lucy::Object::I32Array cnick I32Arr inherits Lucy::Object::Obj {
int32_t *ints;
uint32_t size;
Modified: incubator/lucy/trunk/core/Lucy/Object/LockFreeRegistry.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Object/LockFreeRegistry.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Object/LockFreeRegistry.c (original)
+++ incubator/lucy/trunk/core/Lucy/Object/LockFreeRegistry.c Thu Nov 4 05:36:36 2010
@@ -18,11 +18,11 @@
#define LUCY_USE_SHORT_NAMES
#define CHY_USE_SHORT_NAMES
-#include "KinoSearch/Object/LockFreeRegistry.h"
-#include "KinoSearch/Object/Err.h"
-#include "KinoSearch/Object/VTable.h"
-#include "KinoSearch/Util/Atomic.h"
-#include "KinoSearch/Util/Memory.h"
+#include "Lucy/Object/LockFreeRegistry.h"
+#include "Lucy/Object/Err.h"
+#include "Lucy/Object/VTable.h"
+#include "Lucy/Util/Atomic.h"
+#include "Lucy/Util/Memory.h"
typedef struct lucy_LFRegEntry {
Obj *key;
Modified: incubator/lucy/trunk/core/Lucy/Object/LockFreeRegistry.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Object/LockFreeRegistry.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Object/LockFreeRegistry.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Object/LockFreeRegistry.cfh Thu Nov 4 05:36:36 2010
@@ -18,7 +18,7 @@ parcel Lucy;
/** Specialized lock free hash table for storing VTables.
*/
-class KinoSearch::Object::LockFreeRegistry cnick LFReg inherits KinoSearch::Object::Obj {
+class Lucy::Object::LockFreeRegistry cnick LFReg inherits Lucy::Object::Obj {
size_t capacity;
void *entries;
Modified: incubator/lucy/trunk/core/Lucy/Object/Num.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Object/Num.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Object/Num.c (original)
+++ incubator/lucy/trunk/core/Lucy/Object/Num.c Thu Nov 4 05:36:36 2010
@@ -24,12 +24,12 @@
#define LUCY_USE_SHORT_NAMES
#define CHY_USE_SHORT_NAMES
-#include "KinoSearch/Object/Num.h"
-#include "KinoSearch/Object/CharBuf.h"
-#include "KinoSearch/Object/Err.h"
-#include "KinoSearch/Object/VTable.h"
-#include "KinoSearch/Store/InStream.h"
-#include "KinoSearch/Store/OutStream.h"
+#include "Lucy/Object/Num.h"
+#include "Lucy/Object/CharBuf.h"
+#include "Lucy/Object/Err.h"
+#include "Lucy/Object/VTable.h"
+#include "Lucy/Store/InStream.h"
+#include "Lucy/Store/OutStream.h"
Num*
Num_init(Num *self)
Modified: incubator/lucy/trunk/core/Lucy/Object/Num.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Object/Num.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Object/Num.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Object/Num.cfh Thu Nov 4 05:36:36 2010
@@ -18,7 +18,7 @@ parcel Lucy;
/** Abstract base class for numbers.
*/
-abstract class KinoSearch::Object::Num inherits KinoSearch::Object::Obj {
+abstract class Lucy::Object::Num inherits Lucy::Object::Obj {
inert Num*
init(Num *self);
@@ -32,7 +32,7 @@ abstract class KinoSearch::Object::Num i
/** Abstract base class for floating point numbers.
*/
-abstract class KinoSearch::Object::FloatNum inherits KinoSearch::Object::Num {
+abstract class Lucy::Object::FloatNum inherits Lucy::Object::Num {
inert FloatNum*
init(FloatNum *self);
@@ -44,7 +44,7 @@ abstract class KinoSearch::Object::Float
/** Abstract base class for Integers.
*/
-abstract class KinoSearch::Object::IntNum inherits KinoSearch::Object::Num {
+abstract class Lucy::Object::IntNum inherits Lucy::Object::Num {
inert IntNum*
init(IntNum *self);
@@ -56,7 +56,7 @@ abstract class KinoSearch::Object::IntNu
/** Single precision floating point number.
*/
-class KinoSearch::Object::Float32 inherits KinoSearch::Object::FloatNum {
+class Lucy::Object::Float32 inherits Lucy::Object::FloatNum {
float value;
@@ -99,7 +99,7 @@ class KinoSearch::Object::Float32 inheri
/** Double precision floating point number.
*/
-class KinoSearch::Object::Float64 inherits KinoSearch::Object::FloatNum {
+class Lucy::Object::Float64 inherits Lucy::Object::FloatNum {
double value;
@@ -142,8 +142,8 @@ class KinoSearch::Object::Float64 inheri
/** 32-bit signed integer.
*/
-class KinoSearch::Object::Integer32 cnick Int32
- inherits KinoSearch::Object::IntNum {
+class Lucy::Object::Integer32 cnick Int32
+ inherits Lucy::Object::IntNum {
int32_t value;
@@ -187,8 +187,8 @@ class KinoSearch::Object::Integer32 cnic
/**
* 64-bit signed integer.
*/
-class KinoSearch::Object::Integer64 cnick Int64
- inherits KinoSearch::Object::IntNum {
+class Lucy::Object::Integer64 cnick Int64
+ inherits Lucy::Object::IntNum {
int64_t value;
Modified: incubator/lucy/trunk/core/Lucy/Object/Obj.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Object/Obj.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Object/Obj.c (original)
+++ incubator/lucy/trunk/core/Lucy/Object/Obj.c Thu Nov 4 05:36:36 2010
@@ -23,14 +23,14 @@
#include <stdio.h>
#include <string.h>
-#include "KinoSearch/Object/Obj.h"
-#include "KinoSearch/Object/CharBuf.h"
-#include "KinoSearch/Object/Err.h"
-#include "KinoSearch/Object/Hash.h"
-#include "KinoSearch/Object/VTable.h"
-#include "KinoSearch/Store/InStream.h"
-#include "KinoSearch/Store/OutStream.h"
-#include "KinoSearch/Util/Memory.h"
+#include "Lucy/Object/Obj.h"
+#include "Lucy/Object/CharBuf.h"
+#include "Lucy/Object/Err.h"
+#include "Lucy/Object/Hash.h"
+#include "Lucy/Object/VTable.h"
+#include "Lucy/Store/InStream.h"
+#include "Lucy/Store/OutStream.h"
+#include "Lucy/Util/Memory.h"
Obj*
Obj_init(Obj *self)
Modified: incubator/lucy/trunk/core/Lucy/Object/Obj.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Object/Obj.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Object/Obj.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Object/Obj.cfh Thu Nov 4 05:36:36 2010
@@ -19,7 +19,7 @@ parcel Lucy;
/** Base class for all Lucy objects.
*/
-class KinoSearch::Object::Obj {
+class Lucy::Object::Obj {
VTable *vtable;
lucy_ref_t ref;
Modified: incubator/lucy/trunk/core/Lucy/Object/VArray.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Object/VArray.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Object/VArray.c (original)
+++ incubator/lucy/trunk/core/Lucy/Object/VArray.c Thu Nov 4 05:36:36 2010
@@ -21,14 +21,14 @@
#define LUCY_USE_SHORT_NAMES
#define CHY_USE_SHORT_NAMES
-#include "KinoSearch/Object/VTable.h"
-#include "KinoSearch/Object/VArray.h"
-#include "KinoSearch/Object/Err.h"
-#include "KinoSearch/Util/Memory.h"
-#include "KinoSearch/Util/Freezer.h"
-#include "KinoSearch/Util/SortUtils.h"
-#include "KinoSearch/Store/InStream.h"
-#include "KinoSearch/Store/OutStream.h"
+#include "Lucy/Object/VTable.h"
+#include "Lucy/Object/VArray.h"
+#include "Lucy/Object/Err.h"
+#include "Lucy/Util/Memory.h"
+#include "Lucy/Util/Freezer.h"
+#include "Lucy/Util/SortUtils.h"
+#include "Lucy/Store/InStream.h"
+#include "Lucy/Store/OutStream.h"
VArray*
VA_new(uint32_t capacity)
Modified: incubator/lucy/trunk/core/Lucy/Object/VArray.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Object/VArray.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Object/VArray.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Object/VArray.cfh Thu Nov 4 05:36:36 2010
@@ -17,7 +17,7 @@
parcel Lucy;
__C__
-#include "KinoSearch/Util/SortUtils.h"
+#include "Lucy/Util/SortUtils.h"
typedef chy_bool_t
(*lucy_VA_gather_test_t)(lucy_VArray *self, uint32_t tick, void *data);
@@ -29,7 +29,7 @@ __END_C__
/** Variable-sized array.
*/
-class KinoSearch::Object::VArray cnick VA inherits KinoSearch::Object::Obj {
+class Lucy::Object::VArray cnick VA inherits Lucy::Object::Obj {
Obj **elems;
uint32_t size;
Modified: incubator/lucy/trunk/core/Lucy/Object/VTable.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Object/VTable.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Object/VTable.c (original)
+++ incubator/lucy/trunk/core/Lucy/Object/VTable.c Thu Nov 4 05:36:36 2010
@@ -22,14 +22,14 @@
#include <string.h>
#include <ctype.h>
-#include "KinoSearch/Object/VTable.h"
-#include "KinoSearch/Object/CharBuf.h"
-#include "KinoSearch/Object/Err.h"
-#include "KinoSearch/Object/Hash.h"
-#include "KinoSearch/Object/LockFreeRegistry.h"
-#include "KinoSearch/Object/VArray.h"
-#include "KinoSearch/Util/Atomic.h"
-#include "KinoSearch/Util/Memory.h"
+#include "Lucy/Object/VTable.h"
+#include "Lucy/Object/CharBuf.h"
+#include "Lucy/Object/Err.h"
+#include "Lucy/Object/Hash.h"
+#include "Lucy/Object/LockFreeRegistry.h"
+#include "Lucy/Object/VArray.h"
+#include "Lucy/Util/Atomic.h"
+#include "Lucy/Util/Memory.h"
size_t VTable_offset_of_parent = offsetof(VTable, parent);
Modified: incubator/lucy/trunk/core/Lucy/Object/VTable.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Object/VTable.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Object/VTable.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Object/VTable.cfh Thu Nov 4 05:36:36 2010
@@ -23,7 +23,7 @@ parcel Lucy;
* behavior of VTables.)
*/
-class KinoSearch::Object::VTable inherits KinoSearch::Object::Obj {
+class Lucy::Object::VTable inherits Lucy::Object::Obj {
VTable *parent;
CharBuf *name;
@@ -74,7 +74,7 @@ class KinoSearch::Object::VTable inherit
fetch_vtable(const CharBuf *class_name);
/** Given a class name, return the name of a parent class which descends
- * from KinoSearch::Object::Obj, or NULL if such a class can't be found.
+ * from Lucy::Object::Obj, or NULL if such a class can't be found.
*/
inert nullable CharBuf*
find_parent_class(const CharBuf *class_name);
Modified: incubator/lucy/trunk/core/Lucy/Plan/Architecture.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Plan/Architecture.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Plan/Architecture.c (original)
+++ incubator/lucy/trunk/core/Lucy/Plan/Architecture.c Thu Nov 4 05:36:36 2010
@@ -15,29 +15,29 @@
*/
#define C_LUCY_ARCHITECTURE
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
-#include "KinoSearch/Plan/Architecture.h"
-#include "KinoSearch/Index/DeletionsReader.h"
-#include "KinoSearch/Index/DeletionsWriter.h"
-#include "KinoSearch/Index/DocReader.h"
-#include "KinoSearch/Index/DocWriter.h"
-#include "KinoSearch/Index/HighlightReader.h"
-#include "KinoSearch/Index/HighlightWriter.h"
-#include "KinoSearch/Index/LexiconReader.h"
-#include "KinoSearch/Index/LexiconWriter.h"
-#include "KinoSearch/Index/PolyReader.h"
-#include "KinoSearch/Index/PostingListReader.h"
-#include "KinoSearch/Index/PostingListWriter.h"
-#include "KinoSearch/Index/Segment.h"
-#include "KinoSearch/Index/SegReader.h"
-#include "KinoSearch/Index/SegWriter.h"
-#include "KinoSearch/Index/Similarity.h"
-#include "KinoSearch/Index/Snapshot.h"
-#include "KinoSearch/Index/SortReader.h"
-#include "KinoSearch/Index/SortWriter.h"
-#include "KinoSearch/Plan/Schema.h"
-#include "KinoSearch/Store/Folder.h"
+#include "Lucy/Plan/Architecture.h"
+#include "Lucy/Index/DeletionsReader.h"
+#include "Lucy/Index/DeletionsWriter.h"
+#include "Lucy/Index/DocReader.h"
+#include "Lucy/Index/DocWriter.h"
+#include "Lucy/Index/HighlightReader.h"
+#include "Lucy/Index/HighlightWriter.h"
+#include "Lucy/Index/LexiconReader.h"
+#include "Lucy/Index/LexiconWriter.h"
+#include "Lucy/Index/PolyReader.h"
+#include "Lucy/Index/PostingListReader.h"
+#include "Lucy/Index/PostingListWriter.h"
+#include "Lucy/Index/Segment.h"
+#include "Lucy/Index/SegReader.h"
+#include "Lucy/Index/SegWriter.h"
+#include "Lucy/Index/Similarity.h"
+#include "Lucy/Index/Snapshot.h"
+#include "Lucy/Index/SortReader.h"
+#include "Lucy/Index/SortWriter.h"
+#include "Lucy/Plan/Schema.h"
+#include "Lucy/Store/Folder.h"
Architecture*
Arch_new()
Modified: incubator/lucy/trunk/core/Lucy/Plan/Architecture.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Plan/Architecture.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Plan/Architecture.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Plan/Architecture.cfh Thu Nov 4 05:36:36 2010
@@ -22,10 +22,10 @@ parcel Lucy;
* postings, stored documents, deletions, and highlight data. The readers and
* writers for that data are spawned by Architecture. Each component operates
* at the segment level; Architecture's factory methods are used to build up
- * L<SegWriter|KinoSearch::Index::SegWriter> and
- * L<SegReader|KinoSearch::Index::SegReader>.
+ * L<SegWriter|Lucy::Index::SegWriter> and
+ * L<SegReader|Lucy::Index::SegReader>.
*/
-class KinoSearch::Plan::Architecture cnick Arch inherits KinoSearch::Object::Obj {
+class Lucy::Plan::Architecture cnick Arch inherits Lucy::Object::Obj {
public inert incremented Architecture*
new();
Modified: incubator/lucy/trunk/core/Lucy/Plan/BlobType.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Plan/BlobType.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Plan/BlobType.c (original)
+++ incubator/lucy/trunk/core/Lucy/Plan/BlobType.c Thu Nov 4 05:36:36 2010
@@ -15,9 +15,9 @@
*/
#define C_LUCY_BLOBTYPE
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
-#include "KinoSearch/Plan/BlobType.h"
+#include "Lucy/Plan/BlobType.h"
BlobType*
BlobType_new(bool_t stored)
Modified: incubator/lucy/trunk/core/Lucy/Plan/BlobType.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Plan/BlobType.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Plan/BlobType.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Plan/BlobType.cfh Thu Nov 4 05:36:36 2010
@@ -21,7 +21,7 @@ parcel Lucy;
* BlobType is an implementation of FieldType tuned for use with fields
* containing binary data, which cannot be indexed or searched -- only stored.
*/
-class KinoSearch::Plan::BlobType inherits KinoSearch::Plan::FieldType
+class Lucy::Plan::BlobType inherits Lucy::Plan::FieldType
: dumpable {
/**
Modified: incubator/lucy/trunk/core/Lucy/Plan/FieldType.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Plan/FieldType.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Plan/FieldType.c (original)
+++ incubator/lucy/trunk/core/Lucy/Plan/FieldType.c Thu Nov 4 05:36:36 2010
@@ -15,12 +15,12 @@
*/
#define C_LUCY_FIELDTYPE
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
-#include "KinoSearch/Plan/FieldType.h"
-#include "KinoSearch/Analysis/Analyzer.h"
-#include "KinoSearch/Index/Posting.h"
-#include "KinoSearch/Index/Similarity.h"
+#include "Lucy/Plan/FieldType.h"
+#include "Lucy/Analysis/Analyzer.h"
+#include "Lucy/Index/Posting.h"
+#include "Lucy/Index/Similarity.h"
FieldType*
FType_init(FieldType *self)
Modified: incubator/lucy/trunk/core/Lucy/Plan/FieldType.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Plan/FieldType.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Plan/FieldType.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Plan/FieldType.cfh Thu Nov 4 05:36:36 2010
@@ -65,12 +65,12 @@ __END_C__
* not settable.
*
* The <code>similarity</code> property is a
- * L<Similarity|KinoSearch::Index::Similarity> object which defines matching
+ * L<Similarity|Lucy::Index::Similarity> object which defines matching
* and scoring behavior for the field. It is required if the field is
* <code>indexed</code>.
*/
-abstract class KinoSearch::Plan::FieldType cnick FType
- inherits KinoSearch::Object::Obj {
+abstract class Lucy::Plan::FieldType cnick FType
+ inherits Lucy::Object::Obj {
float boost;
bool_t indexed;
Modified: incubator/lucy/trunk/core/Lucy/Plan/FullTextType.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Plan/FullTextType.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Plan/FullTextType.c (original)
+++ incubator/lucy/trunk/core/Lucy/Plan/FullTextType.c Thu Nov 4 05:36:36 2010
@@ -15,12 +15,12 @@
*/
#define C_LUCY_FULLTEXTTYPE
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
-#include "KinoSearch/Plan/FullTextType.h"
-#include "KinoSearch/Analysis/Analyzer.h"
-#include "KinoSearch/Index/Posting/ScorePosting.h"
-#include "KinoSearch/Index/Similarity.h"
+#include "Lucy/Plan/FullTextType.h"
+#include "Lucy/Analysis/Analyzer.h"
+#include "Lucy/Index/Posting/ScorePosting.h"
+#include "Lucy/Index/Similarity.h"
FullTextType*
FullTextType_new(Analyzer *analyzer)
Modified: incubator/lucy/trunk/core/Lucy/Plan/FullTextType.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Plan/FullTextType.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Plan/FullTextType.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Plan/FullTextType.cfh Thu Nov 4 05:36:36 2010
@@ -18,18 +18,18 @@ parcel Lucy;
/** Full-text search field type.
*
- * KinoSearch::Plan::FullTextType is an implementation of
- * L<KinoSearch::Plan::FieldType> tuned for "full text search".
+ * Lucy::Plan::FullTextType is an implementation of
+ * L<Lucy::Plan::FieldType> tuned for "full text search".
*
* Full text fields are associated with an
- * L<Analyzer|KinoSearch::Analysis::Analyzer>, which is used to tokenize and
+ * L<Analyzer|Lucy::Analysis::Analyzer>, which is used to tokenize and
* normalize the text so that it can be searched for individual words.
*
* For an exact-match, single value field type using character data, see
- * L<StringType|KinoSearch::Plan::StringType>.
+ * L<StringType|Lucy::Plan::StringType>.
*/
-class KinoSearch::Plan::FullTextType
- inherits KinoSearch::Plan::TextType : dumpable {
+class Lucy::Plan::FullTextType
+ inherits Lucy::Plan::TextType : dumpable {
bool_t highlightable;
Analyzer *analyzer;
@@ -55,7 +55,7 @@ class KinoSearch::Plan::FullTextType
new(Analyzer *analyzer);
/** Indicate whether to store data required by
- * L<KinoSearch::Highlight::Highlighter> for excerpt selection and search
+ * L<Lucy::Highlight::Highlighter> for excerpt selection and search
* term highlighting.
*/
public void
Modified: incubator/lucy/trunk/core/Lucy/Plan/NumericType.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Plan/NumericType.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Plan/NumericType.c (original)
+++ incubator/lucy/trunk/core/Lucy/Plan/NumericType.c Thu Nov 4 05:36:36 2010
@@ -15,9 +15,9 @@
*/
#define C_LUCY_NUMERICTYPE
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
-#include "KinoSearch/Plan/NumericType.h"
+#include "Lucy/Plan/NumericType.h"
NumericType*
NumType_init(NumericType *self)
Modified: incubator/lucy/trunk/core/Lucy/Plan/NumericType.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Plan/NumericType.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Plan/NumericType.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Plan/NumericType.cfh Thu Nov 4 05:36:36 2010
@@ -16,8 +16,8 @@
parcel Lucy;
-class KinoSearch::Plan::NumericType cnick NumType
- inherits KinoSearch::Plan::FieldType : dumpable {
+class Lucy::Plan::NumericType cnick NumType
+ inherits Lucy::Plan::FieldType : dumpable {
public inert NumericType*
init(NumericType *self);
@@ -47,11 +47,11 @@ class KinoSearch::Plan::NumericType cnic
Load(NumericType *self, Obj *dump);
}
-abstract class KinoSearch::Plan::FloatType
- inherits KinoSearch::Plan::NumericType : dumpable { }
+abstract class Lucy::Plan::FloatType
+ inherits Lucy::Plan::NumericType : dumpable { }
-class KinoSearch::Plan::Float64Type
- inherits KinoSearch::Plan::FloatType : dumpable {
+class Lucy::Plan::Float64Type
+ inherits Lucy::Plan::FloatType : dumpable {
public inert Float64Type*
new();
@@ -73,8 +73,8 @@ class KinoSearch::Plan::Float64Type
Equals(Float64Type *self, Obj *other);
}
-class KinoSearch::Plan::Float32Type
- inherits KinoSearch::Plan::FloatType : dumpable {
+class Lucy::Plan::Float32Type
+ inherits Lucy::Plan::FloatType : dumpable {
public inert Float32Type*
new();
@@ -96,11 +96,11 @@ class KinoSearch::Plan::Float32Type
Equals(Float32Type *self, Obj *other);
}
-abstract class KinoSearch::Plan::IntType
- inherits KinoSearch::Plan::NumericType : dumpable { }
+abstract class Lucy::Plan::IntType
+ inherits Lucy::Plan::NumericType : dumpable { }
-class KinoSearch::Plan::Int32Type
- inherits KinoSearch::Plan::IntType : dumpable {
+class Lucy::Plan::Int32Type
+ inherits Lucy::Plan::IntType : dumpable {
public inert Int32Type*
new();
@@ -122,8 +122,8 @@ class KinoSearch::Plan::Int32Type
Equals(Int32Type *self, Obj *other);
}
-class KinoSearch::Plan::Int64Type
- inherits KinoSearch::Plan::IntType : dumpable {
+class Lucy::Plan::Int64Type
+ inherits Lucy::Plan::IntType : dumpable {
public inert Int64Type*
new();
Modified: incubator/lucy/trunk/core/Lucy/Plan/Schema.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Plan/Schema.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Plan/Schema.c (original)
+++ incubator/lucy/trunk/core/Lucy/Plan/Schema.c Thu Nov 4 05:36:36 2010
@@ -17,19 +17,19 @@
#define C_LUCY_SCHEMA
#include <string.h>
#include <ctype.h>
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
-#include "KinoSearch/Plan/Schema.h"
-#include "KinoSearch/Analysis/Analyzer.h"
-#include "KinoSearch/Index/Similarity.h"
-#include "KinoSearch/Plan/FieldType.h"
-#include "KinoSearch/Plan/BlobType.h"
-#include "KinoSearch/Plan/NumericType.h"
-#include "KinoSearch/Plan/StringType.h"
-#include "KinoSearch/Plan/FullTextType.h"
-#include "KinoSearch/Plan/Architecture.h"
-#include "KinoSearch/Store/Folder.h"
-#include "KinoSearch/Util/Json.h"
+#include "Lucy/Plan/Schema.h"
+#include "Lucy/Analysis/Analyzer.h"
+#include "Lucy/Index/Similarity.h"
+#include "Lucy/Plan/FieldType.h"
+#include "Lucy/Plan/BlobType.h"
+#include "Lucy/Plan/NumericType.h"
+#include "Lucy/Plan/StringType.h"
+#include "Lucy/Plan/FullTextType.h"
+#include "Lucy/Plan/Architecture.h"
+#include "Lucy/Store/Folder.h"
+#include "Lucy/Util/Json.h"
// Scan the array to see if an object testing as Equal is present. If not,
// push the elem onto the end of the array.
@@ -259,11 +259,11 @@ S_lazy_init_old_type_vtables(void)
{
if (old_full_text_type_vtable) { return; }
CharBuf *klass = CB_new(40);
- CB_setf(klass, "KinoSearch::FieldType::FullTextType");
+ CB_setf(klass, "Lucy::FieldType::FullTextType");
old_full_text_type_vtable = VTable_singleton(klass, FULLTEXTTYPE);
- CB_setf(klass, "KinoSearch::FieldType::StringType");
+ CB_setf(klass, "Lucy::FieldType::StringType");
old_string_type_vtable = VTable_singleton(klass, STRINGTYPE);
- CB_setf(klass, "KinoSearch::FieldType::BlobType");
+ CB_setf(klass, "Lucy::FieldType::BlobType");
old_blob_type_vtable = VTable_singleton(klass, BLOBTYPE);
DECREF(klass);
}
@@ -422,10 +422,10 @@ void
Schema_eat(Schema *self, Schema *other)
{
if (!Schema_Is_A(self, Schema_Get_VTable(other))) {
- // Special case because of move of KinoSearch::Schema.
+ // Special case because of move of Lucy::Schema.
if ( Schema_Get_VTable(self) == SCHEMA
&& CB_Equals_Str(Schema_Get_Class_Name(other),
- "KinoSearch::Schema", 18)
+ "Lucy::Schema", 12)
) {
// allow
}
Modified: incubator/lucy/trunk/core/Lucy/Plan/Schema.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Plan/Schema.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Plan/Schema.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Plan/Schema.cfh Thu Nov 4 05:36:36 2010
@@ -25,7 +25,7 @@ parcel Lucy;
* field definitions may not be changed. However, it is possible to add new
* fields during subsequent indexing sessions.
*/
-class KinoSearch::Plan::Schema inherits KinoSearch::Object::Obj {
+class Lucy::Plan::Schema inherits Lucy::Object::Obj {
Architecture *arch;
Similarity *sim;
Modified: incubator/lucy/trunk/core/Lucy/Plan/StringType.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Plan/StringType.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Plan/StringType.c (original)
+++ incubator/lucy/trunk/core/Lucy/Plan/StringType.c Thu Nov 4 05:36:36 2010
@@ -15,11 +15,11 @@
*/
#define C_LUCY_STRINGTYPE
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
-#include "KinoSearch/Plan/StringType.h"
-#include "KinoSearch/Index/Posting/ScorePosting.h"
-#include "KinoSearch/Index/Similarity.h"
+#include "Lucy/Plan/StringType.h"
+#include "Lucy/Index/Posting/ScorePosting.h"
+#include "Lucy/Index/Similarity.h"
StringType*
StringType_new()
Modified: incubator/lucy/trunk/core/Lucy/Plan/StringType.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Plan/StringType.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Plan/StringType.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Plan/StringType.cfh Thu Nov 4 05:36:36 2010
@@ -18,10 +18,10 @@ parcel Lucy;
/** Non-tokenized text type.
*
- * KinoSearch::Plan::StringType is used for "exact-match" strings.
+ * Lucy::Plan::StringType is used for "exact-match" strings.
*/
-class KinoSearch::Plan::StringType
- inherits KinoSearch::Plan::TextType : dumpable {
+class Lucy::Plan::StringType
+ inherits Lucy::Plan::TextType : dumpable {
/**
* @param boost floating point per-field boost.
Modified: incubator/lucy/trunk/core/Lucy/Plan/TextType.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Plan/TextType.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Plan/TextType.c (original)
+++ incubator/lucy/trunk/core/Lucy/Plan/TextType.c Thu Nov 4 05:36:36 2010
@@ -16,12 +16,12 @@
#define C_LUCY_TEXTTYPE
#define C_LUCY_TEXTTERMSTEPPER
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
-#include "KinoSearch/Plan/TextType.h"
-#include "KinoSearch/Store/InStream.h"
-#include "KinoSearch/Store/OutStream.h"
-#include "KinoSearch/Util/StringHelper.h"
+#include "Lucy/Plan/TextType.h"
+#include "Lucy/Store/InStream.h"
+#include "Lucy/Store/OutStream.h"
+#include "Lucy/Util/StringHelper.h"
CharBuf*
TextType_make_blank(TextType *self)
Modified: incubator/lucy/trunk/core/Lucy/Plan/TextType.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Plan/TextType.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Plan/TextType.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Plan/TextType.cfh Thu Nov 4 05:36:36 2010
@@ -16,7 +16,7 @@
parcel Lucy;
-class KinoSearch::Plan::TextType inherits KinoSearch::Plan::FieldType {
+class Lucy::Plan::TextType inherits Lucy::Plan::FieldType {
incremented CharBuf*
Make_Blank(TextType *self);
@@ -27,8 +27,8 @@ class KinoSearch::Plan::TextType inherit
Primitive_ID(TextType *self);
}
-class KinoSearch::Index::TermStepper::TextTermStepper
- inherits KinoSearch::Index::TermStepper {
+class Lucy::Index::TermStepper::TextTermStepper
+ inherits Lucy::Index::TermStepper {
inert incremented TextTermStepper*
new();
Modified: incubator/lucy/trunk/core/Lucy/Search/ANDQuery.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Search/ANDQuery.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Search/ANDQuery.c (original)
+++ incubator/lucy/trunk/core/Lucy/Search/ANDQuery.c Thu Nov 4 05:36:36 2010
@@ -16,19 +16,19 @@
#define C_LUCY_ANDQUERY
#define C_LUCY_ANDCOMPILER
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
-#include "KinoSearch/Search/ANDQuery.h"
-#include "KinoSearch/Index/DocVector.h"
-#include "KinoSearch/Index/SegReader.h"
-#include "KinoSearch/Index/Similarity.h"
-#include "KinoSearch/Plan/Schema.h"
-#include "KinoSearch/Search/ANDScorer.h"
-#include "KinoSearch/Search/Searcher.h"
-#include "KinoSearch/Search/Span.h"
-#include "KinoSearch/Store/InStream.h"
-#include "KinoSearch/Store/OutStream.h"
-#include "KinoSearch/Util/Freezer.h"
+#include "Lucy/Search/ANDQuery.h"
+#include "Lucy/Index/DocVector.h"
+#include "Lucy/Index/SegReader.h"
+#include "Lucy/Index/Similarity.h"
+#include "Lucy/Plan/Schema.h"
+#include "Lucy/Search/ANDScorer.h"
+#include "Lucy/Search/Searcher.h"
+#include "Lucy/Search/Span.h"
+#include "Lucy/Store/InStream.h"
+#include "Lucy/Store/OutStream.h"
+#include "Lucy/Util/Freezer.h"
ANDQuery*
ANDQuery_new(VArray *children)
Modified: incubator/lucy/trunk/core/Lucy/Search/ANDQuery.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Search/ANDQuery.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Search/ANDQuery.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Search/ANDQuery.cfh Thu Nov 4 05:36:36 2010
@@ -18,11 +18,11 @@ parcel Lucy;
/** Intersect multiple result sets.
*
- * ANDQuery is a composite L<Query|KinoSearch::Search::Query> which matches
+ * ANDQuery is a composite L<Query|Lucy::Search::Query> which matches
* only when all of its children match, so its result set is the intersection
* of their result sets. Documents which match receive a summed score.
*/
-class KinoSearch::Search::ANDQuery inherits KinoSearch::Search::PolyQuery
+class Lucy::Search::ANDQuery inherits Lucy::Search::PolyQuery
: dumpable {
inert incremented ANDQuery*
@@ -44,8 +44,8 @@ class KinoSearch::Search::ANDQuery inher
Equals(ANDQuery *self, Obj *other);
}
-class KinoSearch::Search::ANDCompiler
- inherits KinoSearch::Search::PolyCompiler {
+class Lucy::Search::ANDCompiler
+ inherits Lucy::Search::PolyCompiler {
inert incremented ANDCompiler*
new(ANDQuery *parent, Searcher *searcher, float boost);
Modified: incubator/lucy/trunk/core/Lucy/Search/ANDScorer.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Search/ANDScorer.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Search/ANDScorer.c (original)
+++ incubator/lucy/trunk/core/Lucy/Search/ANDScorer.c Thu Nov 4 05:36:36 2010
@@ -15,10 +15,10 @@
*/
#define C_LUCY_ANDSCORER
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
-#include "KinoSearch/Search/ANDScorer.h"
-#include "KinoSearch/Index/Similarity.h"
+#include "Lucy/Search/ANDScorer.h"
+#include "Lucy/Index/Similarity.h"
ANDScorer*
ANDScorer_new(VArray *children, Similarity *sim)
Modified: incubator/lucy/trunk/core/Lucy/Search/ANDScorer.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Search/ANDScorer.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Search/ANDScorer.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Search/ANDScorer.cfh Thu Nov 4 05:36:36 2010
@@ -19,7 +19,7 @@ parcel Lucy;
/** Intersect multiple required Matchers.
*/
-class KinoSearch::Search::ANDScorer inherits KinoSearch::Search::PolyMatcher {
+class Lucy::Search::ANDScorer inherits Lucy::Search::PolyMatcher {
Matcher **kids;
bool_t more;
Modified: incubator/lucy/trunk/core/Lucy/Search/BitVecMatcher.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Search/BitVecMatcher.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Search/BitVecMatcher.c (original)
+++ incubator/lucy/trunk/core/Lucy/Search/BitVecMatcher.c Thu Nov 4 05:36:36 2010
@@ -15,9 +15,9 @@
*/
#define C_LUCY_BITVECMATCHER
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
-#include "KinoSearch/Search/BitVecMatcher.h"
+#include "Lucy/Search/BitVecMatcher.h"
BitVecMatcher*
BitVecMatcher_new(BitVector *bit_vector)
Modified: incubator/lucy/trunk/core/Lucy/Search/BitVecMatcher.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Search/BitVecMatcher.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Search/BitVecMatcher.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Search/BitVecMatcher.cfh Thu Nov 4 05:36:36 2010
@@ -18,7 +18,7 @@ parcel Lucy;
/** Iterator for deleted document ids.
*/
-class KinoSearch::Search::BitVecMatcher inherits KinoSearch::Search::Matcher {
+class Lucy::Search::BitVecMatcher inherits Lucy::Search::Matcher {
BitVector *bit_vec;
int32_t doc_id;
Modified: incubator/lucy/trunk/core/Lucy/Search/Collector.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Search/Collector.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Search/Collector.c (original)
+++ incubator/lucy/trunk/core/Lucy/Search/Collector.c Thu Nov 4 05:36:36 2010
@@ -17,11 +17,11 @@
#define C_LUCY_COLLECTOR
#define C_LUCY_BITCOLLECTOR
#define C_LUCY_OFFSETCOLLECTOR
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
-#include "KinoSearch/Search/Collector.h"
-#include "KinoSearch/Index/SegReader.h"
-#include "KinoSearch/Search/Matcher.h"
+#include "Lucy/Search/Collector.h"
+#include "Lucy/Index/SegReader.h"
+#include "Lucy/Search/Matcher.h"
Collector*
Coll_init(Collector *self)
Modified: incubator/lucy/trunk/core/Lucy/Search/Collector.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Search/Collector.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Search/Collector.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Search/Collector.cfh Thu Nov 4 05:36:36 2010
@@ -19,7 +19,7 @@ parcel Lucy;
/** Process hits.
*
* A Collector decides what to do with the hits that a
- * L<Matcher|KinoSearch::Search::Matcher> iterates through, based on how the
+ * L<Matcher|Lucy::Search::Matcher> iterates through, based on how the
* abstract Collect() method is implemented.
*
* Collectors operate on individual segments, but must operate within the
@@ -28,8 +28,8 @@ parcel Lucy;
* collector must take the updated information into account.
*/
-abstract class KinoSearch::Search::Collector cnick Coll
- inherits KinoSearch::Object::Obj {
+abstract class Lucy::Search::Collector cnick Coll
+ inherits Lucy::Object::Obj {
SegReader *reader;
Matcher *matcher;
@@ -77,16 +77,16 @@ abstract class KinoSearch::Search::Colle
/** Collector which records doc nums in a BitVector.
*
* BitCollector is a Collector which saves matching document ids in a
- * L<BitVector|KinoSearch::Object::BitVector>. It is useful for recording the
+ * L<BitVector|Lucy::Object::BitVector>. It is useful for recording the
* entire set of documents which matches a query.
*/
-class KinoSearch::Search::Collector::BitCollector cnick BitColl
- inherits KinoSearch::Search::Collector {
+class Lucy::Search::Collector::BitCollector cnick BitColl
+ inherits Lucy::Search::Collector {
BitVector *bit_vec;
/**
- * @param bit_vector A KinoSearch::Object::BitVector.
+ * @param bit_vector A Lucy::Object::BitVector.
*/
public inert BitCollector*
init(BitCollector *self, BitVector *bit_vector);
@@ -105,8 +105,8 @@ class KinoSearch::Search::Collector::Bit
Need_Score(BitCollector *self);
}
-class KinoSearch::Search::Collector::OffsetCollector cnick OffsetColl
- inherits KinoSearch::Search::Collector {
+class Lucy::Search::Collector::OffsetCollector cnick OffsetColl
+ inherits Lucy::Search::Collector {
int32_t offset;
Collector *inner_coll;
Modified: incubator/lucy/trunk/core/Lucy/Search/Collector/SortCollector.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Search/Collector/SortCollector.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Search/Collector/SortCollector.c (original)
+++ incubator/lucy/trunk/core/Lucy/Search/Collector/SortCollector.c Thu Nov 4 05:36:36 2010
@@ -16,21 +16,21 @@
#define C_LUCY_SORTCOLLECTOR
#define C_LUCY_MATCHDOC
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
-#include "KinoSearch/Search/Collector/SortCollector.h"
-#include "KinoSearch/Index/SegReader.h"
-#include "KinoSearch/Index/SortCache.h"
-#include "KinoSearch/Index/SortCache/NumericSortCache.h"
-#include "KinoSearch/Index/SortCache/TextSortCache.h"
-#include "KinoSearch/Index/SortReader.h"
-#include "KinoSearch/Plan/FieldType.h"
-#include "KinoSearch/Plan/Schema.h"
-#include "KinoSearch/Search/HitQueue.h"
-#include "KinoSearch/Search/MatchDoc.h"
-#include "KinoSearch/Search/Matcher.h"
-#include "KinoSearch/Search/SortRule.h"
-#include "KinoSearch/Search/SortSpec.h"
+#include "Lucy/Search/Collector/SortCollector.h"
+#include "Lucy/Index/SegReader.h"
+#include "Lucy/Index/SortCache.h"
+#include "Lucy/Index/SortCache/NumericSortCache.h"
+#include "Lucy/Index/SortCache/TextSortCache.h"
+#include "Lucy/Index/SortReader.h"
+#include "Lucy/Plan/FieldType.h"
+#include "Lucy/Plan/Schema.h"
+#include "Lucy/Search/HitQueue.h"
+#include "Lucy/Search/MatchDoc.h"
+#include "Lucy/Search/Matcher.h"
+#include "Lucy/Search/SortRule.h"
+#include "Lucy/Search/SortSpec.h"
#define COMPARE_BY_SCORE 0x1
#define COMPARE_BY_SCORE_REV 0x2
Modified: incubator/lucy/trunk/core/Lucy/Search/Collector/SortCollector.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Search/Collector/SortCollector.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Search/Collector/SortCollector.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Search/Collector/SortCollector.cfh Thu Nov 4 05:36:36 2010
@@ -21,8 +21,8 @@ parcel Lucy;
* A SortCollector sorts hits according to a SortSpec, keeping the highest
* ranking N documents in a priority queue.
*/
-class KinoSearch::Search::Collector::SortCollector cnick SortColl
- inherits KinoSearch::Search::Collector {
+class Lucy::Search::Collector::SortCollector cnick SortColl
+ inherits Lucy::Search::Collector {
uint32_t wanted;
uint32_t total_hits;
Modified: incubator/lucy/trunk/core/Lucy/Search/Compiler.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Search/Compiler.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Search/Compiler.c (original)
+++ incubator/lucy/trunk/core/Lucy/Search/Compiler.c Thu Nov 4 05:36:36 2010
@@ -15,19 +15,19 @@
*/
#define C_LUCY_COMPILER
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
-#include "KinoSearch/Search/Compiler.h"
-#include "KinoSearch/Index/SegReader.h"
-#include "KinoSearch/Index/DocVector.h"
-#include "KinoSearch/Index/Similarity.h"
-#include "KinoSearch/Plan/Schema.h"
-#include "KinoSearch/Search/Matcher.h"
-#include "KinoSearch/Search/Query.h"
-#include "KinoSearch/Search/Searcher.h"
-#include "KinoSearch/Store/InStream.h"
-#include "KinoSearch/Store/OutStream.h"
-#include "KinoSearch/Util/Freezer.h"
+#include "Lucy/Search/Compiler.h"
+#include "Lucy/Index/SegReader.h"
+#include "Lucy/Index/DocVector.h"
+#include "Lucy/Index/Similarity.h"
+#include "Lucy/Plan/Schema.h"
+#include "Lucy/Search/Matcher.h"
+#include "Lucy/Search/Query.h"
+#include "Lucy/Search/Searcher.h"
+#include "Lucy/Store/InStream.h"
+#include "Lucy/Store/OutStream.h"
+#include "Lucy/Util/Freezer.h"
Compiler*
Compiler_init(Compiler *self, Query *parent, Searcher *searcher,
Modified: incubator/lucy/trunk/core/Lucy/Search/Compiler.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Search/Compiler.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Search/Compiler.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Search/Compiler.cfh Thu Nov 4 05:36:36 2010
@@ -19,8 +19,8 @@ parcel Lucy;
/** Query-to-Matcher compiler.
*
* The purpose of the Compiler class is to take a specification in the form of
- * a L<Query|KinoSearch::Search::Query> object and compile a
- * L<Matcher|KinoSearch::Search::Matcher> object that can do real work.
+ * a L<Query|Lucy::Search::Query> object and compile a
+ * L<Matcher|Lucy::Search::Matcher> object that can do real work.
*
* The simplest Compiler subclasses -- such as those associated with
* constant-scoring Query types -- might simply implement a Make_Matcher()
@@ -36,7 +36,7 @@ parcel Lucy;
* Compiling a Matcher is a two stage process.
*
* The first stage takes place during the Compiler's constructor, which is
- * where the Query object meets a L<Searcher|KinoSearch::Search::Searcher>
+ * where the Query object meets a L<Searcher|Lucy::Search::Searcher>
* object for the first time. Searchers operate on a specific document
* collection and they can tell you certain statistical information about the
* collection -- such as how many total documents are in the collection, or
@@ -46,7 +46,7 @@ parcel Lucy;
* subclasses might do something similar.
*
* The second stage of compilation is Make_Matcher(), method, which is where
- * the Compiler meets a L<SegReader|KinoSearch::Index::SegReader> object.
+ * the Compiler meets a L<SegReader|Lucy::Index::SegReader> object.
* SegReaders are associated with a single segment within a single index on a
* single machine, and are thus lower-level than Searchers, which may
* represent a document collection spread out over a search cluster
@@ -57,7 +57,7 @@ parcel Lucy;
* the Matchers's constructor, or whether Make_Matcher() should return a
* Matcher at all.
*/
-class KinoSearch::Search::Compiler inherits KinoSearch::Search::Query {
+class Lucy::Search::Compiler inherits Lucy::Search::Query {
Query *parent;
Similarity *sim;
@@ -65,7 +65,7 @@ class KinoSearch::Search::Compiler inher
/** Abstract constructor.
*
* @param parent The parent Query.
- * @param searcher A KinoSearch::Search::Searcher, such as an
+ * @param searcher A Lucy::Search::Searcher, such as an
* IndexSearcher.
* @param similarity A Similarity.
* @param boost An arbitrary scoring multiplier. Defaults to the boost of
Modified: incubator/lucy/trunk/core/Lucy/Search/HitQueue.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Search/HitQueue.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Search/HitQueue.c (original)
+++ incubator/lucy/trunk/core/Lucy/Search/HitQueue.c Thu Nov 4 05:36:36 2010
@@ -16,16 +16,16 @@
#define C_LUCY_HITQUEUE
#define C_LUCY_MATCHDOC
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
-#include "KinoSearch/Search/HitQueue.h"
-#include "KinoSearch/Index/SegReader.h"
-#include "KinoSearch/Index/SortCache.h"
-#include "KinoSearch/Plan/FieldType.h"
-#include "KinoSearch/Plan/Schema.h"
-#include "KinoSearch/Search/MatchDoc.h"
-#include "KinoSearch/Search/SortRule.h"
-#include "KinoSearch/Search/SortSpec.h"
+#include "Lucy/Search/HitQueue.h"
+#include "Lucy/Index/SegReader.h"
+#include "Lucy/Index/SortCache.h"
+#include "Lucy/Plan/FieldType.h"
+#include "Lucy/Plan/Schema.h"
+#include "Lucy/Search/MatchDoc.h"
+#include "Lucy/Search/SortRule.h"
+#include "Lucy/Search/SortSpec.h"
#define COMPARE_BY_SCORE 1
Modified: incubator/lucy/trunk/core/Lucy/Search/HitQueue.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Search/HitQueue.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Search/HitQueue.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Search/HitQueue.cfh Thu Nov 4 05:36:36 2010
@@ -22,8 +22,8 @@ parcel Lucy;
* float to the top of the queue and poor matches fall out the bottom.
*/
-class KinoSearch::Search::HitQueue cnick HitQ
- inherits KinoSearch::Util::PriorityQueue {
+class Lucy::Search::HitQueue cnick HitQ
+ inherits Lucy::Util::PriorityQueue {
FieldType **field_types;
uint8_t *actions;
Modified: incubator/lucy/trunk/core/Lucy/Search/Hits.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Search/Hits.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Search/Hits.c (original)
+++ incubator/lucy/trunk/core/Lucy/Search/Hits.c Thu Nov 4 05:36:36 2010
@@ -16,14 +16,14 @@
#define C_LUCY_HITS
#define C_LUCY_MATCHDOC
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
-#include "KinoSearch/Search/Hits.h"
-#include "KinoSearch/Document/HitDoc.h"
-#include "KinoSearch/Search/Query.h"
-#include "KinoSearch/Search/MatchDoc.h"
-#include "KinoSearch/Search/Searcher.h"
-#include "KinoSearch/Search/TopDocs.h"
+#include "Lucy/Search/Hits.h"
+#include "Lucy/Document/HitDoc.h"
+#include "Lucy/Search/Query.h"
+#include "Lucy/Search/MatchDoc.h"
+#include "Lucy/Search/Searcher.h"
+#include "Lucy/Search/TopDocs.h"
Hits*
Hits_new(Searcher *searcher, TopDocs *top_docs, uint32_t offset)
Modified: incubator/lucy/trunk/core/Lucy/Search/Hits.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Search/Hits.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Search/Hits.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Search/Hits.cfh Thu Nov 4 05:36:36 2010
@@ -20,7 +20,7 @@ parcel Lucy;
*
* Hits objects are iterators used to access the results of a search.
*/
-class KinoSearch::Search::Hits inherits KinoSearch::Object::Obj {
+class Lucy::Search::Hits inherits Lucy::Object::Obj {
Searcher *searcher;
TopDocs *top_docs;
Modified: incubator/lucy/trunk/core/Lucy/Search/IndexSearcher.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Search/IndexSearcher.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Search/IndexSearcher.c (original)
+++ incubator/lucy/trunk/core/Lucy/Search/IndexSearcher.c Thu Nov 4 05:36:36 2010
@@ -15,33 +15,33 @@
*/
#define C_LUCY_INDEXSEARCHER
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
-#include "KinoSearch/Search/IndexSearcher.h"
+#include "Lucy/Search/IndexSearcher.h"
-#include "KinoSearch/Document/HitDoc.h"
-#include "KinoSearch/Index/DeletionsReader.h"
-#include "KinoSearch/Index/DocReader.h"
-#include "KinoSearch/Index/DocVector.h"
-#include "KinoSearch/Index/IndexReader.h"
-#include "KinoSearch/Index/LexiconReader.h"
-#include "KinoSearch/Index/SegReader.h"
-#include "KinoSearch/Index/SortCache.h"
-#include "KinoSearch/Index/HighlightReader.h"
-#include "KinoSearch/Plan/FieldType.h"
-#include "KinoSearch/Plan/Schema.h"
-#include "KinoSearch/Search/Collector.h"
-#include "KinoSearch/Search/Collector/SortCollector.h"
-#include "KinoSearch/Search/HitQueue.h"
-#include "KinoSearch/Search/MatchDoc.h"
-#include "KinoSearch/Search/Matcher.h"
-#include "KinoSearch/Search/Query.h"
-#include "KinoSearch/Search/SortRule.h"
-#include "KinoSearch/Search/SortSpec.h"
-#include "KinoSearch/Search/TopDocs.h"
-#include "KinoSearch/Search/Compiler.h"
-#include "KinoSearch/Store/Folder.h"
-#include "KinoSearch/Store/FSFolder.h"
+#include "Lucy/Document/HitDoc.h"
+#include "Lucy/Index/DeletionsReader.h"
+#include "Lucy/Index/DocReader.h"
+#include "Lucy/Index/DocVector.h"
+#include "Lucy/Index/IndexReader.h"
+#include "Lucy/Index/LexiconReader.h"
+#include "Lucy/Index/SegReader.h"
+#include "Lucy/Index/SortCache.h"
+#include "Lucy/Index/HighlightReader.h"
+#include "Lucy/Plan/FieldType.h"
+#include "Lucy/Plan/Schema.h"
+#include "Lucy/Search/Collector.h"
+#include "Lucy/Search/Collector/SortCollector.h"
+#include "Lucy/Search/HitQueue.h"
+#include "Lucy/Search/MatchDoc.h"
+#include "Lucy/Search/Matcher.h"
+#include "Lucy/Search/Query.h"
+#include "Lucy/Search/SortRule.h"
+#include "Lucy/Search/SortSpec.h"
+#include "Lucy/Search/TopDocs.h"
+#include "Lucy/Search/Compiler.h"
+#include "Lucy/Store/Folder.h"
+#include "Lucy/Store/FSFolder.h"
IndexSearcher*
IxSearcher_new(Obj *index)