Skip to content

Commit 55fadce

Browse files
CascadingRadiumabhinavdangeti
CascadingRadium
and
abhinavdangeti
authored
Upgrade RoaringBitmap/roaring/v2, vellum, mmap-go etc. (#360)
- Works with .. - blevesearch/mmap-go#6 - blevesearch/vellum#25 - blevesearch/scorch_segment_api#70 - Enable windows testing workflow - Fixes: #31 --------- Co-authored-by: Abhinav Dangeti <abhinav@couchbase.com>
1 parent 62623f6 commit 55fadce

7 files changed

Lines changed: 151 additions & 124 deletions

File tree

‎.github/workflows/tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
strategy:
1616
matrix:
1717
go-version: [1.23.x, 1.24.x, 1.25.x]
18-
platform: [ubuntu-latest, macos-latest]
18+
platform: [ubuntu-latest, macos-latest, windows-latest]
1919
runs-on: ${{ matrix.platform }}
2020
steps:
2121
- name: Install Go

‎build_test.go‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,26 @@ package zap
1616

1717
import (
1818
"os"
19+
"path/filepath"
1920
"testing"
2021

2122
index "github.com/blevesearch/bleve_index_api"
2223
)
2324

25+
// getTempPath returns a cross-platform temporary file path for testing
26+
func getTempPath(filename string) string {
27+
return filepath.Join(os.TempDir(), filename)
28+
}
29+
2430
func TestBuild(t *testing.T) {
25-
_ = os.RemoveAll("/tmp/scorch.zap")
31+
tmpPath := getTempPath("scorch.zap")
32+
_ = os.RemoveAll(tmpPath)
2633

2734
sb, _, err := buildTestSegment()
2835
if err != nil {
2936
t.Fatal(err)
3037
}
31-
err = PersistSegmentBase(sb, "/tmp/scorch.zap")
38+
err = PersistSegmentBase(sb, tmpPath)
3239
if err != nil {
3340
t.Fatal(err)
3441
}

‎dict_test.go‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,16 @@ func buildTestSegmentForDict() (*SegmentBase, uint64, error) {
3939
}
4040

4141
func TestDictionary(t *testing.T) {
42-
_ = os.RemoveAll("/tmp/scorch.zap")
42+
tmpPath := getTempPath("scorch.zap")
43+
_ = os.RemoveAll(tmpPath)
4344

4445
testSeg, _, _ := buildTestSegmentForDict()
45-
err := PersistSegmentBase(testSeg, "/tmp/scorch.zap")
46+
err := PersistSegmentBase(testSeg, tmpPath)
4647
if err != nil {
4748
t.Fatalf("error persisting segment: %v", err)
4849
}
4950

50-
segment, err := zapPlugin.Open("/tmp/scorch.zap")
51+
segment, err := zapPlugin.Open(tmpPath)
5152
if err != nil {
5253
t.Fatalf("error opening segment: %v", err)
5354
}
@@ -125,15 +126,16 @@ func TestDictionaryError(t *testing.T) {
125126
hash[uint8(i)] = *lb
126127
}
127128

128-
_ = os.RemoveAll("/tmp/scorch.zap")
129+
tmpPath := getTempPath("scorch.zap")
130+
_ = os.RemoveAll(tmpPath)
129131

130132
testSeg, _, _ := buildTestSegmentForDict()
131-
err := PersistSegmentBase(testSeg, "/tmp/scorch.zap")
133+
err := PersistSegmentBase(testSeg, tmpPath)
132134
if err != nil {
133135
t.Fatalf("error persisting segment: %v", err)
134136
}
135137

136-
segment, err := zapPlugin.Open("/tmp/scorch.zap")
138+
segment, err := zapPlugin.Open(tmpPath)
137139
if err != nil {
138140
t.Fatalf("error opening segment: %v", err)
139141
}
@@ -228,15 +230,16 @@ func TestDictionaryError(t *testing.T) {
228230
}
229231

230232
func TestDictionaryBug1156(t *testing.T) {
231-
_ = os.RemoveAll("/tmp/scorch.zap")
233+
tmpPath := getTempPath("scorch.zap")
234+
_ = os.RemoveAll(tmpPath)
232235

233236
testSeg, _, _ := buildTestSegmentForDict()
234-
err := PersistSegmentBase(testSeg, "/tmp/scorch.zap")
237+
err := PersistSegmentBase(testSeg, tmpPath)
235238
if err != nil {
236239
t.Fatalf("error persisting segment: %v", err)
237240
}
238241

239-
segment, err := zapPlugin.Open("/tmp/scorch.zap")
242+
segment, err := zapPlugin.Open(tmpPath)
240243
if err != nil {
241244
t.Fatalf("error opening segment: %v", err)
242245
}

‎go.mod‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
module github.com/blevesearch/zapx/v17
22

3-
go 1.24
3+
go 1.24.0
44

55
require (
6-
github.com/RoaringBitmap/roaring/v2 v2.4.5
7-
github.com/blevesearch/bleve_index_api v1.3.0
6+
github.com/RoaringBitmap/roaring/v2 v2.14.4
7+
github.com/blevesearch/bleve_index_api v1.3.1
88
github.com/blevesearch/go-faiss v1.0.27
9-
github.com/blevesearch/mmap-go v1.0.4
10-
github.com/blevesearch/scorch_segment_api/v2 v2.4.0
11-
github.com/blevesearch/vellum v1.1.0
12-
github.com/golang/snappy v0.0.4
13-
github.com/spf13/cobra v1.7.0
9+
github.com/blevesearch/mmap-go v1.2.0
10+
github.com/blevesearch/scorch_segment_api/v2 v2.4.1
11+
github.com/blevesearch/vellum v1.2.0
12+
github.com/golang/snappy v1.0.0
13+
github.com/spf13/cobra v1.10.2
1414
)
1515

1616
require (
17-
github.com/bits-and-blooms/bitset v1.22.0 // indirect
17+
github.com/bits-and-blooms/bitset v1.24.2 // indirect
1818
github.com/inconshreveable/mousetrap v1.1.0 // indirect
1919
github.com/mschoch/smat v0.2.0 // indirect
20-
github.com/spf13/pflag v1.0.5 // indirect
21-
golang.org/x/sys v0.13.0 // indirect
20+
github.com/spf13/pflag v1.0.9 // indirect
21+
golang.org/x/sys v0.40.0 // indirect
2222
)

‎go.sum‎

Lines changed: 24 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,22 @@
1-
github.com/RoaringBitmap/roaring/v2 v2.4.5 h1:uGrrMreGjvAtTBobc0g5IrW1D5ldxDQYe2JW2gggRdg=
2-
github.com/RoaringBitmap/roaring/v2 v2.4.5/go.mod h1:FiJcsfkGje/nZBZgCu0ZxCPOKD/hVXDS2dXi7/eUFE0=
3-
github.com/bits-and-blooms/bitset v1.12.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8=
4-
github.com/bits-and-blooms/bitset v1.22.0 h1:Tquv9S8+SGaS3EhyA+up3FXzmkhxPGjQQCkcs2uw7w4=
5-
github.com/bits-and-blooms/bitset v1.22.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8=
6-
github.com/blevesearch/bleve_index_api v1.3.0 h1:DsMpWVjFNlBw9/6pyWf59XoqcAkhHj3H0UWiQsavb6E=
7-
github.com/blevesearch/bleve_index_api v1.3.0/go.mod h1:xvd48t5XMeeioWQ5/jZvgLrV98flT2rdvEJ3l/ki4Ko=
1+
github.com/RoaringBitmap/roaring/v2 v2.14.4 h1:4aKySrrg9G/5oRtJ3TrZLObVqxgQ9f1znCRBwEwjuVw=
2+
github.com/RoaringBitmap/roaring/v2 v2.14.4/go.mod h1:oMvV6omPWr+2ifRdeZvVJyaz+aoEUopyv5iH0u/+wbY=
3+
github.com/bits-and-blooms/bitset v1.24.2 h1:M7/NzVbsytmtfHbumG+K2bremQPMJuqv1JD3vOaFxp0=
4+
github.com/bits-and-blooms/bitset v1.24.2/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8=
5+
github.com/blevesearch/bleve_index_api v1.3.1 h1:LdH3CQgBbIZ5UI/5Pykz87e0jfeQtVnrdZ2WUBrHHwU=
6+
github.com/blevesearch/bleve_index_api v1.3.1/go.mod h1:xvd48t5XMeeioWQ5/jZvgLrV98flT2rdvEJ3l/ki4Ko=
87
github.com/blevesearch/go-faiss v1.0.27 h1:7cBImYDDQ82WJd5RUZ1ie6zXztCsC73W94ZzwOjkatk=
98
github.com/blevesearch/go-faiss v1.0.27/go.mod h1:OMGQwOaRRYxrmeNdMrXJPvVx8gBnvE5RYrr0BahNnkk=
10-
github.com/blevesearch/mmap-go v1.0.4 h1:OVhDhT5B/M1HNPpYPBKIEJaD0F3Si+CrEKULGCDPWmc=
11-
github.com/blevesearch/mmap-go v1.0.4/go.mod h1:EWmEAOmdAS9z/pi/+Toxu99DnsbhG1TIxUoRmJw/pSs=
12-
github.com/blevesearch/scorch_segment_api/v2 v2.4.0 h1:OtipwURRzZv6UFmHQnbEqOY90eotINQ2TtSSpWfYuWU=
13-
github.com/blevesearch/scorch_segment_api/v2 v2.4.0/go.mod h1:JalWE/eyEgISwhqtKXoaHMKf5t+F4kXiYrgg0ds3ylw=
14-
github.com/blevesearch/vellum v1.1.0 h1:CinkGyIsgVlYf8Y2LUQHvdelgXr6PYuvoDIajq6yR9w=
15-
github.com/blevesearch/vellum v1.1.0/go.mod h1:QgwWryE8ThtNPxtgWJof5ndPfx0/YMBh+W2weHKPw8Y=
16-
github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
17-
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
9+
github.com/blevesearch/mmap-go v1.2.0 h1:l33nNKPFcBjJUMwem6sAYJPUzhUCABoK9FxZDGiFNBI=
10+
github.com/blevesearch/mmap-go v1.2.0/go.mod h1:Vd6+20GBhEdwJnU1Xohgt88XCD/CTWcqbCNxkZpyBo0=
11+
github.com/blevesearch/scorch_segment_api/v2 v2.4.1 h1:os52/JeCSLZ0YUkOuLk/Z7pu0SKUMofDPUg+VnbrRD0=
12+
github.com/blevesearch/scorch_segment_api/v2 v2.4.1/go.mod h1:zvilBm4BNfbnTRLW7KgCTNgk2R31JaWzwRc2BEcD7Is=
13+
github.com/blevesearch/vellum v1.2.0 h1:xkDiOEsHc2t3Cp0NsNZZ36pvc130sCzcGKOPMzXe+e0=
14+
github.com/blevesearch/vellum v1.2.0/go.mod h1:uEcfBJz7mAOf0Kvq6qoEKQQkLODBF46SINYNkZNae4k=
15+
github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
1816
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
1917
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
20-
github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
21-
github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
18+
github.com/golang/snappy v1.0.0 h1:Oy607GVXHs7RtbggtPBnr2RmDArIsAefDwvrdWvRhGs=
19+
github.com/golang/snappy v1.0.0/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
2220
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
2321
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
2422
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
@@ -28,18 +26,15 @@ github.com/mschoch/smat v0.2.0/go.mod h1:kc9mz7DoBKqDyiRL7VZN8KvXQMWeTaVnttLRXOl
2826
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
2927
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
3028
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
31-
github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I=
32-
github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0=
33-
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
34-
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
35-
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
36-
github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
37-
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
38-
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
39-
golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
40-
golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
29+
github.com/spf13/cobra v1.10.2 h1:DMTTonx5m65Ic0GOoRY2c16WCbHxOOw6xxezuLaBpcU=
30+
github.com/spf13/cobra v1.10.2/go.mod h1:7C1pvHqHw5A4vrJfjNwvOdzYu0Gml16OCs2GRiTUUS4=
31+
github.com/spf13/pflag v1.0.9 h1:9exaQaMOCwffKiiiYk6/BndUBv+iRViNW+4lEMi0PvY=
32+
github.com/spf13/pflag v1.0.9/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
33+
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
34+
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
35+
go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
36+
golang.org/x/sys v0.40.0 h1:DBZZqJ2Rkml6QMQsZywtnjnnGvHza6BTfYFWY9kjEWQ=
37+
golang.org/x/sys v0.40.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
4138
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
42-
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
43-
gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
4439
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
4540
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

0 commit comments

Comments
 (0)