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 [6/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/Test/Store/TestInStream.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Test/Store/TestInStream.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Test/Store/TestInStream.c (original)
+++ incubator/lucy/trunk/core/Lucy/Test/Store/TestInStream.c Thu Nov 4 05:36:36 2010
@@ -18,17 +18,17 @@
#define C_LUCY_INSTREAM
#define C_LUCY_FILEWINDOW
-#include "KinoSearch/Util/ToolSet.h"
-#include "KinoSearch/Test.h"
-#include "KinoSearch/Test/TestUtils.h"
-#include "KinoSearch/Test/Store/TestInStream.h"
-#include "KinoSearch/Test/Store/MockFileHandle.h"
-#include "KinoSearch/Store/FileWindow.h"
-#include "KinoSearch/Store/InStream.h"
-#include "KinoSearch/Store/OutStream.h"
-#include "KinoSearch/Store/RAMFile.h"
-#include "KinoSearch/Store/RAMFileHandle.h"
-#include "KinoSearch/Util/NumberUtils.h"
+#include "Lucy/Util/ToolSet.h"
+#include "Lucy/Test.h"
+#include "Lucy/Test/TestUtils.h"
+#include "Lucy/Test/Store/TestInStream.h"
+#include "Lucy/Test/Store/MockFileHandle.h"
+#include "Lucy/Store/FileWindow.h"
+#include "Lucy/Store/InStream.h"
+#include "Lucy/Store/OutStream.h"
+#include "Lucy/Store/RAMFile.h"
+#include "Lucy/Store/RAMFileHandle.h"
+#include "Lucy/Util/NumberUtils.h"
static void
test_refill(TestBatch *batch)
Modified: incubator/lucy/trunk/core/Lucy/Test/Store/TestInStream.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Test/Store/TestInStream.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Test/Store/TestInStream.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Test/Store/TestInStream.cfh Thu Nov 4 05:36:36 2010
@@ -20,7 +20,7 @@ parcel Lucy;
* streamed sources.
*/
-inert class KinoSearch::Test::Store::TestInStream {
+inert class Lucy::Test::Store::TestInStream {
inert void
run_tests();
}
Modified: incubator/lucy/trunk/core/Lucy/Test/Store/TestRAMDirHandle.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Test/Store/TestRAMDirHandle.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Test/Store/TestRAMDirHandle.c (original)
+++ incubator/lucy/trunk/core/Lucy/Test/Store/TestRAMDirHandle.c Thu Nov 4 05:36:36 2010
@@ -15,13 +15,13 @@
*/
#define C_LUCY_RAMFOLDER
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
-#include "KinoSearch/Test.h"
-#include "KinoSearch/Test/Store/TestRAMDirHandle.h"
-#include "KinoSearch/Store/FileHandle.h"
-#include "KinoSearch/Store/RAMFolder.h"
-#include "KinoSearch/Store/RAMDirHandle.h"
+#include "Lucy/Test.h"
+#include "Lucy/Test/Store/TestRAMDirHandle.h"
+#include "Lucy/Store/FileHandle.h"
+#include "Lucy/Store/RAMFolder.h"
+#include "Lucy/Store/RAMDirHandle.h"
static void
test_all(TestBatch *batch)
Modified: incubator/lucy/trunk/core/Lucy/Test/Store/TestRAMDirHandle.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Test/Store/TestRAMDirHandle.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Test/Store/TestRAMDirHandle.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Test/Store/TestRAMDirHandle.cfh Thu Nov 4 05:36:36 2010
@@ -16,7 +16,7 @@
parcel Lucy;
-inert class KinoSearch::Test::Store::TestRAMDirHandle cnick TestRAMDH {
+inert class Lucy::Test::Store::TestRAMDirHandle cnick TestRAMDH {
inert void
run_tests();
}
Modified: incubator/lucy/trunk/core/Lucy/Test/Store/TestRAMFileHandle.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Test/Store/TestRAMFileHandle.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Test/Store/TestRAMFileHandle.c (original)
+++ incubator/lucy/trunk/core/Lucy/Test/Store/TestRAMFileHandle.c Thu Nov 4 05:36:36 2010
@@ -19,13 +19,13 @@
#define C_LUCY_TESTINSTREAM
#define C_LUCY_INSTREAM
#define C_LUCY_FILEWINDOW
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
-#include "KinoSearch/Test.h"
-#include "KinoSearch/Test/Store/TestRAMFileHandle.h"
-#include "KinoSearch/Store/RAMFileHandle.h"
-#include "KinoSearch/Store/FileWindow.h"
-#include "KinoSearch/Store/RAMFile.h"
+#include "Lucy/Test.h"
+#include "Lucy/Test/Store/TestRAMFileHandle.h"
+#include "Lucy/Store/RAMFileHandle.h"
+#include "Lucy/Store/FileWindow.h"
+#include "Lucy/Store/RAMFile.h"
static void
test_open(TestBatch *batch)
Modified: incubator/lucy/trunk/core/Lucy/Test/Store/TestRAMFileHandle.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Test/Store/TestRAMFileHandle.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Test/Store/TestRAMFileHandle.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Test/Store/TestRAMFileHandle.cfh Thu Nov 4 05:36:36 2010
@@ -16,7 +16,7 @@
parcel Lucy;
-inert class KinoSearch::Test::Store::TestRAMFileHandle cnick TestRAMFH {
+inert class Lucy::Test::Store::TestRAMFileHandle cnick TestRAMFH {
inert void
run_tests();
}
Modified: incubator/lucy/trunk/core/Lucy/Test/Store/TestRAMFolder.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Test/Store/TestRAMFolder.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Test/Store/TestRAMFolder.c (original)
+++ incubator/lucy/trunk/core/Lucy/Test/Store/TestRAMFolder.c Thu Nov 4 05:36:36 2010
@@ -16,14 +16,14 @@
#define C_LUCY_RAMFOLDER
#define C_LUCY_CHARBUF
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
-#include "KinoSearch/Test.h"
-#include "KinoSearch/Test/Store/TestRAMFolder.h"
-#include "KinoSearch/Store/RAMFolder.h"
-#include "KinoSearch/Store/DirHandle.h"
-#include "KinoSearch/Store/RAMDirHandle.h"
-#include "KinoSearch/Store/RAMFileHandle.h"
+#include "Lucy/Test.h"
+#include "Lucy/Test/Store/TestRAMFolder.h"
+#include "Lucy/Store/RAMFolder.h"
+#include "Lucy/Store/DirHandle.h"
+#include "Lucy/Store/RAMDirHandle.h"
+#include "Lucy/Store/RAMFileHandle.h"
static CharBuf foo = ZCB_LITERAL("foo");
static CharBuf bar = ZCB_LITERAL("bar");
Modified: incubator/lucy/trunk/core/Lucy/Test/Store/TestRAMFolder.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Test/Store/TestRAMFolder.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Test/Store/TestRAMFolder.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Test/Store/TestRAMFolder.cfh Thu Nov 4 05:36:36 2010
@@ -16,7 +16,7 @@
parcel Lucy;
-inert class KinoSearch::Test::Store::TestRAMFolder {
+inert class Lucy::Test::Store::TestRAMFolder {
inert void
run_tests();
}
Modified: incubator/lucy/trunk/core/Lucy/Test/TestQueryParser.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Test/TestQueryParser.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Test/TestQueryParser.c (original)
+++ incubator/lucy/trunk/core/Lucy/Test/TestQueryParser.c Thu Nov 4 05:36:36 2010
@@ -15,18 +15,18 @@
*/
#define C_LUCY_TESTQUERYPARSER
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
#include <stdarg.h>
#include <string.h>
-#include "KinoSearch/Test/TestQueryParser.h"
-#include "KinoSearch/Test/TestUtils.h"
-#include "KinoSearch/Search/TermQuery.h"
-#include "KinoSearch/Search/PhraseQuery.h"
-#include "KinoSearch/Search/LeafQuery.h"
-#include "KinoSearch/Search/ANDQuery.h"
-#include "KinoSearch/Search/NOTQuery.h"
-#include "KinoSearch/Search/ORQuery.h"
+#include "Lucy/Test/TestQueryParser.h"
+#include "Lucy/Test/TestUtils.h"
+#include "Lucy/Search/TermQuery.h"
+#include "Lucy/Search/PhraseQuery.h"
+#include "Lucy/Search/LeafQuery.h"
+#include "Lucy/Search/ANDQuery.h"
+#include "Lucy/Search/NOTQuery.h"
+#include "Lucy/Search/ORQuery.h"
TestQueryParser*
TestQP_new(const char *query_string, Query *tree, Query *expanded,
Modified: incubator/lucy/trunk/core/Lucy/Test/TestQueryParser.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Test/TestQueryParser.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Test/TestQueryParser.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Test/TestQueryParser.cfh Thu Nov 4 05:36:36 2010
@@ -19,8 +19,8 @@ parcel Lucy;
/** Test case object for QueryParser unit tests.
*/
-class KinoSearch::Test::TestQueryParser cnick TestQP
- inherits KinoSearch::Object::Obj {
+class Lucy::Test::TestQueryParser cnick TestQP
+ inherits Lucy::Object::Obj {
CharBuf *query_string;
Query *tree;
Modified: incubator/lucy/trunk/core/Lucy/Test/TestQueryParserLogic.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Test/TestQueryParserLogic.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Test/TestQueryParserLogic.c (original)
+++ incubator/lucy/trunk/core/Lucy/Test/TestQueryParserLogic.c Thu Nov 4 05:36:36 2010
@@ -16,32 +16,32 @@
#define C_LUCY_TESTQUERYPARSERLOGIC
#define C_LUCY_TESTQUERYPARSER
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
#include <stdarg.h>
#include <string.h>
-#include "KinoSearch/Test.h"
-#include "KinoSearch/Test/TestQueryParserLogic.h"
-#include "KinoSearch/Test/TestQueryParser.h"
-#include "KinoSearch/Test/TestSchema.h"
-#include "KinoSearch/Test/TestUtils.h"
-#include "KinoSearch/Analysis/Analyzer.h"
-#include "KinoSearch/Analysis/Tokenizer.h"
-#include "KinoSearch/Document/Doc.h"
-#include "KinoSearch/Index/Indexer.h"
-#include "KinoSearch/Search/Hits.h"
-#include "KinoSearch/Search/IndexSearcher.h"
-#include "KinoSearch/Search/QueryParser.h"
-#include "KinoSearch/Search/TermQuery.h"
-#include "KinoSearch/Search/PhraseQuery.h"
-#include "KinoSearch/Search/LeafQuery.h"
-#include "KinoSearch/Search/ANDQuery.h"
-#include "KinoSearch/Search/MatchAllQuery.h"
-#include "KinoSearch/Search/NOTQuery.h"
-#include "KinoSearch/Search/NoMatchQuery.h"
-#include "KinoSearch/Search/ORQuery.h"
-#include "KinoSearch/Search/RequiredOptionalQuery.h"
-#include "KinoSearch/Store/RAMFolder.h"
+#include "Lucy/Test.h"
+#include "Lucy/Test/TestQueryParserLogic.h"
+#include "Lucy/Test/TestQueryParser.h"
+#include "Lucy/Test/TestSchema.h"
+#include "Lucy/Test/TestUtils.h"
+#include "Lucy/Analysis/Analyzer.h"
+#include "Lucy/Analysis/Tokenizer.h"
+#include "Lucy/Document/Doc.h"
+#include "Lucy/Index/Indexer.h"
+#include "Lucy/Search/Hits.h"
+#include "Lucy/Search/IndexSearcher.h"
+#include "Lucy/Search/QueryParser.h"
+#include "Lucy/Search/TermQuery.h"
+#include "Lucy/Search/PhraseQuery.h"
+#include "Lucy/Search/LeafQuery.h"
+#include "Lucy/Search/ANDQuery.h"
+#include "Lucy/Search/MatchAllQuery.h"
+#include "Lucy/Search/NOTQuery.h"
+#include "Lucy/Search/NoMatchQuery.h"
+#include "Lucy/Search/ORQuery.h"
+#include "Lucy/Search/RequiredOptionalQuery.h"
+#include "Lucy/Store/RAMFolder.h"
#define make_leaf_query (Query*)lucy_TestUtils_make_leaf_query
#define make_not_query (Query*)lucy_TestUtils_make_not_query
Modified: incubator/lucy/trunk/core/Lucy/Test/TestQueryParserLogic.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Test/TestQueryParserLogic.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Test/TestQueryParserLogic.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Test/TestQueryParserLogic.cfh Thu Nov 4 05:36:36 2010
@@ -19,7 +19,7 @@ parcel Lucy;
/** Tests for logical structure of Query objects output by QueryParser.
*/
-inert class KinoSearch::Test::TestQueryParserLogic cnick TestQPLogic {
+inert class Lucy::Test::TestQueryParserLogic cnick TestQPLogic {
inert void
run_tests();
}
Modified: incubator/lucy/trunk/core/Lucy/Test/TestQueryParserSyntax.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Test/TestQueryParserSyntax.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Test/TestQueryParserSyntax.c (original)
+++ incubator/lucy/trunk/core/Lucy/Test/TestQueryParserSyntax.c Thu Nov 4 05:36:36 2010
@@ -16,24 +16,24 @@
#define C_LUCY_TESTQUERYPARSERSYNTAX
#define C_LUCY_TESTQUERYPARSER
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
#include <stdarg.h>
#include <string.h>
-#include "KinoSearch/Test.h"
-#include "KinoSearch/Test/TestQueryParserSyntax.h"
-#include "KinoSearch/Test/TestQueryParser.h"
-#include "KinoSearch/Test/TestUtils.h"
-#include "KinoSearch/Search/Hits.h"
-#include "KinoSearch/Search/IndexSearcher.h"
-#include "KinoSearch/Search/QueryParser.h"
-#include "KinoSearch/Search/TermQuery.h"
-#include "KinoSearch/Search/PhraseQuery.h"
-#include "KinoSearch/Search/LeafQuery.h"
-#include "KinoSearch/Search/ANDQuery.h"
-#include "KinoSearch/Search/NOTQuery.h"
-#include "KinoSearch/Search/ORQuery.h"
-#include "KinoSearch/Store/Folder.h"
+#include "Lucy/Test.h"
+#include "Lucy/Test/TestQueryParserSyntax.h"
+#include "Lucy/Test/TestQueryParser.h"
+#include "Lucy/Test/TestUtils.h"
+#include "Lucy/Search/Hits.h"
+#include "Lucy/Search/IndexSearcher.h"
+#include "Lucy/Search/QueryParser.h"
+#include "Lucy/Search/TermQuery.h"
+#include "Lucy/Search/PhraseQuery.h"
+#include "Lucy/Search/LeafQuery.h"
+#include "Lucy/Search/ANDQuery.h"
+#include "Lucy/Search/NOTQuery.h"
+#include "Lucy/Search/ORQuery.h"
+#include "Lucy/Store/Folder.h"
#define make_term_query (Query*)lucy_TestUtils_make_term_query
#define make_phrase_query (Query*)lucy_TestUtils_make_phrase_query
Modified: incubator/lucy/trunk/core/Lucy/Test/TestQueryParserSyntax.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Test/TestQueryParserSyntax.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Test/TestQueryParserSyntax.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Test/TestQueryParserSyntax.cfh Thu Nov 4 05:36:36 2010
@@ -19,7 +19,7 @@ parcel Lucy;
/** Tests for logical structure of Query objects output by QueryParser.
*/
-inert class KinoSearch::Test::TestQueryParserSyntax cnick TestQPSyntax {
+inert class Lucy::Test::TestQueryParserSyntax cnick TestQPSyntax {
inert void
run_tests(Folder *index);
}
Modified: incubator/lucy/trunk/core/Lucy/Test/TestSchema.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Test/TestSchema.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Test/TestSchema.c (original)
+++ incubator/lucy/trunk/core/Lucy/Test/TestSchema.c Thu Nov 4 05:36:36 2010
@@ -15,15 +15,15 @@
*/
#define C_LUCY_TESTSCHEMA
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
-#include "KinoSearch/Test.h"
-#include "KinoSearch/Test/Plan/TestArchitecture.h"
-#include "KinoSearch/Test/TestSchema.h"
-#include "KinoSearch/Analysis/CaseFolder.h"
-#include "KinoSearch/Analysis/Tokenizer.h"
-#include "KinoSearch/Plan/FullTextType.h"
-#include "KinoSearch/Plan/Architecture.h"
+#include "Lucy/Test.h"
+#include "Lucy/Test/Plan/TestArchitecture.h"
+#include "Lucy/Test/TestSchema.h"
+#include "Lucy/Analysis/CaseFolder.h"
+#include "Lucy/Analysis/Tokenizer.h"
+#include "Lucy/Plan/FullTextType.h"
+#include "Lucy/Plan/Architecture.h"
TestSchema*
TestSchema_new()
Modified: incubator/lucy/trunk/core/Lucy/Test/TestSchema.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Test/TestSchema.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Test/TestSchema.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Test/TestSchema.cfh Thu Nov 4 05:36:36 2010
@@ -22,7 +22,7 @@ parcel Lucy;
* which returns absurdly low values for Index_Interval() and Skip_Interval().
*/
-class KinoSearch::Test::TestSchema inherits KinoSearch::Plan::Schema {
+class Lucy::Test::TestSchema inherits Lucy::Plan::Schema {
inert incremented TestSchema*
new();
Modified: incubator/lucy/trunk/core/Lucy/Test/TestUtils.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Test/TestUtils.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Test/TestUtils.c (original)
+++ incubator/lucy/trunk/core/Lucy/Test/TestUtils.c Thu Nov 4 05:36:36 2010
@@ -15,22 +15,22 @@
*/
#define C_LUCY_TESTUTILS
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
#include <stdarg.h>
#include <string.h>
-#include "KinoSearch/Test/TestUtils.h"
-#include "KinoSearch/Search/TermQuery.h"
-#include "KinoSearch/Search/PhraseQuery.h"
-#include "KinoSearch/Search/LeafQuery.h"
-#include "KinoSearch/Search/ANDQuery.h"
-#include "KinoSearch/Search/NOTQuery.h"
-#include "KinoSearch/Search/ORQuery.h"
-#include "KinoSearch/Search/RangeQuery.h"
-#include "KinoSearch/Store/InStream.h"
-#include "KinoSearch/Store/OutStream.h"
-#include "KinoSearch/Store/RAMFile.h"
-#include "KinoSearch/Util/Freezer.h"
+#include "Lucy/Test/TestUtils.h"
+#include "Lucy/Search/TermQuery.h"
+#include "Lucy/Search/PhraseQuery.h"
+#include "Lucy/Search/LeafQuery.h"
+#include "Lucy/Search/ANDQuery.h"
+#include "Lucy/Search/NOTQuery.h"
+#include "Lucy/Search/ORQuery.h"
+#include "Lucy/Search/RangeQuery.h"
+#include "Lucy/Store/InStream.h"
+#include "Lucy/Store/OutStream.h"
+#include "Lucy/Store/RAMFile.h"
+#include "Lucy/Util/Freezer.h"
uint64_t
TestUtils_random_u64()
Modified: incubator/lucy/trunk/core/Lucy/Test/TestUtils.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Test/TestUtils.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Test/TestUtils.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Test/TestUtils.cfh Thu Nov 4 05:36:36 2010
@@ -16,7 +16,7 @@
parcel Lucy;
-inert class KinoSearch::Test::TestUtils {
+inert class Lucy::Test::TestUtils {
/** Testing-only CharBuf factory which uses strlen().
*/
Modified: incubator/lucy/trunk/core/Lucy/Test/Util/BBSortEx.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Test/Util/BBSortEx.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Test/Util/BBSortEx.c (original)
+++ incubator/lucy/trunk/core/Lucy/Test/Util/BBSortEx.c Thu Nov 4 05:36:36 2010
@@ -15,14 +15,14 @@
*/
#define C_LUCY_BBSORTEX
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
-#include "KinoSearch/Test/Util/BBSortEx.h"
+#include "Lucy/Test/Util/BBSortEx.h"
-#include "KinoSearch/Index/Segment.h"
-#include "KinoSearch/Store/InStream.h"
-#include "KinoSearch/Store/Folder.h"
-#include "KinoSearch/Store/OutStream.h"
+#include "Lucy/Index/Segment.h"
+#include "Lucy/Store/InStream.h"
+#include "Lucy/Store/Folder.h"
+#include "Lucy/Store/OutStream.h"
BBSortEx*
BBSortEx_new(uint32_t mem_threshold, VArray *external)
Modified: incubator/lucy/trunk/core/Lucy/Test/Util/BBSortEx.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Test/Util/BBSortEx.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Test/Util/BBSortEx.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Test/Util/BBSortEx.cfh Thu Nov 4 05:36:36 2010
@@ -19,8 +19,8 @@ parcel Lucy;
/** SortExternal for ByteBufs.
*/
-class KinoSearch::Test::Util::BBSortEx
- inherits KinoSearch::Util::SortExternal {
+class Lucy::Test::Util::BBSortEx
+ inherits Lucy::Util::SortExternal {
VArray *external;
uint32_t external_tick;
Modified: incubator/lucy/trunk/core/Lucy/Test/Util/TestAtomic.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Test/Util/TestAtomic.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Test/Util/TestAtomic.c (original)
+++ incubator/lucy/trunk/core/Lucy/Test/Util/TestAtomic.c Thu Nov 4 05:36:36 2010
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
-#include "KinoSearch/Test.h"
-#include "KinoSearch/Test/Util/TestAtomic.h"
-#include "KinoSearch/Util/Atomic.h"
+#include "Lucy/Test.h"
+#include "Lucy/Test/Util/TestAtomic.h"
+#include "Lucy/Util/Atomic.h"
static void
test_cas_ptr(TestBatch *batch)
Modified: incubator/lucy/trunk/core/Lucy/Test/Util/TestAtomic.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Test/Util/TestAtomic.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Test/Util/TestAtomic.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Test/Util/TestAtomic.cfh Thu Nov 4 05:36:36 2010
@@ -16,7 +16,7 @@
parcel Lucy;
-inert class KinoSearch::Test::Util::TestAtomic {
+inert class Lucy::Test::Util::TestAtomic {
inert void
run_tests();
}
Modified: incubator/lucy/trunk/core/Lucy/Test/Util/TestIndexFileNames.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Test/Util/TestIndexFileNames.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Test/Util/TestIndexFileNames.c (original)
+++ incubator/lucy/trunk/core/Lucy/Test/Util/TestIndexFileNames.c Thu Nov 4 05:36:36 2010
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
-#include "KinoSearch/Test.h"
-#include "KinoSearch/Test/Util/TestIndexFileNames.h"
-#include "KinoSearch/Util/IndexFileNames.h"
+#include "Lucy/Test.h"
+#include "Lucy/Test/Util/TestIndexFileNames.h"
+#include "Lucy/Util/IndexFileNames.h"
static void
test_local_part(TestBatch *batch)
Modified: incubator/lucy/trunk/core/Lucy/Test/Util/TestIndexFileNames.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Test/Util/TestIndexFileNames.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Test/Util/TestIndexFileNames.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Test/Util/TestIndexFileNames.cfh Thu Nov 4 05:36:36 2010
@@ -16,7 +16,7 @@
parcel Lucy;
-inert class KinoSearch::Test::Util::TestIndexFileNames cnick TestIxFileNames {
+inert class Lucy::Test::Util::TestIndexFileNames cnick TestIxFileNames {
inert void
run_tests();
}
Modified: incubator/lucy/trunk/core/Lucy/Test/Util/TestJson.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Test/Util/TestJson.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Test/Util/TestJson.c (original)
+++ incubator/lucy/trunk/core/Lucy/Test/Util/TestJson.c Thu Nov 4 05:36:36 2010
@@ -14,13 +14,13 @@
* limitations under the License.
*/
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
-#include "KinoSearch/Test.h"
-#include "KinoSearch/Test/Util/TestJson.h"
-#include "KinoSearch/Util/Json.h"
-#include "KinoSearch/Store/FileHandle.h"
-#include "KinoSearch/Store/RAMFolder.h"
+#include "Lucy/Test.h"
+#include "Lucy/Test/Util/TestJson.h"
+#include "Lucy/Util/Json.h"
+#include "Lucy/Store/FileHandle.h"
+#include "Lucy/Store/RAMFolder.h"
// Create a test data structure including at least one each of Hash, VArray,
// and CharBuf.
Modified: incubator/lucy/trunk/core/Lucy/Test/Util/TestJson.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Test/Util/TestJson.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Test/Util/TestJson.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Test/Util/TestJson.cfh Thu Nov 4 05:36:36 2010
@@ -16,7 +16,7 @@
parcel Lucy;
-inert class KinoSearch::Test::Util::TestJson {
+inert class Lucy::Test::Util::TestJson {
inert void
run_tests();
}
Modified: incubator/lucy/trunk/core/Lucy/Test/Util/TestMemory.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Test/Util/TestMemory.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Test/Util/TestMemory.c (original)
+++ incubator/lucy/trunk/core/Lucy/Test/Util/TestMemory.c Thu Nov 4 05:36:36 2010
@@ -16,10 +16,10 @@
#define C_LUCY_TESTMEMORYPOOL
#define C_LUCY_MEMORYPOOL
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
-#include "KinoSearch/Test.h"
-#include "KinoSearch/Test/Util/TestMemory.h"
+#include "Lucy/Test.h"
+#include "Lucy/Test/Util/TestMemory.h"
static void
test_oversize__growth_rate(TestBatch *batch)
Modified: incubator/lucy/trunk/core/Lucy/Test/Util/TestMemory.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Test/Util/TestMemory.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Test/Util/TestMemory.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Test/Util/TestMemory.cfh Thu Nov 4 05:36:36 2010
@@ -16,7 +16,7 @@
parcel Lucy;
-inert class KinoSearch::Test::Util::TestMemory {
+inert class Lucy::Test::Util::TestMemory {
inert void
run_tests();
}
Modified: incubator/lucy/trunk/core/Lucy/Test/Util/TestMemoryPool.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Test/Util/TestMemoryPool.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Test/Util/TestMemoryPool.c (original)
+++ incubator/lucy/trunk/core/Lucy/Test/Util/TestMemoryPool.c Thu Nov 4 05:36:36 2010
@@ -16,11 +16,11 @@
#define C_LUCY_TESTMEMORYPOOL
#define C_LUCY_MEMORYPOOL
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
-#include "KinoSearch/Test.h"
-#include "KinoSearch/Test/Util/TestMemoryPool.h"
-#include "KinoSearch/Util/MemoryPool.h"
+#include "Lucy/Test.h"
+#include "Lucy/Test/Util/TestMemoryPool.h"
+#include "Lucy/Util/MemoryPool.h"
void
TestMemPool_run_tests()
Modified: incubator/lucy/trunk/core/Lucy/Test/Util/TestMemoryPool.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Test/Util/TestMemoryPool.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Test/Util/TestMemoryPool.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Test/Util/TestMemoryPool.cfh Thu Nov 4 05:36:36 2010
@@ -16,7 +16,7 @@
parcel Lucy;
-inert class KinoSearch::Test::Util::TestMemoryPool cnick TestMemPool {
+inert class Lucy::Test::Util::TestMemoryPool cnick TestMemPool {
inert void
run_tests();
}
Modified: incubator/lucy/trunk/core/Lucy/Test/Util/TestNumberUtils.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Test/Util/TestNumberUtils.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Test/Util/TestNumberUtils.c (original)
+++ incubator/lucy/trunk/core/Lucy/Test/Util/TestNumberUtils.c Thu Nov 4 05:36:36 2010
@@ -15,14 +15,14 @@
*/
#define C_LUCY_TESTNUMBERUTILS
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
#include <stdlib.h>
#include <time.h>
-#include "KinoSearch/Test.h"
-#include "KinoSearch/Test/TestUtils.h"
-#include "KinoSearch/Test/Util/TestNumberUtils.h"
-#include "KinoSearch/Util/NumberUtils.h"
+#include "Lucy/Test.h"
+#include "Lucy/Test/TestUtils.h"
+#include "Lucy/Test/Util/TestNumberUtils.h"
+#include "Lucy/Util/NumberUtils.h"
static void
test_u1(TestBatch *batch)
Modified: incubator/lucy/trunk/core/Lucy/Test/Util/TestNumberUtils.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Test/Util/TestNumberUtils.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Test/Util/TestNumberUtils.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Test/Util/TestNumberUtils.cfh Thu Nov 4 05:36:36 2010
@@ -16,7 +16,7 @@
parcel Lucy;
-inert class KinoSearch::Test::Util::TestNumberUtils cnick TestNumUtil {
+inert class Lucy::Test::Util::TestNumberUtils cnick TestNumUtil {
inert void
run_tests();
}
Modified: incubator/lucy/trunk/core/Lucy/Test/Util/TestPriorityQueue.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Test/Util/TestPriorityQueue.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Test/Util/TestPriorityQueue.c (original)
+++ incubator/lucy/trunk/core/Lucy/Test/Util/TestPriorityQueue.c Thu Nov 4 05:36:36 2010
@@ -15,11 +15,11 @@
*/
#define C_LUCY_TESTPRIORITYQUEUE
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
-#include "KinoSearch/Test.h"
-#include "KinoSearch/Test/Util/TestPriorityQueue.h"
-#include "KinoSearch/Util/PriorityQueue.h"
+#include "Lucy/Test.h"
+#include "Lucy/Test/Util/TestPriorityQueue.h"
+#include "Lucy/Util/PriorityQueue.h"
NumPriorityQueue*
NumPriQ_new(uint32_t max_size)
Modified: incubator/lucy/trunk/core/Lucy/Test/Util/TestPriorityQueue.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Test/Util/TestPriorityQueue.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Test/Util/TestPriorityQueue.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Test/Util/TestPriorityQueue.cfh Thu Nov 4 05:36:36 2010
@@ -16,8 +16,8 @@
parcel Lucy;
-class KinoSearch::Test::Util::NumPriorityQueue cnick NumPriQ
- inherits KinoSearch::Util::PriorityQueue {
+class Lucy::Test::Util::NumPriorityQueue cnick NumPriQ
+ inherits Lucy::Util::PriorityQueue {
inert incremented NumPriorityQueue*
new(uint32_t max_size);
@@ -26,7 +26,7 @@ class KinoSearch::Test::Util::NumPriorit
Less_Than(NumPriorityQueue *self, Obj *a, Obj *b);
}
-inert class KinoSearch::Test::Util::TestPriorityQueue cnick TestPriQ {
+inert class Lucy::Test::Util::TestPriorityQueue cnick TestPriQ {
inert void
run_tests();
}
Modified: incubator/lucy/trunk/core/Lucy/Test/Util/TestStringHelper.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Test/Util/TestStringHelper.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Test/Util/TestStringHelper.c (original)
+++ incubator/lucy/trunk/core/Lucy/Test/Util/TestStringHelper.c Thu Nov 4 05:36:36 2010
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
-#include "KinoSearch/Test.h"
-#include "KinoSearch/Test/Util/TestStringHelper.h"
-#include "KinoSearch/Util/StringHelper.h"
+#include "Lucy/Test.h"
+#include "Lucy/Test/Util/TestStringHelper.h"
+#include "Lucy/Util/StringHelper.h"
static void
test_overlap(TestBatch *batch)
Modified: incubator/lucy/trunk/core/Lucy/Test/Util/TestStringHelper.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Test/Util/TestStringHelper.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Test/Util/TestStringHelper.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Test/Util/TestStringHelper.cfh Thu Nov 4 05:36:36 2010
@@ -16,7 +16,7 @@
parcel Lucy;
-inert class KinoSearch::Test::Util::TestStringHelper cnick TestStrHelp {
+inert class Lucy::Test::Util::TestStringHelper cnick TestStrHelp {
inert void
run_tests();
}
Modified: incubator/lucy/trunk/core/Lucy/Util/Atomic.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Util/Atomic.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Util/Atomic.c (original)
+++ incubator/lucy/trunk/core/Lucy/Util/Atomic.c Thu Nov 4 05:36:36 2010
@@ -16,7 +16,7 @@
#define C_LUCY_ATOMIC
#define LUCY_USE_SHORT_NAMES
-#include "KinoSearch/Util/Atomic.h"
+#include "Lucy/Util/Atomic.h"
/********************************** Windows ********************************/
#ifdef CHY_HAS_WINDOWS_H
Modified: incubator/lucy/trunk/core/Lucy/Util/Atomic.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Util/Atomic.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Util/Atomic.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Util/Atomic.cfh Thu Nov 4 05:36:36 2010
@@ -18,7 +18,7 @@ parcel Lucy;
/** Provide atomic memory operations.
*/
-inert class KinoSearch::Util::Atomic { }
+inert class Lucy::Util::Atomic { }
__C__
Modified: incubator/lucy/trunk/core/Lucy/Util/Debug.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Util/Debug.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Util/Debug.c (original)
+++ incubator/lucy/trunk/core/Lucy/Util/Debug.c Thu Nov 4 05:36:36 2010
@@ -18,7 +18,7 @@
#define LUCY_USE_SHORT_NAMES
#define CHY_USE_SHORT_NAMES
-#include "KinoSearch/Util/Debug.h"
+#include "Lucy/Util/Debug.h"
int32_t Debug_num_allocated = 0;
int32_t Debug_num_freed = 0;
Modified: incubator/lucy/trunk/core/Lucy/Util/Debug.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Util/Debug.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Util/Debug.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Util/Debug.cfh Thu Nov 4 05:36:36 2010
@@ -31,7 +31,7 @@ parcel Lucy;
* The wildcard character '*' can only go at the end of an identifier.
*/
-inert class KinoSearch::Util::Debug {
+inert class Lucy::Util::Debug {
/** Private function, used only by the DEBUG macros.
*/
Modified: incubator/lucy/trunk/core/Lucy/Util/Freezer.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Util/Freezer.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Util/Freezer.c (original)
+++ incubator/lucy/trunk/core/Lucy/Util/Freezer.c Thu Nov 4 05:36:36 2010
@@ -15,11 +15,11 @@
*/
#define C_LUCY_FREEZER
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
-#include "KinoSearch/Util/Freezer.h"
-#include "KinoSearch/Store/InStream.h"
-#include "KinoSearch/Store/OutStream.h"
+#include "Lucy/Util/Freezer.h"
+#include "Lucy/Store/InStream.h"
+#include "Lucy/Store/OutStream.h"
void
Freezer_freeze(Obj *obj, OutStream *outstream)
Modified: incubator/lucy/trunk/core/Lucy/Util/Freezer.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Util/Freezer.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Util/Freezer.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Util/Freezer.cfh Thu Nov 4 05:36:36 2010
@@ -16,7 +16,7 @@
parcel Lucy;
-inert class KinoSearch::Util::Freezer {
+inert class Lucy::Util::Freezer {
/** Store an arbitrary object to the outstream.
*/
Modified: incubator/lucy/trunk/core/Lucy/Util/IndexFileNames.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Util/IndexFileNames.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Util/IndexFileNames.c (original)
+++ incubator/lucy/trunk/core/Lucy/Util/IndexFileNames.c Thu Nov 4 05:36:36 2010
@@ -15,12 +15,12 @@
*/
#define C_LUCY_INDEXFILENAMES
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
-#include "KinoSearch/Util/IndexFileNames.h"
-#include "KinoSearch/Store/DirHandle.h"
-#include "KinoSearch/Store/Folder.h"
-#include "KinoSearch/Util/StringHelper.h"
+#include "Lucy/Util/IndexFileNames.h"
+#include "Lucy/Store/DirHandle.h"
+#include "Lucy/Store/Folder.h"
+#include "Lucy/Util/StringHelper.h"
CharBuf*
IxFileNames_latest_snapshot(Folder *folder)
Modified: incubator/lucy/trunk/core/Lucy/Util/IndexFileNames.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Util/IndexFileNames.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Util/IndexFileNames.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Util/IndexFileNames.cfh Thu Nov 4 05:36:36 2010
@@ -18,7 +18,7 @@ parcel Lucy;
/** Utilities for parsing, interpreting and generating index file names.
*/
-inert class KinoSearch::Util::IndexFileNames cnick IxFileNames {
+inert class Lucy::Util::IndexFileNames cnick IxFileNames {
/** Skip past the first instance of an underscore in the CharBuf, then
* attempt to decode a base 36 number. For example, "snapshot_5.json"
Modified: incubator/lucy/trunk/core/Lucy/Util/Json.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Util/Json.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Util/Json.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Util/Json.cfh Thu Nov 4 05:36:36 2010
@@ -20,7 +20,7 @@ parcel Lucy;
*
* Provides utility functions for encoding/decoding JSON.
*/
-class KinoSearch::Util::Json inherits KinoSearch::Object::Obj {
+class Lucy::Util::Json inherits Lucy::Object::Obj {
/** Encode <code>dump</code> as JSON.
*/
Modified: incubator/lucy/trunk/core/Lucy/Util/Memory.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Util/Memory.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Util/Memory.c (original)
+++ incubator/lucy/trunk/core/Lucy/Util/Memory.c Thu Nov 4 05:36:36 2010
@@ -19,7 +19,7 @@
#include <stdio.h>
#define LUCY_USE_SHORT_NAMES
#define CHY_USE_SHORT_NAMES
-#include "KinoSearch/Util/Memory.h"
+#include "Lucy/Util/Memory.h"
void*
Memory_wrapped_malloc(size_t count)
Modified: incubator/lucy/trunk/core/Lucy/Util/Memory.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Util/Memory.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Util/Memory.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Util/Memory.cfh Thu Nov 4 05:36:36 2010
@@ -16,7 +16,7 @@
parcel Lucy;
-inert class KinoSearch::Util::Memory {
+inert class Lucy::Util::Memory {
/** Attempt to allocate memory with malloc, but print an error and exit if the
* call fails.
Modified: incubator/lucy/trunk/core/Lucy/Util/MemoryPool.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Util/MemoryPool.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Util/MemoryPool.c (original)
+++ incubator/lucy/trunk/core/Lucy/Util/MemoryPool.c Thu Nov 4 05:36:36 2010
@@ -15,9 +15,9 @@
*/
#define C_LUCY_MEMORYPOOL
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
-#include "KinoSearch/Util/MemoryPool.h"
+#include "Lucy/Util/MemoryPool.h"
static void
S_init_arena(MemoryPool *self, size_t amount);
Modified: incubator/lucy/trunk/core/Lucy/Util/MemoryPool.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Util/MemoryPool.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Util/MemoryPool.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Util/MemoryPool.cfh Thu Nov 4 05:36:36 2010
@@ -26,8 +26,8 @@ parcel Lucy;
* class to specific applications.
*/
-class KinoSearch::Util::MemoryPool cnick MemPool
- inherits KinoSearch::Object::Obj {
+class Lucy::Util::MemoryPool cnick MemPool
+ inherits Lucy::Object::Obj {
uint32_t arena_size;
VArray *arenas;
Modified: incubator/lucy/trunk/core/Lucy/Util/NumberUtils.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Util/NumberUtils.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Util/NumberUtils.c (original)
+++ incubator/lucy/trunk/core/Lucy/Util/NumberUtils.c Thu Nov 4 05:36:36 2010
@@ -20,7 +20,7 @@
#include <string.h>
-#include "KinoSearch/Util/NumberUtils.h"
+#include "Lucy/Util/NumberUtils.h"
const uint8_t NumUtil_u1masks[8] = {
0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80
Modified: incubator/lucy/trunk/core/Lucy/Util/NumberUtils.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Util/NumberUtils.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Util/NumberUtils.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Util/NumberUtils.cfh Thu Nov 4 05:36:36 2010
@@ -21,7 +21,7 @@ parcel Lucy;
* Provide utilities for dealing with endian issues, sub-byte-width arrays,
* compressed integers, and so on.
*/
-inert class KinoSearch::Util::NumberUtils cnick NumUtil {
+inert class Lucy::Util::NumberUtils cnick NumUtil {
inert const uint8_t[8] u1masks;
inert const uint8_t[4] u2masks;
Modified: incubator/lucy/trunk/core/Lucy/Util/PriorityQueue.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Util/PriorityQueue.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Util/PriorityQueue.c (original)
+++ incubator/lucy/trunk/core/Lucy/Util/PriorityQueue.c Thu Nov 4 05:36:36 2010
@@ -15,11 +15,11 @@
*/
#define C_LUCY_PRIORITYQUEUE
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
#include <string.h>
-#include "KinoSearch/Util/PriorityQueue.h"
+#include "Lucy/Util/PriorityQueue.h"
// Add an element to the heap. Throw an error if too many elements
// are added.
Modified: incubator/lucy/trunk/core/Lucy/Util/PriorityQueue.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Util/PriorityQueue.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Util/PriorityQueue.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Util/PriorityQueue.cfh Thu Nov 4 05:36:36 2010
@@ -24,8 +24,8 @@ parcel Lucy;
* Subclasses must define the abstract method Less_Than.
*/
-class KinoSearch::Util::PriorityQueue cnick PriQ
- inherits KinoSearch::Object::Obj {
+class Lucy::Util::PriorityQueue cnick PriQ
+ inherits Lucy::Object::Obj {
uint32_t size;
uint32_t max_size;
Modified: incubator/lucy/trunk/core/Lucy/Util/ProcessID.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Util/ProcessID.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Util/ProcessID.c (original)
+++ incubator/lucy/trunk/core/Lucy/Util/ProcessID.c Thu Nov 4 05:36:36 2010
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "KinoSearch/Util/ProcessID.h"
+#include "Lucy/Util/ProcessID.h"
/********************************* WINDOWS ********************************/
#if (defined(CHY_HAS_WINDOWS_H) && defined(CHY_HAS_PROCESS_H))
Modified: incubator/lucy/trunk/core/Lucy/Util/ProcessID.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Util/ProcessID.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Util/ProcessID.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Util/ProcessID.cfh Thu Nov 4 05:36:36 2010
@@ -18,7 +18,7 @@ parcel Lucy;
/** Provide platform-compatible process ID functions.
*/
-inert class KinoSearch::Util::ProcessID cnick PID {
+inert class Lucy::Util::ProcessID cnick PID {
/** Return the ID for the current process.
*/
Modified: incubator/lucy/trunk/core/Lucy/Util/Sleep.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Util/Sleep.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Util/Sleep.c (original)
+++ incubator/lucy/trunk/core/Lucy/Util/Sleep.c Thu Nov 4 05:36:36 2010
@@ -15,7 +15,7 @@
*/
#define C_LUCY_SLEEP
-#include "KinoSearch/Util/Sleep.h"
+#include "Lucy/Util/Sleep.h"
/********************************* WINDOWS ********************************/
#ifdef CHY_HAS_WINDOWS_H
Modified: incubator/lucy/trunk/core/Lucy/Util/Sleep.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Util/Sleep.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Util/Sleep.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Util/Sleep.cfh Thu Nov 4 05:36:36 2010
@@ -18,7 +18,7 @@ parcel Lucy;
/** Provide platform-compatible sleep() functions.
*/
-inert class KinoSearch::Util::Sleep {
+inert class Lucy::Util::Sleep {
/** Sleep for <code>seconds</code> seconds.
*/
Modified: incubator/lucy/trunk/core/Lucy/Util/SortExternal.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Util/SortExternal.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Util/SortExternal.c (original)
+++ incubator/lucy/trunk/core/Lucy/Util/SortExternal.c Thu Nov 4 05:36:36 2010
@@ -15,9 +15,9 @@
*/
#define C_LUCY_SORTEXTERNAL
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
-#include "KinoSearch/Util/SortExternal.h"
+#include "Lucy/Util/SortExternal.h"
// Refill the main cache, drawing from the caches of all runs.
static void
Modified: incubator/lucy/trunk/core/Lucy/Util/SortExternal.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Util/SortExternal.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Util/SortExternal.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Util/SortExternal.cfh Thu Nov 4 05:36:36 2010
@@ -18,8 +18,8 @@ parcel Lucy;
__C__
#include <stddef.h>
-#include "KinoSearch/Object/Obj.h"
-#include "KinoSearch/Util/SortUtils.h"
+#include "Lucy/Object/Obj.h"
+#include "Lucy/Util/SortUtils.h"
#define LUCY_SORTEX_DEFAULT_MEM_THRESHOLD 0x1000000
#ifdef LUCY_USE_SHORT_NAMES
@@ -46,8 +46,8 @@ __END_C__
* SortExternal object then interleaves multiple sorted streams to produce a
* single unified stream of sorted values.
*/
-abstract class KinoSearch::Util::SortExternal cnick SortEx
- inherits KinoSearch::Object::Obj {
+abstract class Lucy::Util::SortExternal cnick SortEx
+ inherits Lucy::Object::Obj {
uint8_t *cache;
uint32_t cache_cap;
Modified: incubator/lucy/trunk/core/Lucy/Util/SortUtils.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Util/SortUtils.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Util/SortUtils.c (original)
+++ incubator/lucy/trunk/core/Lucy/Util/SortUtils.c Thu Nov 4 05:36:36 2010
@@ -19,8 +19,8 @@
#define CHY_USE_SHORT_NAMES
#include <string.h>
-#include "KinoSearch/Util/SortUtils.h"
-#include "KinoSearch/Object/Err.h"
+#include "Lucy/Util/SortUtils.h"
+#include "Lucy/Object/Err.h"
// Define four-byte and eight-byte types so that we can dereference void
// pointers like integer pointers. The only significance of using int32_t and
Modified: incubator/lucy/trunk/core/Lucy/Util/SortUtils.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Util/SortUtils.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Util/SortUtils.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Util/SortUtils.cfh Thu Nov 4 05:36:36 2010
@@ -29,7 +29,7 @@ __END_C__
*
* SortUtils also provides a quicksort with an additional context argument.
*/
-inert class KinoSearch::Util::SortUtils cnick Sort {
+inert class Lucy::Util::SortUtils cnick Sort {
/** Perform a mergesort. In addition to providing a contiguous array of
* elements to be sorted and their count, the caller must also provide a
Modified: incubator/lucy/trunk/core/Lucy/Util/Stepper.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Util/Stepper.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Util/Stepper.c (original)
+++ incubator/lucy/trunk/core/Lucy/Util/Stepper.c Thu Nov 4 05:36:36 2010
@@ -15,9 +15,9 @@
*/
#define C_LUCY_STEPPER
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
-#include "KinoSearch/Util/Stepper.h"
+#include "Lucy/Util/Stepper.h"
Stepper*
Stepper_init(Stepper *self)
Modified: incubator/lucy/trunk/core/Lucy/Util/Stepper.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Util/Stepper.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Util/Stepper.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Util/Stepper.cfh Thu Nov 4 05:36:36 2010
@@ -35,7 +35,7 @@ parcel Lucy;
* logic of the class which calls Stepper_Read_Record.
*/
-class KinoSearch::Util::Stepper inherits KinoSearch::Object::Obj {
+class Lucy::Util::Stepper inherits Lucy::Object::Obj {
inert Stepper*
init(Stepper *self);
Modified: incubator/lucy/trunk/core/Lucy/Util/StringHelper.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Util/StringHelper.c?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Util/StringHelper.c (original)
+++ incubator/lucy/trunk/core/Lucy/Util/StringHelper.c Thu Nov 4 05:36:36 2010
@@ -20,9 +20,9 @@
#define LUCY_USE_SHORT_NAMES
#define CHY_USE_SHORT_NAMES
-#include "KinoSearch/Util/StringHelper.h"
-#include "KinoSearch/Object/Err.h"
-#include "KinoSearch/Util/Memory.h"
+#include "Lucy/Util/StringHelper.h"
+#include "Lucy/Object/Err.h"
+#include "Lucy/Util/Memory.h"
int32_t
StrHelp_overlap(const char *a, const char *b, size_t a_len, size_t b_len)
Modified: incubator/lucy/trunk/core/Lucy/Util/StringHelper.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Util/StringHelper.cfh?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Util/StringHelper.cfh (original)
+++ incubator/lucy/trunk/core/Lucy/Util/StringHelper.cfh Thu Nov 4 05:36:36 2010
@@ -16,7 +16,7 @@
parcel Lucy;
-inert class KinoSearch::Util::StringHelper cnick StrHelp {
+inert class Lucy::Util::StringHelper cnick StrHelp {
/* A table where the values indicate the number of bytes in a UTF-8
* sequence implied by the leading utf8 byte.
Modified: incubator/lucy/trunk/core/Lucy/Util/ToolSet.h
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/Lucy/Util/ToolSet.h?rev=1030838&r1=1030833&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/Lucy/Util/ToolSet.h (original)
+++ incubator/lucy/trunk/core/Lucy/Util/ToolSet.h Thu Nov 4 05:36:36 2010
@@ -36,19 +36,19 @@ extern "C" {
#include <stddef.h>
#include <stdlib.h>
#include <string.h>
-#include "KinoSearch/Object/Obj.h"
-#include "KinoSearch/Object/BitVector.h"
-#include "KinoSearch/Object/ByteBuf.h"
-#include "KinoSearch/Object/CharBuf.h"
-#include "KinoSearch/Object/Err.h"
-#include "KinoSearch/Object/Hash.h"
-#include "KinoSearch/Object/I32Array.h"
-#include "KinoSearch/Object/Num.h"
-#include "KinoSearch/Object/VArray.h"
-#include "KinoSearch/Object/VTable.h"
-#include "KinoSearch/Util/NumberUtils.h"
-#include "KinoSearch/Util/Memory.h"
-#include "KinoSearch/Util/StringHelper.h"
+#include "Lucy/Object/Obj.h"
+#include "Lucy/Object/BitVector.h"
+#include "Lucy/Object/ByteBuf.h"
+#include "Lucy/Object/CharBuf.h"
+#include "Lucy/Object/Err.h"
+#include "Lucy/Object/Hash.h"
+#include "Lucy/Object/I32Array.h"
+#include "Lucy/Object/Num.h"
+#include "Lucy/Object/VArray.h"
+#include "Lucy/Object/VTable.h"
+#include "Lucy/Util/NumberUtils.h"
+#include "Lucy/Util/Memory.h"
+#include "Lucy/Util/StringHelper.h"
#ifdef __cplusplus
}
Modified: incubator/lucy/trunk/core/LucyX/Search/FilterScorer.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/LucyX/Search/FilterScorer.c?rev=1030838&r1=1030837&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/LucyX/Search/FilterScorer.c (original)
+++ incubator/lucy/trunk/core/LucyX/Search/FilterScorer.c Thu Nov 4 05:36:36 2010
@@ -15,7 +15,7 @@
*/
#define C_LUCY_FILTERSCORER
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
#include "LucyX/Search/FilterScorer.h"
Modified: incubator/lucy/trunk/core/LucyX/Search/FilterScorer.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/LucyX/Search/FilterScorer.cfh?rev=1030838&r1=1030837&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/LucyX/Search/FilterScorer.cfh (original)
+++ incubator/lucy/trunk/core/LucyX/Search/FilterScorer.cfh Thu Nov 4 05:36:36 2010
@@ -16,7 +16,7 @@
parcel Lucy;
-class LucyX::Search::FilterScorer inherits KinoSearch::Search::Matcher {
+class LucyX::Search::FilterScorer inherits Lucy::Search::Matcher {
BitVector *bits;
int32_t doc_max;
Modified: incubator/lucy/trunk/core/LucyX/Search/MockMatcher.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/LucyX/Search/MockMatcher.c?rev=1030838&r1=1030837&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/LucyX/Search/MockMatcher.c (original)
+++ incubator/lucy/trunk/core/LucyX/Search/MockMatcher.c Thu Nov 4 05:36:36 2010
@@ -15,7 +15,7 @@
*/
#define C_LUCY_MOCKMATCHER
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
#include "LucyX/Search/MockMatcher.h"
Modified: incubator/lucy/trunk/core/LucyX/Search/MockMatcher.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/LucyX/Search/MockMatcher.cfh?rev=1030838&r1=1030837&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/LucyX/Search/MockMatcher.cfh (original)
+++ incubator/lucy/trunk/core/LucyX/Search/MockMatcher.cfh Thu Nov 4 05:36:36 2010
@@ -16,7 +16,7 @@
parcel Lucy;
-class LucyX::Search::MockMatcher inherits KinoSearch::Search::Matcher {
+class LucyX::Search::MockMatcher inherits Lucy::Search::Matcher {
size_t size;
I32Array *doc_ids;
Modified: incubator/lucy/trunk/core/LucyX/Search/ProximityQuery.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/LucyX/Search/ProximityQuery.c?rev=1030838&r1=1030837&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/LucyX/Search/ProximityQuery.c (original)
+++ incubator/lucy/trunk/core/LucyX/Search/ProximityQuery.c Thu Nov 4 05:36:36 2010
@@ -18,26 +18,26 @@
#define C_LUCY_PROXIMITYCOMPILER
#include <stdarg.h>
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
#include "LucyX/Search/ProximityQuery.h"
-#include "KinoSearch/Index/DocVector.h"
-#include "KinoSearch/Index/Posting.h"
-#include "KinoSearch/Index/Posting/ScorePosting.h"
-#include "KinoSearch/Index/PostingList.h"
-#include "KinoSearch/Index/PostingListReader.h"
-#include "KinoSearch/Index/SegPostingList.h"
-#include "KinoSearch/Index/SegReader.h"
-#include "KinoSearch/Index/Similarity.h"
-#include "KinoSearch/Index/TermVector.h"
-#include "KinoSearch/Plan/Schema.h"
+#include "Lucy/Index/DocVector.h"
+#include "Lucy/Index/Posting.h"
+#include "Lucy/Index/Posting/ScorePosting.h"
+#include "Lucy/Index/PostingList.h"
+#include "Lucy/Index/PostingListReader.h"
+#include "Lucy/Index/SegPostingList.h"
+#include "Lucy/Index/SegReader.h"
+#include "Lucy/Index/Similarity.h"
+#include "Lucy/Index/TermVector.h"
+#include "Lucy/Plan/Schema.h"
#include "LucyX/Search/ProximityScorer.h"
-#include "KinoSearch/Search/Searcher.h"
-#include "KinoSearch/Search/Span.h"
-#include "KinoSearch/Search/TermQuery.h"
-#include "KinoSearch/Store/InStream.h"
-#include "KinoSearch/Store/OutStream.h"
-#include "KinoSearch/Util/Freezer.h"
+#include "Lucy/Search/Searcher.h"
+#include "Lucy/Search/Span.h"
+#include "Lucy/Search/TermQuery.h"
+#include "Lucy/Store/InStream.h"
+#include "Lucy/Store/OutStream.h"
+#include "Lucy/Util/Freezer.h"
// Shared initialization routine which assumes that it's ok to assume control
// over [field] and [terms], eating their refcounts.
Modified: incubator/lucy/trunk/core/LucyX/Search/ProximityQuery.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/LucyX/Search/ProximityQuery.cfh?rev=1030838&r1=1030837&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/LucyX/Search/ProximityQuery.cfh (original)
+++ incubator/lucy/trunk/core/LucyX/Search/ProximityQuery.cfh Thu Nov 4 05:36:36 2010
@@ -18,11 +18,11 @@ parcel Lucy;
/** Query matching an ordered list of terms.
*
- * ProximityQuery is a subclass of L<KinoSearch::Search::Query> for matching
+ * ProximityQuery is a subclass of L<Lucy::Search::Query> for matching
* against an ordered sequence of terms.
*/
-class LucyX::Search::ProximityQuery inherits KinoSearch::Search::Query
+class LucyX::Search::ProximityQuery inherits Lucy::Search::Query
: dumpable {
CharBuf *field;
@@ -74,7 +74,7 @@ class LucyX::Search::ProximityQuery inhe
}
class LucyX::Search::ProximityCompiler
- inherits KinoSearch::Search::Compiler {
+ inherits Lucy::Search::Compiler {
float idf;
float raw_weight;
Modified: incubator/lucy/trunk/core/LucyX/Search/ProximityScorer.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/LucyX/Search/ProximityScorer.c?rev=1030838&r1=1030837&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/LucyX/Search/ProximityScorer.c (original)
+++ incubator/lucy/trunk/core/LucyX/Search/ProximityScorer.c Thu Nov 4 05:36:36 2010
@@ -17,13 +17,13 @@
#define C_LUCY_PROXIMITYSCORER
#define C_LUCY_POSTING
#define C_LUCY_SCOREPOSTING
-#include "KinoSearch/Util/ToolSet.h"
+#include "Lucy/Util/ToolSet.h"
#include "LucyX/Search/ProximityScorer.h"
-#include "KinoSearch/Index/Posting/ScorePosting.h"
-#include "KinoSearch/Index/PostingList.h"
-#include "KinoSearch/Index/Similarity.h"
-#include "KinoSearch/Search/Compiler.h"
+#include "Lucy/Index/Posting/ScorePosting.h"
+#include "Lucy/Index/PostingList.h"
+#include "Lucy/Index/Similarity.h"
+#include "Lucy/Search/Compiler.h"
ProximityScorer*
Modified: incubator/lucy/trunk/core/LucyX/Search/ProximityScorer.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/LucyX/Search/ProximityScorer.cfh?rev=1030838&r1=1030837&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/core/LucyX/Search/ProximityScorer.cfh (original)
+++ incubator/lucy/trunk/core/LucyX/Search/ProximityScorer.cfh Thu Nov 4 05:36:36 2010
@@ -19,7 +19,7 @@ parcel Lucy;
/** Matcher for a ProximityQuery.
*/
-class LucyX::Search::ProximityScorer inherits KinoSearch::Search::Matcher {
+class LucyX::Search::ProximityScorer inherits Lucy::Search::Matcher {
int32_t doc_id;
uint32_t num_elements;
Modified: incubator/lucy/trunk/devel/benchmarks/indexers/BenchmarkingIndexer.pm
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/devel/benchmarks/indexers/BenchmarkingIndexer.pm?rev=1030838&r1=1030837&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/devel/benchmarks/indexers/BenchmarkingIndexer.pm (original)
+++ incubator/lucy/trunk/devel/benchmarks/indexers/BenchmarkingIndexer.pm Thu Nov 4 05:36:36 2010
@@ -122,23 +122,23 @@ END_REPORT
}
package BenchSchema::WhiteSpaceTokenizer;
-use base qw( KinoSearch::Analysis::Tokenizer );
+use base qw( Lucy::Analysis::Tokenizer );
sub new { return shift->SUPER::new( pattern => '\S+' ) }
package BenchSchema;
-use base qw( KinoSearch::Plan::Schema );
-use KinoSearch::Analysis::Tokenizer;
+use base qw( Lucy::Plan::Schema );
+use Lucy::Analysis::Tokenizer;
sub new {
my $self = shift->SUPER::new;
- my $type = KinoSearch::Plan::FullTextType->new(
+ my $type = Lucy::Plan::FullTextType->new(
analyzer => BenchSchema::WhiteSpaceTokenizer->new, );
$self->spec_field( name => 'title', type => $type );
return $self;
}
-package BenchmarkingIndexer::KinoSearch;
+package BenchmarkingIndexer::Lucy;
use base qw( BenchmarkingIndexer );
use Time::HiRes qw( gettimeofday );
@@ -147,12 +147,12 @@ sub new {
my $class = shift;
my $self = $class->SUPER::new(@_);
- require KinoSearch;
- require KinoSearch::Index::Indexer;
+ require Lucy;
+ require Lucy::Index::Indexer;
# Provide runtime flexibility.
my $schema = $self->{schema} = BenchSchema->new;
- my $body_type = KinoSearch::Plan::FullTextType->new(
+ my $body_type = Lucy::Plan::FullTextType->new(
analyzer => BenchSchema::WhiteSpaceTokenizer->new,
highlightable => $self->{store} ? 1 : 0,
stored => $self->{store} ? 1 : 0,
@@ -160,8 +160,8 @@ sub new {
$schema->spec_field( name => 'body', type => $body_type );
$self->{index_dir} = 'lucy_index';
- $self->{engine} = 'KinoSearch';
- $self->{version} = $KinoSearch::VERSION;
+ $self->{engine} = 'Lucy';
+ $self->{version} = $Lucy::VERSION;
return $self;
}
@@ -169,7 +169,7 @@ sub new {
sub init_indexer {
my ( $self, $count ) = @_;
my $truncate = $count == 0 ? 1 : 0;
- return KinoSearch::Index::Indexer->new(
+ return Lucy::Index::Indexer->new(
schema => $self->{schema},
index => $self->{index_dir},
truncate => $truncate,
Modified: incubator/lucy/trunk/devel/benchmarks/indexers/kinosearch_indexer.plx
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/devel/benchmarks/indexers/kinosearch_indexer.plx?rev=1030838&r1=1030837&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/devel/benchmarks/indexers/kinosearch_indexer.plx (original)
+++ incubator/lucy/trunk/devel/benchmarks/indexers/kinosearch_indexer.plx Thu Nov 4 05:36:36 2010
@@ -36,7 +36,7 @@ GetOptions(
);
$num_reps = 1 unless defined $num_reps;
-my $bencher = BenchmarkingIndexer::KinoSearch->new(
+my $bencher = BenchmarkingIndexer::Lucy->new(
docs => $max_to_index,
increment => $increment,
store => $store,
Modified: incubator/lucy/trunk/perl/MANIFEST.SKIP
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/MANIFEST.SKIP?rev=1030838&r1=1030837&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/MANIFEST.SKIP (original)
+++ incubator/lucy/trunk/perl/MANIFEST.SKIP Thu Nov 4 05:36:36 2010
@@ -26,7 +26,7 @@
^_build
# autogenerated by custom Build.PL
-KinoSearch\.xs$
+Lucy\.xs$
typemap
# Makemaker generated files and dirs.
Modified: incubator/lucy/trunk/perl/buildlib/Lucy/Build.pm
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/buildlib/Lucy/Build.pm?rev=1030838&r1=1030837&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/buildlib/Lucy/Build.pm (original)
+++ incubator/lucy/trunk/perl/buildlib/Lucy/Build.pm Thu Nov 4 05:36:36 2010
@@ -74,8 +74,8 @@ use Carp;
BEGIN { unshift @PATH, curdir() }
-sub xs_filepath { catfile( 'lib', "KinoSearch.xs" ) }
-sub autobind_pm_path { catfile( 'lib', 'KinoSearch', 'Autobinding.pm' ); }
+sub xs_filepath { catfile( 'lib', "Lucy.xs" ) }
+sub autobind_pm_path { catfile( 'lib', 'Lucy', 'Autobinding.pm' ); }
sub extra_ccflags {
my $self = shift;
@@ -254,7 +254,7 @@ sub _compile_clownfish {
parcel => 'Lucy',
hierarchy => $hierarchy,
lib_dir => 'lib',
- boot_class => 'KinoSearch',
+ boot_class => 'Lucy',
header => $self->autogen_header,
footer => '',
);
@@ -481,7 +481,7 @@ sub ACTION_compile_custom_xs {
my $cbuilder
= Lucy::Build::CBuilder->new( config => { cc => $self->config('cc') },
);
- my $archdir = catdir( $self->blib, 'arch', 'auto', 'KinoSearch', );
+ my $archdir = catdir( $self->blib, 'arch', 'auto', 'Lucy', );
mkpath( $archdir, 0, 0777 ) unless -d $archdir;
my @include_dirs = (
curdir(), $CORE_SOURCE_DIR, $AUTOGEN_DIR, $XS_SOURCE_DIR,
@@ -509,7 +509,7 @@ sub ACTION_compile_custom_xs {
}
# .xs => .c
- my $perl_binding_c_file = "lib/KinoSearch.c";
+ my $perl_binding_c_file = "lib/Lucy.c";
$self->add_to_cleanup($perl_binding_c_file);
if ( !$self->up_to_date( $xs_filepath, $perl_binding_c_file ) ) {
ExtUtils::ParseXS::process_file(
@@ -521,7 +521,7 @@ sub ACTION_compile_custom_xs {
# .c => .o
my $version = $self->dist_version;
- my $perl_binding_o_file = catfile( 'lib', "KinoSearch$Config{_o}" );
+ my $perl_binding_o_file = catfile( 'lib', "Lucy$Config{_o}" );
unshift @objects, $perl_binding_o_file;
$self->add_to_cleanup($perl_binding_o_file);
if ( !$self->up_to_date( $perl_binding_c_file, $perl_binding_o_file ) ) {
@@ -543,7 +543,7 @@ sub ACTION_compile_custom_xs {
}
# Create .bs bootstrap file, needed by Dynaloader.
- my $bs_file = catfile( $archdir, "KinoSearch.bs" );
+ my $bs_file = catfile( $archdir, "Lucy.bs" );
$self->add_to_cleanup($bs_file);
if ( !$self->up_to_date( $perl_binding_o_file, $bs_file ) ) {
require ExtUtils::Mkbootstrap;
@@ -557,10 +557,10 @@ sub ACTION_compile_custom_xs {
}
# .o => .(a|bundle)
- my $lib_file = catfile( $archdir, "KinoSearch.$Config{dlext}" );
+ my $lib_file = catfile( $archdir, "Lucy.$Config{dlext}" );
if ( !$self->up_to_date( [ @objects, $AUTOGEN_DIR ], $lib_file ) ) {
$cbuilder->link(
- module_name => 'KinoSearch',
+ module_name => 'Lucy',
objects => \@objects,
lib_file => $lib_file,
);
@@ -661,7 +661,7 @@ sub _gen_pause_exclusion_list {
}
# Exclude redacted modules.
- if ( eval { require "buildlib/KinoSearch/Redacted.pm" } ) {
+ if ( eval { require "buildlib/Lucy/Redacted.pm" } ) {
my @redacted = map {
my @parts = split( /\W+/, $_ );
catfile( 'lib', @parts ) . '.pm'
Modified: incubator/lucy/trunk/perl/buildlib/Lucy/Redacted.pm
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/buildlib/Lucy/Redacted.pm?rev=1030838&r1=1030837&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/buildlib/Lucy/Redacted.pm (original)
+++ incubator/lucy/trunk/perl/buildlib/Lucy/Redacted.pm Thu Nov 4 05:36:36 2010
@@ -28,34 +28,34 @@ BEGIN {
sub redacted {
return qw(
- KinoSearch::Analysis::LCNormalizer
- KinoSearch::Analysis::Token
- KinoSearch::Analysis::TokenBatch
- KinoSearch::Index::Term
- KinoSearch::InvIndex
- KinoSearch::InvIndexer
- KinoSearch::QueryParser::QueryParser
- KinoSearch::Search::BooleanQuery
- KinoSearch::Search::QueryFilter
- KinoSearch::Search::SearchServer
- KinoSearch::Search::SearchClient
+ Lucy::Analysis::LCNormalizer
+ Lucy::Analysis::Token
+ Lucy::Analysis::TokenBatch
+ Lucy::Index::Term
+ Lucy::InvIndex
+ Lucy::InvIndexer
+ Lucy::QueryParser::QueryParser
+ Lucy::Search::BooleanQuery
+ Lucy::Search::QueryFilter
+ Lucy::Search::SearchServer
+ Lucy::Search::SearchClient
);
}
# Hide additional stuff from PAUSE and search.cpan.org.
sub hidden {
return qw(
- KinoSearch::Analysis::Inversion
- KinoSearch::Object::Num
- KinoSearch::Plan::Int32Type
- KinoSearch::Plan::Int64Type
- KinoSearch::Plan::Float32Type
- KinoSearch::Plan::Float64Type
+ Lucy::Analysis::Inversion
+ Lucy::Object::Num
+ Lucy::Plan::Int32Type
+ Lucy::Plan::Int64Type
+ Lucy::Plan::Float32Type
+ Lucy::Plan::Float64Type
Lucy::Redacted
- KinoSearch::Test::Object::TestCharBuf
+ Lucy::Test::Object::TestCharBuf
Lucy::Test::TestUtils
Lucy::Test::USConSchema
- KinoSearch::Util::BitVector
+ Lucy::Util::BitVector
);
}
Modified: incubator/lucy/trunk/perl/buildlib/Lucy/Test/TestUtils.pm
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/buildlib/Lucy/Test/TestUtils.pm?rev=1030838&r1=1030837&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/buildlib/Lucy/Test/TestUtils.pm (original)
+++ incubator/lucy/trunk/perl/buildlib/Lucy/Test/TestUtils.pm Thu Nov 4 05:36:36 2010
@@ -35,8 +35,8 @@ our @EXPORT_OK = qw(
modulo_set
);
-use KinoSearch;
-use KinoSearch::Test;
+use Lucy;
+use Lucy::Test;
use lib 'sample';
use Lucy::Test::USConSchema;
@@ -91,10 +91,10 @@ sub init_test_index_loc {
# Build a RAM index, using the supplied array of strings as source material.
# The index will have a single field: "content".
sub create_index {
- my $folder = KinoSearch::Store::RAMFolder->new;
- my $indexer = KinoSearch::Index::Indexer->new(
+ my $folder = Lucy::Store::RAMFolder->new;
+ my $indexer = Lucy::Index::Indexer->new(
index => $folder,
- schema => KinoSearch::Test::TestSchema->new,
+ schema => Lucy::Test::TestSchema->new,
);
$indexer->add_doc( { content => $_ } ) for @_;
$indexer->commit;
@@ -144,10 +144,10 @@ sub get_uscon_docs {
}
sub create_uscon_index {
- my $folder = KinoSearch::Store::FSFolder->new(
+ my $folder = Lucy::Store::FSFolder->new(
path => persistent_test_index_loc() );
my $schema = Lucy::Test::USConSchema->new;
- my $indexer = KinoSearch::Index::Indexer->new(
+ my $indexer = Lucy::Index::Indexer->new(
schema => $schema,
index => $folder,
truncate => 1,
@@ -158,7 +158,7 @@ sub create_uscon_index {
$indexer->commit;
undef $indexer;
- $indexer = KinoSearch::Index::Indexer->new(
+ $indexer = Lucy::Index::Indexer->new(
schema => $schema,
index => $folder,
);
@@ -168,7 +168,7 @@ sub create_uscon_index {
$indexer->commit;
undef $indexer;
- $indexer = KinoSearch::Index::Indexer->new(
+ $indexer = Lucy::Index::Indexer->new(
schema => $schema,
index => $folder,
);
@@ -201,7 +201,7 @@ sub utf8_test_strings {
sub test_analyzer {
my ( $analyzer, $source, $expected, $message ) = @_;
- my $inversion = KinoSearch::Analysis::Inversion->new( text => $source );
+ my $inversion = Lucy::Analysis::Inversion->new( text => $source );
$inversion = $analyzer->transform($inversion);
my @got;
while ( my $token = $inversion->next ) {
Modified: incubator/lucy/trunk/perl/buildlib/Lucy/Test/USConSchema.pm
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/buildlib/Lucy/Test/USConSchema.pm?rev=1030838&r1=1030837&r2=1030838&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/buildlib/Lucy/Test/USConSchema.pm (original)
+++ incubator/lucy/trunk/perl/buildlib/Lucy/Test/USConSchema.pm Thu Nov 4 05:36:36 2010
@@ -17,23 +17,23 @@ use strict;
use warnings;
package Lucy::Test::USConSchema;
-use base 'KinoSearch::Plan::Schema';
-use KinoSearch::Analysis::PolyAnalyzer;
-use KinoSearch::Plan::FullTextType;
-use KinoSearch::Plan::StringType;
+use base 'Lucy::Plan::Schema';
+use Lucy::Analysis::PolyAnalyzer;
+use Lucy::Plan::FullTextType;
+use Lucy::Plan::StringType;
sub new {
my $self = shift->SUPER::new(@_);
my $analyzer
- = KinoSearch::Analysis::PolyAnalyzer->new( language => 'en' );
+ = Lucy::Analysis::PolyAnalyzer->new( language => 'en' );
my $title_type
- = KinoSearch::Plan::FullTextType->new( analyzer => $analyzer, );
- my $content_type = KinoSearch::Plan::FullTextType->new(
+ = Lucy::Plan::FullTextType->new( analyzer => $analyzer, );
+ my $content_type = Lucy::Plan::FullTextType->new(
analyzer => $analyzer,
highlightable => 1,
);
- my $url_type = KinoSearch::Plan::StringType->new( indexed => 0, );
- my $cat_type = KinoSearch::Plan::StringType->new;
+ my $url_type = Lucy::Plan::StringType->new( indexed => 0, );
+ my $cat_type = Lucy::Plan::StringType->new;
$self->spec_field( name => 'title', type => $title_type );
$self->spec_field( name => 'content', type => $content_type );
$self->spec_field( name => 'url', type => $url_type );