diff --git a/analysis/token/snowball/snowball.go b/analysis/token/snowball/snowball.go index 79b233b28..c608ddc99 100644 --- a/analysis/token/snowball/snowball.go +++ b/analysis/token/snowball/snowball.go @@ -20,7 +20,7 @@ import ( "github.com/blevesearch/bleve/v2/analysis" "github.com/blevesearch/bleve/v2/registry" - "github.com/kljensen/snowball" + "github.com/blevesearch/snowball" ) const Name = "stemmer_snowball" diff --git a/go.mod b/go.mod index 3a602b115..3d6c294fc 100644 --- a/go.mod +++ b/go.mod @@ -6,9 +6,13 @@ require ( github.com/RoaringBitmap/roaring v0.9.4 github.com/bits-and-blooms/bitset v1.2.0 github.com/blevesearch/bleve_index_api v1.0.1 + github.com/blevesearch/go-metrics v0.0.0-20190826022208-cac0b30c2563 github.com/blevesearch/go-porterstemmer v1.0.3 + github.com/blevesearch/goleveldb v1.0.1 + github.com/blevesearch/gtreap v0.1.1 github.com/blevesearch/scorch_segment_api/v2 v2.1.0 github.com/blevesearch/segment v0.9.0 + github.com/blevesearch/snowball v0.6.1 github.com/blevesearch/snowballstem v0.9.0 github.com/blevesearch/upsidedown_store_api v1.0.1 github.com/blevesearch/vellum v1.0.7 @@ -19,11 +23,7 @@ require ( github.com/blevesearch/zapx/v15 v15.3.3 github.com/couchbase/moss v0.2.0 github.com/golang/protobuf v1.3.2 - github.com/kljensen/snowball v0.6.0 - github.com/rcrowley/go-metrics v0.0.0-20190826022208-cac0b30c2563 github.com/spf13/cobra v0.0.5 - github.com/steveyen/gtreap v0.1.0 - github.com/syndtr/goleveldb v1.0.0 go.etcd.io/bbolt v1.3.5 golang.org/x/text v0.3.7 ) diff --git a/go.sum b/go.sum index c749be323..554c67587 100644 --- a/go.sum +++ b/go.sum @@ -6,8 +6,14 @@ github.com/bits-and-blooms/bitset v1.2.0 h1:Kn4yilvwNtMACtf1eYDlG8H77R07mZSPbMjL github.com/bits-and-blooms/bitset v1.2.0/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA= github.com/blevesearch/bleve_index_api v1.0.1 h1:nx9++0hnyiGOHJwQQYfsUGzpRdEVE5LsylmmngQvaFk= github.com/blevesearch/bleve_index_api v1.0.1/go.mod h1:fiwKS0xLEm+gBRgv5mumf0dhgFr2mDgZah1pqv1c1M4= +github.com/blevesearch/go-metrics v0.0.0-20190826022208-cac0b30c2563 h1:mQtHArdP4SdgdR2mY8i+W3u9ekCDWDxcM/3nwehEdiw= +github.com/blevesearch/go-metrics v0.0.0-20190826022208-cac0b30c2563/go.mod h1:9eJDeqxJ3E7WnLebQUlPD7ZjSce7AnDb9vjGmMCbD0A= github.com/blevesearch/go-porterstemmer v1.0.3 h1:GtmsqID0aZdCSNiY8SkuPJ12pD4jI+DdXTAn4YRcHCo= github.com/blevesearch/go-porterstemmer v1.0.3/go.mod h1:angGc5Ht+k2xhJdZi511LtmxuEf0OVpvUUNrwmM1P7M= +github.com/blevesearch/goleveldb v1.0.1 h1:iAtV2Cu5s0GD1lwUiekkFHe2gTMCCNVj2foPclDLIFI= +github.com/blevesearch/goleveldb v1.0.1/go.mod h1:WrU8ltZbIp0wAoig/MHbrPCXSOLpe79nz5lv5nqfYrQ= +github.com/blevesearch/gtreap v0.1.1 h1:2JWigFrzDMR+42WGIN/V2p0cUvn4UP3C4Q5nmaZGW8Y= +github.com/blevesearch/gtreap v0.1.1/go.mod h1:QaQyDRAT51sotthUWAH4Sj08awFSSWzgYICSZ3w0tYk= github.com/blevesearch/mmap-go v1.0.2/go.mod h1:ol2qBqYaOUsGdm7aRMRrYGgPvnwLe6Y+7LMvAB5IbSA= github.com/blevesearch/mmap-go v1.0.3 h1:7QkALgFNooSq3a46AE+pWeKASAZc9SiNFJhDGF1NDx4= github.com/blevesearch/mmap-go v1.0.3/go.mod h1:pYvKl/grLQrBxuaRYgoTssa4rVujYYeenDp++2E+yvs= @@ -15,6 +21,8 @@ github.com/blevesearch/scorch_segment_api/v2 v2.1.0 h1:NFwteOpZEvJk5Vg0H6gD0hxup github.com/blevesearch/scorch_segment_api/v2 v2.1.0/go.mod h1:uch7xyyO/Alxkuxa+CGs79vw0QY8BENSBjg6Mw5L5DE= 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/snowball v0.6.1 h1:cDYjn/NCH+wwt2UdehaLpr2e4BwLIjN4V/TdLsL+B5A= +github.com/blevesearch/snowball v0.6.1/go.mod h1:ZF0IBg5vgpeoUhnMza2v0A/z8m1cWPlwhke08LpNusg= 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= @@ -55,8 +63,6 @@ github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= -github.com/kljensen/snowball v0.6.0 h1:6DZLCcZeL0cLfodx+Md4/OLC6b/bfurWUOUGs1ydfOU= -github.com/kljensen/snowball v0.6.0/go.mod h1:27N7E8fVU5H68RlUmnWwZCfxgt4POBJfENGMvNRhldw= 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= @@ -70,8 +76,6 @@ github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1Cpa github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= 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/rcrowley/go-metrics v0.0.0-20190826022208-cac0b30c2563 h1:dY6ETXrvDG7Sa4vE8ZQG4yqWg6UnOcbqTAahkV813vQ= -github.com/rcrowley/go-metrics v0.0.0-20190826022208-cac0b30c2563/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= 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= @@ -81,14 +85,10 @@ github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb6 github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg= 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/steveyen/gtreap v0.1.0 h1:CjhzTa274PyJLJuMZwIzCO1PfC00oRa8d1Kc78bFXJM= -github.com/steveyen/gtreap v0.1.0/go.mod h1:kl/5J7XbrOmlIbYIXdRHDDE5QxHqpk0cmkT7Z4dM9/Y= 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/syndtr/goleveldb v1.0.0 h1:fBdIW9lB4Iz0n9khmH8w27SJ3QEJ7+IgjPEwGSZiFdE= -github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ= github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= go.etcd.io/bbolt v1.3.5 h1:XAzx9gjCb0Rxj7EoqcClPD1d5ZBxZJk0jbuoPHenBt0= diff --git a/index/upsidedown/store/goleveldb/batch.go b/index/upsidedown/store/goleveldb/batch.go index 7a58bb83b..9307c0901 100644 --- a/index/upsidedown/store/goleveldb/batch.go +++ b/index/upsidedown/store/goleveldb/batch.go @@ -16,7 +16,7 @@ package goleveldb import ( store "github.com/blevesearch/upsidedown_store_api" - "github.com/syndtr/goleveldb/leveldb" + "github.com/blevesearch/goleveldb/leveldb" ) type Batch struct { diff --git a/index/upsidedown/store/goleveldb/config.go b/index/upsidedown/store/goleveldb/config.go index 4baca7010..376db8326 100644 --- a/index/upsidedown/store/goleveldb/config.go +++ b/index/upsidedown/store/goleveldb/config.go @@ -15,8 +15,8 @@ package goleveldb import ( - "github.com/syndtr/goleveldb/leveldb/filter" - "github.com/syndtr/goleveldb/leveldb/opt" + "github.com/blevesearch/goleveldb/leveldb/filter" + "github.com/blevesearch/goleveldb/leveldb/opt" ) func applyConfig(o *opt.Options, config map[string]interface{}) (*opt.Options, error) { diff --git a/index/upsidedown/store/goleveldb/iterator.go b/index/upsidedown/store/goleveldb/iterator.go index e7be4e888..e8e002dfa 100644 --- a/index/upsidedown/store/goleveldb/iterator.go +++ b/index/upsidedown/store/goleveldb/iterator.go @@ -14,7 +14,7 @@ package goleveldb -import "github.com/syndtr/goleveldb/leveldb/iterator" +import "github.com/blevesearch/goleveldb/leveldb/iterator" type Iterator struct { store *Store diff --git a/index/upsidedown/store/goleveldb/reader.go b/index/upsidedown/store/goleveldb/reader.go index 584109269..3d8b4bb43 100644 --- a/index/upsidedown/store/goleveldb/reader.go +++ b/index/upsidedown/store/goleveldb/reader.go @@ -16,8 +16,8 @@ package goleveldb import ( store "github.com/blevesearch/upsidedown_store_api" - "github.com/syndtr/goleveldb/leveldb" - "github.com/syndtr/goleveldb/leveldb/util" + "github.com/blevesearch/goleveldb/leveldb" + "github.com/blevesearch/goleveldb/leveldb/util" ) type Reader struct { diff --git a/index/upsidedown/store/goleveldb/store.go b/index/upsidedown/store/goleveldb/store.go index a4b49bba5..9546df029 100644 --- a/index/upsidedown/store/goleveldb/store.go +++ b/index/upsidedown/store/goleveldb/store.go @@ -21,9 +21,9 @@ import ( "github.com/blevesearch/bleve/v2/registry" store "github.com/blevesearch/upsidedown_store_api" - "github.com/syndtr/goleveldb/leveldb" - "github.com/syndtr/goleveldb/leveldb/opt" - "github.com/syndtr/goleveldb/leveldb/util" + "github.com/blevesearch/goleveldb/leveldb" + "github.com/blevesearch/goleveldb/leveldb/opt" + "github.com/blevesearch/goleveldb/leveldb/util" ) const ( diff --git a/index/upsidedown/store/goleveldb/writer.go b/index/upsidedown/store/goleveldb/writer.go index 4746c94fe..ed2ccabb6 100644 --- a/index/upsidedown/store/goleveldb/writer.go +++ b/index/upsidedown/store/goleveldb/writer.go @@ -18,7 +18,7 @@ import ( "fmt" store "github.com/blevesearch/upsidedown_store_api" - "github.com/syndtr/goleveldb/leveldb" + "github.com/blevesearch/goleveldb/leveldb" ) type Writer struct { diff --git a/index/upsidedown/store/gtreap/iterator.go b/index/upsidedown/store/gtreap/iterator.go index 092ccf240..c03f75c72 100644 --- a/index/upsidedown/store/gtreap/iterator.go +++ b/index/upsidedown/store/gtreap/iterator.go @@ -21,7 +21,7 @@ import ( "bytes" "sync" - "github.com/steveyen/gtreap" + "github.com/blevesearch/gtreap" ) type Iterator struct { diff --git a/index/upsidedown/store/gtreap/reader.go b/index/upsidedown/store/gtreap/reader.go index 34df81302..52b05d788 100644 --- a/index/upsidedown/store/gtreap/reader.go +++ b/index/upsidedown/store/gtreap/reader.go @@ -20,7 +20,7 @@ package gtreap import ( "github.com/blevesearch/upsidedown_store_api" - "github.com/steveyen/gtreap" + "github.com/blevesearch/gtreap" ) type Reader struct { diff --git a/index/upsidedown/store/gtreap/store.go b/index/upsidedown/store/gtreap/store.go index 8d1f5887d..760ea121f 100644 --- a/index/upsidedown/store/gtreap/store.go +++ b/index/upsidedown/store/gtreap/store.go @@ -26,7 +26,7 @@ import ( "github.com/blevesearch/bleve/v2/registry" "github.com/blevesearch/upsidedown_store_api" - "github.com/steveyen/gtreap" + "github.com/blevesearch/gtreap" ) const Name = "gtreap" diff --git a/index/upsidedown/store/metrics/store.go b/index/upsidedown/store/metrics/store.go index b863c251b..abdf4fcd6 100644 --- a/index/upsidedown/store/metrics/store.go +++ b/index/upsidedown/store/metrics/store.go @@ -27,7 +27,7 @@ import ( "github.com/blevesearch/bleve/v2/registry" store "github.com/blevesearch/upsidedown_store_api" - "github.com/rcrowley/go-metrics" + "github.com/blevesearch/go-metrics" ) const Name = "metrics" diff --git a/index/upsidedown/store/metrics/util.go b/index/upsidedown/store/metrics/util.go index f06418bbf..6b4101894 100644 --- a/index/upsidedown/store/metrics/util.go +++ b/index/upsidedown/store/metrics/util.go @@ -19,7 +19,7 @@ import ( "io" "math" - "github.com/rcrowley/go-metrics" + "github.com/blevesearch/go-metrics" ) // NOTE: This is copy & pasted from cbft as otherwise there