Skip to content

Commit d662d6d

Browse files
authored
fix(build): fix 32-bit build (dgraph-io#1627)
1 parent 3adc574 commit d662d6d

File tree

5 files changed

+4
-9
lines changed

5 files changed

+4
-9
lines changed

.travis.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,8 @@ script: >-
4141
if [ $TRAVIS_OS_NAME = "linux" ] && [ $go_32 ]; then
4242
uname -a
4343
GOOS=linux GOARCH=arm go test -v ./...
44-
# Another round of tests after turning off mmap.
45-
GOOS=linux GOARCH=arm go test -v -vlog_mmap=false github.com/dgraph-io/badger
4644
else
4745
go test -v ./...
48-
# Another round of tests after turning off mmap.
49-
go test -v -vlog_mmap=false github.com/dgraph-io/badger
5046
# Cross-compile for Plan 9
5147
GOOS=plan9 go build ./...
5248
fi

appveyor.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ test_script:
3636
# Unit tests
3737
- ps: Add-AppveyorTest "Unit Tests" -Outcome Running
3838
- go test -v github.com/dgraph-io/badger/...
39-
- go test -v -vlog_mmap=false github.com/dgraph-io/badger/...
4039
- ps: Update-AppveyorTest "Unit Tests" -Outcome Passed
4140

4241
notifications:

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ go 1.12
77
require (
88
github.com/DataDog/zstd v1.4.1
99
github.com/cespare/xxhash v1.1.0
10-
github.com/dgraph-io/ristretto v0.0.4-0.20201205013540-bafef7527542
10+
github.com/dgraph-io/ristretto v0.0.4-0.20201224172411-e860a6c48e8a
1111
github.com/dustin/go-humanize v1.0.0
1212
github.com/golang/protobuf v1.3.1
1313
github.com/golang/snappy v0.0.1

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ3
1717
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
1818
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
1919
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
20-
github.com/dgraph-io/ristretto v0.0.4-0.20201205013540-bafef7527542 h1:Yya3DAZRF8ibfavFQQysegFbPJQ8plpta39uev0lw1I=
21-
github.com/dgraph-io/ristretto v0.0.4-0.20201205013540-bafef7527542/go.mod h1:tv2ec8nA7vRpSYX7/MbP52ihrUMXIHit54CQMq8npXQ=
20+
github.com/dgraph-io/ristretto v0.0.4-0.20201224172411-e860a6c48e8a h1:jbJJPy2En2HoeNzt3C8Pc03O6+WRmle0O+xTNiORZW0=
21+
github.com/dgraph-io/ristretto v0.0.4-0.20201224172411-e860a6c48e8a/go.mod h1:tv2ec8nA7vRpSYX7/MbP52ihrUMXIHit54CQMq8npXQ=
2222
github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2 h1:tdlZCpZ/P9DhczCTSixgIKmwPv6+wP5DGjqLYw5SUiA=
2323
github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=
2424
github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=

y/bloom.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ func Hash(b []byte) uint32 {
119119
seed = 0xbc9f1d34
120120
m = 0xc6a4a793
121121
)
122-
h := uint32(seed) ^ uint32(len(b)*m)
122+
h := uint32(seed) ^ uint32(len(b))*m
123123
for ; len(b) >= 4; b = b[4:] {
124124
h += uint32(b[0]) | uint32(b[1])<<8 | uint32(b[2])<<16 | uint32(b[3])<<24
125125
h *= m

0 commit comments

Comments
 (0)