In perl.git, the branch yves/hash_rotate has been updated <http://perl5.git.perl.org/perl.git/commitdiff/0790038531db6af92d5ae37f2ce31ce654941f11?hp=6fd5aa8aaceb1d0a12c479fbf0c30783d39a6059>
- Log ----------------------------------------------------------------- commit 0790038531db6af92d5ae37f2ce31ce654941f11 Author: Yves Orton <[email protected]> Date: Tue Dec 4 23:47:29 2012 +0100 sort keys in t/op/smartkve.t With per hash randomization we must sort the keys() if we are to compare them with the keys() of another hash. M t/op/smartkve.t commit 458cb2e7750cf14a0b656e2db06dfce73c742d6a Author: Yves Orton <[email protected]> Date: Tue Dec 4 23:01:25 2012 +0100 fix Pod::Simple hash order dependency in tests M cpan/Pod-Simple/lib/Pod/Simple.pm M cpan/Pod-Simple/t/closeys.t commit 0b5797bb2875c7c3832563cd928fe2788e245b46 Author: Yves Orton <[email protected]> Date: Tue Dec 4 15:22:28 2012 +0100 Switch default hash to SIPHASH on 64 bit builds and ONE_AT_A_TIME on 32 bit builds Murmurhash has certain disadvantages that neither ONE_AT_A_TIME nor SIPHASH posses M hv.h ----------------------------------------------------------------------- Summary of changes: cpan/Pod-Simple/lib/Pod/Simple.pm | 2 +- cpan/Pod-Simple/t/closeys.t | 2 +- hv.h | 6 +++++- t/op/smartkve.t | 35 ++++++++++++++++++----------------- 4 files changed, 25 insertions(+), 20 deletions(-) diff --git a/cpan/Pod-Simple/lib/Pod/Simple.pm b/cpan/Pod-Simple/lib/Pod/Simple.pm index fead5b5..773938f 100644 --- a/cpan/Pod-Simple/lib/Pod/Simple.pm +++ b/cpan/Pod-Simple/lib/Pod/Simple.pm @@ -18,7 +18,7 @@ use vars qw( ); @ISA = ('Pod::Simple::BlackBox'); -$VERSION = '3.23'; +$VERSION = '3.24_000'; @Known_formatting_codes = qw(I B C L E F S X Z); %Known_formatting_codes = map(($_=>1), @Known_formatting_codes); diff --git a/cpan/Pod-Simple/t/closeys.t b/cpan/Pod-Simple/t/closeys.t index 683ce13..e998858 100644 --- a/cpan/Pod-Simple/t/closeys.t +++ b/cpan/Pod-Simple/t/closeys.t @@ -24,7 +24,7 @@ sub nowhine { # $_[0]->{'no_whining'} = 1; $_[0]->accept_targets("*"); } - +local $Pod::Simple::XMLOutStream::SORT_ATTRS= 1; &ok(e( "=begin :foo\n\n=begin :bar\n\nZaz\n\n", "=begin :foo\n\n=begin :bar\n\nZaz\n\n=end :bar\n\n=end :foo\n\n", diff --git a/hv.h b/hv.h index 05e50af..85c2bd0 100644 --- a/hv.h +++ b/hv.h @@ -157,7 +157,11 @@ struct xpvhv { || defined(PERL_HASH_FUNC_ONE_AT_A_TIME_OLD) \ || defined(PERL_HASH_FUNC_BUZZHASH16) \ ) -#define PERL_HASH_FUNC_MURMUR3 +#ifdef U64 +#define PERL_HASH_FUNC_SIPHASH +#else +#define PERL_HASH_FUNC_ONE_AT_A_TIME +#endif #endif #if defined(PERL_HASH_FUNC_BUZZHASH16) diff --git a/t/op/smartkve.t b/t/op/smartkve.t index 7e5d67e..dc56afe 100644 --- a/t/op/smartkve.t +++ b/t/op/smartkve.t @@ -12,7 +12,8 @@ use vars qw($data $array $values $hash $errpat); plan 'no_plan'; -sub j { join(":",@_) } +sub j { join(":", @_) } +sub J { join(":", sort @_) } # NOTE # @@ -118,16 +119,16 @@ is(keys $obj->array ,3, 'Scalar: keys $obj->array'); # Keys -- list -$h_expect = j(keys %$hash); +$h_expect = J(keys %$hash); $a_expect = j(keys @$array); -is(j(keys $hash) ,$h_expect, 'List: keys $hash'); -is(j(keys $data->{hash}) ,$h_expect, 'List: keys $data->{hash}'); -is(j(keys CONST_HASH) ,$h_expect, 'List: keys CONST_HASH'); -is(j(keys CONST_HASH()) ,$h_expect, 'List: keys CONST_HASH()'); -is(j(keys hash_sub) ,$h_expect, 'List: keys hash_sub'); -is(j(keys hash_sub()) ,$h_expect, 'List: keys hash_sub()'); -is(j(keys $obj->hash) ,$h_expect, 'List: keys $obj->hash'); +is(J(keys $hash) ,$h_expect, 'List: keys $hash'); +is(J(keys $data->{hash}) ,$h_expect, 'List: keys $data->{hash}'); +is(J(keys CONST_HASH) ,$h_expect, 'List: keys CONST_HASH'); +is(J(keys CONST_HASH()) ,$h_expect, 'List: keys CONST_HASH()'); +is(J(keys hash_sub) ,$h_expect, 'List: keys hash_sub'); +is(J(keys hash_sub()) ,$h_expect, 'List: keys hash_sub()'); +is(J(keys $obj->hash) ,$h_expect, 'List: keys $obj->hash'); is(j(keys $array) ,$a_expect, 'List: keys $array'); is(j(keys $data->{array}) ,$a_expect, 'List: keys $data->{array}'); is(j(keys CONST_ARRAY) ,$a_expect, 'List: keys CONST_ARRAY'); @@ -221,16 +222,16 @@ is(values $obj->array ,3, 'Scalar: values $obj->array'); # Values -- list -$h_expect = j(values %$hash); +$h_expect = J(values %$hash); $a_expect = j(values @$array); -is(j(values $hash) ,$h_expect, 'List: values $hash'); -is(j(values $data->{hash}) ,$h_expect, 'List: values $data->{hash}'); -is(j(values CONST_HASH) ,$h_expect, 'List: values CONST_HASH'); -is(j(values CONST_HASH()) ,$h_expect, 'List: values CONST_HASH()'); -is(j(values hash_sub) ,$h_expect, 'List: values hash_sub'); -is(j(values hash_sub()) ,$h_expect, 'List: values hash_sub()'); -is(j(values $obj->hash) ,$h_expect, 'List: values $obj->hash'); +is(J(values $hash) ,$h_expect, 'List: values $hash'); +is(J(values $data->{hash}) ,$h_expect, 'List: values $data->{hash}'); +is(J(values CONST_HASH) ,$h_expect, 'List: values CONST_HASH'); +is(J(values CONST_HASH()) ,$h_expect, 'List: values CONST_HASH()'); +is(J(values hash_sub) ,$h_expect, 'List: values hash_sub'); +is(J(values hash_sub()) ,$h_expect, 'List: values hash_sub()'); +is(J(values $obj->hash) ,$h_expect, 'List: values $obj->hash'); is(j(values $array) ,$a_expect, 'List: values $array'); is(j(values $data->{array}) ,$a_expect, 'List: values $data->{array}'); is(j(values CONST_ARRAY) ,$a_expect, 'List: values CONST_ARRAY'); -- Perl5 Master Repository
