--- trunk/lib/WebPAC/Input.pm 2006/10/25 15:56:44 760 +++ trunk/lib/WebPAC/Input.pm 2006/10/25 17:10:08 761 @@ -16,11 +16,11 @@ =head1 VERSION -Version 0.13 +Version 0.14 =cut -our $VERSION = '0.13'; +our $VERSION = '0.14'; =head1 SYNOPSIS @@ -43,7 +43,6 @@ my $db = WebPAC::Input->new( module => 'WebPAC::Input::ISIS', - low_mem => 1, ); $db->open( path => '/path/to/database' ); @@ -63,7 +62,6 @@ my $db = new WebPAC::Input( module => 'WebPAC::Input::MARC', encoding => 'ISO-8859-2', - low_mem => 1, recode => 'char pairs', no_progress_bar => 1, ); @@ -75,8 +73,6 @@ used internally). This should probably be your terminal encoding, and by default, it C. -Default is not to use C options (see L below). - C is optional string constisting of character or words pairs that should be replaced in input stream. @@ -96,6 +92,7 @@ $log->logconfess("code_page argument is not suppored any more. change it to encoding") if ($self->{lookup}); $log->logconfess("lookup argument is not suppored any more. rewrite call to lookup_ref") if ($self->{lookup}); + $log->logconfess("low_mem argument is not suppored any more. rewrite it to load_row and save_row") if ($self->{low_mem}); $log->logconfess("specify low-level file format module") unless ($self->{module}); my $module_path = $self->{module}; @@ -119,6 +116,8 @@ This function will read whole database in memory and produce lookups. + my $store; # simple in-memory hash + $input->open( path => '/path/to/database/file', code_page => 'cp852', @@ -134,6 +133,16 @@ 901 => { '*' => { '^b' => ' ; ' } }, }, modify_file => 'conf/modify/mapping.map', + save_row => sub { + my $a = shift; + $store->{ $a->{id} } = $a->{row}; + }, + load_row => sub { + my $a = shift; + return defined($store->{ $a->{id} }) && + $store->{ $a->{id} }; + }, + ); By default, C is assumed to be C. @@ -154,6 +163,9 @@ (hopefully) simplier sintax than YAML or perl (see L). This option overrides C if both exists for same input. +C and C are low-level implementation of store engine. Calling convention +is documented in example above. + Returns size of database, regardless of C and C parametars, see also C. @@ -180,6 +192,16 @@ $self->{$v} = $arg->{$v} if ($arg->{$v}); } + if ($arg->{load_row} || $arg->{save_row}) { + $log->logconfess("save_row and load_row must be defined in pair and be CODE") unless ( + ref($arg->{load_row}) eq 'CODE' && + ref($arg->{save_row}) eq 'CODE' + ); + $self->{load_row} = $arg->{load_row}; + $self->{save_row} = $arg->{save_row}; + $log->debug("using load_row and save_row instead of in-memory hash"); + } + my $filter_ref; my $recode_regex; my $recode_map; @@ -259,38 +281,6 @@ $log->info("processing $self->{size}/$size records [$from_rec-$to_rec] convert $code_page -> $self->{encoding}", $self->{stats} ? ' [stats]' : ''); - # turn on low_mem for databases with more than 100000 records! - if (! $self->{low_mem} && $size > 100000) { - $log->warn("Using on-disk storage instead of memory for input data. This will affect performance."); - $self->{low_mem}++; - } - - # running with low_mem flag? well, use DBM::Deep then. - if ($self->{'low_mem'}) { - $log->info("running with low_mem which impacts performance (<32 Mb memory usage)"); - - my $db_file = "data.db"; - - if (-e $db_file) { - unlink $db_file or $log->logdie("can't remove '$db_file' from last run"); - $log->debug("removed '$db_file' from last run"); - } - - require DBM::Deep; - - my $db = new DBM::Deep $db_file; - - $log->logdie("DBM::Deep error: $!") unless ($db); - - if ($db->error()) { - $log->logdie("can't open '$db_file' under low_mem: ",$db->error()); - } else { - $log->debug("using file '$db_file' for DBM::Deep"); - } - - $self->{'db'} = $db; - } - # read database for (my $pos = $from_rec; $pos <= $to_rec; $pos++) { @@ -333,8 +323,11 @@ } # store - if ($self->{low_mem}) { - $self->{db}->put($pos, $rec); + if ($self->{save_row}) { + $self->{save_row}->({ + id => $pos, + row => $rec, + }); } else { $self->{data}->{$pos} = $rec; } @@ -425,8 +418,8 @@ my $rec; - if ($self->{low_mem}) { - $rec = $self->{db}->get($mfn); + if ($self->{load_row}) { + $rec = $self->{load_row}->({ id => $mfn }); } else { $rec = $self->{data}->{$mfn}; } @@ -671,37 +664,6 @@ return $regexpes; } -=head1 MEMORY USAGE - -C options is double-edged sword. If enabled, WebPAC -will run on memory constraint machines (which doesn't have enough -physical RAM to create memory structure for whole source database). - -If your machine has 512Mb or more of RAM and database is around 10000 records, -memory shouldn't be an issue. If you don't have enough physical RAM, you -might consider using virtual memory (if your operating system is handling it -well, like on FreeBSD or Linux) instead of dropping to L to handle -parsed structure of ISIS database (this is what C option does). - -Hitting swap at end of reading source database is probably o.k. However, -hitting swap before 90% will dramatically decrease performance and you will -be better off with C and using rest of availble memory for -operating system disk cache (Linux is particuallary good about this). -However, every access to database record will require disk access, so -generation phase will be slower 10-100 times. - -Parsed structures are essential - you just have option to trade RAM memory -(which is fast) for disk space (which is slow). Be sure to have planty of -disk space if you are using C and thus L. - -However, when WebPAC is running on desktop machines (or laptops :-), it's -highly undesireable for system to start swapping. Using C option can -reduce WecPAC memory usage to around 64Mb for same database with lookup -fields and sorted indexes which stay in RAM. Performance will suffer, but -memory usage will really be minimal. It might be also more confortable to -run WebPAC reniced on those machines. - - =head1 AUTHOR Dobrica Pavlinusic, C<< >>