From 596873df0aee18d4c0df86e315eb474d614355c2 Mon Sep 17 00:00:00 2001 From: Rahul Rampure Date: Fri, 9 Jan 2026 18:00:01 +0530 Subject: [PATCH 1/9] [v17] Upgrade deps --- go.mod | 14 +++++++------- go.sum | 37 +++++++++++++++++-------------------- 2 files changed, 24 insertions(+), 27 deletions(-) diff --git a/go.mod b/go.mod index 3bf320d1..fabc3892 100644 --- a/go.mod +++ b/go.mod @@ -1,22 +1,22 @@ module github.com/blevesearch/zapx/v16 -go 1.23 +go 1.24.0 require ( - github.com/RoaringBitmap/roaring/v2 v2.4.5 - github.com/bits-and-blooms/bitset v1.22.0 + github.com/RoaringBitmap/roaring/v2 v2.14.4 + github.com/bits-and-blooms/bitset v1.24.4 github.com/blevesearch/bleve_index_api v1.2.11 github.com/blevesearch/go-faiss v1.0.26 github.com/blevesearch/mmap-go v1.0.4 github.com/blevesearch/scorch_segment_api/v2 v2.3.13 github.com/blevesearch/vellum v1.1.0 - github.com/golang/snappy v0.0.4 - github.com/spf13/cobra v1.7.0 + github.com/golang/snappy v1.0.0 + github.com/spf13/cobra v1.10.2 ) require ( github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/mschoch/smat v0.2.0 // indirect - github.com/spf13/pflag v1.0.5 // indirect - golang.org/x/sys v0.13.0 // indirect + github.com/spf13/pflag v1.0.10 // indirect + golang.org/x/sys v0.40.0 // indirect ) diff --git a/go.sum b/go.sum index 1555d8e7..faa00d58 100644 --- a/go.sum +++ b/go.sum @@ -1,8 +1,7 @@ -github.com/RoaringBitmap/roaring/v2 v2.4.5 h1:uGrrMreGjvAtTBobc0g5IrW1D5ldxDQYe2JW2gggRdg= -github.com/RoaringBitmap/roaring/v2 v2.4.5/go.mod h1:FiJcsfkGje/nZBZgCu0ZxCPOKD/hVXDS2dXi7/eUFE0= -github.com/bits-and-blooms/bitset v1.12.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8= -github.com/bits-and-blooms/bitset v1.22.0 h1:Tquv9S8+SGaS3EhyA+up3FXzmkhxPGjQQCkcs2uw7w4= -github.com/bits-and-blooms/bitset v1.22.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8= +github.com/RoaringBitmap/roaring/v2 v2.14.4 h1:4aKySrrg9G/5oRtJ3TrZLObVqxgQ9f1znCRBwEwjuVw= +github.com/RoaringBitmap/roaring/v2 v2.14.4/go.mod h1:oMvV6omPWr+2ifRdeZvVJyaz+aoEUopyv5iH0u/+wbY= +github.com/bits-and-blooms/bitset v1.24.4 h1:95H15Og1clikBrKr/DuzMXkQzECs1M6hhoGXLwLQOZE= +github.com/bits-and-blooms/bitset v1.24.4/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8= github.com/blevesearch/bleve_index_api v1.2.11 h1:bXQ54kVuwP8hdrXUSOnvTQfgK0KI1+f9A0ITJT8tX1s= github.com/blevesearch/bleve_index_api v1.2.11/go.mod h1:rKQDl4u51uwafZxFrPD1R7xFOwKnzZW7s/LSeK4lgo0= github.com/blevesearch/go-faiss v1.0.26 h1:4dRLolFgjPyjkaXwff4NfbZFdE/dfywbzDqporeQvXI= @@ -13,12 +12,11 @@ github.com/blevesearch/scorch_segment_api/v2 v2.3.13 h1:ZPjv/4VwWvHJZKeMSgScCapO github.com/blevesearch/scorch_segment_api/v2 v2.3.13/go.mod h1:ENk2LClTehOuMS8XzN3UxBEErYmtwkE7MAArFTXs9Vc= github.com/blevesearch/vellum v1.1.0 h1:CinkGyIsgVlYf8Y2LUQHvdelgXr6PYuvoDIajq6yR9w= github.com/blevesearch/vellum v1.1.0/go.mod h1:QgwWryE8ThtNPxtgWJof5ndPfx0/YMBh+W2weHKPw8Y= -github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= -github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/golang/snappy v1.0.0 h1:Oy607GVXHs7RtbggtPBnr2RmDArIsAefDwvrdWvRhGs= +github.com/golang/snappy v1.0.0/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= @@ -28,18 +26,17 @@ github.com/mschoch/smat v0.2.0/go.mod h1:kc9mz7DoBKqDyiRL7VZN8KvXQMWeTaVnttLRXOl github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I= -github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0= -github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= -github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= -github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/spf13/cobra v1.10.2 h1:DMTTonx5m65Ic0GOoRY2c16WCbHxOOw6xxezuLaBpcU= +github.com/spf13/cobra v1.10.2/go.mod h1:7C1pvHqHw5A4vrJfjNwvOdzYu0Gml16OCs2GRiTUUS4= +github.com/spf13/pflag v1.0.9/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk= +github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= +github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= +go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= -golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.40.0 h1:DBZZqJ2Rkml6QMQsZywtnjnnGvHza6BTfYFWY9kjEWQ= +golang.org/x/sys v0.40.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= From 29ace330e2e52122cd3d112a5496e48f3a7a67fd Mon Sep 17 00:00:00 2001 From: Rahul Rampure Date: Tue, 13 Jan 2026 19:26:43 +0530 Subject: [PATCH 2/9] go mod tidy --- go.mod | 4 ++-- go.sum | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index b49ee1fe..997809e7 100644 --- a/go.mod +++ b/go.mod @@ -17,6 +17,6 @@ require ( github.com/bits-and-blooms/bitset v1.24.2 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/mschoch/smat v0.2.0 // indirect - github.com/spf13/pflag v1.0.10 // indirect - golang.org/x/sys v0.40.0 // indirect + github.com/spf13/pflag v1.0.9 // indirect + golang.org/x/sys v0.13.0 // indirect ) diff --git a/go.sum b/go.sum index bb234232..cecbe8a2 100644 --- a/go.sum +++ b/go.sum @@ -28,15 +28,14 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/spf13/cobra v1.10.2 h1:DMTTonx5m65Ic0GOoRY2c16WCbHxOOw6xxezuLaBpcU= github.com/spf13/cobra v1.10.2/go.mod h1:7C1pvHqHw5A4vrJfjNwvOdzYu0Gml16OCs2GRiTUUS4= +github.com/spf13/pflag v1.0.9 h1:9exaQaMOCwffKiiiYk6/BndUBv+iRViNW+4lEMi0PvY= github.com/spf13/pflag v1.0.9/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk= -github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.40.0 h1:DBZZqJ2Rkml6QMQsZywtnjnnGvHza6BTfYFWY9kjEWQ= -golang.org/x/sys v0.40.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= +golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= +golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= From 19ff6bb970d73f2367b9e72a0058b38980ea8176 Mon Sep 17 00:00:00 2001 From: Rahul Rampure Date: Mon, 19 Jan 2026 16:02:45 +0530 Subject: [PATCH 3/9] upgrade vellum --- go.mod | 6 +++--- go.sum | 13 ++++++------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index 259939fc..e4cdce1c 100644 --- a/go.mod +++ b/go.mod @@ -6,9 +6,9 @@ require ( github.com/RoaringBitmap/roaring/v2 v2.14.4 github.com/blevesearch/bleve_index_api v1.3.0 github.com/blevesearch/go-faiss v1.0.27 - github.com/blevesearch/mmap-go v1.0.4 + github.com/blevesearch/mmap-go v1.0.5-0.20260117035204-c9673698c605 github.com/blevesearch/scorch_segment_api/v2 v2.4.0 - github.com/blevesearch/vellum v1.1.0 + github.com/blevesearch/vellum v1.1.1-0.20260119103103-e6cfa6f86fd5 github.com/golang/snappy v1.0.0 github.com/spf13/cobra v1.10.2 ) @@ -18,5 +18,5 @@ require ( github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/mschoch/smat v0.2.0 // indirect github.com/spf13/pflag v1.0.9 // indirect - golang.org/x/sys v0.13.0 // indirect + golang.org/x/sys v0.40.0 // indirect ) diff --git a/go.sum b/go.sum index 9a54e141..ed364eb8 100644 --- a/go.sum +++ b/go.sum @@ -6,12 +6,12 @@ github.com/blevesearch/bleve_index_api v1.3.0 h1:DsMpWVjFNlBw9/6pyWf59XoqcAkhHj3 github.com/blevesearch/bleve_index_api v1.3.0/go.mod h1:xvd48t5XMeeioWQ5/jZvgLrV98flT2rdvEJ3l/ki4Ko= github.com/blevesearch/go-faiss v1.0.27 h1:7cBImYDDQ82WJd5RUZ1ie6zXztCsC73W94ZzwOjkatk= github.com/blevesearch/go-faiss v1.0.27/go.mod h1:OMGQwOaRRYxrmeNdMrXJPvVx8gBnvE5RYrr0BahNnkk= -github.com/blevesearch/mmap-go v1.0.4 h1:OVhDhT5B/M1HNPpYPBKIEJaD0F3Si+CrEKULGCDPWmc= -github.com/blevesearch/mmap-go v1.0.4/go.mod h1:EWmEAOmdAS9z/pi/+Toxu99DnsbhG1TIxUoRmJw/pSs= +github.com/blevesearch/mmap-go v1.0.5-0.20260117035204-c9673698c605 h1:CrUJKyyqwoCSfP29JrcRJdkDF8GiQLtgd41R8isWZUo= +github.com/blevesearch/mmap-go v1.0.5-0.20260117035204-c9673698c605/go.mod h1:Vd6+20GBhEdwJnU1Xohgt88XCD/CTWcqbCNxkZpyBo0= github.com/blevesearch/scorch_segment_api/v2 v2.4.0 h1:OtipwURRzZv6UFmHQnbEqOY90eotINQ2TtSSpWfYuWU= github.com/blevesearch/scorch_segment_api/v2 v2.4.0/go.mod h1:JalWE/eyEgISwhqtKXoaHMKf5t+F4kXiYrgg0ds3ylw= -github.com/blevesearch/vellum v1.1.0 h1:CinkGyIsgVlYf8Y2LUQHvdelgXr6PYuvoDIajq6yR9w= -github.com/blevesearch/vellum v1.1.0/go.mod h1:QgwWryE8ThtNPxtgWJof5ndPfx0/YMBh+W2weHKPw8Y= +github.com/blevesearch/vellum v1.1.1-0.20260119103103-e6cfa6f86fd5 h1:Lga4jDTnEusailmfZ69wArKL+LM9AlMchEf2yaggmhQ= +github.com/blevesearch/vellum v1.1.1-0.20260119103103-e6cfa6f86fd5/go.mod h1:9Io8XGqJjvVCzrJcXx5h8Bfx01bw0ovmym4FPGK/2Po= github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -33,9 +33,8 @@ github.com/spf13/pflag v1.0.9/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg= -golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= -golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.40.0 h1:DBZZqJ2Rkml6QMQsZywtnjnnGvHza6BTfYFWY9kjEWQ= +golang.org/x/sys v0.40.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= From 27edfd6e06326b147667ed4ffd76d3dff92fb6c1 Mon Sep 17 00:00:00 2001 From: Abhinav Dangeti Date: Thu, 22 Jan 2026 11:36:46 -0700 Subject: [PATCH 4/9] go mod tidy --- go.mod | 6 +++--- go.sum | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index e4cdce1c..39cd6a31 100644 --- a/go.mod +++ b/go.mod @@ -6,9 +6,9 @@ require ( github.com/RoaringBitmap/roaring/v2 v2.14.4 github.com/blevesearch/bleve_index_api v1.3.0 github.com/blevesearch/go-faiss v1.0.27 - github.com/blevesearch/mmap-go v1.0.5-0.20260117035204-c9673698c605 - github.com/blevesearch/scorch_segment_api/v2 v2.4.0 - github.com/blevesearch/vellum v1.1.1-0.20260119103103-e6cfa6f86fd5 + github.com/blevesearch/mmap-go v1.2.0 + github.com/blevesearch/scorch_segment_api/v2 v2.4.1-0.20260122183352-acd9a30e3a55 + github.com/blevesearch/vellum v1.2.0 github.com/golang/snappy v1.0.0 github.com/spf13/cobra v1.10.2 ) diff --git a/go.sum b/go.sum index ed364eb8..1d61c234 100644 --- a/go.sum +++ b/go.sum @@ -6,12 +6,12 @@ github.com/blevesearch/bleve_index_api v1.3.0 h1:DsMpWVjFNlBw9/6pyWf59XoqcAkhHj3 github.com/blevesearch/bleve_index_api v1.3.0/go.mod h1:xvd48t5XMeeioWQ5/jZvgLrV98flT2rdvEJ3l/ki4Ko= github.com/blevesearch/go-faiss v1.0.27 h1:7cBImYDDQ82WJd5RUZ1ie6zXztCsC73W94ZzwOjkatk= github.com/blevesearch/go-faiss v1.0.27/go.mod h1:OMGQwOaRRYxrmeNdMrXJPvVx8gBnvE5RYrr0BahNnkk= -github.com/blevesearch/mmap-go v1.0.5-0.20260117035204-c9673698c605 h1:CrUJKyyqwoCSfP29JrcRJdkDF8GiQLtgd41R8isWZUo= -github.com/blevesearch/mmap-go v1.0.5-0.20260117035204-c9673698c605/go.mod h1:Vd6+20GBhEdwJnU1Xohgt88XCD/CTWcqbCNxkZpyBo0= -github.com/blevesearch/scorch_segment_api/v2 v2.4.0 h1:OtipwURRzZv6UFmHQnbEqOY90eotINQ2TtSSpWfYuWU= -github.com/blevesearch/scorch_segment_api/v2 v2.4.0/go.mod h1:JalWE/eyEgISwhqtKXoaHMKf5t+F4kXiYrgg0ds3ylw= -github.com/blevesearch/vellum v1.1.1-0.20260119103103-e6cfa6f86fd5 h1:Lga4jDTnEusailmfZ69wArKL+LM9AlMchEf2yaggmhQ= -github.com/blevesearch/vellum v1.1.1-0.20260119103103-e6cfa6f86fd5/go.mod h1:9Io8XGqJjvVCzrJcXx5h8Bfx01bw0ovmym4FPGK/2Po= +github.com/blevesearch/mmap-go v1.2.0 h1:l33nNKPFcBjJUMwem6sAYJPUzhUCABoK9FxZDGiFNBI= +github.com/blevesearch/mmap-go v1.2.0/go.mod h1:Vd6+20GBhEdwJnU1Xohgt88XCD/CTWcqbCNxkZpyBo0= +github.com/blevesearch/scorch_segment_api/v2 v2.4.1-0.20260122183352-acd9a30e3a55 h1:Qymtqg3t3D/vM6o7gLC6LXS/4rbsmuoW2Ma984QVdpY= +github.com/blevesearch/scorch_segment_api/v2 v2.4.1-0.20260122183352-acd9a30e3a55/go.mod h1:/7t047MtOtLsdLwd+dDgrtyxzV+FK4GP24LuUAQmib4= +github.com/blevesearch/vellum v1.2.0 h1:xkDiOEsHc2t3Cp0NsNZZ36pvc130sCzcGKOPMzXe+e0= +github.com/blevesearch/vellum v1.2.0/go.mod h1:uEcfBJz7mAOf0Kvq6qoEKQQkLODBF46SINYNkZNae4k= github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= From a2b5abee8c9b34957702eac3ef1867c0424ca1fa Mon Sep 17 00:00:00 2001 From: Abhinav Dangeti Date: Thu, 22 Jan 2026 11:57:13 -0700 Subject: [PATCH 5/9] Add windows worklow --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 5a541199..8c846d3f 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -15,7 +15,7 @@ jobs: strategy: matrix: go-version: [1.23.x, 1.24.x, 1.25.x] - platform: [ubuntu-latest, macos-latest] + platform: [ubuntu-latest, macos-latest, windows-latest] runs-on: ${{ matrix.platform }} steps: - name: Install Go From 25acc11c70534328e07d1f1874913a27127718f6 Mon Sep 17 00:00:00 2001 From: Abhinav Dangeti Date: Thu, 22 Jan 2026 12:00:05 -0700 Subject: [PATCH 6/9] Disable certain testing on windows --- build_test.go | 3 +++ dict_test.go | 3 +++ merge_test.go | 3 +++ nested_test.go | 3 +++ segment_test.go | 3 +++ thesaurus_test.go | 3 +++ 6 files changed, 18 insertions(+) diff --git a/build_test.go b/build_test.go index 605350a3..248ecbf4 100644 --- a/build_test.go +++ b/build_test.go @@ -12,6 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !windows +// +build !windows + package zap import ( diff --git a/dict_test.go b/dict_test.go index cc1c4bf6..f3c76332 100644 --- a/dict_test.go +++ b/dict_test.go @@ -12,6 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !windows +// +build !windows + package zap import ( diff --git a/merge_test.go b/merge_test.go index 3abf58b3..b28deb27 100644 --- a/merge_test.go +++ b/merge_test.go @@ -12,6 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !windows +// +build !windows + package zap import ( diff --git a/nested_test.go b/nested_test.go index 7a99f66e..ba45d96b 100644 --- a/nested_test.go +++ b/nested_test.go @@ -12,6 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !windows +// +build !windows + package zap import ( diff --git a/segment_test.go b/segment_test.go index 15a1869e..ef53f2a3 100644 --- a/segment_test.go +++ b/segment_test.go @@ -12,6 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !windows +// +build !windows + package zap import ( diff --git a/thesaurus_test.go b/thesaurus_test.go index 582cb928..b2ba3a19 100644 --- a/thesaurus_test.go +++ b/thesaurus_test.go @@ -12,6 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. +//go:build !windows +// +build !windows + package zap import ( From f9c8329e8fcd22d462e258b8bf3d72e1c289df4e Mon Sep 17 00:00:00 2001 From: Rahul Rampure Date: Fri, 23 Jan 2026 00:57:48 +0530 Subject: [PATCH 7/9] Fix unit tests on windows --- .github/workflows/tests.yml | 2 +- build_test.go | 11 +++- dict_test.go | 21 ++++---- merge_test.go | 104 ++++++++++++++++++++---------------- segment_test.go | 62 +++++++++++---------- 5 files changed, 116 insertions(+), 84 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 5a541199..8c846d3f 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -15,7 +15,7 @@ jobs: strategy: matrix: go-version: [1.23.x, 1.24.x, 1.25.x] - platform: [ubuntu-latest, macos-latest] + platform: [ubuntu-latest, macos-latest, windows-latest] runs-on: ${{ matrix.platform }} steps: - name: Install Go diff --git a/build_test.go b/build_test.go index 605350a3..4221e5ad 100644 --- a/build_test.go +++ b/build_test.go @@ -16,19 +16,26 @@ package zap import ( "os" + "path/filepath" "testing" index "github.com/blevesearch/bleve_index_api" ) +// getTempPath returns a cross-platform temporary file path for testing +func getTempPath(filename string) string { + return filepath.Join(os.TempDir(), filename) +} + func TestBuild(t *testing.T) { - _ = os.RemoveAll("/tmp/scorch.zap") + tmpPath := getTempPath("scorch.zap") + _ = os.RemoveAll(tmpPath) sb, _, err := buildTestSegment() if err != nil { t.Fatal(err) } - err = PersistSegmentBase(sb, "/tmp/scorch.zap") + err = PersistSegmentBase(sb, tmpPath) if err != nil { t.Fatal(err) } diff --git a/dict_test.go b/dict_test.go index cc1c4bf6..6a06ce90 100644 --- a/dict_test.go +++ b/dict_test.go @@ -39,15 +39,16 @@ func buildTestSegmentForDict() (*SegmentBase, uint64, error) { } func TestDictionary(t *testing.T) { - _ = os.RemoveAll("/tmp/scorch.zap") + tmpPath := getTempPath("scorch.zap") + _ = os.RemoveAll(tmpPath) testSeg, _, _ := buildTestSegmentForDict() - err := PersistSegmentBase(testSeg, "/tmp/scorch.zap") + err := PersistSegmentBase(testSeg, tmpPath) if err != nil { t.Fatalf("error persisting segment: %v", err) } - segment, err := zapPlugin.Open("/tmp/scorch.zap") + segment, err := zapPlugin.Open(tmpPath) if err != nil { t.Fatalf("error opening segment: %v", err) } @@ -125,15 +126,16 @@ func TestDictionaryError(t *testing.T) { hash[uint8(i)] = *lb } - _ = os.RemoveAll("/tmp/scorch.zap") + tmpPath := getTempPath("scorch.zap") + _ = os.RemoveAll(tmpPath) testSeg, _, _ := buildTestSegmentForDict() - err := PersistSegmentBase(testSeg, "/tmp/scorch.zap") + err := PersistSegmentBase(testSeg, tmpPath) if err != nil { t.Fatalf("error persisting segment: %v", err) } - segment, err := zapPlugin.Open("/tmp/scorch.zap") + segment, err := zapPlugin.Open(tmpPath) if err != nil { t.Fatalf("error opening segment: %v", err) } @@ -228,15 +230,16 @@ func TestDictionaryError(t *testing.T) { } func TestDictionaryBug1156(t *testing.T) { - _ = os.RemoveAll("/tmp/scorch.zap") + tmpPath := getTempPath("scorch.zap") + _ = os.RemoveAll(tmpPath) testSeg, _, _ := buildTestSegmentForDict() - err := PersistSegmentBase(testSeg, "/tmp/scorch.zap") + err := PersistSegmentBase(testSeg, tmpPath) if err != nil { t.Fatalf("error persisting segment: %v", err) } - segment, err := zapPlugin.Open("/tmp/scorch.zap") + segment, err := zapPlugin.Open(tmpPath) if err != nil { t.Fatalf("error opening segment: %v", err) } diff --git a/merge_test.go b/merge_test.go index 3abf58b3..2f4d77ba 100644 --- a/merge_test.go +++ b/merge_test.go @@ -28,23 +28,26 @@ import ( ) func TestMerge(t *testing.T) { - _ = os.RemoveAll("/tmp/scorch.zap") - _ = os.RemoveAll("/tmp/scorch2.zap") - _ = os.RemoveAll("/tmp/scorch3.zap") + tmpPath1 := getTempPath("scorch.zap") + tmpPath2 := getTempPath("scorch2.zap") + tmpPath3 := getTempPath("scorch3.zap") + _ = os.RemoveAll(tmpPath1) + _ = os.RemoveAll(tmpPath2) + _ = os.RemoveAll(tmpPath3) testSeg, _, _ := buildTestSegmentMulti() - err := PersistSegmentBase(testSeg, "/tmp/scorch.zap") + err := PersistSegmentBase(testSeg, tmpPath1) if err != nil { t.Fatal(err) } testSeg2, _, _ := buildTestSegmentMulti2() - err = PersistSegmentBase(testSeg2, "/tmp/scorch2.zap") + err = PersistSegmentBase(testSeg2, tmpPath2) if err != nil { t.Fatal(err) } - segment, err := zapPlugin.Open("/tmp/scorch.zap") + segment, err := zapPlugin.Open(tmpPath1) if err != nil { t.Fatalf("error opening segment: %v", err) } @@ -55,7 +58,7 @@ func TestMerge(t *testing.T) { } }() - segment2, err := zapPlugin.Open("/tmp/scorch2.zap") + segment2, err := zapPlugin.Open(tmpPath2) if err != nil { t.Fatalf("error opening segment: %v", err) } @@ -70,12 +73,12 @@ func TestMerge(t *testing.T) { segsToMerge[0] = segment segsToMerge[1] = segment2 - _, _, err = zapPlugin.Merge(segsToMerge, []*roaring.Bitmap{nil, nil}, "/tmp/scorch3.zap", nil, nil) + _, _, err = zapPlugin.Merge(segsToMerge, []*roaring.Bitmap{nil, nil}, tmpPath3, nil, nil) if err != nil { t.Fatal(err) } - segm, err := zapPlugin.Open("/tmp/scorch3.zap") + segm, err := zapPlugin.Open(tmpPath3) if err != nil { t.Fatalf("error opening merged segment: %v", err) } @@ -87,7 +90,7 @@ func TestMerge(t *testing.T) { } }() - if seg3.Path() != "/tmp/scorch3.zap" { + if seg3.Path() != tmpPath3 { t.Fatalf("wrong path") } if seg3.Count() != 4 { @@ -117,14 +120,16 @@ func TestMergeWithEmptySegmentsFirst(t *testing.T) { } func testMergeWithEmptySegments(t *testing.T, before bool, numEmptySegments int) { - _ = os.RemoveAll("/tmp/scorch.zap") + tmpPath1 := getTempPath("scorch.zap") + tmpPath3 := getTempPath("scorch3.zap") + _ = os.RemoveAll(tmpPath1) testSeg, _, _ := buildTestSegmentMulti() - err := PersistSegmentBase(testSeg, "/tmp/scorch.zap") + err := PersistSegmentBase(testSeg, tmpPath1) if err != nil { t.Fatal(err) } - segment, err := zapPlugin.Open("/tmp/scorch.zap") + segment, err := zapPlugin.Open(tmpPath1) if err != nil { t.Fatalf("error opening segment: %v", err) } @@ -143,19 +148,20 @@ func testMergeWithEmptySegments(t *testing.T, before bool, numEmptySegments int) for i := 0; i < numEmptySegments; i++ { fname := fmt.Sprintf("scorch-empty-%d.zap", i) + tmpPath := getTempPath(fname) - _ = os.RemoveAll("/tmp/" + fname) + _ = os.RemoveAll(tmpPath) emptySegment, _, err := zapPlugin.newWithChunkMode([]index.Document{}, 1024) if err != nil { t.Fatal(err) } - err = PersistSegmentBase(emptySegment.(*SegmentBase), "/tmp/"+fname) + err = PersistSegmentBase(emptySegment.(*SegmentBase), tmpPath) if err != nil { t.Fatal(err) } - emptyFileSegment, err := zapPlugin.Open("/tmp/" + fname) + emptyFileSegment, err := zapPlugin.Open(tmpPath) if err != nil { t.Fatalf("error opening segment: %v", err) } @@ -173,16 +179,16 @@ func testMergeWithEmptySegments(t *testing.T, before bool, numEmptySegments int) segsToMerge = append(segsToMerge, segment) } - _ = os.RemoveAll("/tmp/scorch3.zap") + _ = os.RemoveAll(tmpPath3) drops := make([]*roaring.Bitmap, len(segsToMerge)) - _, _, err = zapPlugin.Merge(segsToMerge, drops, "/tmp/scorch3.zap", nil, nil) + _, _, err = zapPlugin.Merge(segsToMerge, drops, tmpPath3, nil, nil) if err != nil { t.Fatal(err) } - segm, err := zapPlugin.Open("/tmp/scorch3.zap") + segm, err := zapPlugin.Open(tmpPath3) if err != nil { t.Fatalf("error opening merged segment: %v", err) } @@ -194,7 +200,7 @@ func testMergeWithEmptySegments(t *testing.T, before bool, numEmptySegments int) } }() - if segCur.Path() != "/tmp/scorch3.zap" { + if segCur.Path() != tmpPath3 { t.Fatalf("wrong path") } if segCur.Count() != 2 { @@ -213,18 +219,19 @@ func testMergeWithSelf(t *testing.T, segCur *Segment, expectedCount uint64) { for i := 0; i < 10; i++ { fname := fmt.Sprintf("scorch-self-%d.zap", i) + tmpPath := getTempPath(fname) - _ = os.RemoveAll("/tmp/" + fname) + _ = os.RemoveAll(tmpPath) segsToMerge := make([]seg.Segment, 1) segsToMerge[0] = segCur - _, _, err := zapPlugin.Merge(segsToMerge, []*roaring.Bitmap{nil, nil}, "/tmp/"+fname, nil, nil) + _, _, err := zapPlugin.Merge(segsToMerge, []*roaring.Bitmap{nil, nil}, tmpPath, nil, nil) if err != nil { t.Fatal(err) } - segm, err := zapPlugin.Open("/tmp/" + fname) + segm, err := zapPlugin.Open(tmpPath) if err != nil { t.Fatalf("error opening merged segment: %v", err) } @@ -460,15 +467,17 @@ func TestMergeAndDropAllFromOneSegment(t *testing.T) { } func testMergeAndDrop(t *testing.T, docsToDrop []*roaring.Bitmap) { - _ = os.RemoveAll("/tmp/scorch.zap") - _ = os.RemoveAll("/tmp/scorch2.zap") + tmpPath1 := getTempPath("scorch.zap") + tmpPath2 := getTempPath("scorch2.zap") + _ = os.RemoveAll(tmpPath1) + _ = os.RemoveAll(tmpPath2) testSeg, _, _ := buildTestSegmentMulti() - err := PersistSegmentBase(testSeg, "/tmp/scorch.zap") + err := PersistSegmentBase(testSeg, tmpPath1) if err != nil { t.Fatal(err) } - segment, err := zapPlugin.Open("/tmp/scorch.zap") + segment, err := zapPlugin.Open(tmpPath1) if err != nil { t.Fatalf("error opening segment: %v", err) } @@ -480,12 +489,12 @@ func testMergeAndDrop(t *testing.T, docsToDrop []*roaring.Bitmap) { }() testSeg2, _, _ := buildTestSegmentMulti2() - err = PersistSegmentBase(testSeg2, "/tmp/scorch2.zap") + err = PersistSegmentBase(testSeg2, tmpPath2) if err != nil { t.Fatal(err) } - segment2, err := zapPlugin.Open("/tmp/scorch2.zap") + segment2, err := zapPlugin.Open(tmpPath2) if err != nil { t.Fatalf("error opening segment: %v", err) } @@ -563,15 +572,16 @@ func testMergeWithUpdates(t *testing.T, segmentDocIds [][]string, docsToDrop []* // convert segmentDocIds to segsToMerge for i, docIds := range segmentDocIds { fname := fmt.Sprintf("scorch%d.zap", i) + tmpPath := getTempPath(fname) - _ = os.RemoveAll("/tmp/" + fname) + _ = os.RemoveAll(tmpPath) testSeg, _, _ := buildTestSegmentMultiHelper(docIds) - err := PersistSegmentBase(testSeg, "/tmp/"+fname) + err := PersistSegmentBase(testSeg, tmpPath) if err != nil { t.Fatal(err) } - segment, err := zapPlugin.Open("/tmp/" + fname) + segment, err := zapPlugin.Open(tmpPath) if err != nil { t.Fatalf("error opening segment: %v", err) } @@ -589,14 +599,15 @@ func testMergeWithUpdates(t *testing.T, segmentDocIds [][]string, docsToDrop []* } func testMergeAndDropSegments(t *testing.T, segsToMerge []seg.Segment, docsToDrop []*roaring.Bitmap, expectedNumDocs uint64) { - _ = os.RemoveAll("/tmp/scorch-merged.zap") + tmpPath := getTempPath("scorch-merged.zap") + _ = os.RemoveAll(tmpPath) - _, _, err := zapPlugin.Merge(segsToMerge, docsToDrop, "/tmp/scorch-merged.zap", nil, nil) + _, _, err := zapPlugin.Merge(segsToMerge, docsToDrop, tmpPath, nil, nil) if err != nil { t.Fatal(err) } - segm, err := zapPlugin.Open("/tmp/scorch-merged.zap") + segm, err := zapPlugin.Open(tmpPath) if err != nil { t.Fatalf("error opening merged segment: %v", err) } @@ -649,23 +660,26 @@ func buildTestSegmentMultiHelper(docIds []string) (*SegmentBase, uint64, error) } func TestMergeBytesWritten(t *testing.T) { - _ = os.RemoveAll("/tmp/scorch.zap") - _ = os.RemoveAll("/tmp/scorch2.zap") - _ = os.RemoveAll("/tmp/scorch3.zap") + tmpPath1 := getTempPath("scorch.zap") + tmpPath2 := getTempPath("scorch2.zap") + tmpPath3 := getTempPath("scorch3.zap") + _ = os.RemoveAll(tmpPath1) + _ = os.RemoveAll(tmpPath2) + _ = os.RemoveAll(tmpPath3) testSeg, _, _ := buildTestSegmentMulti() - err := PersistSegmentBase(testSeg, "/tmp/scorch.zap") + err := PersistSegmentBase(testSeg, tmpPath1) if err != nil { t.Fatal(err) } testSeg2, _, _ := buildTestSegmentMulti2() - err = PersistSegmentBase(testSeg2, "/tmp/scorch2.zap") + err = PersistSegmentBase(testSeg2, tmpPath2) if err != nil { t.Fatal(err) } - segment, err := zapPlugin.Open("/tmp/scorch.zap") + segment, err := zapPlugin.Open(tmpPath1) if err != nil { t.Fatalf("error opening segment: %v", err) } @@ -676,7 +690,7 @@ func TestMergeBytesWritten(t *testing.T) { } }() - segment2, err := zapPlugin.Open("/tmp/scorch2.zap") + segment2, err := zapPlugin.Open(tmpPath2) if err != nil { t.Fatalf("error opening segment: %v", err) } @@ -691,7 +705,7 @@ func TestMergeBytesWritten(t *testing.T) { segsToMerge[0] = segment segsToMerge[1] = segment2 - _, nBytes, err := zapPlugin.Merge(segsToMerge, []*roaring.Bitmap{nil, nil}, "/tmp/scorch3.zap", nil, nil) + _, nBytes, err := zapPlugin.Merge(segsToMerge, []*roaring.Bitmap{nil, nil}, tmpPath3, nil, nil) if err != nil { t.Fatal(err) } @@ -700,7 +714,7 @@ func TestMergeBytesWritten(t *testing.T) { t.Fatalf("expected a non zero total_compaction_written_bytes") } - segm, err := zapPlugin.Open("/tmp/scorch3.zap") + segm, err := zapPlugin.Open(tmpPath3) if err != nil { t.Fatalf("error opening merged segment: %v", err) } @@ -712,7 +726,7 @@ func TestMergeBytesWritten(t *testing.T) { } }() - if seg3.Path() != "/tmp/scorch3.zap" { + if seg3.Path() != tmpPath3 { t.Fatalf("wrong path") } if seg3.Count() != 4 { diff --git a/segment_test.go b/segment_test.go index 15a1869e..5cac2b07 100644 --- a/segment_test.go +++ b/segment_test.go @@ -28,15 +28,16 @@ import ( var zapPlugin = &ZapPlugin{} func TestOpen(t *testing.T) { - _ = os.RemoveAll("/tmp/scorch.zap") + tmpPath := getTempPath("scorch.zap") + _ = os.RemoveAll(tmpPath) testSeg, _, _ := buildTestSegment() - err := PersistSegmentBase(testSeg, "/tmp/scorch.zap") + err := PersistSegmentBase(testSeg, tmpPath) if err != nil { t.Fatalf("error persisting segment: %v", err) } - segment, err := zapPlugin.Open("/tmp/scorch.zap") + segment, err := zapPlugin.Open(tmpPath) if err != nil { t.Fatalf("error opening segment: %v", err) } @@ -327,15 +328,16 @@ func TestOpen(t *testing.T) { } func TestOpenMulti(t *testing.T) { - _ = os.RemoveAll("/tmp/scorch.zap") + tmpPath := getTempPath("scorch.zap") + _ = os.RemoveAll(tmpPath) testSeg, _, _ := buildTestSegmentMulti() - err := PersistSegmentBase(testSeg, "/tmp/scorch.zap") + err := PersistSegmentBase(testSeg, tmpPath) if err != nil { t.Fatalf("error persisting segment: %v", err) } - segment, err := zapPlugin.Open("/tmp/scorch.zap") + segment, err := zapPlugin.Open(tmpPath) if err != nil { t.Fatalf("error opening segment: %v", err) } @@ -427,15 +429,16 @@ func TestOpenMulti(t *testing.T) { } func TestOpenMultiWithTwoChunks(t *testing.T) { - _ = os.RemoveAll("/tmp/scorch.zap") + tmpPath := getTempPath("scorch.zap") + _ = os.RemoveAll(tmpPath) testSeg, _, _ := buildTestSegmentMultiWithChunkFactor(1) - err := PersistSegmentBase(testSeg, "/tmp/scorch.zap") + err := PersistSegmentBase(testSeg, tmpPath) if err != nil { t.Fatalf("error persisting segment: %v", err) } - segment, err := zapPlugin.Open("/tmp/scorch.zap") + segment, err := zapPlugin.Open(tmpPath) if err != nil { t.Fatalf("error opening segment: %v", err) } @@ -522,15 +525,16 @@ func TestOpenMultiWithTwoChunks(t *testing.T) { } func TestSegmentVisitableDocValueFieldsList(t *testing.T) { - _ = os.RemoveAll("/tmp/scorch.zap") + tmpPath := getTempPath("scorch.zap") + _ = os.RemoveAll(tmpPath) testSeg, _, _ := buildTestSegmentMultiWithChunkFactor(1) - err := PersistSegmentBase(testSeg, "/tmp/scorch.zap") + err := PersistSegmentBase(testSeg, tmpPath) if err != nil { t.Fatalf("error persisting segment: %v", err) } - seg, err := zapPlugin.Open("/tmp/scorch.zap") + seg, err := zapPlugin.Open(tmpPath) if err != nil { t.Fatalf("error opening segment: %v", err) } @@ -550,15 +554,15 @@ func TestSegmentVisitableDocValueFieldsList(t *testing.T) { if err != nil { t.Fatalf("error closing segment: %v", err) } - _ = os.RemoveAll("/tmp/scorch.zap") + _ = os.RemoveAll(tmpPath) testSeg, _, _ = buildTestSegmentWithDefaultFieldMapping(1) - err = PersistSegmentBase(testSeg, "/tmp/scorch.zap") + err = PersistSegmentBase(testSeg, tmpPath) if err != nil { t.Fatalf("error persisting segment: %v", err) } - seg, err = zapPlugin.Open("/tmp/scorch.zap") + seg, err = zapPlugin.Open(tmpPath) if err != nil { t.Fatalf("error opening segment: %v", err) } @@ -601,18 +605,19 @@ func TestSegmentVisitableDocValueFieldsList(t *testing.T) { } func TestSegmentDocsWithNonOverlappingFields(t *testing.T) { - _ = os.RemoveAll("/tmp/scorch.zap") + tmpPath := getTempPath("scorch.zap") + _ = os.RemoveAll(tmpPath) testSeg, _, err := buildTestSegmentMultiWithDifferentFields(true, true) if err != nil { t.Fatalf("error building segment: %v", err) } - err = PersistSegmentBase(testSeg, "/tmp/scorch.zap") + err = PersistSegmentBase(testSeg, tmpPath) if err != nil { t.Fatalf("error persisting segment: %v", err) } - segment, err := zapPlugin.Open("/tmp/scorch.zap") + segment, err := zapPlugin.Open(tmpPath) if err != nil { t.Fatalf("error opening segment: %v", err) } @@ -649,23 +654,26 @@ func TestSegmentDocsWithNonOverlappingFields(t *testing.T) { } func TestMergedSegmentDocsWithNonOverlappingFields(t *testing.T) { - _ = os.RemoveAll("/tmp/scorch1.zap") - _ = os.RemoveAll("/tmp/scorch2.zap") - _ = os.RemoveAll("/tmp/scorch3.zap") + tmpPath1 := getTempPath("scorch1.zap") + tmpPath2 := getTempPath("scorch2.zap") + tmpPath3 := getTempPath("scorch3.zap") + _ = os.RemoveAll(tmpPath1) + _ = os.RemoveAll(tmpPath2) + _ = os.RemoveAll(tmpPath3) testSeg1, _, _ := buildTestSegmentMultiWithDifferentFields(true, false) - err := PersistSegmentBase(testSeg1, "/tmp/scorch1.zap") + err := PersistSegmentBase(testSeg1, tmpPath1) if err != nil { t.Fatalf("error persisting segment: %v", err) } testSeg2, _, _ := buildTestSegmentMultiWithDifferentFields(false, true) - err = PersistSegmentBase(testSeg2, "/tmp/scorch2.zap") + err = PersistSegmentBase(testSeg2, tmpPath2) if err != nil { t.Fatalf("error persisting segment: %v", err) } - segment1, err := zapPlugin.Open("/tmp/scorch1.zap") + segment1, err := zapPlugin.Open(tmpPath1) if err != nil { t.Fatalf("error opening segment: %v", err) } @@ -676,7 +684,7 @@ func TestMergedSegmentDocsWithNonOverlappingFields(t *testing.T) { } }() - segment2, err := zapPlugin.Open("/tmp/scorch2.zap") + segment2, err := zapPlugin.Open(tmpPath2) if err != nil { t.Fatalf("error opening segment: %v", err) } @@ -691,7 +699,7 @@ func TestMergedSegmentDocsWithNonOverlappingFields(t *testing.T) { segsToMerge[0] = segment1 segsToMerge[1] = segment2 - _, nBytes, err := zapPlugin.Merge(segsToMerge, []*roaring.Bitmap{nil, nil}, "/tmp/scorch3.zap", nil, nil) + _, nBytes, err := zapPlugin.Merge(segsToMerge, []*roaring.Bitmap{nil, nil}, tmpPath3, nil, nil) if err != nil { t.Fatal(err) } @@ -700,7 +708,7 @@ func TestMergedSegmentDocsWithNonOverlappingFields(t *testing.T) { t.Fatalf("expected a non zero total_compaction_written_bytes") } - segmentM, err := zapPlugin.Open("/tmp/scorch3.zap") + segmentM, err := zapPlugin.Open(tmpPath3) if err != nil { t.Fatalf("error opening merged segment: %v", err) } From 4d82cdb1a6eb08637ec0ba831687173af73aa7cd Mon Sep 17 00:00:00 2001 From: Rahul Rampure Date: Fri, 23 Jan 2026 12:46:03 +0530 Subject: [PATCH 8/9] re-enable windows tests --- build_test.go | 3 --- dict_test.go | 3 --- merge_test.go | 3 --- nested_test.go | 3 --- segment_test.go | 3 --- thesaurus_test.go | 3 --- 6 files changed, 18 deletions(-) diff --git a/build_test.go b/build_test.go index 8a817611..4221e5ad 100644 --- a/build_test.go +++ b/build_test.go @@ -12,9 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build !windows -// +build !windows - package zap import ( diff --git a/dict_test.go b/dict_test.go index 5d636274..6a06ce90 100644 --- a/dict_test.go +++ b/dict_test.go @@ -12,9 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build !windows -// +build !windows - package zap import ( diff --git a/merge_test.go b/merge_test.go index a2ba1c04..2f4d77ba 100644 --- a/merge_test.go +++ b/merge_test.go @@ -12,9 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build !windows -// +build !windows - package zap import ( diff --git a/nested_test.go b/nested_test.go index ba45d96b..7a99f66e 100644 --- a/nested_test.go +++ b/nested_test.go @@ -12,9 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build !windows -// +build !windows - package zap import ( diff --git a/segment_test.go b/segment_test.go index 1d13e365..5cac2b07 100644 --- a/segment_test.go +++ b/segment_test.go @@ -12,9 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build !windows -// +build !windows - package zap import ( diff --git a/thesaurus_test.go b/thesaurus_test.go index b2ba3a19..582cb928 100644 --- a/thesaurus_test.go +++ b/thesaurus_test.go @@ -12,9 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -//go:build !windows -// +build !windows - package zap import ( From 78334a95e1871a9f5cbd07f81affac4f9b89f1a6 Mon Sep 17 00:00:00 2001 From: Abhinav Dangeti Date: Mon, 26 Jan 2026 13:31:52 -0700 Subject: [PATCH 9/9] Use scorch_segment_api@v2.4.1 --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 39cd6a31..769906c5 100644 --- a/go.mod +++ b/go.mod @@ -4,10 +4,10 @@ go 1.24.0 require ( github.com/RoaringBitmap/roaring/v2 v2.14.4 - github.com/blevesearch/bleve_index_api v1.3.0 + github.com/blevesearch/bleve_index_api v1.3.1 github.com/blevesearch/go-faiss v1.0.27 github.com/blevesearch/mmap-go v1.2.0 - github.com/blevesearch/scorch_segment_api/v2 v2.4.1-0.20260122183352-acd9a30e3a55 + github.com/blevesearch/scorch_segment_api/v2 v2.4.1 github.com/blevesearch/vellum v1.2.0 github.com/golang/snappy v1.0.0 github.com/spf13/cobra v1.10.2 diff --git a/go.sum b/go.sum index 1d61c234..ebfcb11c 100644 --- a/go.sum +++ b/go.sum @@ -2,14 +2,14 @@ github.com/RoaringBitmap/roaring/v2 v2.14.4 h1:4aKySrrg9G/5oRtJ3TrZLObVqxgQ9f1zn github.com/RoaringBitmap/roaring/v2 v2.14.4/go.mod h1:oMvV6omPWr+2ifRdeZvVJyaz+aoEUopyv5iH0u/+wbY= github.com/bits-and-blooms/bitset v1.24.2 h1:M7/NzVbsytmtfHbumG+K2bremQPMJuqv1JD3vOaFxp0= github.com/bits-and-blooms/bitset v1.24.2/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8= -github.com/blevesearch/bleve_index_api v1.3.0 h1:DsMpWVjFNlBw9/6pyWf59XoqcAkhHj3H0UWiQsavb6E= -github.com/blevesearch/bleve_index_api v1.3.0/go.mod h1:xvd48t5XMeeioWQ5/jZvgLrV98flT2rdvEJ3l/ki4Ko= +github.com/blevesearch/bleve_index_api v1.3.1 h1:LdH3CQgBbIZ5UI/5Pykz87e0jfeQtVnrdZ2WUBrHHwU= +github.com/blevesearch/bleve_index_api v1.3.1/go.mod h1:xvd48t5XMeeioWQ5/jZvgLrV98flT2rdvEJ3l/ki4Ko= github.com/blevesearch/go-faiss v1.0.27 h1:7cBImYDDQ82WJd5RUZ1ie6zXztCsC73W94ZzwOjkatk= github.com/blevesearch/go-faiss v1.0.27/go.mod h1:OMGQwOaRRYxrmeNdMrXJPvVx8gBnvE5RYrr0BahNnkk= github.com/blevesearch/mmap-go v1.2.0 h1:l33nNKPFcBjJUMwem6sAYJPUzhUCABoK9FxZDGiFNBI= github.com/blevesearch/mmap-go v1.2.0/go.mod h1:Vd6+20GBhEdwJnU1Xohgt88XCD/CTWcqbCNxkZpyBo0= -github.com/blevesearch/scorch_segment_api/v2 v2.4.1-0.20260122183352-acd9a30e3a55 h1:Qymtqg3t3D/vM6o7gLC6LXS/4rbsmuoW2Ma984QVdpY= -github.com/blevesearch/scorch_segment_api/v2 v2.4.1-0.20260122183352-acd9a30e3a55/go.mod h1:/7t047MtOtLsdLwd+dDgrtyxzV+FK4GP24LuUAQmib4= +github.com/blevesearch/scorch_segment_api/v2 v2.4.1 h1:os52/JeCSLZ0YUkOuLk/Z7pu0SKUMofDPUg+VnbrRD0= +github.com/blevesearch/scorch_segment_api/v2 v2.4.1/go.mod h1:zvilBm4BNfbnTRLW7KgCTNgk2R31JaWzwRc2BEcD7Is= github.com/blevesearch/vellum v1.2.0 h1:xkDiOEsHc2t3Cp0NsNZZ36pvc130sCzcGKOPMzXe+e0= github.com/blevesearch/vellum v1.2.0/go.mod h1:uEcfBJz7mAOf0Kvq6qoEKQQkLODBF46SINYNkZNae4k= github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=