Commit57d6ce4

committed

Do not use rangeHash when rangeDiff is 0

1 parent03b79e9 commit57d6ce4Copy full SHA for 57d6ce4

File tree

+13

-4

lines changed

+13

-4

lines changed

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ private[hashing] class MurmurHash3 {`
`136`	`136`	`while (it.hasNext) {`
`137`	`137`	`h= mix(h, prev)`
`138`	`138`	`valhash= it.next().##`
`139`		`-if(rangeDiff!= hash- prev) {`
	`139`	`+if(rangeDiff!= hash- prev\|\| rangeDiff==0) {`
`140`	`140`	`h= mix(h, hash)`
`141`	`141`	`i+=1`
`142`	`142`	`while (it.hasNext) {`
`@@ -173,7 +173,7 @@ private[hashing] class MurmurHash3 {`
`173`	`173`	`while (i< l) {`
`174`	`174`	`h= mix(h, prev)`
`175`	`175`	`valhash= a(i).##`
`176`		`-if(rangeDiff!= hash- prev) {`
	`176`	`+if(rangeDiff!= hash- prev\|\| rangeDiff==0) {`
`177`	`177`	`h= mix(h, hash)`
`178`	`178`	`i+=1`
`179`	`179`	`while (i< l) {`
`@@ -252,7 +252,7 @@ private[hashing] class MurmurHash3 {`
`252`	`252`	`while (i< l) {`
`253`	`253`	`h= mix(h, prev)`
`254`	`254`	`valhash= a(i).##`
`255`		`-if(rangeDiff!= hash- prev) {`
	`255`	`+if(rangeDiff!= hash- prev\|\| rangeDiff==0) {`
`256`	`256`	`h= mix(h, hash)`
`257`	`257`	`i+=1`
`258`	`258`	`while (i< l) {`
`@@ -290,7 +290,7 @@ private[hashing] class MurmurHash3 {`
`290`	`290`	`rangeState=1`
`291`	`291`	`case1=>`
`292`	`292`	`rangeDiff= hash- prev`
`293`		`- rangeState=2`
	`293`	`+ rangeState=if (rangeDiff==0)3else2`
`294`	`294`	`case2=>`
`295`	`295`	`if(rangeDiff!= hash- prev) rangeState=3`
`296`	`296`	`case _=>`

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -56,4 +56,13 @@ class MurmurHash3Test {`
`56`	`56`	`assertEquals(r5, r6)`
`57`	`57`	`assertEquals(r5.hashCode, r6.hashCode)`
`58`	`58`	`}`
	`59`	`+`
	`60`	`+@Test`
	`61`	`+deftestEqualArray():Unit= {`
	`62`	`+valz1= (1 to2).map(_=>0).toArray`
	`63`	`+valz2= (1 to5).map(_=>0).toArray`
	`64`	`+ check(z1.hashCode, z1)`
	`65`	`+ check(z2.hashCode, z2)`
	`66`	`+ assertNotEquals(z1.hashCode, z2.hashCode)`
	`67`	`+ }`
`59`	`68`	`}`

Comments

(0)