From f6b506134b0b2a62f9b12a1ea2200791284ea06d Mon Sep 17 00:00:00 2001 From: Steve Yen Date: Tue, 19 Dec 2017 10:49:57 -0800 Subject: [PATCH] import couchbase/vellum instead of couchbaselabs/vellum Also, scrubbed an old couchbaselabs/moss reference in comments. Also, go fmt. --- index/scorch/segment/zap/build.go | 2 +- index/scorch/segment/zap/cmd/zap/cmd/dict.go | 2 +- index/scorch/segment/zap/cmd/zap/cmd/explore.go | 2 +- index/scorch/segment/zap/dict.go | 4 ++-- index/scorch/segment/zap/merge.go | 2 +- index/scorch/segment/zap/segment.go | 2 +- index/store/moss/lower.go | 2 +- index/store/moss/store.go | 2 +- search/search.go | 10 +++++----- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/index/scorch/segment/zap/build.go b/index/scorch/segment/zap/build.go index 60906d33..8bd00601 100644 --- a/index/scorch/segment/zap/build.go +++ b/index/scorch/segment/zap/build.go @@ -23,7 +23,7 @@ import ( "github.com/Smerity/govarint" "github.com/blevesearch/bleve/index/scorch/segment/mem" - "github.com/couchbaselabs/vellum" + "github.com/couchbase/vellum" "github.com/golang/snappy" ) diff --git a/index/scorch/segment/zap/cmd/zap/cmd/dict.go b/index/scorch/segment/zap/cmd/zap/cmd/dict.go index 74e59e90..fa8b3277 100644 --- a/index/scorch/segment/zap/cmd/zap/cmd/dict.go +++ b/index/scorch/segment/zap/cmd/zap/cmd/dict.go @@ -18,7 +18,7 @@ import ( "encoding/binary" "fmt" - "github.com/couchbaselabs/vellum" + "github.com/couchbase/vellum" "github.com/spf13/cobra" ) diff --git a/index/scorch/segment/zap/cmd/zap/cmd/explore.go b/index/scorch/segment/zap/cmd/zap/cmd/explore.go index 42ab8273..012a829f 100644 --- a/index/scorch/segment/zap/cmd/zap/cmd/explore.go +++ b/index/scorch/segment/zap/cmd/zap/cmd/explore.go @@ -19,7 +19,7 @@ import ( "fmt" "log" - "github.com/couchbaselabs/vellum" + "github.com/couchbase/vellum" "github.com/spf13/cobra" ) diff --git a/index/scorch/segment/zap/dict.go b/index/scorch/segment/zap/dict.go index 5d3c160b..3221d061 100644 --- a/index/scorch/segment/zap/dict.go +++ b/index/scorch/segment/zap/dict.go @@ -21,8 +21,8 @@ import ( "github.com/RoaringBitmap/roaring" "github.com/blevesearch/bleve/index" "github.com/blevesearch/bleve/index/scorch/segment" - "github.com/couchbaselabs/vellum" - "github.com/couchbaselabs/vellum/regexp" + "github.com/couchbase/vellum" + "github.com/couchbase/vellum/regexp" ) // Dictionary is the zap representation of the term dictionary diff --git a/index/scorch/segment/zap/merge.go b/index/scorch/segment/zap/merge.go index 481d9272..842371e5 100644 --- a/index/scorch/segment/zap/merge.go +++ b/index/scorch/segment/zap/merge.go @@ -24,7 +24,7 @@ import ( "github.com/RoaringBitmap/roaring" "github.com/Smerity/govarint" - "github.com/couchbaselabs/vellum" + "github.com/couchbase/vellum" "github.com/golang/snappy" ) diff --git a/index/scorch/segment/zap/segment.go b/index/scorch/segment/zap/segment.go index 65c62ac9..62c147a2 100644 --- a/index/scorch/segment/zap/segment.go +++ b/index/scorch/segment/zap/segment.go @@ -25,7 +25,7 @@ import ( "github.com/RoaringBitmap/roaring" "github.com/Smerity/govarint" "github.com/blevesearch/bleve/index/scorch/segment" - "github.com/couchbaselabs/vellum" + "github.com/couchbase/vellum" mmap "github.com/edsrzf/mmap-go" "github.com/golang/snappy" ) diff --git a/index/store/moss/lower.go b/index/store/moss/lower.go index 2aff2aea..1133f95f 100644 --- a/index/store/moss/lower.go +++ b/index/store/moss/lower.go @@ -13,7 +13,7 @@ // limitations under the License. // Package moss provides a KVStore implementation based on the -// github.com/couchbaselabs/moss library. +// github.com/couchbase/moss library. package moss diff --git a/index/store/moss/store.go b/index/store/moss/store.go index a7aa4d41..89ea553c 100644 --- a/index/store/moss/store.go +++ b/index/store/moss/store.go @@ -13,7 +13,7 @@ // limitations under the License. // Package moss provides a KVStore implementation based on the -// github.com/couchbaselabs/moss library. +// github.com/couchbase/moss library. package moss diff --git a/search/search.go b/search/search.go index cbbcfbfd..f9a92783 100644 --- a/search/search.go +++ b/search/search.go @@ -37,12 +37,12 @@ func (ap ArrayPositions) Equals(other ArrayPositions) bool { type Location struct { // Pos is the position of the term within the field, starting at 1 - Pos uint64 `json:"pos"` - + Pos uint64 `json:"pos"` + // Start and End are the byte offsets of the term in the field - Start uint64 `json:"start"` - End uint64 `json:"end"` - + Start uint64 `json:"start"` + End uint64 `json:"end"` + // ArrayPositions contains the positions of the term within any elements. ArrayPositions ArrayPositions `json:"array_positions"` }