marvin at rectangular
Aug 3, 2008, 3:12 PM
Post #1 of 1
(358 views)
Permalink
|
|
r3707 - in trunk/perl: . lib lib/KinoSearch/Index lib/KinoSearch/Util t
|
|
Author: creamyg
Date: 2008-08-03 15:12:07 -0700 (Sun, 03 Aug 2008)
New Revision: 3707
Removed:
trunk/perl/lib/KinoSearch/Util/MathUtils.pm
Modified:
trunk/perl/MANIFEST
trunk/perl/lib/KinoSearch.pm
trunk/perl/lib/KinoSearch/Index/SegDataWriter.pm
trunk/perl/lib/KinoSearch/Index/SegInfo.pm
trunk/perl/lib/KinoSearch/Index/SegLexicon.pm
trunk/perl/lib/KinoSearch/Index/Snapshot.pm
trunk/perl/lib/KinoSearch/Util/Hash.pm
trunk/perl/lib/KinoSearch/Util/Stepper.pm
trunk/perl/lib/KinoSearch/Util/VArray.pm
trunk/perl/t/023-stepper.t
Log:
Kill off a bunch of hand-rolled XS.
Modified: trunk/perl/MANIFEST
===================================================================
--- trunk/perl/MANIFEST 2008-08-03 19:04:36 UTC (rev 3706)
+++ trunk/perl/MANIFEST 2008-08-03 22:12:07 UTC (rev 3707)
@@ -190,7 +190,6 @@
lib/KinoSearch/Util/Hash.pm
lib/KinoSearch/Util/IntMap.pm
lib/KinoSearch/Util/Json.pm
-lib/KinoSearch/Util/MathUtils.pm
lib/KinoSearch/Util/MemoryPool.pm
lib/KinoSearch/Util/Native.pm
lib/KinoSearch/Util/Num.pm
Modified: trunk/perl/lib/KinoSearch/Index/SegDataWriter.pm
===================================================================
--- trunk/perl/lib/KinoSearch/Index/SegDataWriter.pm 2008-08-03 19:04:36 UTC (rev 3706)
+++ trunk/perl/lib/KinoSearch/Index/SegDataWriter.pm 2008-08-03 22:12:07 UTC (rev 3707)
@@ -4,34 +4,11 @@
__END__
-__XS__
-
-MODULE = KinoSearch PACKAGE = KinoSearch::Index::SegDataWriter
-
-void
-_set_or_get2(self, ...)
- kino_SegDataWriter *self;
-ALIAS:
- get_schema = 6
- get_folder = 8
-PPCODE:
-{
- START_SET_OR_GET_SWITCH
-
- case 6: retval = Kino_Obj_To_Native(self->invindex->schema);
- break;
-
- case 8: retval = Kino_Obj_To_Native(self->invindex->folder);
- break;
-
- END_SET_OR_GET_SWITCH
-}
-
__AUTO_XS__
{ "KinoSearch::Index::SegDataWriter" => {
- make_getters => [qw( invindex seg_info )],
bind_methods => [qw( finish add add_segment )],
+ make_getters => [qw( invindex )],
make_constructors => ["new"],
}
}
Modified: trunk/perl/lib/KinoSearch/Index/SegInfo.pm
===================================================================
--- trunk/perl/lib/KinoSearch/Index/SegInfo.pm 2008-08-03 19:04:36 UTC (rev 3706)
+++ trunk/perl/lib/KinoSearch/Index/SegInfo.pm 2008-08-03 22:12:07 UTC (rev 3707)
@@ -4,30 +4,6 @@
__END__
-__XS__
-
-MODULE = KinoSearch PACKAGE = KinoSearch::Index::SegInfo
-
-SV*
-field_num(self, field_name)
- kino_SegInfo *self;
- kino_CharBuf field_name;
-CODE:
-{
- chy_i32_t num = Kino_SegInfo_Field_Num(self, &field_name);
- RETVAL = num == -1
- ? newSV(0)
- : newSViv(num);
-}
-OUTPUT: RETVAL
-
-chy_u32_t
-num_fields(self)
- kino_SegInfo *self;
-CODE:
- RETVAL = self->by_num->size;
-OUTPUT: RETVAL
-
__AUTO_XS__
{ "KinoSearch::Index::SegInfo" => {
Modified: trunk/perl/lib/KinoSearch/Index/SegLexicon.pm
===================================================================
--- trunk/perl/lib/KinoSearch/Index/SegLexicon.pm 2008-08-03 19:04:36 UTC (rev 3706)
+++ trunk/perl/lib/KinoSearch/Index/SegLexicon.pm 2008-08-03 22:12:07 UTC (rev 3707)
@@ -4,25 +4,6 @@
__END__
-__XS__
-
-MODULE = KinoSearch PACKAGE = KinoSearch::Index::SegLexicon
-
-void
-_set_or_get(self, ...)
- kino_SegLexicon *self;
-ALIAS:
- is_index = 10
-PPCODE:
-{
- START_SET_OR_GET_SWITCH
-
- case 10: retval = newSViv(self->is_index);
- break;
-
- END_SET_OR_GET_SWITCH
-}
-
__AUTO_XS__
{ "KinoSearch::Index::SegLexicon" => {
Modified: trunk/perl/lib/KinoSearch/Index/Snapshot.pm
===================================================================
--- trunk/perl/lib/KinoSearch/Index/Snapshot.pm 2008-08-03 19:04:36 UTC (rev 3706)
+++ trunk/perl/lib/KinoSearch/Index/Snapshot.pm 2008-08-03 22:12:07 UTC (rev 3707)
@@ -4,21 +4,6 @@
__END__
-__XS__
-
-MODULE = KinoSearch PACKAGE = KinoSearch::Index::Snapshot
-
-SV*
-new_seg_name(self)
- kino_Snapshot *self;
-CODE:
-{
- kino_CharBuf *seg_name = Kino_Snapshot_New_Seg_Name(self);
- RETVAL = cb_to_sv(seg_name);
- REFCOUNT_DEC(seg_name);
-}
-OUTPUT: RETVAL
-
__AUTO_XS__
{ "KinoSearch::Index::Snapshot" => {
Modified: trunk/perl/lib/KinoSearch/Util/Hash.pm
===================================================================
--- trunk/perl/lib/KinoSearch/Util/Hash.pm 2008-08-03 19:04:36 UTC (rev 3706)
+++ trunk/perl/lib/KinoSearch/Util/Hash.pm 2008-08-03 22:12:07 UTC (rev 3707)
@@ -9,14 +9,6 @@
MODULE = KinoSearch PACKAGE = KinoSearch::Util::Hash
void
-store(self, key, val)
- kino_Hash *self;
- kino_CharBuf key;
- kino_Obj *val;
-PPCODE:
- Kino_Hash_Store(self, &key, val);
-
-void
iter_next(self)
kino_Hash *self;
PPCODE:
@@ -40,6 +32,7 @@
__AUTO_XS__
{ "KinoSearch::Util::Hash" => {
+ bind_positional => [qw( store )],
bind_methods => [.
qw( fetch add_key find_key clear delete
iter_init keys values )
Deleted: trunk/perl/lib/KinoSearch/Util/MathUtils.pm
===================================================================
--- trunk/perl/lib/KinoSearch/Util/MathUtils.pm 2008-08-03 19:04:36 UTC (rev 3706)
+++ trunk/perl/lib/KinoSearch/Util/MathUtils.pm 2008-08-03 22:12:07 UTC (rev 3707)
@@ -1,24 +0,0 @@
-use KinoSearch;
-
-1;
-
-__END__
-
-__XS__
-
-MODULE = KinoSearch PACKAGE = KinoSearch::Util::MathUtils
-
-chy_u32_t
-fibonacci(num)
- chy_u32_t num;
-CODE:
- RETVAL = kino_Math_fibonacci(num);
-OUTPUT: RETVAL
-
-__COPYRIGHT__
-
-Copyright 2005-2008 Marvin Humphrey
-
-This program is free software; you can redistribute it and/or modify
-under the same terms as Perl itself.
-
Modified: trunk/perl/lib/KinoSearch/Util/Stepper.pm
===================================================================
--- trunk/perl/lib/KinoSearch/Util/Stepper.pm 2008-08-03 19:04:36 UTC (rev 3706)
+++ trunk/perl/lib/KinoSearch/Util/Stepper.pm 2008-08-03 22:12:07 UTC (rev 3707)
@@ -7,22 +7,10 @@
__AUTO_XS__
{ "KinoSearch::Util::Stepper" => {
- bind_methods => [qw( read_record dump )],
+ bind_methods => [qw( read_record dump dump_to_file )],
}
}
-__XS__
-
-MODULE = KinoSearch PACKAGE = KinoSearch::Util::Stepper
-
-void
-dump_to_file(self, instream, outstream)
- kino_Stepper *self;
- kino_InStream *instream;
- kino_OutStream *outstream;
-PPCODE:
- Kino_Stepper_Dump_To_File(self, instream, outstream);
-
__COPYRIGHT__
Copyright 2005-2008 Marvin Humphrey
Modified: trunk/perl/lib/KinoSearch/Util/VArray.pm
===================================================================
--- trunk/perl/lib/KinoSearch/Util/VArray.pm 2008-08-03 19:04:36 UTC (rev 3706)
+++ trunk/perl/lib/KinoSearch/Util/VArray.pm 2008-08-03 22:12:07 UTC (rev 3707)
@@ -4,21 +4,10 @@
__END__
-__XS__
-
-MODULE = KinoSearch PACKAGE = KinoSearch::Util::VArray
-
-void
-store(self, num, elem)
- kino_VArray *self;
- chy_u32_t num;
- kino_Obj *elem;
-PPCODE:
- Kino_VA_Store(self, num, elem);
-
__AUTO_XS__
{ "KinoSearch::Util::VArray" => {
+ bind_positional => [qw( store )],
bind_methods => [
qw( push
push_varray
Modified: trunk/perl/lib/KinoSearch.pm
===================================================================
--- trunk/perl/lib/KinoSearch.pm 2008-08-03 19:04:36 UTC (rev 3706)
+++ trunk/perl/lib/KinoSearch.pm 2008-08-03 22:12:07 UTC (rev 3707)
@@ -325,7 +325,7 @@
sub write_compressed {
my ( $self, $doc ) = @_;
my $fields = $doc->get_fields;
- my $schema = $self->get_schema;
+ my $schema = $self->get_invindex->get_schema;
my $ds_out = $self->get_ds_out;
# Lazy load Compress::Zlib.
Modified: trunk/perl/t/023-stepper.t
===================================================================
--- trunk/perl/t/023-stepper.t 2008-08-03 19:04:36 UTC (rev 3706)
+++ trunk/perl/t/023-stepper.t 2008-08-03 22:12:07 UTC (rev 3707)
@@ -21,7 +21,7 @@
is_index => 0,
);
-$term_stepper->dump_to_file( $instream, $outstream );
+$term_stepper->dump_to_file( instream => $instream, outstream => $outstream );
$outstream->close;
my $dumped = $folder->slurp_file('dump');
like( $dumped, qr/0\s+a.+1\s+b.+2\s+c/s, "dump_to_file" );
_______________________________________________
kinosearch-commits mailing list
kinosearch-commits [at] rectangular
http://www.rectangular.com/mailman/listinfo/kinosearch-commits
|
