Skip to content

Commit bce069c

Browse files
Fix int overflow for 32bit (#1216)
- Fix tests for 32 bit systems - Enable 32-bit builds on Travis
1 parent e029e93 commit bce069c

File tree

4 files changed

+26
-13
lines changed

4 files changed

+26
-13
lines changed

.travis.yml

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,38 @@
11
language: go
22

33
go:
4-
- "1.11"
5-
- "1.12"
6-
- "1.13"
7-
- tip
4+
- "1.11"
5+
- "1.12"
6+
- "1.13"
7+
- tip
88
os:
9-
- osx
10-
9+
- osx
10+
env:
11+
jobs:
12+
- GOARCH=386
13+
- GOARCH=amd64
14+
global:
15+
- secure: CRkV2+/jlO0gXzzS50XGxfMS117FNwiVjxNY/LeWq06RKD+dDCPxTJl3JCNe3l0cYEPAglV2uMMYukDiTqJ7e+HI4nh4N4mv6lwx39N8dAvJe1x5ITS2T4qk4kTjuQb1Q1vw/ZOxoQqmvNKj2uRmBdJ/HHmysbRJ1OzCWML3OXdUwJf0AYlJzTjpMfkOKr7sTtE4rwyyQtd4tKH1fGdurgI9ZuFd9qvYxK2qcJhsQ6CNqMXt+7FkVkN1rIPmofjjBTNryzUr4COFXuWH95aDAif19DeBW4lbNgo1+FpDsrgmqtuhl6NAuptI8q/imow2KXBYJ8JPXsxW8DVFj0IIp0RCd3GjaEnwBEbxAyiIHLfW7AudyTS/dJOvZffPqXnuJ8xj3OPIdNe4xY0hWl8Ju2HhKfLOAHq7VadHZWd3IHLil70EiL4/JLD1rNbMImUZisFaA8pyrcIvYYebjOnk4TscwKFLedClRSX1XsMjWWd0oykQtrdkHM2IxknnBpaLu7mFnfE07f6dkG0nlpyu4SCLey7hr5FdcEmljA0nIxTSYDg6035fQkBEAbe7hlESOekkVNT9IZPwG+lmt3vU4ofi6NqNbJecOuSB+h36IiZ9s4YQtxYNnLgW14zjuFGGyT5smc3IjBT7qngDjKIgyrSVoRkY/8udy9qbUgvBeW8=
16+
17+
1118
jobs:
1219
allow_failures:
1320
- go: tip
21+
exclude:
22+
# Exclude builds for 386 architecture on go 1.11, 1.12 and tip
23+
# Since we don't want it to run for 32 bit
24+
- go: "1.11"
25+
env: GOARCH=386
26+
- go: "1.12"
27+
env: GOARCH=386
28+
- go: tip
29+
env: GOARCH=386
1430

1531
notifications:
1632
email: false
1733
slack:
1834
secure: X7uBLWYbuUhf8QFE16CoS5z7WvFR8EN9j6cEectMW6mKZ3vwXGwVXRIPsgUq/606DsQdCCx34MR8MRWYGlu6TBolbSe9y0EP0i46yipPz22YtuT7umcVUbGEyx8MZKgG0v1u/zA0O4aCsOBpGAA3gxz8h3JlEHDt+hv6U8xRsSllVLzLSNb5lwxDtcfEDxVVqP47GMEgjLPM28Pyt5qwjk7o5a4YSVzkfdxBXxd3gWzFUWzJ5E3cTacli50dK4GVfiLcQY2aQYoYO7AAvDnvP+TPfjDkBlUEE4MUz5CDIN51Xb+WW33sX7g+r3Bj7V5IRcF973RiYkpEh+3eoiPnyWyxhDZBYilty3b+Hysp6d4Ov/3I3ll7Bcny5+cYjakjkMH3l9w3gs6Y82GlpSLSJshKWS8vPRsxFe0Pstj6QSJXTd9EBaFr+l1ScXjJv/Sya9j8N9FfTuOTESWuaL1auX4Y7zEEVHlA8SCNOO8K0eTfxGZnC/YcIHsR8rePEAcFxfOYQppkyLF/XvAtnb/LMUuu0g4y2qNdme6Oelvyar1tFEMRtbl4mRCdu/krXBFtkrsfUaVY6WTPdvXAGotsFJ0wuA53zGVhlcd3+xAlSlR3c1QX95HIMeivJKb5L4nTjP+xnrmQNtnVk+tG4LSH2ltuwcZSSczModtcBmRefrk=
1935

20-
env:
21-
global:
22-
- secure: CRkV2+/jlO0gXzzS50XGxfMS117FNwiVjxNY/LeWq06RKD+dDCPxTJl3JCNe3l0cYEPAglV2uMMYukDiTqJ7e+HI4nh4N4mv6lwx39N8dAvJe1x5ITS2T4qk4kTjuQb1Q1vw/ZOxoQqmvNKj2uRmBdJ/HHmysbRJ1OzCWML3OXdUwJf0AYlJzTjpMfkOKr7sTtE4rwyyQtd4tKH1fGdurgI9ZuFd9qvYxK2qcJhsQ6CNqMXt+7FkVkN1rIPmofjjBTNryzUr4COFXuWH95aDAif19DeBW4lbNgo1+FpDsrgmqtuhl6NAuptI8q/imow2KXBYJ8JPXsxW8DVFj0IIp0RCd3GjaEnwBEbxAyiIHLfW7AudyTS/dJOvZffPqXnuJ8xj3OPIdNe4xY0hWl8Ju2HhKfLOAHq7VadHZWd3IHLil70EiL4/JLD1rNbMImUZisFaA8pyrcIvYYebjOnk4TscwKFLedClRSX1XsMjWWd0oykQtrdkHM2IxknnBpaLu7mFnfE07f6dkG0nlpyu4SCLey7hr5FdcEmljA0nIxTSYDg6035fQkBEAbe7hlESOekkVNT9IZPwG+lmt3vU4ofi6NqNbJecOuSB+h36IiZ9s4YQtxYNnLgW14zjuFGGyT5smc3IjBT7qngDjKIgyrSVoRkY/8udy9qbUgvBeW8=
23-
2436
before_script:
2537
- go get github.com/mattn/goveralls
2638
script:

db2_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import (
2323
"fmt"
2424
"io/ioutil"
2525
"log"
26+
"math"
2627
"math/rand"
2728
"os"
2829
"path"
@@ -310,7 +311,7 @@ func TestPushValueLogLimit(t *testing.T) {
310311

311312
for i := 0; i < 32; i++ {
312313
if i == 4 {
313-
v := make([]byte, 2<<30)
314+
v := make([]byte, math.MaxInt32)
314315
err := db.Update(func(txn *Txn) error {
315316
return txn.SetEntry(NewEntry([]byte(key(i)), v))
316317
})

levels_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ func TestDiscardTs(t *testing.T) {
393393
func TestDiscardFirstVersion(t *testing.T) {
394394
opt := DefaultOptions("")
395395
opt.NumCompactors = 0
396-
opt.NumVersionsToKeep = math.MaxUint32
396+
opt.NumVersionsToKeep = math.MaxInt32
397397
opt.managedTxns = true
398398

399399
runBadgerTest(t, &opt, func(t *testing.T, db *DB) {

table/builder_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,11 @@ func TestTableIndex(t *testing.T) {
8080
require.NoError(t, err, "unable to write to file")
8181

8282
tbl, err := OpenTable(f, opt)
83+
require.NoError(t, err, "unable to open table")
8384
if opt.DataKey == nil {
8485
// key id is zero if thre is no datakey.
8586
require.Equal(t, tbl.KeyID(), uint64(0))
8687
}
87-
require.NoError(t, err, "unable to open table")
8888

8989
// Ensure index is built correctly
9090
require.Equal(t, blockCount, len(tbl.blockIndex))

0 commit comments

Comments
 (0)