Mailing List Archive

Author: creamyg
Date: 2008-07-27 15:23:02 -0700 (Sun, 27 Jul 2008)
New Revision: 3642

Modified:
trunk/perl/lib/KinoSearch.pm
trunk/perl/lib/KinoSearch/Index/FilePurger.pm
trunk/perl/lib/KinoSearch/Index/IndexReader.pm
trunk/perl/lib/KinoSearch/InvIndex.pm
trunk/perl/lib/KinoSearch/InvIndexer.pm
trunk/perl/lib/KinoSearch/Store/CompoundFileReader.pm
trunk/perl/lib/KinoSearch/Store/CompoundFileWriter.pm
trunk/perl/lib/KinoSearch/Store/FSFileDes.pm
trunk/perl/lib/KinoSearch/Store/FSFolder.pm
trunk/perl/lib/KinoSearch/Store/FileDes.pm
trunk/perl/lib/KinoSearch/Store/Folder.pm
trunk/perl/lib/KinoSearch/Store/Lock.pm
trunk/perl/lib/KinoSearch/Store/LockFactory.pm
trunk/perl/lib/KinoSearch/Store/RAMFolder.pm
trunk/perl/lib/KinoSearch/Store/SharedLock.pm
Log:
Migrate all Perl code out of modules under KinoSearch::Store and into
KinoSearch.pm.


Modified: trunk/perl/lib/KinoSearch/Index/FilePurger.pm
===================================================================
--- trunk/perl/lib/KinoSearch/Index/FilePurger.pm 2008-07-27 21:53:36 UTC (rev 3641)
+++ trunk/perl/lib/KinoSearch/Index/FilePurger.pm 2008-07-27 22:23:02 UTC (rev 3642)
@@ -5,7 +5,6 @@
use KinoSearch::base qw( KinoSearch::Obj );

use KinoSearch::Index::Snapshot;
-use KinoSearch::Store::LockFactory;

sub try_delete_file {
my ( $self, $filename ) = @_;

Modified: trunk/perl/lib/KinoSearch/Index/IndexReader.pm
===================================================================
--- trunk/perl/lib/KinoSearch/Index/IndexReader.pm 2008-07-27 21:53:36 UTC (rev 3641)
+++ trunk/perl/lib/KinoSearch/Index/IndexReader.pm 2008-07-27 22:23:02 UTC (rev 3642)
@@ -18,7 +18,6 @@
use KinoSearch::Index::LexCache;
use KinoSearch::Util::IntMap;
use KinoSearch::Util::StringHelper qw( from_base36 );
-use KinoSearch::Store::Lock;

sub open {
my $temp = _new(@_);

Modified: trunk/perl/lib/KinoSearch/InvIndex.pm
===================================================================
--- trunk/perl/lib/KinoSearch/InvIndex.pm 2008-07-27 21:53:36 UTC (rev 3641)
+++ trunk/perl/lib/KinoSearch/InvIndex.pm 2008-07-27 22:23:02 UTC (rev 3642)
@@ -5,9 +5,7 @@
use KinoSearch::Util::ToolSet qw( confess a_isa_b );
use KinoSearch::base qw( KinoSearch::Obj );

-use KinoSearch::Store::FSFolder;
use KinoSearch::Index::Snapshot;
-use KinoSearch::Store::Lock;

sub new { confess("InvIndex's constructors are clobber, open, and read") }


Modified: trunk/perl/lib/KinoSearch/InvIndexer.pm
===================================================================
--- trunk/perl/lib/KinoSearch/InvIndexer.pm 2008-07-27 21:53:36 UTC (rev 3641)
+++ trunk/perl/lib/KinoSearch/InvIndexer.pm 2008-07-27 22:23:02 UTC (rev 3642)
@@ -11,7 +11,6 @@
use KinoSearch::Index::Snapshot;
use KinoSearch::Index::SegWriter;
use KinoSearch::Index::FilePurger;
-use KinoSearch::Store::LockFactory;

sub add_doc {
confess('usage: $invindexer->add_doc($doc)') unless @_ == 2;

Modified: trunk/perl/lib/KinoSearch/Store/CompoundFileReader.pm
===================================================================
--- trunk/perl/lib/KinoSearch/Store/CompoundFileReader.pm 2008-07-27 21:53:36 UTC (rev 3641)
+++ trunk/perl/lib/KinoSearch/Store/CompoundFileReader.pm 2008-07-27 22:23:02 UTC (rev 3642)
@@ -1,9 +1,5 @@
-use strict;
-use warnings;
+use KinoSearch qw( KinoSearch::Store::CompoundFileReader );

-package KinoSearch::Store::CompoundFileReader;
-use KinoSearch::base qw( KinoSearch::Store::Folder );
-
1;

__END__

Modified: trunk/perl/lib/KinoSearch/Store/CompoundFileWriter.pm
===================================================================
--- trunk/perl/lib/KinoSearch/Store/CompoundFileWriter.pm 2008-07-27 21:53:36 UTC (rev 3641)
+++ trunk/perl/lib/KinoSearch/Store/CompoundFileWriter.pm 2008-07-27 22:23:02 UTC (rev 3642)
@@ -1,9 +1,5 @@
-use strict;
-use warnings;
+use KinoSearch qw( KinoSearch::Store::CompoundFileWriter );

-package KinoSearch::Store::CompoundFileWriter;
-use KinoSearch::base qw( KinoSearch::Obj );
-
1;

__END__

Modified: trunk/perl/lib/KinoSearch/Store/FSFileDes.pm
===================================================================
--- trunk/perl/lib/KinoSearch/Store/FSFileDes.pm 2008-07-27 21:53:36 UTC (rev 3641)
+++ trunk/perl/lib/KinoSearch/Store/FSFileDes.pm 2008-07-27 22:23:02 UTC (rev 3642)
@@ -1,9 +1,5 @@
-use strict;
-use warnings;
+use KinoSearch qw( KinoSearch::Store::FSFileDes );

-package KinoSearch::Store::FSFileDes;
-use KinoSearch::base qw( KinoSearch::Store::FileDes );
-
1;

__END__

Modified: trunk/perl/lib/KinoSearch/Store/FSFolder.pm
===================================================================
--- trunk/perl/lib/KinoSearch/Store/FSFolder.pm 2008-07-27 21:53:36 UTC (rev 3641)
+++ trunk/perl/lib/KinoSearch/Store/FSFolder.pm 2008-07-27 22:23:02 UTC (rev 3642)
@@ -1,17 +1,5 @@
-use strict;
-use warnings;
+use KinoSearch qw( KinoSearch::Store::FSFolder );

-package KinoSearch::Store::FSFolder;
-use KinoSearch::base qw( KinoSearch::Store::Folder );
-use File::Spec::Functions qw( rel2abs );
-use KinoSearch::Util::Compat::DirManip;
-
-sub new {
- my ( $either, %args ) = @_;
- $args{path} = rel2abs( $args{path} );
- return $either->_new(%args);
-}
-
1;

__END__

Modified: trunk/perl/lib/KinoSearch/Store/FileDes.pm
===================================================================
--- trunk/perl/lib/KinoSearch/Store/FileDes.pm 2008-07-27 21:53:36 UTC (rev 3641)
+++ trunk/perl/lib/KinoSearch/Store/FileDes.pm 2008-07-27 22:23:02 UTC (rev 3642)
@@ -1,11 +1,5 @@
-use strict;
-use warnings;
+use KinoSearch qw( KinoSearch::Store::FileDes );

-package KinoSearch::Store::FileDes;
-use KinoSearch::base qw( KinoSearch::Obj );
-
-sub new { shift->abstract_death }
-
1;

__END__

Modified: trunk/perl/lib/KinoSearch/Store/Folder.pm
===================================================================
--- trunk/perl/lib/KinoSearch/Store/Folder.pm 2008-07-27 21:53:36 UTC (rev 3641)
+++ trunk/perl/lib/KinoSearch/Store/Folder.pm 2008-07-27 22:23:02 UTC (rev 3642)
@@ -1,27 +1,5 @@
-use strict;
-use warnings;
+use KinoSearch qw( KinoSearch::Store::Folder );

-package KinoSearch::Store::Folder;
-use KinoSearch::base qw( KinoSearch::Obj );
-
-use File::Spec::Functions qw( rel2abs );
-use KinoSearch::Store::InStream;
-use KinoSearch::Store::OutStream;
-require KinoSearch::Store::CompoundFileReader;
-require KinoSearch::Store::CompoundFileWriter;
-
-sub new {
- my ( $either, %args ) = @_;
- if ( defined $args{path} ) {
- $args{path} = rel2abs( $args{path} );
- }
- return $either->_new(%args);
-}
-
-sub list { shift->_list->to_perl }
-sub list_real_files { shift->_list_real_files->to_perl }
-sub slurp_file { $_[0]->_slurp_file( $_[1] )->to_perl }
-
1;

__END__

Modified: trunk/perl/lib/KinoSearch/Store/Lock.pm
===================================================================
--- trunk/perl/lib/KinoSearch/Store/Lock.pm 2008-07-27 21:53:36 UTC (rev 3641)
+++ trunk/perl/lib/KinoSearch/Store/Lock.pm 2008-07-27 22:23:02 UTC (rev 3642)
@@ -1,11 +1,5 @@
-use strict;
-use warnings;
+use KinoSearch qw( KinoSearch::Store::Lock );

-package KinoSearch::Store::Lock;
-use KinoSearch::base qw( KinoSearch::Obj );
-
-use KinoSearch::Util::Json;
-
1;

__END__

Modified: trunk/perl/lib/KinoSearch/Store/LockFactory.pm
===================================================================
--- trunk/perl/lib/KinoSearch/Store/LockFactory.pm 2008-07-27 21:53:36 UTC (rev 3641)
+++ trunk/perl/lib/KinoSearch/Store/LockFactory.pm 2008-07-27 22:23:02 UTC (rev 3642)
@@ -1,12 +1,5 @@
-use strict;
-use warnings;
+use KinoSearch qw( KinoSearch::Store::LockFactory );

-package KinoSearch::Store::LockFactory;
-use KinoSearch::base qw( KinoSearch::Obj );
-
-use KinoSearch::Store::Lock;
-use KinoSearch::Store::SharedLock;
-
1;

__END__

Modified: trunk/perl/lib/KinoSearch/Store/RAMFolder.pm
===================================================================
--- trunk/perl/lib/KinoSearch/Store/RAMFolder.pm 2008-07-27 21:53:36 UTC (rev 3641)
+++ trunk/perl/lib/KinoSearch/Store/RAMFolder.pm 2008-07-27 22:23:02 UTC (rev 3642)
@@ -1,23 +1,5 @@
-use strict;
-use warnings;
+use KinoSearch qw( KinoSearch::Store::RAMFolder );

-package KinoSearch::Store::RAMFolder;
-use KinoSearch::base qw( KinoSearch::Store::Folder );
-use File::Spec::Functions qw( rel2abs );
-
-use KinoSearch::Store::FSFolder;
-use KinoSearch::Store::RAMFileDes;
-use KinoSearch::Store::InStream;
-use KinoSearch::Store::OutStream;
-
-sub new {
- my ( $either, %args ) = @_;
- if ( defined $args{path} ) {
- $args{path} = rel2abs( $args{path} );
- }
- return $either->_new(%args);
-}
-
1;

__END__

Modified: trunk/perl/lib/KinoSearch/Store/SharedLock.pm
===================================================================
--- trunk/perl/lib/KinoSearch/Store/SharedLock.pm 2008-07-27 21:53:36 UTC (rev 3641)
+++ trunk/perl/lib/KinoSearch/Store/SharedLock.pm 2008-07-27 22:23:02 UTC (rev 3642)
@@ -1,9 +1,5 @@
-use strict;
-use warnings;
+use KinoSearch qw( KinoSearch::Store::SharedLock );

-package KinoSearch::Store::SharedLock;
-use KinoSearch::base qw( KinoSearch::Store::Lock );
-
1;

__END__

Modified: trunk/perl/lib/KinoSearch.pm
===================================================================
--- trunk/perl/lib/KinoSearch.pm 2008-07-27 21:53:36 UTC (rev 3641)
+++ trunk/perl/lib/KinoSearch.pm 2008-07-27 22:23:02 UTC (rev 3642)
@@ -37,32 +37,40 @@
# );
#
our %inlined = (
- 'KinoSearch::Obj' => 1,
- 'KinoSearch::Obj::FastObj' => 1,
- 'KinoSearch::Obj::Undefined' => 1,
- 'KinoSearch::Store::InStream' => 1,
- 'KinoSearch::Store::OutStream' => 1,
- 'KinoSearch::Store::RAMFileDes' => 1,
- 'KinoSearch::Store::ViewFileDes' => 1,
- 'KinoSearch::Util::BitVector' => 1,
- 'KinoSearch::Util::ByteBuf' => 1,
- 'KinoSearch::Util::CharBuf' => 1,
- 'KinoSearch::Util::Compat::DirManip' => 1,
- 'KinoSearch::Util::ViewCharBuf' => 1,
- 'KinoSearch::Util::ZombieCharBuf' => 1,
- 'KinoSearch::Util::DynVirtualTable' => 1,
- 'KinoSearch::Util::Hash' => 1,
- 'KinoSearch::Util::IntMap' => 1,
- 'KinoSearch::Util::Json' => 1,
- 'KinoSearch::Util::MathUtils' => 1,
- 'KinoSearch::Util::MemoryPool' => 1,
- 'KinoSearch::Util::Num' => 1,
- 'KinoSearch::Util::PriorityQueue' => 1,
- 'KinoSearch::Util::SortExRun' => 1,
- 'KinoSearch::Util::SortExternal' => 1,
- 'KinoSearch::Util::Stepper' => 1,
- 'KinoSearch::Util::VArray' => 1,
- 'KinoSearch::Util::VirtualTable' => 1,
+ 'KinoSearch::Obj' => 1,
+ 'KinoSearch::Obj::FastObj' => 1,
+ 'KinoSearch::Obj::Undefined' => 1,
+ 'KinoSearch::Store::CompoundFileReader' => 1,
+ 'KinoSearch::Store::CompoundFileWriter' => 1,
+ 'KinoSearch::Store::Folder' => 1,
+ 'KinoSearch::Store::FSFolder' => 1,
+ 'KinoSearch::Store::InStream' => 1,
+ 'KinoSearch::Store::Lock' => 1,
+ 'KinoSearch::Store::LockFactory' => 1,
+ 'KinoSearch::Store::OutStream' => 1,
+ 'KinoSearch::Store::RAMFileDes' => 1,
+ 'KinoSearch::Store::RAMFolder' => 1,
+ 'KinoSearch::Store::SharedLock' => 1,
+ 'KinoSearch::Store::ViewFileDes' => 1,
+ 'KinoSearch::Util::BitVector' => 1,
+ 'KinoSearch::Util::ByteBuf' => 1,
+ 'KinoSearch::Util::CharBuf' => 1,
+ 'KinoSearch::Util::Compat::DirManip' => 1,
+ 'KinoSearch::Util::ViewCharBuf' => 1,
+ 'KinoSearch::Util::ZombieCharBuf' => 1,
+ 'KinoSearch::Util::DynVirtualTable' => 1,
+ 'KinoSearch::Util::Hash' => 1,
+ 'KinoSearch::Util::IntMap' => 1,
+ 'KinoSearch::Util::Json' => 1,
+ 'KinoSearch::Util::MathUtils' => 1,
+ 'KinoSearch::Util::MemoryPool' => 1,
+ 'KinoSearch::Util::Num' => 1,
+ 'KinoSearch::Util::PriorityQueue' => 1,
+ 'KinoSearch::Util::SortExRun' => 1,
+ 'KinoSearch::Util::SortExternal' => 1,
+ 'KinoSearch::Util::Stepper' => 1,
+ 'KinoSearch::Util::VArray' => 1,
+ 'KinoSearch::Util::VirtualTable' => 1,
);

sub import {
@@ -225,6 +233,36 @@
}

{
+ package KinoSearch::Store::Folder;
+ use KinoSearch::base qw( KinoSearch::Obj );
+ use File::Spec::Functions qw( rel2abs );
+
+ sub new {
+ my ( $either, %args ) = @_;
+ if ( defined $args{path} ) {
+ $args{path} = rel2abs( $args{path} );
+ }
+ return $either->_new(%args);
+ }
+
+ sub list { shift->_list->to_perl }
+ sub list_real_files { shift->_list_real_files->to_perl }
+ sub slurp_file { $_[0]->_slurp_file( $_[1] )->to_perl }
+}
+
+{
+ package KinoSearch::Store::FSFolder;
+ use KinoSearch::base qw( KinoSearch::Store::Folder );
+ use File::Spec::Functions qw( rel2abs );
+
+ sub new {
+ my ( $either, %args ) = @_;
+ $args{path} = rel2abs( $args{path} );
+ return $either->_new(%args);
+ }
+}
+
+{
package KinoSearch::Store::RAMFileDes;
use KinoSearch::base qw( KinoSearch::Store::FileDes );

@@ -232,6 +270,20 @@
}

{
+ package KinoSearch::Store::RAMFolder;
+ use KinoSearch::base qw( KinoSearch::Store::Folder );
+ use File::Spec::Functions qw( rel2abs );
+
+ sub new {
+ my ( $either, %args ) = @_;
+ if ( defined $args{path} ) {
+ $args{path} = rel2abs( $args{path} );
+ }
+ return $either->_new(%args);
+ }
+}
+
+{
package KinoSearch::Util::BitVector;
use KinoSearch::base qw( KinoSearch::Obj );



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