You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucy.apache.org by ma...@apache.org on 2010/11/03 05:02:11 UTC
[lucy-commits] svn commit: r1030327 - in /incubator/lucy/trunk: core/KSx/
core/KinoSearch/Search/ core/LucyX/ core/LucyX/Search/ perl/lib/
perl/lib/KSx/ perl/lib/LucyX/ perl/lib/LucyX/Index/ perl/lib/LucyX/Remote/
perl/lib/LucyX/Search/ perl/t/ perl/t/binding/
Author: marvin
Date: Wed Nov 3 04:02:10 2010
New Revision: 1030327
URL: http://svn.apache.org/viewvc?rev=1030327&view=rev
Log:
Move everything under KSx namespace to LucyX.
Added:
incubator/lucy/trunk/core/LucyX/
- copied from r1029513, incubator/lucy/trunk/core/KSx/
incubator/lucy/trunk/perl/lib/LucyX/
- copied from r1030326, incubator/lucy/trunk/perl/lib/KSx/
Removed:
incubator/lucy/trunk/core/KSx/
incubator/lucy/trunk/perl/lib/KSx/
Modified:
incubator/lucy/trunk/core/KinoSearch/Search/PolySearcher.cfh
incubator/lucy/trunk/core/LucyX/Search/FilterScorer.c
incubator/lucy/trunk/core/LucyX/Search/FilterScorer.cfh
incubator/lucy/trunk/core/LucyX/Search/MockMatcher.c
incubator/lucy/trunk/core/LucyX/Search/MockMatcher.cfh
incubator/lucy/trunk/core/LucyX/Search/ProximityQuery.c
incubator/lucy/trunk/core/LucyX/Search/ProximityQuery.cfh
incubator/lucy/trunk/core/LucyX/Search/ProximityScorer.c
incubator/lucy/trunk/core/LucyX/Search/ProximityScorer.cfh
incubator/lucy/trunk/perl/lib/KinoSearch.pod
incubator/lucy/trunk/perl/lib/LucyX/Index/ByteBufDocReader.pm
incubator/lucy/trunk/perl/lib/LucyX/Index/ByteBufDocWriter.pm
incubator/lucy/trunk/perl/lib/LucyX/Index/LongFieldSim.pm
incubator/lucy/trunk/perl/lib/LucyX/Index/ZlibDocReader.pm
incubator/lucy/trunk/perl/lib/LucyX/Index/ZlibDocWriter.pm
incubator/lucy/trunk/perl/lib/LucyX/Remote/SearchClient.pm
incubator/lucy/trunk/perl/lib/LucyX/Remote/SearchServer.pm
incubator/lucy/trunk/perl/lib/LucyX/Search/Filter.pm
incubator/lucy/trunk/perl/lib/LucyX/Search/MockScorer.pm
incubator/lucy/trunk/perl/lib/LucyX/Search/ProximityQuery.pm
incubator/lucy/trunk/perl/lib/LucyX/Simple.pm
incubator/lucy/trunk/perl/t/002-kinosearch.t
incubator/lucy/trunk/perl/t/219-byte_buf_doc.t
incubator/lucy/trunk/perl/t/220-zlib_doc.t
incubator/lucy/trunk/perl/t/308-simple.t
incubator/lucy/trunk/perl/t/504-similarity.t
incubator/lucy/trunk/perl/t/506-collector.t
incubator/lucy/trunk/perl/t/507-filter.t
incubator/lucy/trunk/perl/t/510-remote_search.t
incubator/lucy/trunk/perl/t/513-matcher.t
incubator/lucy/trunk/perl/t/514-and_scorer.t
incubator/lucy/trunk/perl/t/518-or_scorer.t
incubator/lucy/trunk/perl/t/519-req_opt_scorer.t
incubator/lucy/trunk/perl/t/526-not_query.t
incubator/lucy/trunk/perl/t/532-sort_collector.t
incubator/lucy/trunk/perl/t/613-proximityquery.t
incubator/lucy/trunk/perl/t/binding/506-collector.t
Modified: incubator/lucy/trunk/core/KinoSearch/Search/PolySearcher.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/KinoSearch/Search/PolySearcher.cfh?rev=1030327&r1=1030326&r2=1030327&view=diff
==============================================================================
--- incubator/lucy/trunk/core/KinoSearch/Search/PolySearcher.cfh (original)
+++ incubator/lucy/trunk/core/KinoSearch/Search/PolySearcher.cfh Wed Nov 3 04:02:10 2010
@@ -20,7 +20,7 @@ parcel KinoSearch cnick Kino;
*
* The primary use for PolySearcher is to aggregate results from several
* remote L<Searchers|KinoSearch::Search::Searcher> via
- * L<KSx::Remote::SearchClient>, diffusing the cost of searching a large
+ * L<LucyX::Remote::SearchClient>, diffusing the cost of searching a large
* corpus over multiple machines. It is also possible to aggregate results
* from multiple Searchers on a single machine.
*/
Modified: incubator/lucy/trunk/core/LucyX/Search/FilterScorer.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/LucyX/Search/FilterScorer.c?rev=1030327&r1=1029513&r2=1030327&view=diff
==============================================================================
--- incubator/lucy/trunk/core/LucyX/Search/FilterScorer.c (original)
+++ incubator/lucy/trunk/core/LucyX/Search/FilterScorer.c Wed Nov 3 04:02:10 2010
@@ -17,7 +17,7 @@
#define C_KINO_FILTERSCORER
#include "KinoSearch/Util/ToolSet.h"
-#include "KSx/Search/FilterScorer.h"
+#include "LucyX/Search/FilterScorer.h"
FilterScorer*
FilterScorer_new(BitVector *bits, int32_t doc_max)
Modified: incubator/lucy/trunk/core/LucyX/Search/FilterScorer.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/LucyX/Search/FilterScorer.cfh?rev=1030327&r1=1029513&r2=1030327&view=diff
==============================================================================
--- incubator/lucy/trunk/core/LucyX/Search/FilterScorer.cfh (original)
+++ incubator/lucy/trunk/core/LucyX/Search/FilterScorer.cfh Wed Nov 3 04:02:10 2010
@@ -16,7 +16,7 @@
parcel KinoSearch cnick Kino;
-class KSx::Search::FilterScorer inherits KinoSearch::Search::Matcher {
+class LucyX::Search::FilterScorer inherits KinoSearch::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=1030327&r1=1029513&r2=1030327&view=diff
==============================================================================
--- incubator/lucy/trunk/core/LucyX/Search/MockMatcher.c (original)
+++ incubator/lucy/trunk/core/LucyX/Search/MockMatcher.c Wed Nov 3 04:02:10 2010
@@ -17,7 +17,7 @@
#define C_KINO_MOCKMATCHER
#include "KinoSearch/Util/ToolSet.h"
-#include "KSx/Search/MockMatcher.h"
+#include "LucyX/Search/MockMatcher.h"
MockMatcher*
MockMatcher_new(I32Array *doc_ids, ByteBuf *scores)
Modified: incubator/lucy/trunk/core/LucyX/Search/MockMatcher.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/LucyX/Search/MockMatcher.cfh?rev=1030327&r1=1029513&r2=1030327&view=diff
==============================================================================
--- incubator/lucy/trunk/core/LucyX/Search/MockMatcher.cfh (original)
+++ incubator/lucy/trunk/core/LucyX/Search/MockMatcher.cfh Wed Nov 3 04:02:10 2010
@@ -16,7 +16,7 @@
parcel KinoSearch cnick Kino;
-class KSx::Search::MockMatcher inherits KinoSearch::Search::Matcher {
+class LucyX::Search::MockMatcher inherits KinoSearch::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=1030327&r1=1029513&r2=1030327&view=diff
==============================================================================
--- incubator/lucy/trunk/core/LucyX/Search/ProximityQuery.c (original)
+++ incubator/lucy/trunk/core/LucyX/Search/ProximityQuery.c Wed Nov 3 04:02:10 2010
@@ -20,7 +20,7 @@
#include "KinoSearch/Util/ToolSet.h"
-#include "KSx/Search/ProximityQuery.h"
+#include "LucyX/Search/ProximityQuery.h"
#include "KinoSearch/Index/DocVector.h"
#include "KinoSearch/Index/Posting.h"
#include "KinoSearch/Index/Posting/ScorePosting.h"
@@ -31,7 +31,7 @@
#include "KinoSearch/Index/Similarity.h"
#include "KinoSearch/Index/TermVector.h"
#include "KinoSearch/Plan/Schema.h"
-#include "KSx/Search/ProximityScorer.h"
+#include "LucyX/Search/ProximityScorer.h"
#include "KinoSearch/Search/Searcher.h"
#include "KinoSearch/Search/Span.h"
#include "KinoSearch/Search/TermQuery.h"
Modified: incubator/lucy/trunk/core/LucyX/Search/ProximityQuery.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/LucyX/Search/ProximityQuery.cfh?rev=1030327&r1=1029513&r2=1030327&view=diff
==============================================================================
--- incubator/lucy/trunk/core/LucyX/Search/ProximityQuery.cfh (original)
+++ incubator/lucy/trunk/core/LucyX/Search/ProximityQuery.cfh Wed Nov 3 04:02:10 2010
@@ -22,7 +22,7 @@ parcel KinoSearch cnick Kino;
* against an ordered sequence of terms.
*/
-class KSx::Search::ProximityQuery inherits KinoSearch::Search::Query
+class LucyX::Search::ProximityQuery inherits KinoSearch::Search::Query
: dumpable {
CharBuf *field;
@@ -73,7 +73,7 @@ class KSx::Search::ProximityQuery inheri
Destroy(ProximityQuery *self);
}
-class KSx::Search::ProximityCompiler
+class LucyX::Search::ProximityCompiler
inherits KinoSearch::Search::Compiler {
float idf;
Modified: incubator/lucy/trunk/core/LucyX/Search/ProximityScorer.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/LucyX/Search/ProximityScorer.c?rev=1030327&r1=1029513&r2=1030327&view=diff
==============================================================================
--- incubator/lucy/trunk/core/LucyX/Search/ProximityScorer.c (original)
+++ incubator/lucy/trunk/core/LucyX/Search/ProximityScorer.c Wed Nov 3 04:02:10 2010
@@ -19,7 +19,7 @@
#define C_KINO_SCOREPOSTING
#include "KinoSearch/Util/ToolSet.h"
-#include "KSx/Search/ProximityScorer.h"
+#include "LucyX/Search/ProximityScorer.h"
#include "KinoSearch/Index/Posting/ScorePosting.h"
#include "KinoSearch/Index/PostingList.h"
#include "KinoSearch/Index/Similarity.h"
Modified: incubator/lucy/trunk/core/LucyX/Search/ProximityScorer.cfh
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/core/LucyX/Search/ProximityScorer.cfh?rev=1030327&r1=1029513&r2=1030327&view=diff
==============================================================================
--- incubator/lucy/trunk/core/LucyX/Search/ProximityScorer.cfh (original)
+++ incubator/lucy/trunk/core/LucyX/Search/ProximityScorer.cfh Wed Nov 3 04:02:10 2010
@@ -19,7 +19,7 @@ parcel KinoSearch cnick Kino;
/** Matcher for a ProximityQuery.
*/
-class KSx::Search::ProximityScorer inherits KinoSearch::Search::Matcher {
+class LucyX::Search::ProximityScorer inherits KinoSearch::Search::Matcher {
int32_t doc_id;
uint32_t num_elements;
Modified: incubator/lucy/trunk/perl/lib/KinoSearch.pod
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/lib/KinoSearch.pod?rev=1030327&r1=1030326&r2=1030327&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/lib/KinoSearch.pod (original)
+++ incubator/lucy/trunk/perl/lib/KinoSearch.pod Wed Nov 3 04:02:10 2010
@@ -134,7 +134,7 @@ Stoplists.
=head2 Getting Started
-L<KSx::Simple> provides a stripped down API which may suffice for many
+L<LucyX::Simple> provides a stripped down API which may suffice for many
tasks.
L<KinoSearch::Docs::Tutorial> demonstrates how to build a basic CGI search
@@ -255,8 +255,8 @@ L<MatchAllQuery|KinoSearch::Search::Matc
L<NoMatchQuery|KinoSearch::Search::NoMatchQuery>, plus
L<KinoSearch::Search::QueryParser>.
-For distributed searching, see L<KSx::Remote::SearchServer>,
-L<KSx::Remote::SearchClient>, and L<KinoSearch::Search::PolySearcher>.
+For distributed searching, see L<LucyX::Remote::SearchServer>,
+L<LucyX::Remote::SearchClient>, and L<KinoSearch::Search::PolySearcher>.
=head2 Backwards Compatibility Policy
Modified: incubator/lucy/trunk/perl/lib/LucyX/Index/ByteBufDocReader.pm
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/lib/LucyX/Index/ByteBufDocReader.pm?rev=1030327&r1=1030326&r2=1030327&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/lib/LucyX/Index/ByteBufDocReader.pm (original)
+++ incubator/lucy/trunk/perl/lib/LucyX/Index/ByteBufDocReader.pm Wed Nov 3 04:02:10 2010
@@ -16,7 +16,7 @@
use strict;
use warnings;
-package KSx::Index::ByteBufDocReader;
+package LucyX::Index::ByteBufDocReader;
use base qw( KinoSearch::Index::DocReader );
use KinoSearch::Document::HitDoc;
use Carp;
Modified: incubator/lucy/trunk/perl/lib/LucyX/Index/ByteBufDocWriter.pm
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/lib/LucyX/Index/ByteBufDocWriter.pm?rev=1030327&r1=1030326&r2=1030327&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/lib/LucyX/Index/ByteBufDocWriter.pm (original)
+++ incubator/lucy/trunk/perl/lib/LucyX/Index/ByteBufDocWriter.pm Wed Nov 3 04:02:10 2010
@@ -16,7 +16,7 @@
use strict;
use warnings;
-package KSx::Index::ByteBufDocWriter;
+package LucyX::Index::ByteBufDocWriter;
use base qw( KinoSearch::Index::DataWriter );
use Carp;
use Scalar::Util qw( blessed );
@@ -80,7 +80,7 @@ sub add_segment {
my $doc_reader = $seg_reader->obtain("KinoSearch::Index::DocReader");
confess("Not a ByteBufDocReader")
unless ( blessed($doc_reader)
- and $doc_reader->isa("KSx::Index::ByteBufDocReader") );
+ and $doc_reader->isa("LucyX::Index::ByteBufDocReader") );
for ( my $i = 1; $i <= $doc_max; $i++ ) {
next unless $doc_map->get($i);
Modified: incubator/lucy/trunk/perl/lib/LucyX/Index/LongFieldSim.pm
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/lib/LucyX/Index/LongFieldSim.pm?rev=1030327&r1=1030326&r2=1030327&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/lib/LucyX/Index/LongFieldSim.pm (original)
+++ incubator/lucy/trunk/perl/lib/LucyX/Index/LongFieldSim.pm Wed Nov 3 04:02:10 2010
@@ -16,7 +16,7 @@
use strict;
use warnings;
-package KSx::Index::LongFieldSim;
+package LucyX::Index::LongFieldSim;
use base qw( KinoSearch::Index::Similarity );
sub length_norm {
Modified: incubator/lucy/trunk/perl/lib/LucyX/Index/ZlibDocReader.pm
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/lib/LucyX/Index/ZlibDocReader.pm?rev=1030327&r1=1030326&r2=1030327&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/lib/LucyX/Index/ZlibDocReader.pm (original)
+++ incubator/lucy/trunk/perl/lib/LucyX/Index/ZlibDocReader.pm Wed Nov 3 04:02:10 2010
@@ -16,7 +16,7 @@
use strict;
use warnings;
-package KSx::Index::ZlibDocReader;
+package LucyX::Index::ZlibDocReader;
use base qw( KinoSearch::Index::DocReader );
use KinoSearch::Util::StringHelper qw( utf8_valid utf8_flag_on );
use Compress::Zlib qw( uncompress );
Modified: incubator/lucy/trunk/perl/lib/LucyX/Index/ZlibDocWriter.pm
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/lib/LucyX/Index/ZlibDocWriter.pm?rev=1030327&r1=1030326&r2=1030327&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/lib/LucyX/Index/ZlibDocWriter.pm (original)
+++ incubator/lucy/trunk/perl/lib/LucyX/Index/ZlibDocWriter.pm Wed Nov 3 04:02:10 2010
@@ -15,7 +15,7 @@
use strict;
-package KSx::Index::ZlibDocWriter;
+package LucyX::Index::ZlibDocWriter;
use base qw( KinoSearch::Index::DataWriter );
use Carp;
use Scalar::Util qw( blessed );
@@ -95,7 +95,7 @@ sub add_segment {
my $doc_reader = $seg_reader->obtain("KinoSearch::Index::DocReader");
confess("Not a ZlibDocReader")
unless ( blessed($doc_reader)
- and $doc_reader->isa("KSx::Index::ZlibDocReader") );
+ and $doc_reader->isa("LucyX::Index::ZlibDocReader") );
for ( my $i = 1; $i <= $doc_max; $i++ ) {
next unless $doc_map->get($i);
Modified: incubator/lucy/trunk/perl/lib/LucyX/Remote/SearchClient.pm
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/lib/LucyX/Remote/SearchClient.pm?rev=1030327&r1=1030326&r2=1030327&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/lib/LucyX/Remote/SearchClient.pm (original)
+++ incubator/lucy/trunk/perl/lib/LucyX/Remote/SearchClient.pm Wed Nov 3 04:02:10 2010
@@ -16,7 +16,7 @@
use strict;
use warnings;
-package KSx::Remote::SearchClient;
+package LucyX::Remote::SearchClient;
BEGIN { our @ISA = qw( KinoSearch::Search::Searcher ) }
use Carp;
use Storable qw( nfreeze thaw );
Modified: incubator/lucy/trunk/perl/lib/LucyX/Remote/SearchServer.pm
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/lib/LucyX/Remote/SearchServer.pm?rev=1030327&r1=1030326&r2=1030327&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/lib/LucyX/Remote/SearchServer.pm (original)
+++ incubator/lucy/trunk/perl/lib/LucyX/Remote/SearchServer.pm Wed Nov 3 04:02:10 2010
@@ -16,7 +16,7 @@
use strict;
use warnings;
-package KSx::Remote::SearchServer;
+package LucyX::Remote::SearchServer;
BEGIN { our @ISA = qw( KinoSearch::Object::Obj ) }
use Carp;
use Storable qw( nfreeze thaw );
Modified: incubator/lucy/trunk/perl/lib/LucyX/Search/Filter.pm
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/lib/LucyX/Search/Filter.pm?rev=1030327&r1=1030326&r2=1030327&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/lib/LucyX/Search/Filter.pm (original)
+++ incubator/lucy/trunk/perl/lib/LucyX/Search/Filter.pm Wed Nov 3 04:02:10 2010
@@ -16,7 +16,7 @@
use strict;
use warnings;
-package KSx::Search::Filter;
+package LucyX::Search::Filter;
BEGIN { our @ISA = qw( KinoSearch::Search::Query ) }
use Carp;
use Storable qw( nfreeze thaw );
@@ -50,7 +50,7 @@ sub DESTROY {
sub make_compiler {
my $self = shift;
- return KSx::Search::FilterCompiler->new( @_, parent => $self );
+ return LucyX::Search::FilterCompiler->new( @_, parent => $self );
}
sub serialize {
@@ -160,7 +160,7 @@ sub _cached_count {
keys %{ $cached_bits{$$self} };
}
-package KSx::Search::FilterCompiler;
+package LucyX::Search::FilterCompiler;
BEGIN { our @ISA = qw( KinoSearch::Search::Compiler ) }
sub new {
@@ -173,13 +173,13 @@ sub make_matcher {
my ( $self, %args ) = @_;
my $seg_reader = $args{reader};
my $bits = $self->get_parent->_bits($seg_reader);
- return KSx::Search::FilterScorer->new(
+ return LucyX::Search::FilterScorer->new(
bits => $bits,
doc_max => $seg_reader->doc_max,
);
}
-package KSx::Search::FilterScorer;
+package LucyX::Search::FilterScorer;
BEGIN { our @ISA = qw( KinoSearch::Search::Matcher ) }
1;
@@ -190,7 +190,7 @@ __BINDING__
Clownfish::Binding::Perl::Class->register(
parcel => "KinoSearch",
- class_name => "KSx::Search::FilterScorer",
+ class_name => "LucyX::Search::FilterScorer",
bind_constructors => ["new"],
);
Modified: incubator/lucy/trunk/perl/lib/LucyX/Search/MockScorer.pm
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/lib/LucyX/Search/MockScorer.pm?rev=1030327&r1=1030326&r2=1030327&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/lib/LucyX/Search/MockScorer.pm (original)
+++ incubator/lucy/trunk/perl/lib/LucyX/Search/MockScorer.pm Wed Nov 3 04:02:10 2010
@@ -17,8 +17,8 @@ use strict;
use warnings;
use KinoSearch;
-package KSx::Search::MockScorer;
-BEGIN { our @ISA = qw( KSx::Search::MockMatcher ) }
+package LucyX::Search::MockScorer;
+BEGIN { our @ISA = qw( LucyX::Search::MockMatcher ) }
sub new {
my ( $either, %args ) = @_;
@@ -47,7 +47,7 @@ __BINDING__
Clownfish::Binding::Perl::Class->register(
parcel => "KinoSearch",
- class_name => "KSx::Search::MockMatcher",
+ class_name => "LucyX::Search::MockMatcher",
bind_constructors => ["_new|init"],
);
Modified: incubator/lucy/trunk/perl/lib/LucyX/Search/ProximityQuery.pm
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/lib/LucyX/Search/ProximityQuery.pm?rev=1030327&r1=1030326&r2=1030327&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/lib/LucyX/Search/ProximityQuery.pm (original)
+++ incubator/lucy/trunk/perl/lib/LucyX/Search/ProximityQuery.pm Wed Nov 3 04:02:10 2010
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-package KSx::Search::ProximityQuery;
+package LucyX::Search::ProximityQuery;
use KinoSearch;
1;
@@ -33,7 +33,7 @@ END_SYNOPSIS
Clownfish::Binding::Perl::Class->register(
parcel => "KinoSearch",
- class_name => "KSx::Search::ProximityQuery",
+ class_name => "LucyX::Search::ProximityQuery",
bind_methods => [qw( Get_Field Get_Terms )],
bind_constructors => ["new"],
make_pod => {
@@ -44,7 +44,7 @@ Clownfish::Binding::Perl::Class->registe
);
Clownfish::Binding::Perl::Class->register(
parcel => "KinoSearch",
- class_name => "KSx::Search::ProximityCompiler",
+ class_name => "LucyX::Search::ProximityCompiler",
bind_constructors => ["do_new"],
);
Modified: incubator/lucy/trunk/perl/lib/LucyX/Simple.pm
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/lib/LucyX/Simple.pm?rev=1030327&r1=1030326&r2=1030327&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/lib/LucyX/Simple.pm (original)
+++ incubator/lucy/trunk/perl/lib/LucyX/Simple.pm Wed Nov 3 04:02:10 2010
@@ -16,7 +16,7 @@
use strict;
use warnings;
-package KSx::Simple;
+package LucyX::Simple;
use Carp;
use Scalar::Util qw( weaken reftype refaddr );
Modified: incubator/lucy/trunk/perl/t/002-kinosearch.t
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/t/002-kinosearch.t?rev=1030327&r1=1030326&r2=1030327&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/t/002-kinosearch.t (original)
+++ incubator/lucy/trunk/perl/t/002-kinosearch.t Wed Nov 3 04:02:10 2010
@@ -47,7 +47,7 @@ plan( tests => scalar @modules );
for (@modules) {
s/^.*?KinoSearch/KinoSearch/;
- s/^.*?KSx/KSx/;
+ s/^.*?LucyX/LucyX/;
s/\.pm$//;
s/\W+/::/g;
if ( $excluded{$_} ) {
Modified: incubator/lucy/trunk/perl/t/219-byte_buf_doc.t
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/t/219-byte_buf_doc.t?rev=1030327&r1=1030326&r2=1030327&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/t/219-byte_buf_doc.t (original)
+++ incubator/lucy/trunk/perl/t/219-byte_buf_doc.t Wed Nov 3 04:02:10 2010
@@ -19,12 +19,12 @@ use warnings;
package MyArchitecture;
use base qw( KinoSearch::Plan::Architecture );
-use KSx::Index::ByteBufDocWriter;
-use KSx::Index::ByteBufDocReader;
+use LucyX::Index::ByteBufDocWriter;
+use LucyX::Index::ByteBufDocReader;
sub register_doc_writer {
my ( $self, $seg_writer ) = @_;
- my $doc_writer = KSx::Index::ByteBufDocWriter->new(
+ my $doc_writer = LucyX::Index::ByteBufDocWriter->new(
width => 1,
field => 'value',
schema => $seg_writer->get_schema,
@@ -41,7 +41,7 @@ sub register_doc_writer {
sub register_doc_reader {
my ( $self, $seg_reader ) = @_;
- my $doc_reader = KSx::Index::ByteBufDocReader->new(
+ my $doc_reader = LucyX::Index::ByteBufDocReader->new(
width => 1,
field => 'value',
schema => $seg_reader->get_schema,
Modified: incubator/lucy/trunk/perl/t/220-zlib_doc.t
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/t/220-zlib_doc.t?rev=1030327&r1=1030326&r2=1030327&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/t/220-zlib_doc.t (original)
+++ incubator/lucy/trunk/perl/t/220-zlib_doc.t Wed Nov 3 04:02:10 2010
@@ -19,12 +19,12 @@ use warnings;
package MyArchitecture;
use base qw( KinoSearch::Plan::Architecture );
-use KSx::Index::ZlibDocWriter;
-use KSx::Index::ZlibDocReader;
+use LucyX::Index::ZlibDocWriter;
+use LucyX::Index::ZlibDocReader;
sub register_doc_writer {
my ( $self, $seg_writer ) = @_;
- my $doc_writer = KSx::Index::ZlibDocWriter->new(
+ my $doc_writer = LucyX::Index::ZlibDocWriter->new(
schema => $seg_writer->get_schema,
snapshot => $seg_writer->get_snapshot,
segment => $seg_writer->get_segment,
@@ -39,7 +39,7 @@ sub register_doc_writer {
sub register_doc_reader {
my ( $self, $seg_reader ) = @_;
- my $doc_reader = KSx::Index::ZlibDocReader->new(
+ my $doc_reader = LucyX::Index::ZlibDocReader->new(
schema => $seg_reader->get_schema,
folder => $seg_reader->get_folder,
segments => $seg_reader->get_segments,
Modified: incubator/lucy/trunk/perl/t/308-simple.t
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/t/308-simple.t?rev=1030327&r1=1030326&r2=1030327&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/t/308-simple.t (original)
+++ incubator/lucy/trunk/perl/t/308-simple.t Wed Nov 3 04:02:10 2010
@@ -18,12 +18,12 @@ use warnings;
use lib 'buildlib';
use Test::More tests => 8;
-use KSx::Simple;
+use LucyX::Simple;
use KinoSearch::Test::TestUtils qw( init_test_index_loc );
my $test_index_loc = init_test_index_loc();
-my $index = KSx::Simple->new(
+my $index = LucyX::Simple->new(
language => 'en',
path => $test_index_loc,
);
@@ -36,7 +36,7 @@ is( $index->search( query => 'creamed' )
$index->add_doc( { food => 'creamed broccoli' } );
undef $index;
-$index = KSx::Simple->new(
+$index = LucyX::Simple->new(
language => 'en',
path => $test_index_loc,
);
@@ -62,7 +62,7 @@ SKIP: {
my $pid = fork();
if ( $pid == 0 ) { # child
our # This *has* to be 'our' for the test to work
- $index = KSx::Simple->new(
+ $index = LucyX::Simple->new(
language => 'en',
path => $test_index_loc,
);
@@ -74,7 +74,7 @@ SKIP: {
waitpid( $pid, 0 );
}
- my $index = KSx::Simple->new(
+ my $index = LucyX::Simple->new(
language => 'en',
path => $test_index_loc,
);
Modified: incubator/lucy/trunk/perl/t/504-similarity.t
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/t/504-similarity.t?rev=1030327&r1=1030326&r2=1030327&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/t/504-similarity.t (original)
+++ incubator/lucy/trunk/perl/t/504-similarity.t Wed Nov 3 04:02:10 2010
@@ -18,9 +18,9 @@ use warnings;
package MySchema::LongTextField;
use base qw( KinoSearch::Plan::FullTextType );
-use KSx::Index::LongFieldSim;
+use LucyX::Index::LongFieldSim;
-sub make_similarity { KSx::Index::LongFieldSim->new }
+sub make_similarity { LucyX::Index::LongFieldSim->new }
package MySchema;
use base qw( KinoSearch::Plan::Schema );
Modified: incubator/lucy/trunk/perl/t/506-collector.t
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/t/506-collector.t?rev=1030327&r1=1030326&r2=1030327&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/t/506-collector.t (original)
+++ incubator/lucy/trunk/perl/t/506-collector.t Wed Nov 3 04:02:10 2010
@@ -18,7 +18,7 @@ use warnings;
use Test::More tests => 5;
use KinoSearch::Test;
-use KSx::Search::MockScorer;
+use LucyX::Search::MockScorer;
my @docs = ( 1, 5, 10, 1000 );
my @scores = ( 2, 0, 0, 1 );
@@ -59,7 +59,7 @@ is_deeply( $bit_vec->to_arrayref, [ 11,
sub test_collect {
my $collector = shift;
- my $matcher = KSx::Search::MockScorer->new(
+ my $matcher = LucyX::Search::MockScorer->new(
doc_ids => \@docs,
scores => \@scores,
);
Modified: incubator/lucy/trunk/perl/t/507-filter.t
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/t/507-filter.t?rev=1030327&r1=1030326&r2=1030327&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/t/507-filter.t (original)
+++ incubator/lucy/trunk/perl/t/507-filter.t Wed Nov 3 04:02:10 2010
@@ -21,7 +21,7 @@ use Test::More tests => 24;
use Storable qw( nfreeze thaw );
use KinoSearch::Test;
use KinoSearch::Test::TestUtils qw( create_index );
-use KSx::Search::Filter;
+use LucyX::Search::Filter;
my $query_parser = KinoSearch::Search::QueryParser->new(
schema => KinoSearch::Test::TestSchema->new );
@@ -44,8 +44,8 @@ my ( $filter_1, $filter_2 );
field => 'content',
term => 'a',
);
- $filter_1 = KSx::Search::Filter->new( query => $only_a_query );
- $filter_2 = KSx::Search::Filter->new( query => $only_a_query );
+ $filter_1 = LucyX::Search::Filter->new( query => $only_a_query );
+ $filter_2 = LucyX::Search::Filter->new( query => $only_a_query );
## Test index 1, filter 1.
my $hits = $searcher_1->hits( query => filt_query( $filter_1, 'x y z' ) );
Modified: incubator/lucy/trunk/perl/t/510-remote_search.t
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/t/510-remote_search.t?rev=1030327&r1=1030326&r2=1030327&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/t/510-remote_search.t (original)
+++ incubator/lucy/trunk/perl/t/510-remote_search.t Wed Nov 3 04:02:10 2010
@@ -47,8 +47,8 @@ sub new {
package main;
use KinoSearch::Test;
-use KSx::Remote::SearchServer;
-use KSx::Remote::SearchClient;
+use LucyX::Remote::SearchServer;
+use LucyX::Remote::SearchClient;
my $kid;
$kid = fork;
@@ -70,7 +70,7 @@ else {
$indexer->commit;
my $searcher = KinoSearch::Search::IndexSearcher->new( index => $folder );
- my $server = KSx::Remote::SearchServer->new(
+ my $server = LucyX::Remote::SearchServer->new(
port => $PORT_NUM,
searcher => $searcher,
password => 'foo',
@@ -91,7 +91,7 @@ else {
plan( 'skip_all', "Can't get a socket: $!" );
}
-my $searchclient = KSx::Remote::SearchClient->new(
+my $searchclient = LucyX::Remote::SearchClient->new(
schema => SortSchema->new,
peer_address => "localhost:$PORT_NUM",
password => 'foo',
Modified: incubator/lucy/trunk/perl/t/513-matcher.t
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/t/513-matcher.t?rev=1030327&r1=1030326&r2=1030327&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/t/513-matcher.t (original)
+++ incubator/lucy/trunk/perl/t/513-matcher.t Wed Nov 3 04:02:10 2010
@@ -24,7 +24,7 @@ package main;
use Test::More tests => 22;
-use KSx::Search::MockScorer;
+use LucyX::Search::MockScorer;
use KinoSearch::Test;
my $matcher = MyMatcher->new;
@@ -101,7 +101,7 @@ sub test_search {
my $dels = delete $args{dels} || [];
my $del_enum;
- my $matcher = KSx::Search::MockScorer->new(
+ my $matcher = LucyX::Search::MockScorer->new(
doc_ids => $docs,
scores => [ (0) x scalar @$docs ],
);
Modified: incubator/lucy/trunk/perl/t/514-and_scorer.t
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/t/514-and_scorer.t?rev=1030327&r1=1030326&r2=1030327&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/t/514-and_scorer.t (original)
+++ incubator/lucy/trunk/perl/t/514-and_scorer.t Wed Nov 3 04:02:10 2010
@@ -19,7 +19,7 @@ use lib 'buildlib';
use Test::More tests => 1362;
use KinoSearch::Test;
-use KSx::Search::MockScorer;
+use LucyX::Search::MockScorer;
use KinoSearch::Test::TestUtils qw( modulo_set doc_ids_from_td_coll );
my $sim = KinoSearch::Index::Similarity->new;
@@ -39,7 +39,7 @@ sub check_scorer {
my @intervals = @_;
my @doc_id_arrays = map { modulo_set( $_, 100 ) } @intervals;
my @children = map {
- KSx::Search::MockScorer->new(
+ LucyX::Search::MockScorer->new(
doc_ids => $_,
scores => [ (0) x scalar @$_ ],
)
Modified: incubator/lucy/trunk/perl/t/518-or_scorer.t
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/t/518-or_scorer.t?rev=1030327&r1=1030326&r2=1030327&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/t/518-or_scorer.t (original)
+++ incubator/lucy/trunk/perl/t/518-or_scorer.t Wed Nov 3 04:02:10 2010
@@ -19,7 +19,7 @@ use lib 'buildlib';
use Test::More tests => 900;
use KinoSearch::Test;
-use KSx::Search::MockScorer;
+use LucyX::Search::MockScorer;
use KinoSearch::Test::TestUtils qw( modulo_set doc_ids_from_td_coll );
my $sim = KinoSearch::Index::Similarity->new;
@@ -40,7 +40,7 @@ sub check_scorer {
my $subscorers
= KinoSearch::Object::VArray->new( capacity => scalar @intervals );
for my $doc_id_array (@doc_id_arrays) {
- my $mock = KSx::Search::MockScorer->new(
+ my $mock = LucyX::Search::MockScorer->new(
doc_ids => $doc_id_array,
scores => [ (1) x scalar @$doc_id_array ],
);
Modified: incubator/lucy/trunk/perl/t/519-req_opt_scorer.t
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/t/519-req_opt_scorer.t?rev=1030327&r1=1030326&r2=1030327&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/t/519-req_opt_scorer.t (original)
+++ incubator/lucy/trunk/perl/t/519-req_opt_scorer.t Wed Nov 3 04:02:10 2010
@@ -19,7 +19,7 @@ use lib 'buildlib';
use Test::More tests => 726;
use KinoSearch::Test;
-use KSx::Search::MockScorer;
+use LucyX::Search::MockScorer;
use KinoSearch::Test::TestUtils qw( modulo_set doc_ids_from_td_coll );
my $sim = KinoSearch::Index::Similarity->new;
@@ -35,11 +35,11 @@ sub check_scorer {
my ( $req_interval, $opt_interval ) = @_;
my $req_docs = modulo_set( $req_interval, 100 );
my $opt_docs = modulo_set( $opt_interval, 100 );
- my $req_mock = KSx::Search::MockScorer->new(
+ my $req_mock = LucyX::Search::MockScorer->new(
doc_ids => $req_docs,
scores => [ (1) x scalar @$req_docs ],
);
- my $opt_mock = KSx::Search::MockScorer->new(
+ my $opt_mock = LucyX::Search::MockScorer->new(
doc_ids => $opt_docs,
scores => [ (1) x scalar @$opt_docs ],
);
Modified: incubator/lucy/trunk/perl/t/526-not_query.t
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/t/526-not_query.t?rev=1030327&r1=1030326&r2=1030327&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/t/526-not_query.t (original)
+++ incubator/lucy/trunk/perl/t/526-not_query.t Wed Nov 3 04:02:10 2010
@@ -20,7 +20,7 @@ use lib 'buildlib';
use Test::More tests => 61;
use Storable qw( freeze thaw );
use KinoSearch::Test::TestUtils qw( create_index );
-use KSx::Search::MockScorer;
+use LucyX::Search::MockScorer;
my @got;
@@ -76,7 +76,7 @@ for my $num_negated ( 1 .. 26 ) {
push @mock_ids, splice( @source_ids, $tick, 1 );
}
@mock_ids = sort { $a <=> $b } @mock_ids;
- my $mock_scorer = KSx::Search::MockScorer->new(
+ my $mock_scorer = LucyX::Search::MockScorer->new(
doc_ids => \@mock_ids,
scores => [ (1) x scalar @mock_ids ],
);
Modified: incubator/lucy/trunk/perl/t/532-sort_collector.t
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/t/532-sort_collector.t?rev=1030327&r1=1030326&r2=1030327&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/t/532-sort_collector.t (original)
+++ incubator/lucy/trunk/perl/t/532-sort_collector.t Wed Nov 3 04:02:10 2010
@@ -19,7 +19,7 @@ use warnings;
use Test::More tests => 32;
use KinoSearch::Test;
use List::Util qw( shuffle );
-use KSx::Search::MockScorer;
+use LucyX::Search::MockScorer;
my $schema = KinoSearch::Plan::Schema->new;
my $type = KinoSearch::Plan::StringType->new( sortable => 1 );
@@ -90,7 +90,7 @@ my @doc_ids = map { $_->[0] } @docs_and_
my @scores = map { $_->[1] } @docs_and_scores;
for my $size ( 0 .. @doc_ids ) {
- my $matcher = KSx::Search::MockScorer->new(
+ my $matcher = LucyX::Search::MockScorer->new(
doc_ids => \@doc_ids,
scores => \@scores,
);
Modified: incubator/lucy/trunk/perl/t/613-proximityquery.t
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/t/613-proximityquery.t?rev=1030327&r1=1030326&r2=1030327&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/t/613-proximityquery.t (original)
+++ incubator/lucy/trunk/perl/t/613-proximityquery.t Wed Nov 3 04:02:10 2010
@@ -21,7 +21,7 @@ use Test::More tests => 11;
use Storable qw( freeze thaw );
use KinoSearch::Test;
use KinoSearch::Test::TestUtils qw( create_index );
-use KSx::Search::ProximityQuery;
+use LucyX::Search::ProximityQuery;
# this is better than 'x a b c d a b c d' because its
# posting weight is higher, presumably because
@@ -39,14 +39,14 @@ my @docs = (
my $folder = create_index(@docs);
my $searcher = KinoSearch::Search::IndexSearcher->new( index => $folder );
-my $proximity_query = KSx::Search::ProximityQuery->new(
+my $proximity_query = LucyX::Search::ProximityQuery->new(
field => 'content',
terms => [],
within => 10,
);
is( $proximity_query->to_string, 'content:""~10',
"empty ProximityQuery to_string" );
-$proximity_query = KSx::Search::ProximityQuery->new(
+$proximity_query = LucyX::Search::ProximityQuery->new(
field => 'content',
terms => [qw( d a )],
within => 10,
@@ -65,7 +65,7 @@ ok( $first_hit->get_score > $second_hit-
. $second_hit->get_score
);
-$proximity_query = KSx::Search::ProximityQuery->new(
+$proximity_query = LucyX::Search::ProximityQuery->new(
field => 'content',
terms => [qw( c a )],
within => 10,
@@ -73,7 +73,7 @@ $proximity_query = KSx::Search::Proximit
$hits = $searcher->hits( query => $proximity_query );
is( $hits->total_hits, 3, 'avoid underflow when subtracting offset' );
-$proximity_query = KSx::Search::ProximityQuery->new(
+$proximity_query = LucyX::Search::ProximityQuery->new(
field => 'content',
terms => [qw( b d )],
within => 10,
@@ -92,14 +92,14 @@ $frozen = freeze($proximity_compiler);
$thawed = thaw($frozen);
ok( $proximity_compiler->equals($thawed), "freeze/thaw compiler" );
-$proximity_query = KSx::Search::ProximityQuery->new(
+$proximity_query = LucyX::Search::ProximityQuery->new(
field => 'content',
terms => [qw( x d )],
within => 4,
);
$hits = $searcher->hits( query => $proximity_query );
is( $hits->total_hits, 2, 'within range is exclusive' );
-$proximity_query = KSx::Search::ProximityQuery->new(
+$proximity_query = LucyX::Search::ProximityQuery->new(
field => 'content',
terms => [qw( x d )],
within => 3,
Modified: incubator/lucy/trunk/perl/t/binding/506-collector.t
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/t/binding/506-collector.t?rev=1030327&r1=1030326&r2=1030327&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/t/binding/506-collector.t (original)
+++ incubator/lucy/trunk/perl/t/binding/506-collector.t Wed Nov 3 04:02:10 2010
@@ -46,10 +46,10 @@ package main;
use Test::More tests => 1;
use KinoSearch::Test;
-use KSx::Search::MockScorer;
+use LucyX::Search::MockScorer;
my $collector = EvensOnlyCollector->new;
-my $matcher = KSx::Search::MockScorer->new( doc_ids => [ 1, 5, 10, 1000 ], );
+my $matcher = LucyX::Search::MockScorer->new( doc_ids => [ 1, 5, 10, 1000 ], );
$collector->set_matcher($matcher);
while ( my $doc_id = $matcher->next ) {
$collector->collect($doc_id);