diff --git a/go.mod b/go.mod index a64aded20d20c850a64028f4430dbec6082b0c13..a0d4c46dce11fbde2b55f6f3fdcf0b69ff5185fd 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.14 require ( github.com/RoaringBitmap/roaring v0.5.5 // indirect - github.com/blevesearch/bleve/v2 v2.0.1 + github.com/blevesearch/bleve/v2 v2.0.2 github.com/glycerine/go-unsnap-stream v0.0.0-20190901134440-81cf024a9e0a // indirect github.com/golang/protobuf v1.4.3 // indirect github.com/golang/snappy v0.0.2 // indirect diff --git a/go.sum b/go.sum index 5f5cea5bcb64b1d8f4a440f1bc79a380d4df0aa6..94f9fe62cb4f55fde66e92d7b21dc09475abb555 100644 --- a/go.sum +++ b/go.sum @@ -7,6 +7,8 @@ github.com/RoaringBitmap/roaring v0.5.5/go.mod h1:puNo5VdzwbaIQxSiDIwfXl4Hnc+fbo github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= github.com/blevesearch/bleve/v2 v2.0.1 h1:v1eV5K+/lndsjnykeVcuU9J4cJnjKLUKSwxXFxZsLuY= github.com/blevesearch/bleve/v2 v2.0.1/go.mod h1:OBP2Pktqik8vEiUlGhuWjYx7KiO4zD542+DHqICwM5w= +github.com/blevesearch/bleve/v2 v2.0.2 h1:D93VfhOiR6wALovgjsK5XNPeDRrZQlUEIq4YWFeaiTw= +github.com/blevesearch/bleve/v2 v2.0.2/go.mod h1:ip+4iafiEq2gCY5rJXe87bT6LkF/OJMCjQEYIfTBfW8= github.com/blevesearch/bleve_index_api v1.0.0 h1:Ds3XeuTxjXCkG6pgIwWDRyooJKNIuOKemnN0N0IkhTU= github.com/blevesearch/bleve_index_api v1.0.0/go.mod h1:fiwKS0xLEm+gBRgv5mumf0dhgFr2mDgZah1pqv1c1M4= github.com/blevesearch/go-porterstemmer v1.0.3 h1:GtmsqID0aZdCSNiY8SkuPJ12pD4jI+DdXTAn4YRcHCo= @@ -15,22 +17,36 @@ github.com/blevesearch/mmap-go v1.0.2 h1:JtMHb+FgQCTTYIhtMvimw15dJwu1Y5lrZDMOFXV github.com/blevesearch/mmap-go v1.0.2/go.mod h1:ol2qBqYaOUsGdm7aRMRrYGgPvnwLe6Y+7LMvAB5IbSA= github.com/blevesearch/scorch_segment_api v1.0.0 h1:BUkCPWDg2gimTEyVDXf85I2buqqt4lh28uaVMiJsIYk= github.com/blevesearch/scorch_segment_api v1.0.0/go.mod h1:KgRYmlfYC27NeM6cXOHx8LBgq7jn0atpV8mVWoBKBng= +github.com/blevesearch/scorch_segment_api/v2 v2.0.1 h1:fd+hPtZ8GsbqPK1HslGp7Vhoik4arZteA/IsCEgOisw= +github.com/blevesearch/scorch_segment_api/v2 v2.0.1/go.mod h1:lq7yK2jQy1yQjtjTfU931aVqz7pYxEudHaDwOt1tXfU= github.com/blevesearch/segment v0.9.0 h1:5lG7yBCx98or7gK2cHMKPukPZ/31Kag7nONpoBt22Ac= github.com/blevesearch/segment v0.9.0/go.mod h1:9PfHYUdQCgHktBgvtUOF4x+pc4/l8rdH0u5spnW85UQ= github.com/blevesearch/snowballstem v0.9.0 h1:lMQ189YspGP6sXvZQ4WZ+MLawfV8wOmPoD/iWeNXm8s= github.com/blevesearch/snowballstem v0.9.0/go.mod h1:PivSj3JMc8WuaFkTSRDW2SlrulNWPl4ABg1tC/hlgLs= github.com/blevesearch/upsidedown_store_api v1.0.1 h1:1SYRwyoFLwG3sj0ed89RLtM15amfX2pXlYbFOnF8zNU= github.com/blevesearch/upsidedown_store_api v1.0.1/go.mod h1:MQDVGpHZrpe3Uy26zJBf/a8h0FZY6xJbthIMm8myH2Q= +github.com/blevesearch/vellum v1.0.3 h1:U86G41A7CtXNzzpIJHM8lSTUqz1Mp8U870TkcdCzZc8= +github.com/blevesearch/vellum v1.0.3/go.mod h1:2u5ax02KeDuNWu4/C+hVQMD6uLN4txH1JbtpaDNLJRo= github.com/blevesearch/zapx/v11 v11.1.10 h1:8Eo3rXiHsVSP9Sk+4StrrwLrj9vyulhMVPmxTf8ZuDg= github.com/blevesearch/zapx/v11 v11.1.10/go.mod h1:DTjbcBqrr/Uo82UBilDC8lEew42gN/OcIyiTNFtSijc= +github.com/blevesearch/zapx/v11 v11.2.0 h1:GBkCJYsyj3eIU4+aiLPxoMz1PYvDbQZl/oXHIBZIP60= +github.com/blevesearch/zapx/v11 v11.2.0/go.mod h1:gN/a0alGw1FZt/YGTo1G6Z6XpDkeOfujX5exY9sCQQM= github.com/blevesearch/zapx/v12 v12.1.10 h1:sqR+/0Z4dSTovApRqLA1HnilMtQer7a4UvPrNmPzlTM= github.com/blevesearch/zapx/v12 v12.1.10/go.mod h1:14NmKnPrnKAIyiEJM566k/Jk+FQpuiflT5d3uaaK3MI= +github.com/blevesearch/zapx/v12 v12.2.0 h1:dyRcSoZVO1jktL4UpGkCEF1AYa3xhKPirh4/N+Va+Ww= +github.com/blevesearch/zapx/v12 v12.2.0/go.mod h1:fdjwvCwWWwJW/EYTYGtAp3gBA0geCYGLcVTtJEZnY6A= github.com/blevesearch/zapx/v13 v13.1.10 h1:zCneEVRJDXwtDfSwh+33Dxguliv192vCK283zdGH4Sw= github.com/blevesearch/zapx/v13 v13.1.10/go.mod h1:YsVY6YGpTEAlJOMjdL7EsdBLvjWd8kPa2gwJDNpqLJo= +github.com/blevesearch/zapx/v13 v13.2.0 h1:mUqbaqQABp8nBE4t4q2qMyHCCq4sykoV8r7aJk4ih3s= +github.com/blevesearch/zapx/v13 v13.2.0/go.mod h1:o5rAy/lRS5JpAbITdrOHBS/TugWYbkcYZTz6VfEinAQ= github.com/blevesearch/zapx/v14 v14.1.10 h1:nD0vw2jxKogJFfA5WyoS4wNwZlVby3Aq8aW7CZi6YIw= github.com/blevesearch/zapx/v14 v14.1.10/go.mod h1:hsULl5eJSxs5NEfBsmeT9qrqdCP+/ecpVZKt60M4V64= +github.com/blevesearch/zapx/v14 v14.2.0 h1:UsfRqvM9RJxKNKrkR1U7aYc1cv9MWx719fsAjbF6joI= +github.com/blevesearch/zapx/v14 v14.2.0/go.mod h1:GNgZusc1p4ot040cBQMRGEZobvwjCquiEKYh1xLFK9g= github.com/blevesearch/zapx/v15 v15.1.10 h1:kZR3b9jO9l6s2B5UHI+1N1llLzJ4nYikkXQTMrDl1vQ= github.com/blevesearch/zapx/v15 v15.1.10/go.mod h1:4ypq25bwtSQKzwEF1UERyIhmGTbMT3brY/n4NC5gRnM= +github.com/blevesearch/zapx/v15 v15.2.0 h1:ZpibwcrrOaeslkOw3sJ7npP7KDgRHI/DkACjKTqFwyM= +github.com/blevesearch/zapx/v15 v15.2.0/go.mod h1:MmQceLpWfME4n1WrBFIwplhWmaQbQqLQARpaKUEOs/A= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= diff --git a/vendor/github.com/blevesearch/bleve/v2/go.mod b/vendor/github.com/blevesearch/bleve/v2/go.mod index 3ba4ec65493d0469a67880bb13ba1ad5d2e1fa80..a1a6b5977e2843060a12052ff1aca5aa904d8200 100644 --- a/vendor/github.com/blevesearch/bleve/v2/go.mod +++ b/vendor/github.com/blevesearch/bleve/v2/go.mod @@ -6,17 +6,17 @@ require ( github.com/RoaringBitmap/roaring v0.4.23 github.com/blevesearch/bleve_index_api v1.0.0 github.com/blevesearch/go-porterstemmer v1.0.3 - github.com/blevesearch/scorch_segment_api v1.0.0 + github.com/blevesearch/scorch_segment_api/v2 v2.0.1 github.com/blevesearch/segment v0.9.0 github.com/blevesearch/snowballstem v0.9.0 github.com/blevesearch/upsidedown_store_api v1.0.1 - github.com/blevesearch/zapx/v11 v11.1.10 - github.com/blevesearch/zapx/v12 v12.1.10 - github.com/blevesearch/zapx/v13 v13.1.10 - github.com/blevesearch/zapx/v14 v14.1.10 - github.com/blevesearch/zapx/v15 v15.1.10 + github.com/blevesearch/vellum v1.0.3 + github.com/blevesearch/zapx/v11 v11.2.0 + github.com/blevesearch/zapx/v12 v12.2.0 + github.com/blevesearch/zapx/v13 v13.2.0 + github.com/blevesearch/zapx/v14 v14.2.0 + github.com/blevesearch/zapx/v15 v15.2.0 github.com/couchbase/moss v0.1.0 - github.com/couchbase/vellum v1.0.2 github.com/golang/protobuf v1.3.2 github.com/kljensen/snowball v0.6.0 github.com/rcrowley/go-metrics v0.0.0-20190826022208-cac0b30c2563 diff --git a/vendor/github.com/blevesearch/bleve/v2/go.sum b/vendor/github.com/blevesearch/bleve/v2/go.sum index f411283ba08887223072b6c3a6f3cac47d755561..e1e8edd189bb8cf1d19bd233b2ba5a8a3b03817b 100644 --- a/vendor/github.com/blevesearch/bleve/v2/go.sum +++ b/vendor/github.com/blevesearch/bleve/v2/go.sum @@ -8,24 +8,26 @@ github.com/blevesearch/go-porterstemmer v1.0.3 h1:GtmsqID0aZdCSNiY8SkuPJ12pD4jI+ github.com/blevesearch/go-porterstemmer v1.0.3/go.mod h1:angGc5Ht+k2xhJdZi511LtmxuEf0OVpvUUNrwmM1P7M= github.com/blevesearch/mmap-go v1.0.2 h1:JtMHb+FgQCTTYIhtMvimw15dJwu1Y5lrZDMOFXVWPk0= github.com/blevesearch/mmap-go v1.0.2/go.mod h1:ol2qBqYaOUsGdm7aRMRrYGgPvnwLe6Y+7LMvAB5IbSA= -github.com/blevesearch/scorch_segment_api v1.0.0 h1:BUkCPWDg2gimTEyVDXf85I2buqqt4lh28uaVMiJsIYk= -github.com/blevesearch/scorch_segment_api v1.0.0/go.mod h1:KgRYmlfYC27NeM6cXOHx8LBgq7jn0atpV8mVWoBKBng= +github.com/blevesearch/scorch_segment_api/v2 v2.0.1 h1:fd+hPtZ8GsbqPK1HslGp7Vhoik4arZteA/IsCEgOisw= +github.com/blevesearch/scorch_segment_api/v2 v2.0.1/go.mod h1:lq7yK2jQy1yQjtjTfU931aVqz7pYxEudHaDwOt1tXfU= github.com/blevesearch/segment v0.9.0 h1:5lG7yBCx98or7gK2cHMKPukPZ/31Kag7nONpoBt22Ac= github.com/blevesearch/segment v0.9.0/go.mod h1:9PfHYUdQCgHktBgvtUOF4x+pc4/l8rdH0u5spnW85UQ= github.com/blevesearch/snowballstem v0.9.0 h1:lMQ189YspGP6sXvZQ4WZ+MLawfV8wOmPoD/iWeNXm8s= github.com/blevesearch/snowballstem v0.9.0/go.mod h1:PivSj3JMc8WuaFkTSRDW2SlrulNWPl4ABg1tC/hlgLs= github.com/blevesearch/upsidedown_store_api v1.0.1 h1:1SYRwyoFLwG3sj0ed89RLtM15amfX2pXlYbFOnF8zNU= github.com/blevesearch/upsidedown_store_api v1.0.1/go.mod h1:MQDVGpHZrpe3Uy26zJBf/a8h0FZY6xJbthIMm8myH2Q= -github.com/blevesearch/zapx/v11 v11.1.10 h1:8Eo3rXiHsVSP9Sk+4StrrwLrj9vyulhMVPmxTf8ZuDg= -github.com/blevesearch/zapx/v11 v11.1.10/go.mod h1:DTjbcBqrr/Uo82UBilDC8lEew42gN/OcIyiTNFtSijc= -github.com/blevesearch/zapx/v12 v12.1.10 h1:sqR+/0Z4dSTovApRqLA1HnilMtQer7a4UvPrNmPzlTM= -github.com/blevesearch/zapx/v12 v12.1.10/go.mod h1:14NmKnPrnKAIyiEJM566k/Jk+FQpuiflT5d3uaaK3MI= -github.com/blevesearch/zapx/v13 v13.1.10 h1:zCneEVRJDXwtDfSwh+33Dxguliv192vCK283zdGH4Sw= -github.com/blevesearch/zapx/v13 v13.1.10/go.mod h1:YsVY6YGpTEAlJOMjdL7EsdBLvjWd8kPa2gwJDNpqLJo= -github.com/blevesearch/zapx/v14 v14.1.10 h1:nD0vw2jxKogJFfA5WyoS4wNwZlVby3Aq8aW7CZi6YIw= -github.com/blevesearch/zapx/v14 v14.1.10/go.mod h1:hsULl5eJSxs5NEfBsmeT9qrqdCP+/ecpVZKt60M4V64= -github.com/blevesearch/zapx/v15 v15.1.10 h1:kZR3b9jO9l6s2B5UHI+1N1llLzJ4nYikkXQTMrDl1vQ= -github.com/blevesearch/zapx/v15 v15.1.10/go.mod h1:4ypq25bwtSQKzwEF1UERyIhmGTbMT3brY/n4NC5gRnM= +github.com/blevesearch/vellum v1.0.3 h1:U86G41A7CtXNzzpIJHM8lSTUqz1Mp8U870TkcdCzZc8= +github.com/blevesearch/vellum v1.0.3/go.mod h1:2u5ax02KeDuNWu4/C+hVQMD6uLN4txH1JbtpaDNLJRo= +github.com/blevesearch/zapx/v11 v11.2.0 h1:GBkCJYsyj3eIU4+aiLPxoMz1PYvDbQZl/oXHIBZIP60= +github.com/blevesearch/zapx/v11 v11.2.0/go.mod h1:gN/a0alGw1FZt/YGTo1G6Z6XpDkeOfujX5exY9sCQQM= +github.com/blevesearch/zapx/v12 v12.2.0 h1:dyRcSoZVO1jktL4UpGkCEF1AYa3xhKPirh4/N+Va+Ww= +github.com/blevesearch/zapx/v12 v12.2.0/go.mod h1:fdjwvCwWWwJW/EYTYGtAp3gBA0geCYGLcVTtJEZnY6A= +github.com/blevesearch/zapx/v13 v13.2.0 h1:mUqbaqQABp8nBE4t4q2qMyHCCq4sykoV8r7aJk4ih3s= +github.com/blevesearch/zapx/v13 v13.2.0/go.mod h1:o5rAy/lRS5JpAbITdrOHBS/TugWYbkcYZTz6VfEinAQ= +github.com/blevesearch/zapx/v14 v14.2.0 h1:UsfRqvM9RJxKNKrkR1U7aYc1cv9MWx719fsAjbF6joI= +github.com/blevesearch/zapx/v14 v14.2.0/go.mod h1:GNgZusc1p4ot040cBQMRGEZobvwjCquiEKYh1xLFK9g= +github.com/blevesearch/zapx/v15 v15.2.0 h1:ZpibwcrrOaeslkOw3sJ7npP7KDgRHI/DkACjKTqFwyM= +github.com/blevesearch/zapx/v15 v15.2.0/go.mod h1:MmQceLpWfME4n1WrBFIwplhWmaQbQqLQARpaKUEOs/A= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= @@ -33,8 +35,6 @@ github.com/couchbase/ghistogram v0.1.0 h1:b95QcQTCzjTUocDXp/uMgSNQi8oj1tGwnJ4bOD github.com/couchbase/ghistogram v0.1.0/go.mod h1:s1Jhy76zqfEecpNWJfWUiKZookAFaiGOEoyzgHt9i7k= github.com/couchbase/moss v0.1.0 h1:HCL+xxHUwmOaL44kMM/gU08OW6QGCui1WVFO58bjhNI= github.com/couchbase/moss v0.1.0/go.mod h1:9MaHIaRuy9pvLPUJxB8sh8OrLfyDczECVL37grCIubs= -github.com/couchbase/vellum v1.0.2 h1:BrbP0NKiyDdndMPec8Jjhy0U47CZ0Lgx3xUC2r9rZqw= -github.com/couchbase/vellum v1.0.2/go.mod h1:FcwrEivFpNi24R3jLOs3n+fs5RnuQnQqCLBJ1uAg1W4= github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= diff --git a/vendor/github.com/blevesearch/bleve/v2/index/scorch/builder.go b/vendor/github.com/blevesearch/bleve/v2/index/scorch/builder.go index 455c53578749697423aadc7243f87fa142cc10fa..3311bd02e4bbdfcf0cffa487a3d8887c8c3a6a59 100644 --- a/vendor/github.com/blevesearch/bleve/v2/index/scorch/builder.go +++ b/vendor/github.com/blevesearch/bleve/v2/index/scorch/builder.go @@ -22,7 +22,7 @@ import ( "github.com/RoaringBitmap/roaring" index "github.com/blevesearch/bleve_index_api" - segment "github.com/blevesearch/scorch_segment_api" + segment "github.com/blevesearch/scorch_segment_api/v2" bolt "go.etcd.io/bbolt" ) diff --git a/vendor/github.com/blevesearch/bleve/v2/index/scorch/empty.go b/vendor/github.com/blevesearch/bleve/v2/index/scorch/empty.go index 7bda01aa4f49273556c244bc0669a9c29b96a4d2..4d47555315624bd0953a509f93959f447ae7b5f6 100644 --- a/vendor/github.com/blevesearch/bleve/v2/index/scorch/empty.go +++ b/vendor/github.com/blevesearch/bleve/v2/index/scorch/empty.go @@ -14,7 +14,7 @@ package scorch -import segment "github.com/blevesearch/scorch_segment_api" +import segment "github.com/blevesearch/scorch_segment_api/v2" type emptyPostingsIterator struct{} diff --git a/vendor/github.com/blevesearch/bleve/v2/index/scorch/introducer.go b/vendor/github.com/blevesearch/bleve/v2/index/scorch/introducer.go index 4f71048fd1fb8206484b789982e45c8c977e6d54..8516d411dbbf1084aa34035081ec419b6cc4f3f6 100644 --- a/vendor/github.com/blevesearch/bleve/v2/index/scorch/introducer.go +++ b/vendor/github.com/blevesearch/bleve/v2/index/scorch/introducer.go @@ -20,7 +20,7 @@ import ( "github.com/RoaringBitmap/roaring" index "github.com/blevesearch/bleve_index_api" - segment "github.com/blevesearch/scorch_segment_api" + segment "github.com/blevesearch/scorch_segment_api/v2" ) type segmentIntroduction struct { diff --git a/vendor/github.com/blevesearch/bleve/v2/index/scorch/merge.go b/vendor/github.com/blevesearch/bleve/v2/index/scorch/merge.go index 5cd41ae8ab4ca13fb94394fb2ab856aab61ea5d9..1e269afc6310993e5e0040d7237a707835b00d77 100644 --- a/vendor/github.com/blevesearch/bleve/v2/index/scorch/merge.go +++ b/vendor/github.com/blevesearch/bleve/v2/index/scorch/merge.go @@ -25,7 +25,7 @@ import ( "github.com/RoaringBitmap/roaring" "github.com/blevesearch/bleve/v2/index/scorch/mergeplan" - segment "github.com/blevesearch/scorch_segment_api" + segment "github.com/blevesearch/scorch_segment_api/v2" ) func (s *Scorch) mergerLoop() { diff --git a/vendor/github.com/blevesearch/bleve/v2/index/scorch/optimize.go b/vendor/github.com/blevesearch/bleve/v2/index/scorch/optimize.go index 8575613b5e127f9638a5413d643c8f4d6681de0d..3c7969fa9effdec03d70229fc3af51eb0a6b76b3 100644 --- a/vendor/github.com/blevesearch/bleve/v2/index/scorch/optimize.go +++ b/vendor/github.com/blevesearch/bleve/v2/index/scorch/optimize.go @@ -18,7 +18,7 @@ import ( "fmt" "github.com/RoaringBitmap/roaring" index "github.com/blevesearch/bleve_index_api" - segment "github.com/blevesearch/scorch_segment_api" + segment "github.com/blevesearch/scorch_segment_api/v2" "sync/atomic" ) diff --git a/vendor/github.com/blevesearch/bleve/v2/index/scorch/persister.go b/vendor/github.com/blevesearch/bleve/v2/index/scorch/persister.go index d58a4b8e7274ab0163f7d6151461d7c629ed5333..36a0379e6d0921196c539acacf679c7a08f50b20 100644 --- a/vendor/github.com/blevesearch/bleve/v2/index/scorch/persister.go +++ b/vendor/github.com/blevesearch/bleve/v2/index/scorch/persister.go @@ -31,7 +31,7 @@ import ( "github.com/RoaringBitmap/roaring" index "github.com/blevesearch/bleve_index_api" - segment "github.com/blevesearch/scorch_segment_api" + segment "github.com/blevesearch/scorch_segment_api/v2" bolt "go.etcd.io/bbolt" ) diff --git a/vendor/github.com/blevesearch/bleve/v2/index/scorch/regexp.go b/vendor/github.com/blevesearch/bleve/v2/index/scorch/regexp.go index 6c43d99e2db463b40aac40bbe2af5c9085bed080..5a3584f51a0391f75b2d0eed4beb7e8db8cb5ca9 100644 --- a/vendor/github.com/blevesearch/bleve/v2/index/scorch/regexp.go +++ b/vendor/github.com/blevesearch/bleve/v2/index/scorch/regexp.go @@ -17,7 +17,7 @@ package scorch import ( "regexp/syntax" - "github.com/couchbase/vellum/regexp" + "github.com/blevesearch/vellum/regexp" ) func parseRegexp(pattern string) (a *regexp.Regexp, prefixBeg, prefixEnd []byte, err error) { diff --git a/vendor/github.com/blevesearch/bleve/v2/index/scorch/scorch.go b/vendor/github.com/blevesearch/bleve/v2/index/scorch/scorch.go index 5e6304f35174de34b54249007ffd007f8de468e0..fa1aaebbfef1d27b41d27d88db11f458115baa6c 100644 --- a/vendor/github.com/blevesearch/bleve/v2/index/scorch/scorch.go +++ b/vendor/github.com/blevesearch/bleve/v2/index/scorch/scorch.go @@ -26,7 +26,7 @@ import ( "github.com/RoaringBitmap/roaring" "github.com/blevesearch/bleve/v2/registry" index "github.com/blevesearch/bleve_index_api" - segment "github.com/blevesearch/scorch_segment_api" + segment "github.com/blevesearch/scorch_segment_api/v2" bolt "go.etcd.io/bbolt" ) @@ -199,11 +199,9 @@ func (s *Scorch) openBolt() error { s.unsafeBatch = true } - var rootBoltOpt *bolt.Options + var rootBoltOpt = *bolt.DefaultOptions if s.readOnly { - rootBoltOpt = &bolt.Options{ - ReadOnly: true, - } + rootBoltOpt.ReadOnly = true } else { if s.path != "" { err := os.MkdirAll(s.path, 0700) @@ -213,10 +211,19 @@ func (s *Scorch) openBolt() error { } } + if boltTimeoutStr, ok := s.config["bolt_timeout"].(string); ok { + var err error + boltTimeout, err := time.ParseDuration(boltTimeoutStr) + if err != nil { + return fmt.Errorf("invalid duration specified for bolt_timeout: %v", err) + } + rootBoltOpt.Timeout = boltTimeout + } + rootBoltPath := s.path + string(os.PathSeparator) + "root.bolt" var err error if s.path != "" { - s.rootBolt, err = bolt.Open(rootBoltPath, 0600, rootBoltOpt) + s.rootBolt, err = bolt.Open(rootBoltPath, 0600, &rootBoltOpt) if err != nil { return err } diff --git a/vendor/github.com/blevesearch/bleve/v2/index/scorch/segment_plugin.go b/vendor/github.com/blevesearch/bleve/v2/index/scorch/segment_plugin.go index 99c3b9c891b520e36efd69feb72a9f638be3863c..ea40911fa9e9957230ac1d91dcb5738e1f81bc38 100644 --- a/vendor/github.com/blevesearch/bleve/v2/index/scorch/segment_plugin.go +++ b/vendor/github.com/blevesearch/bleve/v2/index/scorch/segment_plugin.go @@ -19,7 +19,7 @@ import ( "github.com/RoaringBitmap/roaring" index "github.com/blevesearch/bleve_index_api" - segment "github.com/blevesearch/scorch_segment_api" + segment "github.com/blevesearch/scorch_segment_api/v2" zapv11 "github.com/blevesearch/zapx/v11" zapv12 "github.com/blevesearch/zapx/v12" diff --git a/vendor/github.com/blevesearch/bleve/v2/index/scorch/snapshot_index.go b/vendor/github.com/blevesearch/bleve/v2/index/scorch/snapshot_index.go index 7c8353c8bf3265022da4220e33041c56917181b9..ac2f344120701ffdca243c6869df097428d6c844 100644 --- a/vendor/github.com/blevesearch/bleve/v2/index/scorch/snapshot_index.go +++ b/vendor/github.com/blevesearch/bleve/v2/index/scorch/snapshot_index.go @@ -26,9 +26,9 @@ import ( "github.com/RoaringBitmap/roaring" "github.com/blevesearch/bleve/v2/document" index "github.com/blevesearch/bleve_index_api" - segment "github.com/blevesearch/scorch_segment_api" - "github.com/couchbase/vellum" - lev "github.com/couchbase/vellum/levenshtein" + segment "github.com/blevesearch/scorch_segment_api/v2" + "github.com/blevesearch/vellum" + lev "github.com/blevesearch/vellum/levenshtein" ) // re usable, threadsafe levenshtein builders diff --git a/vendor/github.com/blevesearch/bleve/v2/index/scorch/snapshot_index_dict.go b/vendor/github.com/blevesearch/bleve/v2/index/scorch/snapshot_index_dict.go index 90e5a567727f223d51574ebeea2632fef0ed1901..0a2bd232e129f5b4f051d761a1d407331d2e8549 100644 --- a/vendor/github.com/blevesearch/bleve/v2/index/scorch/snapshot_index_dict.go +++ b/vendor/github.com/blevesearch/bleve/v2/index/scorch/snapshot_index_dict.go @@ -18,7 +18,7 @@ import ( "container/heap" index "github.com/blevesearch/bleve_index_api" - segment "github.com/blevesearch/scorch_segment_api" + segment "github.com/blevesearch/scorch_segment_api/v2" ) type segmentDictCursor struct { diff --git a/vendor/github.com/blevesearch/bleve/v2/index/scorch/snapshot_index_tfr.go b/vendor/github.com/blevesearch/bleve/v2/index/scorch/snapshot_index_tfr.go index 07b56605a142e2eee68e42dcb9087b0b1ae15acb..e983e3dd26f7cea7fe129344359de5a6078a6020 100644 --- a/vendor/github.com/blevesearch/bleve/v2/index/scorch/snapshot_index_tfr.go +++ b/vendor/github.com/blevesearch/bleve/v2/index/scorch/snapshot_index_tfr.go @@ -22,7 +22,7 @@ import ( "github.com/blevesearch/bleve/v2/size" index "github.com/blevesearch/bleve_index_api" - segment "github.com/blevesearch/scorch_segment_api" + segment "github.com/blevesearch/scorch_segment_api/v2" ) var reflectStaticSizeIndexSnapshotTermFieldReader int diff --git a/vendor/github.com/blevesearch/bleve/v2/index/scorch/snapshot_segment.go b/vendor/github.com/blevesearch/bleve/v2/index/scorch/snapshot_segment.go index 3170b76212e9099139f38ad43bf092c8f5b732dd..e017eb2a92b156b95db5c4edac062de8a0d13413 100644 --- a/vendor/github.com/blevesearch/bleve/v2/index/scorch/snapshot_segment.go +++ b/vendor/github.com/blevesearch/bleve/v2/index/scorch/snapshot_segment.go @@ -22,7 +22,7 @@ import ( "github.com/RoaringBitmap/roaring" "github.com/blevesearch/bleve/v2/size" index "github.com/blevesearch/bleve_index_api" - segment "github.com/blevesearch/scorch_segment_api" + segment "github.com/blevesearch/scorch_segment_api/v2" ) var TermSeparator byte = 0xff diff --git a/vendor/github.com/blevesearch/bleve/v2/index/scorch/unadorned.go b/vendor/github.com/blevesearch/bleve/v2/index/scorch/unadorned.go index bc7ca4e311428c592cb77aee8cda238e209e7601..855b813613f8ebbea6673a0517535860ba04c04d 100644 --- a/vendor/github.com/blevesearch/bleve/v2/index/scorch/unadorned.go +++ b/vendor/github.com/blevesearch/bleve/v2/index/scorch/unadorned.go @@ -16,7 +16,7 @@ package scorch import ( "github.com/RoaringBitmap/roaring" - segment "github.com/blevesearch/scorch_segment_api" + segment "github.com/blevesearch/scorch_segment_api/v2" "math" "reflect" ) diff --git a/vendor/github.com/blevesearch/bleve/v2/search.go b/vendor/github.com/blevesearch/bleve/v2/search.go index a9d00b935619eae615dd3d588fc11b95505c4db5..7397f566ea5a61267b6c1fa71314e26ca55563d2 100644 --- a/vendor/github.com/blevesearch/bleve/v2/search.go +++ b/vendor/github.com/blevesearch/bleve/v2/search.go @@ -600,12 +600,14 @@ func MemoryNeededForSearchResult(req *SearchRequest) uint64 { estimate += len(req.Facets) * fr.Size() } - // highlighting, store + // overhead from fields, highlighting var d document.Document if len(req.Fields) > 0 || req.Highlight != nil { - for i := 0; i < (req.Size + req.From); i++ { - estimate += (req.Size + req.From) * d.Size() + numDocsApplicable := req.Size + if numDocsApplicable > collector.PreAllocSizeSkipCap { + numDocsApplicable = collector.PreAllocSizeSkipCap } + estimate += numDocsApplicable * d.Size() } return uint64(estimate) diff --git a/vendor/github.com/blevesearch/scorch_segment_api/.golangci.yml b/vendor/github.com/blevesearch/scorch_segment_api/v2/.golangci.yml similarity index 100% rename from vendor/github.com/blevesearch/scorch_segment_api/.golangci.yml rename to vendor/github.com/blevesearch/scorch_segment_api/v2/.golangci.yml diff --git a/vendor/github.com/blevesearch/scorch_segment_api/LICENSE b/vendor/github.com/blevesearch/scorch_segment_api/v2/LICENSE similarity index 100% rename from vendor/github.com/blevesearch/scorch_segment_api/LICENSE rename to vendor/github.com/blevesearch/scorch_segment_api/v2/LICENSE diff --git a/vendor/github.com/blevesearch/scorch_segment_api/README.md b/vendor/github.com/blevesearch/scorch_segment_api/v2/README.md similarity index 100% rename from vendor/github.com/blevesearch/scorch_segment_api/README.md rename to vendor/github.com/blevesearch/scorch_segment_api/v2/README.md diff --git a/vendor/github.com/blevesearch/scorch_segment_api/v2/automaton.go b/vendor/github.com/blevesearch/scorch_segment_api/v2/automaton.go new file mode 100644 index 0000000000000000000000000000000000000000..4577ceb2e6f0939912d681cd6dbed3a103ae3113 --- /dev/null +++ b/vendor/github.com/blevesearch/scorch_segment_api/v2/automaton.go @@ -0,0 +1,36 @@ +// Copyright (c) 2021 Couchbase, Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package segment + +// Automaton represents the general contract of a byte-based finite automaton +type Automaton interface { + + // Start returns the start state + Start() int + + // IsMatch returns true if and only if the state is a match + IsMatch(int) bool + + // CanMatch returns true if and only if it is possible to reach a match + // in zero or more steps + CanMatch(int) bool + + // WillAlwaysMatch returns true if and only if the current state matches + // and will always match no matter what steps are taken + WillAlwaysMatch(int) bool + + // Accept returns the next state given the input to the specified state + Accept(int, byte) int +} diff --git a/vendor/github.com/blevesearch/scorch_segment_api/go.mod b/vendor/github.com/blevesearch/scorch_segment_api/v2/go.mod similarity index 61% rename from vendor/github.com/blevesearch/scorch_segment_api/go.mod rename to vendor/github.com/blevesearch/scorch_segment_api/v2/go.mod index 86ca5f42ad541f8ec77962553518f78e41e53d1e..fb60b845efc90b660f72995927c7585bdc71f2bc 100644 --- a/vendor/github.com/blevesearch/scorch_segment_api/go.mod +++ b/vendor/github.com/blevesearch/scorch_segment_api/v2/go.mod @@ -1,10 +1,10 @@ -module github.com/blevesearch/scorch_segment_api +module github.com/blevesearch/scorch_segment_api/v2 go 1.13 require ( github.com/RoaringBitmap/roaring v0.4.23 github.com/blevesearch/bleve_index_api v1.0.0 - github.com/couchbase/vellum v1.0.2 + github.com/davecgh/go-spew v1.1.1 // indirect github.com/mschoch/smat v0.2.0 // indirect ) diff --git a/vendor/github.com/blevesearch/scorch_segment_api/go.sum b/vendor/github.com/blevesearch/scorch_segment_api/v2/go.sum similarity index 51% rename from vendor/github.com/blevesearch/scorch_segment_api/go.sum rename to vendor/github.com/blevesearch/scorch_segment_api/v2/go.sum index d69d7bd87ff7790ccf1e68255016f59980701004..c465e59d69724a8c83a194a386ec39e775e321b8 100644 --- a/vendor/github.com/blevesearch/scorch_segment_api/go.sum +++ b/vendor/github.com/blevesearch/scorch_segment_api/v2/go.sum @@ -1,21 +1,10 @@ -github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/RoaringBitmap/roaring v0.4.23 h1:gpyfd12QohbqhFO4NVDUdoPOCXsyahYRQhINmlHxKeo= github.com/RoaringBitmap/roaring v0.4.23/go.mod h1:D0gp8kJQgE1A4LQ5wFLggQEyvDi06Mq5mKs52e1TwOo= -github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= github.com/blevesearch/bleve_index_api v1.0.0 h1:Ds3XeuTxjXCkG6pgIwWDRyooJKNIuOKemnN0N0IkhTU= github.com/blevesearch/bleve_index_api v1.0.0/go.mod h1:fiwKS0xLEm+gBRgv5mumf0dhgFr2mDgZah1pqv1c1M4= -github.com/blevesearch/mmap-go v1.0.2 h1:JtMHb+FgQCTTYIhtMvimw15dJwu1Y5lrZDMOFXVWPk0= -github.com/blevesearch/mmap-go v1.0.2/go.mod h1:ol2qBqYaOUsGdm7aRMRrYGgPvnwLe6Y+7LMvAB5IbSA= -github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= -github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= -github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= -github.com/couchbase/vellum v1.0.2 h1:BrbP0NKiyDdndMPec8Jjhy0U47CZ0Lgx3xUC2r9rZqw= -github.com/couchbase/vellum v1.0.2/go.mod h1:FcwrEivFpNi24R3jLOs3n+fs5RnuQnQqCLBJ1uAg1W4= -github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= 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/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/glycerine/go-unsnap-stream v0.0.0-20181221182339-f9677308dec2 h1:Ujru1hufTHVb++eG6OuNDKMxZnGIvF6o/u8q/8h2+I4= github.com/glycerine/go-unsnap-stream v0.0.0-20181221182339-f9677308dec2/go.mod h1:/20jfyN9Y5QPEAprSgKAUr+glWDY39ZiUEAYOEv5dsE= github.com/glycerine/goconvey v0.0.0-20190410193231-58a59202ab31 h1:gclg6gY70GLy3PbkQ1AERPfmLMMagS60DKF78eWwLn8= @@ -24,44 +13,22 @@ github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/gopherjs/gopherjs v0.0.0-20190910122728-9d188e94fb99 h1:twflg0XRTjwKpxb/jFExr4HGq6on2dEOmnL6FV+fgPw= github.com/gopherjs/gopherjs v0.0.0-20190910122728-9d188e94fb99/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= -github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= -github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= -github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= -github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= -github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mschoch/smat v0.0.0-20160514031455-90eadee771ae/go.mod h1:qAyveg+e4CE+eKJXWVjKXM4ck2QobLqTDytGJbLLhJg= github.com/mschoch/smat v0.2.0 h1:8imxQsjDm8yFEAVBe7azKmKSgzSkZXDuKkSq9374khM= github.com/mschoch/smat v0.2.0/go.mod h1:kc9mz7DoBKqDyiRL7VZN8KvXQMWeTaVnttLRXOlotKw= -github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/philhofer/fwd v1.0.0 h1:UbZqGr5Y38ApvM/V/jEljVxwocdweyH+vmYvRPBnbqQ= github.com/philhofer/fwd v1.0.0/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU= 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 v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= -github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= -github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= -github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= -github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= -github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/tinylib/msgp v1.1.0 h1:9fQd+ICuRIu/ue4vxJZu6/LzxN0HwMds2nq/0cFvxHU= github.com/tinylib/msgp v1.1.0/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE= -github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= github.com/willf/bitset v1.1.10 h1:NotGKqX0KwQ72NUzqrjZq5ipPNDQex9lo3WpaS8L2sc= github.com/willf/bitset v1.1.10/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4= -github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= -golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181221143128-b4a75ba826a6/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a h1:aYOabOQFp6Vj6W1F80affTUvO9UxmJRx8K0gsfABByQ= -golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= diff --git a/vendor/github.com/blevesearch/scorch_segment_api/segment.go b/vendor/github.com/blevesearch/scorch_segment_api/v2/segment.go similarity index 98% rename from vendor/github.com/blevesearch/scorch_segment_api/segment.go rename to vendor/github.com/blevesearch/scorch_segment_api/v2/segment.go index 7f3ab16f38852f7d4805ec2e4897bb602bcab08c..702214a55e35782630cda08fb1c4e7dc50661845 100644 --- a/vendor/github.com/blevesearch/scorch_segment_api/segment.go +++ b/vendor/github.com/blevesearch/scorch_segment_api/v2/segment.go @@ -19,7 +19,6 @@ import ( "github.com/RoaringBitmap/roaring" index "github.com/blevesearch/bleve_index_api" - "github.com/couchbase/vellum" ) var ErrClosed = fmt.Errorf("index closed") @@ -63,7 +62,7 @@ type PersistedSegment interface { type TermDictionary interface { PostingsList(term []byte, except *roaring.Bitmap, prealloc PostingsList) (PostingsList, error) - AutomatonIterator(a vellum.Automaton, + AutomatonIterator(a Automaton, startKeyInclusive, endKeyExclusive []byte) DictionaryIterator Contains(key []byte) (bool, error) diff --git a/vendor/github.com/couchbase/vellum/CONTRIBUTING.md b/vendor/github.com/blevesearch/vellum/CONTRIBUTING.md similarity index 100% rename from vendor/github.com/couchbase/vellum/CONTRIBUTING.md rename to vendor/github.com/blevesearch/vellum/CONTRIBUTING.md diff --git a/vendor/github.com/couchbase/vellum/LICENSE b/vendor/github.com/blevesearch/vellum/LICENSE similarity index 100% rename from vendor/github.com/couchbase/vellum/LICENSE rename to vendor/github.com/blevesearch/vellum/LICENSE diff --git a/vendor/github.com/couchbase/vellum/README.md b/vendor/github.com/blevesearch/vellum/README.md similarity index 100% rename from vendor/github.com/couchbase/vellum/README.md rename to vendor/github.com/blevesearch/vellum/README.md diff --git a/vendor/github.com/couchbase/vellum/automaton.go b/vendor/github.com/blevesearch/vellum/automaton.go similarity index 100% rename from vendor/github.com/couchbase/vellum/automaton.go rename to vendor/github.com/blevesearch/vellum/automaton.go diff --git a/vendor/github.com/couchbase/vellum/builder.go b/vendor/github.com/blevesearch/vellum/builder.go similarity index 100% rename from vendor/github.com/couchbase/vellum/builder.go rename to vendor/github.com/blevesearch/vellum/builder.go diff --git a/vendor/github.com/couchbase/vellum/common.go b/vendor/github.com/blevesearch/vellum/common.go similarity index 100% rename from vendor/github.com/couchbase/vellum/common.go rename to vendor/github.com/blevesearch/vellum/common.go diff --git a/vendor/github.com/couchbase/vellum/decoder_v1.go b/vendor/github.com/blevesearch/vellum/decoder_v1.go similarity index 100% rename from vendor/github.com/couchbase/vellum/decoder_v1.go rename to vendor/github.com/blevesearch/vellum/decoder_v1.go diff --git a/vendor/github.com/couchbase/vellum/encoder_v1.go b/vendor/github.com/blevesearch/vellum/encoder_v1.go similarity index 100% rename from vendor/github.com/couchbase/vellum/encoder_v1.go rename to vendor/github.com/blevesearch/vellum/encoder_v1.go diff --git a/vendor/github.com/couchbase/vellum/encoding.go b/vendor/github.com/blevesearch/vellum/encoding.go similarity index 100% rename from vendor/github.com/couchbase/vellum/encoding.go rename to vendor/github.com/blevesearch/vellum/encoding.go diff --git a/vendor/github.com/couchbase/vellum/fst.go b/vendor/github.com/blevesearch/vellum/fst.go similarity index 100% rename from vendor/github.com/couchbase/vellum/fst.go rename to vendor/github.com/blevesearch/vellum/fst.go diff --git a/vendor/github.com/couchbase/vellum/fst_iterator.go b/vendor/github.com/blevesearch/vellum/fst_iterator.go similarity index 100% rename from vendor/github.com/couchbase/vellum/fst_iterator.go rename to vendor/github.com/blevesearch/vellum/fst_iterator.go diff --git a/vendor/github.com/couchbase/vellum/go.mod b/vendor/github.com/blevesearch/vellum/go.mod similarity index 83% rename from vendor/github.com/couchbase/vellum/go.mod rename to vendor/github.com/blevesearch/vellum/go.mod index ef9d9abfb0af17561c2eceda1fa62d090ee2a76a..afc0acff9b747ea6a382ffad682a0376dd9ad119 100644 --- a/vendor/github.com/couchbase/vellum/go.mod +++ b/vendor/github.com/blevesearch/vellum/go.mod @@ -1,4 +1,4 @@ -module github.com/couchbase/vellum +module github.com/blevesearch/vellum go 1.12 diff --git a/vendor/github.com/couchbase/vellum/go.sum b/vendor/github.com/blevesearch/vellum/go.sum similarity index 100% rename from vendor/github.com/couchbase/vellum/go.sum rename to vendor/github.com/blevesearch/vellum/go.sum diff --git a/vendor/github.com/couchbase/vellum/levenshtein/LICENSE b/vendor/github.com/blevesearch/vellum/levenshtein/LICENSE similarity index 100% rename from vendor/github.com/couchbase/vellum/levenshtein/LICENSE rename to vendor/github.com/blevesearch/vellum/levenshtein/LICENSE diff --git a/vendor/github.com/couchbase/vellum/levenshtein/README.md b/vendor/github.com/blevesearch/vellum/levenshtein/README.md similarity index 100% rename from vendor/github.com/couchbase/vellum/levenshtein/README.md rename to vendor/github.com/blevesearch/vellum/levenshtein/README.md diff --git a/vendor/github.com/couchbase/vellum/levenshtein/alphabet.go b/vendor/github.com/blevesearch/vellum/levenshtein/alphabet.go similarity index 100% rename from vendor/github.com/couchbase/vellum/levenshtein/alphabet.go rename to vendor/github.com/blevesearch/vellum/levenshtein/alphabet.go diff --git a/vendor/github.com/couchbase/vellum/levenshtein/dfa.go b/vendor/github.com/blevesearch/vellum/levenshtein/dfa.go similarity index 100% rename from vendor/github.com/couchbase/vellum/levenshtein/dfa.go rename to vendor/github.com/blevesearch/vellum/levenshtein/dfa.go diff --git a/vendor/github.com/couchbase/vellum/levenshtein/levenshtein.go b/vendor/github.com/blevesearch/vellum/levenshtein/levenshtein.go similarity index 100% rename from vendor/github.com/couchbase/vellum/levenshtein/levenshtein.go rename to vendor/github.com/blevesearch/vellum/levenshtein/levenshtein.go diff --git a/vendor/github.com/couchbase/vellum/levenshtein/levenshtein_nfa.go b/vendor/github.com/blevesearch/vellum/levenshtein/levenshtein_nfa.go similarity index 100% rename from vendor/github.com/couchbase/vellum/levenshtein/levenshtein_nfa.go rename to vendor/github.com/blevesearch/vellum/levenshtein/levenshtein_nfa.go diff --git a/vendor/github.com/couchbase/vellum/levenshtein/parametric_dfa.go b/vendor/github.com/blevesearch/vellum/levenshtein/parametric_dfa.go similarity index 100% rename from vendor/github.com/couchbase/vellum/levenshtein/parametric_dfa.go rename to vendor/github.com/blevesearch/vellum/levenshtein/parametric_dfa.go diff --git a/vendor/github.com/couchbase/vellum/merge_iterator.go b/vendor/github.com/blevesearch/vellum/merge_iterator.go similarity index 100% rename from vendor/github.com/couchbase/vellum/merge_iterator.go rename to vendor/github.com/blevesearch/vellum/merge_iterator.go diff --git a/vendor/github.com/couchbase/vellum/pack.go b/vendor/github.com/blevesearch/vellum/pack.go similarity index 100% rename from vendor/github.com/couchbase/vellum/pack.go rename to vendor/github.com/blevesearch/vellum/pack.go diff --git a/vendor/github.com/couchbase/vellum/regexp/compile.go b/vendor/github.com/blevesearch/vellum/regexp/compile.go similarity index 99% rename from vendor/github.com/couchbase/vellum/regexp/compile.go rename to vendor/github.com/blevesearch/vellum/regexp/compile.go index 92284d0a874860142eff1f8f3b60697c151d76ce..558ce41985ae1c9ecb7e1f958121d04ec8dd9a2e 100644 --- a/vendor/github.com/couchbase/vellum/regexp/compile.go +++ b/vendor/github.com/blevesearch/vellum/regexp/compile.go @@ -20,7 +20,7 @@ import ( unicode_utf8 "unicode/utf8" - "github.com/couchbase/vellum/utf8" + "github.com/blevesearch/vellum/utf8" ) type compiler struct { diff --git a/vendor/github.com/couchbase/vellum/regexp/dfa.go b/vendor/github.com/blevesearch/vellum/regexp/dfa.go similarity index 100% rename from vendor/github.com/couchbase/vellum/regexp/dfa.go rename to vendor/github.com/blevesearch/vellum/regexp/dfa.go diff --git a/vendor/github.com/couchbase/vellum/regexp/inst.go b/vendor/github.com/blevesearch/vellum/regexp/inst.go similarity index 100% rename from vendor/github.com/couchbase/vellum/regexp/inst.go rename to vendor/github.com/blevesearch/vellum/regexp/inst.go diff --git a/vendor/github.com/couchbase/vellum/regexp/regexp.go b/vendor/github.com/blevesearch/vellum/regexp/regexp.go similarity index 100% rename from vendor/github.com/couchbase/vellum/regexp/regexp.go rename to vendor/github.com/blevesearch/vellum/regexp/regexp.go diff --git a/vendor/github.com/couchbase/vellum/regexp/sparse.go b/vendor/github.com/blevesearch/vellum/regexp/sparse.go similarity index 100% rename from vendor/github.com/couchbase/vellum/regexp/sparse.go rename to vendor/github.com/blevesearch/vellum/regexp/sparse.go diff --git a/vendor/github.com/couchbase/vellum/registry.go b/vendor/github.com/blevesearch/vellum/registry.go similarity index 100% rename from vendor/github.com/couchbase/vellum/registry.go rename to vendor/github.com/blevesearch/vellum/registry.go diff --git a/vendor/github.com/couchbase/vellum/transducer.go b/vendor/github.com/blevesearch/vellum/transducer.go similarity index 100% rename from vendor/github.com/couchbase/vellum/transducer.go rename to vendor/github.com/blevesearch/vellum/transducer.go diff --git a/vendor/github.com/couchbase/vellum/utf8/utf8.go b/vendor/github.com/blevesearch/vellum/utf8/utf8.go similarity index 100% rename from vendor/github.com/couchbase/vellum/utf8/utf8.go rename to vendor/github.com/blevesearch/vellum/utf8/utf8.go diff --git a/vendor/github.com/couchbase/vellum/vellum.go b/vendor/github.com/blevesearch/vellum/vellum.go similarity index 100% rename from vendor/github.com/couchbase/vellum/vellum.go rename to vendor/github.com/blevesearch/vellum/vellum.go diff --git a/vendor/github.com/couchbase/vellum/vellum_mmap.go b/vendor/github.com/blevesearch/vellum/vellum_mmap.go similarity index 100% rename from vendor/github.com/couchbase/vellum/vellum_mmap.go rename to vendor/github.com/blevesearch/vellum/vellum_mmap.go diff --git a/vendor/github.com/couchbase/vellum/vellum_nommap.go b/vendor/github.com/blevesearch/vellum/vellum_nommap.go similarity index 100% rename from vendor/github.com/couchbase/vellum/vellum_nommap.go rename to vendor/github.com/blevesearch/vellum/vellum_nommap.go diff --git a/vendor/github.com/couchbase/vellum/writer.go b/vendor/github.com/blevesearch/vellum/writer.go similarity index 100% rename from vendor/github.com/couchbase/vellum/writer.go rename to vendor/github.com/blevesearch/vellum/writer.go diff --git a/vendor/github.com/blevesearch/zapx/v11/build.go b/vendor/github.com/blevesearch/zapx/v11/build.go index bac1edb54945ce2922ce319f6f67afc53c8ed498..a4b5d2117b07c124f7ab35e52afc99d5c7570313 100644 --- a/vendor/github.com/blevesearch/zapx/v11/build.go +++ b/vendor/github.com/blevesearch/zapx/v11/build.go @@ -19,7 +19,7 @@ import ( "math" "os" - "github.com/couchbase/vellum" + "github.com/blevesearch/vellum" ) const Version uint32 = 11 diff --git a/vendor/github.com/blevesearch/zapx/v11/count.go b/vendor/github.com/blevesearch/zapx/v11/count.go index 9508e127040aa37c58b696a51f48b968e96349c4..b6135359fb5426dcd236dee7734baaa162e54fb5 100644 --- a/vendor/github.com/blevesearch/zapx/v11/count.go +++ b/vendor/github.com/blevesearch/zapx/v11/count.go @@ -18,7 +18,7 @@ import ( "hash/crc32" "io" - segment "github.com/blevesearch/scorch_segment_api" + segment "github.com/blevesearch/scorch_segment_api/v2" ) // CountHashWriter is a wrapper around a Writer which counts the number of diff --git a/vendor/github.com/blevesearch/zapx/v11/dict.go b/vendor/github.com/blevesearch/zapx/v11/dict.go index cf88651a7e9bce105713cea7725499d421a59f2c..e30bf2420da03d844858bc40c28e2c6ad15b2260 100644 --- a/vendor/github.com/blevesearch/zapx/v11/dict.go +++ b/vendor/github.com/blevesearch/zapx/v11/dict.go @@ -19,8 +19,8 @@ import ( "github.com/RoaringBitmap/roaring" index "github.com/blevesearch/bleve_index_api" - segment "github.com/blevesearch/scorch_segment_api" - "github.com/couchbase/vellum" + segment "github.com/blevesearch/scorch_segment_api/v2" + "github.com/blevesearch/vellum" ) // Dictionary is the zap representation of the term dictionary @@ -106,7 +106,7 @@ func (d *Dictionary) Contains(key []byte) (bool, error) { // AutomatonIterator returns an iterator which only visits terms // having the the vellum automaton and start/end key range -func (d *Dictionary) AutomatonIterator(a vellum.Automaton, +func (d *Dictionary) AutomatonIterator(a segment.Automaton, startKeyInclusive, endKeyExclusive []byte) segment.DictionaryIterator { if d.fst != nil { rv := &DictionaryIterator{ diff --git a/vendor/github.com/blevesearch/zapx/v11/docvalues.go b/vendor/github.com/blevesearch/zapx/v11/docvalues.go index 09a708df1a40f605150a1d67f70acf7f409d752d..27dba9962e677ba1bebd4de7f43debe2ba9a56bf 100644 --- a/vendor/github.com/blevesearch/zapx/v11/docvalues.go +++ b/vendor/github.com/blevesearch/zapx/v11/docvalues.go @@ -23,7 +23,7 @@ import ( "sort" index "github.com/blevesearch/bleve_index_api" - segment "github.com/blevesearch/scorch_segment_api" + segment "github.com/blevesearch/scorch_segment_api/v2" "github.com/golang/snappy" ) diff --git a/vendor/github.com/blevesearch/zapx/v11/enumerator.go b/vendor/github.com/blevesearch/zapx/v11/enumerator.go index cd6ff73c7920103be8ae87aafd4d7aab453a6165..5531d2cf1d67ac721d2bdd2e04c0972f8aed0985 100644 --- a/vendor/github.com/blevesearch/zapx/v11/enumerator.go +++ b/vendor/github.com/blevesearch/zapx/v11/enumerator.go @@ -17,7 +17,7 @@ package zap import ( "bytes" - "github.com/couchbase/vellum" + "github.com/blevesearch/vellum" ) // enumerator provides an ordered traversal of multiple vellum diff --git a/vendor/github.com/blevesearch/zapx/v11/go.mod b/vendor/github.com/blevesearch/zapx/v11/go.mod index c90c2f8465bf042606c55b15d8737478651e7dc7..394dbb6a57659508964117c10e3ce2cdf6aa5149 100644 --- a/vendor/github.com/blevesearch/zapx/v11/go.mod +++ b/vendor/github.com/blevesearch/zapx/v11/go.mod @@ -6,8 +6,8 @@ require ( github.com/RoaringBitmap/roaring v0.4.23 github.com/blevesearch/bleve_index_api v1.0.0 github.com/blevesearch/mmap-go v1.0.2 - github.com/blevesearch/scorch_segment_api v1.0.0 - github.com/couchbase/vellum v1.0.2 + github.com/blevesearch/scorch_segment_api/v2 v2.0.1 + github.com/blevesearch/vellum v1.0.3 github.com/golang/snappy v0.0.1 github.com/spf13/cobra v0.0.5 ) diff --git a/vendor/github.com/blevesearch/zapx/v11/go.sum b/vendor/github.com/blevesearch/zapx/v11/go.sum index 696bdabac2174389cb7cbb5d83628a0a268c532a..68e45348c8bf3373ae363ee39681bfbd9666d598 100644 --- a/vendor/github.com/blevesearch/zapx/v11/go.sum +++ b/vendor/github.com/blevesearch/zapx/v11/go.sum @@ -6,13 +6,13 @@ github.com/blevesearch/bleve_index_api v1.0.0 h1:Ds3XeuTxjXCkG6pgIwWDRyooJKNIuOK github.com/blevesearch/bleve_index_api v1.0.0/go.mod h1:fiwKS0xLEm+gBRgv5mumf0dhgFr2mDgZah1pqv1c1M4= github.com/blevesearch/mmap-go v1.0.2 h1:JtMHb+FgQCTTYIhtMvimw15dJwu1Y5lrZDMOFXVWPk0= github.com/blevesearch/mmap-go v1.0.2/go.mod h1:ol2qBqYaOUsGdm7aRMRrYGgPvnwLe6Y+7LMvAB5IbSA= -github.com/blevesearch/scorch_segment_api v1.0.0 h1:BUkCPWDg2gimTEyVDXf85I2buqqt4lh28uaVMiJsIYk= -github.com/blevesearch/scorch_segment_api v1.0.0/go.mod h1:KgRYmlfYC27NeM6cXOHx8LBgq7jn0atpV8mVWoBKBng= +github.com/blevesearch/scorch_segment_api/v2 v2.0.1 h1:fd+hPtZ8GsbqPK1HslGp7Vhoik4arZteA/IsCEgOisw= +github.com/blevesearch/scorch_segment_api/v2 v2.0.1/go.mod h1:lq7yK2jQy1yQjtjTfU931aVqz7pYxEudHaDwOt1tXfU= +github.com/blevesearch/vellum v1.0.3 h1:U86G41A7CtXNzzpIJHM8lSTUqz1Mp8U870TkcdCzZc8= +github.com/blevesearch/vellum v1.0.3/go.mod h1:2u5ax02KeDuNWu4/C+hVQMD6uLN4txH1JbtpaDNLJRo= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= -github.com/couchbase/vellum v1.0.2 h1:BrbP0NKiyDdndMPec8Jjhy0U47CZ0Lgx3xUC2r9rZqw= -github.com/couchbase/vellum v1.0.2/go.mod h1:FcwrEivFpNi24R3jLOs3n+fs5RnuQnQqCLBJ1uAg1W4= github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= diff --git a/vendor/github.com/blevesearch/zapx/v11/merge.go b/vendor/github.com/blevesearch/zapx/v11/merge.go index a042079c0d1fbea1972a924ee92aae35b2a9d5fe..f0770e990bc61cbc458028c90112fdd63f8dda83 100644 --- a/vendor/github.com/blevesearch/zapx/v11/merge.go +++ b/vendor/github.com/blevesearch/zapx/v11/merge.go @@ -24,8 +24,8 @@ import ( "sort" "github.com/RoaringBitmap/roaring" - seg "github.com/blevesearch/scorch_segment_api" - "github.com/couchbase/vellum" + seg "github.com/blevesearch/scorch_segment_api/v2" + "github.com/blevesearch/vellum" "github.com/golang/snappy" ) diff --git a/vendor/github.com/blevesearch/zapx/v11/new.go b/vendor/github.com/blevesearch/zapx/v11/new.go index e5ad5443e8e5347a38274ab2121d82d345ff8f30..4491422aa9000f0770da6cb0c24d56370de89130 100644 --- a/vendor/github.com/blevesearch/zapx/v11/new.go +++ b/vendor/github.com/blevesearch/zapx/v11/new.go @@ -23,8 +23,8 @@ import ( "github.com/RoaringBitmap/roaring" index "github.com/blevesearch/bleve_index_api" - segment "github.com/blevesearch/scorch_segment_api" - "github.com/couchbase/vellum" + segment "github.com/blevesearch/scorch_segment_api/v2" + "github.com/blevesearch/vellum" "github.com/golang/snappy" ) diff --git a/vendor/github.com/blevesearch/zapx/v11/posting.go b/vendor/github.com/blevesearch/zapx/v11/posting.go index 9cbb91d8dcec24bd8451d15f49beaddd4750d4a0..b7125e7c8ae13fa90c4b2c71a9e2be1cddbd71fd 100644 --- a/vendor/github.com/blevesearch/zapx/v11/posting.go +++ b/vendor/github.com/blevesearch/zapx/v11/posting.go @@ -21,7 +21,7 @@ import ( "reflect" "github.com/RoaringBitmap/roaring" - segment "github.com/blevesearch/scorch_segment_api" + segment "github.com/blevesearch/scorch_segment_api/v2" ) var reflectStaticSizePostingsList int diff --git a/vendor/github.com/blevesearch/zapx/v11/segment.go b/vendor/github.com/blevesearch/zapx/v11/segment.go index 62a8d5aab62d54d36cf31e15a110f6923c30c307..7995de48c00e69651c026697e006c81cd7f74fcb 100644 --- a/vendor/github.com/blevesearch/zapx/v11/segment.go +++ b/vendor/github.com/blevesearch/zapx/v11/segment.go @@ -25,8 +25,8 @@ import ( "github.com/RoaringBitmap/roaring" mmap "github.com/blevesearch/mmap-go" - segment "github.com/blevesearch/scorch_segment_api" - "github.com/couchbase/vellum" + segment "github.com/blevesearch/scorch_segment_api/v2" + "github.com/blevesearch/vellum" "github.com/golang/snappy" ) diff --git a/vendor/github.com/blevesearch/zapx/v12/build.go b/vendor/github.com/blevesearch/zapx/v12/build.go index 467e5e007b33d8fc88e285e13b1eb0b974e8b5b5..eec4dde08c2740b125d6b3f87c1e0e5dfe07fe10 100644 --- a/vendor/github.com/blevesearch/zapx/v12/build.go +++ b/vendor/github.com/blevesearch/zapx/v12/build.go @@ -19,7 +19,7 @@ import ( "math" "os" - "github.com/couchbase/vellum" + "github.com/blevesearch/vellum" ) const Version uint32 = 12 diff --git a/vendor/github.com/blevesearch/zapx/v12/count.go b/vendor/github.com/blevesearch/zapx/v12/count.go index 9508e127040aa37c58b696a51f48b968e96349c4..b6135359fb5426dcd236dee7734baaa162e54fb5 100644 --- a/vendor/github.com/blevesearch/zapx/v12/count.go +++ b/vendor/github.com/blevesearch/zapx/v12/count.go @@ -18,7 +18,7 @@ import ( "hash/crc32" "io" - segment "github.com/blevesearch/scorch_segment_api" + segment "github.com/blevesearch/scorch_segment_api/v2" ) // CountHashWriter is a wrapper around a Writer which counts the number of diff --git a/vendor/github.com/blevesearch/zapx/v12/dict.go b/vendor/github.com/blevesearch/zapx/v12/dict.go index cf88651a7e9bce105713cea7725499d421a59f2c..e30bf2420da03d844858bc40c28e2c6ad15b2260 100644 --- a/vendor/github.com/blevesearch/zapx/v12/dict.go +++ b/vendor/github.com/blevesearch/zapx/v12/dict.go @@ -19,8 +19,8 @@ import ( "github.com/RoaringBitmap/roaring" index "github.com/blevesearch/bleve_index_api" - segment "github.com/blevesearch/scorch_segment_api" - "github.com/couchbase/vellum" + segment "github.com/blevesearch/scorch_segment_api/v2" + "github.com/blevesearch/vellum" ) // Dictionary is the zap representation of the term dictionary @@ -106,7 +106,7 @@ func (d *Dictionary) Contains(key []byte) (bool, error) { // AutomatonIterator returns an iterator which only visits terms // having the the vellum automaton and start/end key range -func (d *Dictionary) AutomatonIterator(a vellum.Automaton, +func (d *Dictionary) AutomatonIterator(a segment.Automaton, startKeyInclusive, endKeyExclusive []byte) segment.DictionaryIterator { if d.fst != nil { rv := &DictionaryIterator{ diff --git a/vendor/github.com/blevesearch/zapx/v12/docvalues.go b/vendor/github.com/blevesearch/zapx/v12/docvalues.go index f8da68f4368b051381b0101c50fe7b4200dbab3f..a530aa5ad9c6fe5dd027e729bae86a7aa6e9b10c 100644 --- a/vendor/github.com/blevesearch/zapx/v12/docvalues.go +++ b/vendor/github.com/blevesearch/zapx/v12/docvalues.go @@ -23,7 +23,7 @@ import ( "sort" index "github.com/blevesearch/bleve_index_api" - segment "github.com/blevesearch/scorch_segment_api" + segment "github.com/blevesearch/scorch_segment_api/v2" "github.com/golang/snappy" ) diff --git a/vendor/github.com/blevesearch/zapx/v12/enumerator.go b/vendor/github.com/blevesearch/zapx/v12/enumerator.go index bc5b7e6276d8f74b30c5b2f95e45f8a7c52e9bcd..972a2241653ab0acb8f823fe2c5b1714314949e4 100644 --- a/vendor/github.com/blevesearch/zapx/v12/enumerator.go +++ b/vendor/github.com/blevesearch/zapx/v12/enumerator.go @@ -17,7 +17,7 @@ package zap import ( "bytes" - "github.com/couchbase/vellum" + "github.com/blevesearch/vellum" ) // enumerator provides an ordered traversal of multiple vellum diff --git a/vendor/github.com/blevesearch/zapx/v12/go.mod b/vendor/github.com/blevesearch/zapx/v12/go.mod index 21b5665448e57bb39ba857a5b42b919be7d33635..e6f734cfde47899d3f2386fd6407b8e532617981 100644 --- a/vendor/github.com/blevesearch/zapx/v12/go.mod +++ b/vendor/github.com/blevesearch/zapx/v12/go.mod @@ -6,8 +6,8 @@ require ( github.com/RoaringBitmap/roaring v0.4.23 github.com/blevesearch/bleve_index_api v1.0.0 github.com/blevesearch/mmap-go v1.0.2 - github.com/blevesearch/scorch_segment_api v1.0.0 - github.com/couchbase/vellum v1.0.2 + github.com/blevesearch/scorch_segment_api/v2 v2.0.1 + github.com/blevesearch/vellum v1.0.3 github.com/golang/snappy v0.0.1 github.com/spf13/cobra v0.0.5 ) diff --git a/vendor/github.com/blevesearch/zapx/v12/go.sum b/vendor/github.com/blevesearch/zapx/v12/go.sum index 696bdabac2174389cb7cbb5d83628a0a268c532a..68e45348c8bf3373ae363ee39681bfbd9666d598 100644 --- a/vendor/github.com/blevesearch/zapx/v12/go.sum +++ b/vendor/github.com/blevesearch/zapx/v12/go.sum @@ -6,13 +6,13 @@ github.com/blevesearch/bleve_index_api v1.0.0 h1:Ds3XeuTxjXCkG6pgIwWDRyooJKNIuOK github.com/blevesearch/bleve_index_api v1.0.0/go.mod h1:fiwKS0xLEm+gBRgv5mumf0dhgFr2mDgZah1pqv1c1M4= github.com/blevesearch/mmap-go v1.0.2 h1:JtMHb+FgQCTTYIhtMvimw15dJwu1Y5lrZDMOFXVWPk0= github.com/blevesearch/mmap-go v1.0.2/go.mod h1:ol2qBqYaOUsGdm7aRMRrYGgPvnwLe6Y+7LMvAB5IbSA= -github.com/blevesearch/scorch_segment_api v1.0.0 h1:BUkCPWDg2gimTEyVDXf85I2buqqt4lh28uaVMiJsIYk= -github.com/blevesearch/scorch_segment_api v1.0.0/go.mod h1:KgRYmlfYC27NeM6cXOHx8LBgq7jn0atpV8mVWoBKBng= +github.com/blevesearch/scorch_segment_api/v2 v2.0.1 h1:fd+hPtZ8GsbqPK1HslGp7Vhoik4arZteA/IsCEgOisw= +github.com/blevesearch/scorch_segment_api/v2 v2.0.1/go.mod h1:lq7yK2jQy1yQjtjTfU931aVqz7pYxEudHaDwOt1tXfU= +github.com/blevesearch/vellum v1.0.3 h1:U86G41A7CtXNzzpIJHM8lSTUqz1Mp8U870TkcdCzZc8= +github.com/blevesearch/vellum v1.0.3/go.mod h1:2u5ax02KeDuNWu4/C+hVQMD6uLN4txH1JbtpaDNLJRo= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= -github.com/couchbase/vellum v1.0.2 h1:BrbP0NKiyDdndMPec8Jjhy0U47CZ0Lgx3xUC2r9rZqw= -github.com/couchbase/vellum v1.0.2/go.mod h1:FcwrEivFpNi24R3jLOs3n+fs5RnuQnQqCLBJ1uAg1W4= github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= diff --git a/vendor/github.com/blevesearch/zapx/v12/merge.go b/vendor/github.com/blevesearch/zapx/v12/merge.go index fa33cb955c35e49391f39fa109c25b6a4a668de7..6a853a16a6f1c8ba3b9cd73de8e9f43936eba74e 100644 --- a/vendor/github.com/blevesearch/zapx/v12/merge.go +++ b/vendor/github.com/blevesearch/zapx/v12/merge.go @@ -24,8 +24,8 @@ import ( "sort" "github.com/RoaringBitmap/roaring" - seg "github.com/blevesearch/scorch_segment_api" - "github.com/couchbase/vellum" + seg "github.com/blevesearch/scorch_segment_api/v2" + "github.com/blevesearch/vellum" "github.com/golang/snappy" ) diff --git a/vendor/github.com/blevesearch/zapx/v12/new.go b/vendor/github.com/blevesearch/zapx/v12/new.go index 12a2d01efeed6a42792b77f223e4f7ec8c9b256f..b4e0d03415bf0a5f87d2b589813b94c9eef9b6e0 100644 --- a/vendor/github.com/blevesearch/zapx/v12/new.go +++ b/vendor/github.com/blevesearch/zapx/v12/new.go @@ -23,8 +23,8 @@ import ( "github.com/RoaringBitmap/roaring" index "github.com/blevesearch/bleve_index_api" - segment "github.com/blevesearch/scorch_segment_api" - "github.com/couchbase/vellum" + segment "github.com/blevesearch/scorch_segment_api/v2" + "github.com/blevesearch/vellum" "github.com/golang/snappy" ) diff --git a/vendor/github.com/blevesearch/zapx/v12/posting.go b/vendor/github.com/blevesearch/zapx/v12/posting.go index c18aa31da5cc50f835a326603d5db247a7c8e733..d6c61a42ce1f7c46f2d51724f5ec373489e12805 100644 --- a/vendor/github.com/blevesearch/zapx/v12/posting.go +++ b/vendor/github.com/blevesearch/zapx/v12/posting.go @@ -21,7 +21,7 @@ import ( "reflect" "github.com/RoaringBitmap/roaring" - segment "github.com/blevesearch/scorch_segment_api" + segment "github.com/blevesearch/scorch_segment_api/v2" ) var reflectStaticSizePostingsList int diff --git a/vendor/github.com/blevesearch/zapx/v12/segment.go b/vendor/github.com/blevesearch/zapx/v12/segment.go index 427644f12c6a1125c60e6996c684974bc5661e8c..6317ad4036c8f8c67d4da3e8ea8bc16990460f35 100644 --- a/vendor/github.com/blevesearch/zapx/v12/segment.go +++ b/vendor/github.com/blevesearch/zapx/v12/segment.go @@ -25,8 +25,8 @@ import ( "github.com/RoaringBitmap/roaring" mmap "github.com/blevesearch/mmap-go" - segment "github.com/blevesearch/scorch_segment_api" - "github.com/couchbase/vellum" + segment "github.com/blevesearch/scorch_segment_api/v2" + "github.com/blevesearch/vellum" "github.com/golang/snappy" ) diff --git a/vendor/github.com/blevesearch/zapx/v13/build.go b/vendor/github.com/blevesearch/zapx/v13/build.go index 58d829f0c64f8289d0f2a9ef1802bf9c4815e981..5a25eef77bbd7469ae18795bf7a5e22eb40caf2a 100644 --- a/vendor/github.com/blevesearch/zapx/v13/build.go +++ b/vendor/github.com/blevesearch/zapx/v13/build.go @@ -19,7 +19,7 @@ import ( "math" "os" - "github.com/couchbase/vellum" + "github.com/blevesearch/vellum" ) const Version uint32 = 13 diff --git a/vendor/github.com/blevesearch/zapx/v13/count.go b/vendor/github.com/blevesearch/zapx/v13/count.go index 9508e127040aa37c58b696a51f48b968e96349c4..b6135359fb5426dcd236dee7734baaa162e54fb5 100644 --- a/vendor/github.com/blevesearch/zapx/v13/count.go +++ b/vendor/github.com/blevesearch/zapx/v13/count.go @@ -18,7 +18,7 @@ import ( "hash/crc32" "io" - segment "github.com/blevesearch/scorch_segment_api" + segment "github.com/blevesearch/scorch_segment_api/v2" ) // CountHashWriter is a wrapper around a Writer which counts the number of diff --git a/vendor/github.com/blevesearch/zapx/v13/dict.go b/vendor/github.com/blevesearch/zapx/v13/dict.go index cf88651a7e9bce105713cea7725499d421a59f2c..e30bf2420da03d844858bc40c28e2c6ad15b2260 100644 --- a/vendor/github.com/blevesearch/zapx/v13/dict.go +++ b/vendor/github.com/blevesearch/zapx/v13/dict.go @@ -19,8 +19,8 @@ import ( "github.com/RoaringBitmap/roaring" index "github.com/blevesearch/bleve_index_api" - segment "github.com/blevesearch/scorch_segment_api" - "github.com/couchbase/vellum" + segment "github.com/blevesearch/scorch_segment_api/v2" + "github.com/blevesearch/vellum" ) // Dictionary is the zap representation of the term dictionary @@ -106,7 +106,7 @@ func (d *Dictionary) Contains(key []byte) (bool, error) { // AutomatonIterator returns an iterator which only visits terms // having the the vellum automaton and start/end key range -func (d *Dictionary) AutomatonIterator(a vellum.Automaton, +func (d *Dictionary) AutomatonIterator(a segment.Automaton, startKeyInclusive, endKeyExclusive []byte) segment.DictionaryIterator { if d.fst != nil { rv := &DictionaryIterator{ diff --git a/vendor/github.com/blevesearch/zapx/v13/docvalues.go b/vendor/github.com/blevesearch/zapx/v13/docvalues.go index f8da68f4368b051381b0101c50fe7b4200dbab3f..a530aa5ad9c6fe5dd027e729bae86a7aa6e9b10c 100644 --- a/vendor/github.com/blevesearch/zapx/v13/docvalues.go +++ b/vendor/github.com/blevesearch/zapx/v13/docvalues.go @@ -23,7 +23,7 @@ import ( "sort" index "github.com/blevesearch/bleve_index_api" - segment "github.com/blevesearch/scorch_segment_api" + segment "github.com/blevesearch/scorch_segment_api/v2" "github.com/golang/snappy" ) diff --git a/vendor/github.com/blevesearch/zapx/v13/enumerator.go b/vendor/github.com/blevesearch/zapx/v13/enumerator.go index bc5b7e6276d8f74b30c5b2f95e45f8a7c52e9bcd..972a2241653ab0acb8f823fe2c5b1714314949e4 100644 --- a/vendor/github.com/blevesearch/zapx/v13/enumerator.go +++ b/vendor/github.com/blevesearch/zapx/v13/enumerator.go @@ -17,7 +17,7 @@ package zap import ( "bytes" - "github.com/couchbase/vellum" + "github.com/blevesearch/vellum" ) // enumerator provides an ordered traversal of multiple vellum diff --git a/vendor/github.com/blevesearch/zapx/v13/go.mod b/vendor/github.com/blevesearch/zapx/v13/go.mod index 144f060f7b9ca562032517aa987167d870b1e11a..7036e8689bf6659d3c1ba497c10301b6ad3db385 100644 --- a/vendor/github.com/blevesearch/zapx/v13/go.mod +++ b/vendor/github.com/blevesearch/zapx/v13/go.mod @@ -6,8 +6,8 @@ require ( github.com/RoaringBitmap/roaring v0.4.23 github.com/blevesearch/bleve_index_api v1.0.0 github.com/blevesearch/mmap-go v1.0.2 - github.com/blevesearch/scorch_segment_api v1.0.0 - github.com/couchbase/vellum v1.0.2 + github.com/blevesearch/scorch_segment_api/v2 v2.0.1 + github.com/blevesearch/vellum v1.0.3 github.com/golang/snappy v0.0.1 github.com/spf13/cobra v0.0.5 ) diff --git a/vendor/github.com/blevesearch/zapx/v13/go.sum b/vendor/github.com/blevesearch/zapx/v13/go.sum index 696bdabac2174389cb7cbb5d83628a0a268c532a..68e45348c8bf3373ae363ee39681bfbd9666d598 100644 --- a/vendor/github.com/blevesearch/zapx/v13/go.sum +++ b/vendor/github.com/blevesearch/zapx/v13/go.sum @@ -6,13 +6,13 @@ github.com/blevesearch/bleve_index_api v1.0.0 h1:Ds3XeuTxjXCkG6pgIwWDRyooJKNIuOK github.com/blevesearch/bleve_index_api v1.0.0/go.mod h1:fiwKS0xLEm+gBRgv5mumf0dhgFr2mDgZah1pqv1c1M4= github.com/blevesearch/mmap-go v1.0.2 h1:JtMHb+FgQCTTYIhtMvimw15dJwu1Y5lrZDMOFXVWPk0= github.com/blevesearch/mmap-go v1.0.2/go.mod h1:ol2qBqYaOUsGdm7aRMRrYGgPvnwLe6Y+7LMvAB5IbSA= -github.com/blevesearch/scorch_segment_api v1.0.0 h1:BUkCPWDg2gimTEyVDXf85I2buqqt4lh28uaVMiJsIYk= -github.com/blevesearch/scorch_segment_api v1.0.0/go.mod h1:KgRYmlfYC27NeM6cXOHx8LBgq7jn0atpV8mVWoBKBng= +github.com/blevesearch/scorch_segment_api/v2 v2.0.1 h1:fd+hPtZ8GsbqPK1HslGp7Vhoik4arZteA/IsCEgOisw= +github.com/blevesearch/scorch_segment_api/v2 v2.0.1/go.mod h1:lq7yK2jQy1yQjtjTfU931aVqz7pYxEudHaDwOt1tXfU= +github.com/blevesearch/vellum v1.0.3 h1:U86G41A7CtXNzzpIJHM8lSTUqz1Mp8U870TkcdCzZc8= +github.com/blevesearch/vellum v1.0.3/go.mod h1:2u5ax02KeDuNWu4/C+hVQMD6uLN4txH1JbtpaDNLJRo= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= -github.com/couchbase/vellum v1.0.2 h1:BrbP0NKiyDdndMPec8Jjhy0U47CZ0Lgx3xUC2r9rZqw= -github.com/couchbase/vellum v1.0.2/go.mod h1:FcwrEivFpNi24R3jLOs3n+fs5RnuQnQqCLBJ1uAg1W4= github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= diff --git a/vendor/github.com/blevesearch/zapx/v13/merge.go b/vendor/github.com/blevesearch/zapx/v13/merge.go index fa33cb955c35e49391f39fa109c25b6a4a668de7..6a853a16a6f1c8ba3b9cd73de8e9f43936eba74e 100644 --- a/vendor/github.com/blevesearch/zapx/v13/merge.go +++ b/vendor/github.com/blevesearch/zapx/v13/merge.go @@ -24,8 +24,8 @@ import ( "sort" "github.com/RoaringBitmap/roaring" - seg "github.com/blevesearch/scorch_segment_api" - "github.com/couchbase/vellum" + seg "github.com/blevesearch/scorch_segment_api/v2" + "github.com/blevesearch/vellum" "github.com/golang/snappy" ) diff --git a/vendor/github.com/blevesearch/zapx/v13/new.go b/vendor/github.com/blevesearch/zapx/v13/new.go index 12a2d01efeed6a42792b77f223e4f7ec8c9b256f..b4e0d03415bf0a5f87d2b589813b94c9eef9b6e0 100644 --- a/vendor/github.com/blevesearch/zapx/v13/new.go +++ b/vendor/github.com/blevesearch/zapx/v13/new.go @@ -23,8 +23,8 @@ import ( "github.com/RoaringBitmap/roaring" index "github.com/blevesearch/bleve_index_api" - segment "github.com/blevesearch/scorch_segment_api" - "github.com/couchbase/vellum" + segment "github.com/blevesearch/scorch_segment_api/v2" + "github.com/blevesearch/vellum" "github.com/golang/snappy" ) diff --git a/vendor/github.com/blevesearch/zapx/v13/posting.go b/vendor/github.com/blevesearch/zapx/v13/posting.go index c18aa31da5cc50f835a326603d5db247a7c8e733..d6c61a42ce1f7c46f2d51724f5ec373489e12805 100644 --- a/vendor/github.com/blevesearch/zapx/v13/posting.go +++ b/vendor/github.com/blevesearch/zapx/v13/posting.go @@ -21,7 +21,7 @@ import ( "reflect" "github.com/RoaringBitmap/roaring" - segment "github.com/blevesearch/scorch_segment_api" + segment "github.com/blevesearch/scorch_segment_api/v2" ) var reflectStaticSizePostingsList int diff --git a/vendor/github.com/blevesearch/zapx/v13/segment.go b/vendor/github.com/blevesearch/zapx/v13/segment.go index 427644f12c6a1125c60e6996c684974bc5661e8c..6317ad4036c8f8c67d4da3e8ea8bc16990460f35 100644 --- a/vendor/github.com/blevesearch/zapx/v13/segment.go +++ b/vendor/github.com/blevesearch/zapx/v13/segment.go @@ -25,8 +25,8 @@ import ( "github.com/RoaringBitmap/roaring" mmap "github.com/blevesearch/mmap-go" - segment "github.com/blevesearch/scorch_segment_api" - "github.com/couchbase/vellum" + segment "github.com/blevesearch/scorch_segment_api/v2" + "github.com/blevesearch/vellum" "github.com/golang/snappy" ) diff --git a/vendor/github.com/blevesearch/zapx/v14/build.go b/vendor/github.com/blevesearch/zapx/v14/build.go index 7a8dce0dcc2504c6ed125864b59f583fab667a3f..59c42684887188d4e9f92b227ce81a33fe4c5dea 100644 --- a/vendor/github.com/blevesearch/zapx/v14/build.go +++ b/vendor/github.com/blevesearch/zapx/v14/build.go @@ -19,7 +19,7 @@ import ( "math" "os" - "github.com/couchbase/vellum" + "github.com/blevesearch/vellum" ) const Version uint32 = 14 diff --git a/vendor/github.com/blevesearch/zapx/v14/count.go b/vendor/github.com/blevesearch/zapx/v14/count.go index 9508e127040aa37c58b696a51f48b968e96349c4..b6135359fb5426dcd236dee7734baaa162e54fb5 100644 --- a/vendor/github.com/blevesearch/zapx/v14/count.go +++ b/vendor/github.com/blevesearch/zapx/v14/count.go @@ -18,7 +18,7 @@ import ( "hash/crc32" "io" - segment "github.com/blevesearch/scorch_segment_api" + segment "github.com/blevesearch/scorch_segment_api/v2" ) // CountHashWriter is a wrapper around a Writer which counts the number of diff --git a/vendor/github.com/blevesearch/zapx/v14/dict.go b/vendor/github.com/blevesearch/zapx/v14/dict.go index cf88651a7e9bce105713cea7725499d421a59f2c..e30bf2420da03d844858bc40c28e2c6ad15b2260 100644 --- a/vendor/github.com/blevesearch/zapx/v14/dict.go +++ b/vendor/github.com/blevesearch/zapx/v14/dict.go @@ -19,8 +19,8 @@ import ( "github.com/RoaringBitmap/roaring" index "github.com/blevesearch/bleve_index_api" - segment "github.com/blevesearch/scorch_segment_api" - "github.com/couchbase/vellum" + segment "github.com/blevesearch/scorch_segment_api/v2" + "github.com/blevesearch/vellum" ) // Dictionary is the zap representation of the term dictionary @@ -106,7 +106,7 @@ func (d *Dictionary) Contains(key []byte) (bool, error) { // AutomatonIterator returns an iterator which only visits terms // having the the vellum automaton and start/end key range -func (d *Dictionary) AutomatonIterator(a vellum.Automaton, +func (d *Dictionary) AutomatonIterator(a segment.Automaton, startKeyInclusive, endKeyExclusive []byte) segment.DictionaryIterator { if d.fst != nil { rv := &DictionaryIterator{ diff --git a/vendor/github.com/blevesearch/zapx/v14/docvalues.go b/vendor/github.com/blevesearch/zapx/v14/docvalues.go index f8da68f4368b051381b0101c50fe7b4200dbab3f..a530aa5ad9c6fe5dd027e729bae86a7aa6e9b10c 100644 --- a/vendor/github.com/blevesearch/zapx/v14/docvalues.go +++ b/vendor/github.com/blevesearch/zapx/v14/docvalues.go @@ -23,7 +23,7 @@ import ( "sort" index "github.com/blevesearch/bleve_index_api" - segment "github.com/blevesearch/scorch_segment_api" + segment "github.com/blevesearch/scorch_segment_api/v2" "github.com/golang/snappy" ) diff --git a/vendor/github.com/blevesearch/zapx/v14/enumerator.go b/vendor/github.com/blevesearch/zapx/v14/enumerator.go index bc5b7e6276d8f74b30c5b2f95e45f8a7c52e9bcd..972a2241653ab0acb8f823fe2c5b1714314949e4 100644 --- a/vendor/github.com/blevesearch/zapx/v14/enumerator.go +++ b/vendor/github.com/blevesearch/zapx/v14/enumerator.go @@ -17,7 +17,7 @@ package zap import ( "bytes" - "github.com/couchbase/vellum" + "github.com/blevesearch/vellum" ) // enumerator provides an ordered traversal of multiple vellum diff --git a/vendor/github.com/blevesearch/zapx/v14/go.mod b/vendor/github.com/blevesearch/zapx/v14/go.mod index 2394b4fa2d8ec367a37c6d26bb0eb2f4da69ab46..762a0807dc7d68462f9f86410b64305792926e41 100644 --- a/vendor/github.com/blevesearch/zapx/v14/go.mod +++ b/vendor/github.com/blevesearch/zapx/v14/go.mod @@ -6,8 +6,8 @@ require ( github.com/RoaringBitmap/roaring v0.4.23 github.com/blevesearch/bleve_index_api v1.0.0 github.com/blevesearch/mmap-go v1.0.2 - github.com/blevesearch/scorch_segment_api v1.0.0 - github.com/couchbase/vellum v1.0.2 + github.com/blevesearch/scorch_segment_api/v2 v2.0.1 + github.com/blevesearch/vellum v1.0.3 github.com/golang/snappy v0.0.1 github.com/spf13/cobra v0.0.5 ) diff --git a/vendor/github.com/blevesearch/zapx/v14/go.sum b/vendor/github.com/blevesearch/zapx/v14/go.sum index 696bdabac2174389cb7cbb5d83628a0a268c532a..68e45348c8bf3373ae363ee39681bfbd9666d598 100644 --- a/vendor/github.com/blevesearch/zapx/v14/go.sum +++ b/vendor/github.com/blevesearch/zapx/v14/go.sum @@ -6,13 +6,13 @@ github.com/blevesearch/bleve_index_api v1.0.0 h1:Ds3XeuTxjXCkG6pgIwWDRyooJKNIuOK github.com/blevesearch/bleve_index_api v1.0.0/go.mod h1:fiwKS0xLEm+gBRgv5mumf0dhgFr2mDgZah1pqv1c1M4= github.com/blevesearch/mmap-go v1.0.2 h1:JtMHb+FgQCTTYIhtMvimw15dJwu1Y5lrZDMOFXVWPk0= github.com/blevesearch/mmap-go v1.0.2/go.mod h1:ol2qBqYaOUsGdm7aRMRrYGgPvnwLe6Y+7LMvAB5IbSA= -github.com/blevesearch/scorch_segment_api v1.0.0 h1:BUkCPWDg2gimTEyVDXf85I2buqqt4lh28uaVMiJsIYk= -github.com/blevesearch/scorch_segment_api v1.0.0/go.mod h1:KgRYmlfYC27NeM6cXOHx8LBgq7jn0atpV8mVWoBKBng= +github.com/blevesearch/scorch_segment_api/v2 v2.0.1 h1:fd+hPtZ8GsbqPK1HslGp7Vhoik4arZteA/IsCEgOisw= +github.com/blevesearch/scorch_segment_api/v2 v2.0.1/go.mod h1:lq7yK2jQy1yQjtjTfU931aVqz7pYxEudHaDwOt1tXfU= +github.com/blevesearch/vellum v1.0.3 h1:U86G41A7CtXNzzpIJHM8lSTUqz1Mp8U870TkcdCzZc8= +github.com/blevesearch/vellum v1.0.3/go.mod h1:2u5ax02KeDuNWu4/C+hVQMD6uLN4txH1JbtpaDNLJRo= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= -github.com/couchbase/vellum v1.0.2 h1:BrbP0NKiyDdndMPec8Jjhy0U47CZ0Lgx3xUC2r9rZqw= -github.com/couchbase/vellum v1.0.2/go.mod h1:FcwrEivFpNi24R3jLOs3n+fs5RnuQnQqCLBJ1uAg1W4= github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= diff --git a/vendor/github.com/blevesearch/zapx/v14/merge.go b/vendor/github.com/blevesearch/zapx/v14/merge.go index fa33cb955c35e49391f39fa109c25b6a4a668de7..6a853a16a6f1c8ba3b9cd73de8e9f43936eba74e 100644 --- a/vendor/github.com/blevesearch/zapx/v14/merge.go +++ b/vendor/github.com/blevesearch/zapx/v14/merge.go @@ -24,8 +24,8 @@ import ( "sort" "github.com/RoaringBitmap/roaring" - seg "github.com/blevesearch/scorch_segment_api" - "github.com/couchbase/vellum" + seg "github.com/blevesearch/scorch_segment_api/v2" + "github.com/blevesearch/vellum" "github.com/golang/snappy" ) diff --git a/vendor/github.com/blevesearch/zapx/v14/new.go b/vendor/github.com/blevesearch/zapx/v14/new.go index 12a2d01efeed6a42792b77f223e4f7ec8c9b256f..b4e0d03415bf0a5f87d2b589813b94c9eef9b6e0 100644 --- a/vendor/github.com/blevesearch/zapx/v14/new.go +++ b/vendor/github.com/blevesearch/zapx/v14/new.go @@ -23,8 +23,8 @@ import ( "github.com/RoaringBitmap/roaring" index "github.com/blevesearch/bleve_index_api" - segment "github.com/blevesearch/scorch_segment_api" - "github.com/couchbase/vellum" + segment "github.com/blevesearch/scorch_segment_api/v2" + "github.com/blevesearch/vellum" "github.com/golang/snappy" ) diff --git a/vendor/github.com/blevesearch/zapx/v14/posting.go b/vendor/github.com/blevesearch/zapx/v14/posting.go index 851790cab122f3beedb4ca9bb91c7abc7e34e43f..1d04247fb69160207e05349bdf9649a051460581 100644 --- a/vendor/github.com/blevesearch/zapx/v14/posting.go +++ b/vendor/github.com/blevesearch/zapx/v14/posting.go @@ -21,7 +21,7 @@ import ( "reflect" "github.com/RoaringBitmap/roaring" - segment "github.com/blevesearch/scorch_segment_api" + segment "github.com/blevesearch/scorch_segment_api/v2" ) var reflectStaticSizePostingsList int diff --git a/vendor/github.com/blevesearch/zapx/v14/segment.go b/vendor/github.com/blevesearch/zapx/v14/segment.go index 427644f12c6a1125c60e6996c684974bc5661e8c..6317ad4036c8f8c67d4da3e8ea8bc16990460f35 100644 --- a/vendor/github.com/blevesearch/zapx/v14/segment.go +++ b/vendor/github.com/blevesearch/zapx/v14/segment.go @@ -25,8 +25,8 @@ import ( "github.com/RoaringBitmap/roaring" mmap "github.com/blevesearch/mmap-go" - segment "github.com/blevesearch/scorch_segment_api" - "github.com/couchbase/vellum" + segment "github.com/blevesearch/scorch_segment_api/v2" + "github.com/blevesearch/vellum" "github.com/golang/snappy" ) diff --git a/vendor/github.com/blevesearch/zapx/v15/build.go b/vendor/github.com/blevesearch/zapx/v15/build.go index 1b7318376eaff7313913173e9a780ed46033dba0..14309f90ca90746fdd367df79f2bc67c0b3a69bd 100644 --- a/vendor/github.com/blevesearch/zapx/v15/build.go +++ b/vendor/github.com/blevesearch/zapx/v15/build.go @@ -19,7 +19,7 @@ import ( "math" "os" - "github.com/couchbase/vellum" + "github.com/blevesearch/vellum" ) const Version uint32 = 15 diff --git a/vendor/github.com/blevesearch/zapx/v15/count.go b/vendor/github.com/blevesearch/zapx/v15/count.go index 9508e127040aa37c58b696a51f48b968e96349c4..b6135359fb5426dcd236dee7734baaa162e54fb5 100644 --- a/vendor/github.com/blevesearch/zapx/v15/count.go +++ b/vendor/github.com/blevesearch/zapx/v15/count.go @@ -18,7 +18,7 @@ import ( "hash/crc32" "io" - segment "github.com/blevesearch/scorch_segment_api" + segment "github.com/blevesearch/scorch_segment_api/v2" ) // CountHashWriter is a wrapper around a Writer which counts the number of diff --git a/vendor/github.com/blevesearch/zapx/v15/dict.go b/vendor/github.com/blevesearch/zapx/v15/dict.go index cf88651a7e9bce105713cea7725499d421a59f2c..e30bf2420da03d844858bc40c28e2c6ad15b2260 100644 --- a/vendor/github.com/blevesearch/zapx/v15/dict.go +++ b/vendor/github.com/blevesearch/zapx/v15/dict.go @@ -19,8 +19,8 @@ import ( "github.com/RoaringBitmap/roaring" index "github.com/blevesearch/bleve_index_api" - segment "github.com/blevesearch/scorch_segment_api" - "github.com/couchbase/vellum" + segment "github.com/blevesearch/scorch_segment_api/v2" + "github.com/blevesearch/vellum" ) // Dictionary is the zap representation of the term dictionary @@ -106,7 +106,7 @@ func (d *Dictionary) Contains(key []byte) (bool, error) { // AutomatonIterator returns an iterator which only visits terms // having the the vellum automaton and start/end key range -func (d *Dictionary) AutomatonIterator(a vellum.Automaton, +func (d *Dictionary) AutomatonIterator(a segment.Automaton, startKeyInclusive, endKeyExclusive []byte) segment.DictionaryIterator { if d.fst != nil { rv := &DictionaryIterator{ diff --git a/vendor/github.com/blevesearch/zapx/v15/docvalues.go b/vendor/github.com/blevesearch/zapx/v15/docvalues.go index f8da68f4368b051381b0101c50fe7b4200dbab3f..a530aa5ad9c6fe5dd027e729bae86a7aa6e9b10c 100644 --- a/vendor/github.com/blevesearch/zapx/v15/docvalues.go +++ b/vendor/github.com/blevesearch/zapx/v15/docvalues.go @@ -23,7 +23,7 @@ import ( "sort" index "github.com/blevesearch/bleve_index_api" - segment "github.com/blevesearch/scorch_segment_api" + segment "github.com/blevesearch/scorch_segment_api/v2" "github.com/golang/snappy" ) diff --git a/vendor/github.com/blevesearch/zapx/v15/enumerator.go b/vendor/github.com/blevesearch/zapx/v15/enumerator.go index bc5b7e6276d8f74b30c5b2f95e45f8a7c52e9bcd..972a2241653ab0acb8f823fe2c5b1714314949e4 100644 --- a/vendor/github.com/blevesearch/zapx/v15/enumerator.go +++ b/vendor/github.com/blevesearch/zapx/v15/enumerator.go @@ -17,7 +17,7 @@ package zap import ( "bytes" - "github.com/couchbase/vellum" + "github.com/blevesearch/vellum" ) // enumerator provides an ordered traversal of multiple vellum diff --git a/vendor/github.com/blevesearch/zapx/v15/go.mod b/vendor/github.com/blevesearch/zapx/v15/go.mod index dab0d929b06149501c859f4e8d79f7c358fe3e36..5f098983b818a451d1134c09b2480f1122f0c9d7 100644 --- a/vendor/github.com/blevesearch/zapx/v15/go.mod +++ b/vendor/github.com/blevesearch/zapx/v15/go.mod @@ -6,8 +6,8 @@ require ( github.com/RoaringBitmap/roaring v0.4.23 github.com/blevesearch/bleve_index_api v1.0.0 github.com/blevesearch/mmap-go v1.0.2 - github.com/blevesearch/scorch_segment_api v1.0.0 - github.com/couchbase/vellum v1.0.2 + github.com/blevesearch/scorch_segment_api/v2 v2.0.1 + github.com/blevesearch/vellum v1.0.3 github.com/golang/snappy v0.0.1 github.com/spf13/cobra v0.0.5 ) diff --git a/vendor/github.com/blevesearch/zapx/v15/go.sum b/vendor/github.com/blevesearch/zapx/v15/go.sum index 696bdabac2174389cb7cbb5d83628a0a268c532a..68e45348c8bf3373ae363ee39681bfbd9666d598 100644 --- a/vendor/github.com/blevesearch/zapx/v15/go.sum +++ b/vendor/github.com/blevesearch/zapx/v15/go.sum @@ -6,13 +6,13 @@ github.com/blevesearch/bleve_index_api v1.0.0 h1:Ds3XeuTxjXCkG6pgIwWDRyooJKNIuOK github.com/blevesearch/bleve_index_api v1.0.0/go.mod h1:fiwKS0xLEm+gBRgv5mumf0dhgFr2mDgZah1pqv1c1M4= github.com/blevesearch/mmap-go v1.0.2 h1:JtMHb+FgQCTTYIhtMvimw15dJwu1Y5lrZDMOFXVWPk0= github.com/blevesearch/mmap-go v1.0.2/go.mod h1:ol2qBqYaOUsGdm7aRMRrYGgPvnwLe6Y+7LMvAB5IbSA= -github.com/blevesearch/scorch_segment_api v1.0.0 h1:BUkCPWDg2gimTEyVDXf85I2buqqt4lh28uaVMiJsIYk= -github.com/blevesearch/scorch_segment_api v1.0.0/go.mod h1:KgRYmlfYC27NeM6cXOHx8LBgq7jn0atpV8mVWoBKBng= +github.com/blevesearch/scorch_segment_api/v2 v2.0.1 h1:fd+hPtZ8GsbqPK1HslGp7Vhoik4arZteA/IsCEgOisw= +github.com/blevesearch/scorch_segment_api/v2 v2.0.1/go.mod h1:lq7yK2jQy1yQjtjTfU931aVqz7pYxEudHaDwOt1tXfU= +github.com/blevesearch/vellum v1.0.3 h1:U86G41A7CtXNzzpIJHM8lSTUqz1Mp8U870TkcdCzZc8= +github.com/blevesearch/vellum v1.0.3/go.mod h1:2u5ax02KeDuNWu4/C+hVQMD6uLN4txH1JbtpaDNLJRo= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= -github.com/couchbase/vellum v1.0.2 h1:BrbP0NKiyDdndMPec8Jjhy0U47CZ0Lgx3xUC2r9rZqw= -github.com/couchbase/vellum v1.0.2/go.mod h1:FcwrEivFpNi24R3jLOs3n+fs5RnuQnQqCLBJ1uAg1W4= github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= diff --git a/vendor/github.com/blevesearch/zapx/v15/merge.go b/vendor/github.com/blevesearch/zapx/v15/merge.go index 5f19a2cd5fbecca8c004960bfce57fee01aa6941..887d3447e85ecad52787ef7ed0b1ffbc96903a6b 100644 --- a/vendor/github.com/blevesearch/zapx/v15/merge.go +++ b/vendor/github.com/blevesearch/zapx/v15/merge.go @@ -24,8 +24,8 @@ import ( "sort" "github.com/RoaringBitmap/roaring" - seg "github.com/blevesearch/scorch_segment_api" - "github.com/couchbase/vellum" + seg "github.com/blevesearch/scorch_segment_api/v2" + "github.com/blevesearch/vellum" "github.com/golang/snappy" ) diff --git a/vendor/github.com/blevesearch/zapx/v15/new.go b/vendor/github.com/blevesearch/zapx/v15/new.go index 597751d1868a14445dfba324e86567c0dc2c54d4..362715d443820eeedb5571f84139ce824e992073 100644 --- a/vendor/github.com/blevesearch/zapx/v15/new.go +++ b/vendor/github.com/blevesearch/zapx/v15/new.go @@ -23,8 +23,8 @@ import ( "github.com/RoaringBitmap/roaring" index "github.com/blevesearch/bleve_index_api" - segment "github.com/blevesearch/scorch_segment_api" - "github.com/couchbase/vellum" + segment "github.com/blevesearch/scorch_segment_api/v2" + "github.com/blevesearch/vellum" "github.com/golang/snappy" ) diff --git a/vendor/github.com/blevesearch/zapx/v15/posting.go b/vendor/github.com/blevesearch/zapx/v15/posting.go index 5f6332102c230fb1ebf1709940e21c0072fc38cb..b1d19e532d3cfa4504b59402e6fd39ff8ca5fbc2 100644 --- a/vendor/github.com/blevesearch/zapx/v15/posting.go +++ b/vendor/github.com/blevesearch/zapx/v15/posting.go @@ -21,7 +21,7 @@ import ( "reflect" "github.com/RoaringBitmap/roaring" - segment "github.com/blevesearch/scorch_segment_api" + segment "github.com/blevesearch/scorch_segment_api/v2" ) var reflectStaticSizePostingsList int diff --git a/vendor/github.com/blevesearch/zapx/v15/segment.go b/vendor/github.com/blevesearch/zapx/v15/segment.go index b3ad260f9d49dc54234a79c7b9854d00ae830871..bc29f3f4a319ae7beb920f3856ee680c486489d8 100644 --- a/vendor/github.com/blevesearch/zapx/v15/segment.go +++ b/vendor/github.com/blevesearch/zapx/v15/segment.go @@ -25,8 +25,8 @@ import ( "github.com/RoaringBitmap/roaring" mmap "github.com/blevesearch/mmap-go" - segment "github.com/blevesearch/scorch_segment_api" - "github.com/couchbase/vellum" + segment "github.com/blevesearch/scorch_segment_api/v2" + "github.com/blevesearch/vellum" "github.com/golang/snappy" ) diff --git a/vendor/github.com/couchbase/vellum/.travis.yml b/vendor/github.com/couchbase/vellum/.travis.yml deleted file mode 100644 index 229edf283439cc6d74683f7096c87e0345503a01..0000000000000000000000000000000000000000 --- a/vendor/github.com/couchbase/vellum/.travis.yml +++ /dev/null @@ -1,22 +0,0 @@ -sudo: false - -language: go - -go: - - "1.9.x" - - "1.10.x" - - "1.11.x" - -script: - - go get github.com/mattn/goveralls - - go get -u github.com/kisielk/errcheck - - go test -v $(go list ./... | grep -v vendor/) - - go test -race - - go vet - - errcheck - - go test -coverprofile=profile.out -covermode=count - - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then goveralls -service=travis-ci -coverprofile=profile.out -repotoken $COVERALLS; fi' - -notifications: - email: - - marty.schoch@gmail.com diff --git a/vendor/modules.txt b/vendor/modules.txt index acff75a357ac0ed32945470f983798e31d408683..24e976305221ca733d56774ea9839dea15c7886e 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1,7 +1,7 @@ # github.com/RoaringBitmap/roaring v0.5.5 ## explicit github.com/RoaringBitmap/roaring -# github.com/blevesearch/bleve/v2 v2.0.1 +# github.com/blevesearch/bleve/v2 v2.0.2 ## explicit github.com/blevesearch/bleve/v2 github.com/blevesearch/bleve/v2/analysis @@ -49,8 +49,8 @@ github.com/blevesearch/bleve_index_api github.com/blevesearch/go-porterstemmer # github.com/blevesearch/mmap-go v1.0.2 github.com/blevesearch/mmap-go -# github.com/blevesearch/scorch_segment_api v1.0.0 -github.com/blevesearch/scorch_segment_api +# github.com/blevesearch/scorch_segment_api/v2 v2.0.1 +github.com/blevesearch/scorch_segment_api/v2 # github.com/blevesearch/segment v0.9.0 github.com/blevesearch/segment # github.com/blevesearch/snowballstem v0.9.0 @@ -58,21 +58,21 @@ github.com/blevesearch/snowballstem github.com/blevesearch/snowballstem/english # github.com/blevesearch/upsidedown_store_api v1.0.1 github.com/blevesearch/upsidedown_store_api -# github.com/blevesearch/zapx/v11 v11.1.10 +# github.com/blevesearch/vellum v1.0.3 +github.com/blevesearch/vellum +github.com/blevesearch/vellum/levenshtein +github.com/blevesearch/vellum/regexp +github.com/blevesearch/vellum/utf8 +# github.com/blevesearch/zapx/v11 v11.2.0 github.com/blevesearch/zapx/v11 -# github.com/blevesearch/zapx/v12 v12.1.10 +# github.com/blevesearch/zapx/v12 v12.2.0 github.com/blevesearch/zapx/v12 -# github.com/blevesearch/zapx/v13 v13.1.10 +# github.com/blevesearch/zapx/v13 v13.2.0 github.com/blevesearch/zapx/v13 -# github.com/blevesearch/zapx/v14 v14.1.10 +# github.com/blevesearch/zapx/v14 v14.2.0 github.com/blevesearch/zapx/v14 -# github.com/blevesearch/zapx/v15 v15.1.10 +# github.com/blevesearch/zapx/v15 v15.2.0 github.com/blevesearch/zapx/v15 -# github.com/couchbase/vellum v1.0.2 -github.com/couchbase/vellum -github.com/couchbase/vellum/levenshtein -github.com/couchbase/vellum/regexp -github.com/couchbase/vellum/utf8 # github.com/glycerine/go-unsnap-stream v0.0.0-20190901134440-81cf024a9e0a ## explicit github.com/glycerine/go-unsnap-stream