In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/a9ccbcd7e3e4416b46c5c8cd5e61e7930776a83e?hp=a8ec9917c1913282d626f8c7467e40e55b7f5c97>
- Log ----------------------------------------------------------------- commit a9ccbcd7e3e4416b46c5c8cd5e61e7930776a83e Author: Lajos Veres <[email protected]> Date: Thu Jan 29 19:32:16 2015 -0500 Corrections to spelling and grammatical errors. Extracted from patch submitted by Lajos Veres in RT #123693. This commit applies those patches to files under dist/ *other than* those pertaining to Tie-File. Update $VERSION in Dumper.pm and Storable.pm after re-applying patches from RT M dist/Data-Dumper/Changes M dist/Data-Dumper/Dumper.pm M dist/Data-Dumper/Dumper.xs M dist/ExtUtils-CBuilder/Changes M dist/IO/t/io_sock.t M dist/Math-BigInt/t/bigintpm.inc M dist/Math-BigInt/t/upgrade.inc M dist/Module-CoreList/Changes M dist/Safe/Changes M dist/Storable/ChangeLog M dist/Storable/Storable.pm M dist/Storable/Storable.xs M dist/Storable/t/attach_errors.t M dist/threads-shared/t/hv_refs.t commit f4fb63c7b74ff0e28cab75889fd6b0947f57d662 Author: James E Keenan <[email protected]> Date: Thu Jan 29 19:21:52 2015 -0500 Revert "Corrections to spelling and grammatical errors." This reverts commit 5bf4b3bf13bc4055684a48448b05920845ef7764. On p5p-list, Steve Hay wrote on 2015-01-29: "... these and other changes to Tie-File could break backwards compatibility. The keys of %opt are passed in from user code, so we can't change the expected key from "autodefer_threshhold" to "autodefer_threshold" without also asking users to change their code, which is probably more hassle than it's worth." Parts of the reverted commit will be re-committed from a new patch. M dist/Data-Dumper/Changes M dist/Data-Dumper/Dumper.pm M dist/Data-Dumper/Dumper.xs M dist/ExtUtils-CBuilder/Changes M dist/IO/t/io_sock.t M dist/Math-BigInt/t/bigintpm.inc M dist/Math-BigInt/t/upgrade.inc M dist/Module-CoreList/Changes M dist/Safe/Changes M dist/Storable/ChangeLog M dist/Storable/Storable.pm M dist/Storable/Storable.xs M dist/Storable/t/attach_errors.t M dist/Tie-File/lib/Tie/File.pm M dist/Tie-File/t/00_version.t M dist/Tie-File/t/31_autodefer.t M dist/threads-shared/t/hv_refs.t ----------------------------------------------------------------------- Summary of changes: dist/Data-Dumper/Dumper.pm | 2 +- dist/Tie-File/lib/Tie/File.pm | 28 ++++++++++++++-------------- dist/Tie-File/t/00_version.t | 2 +- dist/Tie-File/t/31_autodefer.t | 4 ++-- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dist/Data-Dumper/Dumper.pm b/dist/Data-Dumper/Dumper.pm index f9e6a1e..5073be1 100644 --- a/dist/Data-Dumper/Dumper.pm +++ b/dist/Data-Dumper/Dumper.pm @@ -1419,7 +1419,7 @@ modify it under the same terms as Perl itself. =head1 VERSION -Version 2.157 (January 28 2015) +Version 2.157 (January 29 2014) =head1 SEE ALSO diff --git a/dist/Tie-File/lib/Tie/File.pm b/dist/Tie-File/lib/Tie/File.pm index 1f71531..df8a197 100644 --- a/dist/Tie-File/lib/Tie/File.pm +++ b/dist/Tie-File/lib/Tie/File.pm @@ -7,14 +7,14 @@ use Fcntl 'O_CREAT', 'O_RDWR', 'LOCK_EX', 'LOCK_SH', 'O_WRONLY', 'O_RDONLY'; sub O_ACCMODE () { O_RDONLY | O_RDWR | O_WRONLY } -$VERSION = "1.02"; +$VERSION = "1.01"; my $DEFAULT_MEMORY_SIZE = 1<<21; # 2 megabytes -my $DEFAULT_AUTODEFER_THRESHOLD = 3; # 3 records -my $DEFAULT_AUTODEFER_FILELEN_THRESHOLD = 65536; # 16 disk blocksful +my $DEFAULT_AUTODEFER_THRESHHOLD = 3; # 3 records +my $DEFAULT_AUTODEFER_FILELEN_THRESHHOLD = 65536; # 16 disk blocksful my %good_opt = map {$_ => 1, "-$_" => 1} qw(memory dw_size mode recsep discipline - autodefer autochomp autodefer_threshold concurrent); + autodefer autochomp autodefer_threshhold concurrent); sub TIEARRAY { if (@_ % 2 != 0) { @@ -62,10 +62,10 @@ sub TIEARRAY { $opts{autodefer} = 1 unless defined $opts{autodefer}; $opts{autodeferring} = 0; # but is not initially active $opts{ad_history} = []; - $opts{autodefer_threshold} = $DEFAULT_AUTODEFER_THRESHOLD - unless defined $opts{autodefer_threshold}; - $opts{autodefer_filelen_threshold} = $DEFAULT_AUTODEFER_FILELEN_THRESHOLD - unless defined $opts{autodefer_filelen_threshold}; + $opts{autodefer_threshhold} = $DEFAULT_AUTODEFER_THRESHHOLD + unless defined $opts{autodefer_threshhold}; + $opts{autodefer_filelen_threshhold} = $DEFAULT_AUTODEFER_FILELEN_THRESHHOLD + unless defined $opts{autodefer_filelen_threshhold}; $opts{offsets} = [0]; $opts{filename} = $file; @@ -1100,7 +1100,7 @@ sub _old_flush { @{$self->{deferred}}{$first_rec .. $last_rec}); } - $self->_discard; # clear out deferred-write-cache + $self->_discard; # clear out defered-write-cache } sub _flush { @@ -1133,7 +1133,7 @@ sub _flush { } $self->_mtwrite(@args); # write multiple record groups - $self->_discard; # clear out deferred-write-cache + $self->_discard; # clear out defered-write-cache $self->_oadjust(@adjust); } @@ -1201,7 +1201,7 @@ sub autodefer { # Now, what does the ad_history mean, and what is this function doing? # Essentially, the idea is to enable autodeferring when we see that the # user has made three consecutive STORE calls to three consecutive records. -# ("Three" is actually ->{autodefer_threshold}.) +# ("Three" is actually ->{autodefer_threshhold}.) # A STORE call for record #$n inserts $n into the autodefer history, # and if the history contains three consecutive records, we enable # autodeferment. An ad_history of [X, Y] means that the most recent @@ -1220,7 +1220,7 @@ sub _annotate_ad_history { my ($self, $n) = @_; return unless $self->{autodefer}; # feature is disabled return if $self->{defer}; # already in explicit defer mode - return unless $self->{offsets}[-1] >= $self->{autodefer_filelen_threshold}; + return unless $self->{offsets}[-1] >= $self->{autodefer_filelen_threshhold}; local *H = $self->{ad_history}; if ($n eq 'CLEAR') { @@ -1232,7 +1232,7 @@ sub _annotate_ad_history { } else { # @H == 2 if ($H[1] == $n-1) { # another consecutive record $H[1]++; - if ($H[1] - $H[0] + 1 >= $self->{autodefer_threshold}) { + if ($H[1] - $H[0] + 1 >= $self->{autodefer_threshhold}) { $self->{autodeferring} = 1; } } else { # nonconsecutive- erase and start over @@ -1562,7 +1562,7 @@ sub lookup { # $self->[MISS]++ if $self->[STAT][$key]++ == 0; # $self->[REQ]++; # my $hit_rate = 1 - $self->[MISS] / $self->[REQ]; -# # Do some testing to determine this threshold +# # Do some testing to determine this threshhold # $#$self = STAT - 1 if $hit_rate > 0.20; # } diff --git a/dist/Tie-File/t/00_version.t b/dist/Tie-File/t/00_version.t index 3a404ff..1bd714e 100644 --- a/dist/Tie-File/t/00_version.t +++ b/dist/Tie-File/t/00_version.t @@ -2,7 +2,7 @@ print "1..1\n"; -my $testversion = "1.02"; +my $testversion = "1.01"; use Tie::File; if ($Tie::File::VERSION != $testversion) { diff --git a/dist/Tie-File/t/31_autodefer.t b/dist/Tie-File/t/31_autodefer.t index e7af0ad..ea929a4 100644 --- a/dist/Tie-File/t/31_autodefer.t +++ b/dist/Tie-File/t/31_autodefer.t @@ -28,7 +28,7 @@ print $o ? "ok $N\n" : "not ok $N\n"; $N++; # I am an undocumented feature -$o->{autodefer_filelen_threshold} = 0; +$o->{autodefer_filelen_threshhold} = 0; # Normally autodeferring only works on large files. This disables that. # (3-22) Deferred storage @@ -111,7 +111,7 @@ my $BUF = 20; $o = tie @a, 'Tie::File', $file, autodefer => 0; die $! unless $o; # I am an undocumented feature -$o->{autodefer_filelen_threshold} = 0; +$o->{autodefer_filelen_threshhold} = 0; # Normally autodeferring only works on large files. This disables that. # (57-59) Did the autodefer => 0 option work? -- Perl5 Master Repository
