From 9ebf0e21197e9edc7779a95161c47eb9f5001115 Mon Sep 17 00:00:00 2001 From: Ben Johnson Date: Fri, 21 Jan 2022 09:41:17 -0700 Subject: [PATCH] Upgrade go.mod to featurebase/v3 --- Makefile | 11 ++++---- api.go | 18 ++++++------- api/client/grpc.go | 4 +-- api_test.go | 16 +++++------ audit.go | 2 +- audit_internal_test.go | 2 +- audit_test.go | 4 +-- authn/authenticate.go | 2 +- authn/authenticate_internal_test.go | 2 +- authz/authorization.go | 2 +- authz/authorization_test.go | 4 +-- boltdb/translate.go | 2 +- boltdb/translate_test.go | 8 +++--- broadcast.go | 2 +- bsi.go | 2 +- cache.go | 6 ++--- cache_test.go | 2 +- catcher.go | 6 ++--- client.go | 8 +++--- client/batch.go | 6 ++--- client/batch_test.go | 2 +- client/client.go | 14 +++++----- client/client_it_test.go | 8 +++--- client/client_test.go | 2 +- client/cluster.go | 2 +- client/cluster_test.go | 2 +- client/csv/csv.go | 2 +- client/csv/csv_it_test.go | 4 +-- client/csv/csv_test.go | 6 ++--- client/doc.go | 2 +- client/egpool/egpool_test.go | 2 +- client/ingest_api_batch.go | 2 +- client/ingest_api_batch_test.go | 4 +-- client/orm.go | 2 +- client/orm_test.go | 4 +-- client/record_test.go | 2 +- client/response.go | 2 +- client/response_test.go | 2 +- client/shardnodes.go | 2 +- cluster.go | 12 ++++----- cluster_internal_test.go | 10 +++---- cmd.go | 2 +- cmd/backup.go | 2 +- cmd/badloader/badloader.go | 8 +++--- cmd/check.go | 2 +- cmd/chksum.go | 2 +- cmd/config.go | 4 +-- cmd/convert.go | 2 +- cmd/export.go | 2 +- cmd/export_test.go | 2 +- cmd/featurebase-parse-sql/main.go | 2 +- cmd/featurebase/main.go | 2 +- cmd/generate_config.go | 2 +- cmd/import.go | 4 +-- cmd/import_test.go | 6 ++--- cmd/keygen.go | 2 +- cmd/pilosa-bench/main.go | 4 +-- cmd/random-query/main.go | 12 ++++----- cmd/random-query/main_test.go | 12 ++++----- cmd/rbf.go | 2 +- cmd/restore.go | 2 +- cmd/roaring-migrate/main.go | 10 +++---- cmd/root.go | 2 +- cmd/root_test.go | 4 +-- cmd/server.go | 8 +++--- cmd/server_test.go | 8 +++--- cmd/slurp/slurp.go | 8 +++--- ctl/backup.go | 8 +++--- ctl/check.go | 4 +-- ctl/check_test.go | 2 +- ctl/chksum.go | 4 +-- ctl/common.go | 6 ++--- ctl/config.go | 4 +-- ctl/config_test.go | 2 +- ctl/export.go | 4 +-- ctl/export_test.go | 4 +-- ctl/generate_config.go | 4 +-- ctl/import.go | 6 ++--- ctl/import_test.go | 6 ++--- ctl/inspect.go | 6 ++--- ctl/inspect_test.go | 2 +- ctl/keygen.go | 2 +- ctl/main_test.go | 2 +- ctl/rbf_check.go | 4 +-- ctl/rbf_dump.go | 4 +-- ctl/rbf_page.go | 4 +-- ctl/rbf_pages.go | 6 ++--- ctl/restore.go | 10 +++---- ctl/server.go | 4 +-- ctl/server_test.go | 2 +- ctl/util.go | 2 +- dbshard.go | 8 +++--- dbshard_internal_test.go | 10 +++---- dbshard_test.go | 12 ++++----- delete_test.go | 4 +-- diagnostics.go | 2 +- diagnostics_internal_test.go | 2 +- encoding/proto/proto.go | 16 +++++------ encoding/proto/proto_test.go | 6 ++--- etcd/embed.go | 6 ++--- etcd/leasedkv.go | 2 +- etcd/leasedkv_test.go | 6 ++--- event.go | 2 +- executor.go | 16 +++++------ executor_internal_test.go | 4 +-- executor_test.go | 24 ++++++++--------- field.go | 12 ++++----- field_internal_test.go | 10 +++---- field_test.go | 8 +++--- fragment.go | 22 +++++++-------- fragment_internal_test.go | 10 +++---- gcnotify/gcnotify.go | 2 +- gendebug_test.go | 2 +- generation.go | 6 ++--- go.mod | 3 +-- gopsutil/systeminfo.go | 2 +- gopsutil/systeminfo_test.go | 4 +-- hack.go | 4 +-- handler.go | 4 +-- hash/blake3_test.go | 2 +- holder.go | 18 ++++++------- holder_internal_test.go | 4 +-- holder_test.go | 8 +++--- http/client.go | 16 +++++------ http/client_test.go | 12 ++++----- http/handler.go | 20 +++++++------- http/handler_internal_test.go | 10 +++---- http/handler_test.go | 8 +++--- http/translator.go | 4 +-- http/translator_test.go | 6 ++--- idalloc_test.go | 2 +- index.go | 8 +++--- index_internal_test.go | 2 +- index_test.go | 10 +++---- ingest/codec_test.go | 2 +- ingest/op.go | 2 +- ingest/op_test.go | 2 +- ingest/update.go | 2 +- ingest_test.go | 6 ++--- internal/clustertests/cluster_test.go | 6 ++--- internal/clustertests/docker-compose.yml | 2 +- internal/clustertests/pause_node_test.go | 12 ++++----- internal/test/querygenerator.go | 2 +- internal/test/querygenerator_test.go | 2 +- iterator.go | 2 +- logger/filewriter_test.go | 2 +- main_test.go | 2 +- mmap_test.go | 4 +-- mock/translator.go | 2 +- pg/pgtest/handler.go | 2 +- pg/pgtest/server.go | 2 +- pg/pgtest/tls.go | 2 +- pg/protocol.go | 4 +-- pg/query.go | 2 +- pg/server.go | 2 +- pg/server_test.go | 6 ++--- pg/type.go | 2 +- pilosa.go | 6 ++--- pilosa_internal_test.go | 4 +-- pilosa_test.go | 4 +-- planner.go | 4 +-- planner_test.go | 4 +-- pprof.go | 4 +-- pql/ast_test.go | 2 +- pql/decimal_test.go | 2 +- pql/parser_test.go | 4 +-- prometheus/prometheus.go | 4 +-- prometheus/prometheus_test.go | 2 +- proto/vdsm/vdsm.pb.go | 2 +- rbf.go | 12 ++++----- rbf/array.go | 2 +- rbf/cfg/cfg.go | 2 +- rbf/cursor.go | 2 +- rbf/cursor_internal_test.go | 4 +-- rbf/cursor_test.go | 4 +-- rbf/cursorx.go | 2 +- rbf/db.go | 6 ++--- rbf/db_test.go | 4 +-- rbf/ingest_test.go | 10 +++---- rbf/rbf.go | 6 ++--- rbf/rbf_test.go | 8 +++--- rbf/tx.go | 6 ++--- rbf/tx_test.go | 4 +-- rbf/util.go | 4 +-- rbf/util_test.go | 6 ++--- roaring/benchpretty/main.go | 2 +- roaring/filter.go | 2 +- roaring/filter_internal_test.go | 2 +- roaring/printutil.go | 2 +- roaring/printutil_test.go | 2 +- roaring/roaring_internal_test.go | 2 +- roaring/roaring_stats.go | 2 +- roaring/roaring_test.go | 8 +++--- row.go | 4 +-- row_test.go | 2 +- rrtx.go | 8 +++--- rrtx_internal_test.go | 2 +- server.go | 18 ++++++------- server/cluster_test.go | 8 +++--- server/config.go | 10 +++---- server/config_test.go | 4 +-- server/grpc.go | 18 ++++++------- server/grpc_test.go | 18 ++++++------- server/handler_test.go | 14 +++++----- server/pg.go | 14 +++++----- server/pg_internal_test.go | 4 +-- server/pg_test.go | 12 ++++----- server/server.go | 34 ++++++++++++------------ server/server_test.go | 16 +++++------ server/sql.go | 8 +++--- server/tlsconfig.go | 2 +- server/trial.go | 2 +- server_internal_test.go | 4 +-- shardwidth/helper_test.go | 2 +- snapshotqueue.go | 4 +-- sql/ddl.go | 4 +-- sql/extract.go | 4 +-- sql/handler_test.go | 4 +-- sql/mapper.go | 2 +- sql/model.go | 2 +- sql/reduce.go | 6 ++--- sql/reduce_test.go | 2 +- sql/select.go | 6 ++--- sql/show.go | 4 +-- sql2/ast_test.go | 2 +- sql2/parser_test.go | 2 +- sql2/scanner_test.go | 2 +- sql2/token_test.go | 2 +- statik/filesystem.go | 2 +- stats/stats.go | 2 +- stats/stats_test.go | 10 +++---- statsd/statsd.go | 4 +-- statsd/statsd_test.go | 4 +-- stattx.go | 8 +++--- test/cluster.go | 14 +++++----- test/disco.go | 6 ++--- test/field.go | 2 +- test/holder.go | 8 +++--- test/index.go | 4 +-- test/pilosa.go | 12 ++++----- test/pilosa_test.go | 4 +-- test/transaction.go | 2 +- testhook/auditor_test.go | 2 +- topology/node.go | 4 +-- topology/snapshot.go | 4 +-- tracing/opentracing/opentracing.go | 4 +-- transaction.go | 2 +- transaction_test.go | 6 ++--- translate.go | 4 +-- translator_test.go | 14 +++++----- tx.go | 6 ++--- tx_internal_test.go | 2 +- tx_test.go | 12 ++++----- txfactory.go | 4 +-- util.go | 2 +- utils_internal_test.go | 6 ++--- version.go | 2 +- view.go | 10 +++---- view_internal_test.go | 4 +-- 259 files changed, 695 insertions(+), 697 deletions(-) diff --git a/Makefile b/Makefile index 540c1f9b7..b98e3c803 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,6 @@ .PHONY: build check-clean clean build-lattice cover cover-viz default docker docker-build docker-test docker-tag-push generate generate-protoc generate-pql generate-statik gometalinter install install-build-deps install-golangci-lint install-gometalinter install-protoc install-protoc-gen-gofast install-peg install-statik release release-build test testv testv-race testvsub testvsub-race test-txstore-rbf CLONE_URL=github.com/pilosa/pilosa -MOD_VERSION=v2 VERSION := $(shell git describe --tags 2> /dev/null || echo unknown) VARIANT = Molecula GO=go @@ -13,7 +12,7 @@ BRANCH_ID := $(BRANCH)-$(GOOS)-$(GOARCH) BUILD_TIME := $(shell date -u +%FT%T%z) SHARD_WIDTH = 20 COMMIT := $(shell git describe --exact-match >/dev/null 2>&1 || git rev-parse --short HEAD) -LDFLAGS="-X github.com/molecula/featurebase/v2.Version=$(VERSION) -X github.com/molecula/featurebase/v2.BuildTime=$(BUILD_TIME) -X github.com/molecula/featurebase/v2.Variant=$(VARIANT) -X github.com/molecula/featurebase/v2.Commit=$(COMMIT) -X github.com/molecula/featurebase/v2.TrialDeadline=$(TRIAL_DEADLINE)" +LDFLAGS="-X github.com/molecula/featurebase/v3.Version=$(VERSION) -X github.com/molecula/featurebase/v3.BuildTime=$(BUILD_TIME) -X github.com/molecula/featurebase/v3.Variant=$(VARIANT) -X github.com/molecula/featurebase/v3.Commit=$(COMMIT) -X github.com/molecula/featurebase/v3.TrialDeadline=$(TRIAL_DEADLINE)" GO_VERSION=1.16.10 DOCKER_BUILD= # set to 1 to use `docker-build` instead of `build` when creating a release BUILD_TAGS += shardwidth$(SHARD_WIDTH) @@ -170,11 +169,11 @@ build-lattice: # `go generate` protocol buffers generate-protoc: require-protoc require-protoc-gen-gofast - $(GO) generate github.com/molecula/featurebase/v2/pb + $(GO) generate github.com/molecula/featurebase/v3/pb # `go generate` statik assets (lattice UI) generate-statik: build-lattice require-statik - $(GO) generate github.com/molecula/featurebase/v2/statik + $(GO) generate github.com/molecula/featurebase/v3/statik # `go generate` statik assets (lattice UI) in Docker generate-statik-docker: build-lattice @@ -182,7 +181,7 @@ generate-statik-docker: build-lattice # `go generate` stringers generate-stringer: - $(GO) generate github.com/molecula/featurebase/v2 + $(GO) generate github.com/molecula/featurebase/v3 generate-pql: require-peg cd pql && peg -inline pql.peg && cd .. @@ -193,7 +192,7 @@ generate-proto-grpc: require-protoc require-protoc-gen-go # TODO: Modify above commands and remove the below mv if possible. # See https://go-review.googlesource.com/c/protobuf/+/219298/ for info on --go-opt # I couldn't get it to work during development - Cody - cp -r proto/github.com/molecula/featurebase/v2/proto/ proto/ + cp -r proto/github.com/molecula/featurebase/v3/proto/ proto/ rm -rf proto/github.com # `go generate` all needed packages diff --git a/api.go b/api.go index fdee2f8f7..a373b0a1b 100644 --- a/api.go +++ b/api.go @@ -21,16 +21,16 @@ import ( "sync" "time" - "github.com/molecula/featurebase/v2/disco" - "github.com/molecula/featurebase/v2/ingest" - "github.com/molecula/featurebase/v2/rbf" + "github.com/molecula/featurebase/v3/disco" + "github.com/molecula/featurebase/v3/ingest" + "github.com/molecula/featurebase/v3/rbf" - //"github.com/molecula/featurebase/v2/pg" - "github.com/molecula/featurebase/v2/pql" - "github.com/molecula/featurebase/v2/roaring" - "github.com/molecula/featurebase/v2/stats" - "github.com/molecula/featurebase/v2/topology" - "github.com/molecula/featurebase/v2/tracing" + //"github.com/molecula/featurebase/v3/pg" + "github.com/molecula/featurebase/v3/pql" + "github.com/molecula/featurebase/v3/roaring" + "github.com/molecula/featurebase/v3/stats" + "github.com/molecula/featurebase/v3/topology" + "github.com/molecula/featurebase/v3/tracing" "github.com/pkg/errors" "golang.org/x/sync/errgroup" ) diff --git a/api/client/grpc.go b/api/client/grpc.go index bb1479612..2bad9f413 100644 --- a/api/client/grpc.go +++ b/api/client/grpc.go @@ -6,8 +6,8 @@ import ( "crypto/tls" "sync" - "github.com/molecula/featurebase/v2/logger" - pb "github.com/molecula/featurebase/v2/proto" + "github.com/molecula/featurebase/v3/logger" + pb "github.com/molecula/featurebase/v3/proto" "github.com/pkg/errors" "google.golang.org/grpc" "google.golang.org/grpc/connectivity" diff --git a/api_test.go b/api_test.go index 98a6ba42b..0c7c63287 100644 --- a/api_test.go +++ b/api_test.go @@ -19,14 +19,14 @@ import ( "time" "github.com/golang-jwt/jwt" - pilosa "github.com/molecula/featurebase/v2" - "github.com/molecula/featurebase/v2/authn" - "github.com/molecula/featurebase/v2/boltdb" - "github.com/molecula/featurebase/v2/http" - "github.com/molecula/featurebase/v2/server" - "github.com/molecula/featurebase/v2/shardwidth" - "github.com/molecula/featurebase/v2/test" - . "github.com/molecula/featurebase/v2/vprint" // nolint:staticcheck + pilosa "github.com/molecula/featurebase/v3" + "github.com/molecula/featurebase/v3/authn" + "github.com/molecula/featurebase/v3/boltdb" + "github.com/molecula/featurebase/v3/http" + "github.com/molecula/featurebase/v3/server" + "github.com/molecula/featurebase/v3/shardwidth" + "github.com/molecula/featurebase/v3/test" + . "github.com/molecula/featurebase/v3/vprint" // nolint:staticcheck ) func TestAPI_Import(t *testing.T) { diff --git a/audit.go b/audit.go index c86e56b74..6ffd28eb9 100644 --- a/audit.go +++ b/audit.go @@ -2,7 +2,7 @@ package pilosa import ( - "github.com/molecula/featurebase/v2/testhook" + "github.com/molecula/featurebase/v3/testhook" ) var NewAuditor func() testhook.Auditor = NewNopAuditor diff --git a/audit_internal_test.go b/audit_internal_test.go index 6382d9588..70cce7d2d 100644 --- a/audit_internal_test.go +++ b/audit_internal_test.go @@ -5,7 +5,7 @@ import ( "fmt" "reflect" - "github.com/molecula/featurebase/v2/testhook" + "github.com/molecula/featurebase/v3/testhook" ) // These audit hooks are desireable during testing, but not in diff --git a/audit_test.go b/audit_test.go index c887a2398..112f8bbfd 100644 --- a/audit_test.go +++ b/audit_test.go @@ -6,8 +6,8 @@ import ( "os" "reflect" - "github.com/molecula/featurebase/v2" - "github.com/molecula/featurebase/v2/testhook" + "github.com/molecula/featurebase/v3" + "github.com/molecula/featurebase/v3/testhook" ) // AuditLeaksOn is a global switch to turn on resource diff --git a/authn/authenticate.go b/authn/authenticate.go index 73b325055..037d30d14 100644 --- a/authn/authenticate.go +++ b/authn/authenticate.go @@ -15,7 +15,7 @@ import ( "time" "github.com/golang-jwt/jwt" - "github.com/molecula/featurebase/v2/logger" + "github.com/molecula/featurebase/v3/logger" "github.com/pkg/errors" "golang.org/x/oauth2" ) diff --git a/authn/authenticate_internal_test.go b/authn/authenticate_internal_test.go index f937510d5..3eed3878c 100644 --- a/authn/authenticate_internal_test.go +++ b/authn/authenticate_internal_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/molecula/featurebase/v2/logger" + "github.com/molecula/featurebase/v3/logger" ) func TestAuth(t *testing.T) { diff --git a/authz/authorization.go b/authz/authorization.go index 1cd0d3dc1..bd57ff521 100644 --- a/authz/authorization.go +++ b/authz/authorization.go @@ -19,7 +19,7 @@ import ( "io" "io/ioutil" - "github.com/molecula/featurebase/v2/authn" + "github.com/molecula/featurebase/v3/authn" "gopkg.in/yaml.v2" ) diff --git a/authz/authorization_test.go b/authz/authorization_test.go index 0b0f9dbbe..5bc0602dc 100644 --- a/authz/authorization_test.go +++ b/authz/authorization_test.go @@ -20,8 +20,8 @@ import ( "strings" "testing" - "github.com/molecula/featurebase/v2/authn" - "github.com/molecula/featurebase/v2/authz" + "github.com/molecula/featurebase/v3/authn" + "github.com/molecula/featurebase/v3/authz" ) func TestAuth_ReadPermissionsFile(t *testing.T) { diff --git a/boltdb/translate.go b/boltdb/translate.go index 939be909c..8ff56f7e4 100644 --- a/boltdb/translate.go +++ b/boltdb/translate.go @@ -12,7 +12,7 @@ import ( "sync" "time" - "github.com/molecula/featurebase/v2" + "github.com/molecula/featurebase/v3" "github.com/pkg/errors" bolt "go.etcd.io/bbolt" diff --git a/boltdb/translate_test.go b/boltdb/translate_test.go index c1640d62e..201971644 100644 --- a/boltdb/translate_test.go +++ b/boltdb/translate_test.go @@ -10,10 +10,10 @@ import ( "testing" "time" - "github.com/molecula/featurebase/v2" - "github.com/molecula/featurebase/v2/boltdb" - "github.com/molecula/featurebase/v2/testhook" - "github.com/molecula/featurebase/v2/topology" + "github.com/molecula/featurebase/v3" + "github.com/molecula/featurebase/v3/boltdb" + "github.com/molecula/featurebase/v3/testhook" + "github.com/molecula/featurebase/v3/topology" ) //var vv = pilosa.VV diff --git a/broadcast.go b/broadcast.go index 022508855..663044497 100644 --- a/broadcast.go +++ b/broadcast.go @@ -4,7 +4,7 @@ package pilosa import ( "fmt" - "github.com/molecula/featurebase/v2/topology" + "github.com/molecula/featurebase/v3/topology" "github.com/pkg/errors" ) diff --git a/bsi.go b/bsi.go index 7e776d64b..719404897 100644 --- a/bsi.go +++ b/bsi.go @@ -4,7 +4,7 @@ package pilosa import ( "math/bits" - "github.com/molecula/featurebase/v2/roaring" + "github.com/molecula/featurebase/v3/roaring" ) // bsiData contains BSI-structured data. diff --git a/cache.go b/cache.go index 11a9e58ac..4dd5d5e4c 100644 --- a/cache.go +++ b/cache.go @@ -10,9 +10,9 @@ import ( "sync" "time" - "github.com/molecula/featurebase/v2/lru" - pb "github.com/molecula/featurebase/v2/proto" - "github.com/molecula/featurebase/v2/stats" + "github.com/molecula/featurebase/v3/lru" + pb "github.com/molecula/featurebase/v3/proto" + "github.com/molecula/featurebase/v3/stats" "github.com/pkg/errors" ) diff --git a/cache_test.go b/cache_test.go index d3691e5b4..1ff8d0fff 100644 --- a/cache_test.go +++ b/cache_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "github.com/molecula/featurebase/v2" + "github.com/molecula/featurebase/v3" ) // Ensure cache stays constrained to its configured size. diff --git a/catcher.go b/catcher.go index e1c5fd4d9..a1f128d65 100644 --- a/catcher.go +++ b/catcher.go @@ -2,9 +2,9 @@ package pilosa import ( - "github.com/molecula/featurebase/v2/roaring" - txkey "github.com/molecula/featurebase/v2/short_txkey" - "github.com/molecula/featurebase/v2/vprint" + "github.com/molecula/featurebase/v3/roaring" + txkey "github.com/molecula/featurebase/v3/short_txkey" + "github.com/molecula/featurebase/v3/vprint" ) // catcher is useful to report error locations with a diff --git a/client.go b/client.go index 75741fcd3..35e3230de 100644 --- a/client.go +++ b/client.go @@ -6,9 +6,9 @@ import ( "io" "time" - "github.com/molecula/featurebase/v2/ingest" - pnet "github.com/molecula/featurebase/v2/net" - "github.com/molecula/featurebase/v2/topology" + "github.com/molecula/featurebase/v3/ingest" + pnet "github.com/molecula/featurebase/v3/net" + "github.com/molecula/featurebase/v3/topology" ) // Bit represents the intersection of a row and a column. It can be specified by @@ -36,7 +36,7 @@ type FieldValue struct { // While I understand that putting the entire Client behind an interface might require this many methods, // I don't want to let it go unquestioned. // Another note from Travis: I think we eventually want to unify `InternalClient` with -// the `github.com/molecula/featurebase/v2/client` client. +// the `github.com/molecula/featurebase/v3/client` client. // Doing that may obviate the need to refactor this. type InternalClient interface { InternalQueryClient diff --git a/client/batch.go b/client/batch.go index 182d4e476..87a8952ee 100644 --- a/client/batch.go +++ b/client/batch.go @@ -6,9 +6,9 @@ import ( "sync" "time" - "github.com/molecula/featurebase/v2/client/egpool" - "github.com/molecula/featurebase/v2/logger" - "github.com/molecula/featurebase/v2/roaring" + "github.com/molecula/featurebase/v3/client/egpool" + "github.com/molecula/featurebase/v3/logger" + "github.com/molecula/featurebase/v3/roaring" "github.com/pkg/errors" ) diff --git a/client/batch_test.go b/client/batch_test.go index cc8ab891f..8823a5099 100644 --- a/client/batch_test.go +++ b/client/batch_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - "github.com/molecula/featurebase/v2/test" + "github.com/molecula/featurebase/v3/test" "github.com/pkg/errors" ) diff --git a/client/client.go b/client/client.go index 082a56634..bc5740514 100644 --- a/client/client.go +++ b/client/client.go @@ -20,13 +20,13 @@ import ( "time" "github.com/golang/protobuf/proto" //nolint:staticcheck - pilosa "github.com/molecula/featurebase/v2" - "github.com/molecula/featurebase/v2/logger" - pnet "github.com/molecula/featurebase/v2/net" - "github.com/molecula/featurebase/v2/pb" - "github.com/molecula/featurebase/v2/pql" - "github.com/molecula/featurebase/v2/roaring" - "github.com/molecula/featurebase/v2/stats" + pilosa "github.com/molecula/featurebase/v3" + "github.com/molecula/featurebase/v3/logger" + pnet "github.com/molecula/featurebase/v3/net" + "github.com/molecula/featurebase/v3/pb" + "github.com/molecula/featurebase/v3/pql" + "github.com/molecula/featurebase/v3/roaring" + "github.com/molecula/featurebase/v3/stats" "github.com/opentracing/opentracing-go" "github.com/pkg/errors" "golang.org/x/sync/errgroup" diff --git a/client/client_it_test.go b/client/client_it_test.go index ef79f105c..ff8614d78 100644 --- a/client/client_it_test.go +++ b/client/client_it_test.go @@ -7,10 +7,10 @@ import ( "testing" "time" - "github.com/molecula/featurebase/v2/disco" - pnet "github.com/molecula/featurebase/v2/net" - "github.com/molecula/featurebase/v2/shardwidth" - "github.com/molecula/featurebase/v2/test" + "github.com/molecula/featurebase/v3/disco" + pnet "github.com/molecula/featurebase/v3/net" + "github.com/molecula/featurebase/v3/shardwidth" + "github.com/molecula/featurebase/v3/test" "github.com/stretchr/testify/require" "golang.org/x/sync/errgroup" ) diff --git a/client/client_test.go b/client/client_test.go index ea073eaac..170cf5093 100644 --- a/client/client_test.go +++ b/client/client_test.go @@ -10,7 +10,7 @@ import ( "reflect" "testing" - pnet "github.com/molecula/featurebase/v2/net" + pnet "github.com/molecula/featurebase/v3/net" ) func TestQueryWithError(t *testing.T) { diff --git a/client/cluster.go b/client/cluster.go index dfc407ddb..0f1230583 100644 --- a/client/cluster.go +++ b/client/cluster.go @@ -7,7 +7,7 @@ package client import ( "sync" - pnet "github.com/molecula/featurebase/v2/net" + pnet "github.com/molecula/featurebase/v3/net" ) // Cluster contains hosts in a Pilosa cluster. diff --git a/client/cluster_test.go b/client/cluster_test.go index 797427371..36790b7f8 100644 --- a/client/cluster_test.go +++ b/client/cluster_test.go @@ -7,7 +7,7 @@ package client import ( "testing" - pnet "github.com/molecula/featurebase/v2/net" + pnet "github.com/molecula/featurebase/v3/net" ) func TestNewClusterWithHost(t *testing.T) { diff --git a/client/csv/csv.go b/client/csv/csv.go index e2dd8f6a2..a0797c52d 100644 --- a/client/csv/csv.go +++ b/client/csv/csv.go @@ -10,7 +10,7 @@ import ( "strings" "time" - "github.com/molecula/featurebase/v2/client" + "github.com/molecula/featurebase/v3/client" ) // Format is the format of the data in the CSV file. diff --git a/client/csv/csv_it_test.go b/client/csv/csv_it_test.go index de901816c..c530b3147 100644 --- a/client/csv/csv_it_test.go +++ b/client/csv/csv_it_test.go @@ -10,8 +10,8 @@ import ( "strings" "testing" - "github.com/molecula/featurebase/v2/client" - "github.com/molecula/featurebase/v2/client/csv" + "github.com/molecula/featurebase/v3/client" + "github.com/molecula/featurebase/v3/client/csv" ) func TestCSVIterate(t *testing.T) { diff --git a/client/csv/csv_test.go b/client/csv/csv_test.go index 870237fb3..3be57f12d 100644 --- a/client/csv/csv_test.go +++ b/client/csv/csv_test.go @@ -8,9 +8,9 @@ import ( "strings" "testing" - "github.com/molecula/featurebase/v2" - "github.com/molecula/featurebase/v2/client" - "github.com/molecula/featurebase/v2/client/csv" + "github.com/molecula/featurebase/v3" + "github.com/molecula/featurebase/v3/client" + "github.com/molecula/featurebase/v3/client/csv" ) func TestCSVColumnIterator(t *testing.T) { diff --git a/client/doc.go b/client/doc.go index afd6cc244..5c519c819 100644 --- a/client/doc.go +++ b/client/doc.go @@ -11,7 +11,7 @@ Usage: import ( "fmt" - "github.com/molecula/featurebase/v2/client" + "github.com/molecula/featurebase/v3/client" ) // Create a Client instance diff --git a/client/egpool/egpool_test.go b/client/egpool/egpool_test.go index 4413b813b..af5132e50 100644 --- a/client/egpool/egpool_test.go +++ b/client/egpool/egpool_test.go @@ -5,7 +5,7 @@ import ( "errors" "testing" - "github.com/molecula/featurebase/v2/client/egpool" + "github.com/molecula/featurebase/v3/client/egpool" ) func TestEGPool(t *testing.T) { diff --git a/client/ingest_api_batch.go b/client/ingest_api_batch.go index 2f6d35d5e..a1ae7a1c5 100644 --- a/client/ingest_api_batch.go +++ b/client/ingest_api_batch.go @@ -3,7 +3,7 @@ package client import ( "time" - "github.com/molecula/featurebase/v2/logger" + "github.com/molecula/featurebase/v3/logger" "github.com/pkg/errors" ) diff --git a/client/ingest_api_batch_test.go b/client/ingest_api_batch_test.go index ff5692b1b..9abfa15c6 100644 --- a/client/ingest_api_batch_test.go +++ b/client/ingest_api_batch_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - "github.com/molecula/featurebase/v2/logger" - "github.com/molecula/featurebase/v2/test" + "github.com/molecula/featurebase/v3/logger" + "github.com/molecula/featurebase/v3/test" ) func TestIngestAPIBatchAdd(t *testing.T) { diff --git a/client/orm.go b/client/orm.go index 0c4262d63..ddb77bbd4 100644 --- a/client/orm.go +++ b/client/orm.go @@ -13,7 +13,7 @@ import ( "sync" "time" - "github.com/molecula/featurebase/v2/pql" + "github.com/molecula/featurebase/v3/pql" "github.com/pkg/errors" ) diff --git a/client/orm_test.go b/client/orm_test.go index 595710e53..650d113c3 100644 --- a/client/orm_test.go +++ b/client/orm_test.go @@ -13,8 +13,8 @@ import ( "testing" "time" - pilosa "github.com/molecula/featurebase/v2" - "github.com/molecula/featurebase/v2/pql" + pilosa "github.com/molecula/featurebase/v3" + "github.com/molecula/featurebase/v3/pql" "github.com/pkg/errors" ) diff --git a/client/record_test.go b/client/record_test.go index b2aa892c8..7cb23b216 100644 --- a/client/record_test.go +++ b/client/record_test.go @@ -7,7 +7,7 @@ package client_test import ( "testing" - "github.com/molecula/featurebase/v2/client" + "github.com/molecula/featurebase/v3/client" ) func TestColumnShard(t *testing.T) { diff --git a/client/response.go b/client/response.go index b7ad51a84..8aa3c8c1a 100644 --- a/client/response.go +++ b/client/response.go @@ -8,7 +8,7 @@ import ( "encoding/json" "fmt" - "github.com/molecula/featurebase/v2/pb" + "github.com/molecula/featurebase/v3/pb" ) // QueryResponse types. diff --git a/client/response_test.go b/client/response_test.go index 41bd0b916..7cce0de22 100644 --- a/client/response_test.go +++ b/client/response_test.go @@ -11,7 +11,7 @@ import ( "reflect" "testing" - "github.com/molecula/featurebase/v2/pb" + "github.com/molecula/featurebase/v3/pb" ) func TestNewRowResultFromInternal(t *testing.T) { diff --git a/client/shardnodes.go b/client/shardnodes.go index 332cb818c..52161be35 100644 --- a/client/shardnodes.go +++ b/client/shardnodes.go @@ -7,7 +7,7 @@ package client import ( "sync" - pnet "github.com/molecula/featurebase/v2/net" + pnet "github.com/molecula/featurebase/v3/net" ) type shardNodes struct { diff --git a/cluster.go b/cluster.go index 6ae257352..1f45d2c15 100644 --- a/cluster.go +++ b/cluster.go @@ -10,12 +10,12 @@ import ( "sync" "time" - "github.com/molecula/featurebase/v2/disco" - "github.com/molecula/featurebase/v2/ingest" - "github.com/molecula/featurebase/v2/logger" - "github.com/molecula/featurebase/v2/roaring" - "github.com/molecula/featurebase/v2/topology" - "github.com/molecula/featurebase/v2/tracing" + "github.com/molecula/featurebase/v3/disco" + "github.com/molecula/featurebase/v3/ingest" + "github.com/molecula/featurebase/v3/logger" + "github.com/molecula/featurebase/v3/roaring" + "github.com/molecula/featurebase/v3/topology" + "github.com/molecula/featurebase/v3/tracing" "github.com/pkg/errors" "golang.org/x/sync/errgroup" ) diff --git a/cluster_internal_test.go b/cluster_internal_test.go index fa3afd983..e2261a41f 100644 --- a/cluster_internal_test.go +++ b/cluster_internal_test.go @@ -12,11 +12,11 @@ import ( "time" "github.com/davecgh/go-spew/spew" - pnet "github.com/molecula/featurebase/v2/net" - "github.com/molecula/featurebase/v2/roaring" - "github.com/molecula/featurebase/v2/testhook" - "github.com/molecula/featurebase/v2/topology" - . "github.com/molecula/featurebase/v2/vprint" // nolint:staticcheck + pnet "github.com/molecula/featurebase/v3/net" + "github.com/molecula/featurebase/v3/roaring" + "github.com/molecula/featurebase/v3/testhook" + "github.com/molecula/featurebase/v3/topology" + . "github.com/molecula/featurebase/v3/vprint" // nolint:staticcheck ) // Ensure that fragCombos creates the correct fragment mapping. diff --git a/cmd.go b/cmd.go index 05036b941..73f54d17f 100644 --- a/cmd.go +++ b/cmd.go @@ -4,7 +4,7 @@ package pilosa import ( "io" - "github.com/molecula/featurebase/v2/logger" + "github.com/molecula/featurebase/v3/logger" ) // CmdIO holds standard unix inputs and outputs. diff --git a/cmd/backup.go b/cmd/backup.go index 28712123d..0a0d5dd28 100644 --- a/cmd/backup.go +++ b/cmd/backup.go @@ -5,7 +5,7 @@ import ( "context" "io" - "github.com/molecula/featurebase/v2/ctl" + "github.com/molecula/featurebase/v3/ctl" "github.com/spf13/cobra" ) diff --git a/cmd/badloader/badloader.go b/cmd/badloader/badloader.go index f95d0a649..642137575 100644 --- a/cmd/badloader/badloader.go +++ b/cmd/badloader/badloader.go @@ -12,10 +12,10 @@ import ( "io/ioutil" gohttp "net/http" - pilosa "github.com/molecula/featurebase/v2" - "github.com/molecula/featurebase/v2/http" - pnet "github.com/molecula/featurebase/v2/net" - "github.com/molecula/featurebase/v2/vprint" + pilosa "github.com/molecula/featurebase/v3" + "github.com/molecula/featurebase/v3/http" + pnet "github.com/molecula/featurebase/v3/net" + "github.com/molecula/featurebase/v3/vprint" "os" "strconv" diff --git a/cmd/check.go b/cmd/check.go index ac1700e07..f22dcd3a0 100644 --- a/cmd/check.go +++ b/cmd/check.go @@ -8,7 +8,7 @@ import ( "github.com/spf13/cobra" - "github.com/molecula/featurebase/v2/ctl" + "github.com/molecula/featurebase/v3/ctl" ) var checker *ctl.CheckCommand diff --git a/cmd/chksum.go b/cmd/chksum.go index a9fa14b0c..54a8643f9 100644 --- a/cmd/chksum.go +++ b/cmd/chksum.go @@ -5,7 +5,7 @@ import ( "context" "io" - "github.com/molecula/featurebase/v2/ctl" + "github.com/molecula/featurebase/v3/ctl" "github.com/spf13/cobra" ) diff --git a/cmd/config.go b/cmd/config.go index 19d6bad7e..fc3e11b24 100644 --- a/cmd/config.go +++ b/cmd/config.go @@ -7,8 +7,8 @@ import ( "github.com/spf13/cobra" - "github.com/molecula/featurebase/v2/ctl" - "github.com/molecula/featurebase/v2/server" + "github.com/molecula/featurebase/v3/ctl" + "github.com/molecula/featurebase/v3/server" ) var conf *ctl.ConfigCommand diff --git a/cmd/convert.go b/cmd/convert.go index 4b86eff60..2a9f5711a 100644 --- a/cmd/convert.go +++ b/cmd/convert.go @@ -8,7 +8,7 @@ import ( "github.com/spf13/cobra" - "github.com/molecula/featurebase/v2/ctl" + "github.com/molecula/featurebase/v3/ctl" ) var inspector *ctl.InspectCommand diff --git a/cmd/export.go b/cmd/export.go index 8d97b742f..aae8f13d9 100644 --- a/cmd/export.go +++ b/cmd/export.go @@ -7,7 +7,7 @@ import ( "github.com/spf13/cobra" - "github.com/molecula/featurebase/v2/ctl" + "github.com/molecula/featurebase/v3/ctl" ) var Exporter *ctl.ExportCommand diff --git a/cmd/export_test.go b/cmd/export_test.go index 1ff43a2ab..4a97ece8c 100644 --- a/cmd/export_test.go +++ b/cmd/export_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "github.com/molecula/featurebase/v2/cmd" + "github.com/molecula/featurebase/v3/cmd" ) func TestExportHelp(t *testing.T) { diff --git a/cmd/featurebase-parse-sql/main.go b/cmd/featurebase-parse-sql/main.go index d3143e419..10dcfc3cd 100644 --- a/cmd/featurebase-parse-sql/main.go +++ b/cmd/featurebase-parse-sql/main.go @@ -9,7 +9,7 @@ import ( "os" "strings" - "github.com/molecula/featurebase/v2/sql2" + "github.com/molecula/featurebase/v3/sql2" ) func main() { diff --git a/cmd/featurebase/main.go b/cmd/featurebase/main.go index f185eac29..42f814fe0 100644 --- a/cmd/featurebase/main.go +++ b/cmd/featurebase/main.go @@ -8,7 +8,7 @@ import ( "fmt" "os" - "github.com/molecula/featurebase/v2/cmd" + "github.com/molecula/featurebase/v3/cmd" ) func main() { diff --git a/cmd/generate_config.go b/cmd/generate_config.go index 2ee184ab9..ce671f886 100644 --- a/cmd/generate_config.go +++ b/cmd/generate_config.go @@ -7,7 +7,7 @@ import ( "github.com/spf13/cobra" - "github.com/molecula/featurebase/v2/ctl" + "github.com/molecula/featurebase/v3/ctl" ) var generateConf *ctl.GenerateConfigCommand diff --git a/cmd/import.go b/cmd/import.go index 0ad7e293c..243f440e8 100644 --- a/cmd/import.go +++ b/cmd/import.go @@ -5,8 +5,8 @@ import ( "context" "io" - "github.com/molecula/featurebase/v2" - "github.com/molecula/featurebase/v2/ctl" + "github.com/molecula/featurebase/v3" + "github.com/molecula/featurebase/v3/ctl" "github.com/spf13/cobra" ) diff --git a/cmd/import_test.go b/cmd/import_test.go index d3713b67a..bc640dc82 100644 --- a/cmd/import_test.go +++ b/cmd/import_test.go @@ -5,10 +5,10 @@ import ( "strings" "testing" - "github.com/molecula/featurebase/v2" + "github.com/molecula/featurebase/v3" - "github.com/molecula/featurebase/v2/cmd" - "github.com/molecula/featurebase/v2/pql" + "github.com/molecula/featurebase/v3/cmd" + "github.com/molecula/featurebase/v3/pql" ) func TestImportHelp(t *testing.T) { diff --git a/cmd/keygen.go b/cmd/keygen.go index 527a7ca3d..8bf9166f0 100644 --- a/cmd/keygen.go +++ b/cmd/keygen.go @@ -5,7 +5,7 @@ import ( "context" "io" - "github.com/molecula/featurebase/v2/ctl" + "github.com/molecula/featurebase/v3/ctl" "github.com/spf13/cobra" ) diff --git a/cmd/pilosa-bench/main.go b/cmd/pilosa-bench/main.go index 8f1569028..15c7f4e6b 100644 --- a/cmd/pilosa-bench/main.go +++ b/cmd/pilosa-bench/main.go @@ -16,8 +16,8 @@ import ( "strings" "time" - "github.com/molecula/featurebase/v2" - phttp "github.com/molecula/featurebase/v2/http" + "github.com/molecula/featurebase/v3" + phttp "github.com/molecula/featurebase/v3/http" "golang.org/x/sync/errgroup" ) diff --git a/cmd/random-query/main.go b/cmd/random-query/main.go index ed4416a28..282e9034b 100644 --- a/cmd/random-query/main.go +++ b/cmd/random-query/main.go @@ -16,12 +16,12 @@ import ( "time" "github.com/gogo/protobuf/proto" - pilosa "github.com/molecula/featurebase/v2" - "github.com/molecula/featurebase/v2/client" - "github.com/molecula/featurebase/v2/http" - "github.com/molecula/featurebase/v2/pb" - "github.com/molecula/featurebase/v2/pql" - "github.com/molecula/featurebase/v2/vprint" + pilosa "github.com/molecula/featurebase/v3" + "github.com/molecula/featurebase/v3/client" + "github.com/molecula/featurebase/v3/http" + "github.com/molecula/featurebase/v3/pb" + "github.com/molecula/featurebase/v3/pql" + "github.com/molecula/featurebase/v3/vprint" "github.com/pkg/errors" vegeta "github.com/tsenart/vegeta/v12/lib" ) diff --git a/cmd/random-query/main_test.go b/cmd/random-query/main_test.go index 6f17c6518..2c847217f 100644 --- a/cmd/random-query/main_test.go +++ b/cmd/random-query/main_test.go @@ -7,12 +7,12 @@ import ( "strconv" "testing" - pilosa "github.com/molecula/featurebase/v2" - "github.com/molecula/featurebase/v2/boltdb" - "github.com/molecula/featurebase/v2/http" - "github.com/molecula/featurebase/v2/server" - "github.com/molecula/featurebase/v2/test" - . "github.com/molecula/featurebase/v2/vprint" // nolint:staticcheck + pilosa "github.com/molecula/featurebase/v3" + "github.com/molecula/featurebase/v3/boltdb" + "github.com/molecula/featurebase/v3/http" + "github.com/molecula/featurebase/v3/server" + "github.com/molecula/featurebase/v3/test" + . "github.com/molecula/featurebase/v3/vprint" // nolint:staticcheck ) func Test_RandomQuery(t *testing.T) { diff --git a/cmd/rbf.go b/cmd/rbf.go index 15c9900fd..b7c1925c4 100644 --- a/cmd/rbf.go +++ b/cmd/rbf.go @@ -8,7 +8,7 @@ import ( "io" "strconv" - "github.com/molecula/featurebase/v2/ctl" + "github.com/molecula/featurebase/v3/ctl" "github.com/spf13/cobra" ) diff --git a/cmd/restore.go b/cmd/restore.go index bc9271d0e..071463714 100644 --- a/cmd/restore.go +++ b/cmd/restore.go @@ -5,7 +5,7 @@ import ( "context" "io" - "github.com/molecula/featurebase/v2/ctl" + "github.com/molecula/featurebase/v3/ctl" "github.com/spf13/cobra" ) diff --git a/cmd/roaring-migrate/main.go b/cmd/roaring-migrate/main.go index 4ca91bec0..72e6fa94a 100644 --- a/cmd/roaring-migrate/main.go +++ b/cmd/roaring-migrate/main.go @@ -12,11 +12,11 @@ import ( "strings" "syscall" - pilosa "github.com/molecula/featurebase/v2" - "github.com/molecula/featurebase/v2/rbf" - "github.com/molecula/featurebase/v2/rbf/cfg" - "github.com/molecula/featurebase/v2/roaring" - txkey "github.com/molecula/featurebase/v2/short_txkey" + pilosa "github.com/molecula/featurebase/v3" + "github.com/molecula/featurebase/v3/rbf" + "github.com/molecula/featurebase/v3/rbf/cfg" + "github.com/molecula/featurebase/v3/roaring" + txkey "github.com/molecula/featurebase/v3/short_txkey" "github.com/spf13/cobra" ) diff --git a/cmd/root.go b/cmd/root.go index c164bed97..f32cc5875 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -6,7 +6,7 @@ import ( "io" "strings" - pilosa "github.com/molecula/featurebase/v2" + pilosa "github.com/molecula/featurebase/v3" "github.com/spf13/cobra" "github.com/spf13/pflag" "github.com/spf13/viper" diff --git a/cmd/root_test.go b/cmd/root_test.go index 23a36cd8c..00f2072d8 100644 --- a/cmd/root_test.go +++ b/cmd/root_test.go @@ -12,8 +12,8 @@ import ( "time" - "github.com/molecula/featurebase/v2/cmd" - "github.com/molecula/featurebase/v2/testhook" + "github.com/molecula/featurebase/v3/cmd" + "github.com/molecula/featurebase/v3/testhook" "github.com/spf13/cobra" ) diff --git a/cmd/server.go b/cmd/server.go index 60a541a0f..e03266d5b 100644 --- a/cmd/server.go +++ b/cmd/server.go @@ -4,10 +4,10 @@ package cmd import ( "io" - "github.com/molecula/featurebase/v2/ctl" - "github.com/molecula/featurebase/v2/server" - "github.com/molecula/featurebase/v2/tracing" - "github.com/molecula/featurebase/v2/tracing/opentracing" + "github.com/molecula/featurebase/v3/ctl" + "github.com/molecula/featurebase/v3/server" + "github.com/molecula/featurebase/v3/tracing" + "github.com/molecula/featurebase/v3/tracing/opentracing" "github.com/pkg/errors" "github.com/spf13/cobra" jaegercfg "github.com/uber/jaeger-client-go/config" diff --git a/cmd/server_test.go b/cmd/server_test.go index 0843822b1..f2d3cf057 100644 --- a/cmd/server_test.go +++ b/cmd/server_test.go @@ -7,10 +7,10 @@ import ( "testing" "time" - "github.com/molecula/featurebase/v2/cmd" - _ "github.com/molecula/featurebase/v2/test" - "github.com/molecula/featurebase/v2/testhook" - "github.com/molecula/featurebase/v2/toml" + "github.com/molecula/featurebase/v3/cmd" + _ "github.com/molecula/featurebase/v3/test" + "github.com/molecula/featurebase/v3/testhook" + "github.com/molecula/featurebase/v3/toml" "github.com/pkg/errors" ) diff --git a/cmd/slurp/slurp.go b/cmd/slurp/slurp.go index 800a5a773..8b4eaef85 100644 --- a/cmd/slurp/slurp.go +++ b/cmd/slurp/slurp.go @@ -17,10 +17,10 @@ import ( "strings" "time" - pilosa "github.com/molecula/featurebase/v2" - "github.com/molecula/featurebase/v2/http" - pnet "github.com/molecula/featurebase/v2/net" - "github.com/molecula/featurebase/v2/vprint" + pilosa "github.com/molecula/featurebase/v3" + "github.com/molecula/featurebase/v3/http" + pnet "github.com/molecula/featurebase/v3/net" + "github.com/molecula/featurebase/v3/vprint" ) // slurp: slurp is a load-tester for importing bulk data. diff --git a/ctl/backup.go b/ctl/backup.go index 519a604fd..8d3aa4e1a 100644 --- a/ctl/backup.go +++ b/ctl/backup.go @@ -12,10 +12,10 @@ import ( "path/filepath" "time" - pilosa "github.com/molecula/featurebase/v2" - fb_http "github.com/molecula/featurebase/v2/http" - "github.com/molecula/featurebase/v2/server" - "github.com/molecula/featurebase/v2/topology" + pilosa "github.com/molecula/featurebase/v3" + fb_http "github.com/molecula/featurebase/v3/http" + "github.com/molecula/featurebase/v3/server" + "github.com/molecula/featurebase/v3/topology" "github.com/pkg/errors" "golang.org/x/sync/errgroup" ) diff --git a/ctl/check.go b/ctl/check.go index da3a3412a..655394757 100644 --- a/ctl/check.go +++ b/ctl/check.go @@ -9,8 +9,8 @@ import ( "path/filepath" "syscall" - "github.com/molecula/featurebase/v2" - "github.com/molecula/featurebase/v2/roaring" + "github.com/molecula/featurebase/v3" + "github.com/molecula/featurebase/v3/roaring" "github.com/pkg/errors" ) diff --git a/ctl/check_test.go b/ctl/check_test.go index cad35a4c3..229fcff44 100644 --- a/ctl/check_test.go +++ b/ctl/check_test.go @@ -10,7 +10,7 @@ import ( "context" - "github.com/molecula/featurebase/v2/testhook" + "github.com/molecula/featurebase/v3/testhook" ) func TestCheckCommand_RunCacheFile(t *testing.T) { diff --git a/ctl/chksum.go b/ctl/chksum.go index af2430efb..5b10d56c9 100644 --- a/ctl/chksum.go +++ b/ctl/chksum.go @@ -8,8 +8,8 @@ import ( "io" "github.com/cespare/xxhash" - pilosa "github.com/molecula/featurebase/v2" - "github.com/molecula/featurebase/v2/server" + pilosa "github.com/molecula/featurebase/v3" + "github.com/molecula/featurebase/v3/server" ) // ChkSumCommand represents a command for backing up a Pilosa node. diff --git a/ctl/common.go b/ctl/common.go index 558cdece3..028a1250a 100644 --- a/ctl/common.go +++ b/ctl/common.go @@ -7,9 +7,9 @@ import ( gohttp "net/http" - "github.com/molecula/featurebase/v2/http" - "github.com/molecula/featurebase/v2/logger" - "github.com/molecula/featurebase/v2/server" + "github.com/molecula/featurebase/v3/http" + "github.com/molecula/featurebase/v3/logger" + "github.com/molecula/featurebase/v3/server" "github.com/pkg/errors" "github.com/spf13/pflag" ) diff --git a/ctl/config.go b/ctl/config.go index 526997cc0..cd4331e18 100644 --- a/ctl/config.go +++ b/ctl/config.go @@ -6,8 +6,8 @@ import ( "fmt" "io" - "github.com/molecula/featurebase/v2" - "github.com/molecula/featurebase/v2/server" + "github.com/molecula/featurebase/v3" + "github.com/molecula/featurebase/v3/server" toml "github.com/pelletier/go-toml" ) diff --git a/ctl/config_test.go b/ctl/config_test.go index a251ae008..9594229ad 100644 --- a/ctl/config_test.go +++ b/ctl/config_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "github.com/molecula/featurebase/v2/server" + "github.com/molecula/featurebase/v3/server" ) func TestConfigCommand_Run(t *testing.T) { diff --git a/ctl/export.go b/ctl/export.go index 8df67c79e..43c988693 100644 --- a/ctl/export.go +++ b/ctl/export.go @@ -6,8 +6,8 @@ import ( "io" "os" - "github.com/molecula/featurebase/v2" - "github.com/molecula/featurebase/v2/server" + "github.com/molecula/featurebase/v3" + "github.com/molecula/featurebase/v3/server" "github.com/pkg/errors" ) diff --git a/ctl/export_test.go b/ctl/export_test.go index 144ad3417..8dbdf08c3 100644 --- a/ctl/export_test.go +++ b/ctl/export_test.go @@ -8,8 +8,8 @@ import ( "strings" "testing" - "github.com/molecula/featurebase/v2" - "github.com/molecula/featurebase/v2/test" + "github.com/molecula/featurebase/v3" + "github.com/molecula/featurebase/v3/test" ) func TestExportCommand_Validation(t *testing.T) { diff --git a/ctl/generate_config.go b/ctl/generate_config.go index 96ae06f56..634b69ff9 100644 --- a/ctl/generate_config.go +++ b/ctl/generate_config.go @@ -6,8 +6,8 @@ import ( "fmt" "io" - "github.com/molecula/featurebase/v2" - "github.com/molecula/featurebase/v2/server" + "github.com/molecula/featurebase/v3" + "github.com/molecula/featurebase/v3/server" "github.com/pelletier/go-toml" "github.com/pkg/errors" ) diff --git a/ctl/import.go b/ctl/import.go index f6ecf148c..34689ec9c 100644 --- a/ctl/import.go +++ b/ctl/import.go @@ -11,9 +11,9 @@ import ( "strconv" "time" - "github.com/molecula/featurebase/v2" - "github.com/molecula/featurebase/v2/pql" - "github.com/molecula/featurebase/v2/server" + "github.com/molecula/featurebase/v3" + "github.com/molecula/featurebase/v3/pql" + "github.com/molecula/featurebase/v3/server" "github.com/pkg/errors" ) diff --git a/ctl/import_test.go b/ctl/import_test.go index fd3a2d66b..b9327bb9b 100644 --- a/ctl/import_test.go +++ b/ctl/import_test.go @@ -14,9 +14,9 @@ import ( "testing" "time" - "github.com/molecula/featurebase/v2" - "github.com/molecula/featurebase/v2/test" - "github.com/molecula/featurebase/v2/testhook" + "github.com/molecula/featurebase/v3" + "github.com/molecula/featurebase/v3/test" + "github.com/molecula/featurebase/v3/testhook" ) func TestImportCommand_Validation(t *testing.T) { diff --git a/ctl/inspect.go b/ctl/inspect.go index 0848c9cbf..73d197501 100644 --- a/ctl/inspect.go +++ b/ctl/inspect.go @@ -19,9 +19,9 @@ import ( "unsafe" "github.com/gogo/protobuf/proto" - "github.com/molecula/featurebase/v2" - "github.com/molecula/featurebase/v2/pb" - "github.com/molecula/featurebase/v2/roaring" + "github.com/molecula/featurebase/v3" + "github.com/molecula/featurebase/v3/pb" + "github.com/molecula/featurebase/v3/roaring" "github.com/pkg/errors" ) diff --git a/ctl/inspect_test.go b/ctl/inspect_test.go index 94ed12937..3528edbe7 100644 --- a/ctl/inspect_test.go +++ b/ctl/inspect_test.go @@ -9,7 +9,7 @@ import ( "strings" "testing" - "github.com/molecula/featurebase/v2/testhook" + "github.com/molecula/featurebase/v3/testhook" ) func TestInspectCommand_Run(t *testing.T) { diff --git a/ctl/keygen.go b/ctl/keygen.go index 001cad9f9..19b4f8026 100644 --- a/ctl/keygen.go +++ b/ctl/keygen.go @@ -7,7 +7,7 @@ import ( "io" "github.com/gorilla/securecookie" - pilosa "github.com/molecula/featurebase/v2" + pilosa "github.com/molecula/featurebase/v3" ) // Keygen represents a command for generating a cryptographic key. diff --git a/ctl/main_test.go b/ctl/main_test.go index e4c50bb9b..cbd81d2ff 100644 --- a/ctl/main_test.go +++ b/ctl/main_test.go @@ -9,7 +9,7 @@ import ( _ "net/http/pprof" - "github.com/molecula/featurebase/v2/testhook" + "github.com/molecula/featurebase/v3/testhook" ) func TestMain(m *testing.M) { diff --git a/ctl/rbf_check.go b/ctl/rbf_check.go index f3d40912d..cc6ec3465 100644 --- a/ctl/rbf_check.go +++ b/ctl/rbf_check.go @@ -6,8 +6,8 @@ import ( "fmt" "io" - "github.com/molecula/featurebase/v2" - "github.com/molecula/featurebase/v2/rbf" + "github.com/molecula/featurebase/v3" + "github.com/molecula/featurebase/v3/rbf" ) // RBFCheckCommand represents a command for running a consistency check on RBF. diff --git a/ctl/rbf_dump.go b/ctl/rbf_dump.go index 992318de6..cfaa120e1 100644 --- a/ctl/rbf_dump.go +++ b/ctl/rbf_dump.go @@ -8,8 +8,8 @@ import ( "io" "strings" - "github.com/molecula/featurebase/v2" - "github.com/molecula/featurebase/v2/rbf" + "github.com/molecula/featurebase/v3" + "github.com/molecula/featurebase/v3/rbf" ) // RBFDumpCommand represents a command for dumping raw data for an RBF page. diff --git a/ctl/rbf_page.go b/ctl/rbf_page.go index 1af1e9335..eb0a71c7f 100644 --- a/ctl/rbf_page.go +++ b/ctl/rbf_page.go @@ -6,8 +6,8 @@ import ( "fmt" "io" - "github.com/molecula/featurebase/v2" - "github.com/molecula/featurebase/v2/rbf" + "github.com/molecula/featurebase/v3" + "github.com/molecula/featurebase/v3/rbf" ) // RBFPageCommand represents a command for printing data for a single RBF page. diff --git a/ctl/rbf_pages.go b/ctl/rbf_pages.go index b774175ae..75c6ba59a 100644 --- a/ctl/rbf_pages.go +++ b/ctl/rbf_pages.go @@ -6,9 +6,9 @@ import ( "fmt" "io" - "github.com/molecula/featurebase/v2" - "github.com/molecula/featurebase/v2/rbf" - "github.com/molecula/featurebase/v2/txkey" + "github.com/molecula/featurebase/v3" + "github.com/molecula/featurebase/v3/rbf" + "github.com/molecula/featurebase/v3/txkey" ) // RBFPagesCommand represents a command for printing a list of RBF page metadata. diff --git a/ctl/restore.go b/ctl/restore.go index 6cbf700b0..b40b25b78 100644 --- a/ctl/restore.go +++ b/ctl/restore.go @@ -17,11 +17,11 @@ import ( "github.com/hashicorp/go-retryablehttp" - pilosa "github.com/molecula/featurebase/v2" - fb_http "github.com/molecula/featurebase/v2/http" - "github.com/molecula/featurebase/v2/logger" - "github.com/molecula/featurebase/v2/server" - "github.com/molecula/featurebase/v2/topology" + pilosa "github.com/molecula/featurebase/v3" + fb_http "github.com/molecula/featurebase/v3/http" + "github.com/molecula/featurebase/v3/logger" + "github.com/molecula/featurebase/v3/server" + "github.com/molecula/featurebase/v3/topology" "github.com/pkg/errors" "golang.org/x/sync/errgroup" ) diff --git a/ctl/server.go b/ctl/server.go index db5300e83..98391f761 100644 --- a/ctl/server.go +++ b/ctl/server.go @@ -5,8 +5,8 @@ import ( "fmt" "time" - "github.com/molecula/featurebase/v2/server" - "github.com/molecula/featurebase/v2/storage" + "github.com/molecula/featurebase/v3/server" + "github.com/molecula/featurebase/v3/storage" "github.com/spf13/cobra" ) diff --git a/ctl/server_test.go b/ctl/server_test.go index 18d8027e2..fc17e3050 100644 --- a/ctl/server_test.go +++ b/ctl/server_test.go @@ -5,7 +5,7 @@ import ( "bytes" "testing" - "github.com/molecula/featurebase/v2/server" + "github.com/molecula/featurebase/v3/server" "github.com/spf13/cobra" ) diff --git a/ctl/util.go b/ctl/util.go index 2a5611df6..4ee0762b0 100644 --- a/ctl/util.go +++ b/ctl/util.go @@ -9,7 +9,7 @@ import ( "time" "github.com/felixge/fgprof" - "github.com/molecula/featurebase/v2/logger" + "github.com/molecula/featurebase/v3/logger" "github.com/pkg/errors" ) diff --git a/dbshard.go b/dbshard.go index df43273dd..ee738458f 100644 --- a/dbshard.go +++ b/dbshard.go @@ -10,12 +10,12 @@ import ( "strings" "sync" - rbfcfg "github.com/molecula/featurebase/v2/rbf/cfg" - txkey "github.com/molecula/featurebase/v2/short_txkey" - "github.com/molecula/featurebase/v2/storage" + rbfcfg "github.com/molecula/featurebase/v3/rbf/cfg" + txkey "github.com/molecula/featurebase/v3/short_txkey" + "github.com/molecula/featurebase/v3/storage" "github.com/pkg/errors" - "github.com/molecula/featurebase/v2/vprint" + "github.com/molecula/featurebase/v3/vprint" ) var _ = sort.Sort diff --git a/dbshard_internal_test.go b/dbshard_internal_test.go index e524ae7e7..ceb63ab89 100644 --- a/dbshard_internal_test.go +++ b/dbshard_internal_test.go @@ -8,11 +8,11 @@ import ( "strings" "testing" - "github.com/molecula/featurebase/v2/rbf" - "github.com/molecula/featurebase/v2/shardwidth" - txkey "github.com/molecula/featurebase/v2/short_txkey" - "github.com/molecula/featurebase/v2/testhook" - . "github.com/molecula/featurebase/v2/vprint" // nolint:staticcheck + "github.com/molecula/featurebase/v3/rbf" + "github.com/molecula/featurebase/v3/shardwidth" + txkey "github.com/molecula/featurebase/v3/short_txkey" + "github.com/molecula/featurebase/v3/testhook" + . "github.com/molecula/featurebase/v3/vprint" // nolint:staticcheck ) // Shard per db evaluation diff --git a/dbshard_test.go b/dbshard_test.go index 62945b1fb..6f7281301 100644 --- a/dbshard_test.go +++ b/dbshard_test.go @@ -7,12 +7,12 @@ import ( "reflect" "testing" - "github.com/molecula/featurebase/v2" - "github.com/molecula/featurebase/v2/boltdb" - "github.com/molecula/featurebase/v2/http" - "github.com/molecula/featurebase/v2/server" - "github.com/molecula/featurebase/v2/test" - . "github.com/molecula/featurebase/v2/vprint" // nolint:staticcheck + "github.com/molecula/featurebase/v3" + "github.com/molecula/featurebase/v3/boltdb" + "github.com/molecula/featurebase/v3/http" + "github.com/molecula/featurebase/v3/server" + "github.com/molecula/featurebase/v3/test" + . "github.com/molecula/featurebase/v3/vprint" // nolint:staticcheck ) func TestAPI_SimplerOneNode_ImportColumnKey(t *testing.T) { diff --git a/delete_test.go b/delete_test.go index e3e1a2aef..df977513b 100644 --- a/delete_test.go +++ b/delete_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" - "github.com/molecula/featurebase/v2" - "github.com/molecula/featurebase/v2/test" + "github.com/molecula/featurebase/v3" + "github.com/molecula/featurebase/v3/test" "github.com/stretchr/testify/require" ) diff --git a/diagnostics.go b/diagnostics.go index 3742d6d88..989fc8e4c 100644 --- a/diagnostics.go +++ b/diagnostics.go @@ -11,7 +11,7 @@ import ( "sync" "time" - "github.com/molecula/featurebase/v2/logger" + "github.com/molecula/featurebase/v3/logger" "github.com/pkg/errors" ) diff --git a/diagnostics_internal_test.go b/diagnostics_internal_test.go index 690fba1de..0a0ccf8c9 100644 --- a/diagnostics_internal_test.go +++ b/diagnostics_internal_test.go @@ -10,7 +10,7 @@ import ( "strings" "testing" - "github.com/molecula/featurebase/v2/logger" + "github.com/molecula/featurebase/v3/logger" ) func TestDiagnosticsClient(t *testing.T) { diff --git a/encoding/proto/proto.go b/encoding/proto/proto.go index cb66619c3..b9f826938 100644 --- a/encoding/proto/proto.go +++ b/encoding/proto/proto.go @@ -6,14 +6,14 @@ import ( "time" "github.com/gogo/protobuf/proto" - pilosa "github.com/molecula/featurebase/v2" - "github.com/molecula/featurebase/v2/disco" - "github.com/molecula/featurebase/v2/ingest" - pnet "github.com/molecula/featurebase/v2/net" - "github.com/molecula/featurebase/v2/pb" - "github.com/molecula/featurebase/v2/pql" - "github.com/molecula/featurebase/v2/roaring" - "github.com/molecula/featurebase/v2/topology" + pilosa "github.com/molecula/featurebase/v3" + "github.com/molecula/featurebase/v3/disco" + "github.com/molecula/featurebase/v3/ingest" + pnet "github.com/molecula/featurebase/v3/net" + "github.com/molecula/featurebase/v3/pb" + "github.com/molecula/featurebase/v3/pql" + "github.com/molecula/featurebase/v3/roaring" + "github.com/molecula/featurebase/v3/topology" "github.com/pkg/errors" ) diff --git a/encoding/proto/proto_test.go b/encoding/proto/proto_test.go index a011b6b41..6c2107fc5 100644 --- a/encoding/proto/proto_test.go +++ b/encoding/proto/proto_test.go @@ -6,9 +6,9 @@ import ( "reflect" "testing" - pilosa "github.com/molecula/featurebase/v2" - "github.com/molecula/featurebase/v2/ingest" - "github.com/molecula/featurebase/v2/pb" + pilosa "github.com/molecula/featurebase/v3" + "github.com/molecula/featurebase/v3/ingest" + "github.com/molecula/featurebase/v3/pb" ) func testOneRoundTrip(t *testing.T, s pilosa.Serializer, obj pilosa.Message, expectedMarshalErr error, expectedUnmarshalErr error, expectedMismatchErr error) { diff --git a/etcd/embed.go b/etcd/embed.go index 696c85df2..cff332736 100644 --- a/etcd/embed.go +++ b/etcd/embed.go @@ -14,9 +14,9 @@ import ( "sync" "time" - "github.com/molecula/featurebase/v2/disco" - "github.com/molecula/featurebase/v2/logger" - "github.com/molecula/featurebase/v2/topology" + "github.com/molecula/featurebase/v3/disco" + "github.com/molecula/featurebase/v3/logger" + "github.com/molecula/featurebase/v3/topology" "github.com/pkg/errors" "go.etcd.io/etcd/clientv3" "go.etcd.io/etcd/clientv3/clientv3util" diff --git a/etcd/leasedkv.go b/etcd/leasedkv.go index 742bb51ad..20d8d40ed 100644 --- a/etcd/leasedkv.go +++ b/etcd/leasedkv.go @@ -7,7 +7,7 @@ import ( "sync" "time" - "github.com/molecula/featurebase/v2/disco" + "github.com/molecula/featurebase/v3/disco" "github.com/pkg/errors" "go.etcd.io/etcd/clientv3" "go.etcd.io/etcd/clientv3/clientv3util" diff --git a/etcd/leasedkv_test.go b/etcd/leasedkv_test.go index 0366d7dd2..e4222764b 100644 --- a/etcd/leasedkv_test.go +++ b/etcd/leasedkv_test.go @@ -9,9 +9,9 @@ import ( "testing" "time" - "github.com/molecula/featurebase/v2/disco" - "github.com/molecula/featurebase/v2/logger" - "github.com/molecula/featurebase/v2/testhook" + "github.com/molecula/featurebase/v3/disco" + "github.com/molecula/featurebase/v3/logger" + "github.com/molecula/featurebase/v3/testhook" "github.com/pkg/errors" "go.etcd.io/etcd/embed" "go.etcd.io/etcd/etcdserver/api/v3client" diff --git a/event.go b/event.go index 83d2c3a03..811e6c7d9 100644 --- a/event.go +++ b/event.go @@ -1,7 +1,7 @@ // Copyright 2021 Molecula Corp. All rights reserved. package pilosa -import "github.com/molecula/featurebase/v2/topology" +import "github.com/molecula/featurebase/v3/topology" // NodeEventType are the types of node events. type NodeEventType int diff --git a/executor.go b/executor.go index 692feef82..24e36af61 100644 --- a/executor.go +++ b/executor.go @@ -17,14 +17,14 @@ import ( "unsafe" "github.com/lib/pq" - "github.com/molecula/featurebase/v2/disco" - "github.com/molecula/featurebase/v2/pql" - "github.com/molecula/featurebase/v2/proto" - "github.com/molecula/featurebase/v2/roaring" - "github.com/molecula/featurebase/v2/shardwidth" - "github.com/molecula/featurebase/v2/testhook" - "github.com/molecula/featurebase/v2/topology" - "github.com/molecula/featurebase/v2/tracing" + "github.com/molecula/featurebase/v3/disco" + "github.com/molecula/featurebase/v3/pql" + "github.com/molecula/featurebase/v3/proto" + "github.com/molecula/featurebase/v3/roaring" + "github.com/molecula/featurebase/v3/shardwidth" + "github.com/molecula/featurebase/v3/testhook" + "github.com/molecula/featurebase/v3/topology" + "github.com/molecula/featurebase/v3/tracing" "github.com/pkg/errors" "golang.org/x/sync/errgroup" ) diff --git a/executor_internal_test.go b/executor_internal_test.go index 953123385..171cb2ae3 100644 --- a/executor_internal_test.go +++ b/executor_internal_test.go @@ -10,8 +10,8 @@ import ( "testing" "time" - "github.com/molecula/featurebase/v2/pql" - "github.com/molecula/featurebase/v2/testhook" + "github.com/molecula/featurebase/v3/pql" + "github.com/molecula/featurebase/v3/testhook" ) func TestExecutor_TranslateRowsOnBool(t *testing.T) { diff --git a/executor_test.go b/executor_test.go index 990a569dd..a074cf90f 100644 --- a/executor_test.go +++ b/executor_test.go @@ -25,18 +25,18 @@ import ( "github.com/davecgh/go-spew/spew" "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - pilosa "github.com/molecula/featurebase/v2" - "github.com/molecula/featurebase/v2/boltdb" - "github.com/molecula/featurebase/v2/ctl" - "github.com/molecula/featurebase/v2/disco" - "github.com/molecula/featurebase/v2/http" - "github.com/molecula/featurebase/v2/pql" - "github.com/molecula/featurebase/v2/proto" - "github.com/molecula/featurebase/v2/server" - "github.com/molecula/featurebase/v2/storage" - "github.com/molecula/featurebase/v2/test" - "github.com/molecula/featurebase/v2/testhook" - . "github.com/molecula/featurebase/v2/vprint" // nolint:staticcheck + pilosa "github.com/molecula/featurebase/v3" + "github.com/molecula/featurebase/v3/boltdb" + "github.com/molecula/featurebase/v3/ctl" + "github.com/molecula/featurebase/v3/disco" + "github.com/molecula/featurebase/v3/http" + "github.com/molecula/featurebase/v3/pql" + "github.com/molecula/featurebase/v3/proto" + "github.com/molecula/featurebase/v3/server" + "github.com/molecula/featurebase/v3/storage" + "github.com/molecula/featurebase/v3/test" + "github.com/molecula/featurebase/v3/testhook" + . "github.com/molecula/featurebase/v3/vprint" // nolint:staticcheck "github.com/pkg/errors" ) diff --git a/field.go b/field.go index b78ed051c..5beb2983a 100644 --- a/field.go +++ b/field.go @@ -15,12 +15,12 @@ import ( "sync" "time" - "github.com/molecula/featurebase/v2/disco" - "github.com/molecula/featurebase/v2/pql" - "github.com/molecula/featurebase/v2/roaring" - "github.com/molecula/featurebase/v2/stats" - "github.com/molecula/featurebase/v2/testhook" - "github.com/molecula/featurebase/v2/tracing" + "github.com/molecula/featurebase/v3/disco" + "github.com/molecula/featurebase/v3/pql" + "github.com/molecula/featurebase/v3/roaring" + "github.com/molecula/featurebase/v3/stats" + "github.com/molecula/featurebase/v3/testhook" + "github.com/molecula/featurebase/v3/tracing" "github.com/pkg/errors" ) diff --git a/field_internal_test.go b/field_internal_test.go index d9471db91..da1ba40bd 100644 --- a/field_internal_test.go +++ b/field_internal_test.go @@ -12,11 +12,11 @@ import ( "testing" "time" - "github.com/molecula/featurebase/v2/pql" - "github.com/molecula/featurebase/v2/roaring" - "github.com/molecula/featurebase/v2/shardwidth" - "github.com/molecula/featurebase/v2/testhook" - . "github.com/molecula/featurebase/v2/vprint" // nolint:staticcheck + "github.com/molecula/featurebase/v3/pql" + "github.com/molecula/featurebase/v3/roaring" + "github.com/molecula/featurebase/v3/shardwidth" + "github.com/molecula/featurebase/v3/testhook" + . "github.com/molecula/featurebase/v3/vprint" // nolint:staticcheck ) // CorruptAMutex breaks a mutex in order to test the mutex-corruption stuff. diff --git a/field_test.go b/field_test.go index 739dc60a2..8eb4f8d3e 100644 --- a/field_test.go +++ b/field_test.go @@ -6,10 +6,10 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/molecula/featurebase/v2" - "github.com/molecula/featurebase/v2/roaring" - "github.com/molecula/featurebase/v2/test" - "github.com/molecula/featurebase/v2/testhook" + "github.com/molecula/featurebase/v3" + "github.com/molecula/featurebase/v3/roaring" + "github.com/molecula/featurebase/v3/test" + "github.com/molecula/featurebase/v3/testhook" ) // Ensure a field can set & read a bsiGroup value. diff --git a/fragment.go b/fragment.go index cf04079e0..1eceb076f 100644 --- a/fragment.go +++ b/fragment.go @@ -27,17 +27,17 @@ import ( "github.com/cespare/xxhash" "github.com/gogo/protobuf/proto" - "github.com/molecula/featurebase/v2/logger" - pnet "github.com/molecula/featurebase/v2/net" - "github.com/molecula/featurebase/v2/pb" - "github.com/molecula/featurebase/v2/pql" - "github.com/molecula/featurebase/v2/roaring" - "github.com/molecula/featurebase/v2/shardwidth" - "github.com/molecula/featurebase/v2/stats" - "github.com/molecula/featurebase/v2/testhook" - "github.com/molecula/featurebase/v2/topology" - "github.com/molecula/featurebase/v2/tracing" - "github.com/molecula/featurebase/v2/vprint" + "github.com/molecula/featurebase/v3/logger" + pnet "github.com/molecula/featurebase/v3/net" + "github.com/molecula/featurebase/v3/pb" + "github.com/molecula/featurebase/v3/pql" + "github.com/molecula/featurebase/v3/roaring" + "github.com/molecula/featurebase/v3/shardwidth" + "github.com/molecula/featurebase/v3/stats" + "github.com/molecula/featurebase/v3/testhook" + "github.com/molecula/featurebase/v3/topology" + "github.com/molecula/featurebase/v3/tracing" + "github.com/molecula/featurebase/v3/vprint" "github.com/pkg/errors" ) diff --git a/fragment_internal_test.go b/fragment_internal_test.go index 7945476c6..0ecdfb787 100644 --- a/fragment_internal_test.go +++ b/fragment_internal_test.go @@ -23,11 +23,11 @@ import ( "testing/quick" "github.com/davecgh/go-spew/spew" - "github.com/molecula/featurebase/v2/pql" - "github.com/molecula/featurebase/v2/roaring" - "github.com/molecula/featurebase/v2/storage" - "github.com/molecula/featurebase/v2/testhook" - . "github.com/molecula/featurebase/v2/vprint" // nolint:staticcheck + "github.com/molecula/featurebase/v3/pql" + "github.com/molecula/featurebase/v3/roaring" + "github.com/molecula/featurebase/v3/storage" + "github.com/molecula/featurebase/v3/testhook" + . "github.com/molecula/featurebase/v3/vprint" // nolint:staticcheck "github.com/pkg/errors" "golang.org/x/sync/errgroup" ) diff --git a/gcnotify/gcnotify.go b/gcnotify/gcnotify.go index fc9d90fa6..e6bf92eed 100644 --- a/gcnotify/gcnotify.go +++ b/gcnotify/gcnotify.go @@ -3,7 +3,7 @@ package gcnotify import ( "github.com/CAFxX/gcnotifier" - "github.com/molecula/featurebase/v2" + "github.com/molecula/featurebase/v3" ) // Ensure ActiveGCNotifier implements interface. diff --git a/gendebug_test.go b/gendebug_test.go index bc7fb488c..05094bd22 100644 --- a/gendebug_test.go +++ b/gendebug_test.go @@ -10,7 +10,7 @@ import ( "fmt" "runtime" - "github.com/molecula/featurebase/v2/testhook" + "github.com/molecula/featurebase/v3/testhook" ) func examineResults() error { diff --git a/generation.go b/generation.go index 7c880c8c3..dfb8a3277 100644 --- a/generation.go +++ b/generation.go @@ -12,9 +12,9 @@ import ( "syscall" "time" - "github.com/molecula/featurebase/v2/logger" - "github.com/molecula/featurebase/v2/roaring" - "github.com/molecula/featurebase/v2/syswrap" + "github.com/molecula/featurebase/v3/logger" + "github.com/molecula/featurebase/v3/roaring" + "github.com/molecula/featurebase/v3/syswrap" "github.com/pkg/errors" ) diff --git a/go.mod b/go.mod index f15095796..f1d6d285b 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/molecula/featurebase/v2 +module github.com/molecula/featurebase/v3 replace go.etcd.io/etcd => github.com/molecula/etcd v0.0.0-20210930172242-ad94b354f72c @@ -14,7 +14,6 @@ require ( github.com/cespare/xxhash v1.1.0 github.com/davecgh/go-spew v1.1.1 github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect - github.com/dgrijalva/jwt-go v3.2.0+incompatible github.com/dustin/go-humanize v1.0.0 // indirect github.com/felixge/fgprof v0.9.1 github.com/fsnotify/fsnotify v1.4.9 // indirect diff --git a/gopsutil/systeminfo.go b/gopsutil/systeminfo.go index f95a08e86..3430562b6 100644 --- a/gopsutil/systeminfo.go +++ b/gopsutil/systeminfo.go @@ -6,7 +6,7 @@ import ( "runtime" "strings" - "github.com/molecula/featurebase/v2" + "github.com/molecula/featurebase/v3" "github.com/shirou/gopsutil/v3/cpu" "github.com/shirou/gopsutil/v3/disk" "github.com/shirou/gopsutil/v3/host" diff --git a/gopsutil/systeminfo_test.go b/gopsutil/systeminfo_test.go index f285f3a69..a59cedc03 100644 --- a/gopsutil/systeminfo_test.go +++ b/gopsutil/systeminfo_test.go @@ -4,8 +4,8 @@ package gopsutil_test import ( "testing" - "github.com/molecula/featurebase/v2" - "github.com/molecula/featurebase/v2/gopsutil" + "github.com/molecula/featurebase/v3" + "github.com/molecula/featurebase/v3/gopsutil" ) func TestSystemInfo(t *testing.T) { diff --git a/hack.go b/hack.go index 2fad99df2..4f8a8a460 100644 --- a/hack.go +++ b/hack.go @@ -3,8 +3,8 @@ package pilosa import ( "github.com/gogo/protobuf/proto" - "github.com/molecula/featurebase/v2/pb" - "github.com/molecula/featurebase/v2/pql" + "github.com/molecula/featurebase/v3/pb" + "github.com/molecula/featurebase/v3/pql" ) func UnmarshalIndexOptions(name string, createdAt int64, buf []byte) (*IndexOptions, error) { diff --git a/handler.go b/handler.go index ee18153ea..725225f5f 100644 --- a/handler.go +++ b/handler.go @@ -5,8 +5,8 @@ import ( "encoding/json" "time" - "github.com/molecula/featurebase/v2/ingest" - "github.com/molecula/featurebase/v2/tracing" + "github.com/molecula/featurebase/v3/ingest" + "github.com/molecula/featurebase/v3/tracing" "github.com/pkg/errors" ) diff --git a/hash/blake3_test.go b/hash/blake3_test.go index d33df7b4b..e7552f23a 100644 --- a/hash/blake3_test.go +++ b/hash/blake3_test.go @@ -9,7 +9,7 @@ import ( "path" "testing" - "github.com/molecula/featurebase/v2/testhook" + "github.com/molecula/featurebase/v3/testhook" ) func TestBlake3Hasher(t *testing.T) { diff --git a/holder.go b/holder.go index ad50e497e..cf35bf998 100644 --- a/holder.go +++ b/holder.go @@ -15,15 +15,15 @@ import ( "sync" "time" - "github.com/molecula/featurebase/v2/disco" - "github.com/molecula/featurebase/v2/logger" - rbfcfg "github.com/molecula/featurebase/v2/rbf/cfg" - "github.com/molecula/featurebase/v2/roaring" - "github.com/molecula/featurebase/v2/stats" - "github.com/molecula/featurebase/v2/storage" - "github.com/molecula/featurebase/v2/testhook" - "github.com/molecula/featurebase/v2/topology" - "github.com/molecula/featurebase/v2/vprint" + "github.com/molecula/featurebase/v3/disco" + "github.com/molecula/featurebase/v3/logger" + rbfcfg "github.com/molecula/featurebase/v3/rbf/cfg" + "github.com/molecula/featurebase/v3/roaring" + "github.com/molecula/featurebase/v3/stats" + "github.com/molecula/featurebase/v3/storage" + "github.com/molecula/featurebase/v3/testhook" + "github.com/molecula/featurebase/v3/topology" + "github.com/molecula/featurebase/v3/vprint" "github.com/pkg/errors" "golang.org/x/sync/errgroup" ) diff --git a/holder_internal_test.go b/holder_internal_test.go index e2724ac50..b1455aa5e 100644 --- a/holder_internal_test.go +++ b/holder_internal_test.go @@ -7,8 +7,8 @@ import ( "os" "testing" - "github.com/molecula/featurebase/v2/disco" - "github.com/molecula/featurebase/v2/testhook" + "github.com/molecula/featurebase/v3/disco" + "github.com/molecula/featurebase/v3/testhook" ) var _ = fmt.Printf diff --git a/holder_test.go b/holder_test.go index 01b6db39f..cff3cf7da 100644 --- a/holder_test.go +++ b/holder_test.go @@ -11,10 +11,10 @@ import ( "testing" "time" - "github.com/molecula/featurebase/v2" - "github.com/molecula/featurebase/v2/disco" - "github.com/molecula/featurebase/v2/pql" - "github.com/molecula/featurebase/v2/test" + "github.com/molecula/featurebase/v3" + "github.com/molecula/featurebase/v3/disco" + "github.com/molecula/featurebase/v3/pql" + "github.com/molecula/featurebase/v3/test" "github.com/pkg/errors" ) diff --git a/http/client.go b/http/client.go index c9bf14068..183b7675d 100644 --- a/http/client.go +++ b/http/client.go @@ -20,14 +20,14 @@ import ( "time" "github.com/hashicorp/go-retryablehttp" - pilosa "github.com/molecula/featurebase/v2" - "github.com/molecula/featurebase/v2/authn" - "github.com/molecula/featurebase/v2/encoding/proto" - "github.com/molecula/featurebase/v2/ingest" - "github.com/molecula/featurebase/v2/logger" - pnet "github.com/molecula/featurebase/v2/net" - "github.com/molecula/featurebase/v2/topology" - "github.com/molecula/featurebase/v2/tracing" + pilosa "github.com/molecula/featurebase/v3" + "github.com/molecula/featurebase/v3/authn" + "github.com/molecula/featurebase/v3/encoding/proto" + "github.com/molecula/featurebase/v3/ingest" + "github.com/molecula/featurebase/v3/logger" + pnet "github.com/molecula/featurebase/v3/net" + "github.com/molecula/featurebase/v3/topology" + "github.com/molecula/featurebase/v3/tracing" "github.com/pkg/errors" ) diff --git a/http/client_test.go b/http/client_test.go index 0b05bc00f..74c25d7fd 100644 --- a/http/client_test.go +++ b/http/client_test.go @@ -14,12 +14,12 @@ import ( "time" "github.com/davecgh/go-spew/spew" - "github.com/molecula/featurebase/v2" - "github.com/molecula/featurebase/v2/http" - "github.com/molecula/featurebase/v2/pql" - "github.com/molecula/featurebase/v2/server" - "github.com/molecula/featurebase/v2/test" - "github.com/molecula/featurebase/v2/topology" + "github.com/molecula/featurebase/v3" + "github.com/molecula/featurebase/v3/http" + "github.com/molecula/featurebase/v3/pql" + "github.com/molecula/featurebase/v3/server" + "github.com/molecula/featurebase/v3/test" + "github.com/molecula/featurebase/v3/topology" "github.com/pkg/errors" ) diff --git a/http/handler.go b/http/handler.go index 579f66385..d92f69e45 100644 --- a/http/handler.go +++ b/http/handler.go @@ -29,16 +29,16 @@ import ( "github.com/felixge/fgprof" "github.com/gorilla/handlers" "github.com/gorilla/mux" - pilosa "github.com/molecula/featurebase/v2" - "github.com/molecula/featurebase/v2/authn" - "github.com/molecula/featurebase/v2/authz" - "github.com/molecula/featurebase/v2/encoding/proto" - "github.com/molecula/featurebase/v2/ingest" - "github.com/molecula/featurebase/v2/logger" - "github.com/molecula/featurebase/v2/pql" - "github.com/molecula/featurebase/v2/rbf" - "github.com/molecula/featurebase/v2/topology" - "github.com/molecula/featurebase/v2/tracing" + pilosa "github.com/molecula/featurebase/v3" + "github.com/molecula/featurebase/v3/authn" + "github.com/molecula/featurebase/v3/authz" + "github.com/molecula/featurebase/v3/encoding/proto" + "github.com/molecula/featurebase/v3/ingest" + "github.com/molecula/featurebase/v3/logger" + "github.com/molecula/featurebase/v3/pql" + "github.com/molecula/featurebase/v3/rbf" + "github.com/molecula/featurebase/v3/topology" + "github.com/molecula/featurebase/v3/tracing" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus/promhttp" dto "github.com/prometheus/client_model/go" diff --git a/http/handler_internal_test.go b/http/handler_internal_test.go index 511079961..a3fcdb133 100644 --- a/http/handler_internal_test.go +++ b/http/handler_internal_test.go @@ -16,13 +16,13 @@ import ( "time" "github.com/golang-jwt/jwt" - pilosa "github.com/molecula/featurebase/v2" - "github.com/molecula/featurebase/v2/authn" + pilosa "github.com/molecula/featurebase/v3" + "github.com/molecula/featurebase/v3/authn" "golang.org/x/oauth2" - "github.com/molecula/featurebase/v2/authz" - "github.com/molecula/featurebase/v2/logger" - "github.com/molecula/featurebase/v2/pql" + "github.com/molecula/featurebase/v3/authz" + "github.com/molecula/featurebase/v3/logger" + "github.com/molecula/featurebase/v3/pql" ) // Test custom UnmarshalJSON for postIndexRequest object diff --git a/http/handler_test.go b/http/handler_test.go index 7dd2e6b00..c58a4bd3e 100644 --- a/http/handler_test.go +++ b/http/handler_test.go @@ -9,10 +9,10 @@ import ( "strings" "testing" - pilosa "github.com/molecula/featurebase/v2" - "github.com/molecula/featurebase/v2/http" - "github.com/molecula/featurebase/v2/server" - "github.com/molecula/featurebase/v2/test" + pilosa "github.com/molecula/featurebase/v3" + "github.com/molecula/featurebase/v3/http" + "github.com/molecula/featurebase/v3/server" + "github.com/molecula/featurebase/v3/test" ) func TestHandlerOptions(t *testing.T) { diff --git a/http/translator.go b/http/translator.go index 8bce04a67..4c161d590 100644 --- a/http/translator.go +++ b/http/translator.go @@ -12,8 +12,8 @@ import ( "reflect" "sync" - "github.com/molecula/featurebase/v2" - "github.com/molecula/featurebase/v2/logger" + "github.com/molecula/featurebase/v3" + "github.com/molecula/featurebase/v3/logger" ) func GetOpenTranslateReaderFunc(client *http.Client) pilosa.OpenTranslateReaderFunc { diff --git a/http/translator_test.go b/http/translator_test.go index 2474da7f1..74a579f9c 100644 --- a/http/translator_test.go +++ b/http/translator_test.go @@ -8,9 +8,9 @@ import ( "testing" "time" - "github.com/molecula/featurebase/v2" - "github.com/molecula/featurebase/v2/http" - "github.com/molecula/featurebase/v2/test" + "github.com/molecula/featurebase/v3" + "github.com/molecula/featurebase/v3/http" + "github.com/molecula/featurebase/v3/test" ) func TestTranslateStore_EntryReader(t *testing.T) { diff --git a/idalloc_test.go b/idalloc_test.go index 69d7e5e3e..1004dc229 100644 --- a/idalloc_test.go +++ b/idalloc_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/molecula/featurebase/v2/testhook" + "github.com/molecula/featurebase/v3/testhook" bolt "go.etcd.io/bbolt" ) diff --git a/index.go b/index.go index 3426b3b5a..864e71346 100644 --- a/index.go +++ b/index.go @@ -10,10 +10,10 @@ import ( "strconv" "sync" - "github.com/molecula/featurebase/v2/disco" - "github.com/molecula/featurebase/v2/roaring" - "github.com/molecula/featurebase/v2/stats" - "github.com/molecula/featurebase/v2/testhook" + "github.com/molecula/featurebase/v3/disco" + "github.com/molecula/featurebase/v3/roaring" + "github.com/molecula/featurebase/v3/stats" + "github.com/molecula/featurebase/v3/testhook" "github.com/pkg/errors" "golang.org/x/sync/errgroup" ) diff --git a/index_internal_test.go b/index_internal_test.go index 161e7a2d3..a36a2475a 100644 --- a/index_internal_test.go +++ b/index_internal_test.go @@ -4,7 +4,7 @@ package pilosa import ( "testing" - "github.com/molecula/featurebase/v2/testhook" + "github.com/molecula/featurebase/v3/testhook" ) // mustOpenIndex returns a new, opened index at a temporary path. Panic on error. diff --git a/index_test.go b/index_test.go index 6d2a7a0c6..67d69ecbe 100644 --- a/index_test.go +++ b/index_test.go @@ -10,11 +10,11 @@ import ( "testing" "time" - pilosa "github.com/molecula/featurebase/v2" - "github.com/molecula/featurebase/v2/disco" - "github.com/molecula/featurebase/v2/pql" - "github.com/molecula/featurebase/v2/test" - "github.com/molecula/featurebase/v2/testhook" + pilosa "github.com/molecula/featurebase/v3" + "github.com/molecula/featurebase/v3/disco" + "github.com/molecula/featurebase/v3/pql" + "github.com/molecula/featurebase/v3/test" + "github.com/molecula/featurebase/v3/testhook" "github.com/pkg/errors" ) diff --git a/ingest/codec_test.go b/ingest/codec_test.go index 04d81c558..d36a0b757 100644 --- a/ingest/codec_test.go +++ b/ingest/codec_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/molecula/featurebase/v2/shardwidth" + "github.com/molecula/featurebase/v3/shardwidth" ) func TestStableTranslator(t *testing.T) { diff --git a/ingest/op.go b/ingest/op.go index df5291a39..5eb3880ca 100644 --- a/ingest/op.go +++ b/ingest/op.go @@ -7,7 +7,7 @@ import ( "math/bits" "sort" - "github.com/molecula/featurebase/v2/shardwidth" + "github.com/molecula/featurebase/v3/shardwidth" ) type OpType uint8 diff --git a/ingest/op_test.go b/ingest/op_test.go index dadf04d0f..31e1c56ff 100644 --- a/ingest/op_test.go +++ b/ingest/op_test.go @@ -5,7 +5,7 @@ import ( "math/rand" "testing" - "github.com/molecula/featurebase/v2/shardwidth" + "github.com/molecula/featurebase/v3/shardwidth" ) type opShardingTestCase struct { diff --git a/ingest/update.go b/ingest/update.go index c27448eac..f36363ba7 100644 --- a/ingest/update.go +++ b/ingest/update.go @@ -2,7 +2,7 @@ package ingest import ( - "github.com/molecula/featurebase/v2/roaring" + "github.com/molecula/featurebase/v3/roaring" ) // ShardUpdate is an update request for a shard. diff --git a/ingest_test.go b/ingest_test.go index cca87e258..712b834e6 100644 --- a/ingest_test.go +++ b/ingest_test.go @@ -12,9 +12,9 @@ import ( "strings" "testing" - pilosa "github.com/molecula/featurebase/v2" - "github.com/molecula/featurebase/v2/ingest" - "github.com/molecula/featurebase/v2/test" + pilosa "github.com/molecula/featurebase/v3" + "github.com/molecula/featurebase/v3/ingest" + "github.com/molecula/featurebase/v3/test" "github.com/pkg/errors" ) diff --git a/internal/clustertests/cluster_test.go b/internal/clustertests/cluster_test.go index 79d067ad4..c6f4b0c3b 100644 --- a/internal/clustertests/cluster_test.go +++ b/internal/clustertests/cluster_test.go @@ -11,9 +11,9 @@ import ( "testing" "time" - pilosa "github.com/molecula/featurebase/v2" - "github.com/molecula/featurebase/v2/disco" - picli "github.com/molecula/featurebase/v2/http" + pilosa "github.com/molecula/featurebase/v3" + "github.com/molecula/featurebase/v3/disco" + picli "github.com/molecula/featurebase/v3/http" ) func TestClusterStuff(t *testing.T) { diff --git a/internal/clustertests/docker-compose.yml b/internal/clustertests/docker-compose.yml index 46143a3f6..af74a4d30 100644 --- a/internal/clustertests/docker-compose.yml +++ b/internal/clustertests/docker-compose.yml @@ -75,6 +75,6 @@ services: volumes: - /var/run/docker.sock:/var/run/docker.sock command: - - "cd /go/src/github.com/molecula/featurebase/ && go test -mod=vendor -v -count=1 github.com/molecula/featurebase/v2/internal/clustertests" + - "cd /go/src/github.com/molecula/featurebase/ && go test -mod=vendor -v -count=1 github.com/molecula/featurebase/v3/internal/clustertests" networks: pilosanet: diff --git a/internal/clustertests/pause_node_test.go b/internal/clustertests/pause_node_test.go index 256078a90..d6c3863a8 100644 --- a/internal/clustertests/pause_node_test.go +++ b/internal/clustertests/pause_node_test.go @@ -14,12 +14,12 @@ import ( "testing" "time" - pilosa "github.com/molecula/featurebase/v2" - boltdb "github.com/molecula/featurebase/v2/boltdb" - "github.com/molecula/featurebase/v2/disco" - "github.com/molecula/featurebase/v2/http" - "github.com/molecula/featurebase/v2/net" - "github.com/molecula/featurebase/v2/topology" + pilosa "github.com/molecula/featurebase/v3" + boltdb "github.com/molecula/featurebase/v3/boltdb" + "github.com/molecula/featurebase/v3/disco" + "github.com/molecula/featurebase/v3/http" + "github.com/molecula/featurebase/v3/net" + "github.com/molecula/featurebase/v3/topology" "github.com/pkg/errors" ) diff --git a/internal/test/querygenerator.go b/internal/test/querygenerator.go index f85811ed7..2be0e4874 100644 --- a/internal/test/querygenerator.go +++ b/internal/test/querygenerator.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - "github.com/molecula/featurebase/v2/pql" + "github.com/molecula/featurebase/v3/pql" ) type Args map[string]interface{} diff --git a/internal/test/querygenerator_test.go b/internal/test/querygenerator_test.go index 766e62a80..9b62586a3 100644 --- a/internal/test/querygenerator_test.go +++ b/internal/test/querygenerator_test.go @@ -4,7 +4,7 @@ package test import ( "testing" - "github.com/molecula/featurebase/v2/pql" + "github.com/molecula/featurebase/v3/pql" ) func TestPQL_Generator(t *testing.T) { diff --git a/iterator.go b/iterator.go index b37c44062..0364ae28e 100644 --- a/iterator.go +++ b/iterator.go @@ -4,7 +4,7 @@ package pilosa import ( "fmt" - "github.com/molecula/featurebase/v2/roaring" + "github.com/molecula/featurebase/v3/roaring" ) // iterator is an interface for looping over row/column pairs. diff --git a/logger/filewriter_test.go b/logger/filewriter_test.go index df7501e5c..9d493cce0 100644 --- a/logger/filewriter_test.go +++ b/logger/filewriter_test.go @@ -30,7 +30,7 @@ import ( "os" "testing" - "github.com/molecula/featurebase/v2/testhook" + "github.com/molecula/featurebase/v3/testhook" ) // TestReopenAppend -- make sure we always append to an existing file diff --git a/main_test.go b/main_test.go index 983b234ee..6919a82ae 100644 --- a/main_test.go +++ b/main_test.go @@ -9,7 +9,7 @@ import ( "net/http" _ "net/http/pprof" - "github.com/molecula/featurebase/v2/testhook" + "github.com/molecula/featurebase/v3/testhook" ) func TestMain(m *testing.M) { diff --git a/mmap_test.go b/mmap_test.go index 669f8caf9..ef7513b4a 100644 --- a/mmap_test.go +++ b/mmap_test.go @@ -7,8 +7,8 @@ import ( "runtime" "testing" - "github.com/molecula/featurebase/v2/logger" - "github.com/molecula/featurebase/v2/syswrap" + "github.com/molecula/featurebase/v3/logger" + "github.com/molecula/featurebase/v3/syswrap" ) type cv struct { diff --git a/mock/translator.go b/mock/translator.go index 74ed4c42f..fe3583272 100644 --- a/mock/translator.go +++ b/mock/translator.go @@ -5,7 +5,7 @@ import ( "context" "io" - "github.com/molecula/featurebase/v2" + "github.com/molecula/featurebase/v3" ) type TranslateStore struct { diff --git a/pg/pgtest/handler.go b/pg/pgtest/handler.go index 592485547..4ee29e505 100644 --- a/pg/pgtest/handler.go +++ b/pg/pgtest/handler.go @@ -7,7 +7,7 @@ import ( "fmt" "strings" - "github.com/molecula/featurebase/v2/pg" + "github.com/molecula/featurebase/v3/pg" ) // HandlerFunc implements a postgres query handler with a function. diff --git a/pg/pgtest/server.go b/pg/pgtest/server.go index 95e11a86c..07df564bc 100644 --- a/pg/pgtest/server.go +++ b/pg/pgtest/server.go @@ -7,7 +7,7 @@ import ( "net" "testing" - "github.com/molecula/featurebase/v2/pg" + "github.com/molecula/featurebase/v3/pg" "github.com/pkg/errors" "golang.org/x/sync/errgroup" ) diff --git a/pg/pgtest/tls.go b/pg/pgtest/tls.go index c188c7d4d..0779e3bc7 100644 --- a/pg/pgtest/tls.go +++ b/pg/pgtest/tls.go @@ -12,7 +12,7 @@ import ( "math/big" "time" - "github.com/molecula/featurebase/v2/pg" + "github.com/molecula/featurebase/v3/pg" "github.com/pkg/errors" ) diff --git a/pg/protocol.go b/pg/protocol.go index 8a0044323..54868f65e 100644 --- a/pg/protocol.go +++ b/pg/protocol.go @@ -17,8 +17,8 @@ import ( "sync" "time" - "github.com/molecula/featurebase/v2/pg/message" - "github.com/molecula/featurebase/v2/sql" + "github.com/molecula/featurebase/v3/pg/message" + "github.com/molecula/featurebase/v3/sql" "github.com/pkg/errors" "vitess.io/vitess/go/vt/sqlparser" ) diff --git a/pg/query.go b/pg/query.go index 773562929..ff4f303d7 100644 --- a/pg/query.go +++ b/pg/query.go @@ -5,7 +5,7 @@ import ( "context" "fmt" - "github.com/molecula/featurebase/v2/pg/message" + "github.com/molecula/featurebase/v3/pg/message" "github.com/pkg/errors" ) diff --git a/pg/server.go b/pg/server.go index 8e6841a32..e6bf0e658 100644 --- a/pg/server.go +++ b/pg/server.go @@ -8,7 +8,7 @@ import ( "sync" "time" - "github.com/molecula/featurebase/v2/logger" + "github.com/molecula/featurebase/v3/logger" ) // Server is a postgres wire protocol server. diff --git a/pg/server_test.go b/pg/server_test.go index a7b719f2f..b2066bbeb 100644 --- a/pg/server_test.go +++ b/pg/server_test.go @@ -15,9 +15,9 @@ import ( "time" "github.com/lib/pq" - "github.com/molecula/featurebase/v2/logger" - "github.com/molecula/featurebase/v2/pg" - "github.com/molecula/featurebase/v2/pg/pgtest" + "github.com/molecula/featurebase/v3/logger" + "github.com/molecula/featurebase/v3/pg" + "github.com/molecula/featurebase/v3/pg/pgtest" ) // TestStartupTimeout tests that an incoming connection that does nothing times out and gets closed. diff --git a/pg/type.go b/pg/type.go index 9fa0451f8..52275a1b6 100644 --- a/pg/type.go +++ b/pg/type.go @@ -1,7 +1,7 @@ // Copyright 2021 Molecula Corp. All rights reserved. package pg -import "github.com/molecula/featurebase/v2/pg/message" +import "github.com/molecula/featurebase/v3/pg/message" // Type represents a postgres type. type Type struct { diff --git a/pilosa.go b/pilosa.go index 1757f7de3..354c435ff 100644 --- a/pilosa.go +++ b/pilosa.go @@ -6,9 +6,9 @@ import ( "regexp" "time" - "github.com/molecula/featurebase/v2/disco" - pnet "github.com/molecula/featurebase/v2/net" - "github.com/molecula/featurebase/v2/storage" + "github.com/molecula/featurebase/v3/disco" + pnet "github.com/molecula/featurebase/v3/net" + "github.com/molecula/featurebase/v3/storage" "github.com/pkg/errors" ) diff --git a/pilosa_internal_test.go b/pilosa_internal_test.go index d2891199e..ca68e640f 100644 --- a/pilosa_internal_test.go +++ b/pilosa_internal_test.go @@ -6,8 +6,8 @@ import ( "reflect" "testing" - "github.com/molecula/featurebase/v2/roaring" - . "github.com/molecula/featurebase/v2/vprint" // nolint:staticcheck + "github.com/molecula/featurebase/v3/roaring" + . "github.com/molecula/featurebase/v3/vprint" // nolint:staticcheck ) func TestValidateName(t *testing.T) { diff --git a/pilosa_test.go b/pilosa_test.go index a9fd29826..8f057355f 100644 --- a/pilosa_test.go +++ b/pilosa_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" - "github.com/molecula/featurebase/v2" - _ "github.com/molecula/featurebase/v2/test" + "github.com/molecula/featurebase/v3" + _ "github.com/molecula/featurebase/v3/test" ) func TestAddressWithDefaults(t *testing.T) { diff --git a/planner.go b/planner.go index 6ecedb179..91541f20c 100644 --- a/planner.go +++ b/planner.go @@ -8,8 +8,8 @@ import ( "strconv" "strings" - "github.com/molecula/featurebase/v2/pql" - "github.com/molecula/featurebase/v2/sql2" + "github.com/molecula/featurebase/v3/pql" + "github.com/molecula/featurebase/v3/sql2" ) type Planner struct { diff --git a/planner_test.go b/planner_test.go index 668e8a9c5..edcbbaefc 100644 --- a/planner_test.go +++ b/planner_test.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/molecula/featurebase/v2" - "github.com/molecula/featurebase/v2/test" + "github.com/molecula/featurebase/v3" + "github.com/molecula/featurebase/v3/test" ) func TestPlanner_Count(t *testing.T) { diff --git a/pprof.go b/pprof.go index 9d601da6a..07f87b1b2 100644 --- a/pprof.go +++ b/pprof.go @@ -10,8 +10,8 @@ import ( _ "net/http/pprof" // Imported for its side-effect of registering pprof endpoints with the server. - "github.com/molecula/featurebase/v2/storage" - "github.com/molecula/featurebase/v2/vprint" + "github.com/molecula/featurebase/v3/storage" + "github.com/molecula/featurebase/v3/vprint" ) // CPUProfileForDur (where "Dur" is short for "Duration"), is used for diff --git a/pql/ast_test.go b/pql/ast_test.go index 3d7153bfb..b095fe878 100644 --- a/pql/ast_test.go +++ b/pql/ast_test.go @@ -4,7 +4,7 @@ package pql_test import ( "testing" - "github.com/molecula/featurebase/v2/pql" + "github.com/molecula/featurebase/v3/pql" ) // Ensure call can be converted into a string. diff --git a/pql/decimal_test.go b/pql/decimal_test.go index e5efca481..ea24685ff 100644 --- a/pql/decimal_test.go +++ b/pql/decimal_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/molecula/featurebase/v2/pql" + "github.com/molecula/featurebase/v3/pql" ) // Ensure call can be converted into a string. diff --git a/pql/parser_test.go b/pql/parser_test.go index fad097bf1..3cfa612a8 100644 --- a/pql/parser_test.go +++ b/pql/parser_test.go @@ -6,8 +6,8 @@ import ( "strings" "testing" - "github.com/molecula/featurebase/v2/pql" - _ "github.com/molecula/featurebase/v2/test" + "github.com/molecula/featurebase/v3/pql" + _ "github.com/molecula/featurebase/v3/test" ) // Ensure the parser can parse PQL. diff --git a/prometheus/prometheus.go b/prometheus/prometheus.go index 1bd92af8a..79703cf85 100644 --- a/prometheus/prometheus.go +++ b/prometheus/prometheus.go @@ -7,8 +7,8 @@ import ( "sync" "time" - "github.com/molecula/featurebase/v2/logger" - "github.com/molecula/featurebase/v2/stats" + "github.com/molecula/featurebase/v3/logger" + "github.com/molecula/featurebase/v3/stats" "github.com/prometheus/client_golang/prometheus" ) diff --git a/prometheus/prometheus_test.go b/prometheus/prometheus_test.go index 07ee4c1ac..1dd64ca9d 100644 --- a/prometheus/prometheus_test.go +++ b/prometheus/prometheus_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - pilosaPrometheus "github.com/molecula/featurebase/v2/prometheus" + pilosaPrometheus "github.com/molecula/featurebase/v3/prometheus" "github.com/prometheus/client_golang/prometheus" io_prometheus_client "github.com/prometheus/client_model/go" ) diff --git a/proto/vdsm/vdsm.pb.go b/proto/vdsm/vdsm.pb.go index 62e9cc00c..6390f80dd 100644 --- a/proto/vdsm/vdsm.pb.go +++ b/proto/vdsm/vdsm.pb.go @@ -7,7 +7,7 @@ import ( context "context" fmt "fmt" proto "github.com/golang/protobuf/proto" - proto1 "github.com/molecula/featurebase/v2/proto" + proto1 "github.com/molecula/featurebase/v3/proto" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/rbf.go b/rbf.go index 298c717d7..b79b2eb03 100644 --- a/rbf.go +++ b/rbf.go @@ -9,13 +9,13 @@ import ( "strings" "sync" - "github.com/molecula/featurebase/v2/rbf" - rbfcfg "github.com/molecula/featurebase/v2/rbf/cfg" - "github.com/molecula/featurebase/v2/roaring" - txkey "github.com/molecula/featurebase/v2/short_txkey" - "github.com/molecula/featurebase/v2/storage" + "github.com/molecula/featurebase/v3/rbf" + rbfcfg "github.com/molecula/featurebase/v3/rbf/cfg" + "github.com/molecula/featurebase/v3/roaring" + txkey "github.com/molecula/featurebase/v3/short_txkey" + "github.com/molecula/featurebase/v3/storage" - "github.com/molecula/featurebase/v2/vprint" + "github.com/molecula/featurebase/v3/vprint" "github.com/pkg/errors" ) diff --git a/rbf/array.go b/rbf/array.go index d8d008a32..4e2b3b7e8 100644 --- a/rbf/array.go +++ b/rbf/array.go @@ -4,7 +4,7 @@ package rbf import ( "unsafe" - "github.com/molecula/featurebase/v2/roaring" + "github.com/molecula/featurebase/v3/roaring" ) // toArray16 converts a byte slice into a slice of uint16 values using unsafe. diff --git a/rbf/cfg/cfg.go b/rbf/cfg/cfg.go index 671c6fe43..184775e33 100644 --- a/rbf/cfg/cfg.go +++ b/rbf/cfg/cfg.go @@ -2,7 +2,7 @@ package cfg import ( - "github.com/molecula/featurebase/v2/logger" + "github.com/molecula/featurebase/v3/logger" "github.com/spf13/pflag" ) diff --git a/rbf/cursor.go b/rbf/cursor.go index 22d4427e6..41e9e4d4f 100644 --- a/rbf/cursor.go +++ b/rbf/cursor.go @@ -8,7 +8,7 @@ import ( "sort" "unsafe" - "github.com/molecula/featurebase/v2/roaring" + "github.com/molecula/featurebase/v3/roaring" "github.com/pkg/errors" ) diff --git a/rbf/cursor_internal_test.go b/rbf/cursor_internal_test.go index 8f2bf6a1f..b97b80bd7 100644 --- a/rbf/cursor_internal_test.go +++ b/rbf/cursor_internal_test.go @@ -6,8 +6,8 @@ import ( "fmt" "testing" - "github.com/molecula/featurebase/v2/roaring" - . "github.com/molecula/featurebase/v2/vprint" // nolint:staticcheck + "github.com/molecula/featurebase/v3/roaring" + . "github.com/molecula/featurebase/v3/vprint" // nolint:staticcheck ) func getRoaringIter(bitsToSet ...uint64) roaring.RoaringIterator { diff --git a/rbf/cursor_test.go b/rbf/cursor_test.go index 940798c04..9c5603a3a 100644 --- a/rbf/cursor_test.go +++ b/rbf/cursor_test.go @@ -11,8 +11,8 @@ import ( "strings" "testing" - "github.com/molecula/featurebase/v2/rbf" - "github.com/molecula/featurebase/v2/roaring" + "github.com/molecula/featurebase/v3/rbf" + "github.com/molecula/featurebase/v3/roaring" ) func TestCursor_FirstNext(t *testing.T) { diff --git a/rbf/cursorx.go b/rbf/cursorx.go index 2b6226dde..fafdbf512 100644 --- a/rbf/cursorx.go +++ b/rbf/cursorx.go @@ -8,7 +8,7 @@ import ( "math" "os" - "github.com/molecula/featurebase/v2/roaring" + "github.com/molecula/featurebase/v3/roaring" "github.com/pkg/errors" ) diff --git a/rbf/db.go b/rbf/db.go index f2eeceea3..a6c9959bb 100644 --- a/rbf/db.go +++ b/rbf/db.go @@ -14,9 +14,9 @@ import ( "unsafe" "github.com/benbjohnson/immutable" - "github.com/molecula/featurebase/v2/logger" - rbfcfg "github.com/molecula/featurebase/v2/rbf/cfg" - "github.com/molecula/featurebase/v2/syswrap" + "github.com/molecula/featurebase/v3/logger" + rbfcfg "github.com/molecula/featurebase/v3/rbf/cfg" + "github.com/molecula/featurebase/v3/syswrap" ) var ( diff --git a/rbf/db_test.go b/rbf/db_test.go index 65d84cff6..3e6bdd1b1 100644 --- a/rbf/db_test.go +++ b/rbf/db_test.go @@ -15,8 +15,8 @@ import ( _ "net/http/pprof" "github.com/felixge/fgprof" - "github.com/molecula/featurebase/v2/rbf" - rbfcfg "github.com/molecula/featurebase/v2/rbf/cfg" + "github.com/molecula/featurebase/v3/rbf" + rbfcfg "github.com/molecula/featurebase/v3/rbf/cfg" "golang.org/x/sync/errgroup" ) diff --git a/rbf/ingest_test.go b/rbf/ingest_test.go index e4a7532af..d9b7be2e6 100644 --- a/rbf/ingest_test.go +++ b/rbf/ingest_test.go @@ -12,12 +12,12 @@ import ( //"time" - "github.com/molecula/featurebase/v2/rbf/cfg" - "github.com/molecula/featurebase/v2/roaring" - "github.com/molecula/featurebase/v2/testhook" + "github.com/molecula/featurebase/v3/rbf/cfg" + "github.com/molecula/featurebase/v3/roaring" + "github.com/molecula/featurebase/v3/testhook" - txkey "github.com/molecula/featurebase/v2/short_txkey" - . "github.com/molecula/featurebase/v2/vprint" // nolint:staticcheck + txkey "github.com/molecula/featurebase/v3/short_txkey" + . "github.com/molecula/featurebase/v3/vprint" // nolint:staticcheck ) func rbfName(index, field, view string, shard uint64) string { diff --git a/rbf/rbf.go b/rbf/rbf.go index 4a66ba309..ac156a2c7 100644 --- a/rbf/rbf.go +++ b/rbf/rbf.go @@ -15,9 +15,9 @@ import ( "unsafe" "github.com/benbjohnson/immutable" - "github.com/molecula/featurebase/v2/roaring" - "github.com/molecula/featurebase/v2/shardwidth" - "github.com/molecula/featurebase/v2/vprint" + "github.com/molecula/featurebase/v3/roaring" + "github.com/molecula/featurebase/v3/shardwidth" + "github.com/molecula/featurebase/v3/vprint" ) const ( diff --git a/rbf/rbf_test.go b/rbf/rbf_test.go index 17605a6fc..3ff80350b 100644 --- a/rbf/rbf_test.go +++ b/rbf/rbf_test.go @@ -11,10 +11,10 @@ import ( "sort" "testing" - "github.com/molecula/featurebase/v2/logger" - "github.com/molecula/featurebase/v2/rbf" - rbfcfg "github.com/molecula/featurebase/v2/rbf/cfg" - "github.com/molecula/featurebase/v2/testhook" + "github.com/molecula/featurebase/v3/logger" + "github.com/molecula/featurebase/v3/rbf" + rbfcfg "github.com/molecula/featurebase/v3/rbf/cfg" + "github.com/molecula/featurebase/v3/testhook" ) var quickCheckN *int = flag.Int("quickchecks", 10, "The number of iterations for each quickcheck") diff --git a/rbf/tx.go b/rbf/tx.go index 4fa8f441e..17647caa3 100644 --- a/rbf/tx.go +++ b/rbf/tx.go @@ -11,9 +11,9 @@ import ( "sync" "github.com/benbjohnson/immutable" - "github.com/molecula/featurebase/v2/roaring" - txkey "github.com/molecula/featurebase/v2/short_txkey" - "github.com/molecula/featurebase/v2/vprint" + "github.com/molecula/featurebase/v3/roaring" + txkey "github.com/molecula/featurebase/v3/short_txkey" + "github.com/molecula/featurebase/v3/vprint" ) var _ = txkey.ToString diff --git a/rbf/tx_test.go b/rbf/tx_test.go index 6f98a0fb0..e9e493afc 100644 --- a/rbf/tx_test.go +++ b/rbf/tx_test.go @@ -12,8 +12,8 @@ import ( "testing" "time" - "github.com/molecula/featurebase/v2/rbf" - "github.com/molecula/featurebase/v2/roaring" + "github.com/molecula/featurebase/v3/rbf" + "github.com/molecula/featurebase/v3/roaring" ) func TestTx_CommitRollback(t *testing.T) { diff --git a/rbf/util.go b/rbf/util.go index 626b97738..4b29b2a2e 100644 --- a/rbf/util.go +++ b/rbf/util.go @@ -5,8 +5,8 @@ import ( "fmt" "strings" - txkey "github.com/molecula/featurebase/v2/short_txkey" - "github.com/molecula/featurebase/v2/vprint" + txkey "github.com/molecula/featurebase/v3/short_txkey" + "github.com/molecula/featurebase/v3/vprint" ) // we don't currently use dumpAllPages but it's tricky enough to get right diff --git a/rbf/util_test.go b/rbf/util_test.go index e13cc6acf..4a8177aff 100644 --- a/rbf/util_test.go +++ b/rbf/util_test.go @@ -7,9 +7,9 @@ import ( "os" "testing" - rbfcfg "github.com/molecula/featurebase/v2/rbf/cfg" - "github.com/molecula/featurebase/v2/roaring" - "github.com/molecula/featurebase/v2/testhook" + rbfcfg "github.com/molecula/featurebase/v3/rbf/cfg" + "github.com/molecula/featurebase/v3/roaring" + "github.com/molecula/featurebase/v3/testhook" ) // util_test adds reusable utilities for testing. diff --git a/roaring/benchpretty/main.go b/roaring/benchpretty/main.go index 20c790f6c..229eb39df 100644 --- a/roaring/benchpretty/main.go +++ b/roaring/benchpretty/main.go @@ -11,7 +11,7 @@ import ( "strconv" "strings" - "github.com/molecula/featurebase/v2/roaring" + "github.com/molecula/featurebase/v3/roaring" ) var pattern = regexp.MustCompile(`^BenchmarkCtOps/([^/]+)/([^/]+)/([^-]+)-([0-9]+)\s*([0-9]+)\s*([0-9.]+) ns/op`) diff --git a/roaring/filter.go b/roaring/filter.go index 600de65da..15a4a2f90 100644 --- a/roaring/filter.go +++ b/roaring/filter.go @@ -5,7 +5,7 @@ import ( "errors" "fmt" - "github.com/molecula/featurebase/v2/shardwidth" + "github.com/molecula/featurebase/v3/shardwidth" ) // We want BitmapScanner to be accessible from both the pilosa package, and diff --git a/roaring/filter_internal_test.go b/roaring/filter_internal_test.go index c390741d6..1e9a5d778 100644 --- a/roaring/filter_internal_test.go +++ b/roaring/filter_internal_test.go @@ -9,7 +9,7 @@ import ( "sync" "testing" - "github.com/molecula/featurebase/v2/shardwidth" + "github.com/molecula/featurebase/v3/shardwidth" ) // For each container key i from 1 to (shard width in containers), we diff --git a/roaring/printutil.go b/roaring/printutil.go index bffd3b0b0..6cebb192d 100644 --- a/roaring/printutil.go +++ b/roaring/printutil.go @@ -5,7 +5,7 @@ import ( "fmt" "math" - "github.com/molecula/featurebase/v2/shardwidth" + "github.com/molecula/featurebase/v3/shardwidth" ) func (b *Bitmap) String() (r string) { diff --git a/roaring/printutil_test.go b/roaring/printutil_test.go index 44cbb6acc..27d2cbb58 100644 --- a/roaring/printutil_test.go +++ b/roaring/printutil_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/molecula/featurebase/v2/shardwidth" + "github.com/molecula/featurebase/v3/shardwidth" ) func TestAsContainerMatrixString(t *testing.T) { diff --git a/roaring/roaring_internal_test.go b/roaring/roaring_internal_test.go index ba59b7ce4..7fc0e5bb1 100644 --- a/roaring/roaring_internal_test.go +++ b/roaring/roaring_internal_test.go @@ -12,7 +12,7 @@ import ( "strings" "testing" - "github.com/molecula/featurebase/v2/generator" + "github.com/molecula/featurebase/v3/generator" "github.com/pkg/errors" ) diff --git a/roaring/roaring_stats.go b/roaring/roaring_stats.go index eac3909f1..b0218bfcc 100644 --- a/roaring/roaring_stats.go +++ b/roaring/roaring_stats.go @@ -5,7 +5,7 @@ package roaring import ( - "github.com/molecula/featurebase/v2/stats" + "github.com/molecula/featurebase/v3/stats" ) var statsEv = stats.NewExpvarStatsClient() diff --git a/roaring/roaring_test.go b/roaring/roaring_test.go index 86e9ea516..508505b38 100644 --- a/roaring/roaring_test.go +++ b/roaring/roaring_test.go @@ -11,10 +11,10 @@ import ( "testing/quick" "time" - "github.com/molecula/featurebase/v2" - "github.com/molecula/featurebase/v2/generator" - "github.com/molecula/featurebase/v2/roaring" - _ "github.com/molecula/featurebase/v2/test" + "github.com/molecula/featurebase/v3" + "github.com/molecula/featurebase/v3/generator" + "github.com/molecula/featurebase/v3/roaring" + _ "github.com/molecula/featurebase/v3/test" ) func TestContainerCount(t *testing.T) { diff --git a/row.go b/row.go index 60c14566f..b310d2ad0 100644 --- a/row.go +++ b/row.go @@ -5,8 +5,8 @@ import ( "encoding/json" "sort" - pb "github.com/molecula/featurebase/v2/proto" - "github.com/molecula/featurebase/v2/roaring" + pb "github.com/molecula/featurebase/v3/proto" + "github.com/molecula/featurebase/v3/roaring" "github.com/pkg/errors" ) diff --git a/row_test.go b/row_test.go index c4199a452..076026313 100644 --- a/row_test.go +++ b/row_test.go @@ -6,7 +6,7 @@ import ( "reflect" "testing" - "github.com/molecula/featurebase/v2" + "github.com/molecula/featurebase/v3" ) // Ensure a row can be merged diff --git a/rrtx.go b/rrtx.go index be55f1893..0411e9c80 100644 --- a/rrtx.go +++ b/rrtx.go @@ -11,11 +11,11 @@ import ( "sync" "sync/atomic" - "github.com/molecula/featurebase/v2/roaring" - txkey "github.com/molecula/featurebase/v2/short_txkey" - "github.com/molecula/featurebase/v2/storage" + "github.com/molecula/featurebase/v3/roaring" + txkey "github.com/molecula/featurebase/v3/short_txkey" + "github.com/molecula/featurebase/v3/storage" - "github.com/molecula/featurebase/v2/vprint" + "github.com/molecula/featurebase/v3/vprint" "github.com/pkg/errors" ) diff --git a/rrtx_internal_test.go b/rrtx_internal_test.go index eb3907cd1..64c996bc4 100644 --- a/rrtx_internal_test.go +++ b/rrtx_internal_test.go @@ -4,7 +4,7 @@ package pilosa import ( "testing" - . "github.com/molecula/featurebase/v2/vprint" // nolint:staticcheck + . "github.com/molecula/featurebase/v3/vprint" // nolint:staticcheck ) func TestRoaring_HasData(t *testing.T) { diff --git a/server.go b/server.go index 23e760e19..076142a9a 100644 --- a/server.go +++ b/server.go @@ -17,15 +17,15 @@ import ( uuid "github.com/satori/go.uuid" - "github.com/molecula/featurebase/v2/disco" - "github.com/molecula/featurebase/v2/logger" - pnet "github.com/molecula/featurebase/v2/net" - rbfcfg "github.com/molecula/featurebase/v2/rbf/cfg" - "github.com/molecula/featurebase/v2/roaring" - "github.com/molecula/featurebase/v2/sql2" - "github.com/molecula/featurebase/v2/stats" - "github.com/molecula/featurebase/v2/storage" - "github.com/molecula/featurebase/v2/topology" + "github.com/molecula/featurebase/v3/disco" + "github.com/molecula/featurebase/v3/logger" + pnet "github.com/molecula/featurebase/v3/net" + rbfcfg "github.com/molecula/featurebase/v3/rbf/cfg" + "github.com/molecula/featurebase/v3/roaring" + "github.com/molecula/featurebase/v3/sql2" + "github.com/molecula/featurebase/v3/stats" + "github.com/molecula/featurebase/v3/storage" + "github.com/molecula/featurebase/v3/topology" "github.com/pkg/errors" "golang.org/x/sync/errgroup" diff --git a/server/cluster_test.go b/server/cluster_test.go index 07ab7ea04..1f021bdf0 100644 --- a/server/cluster_test.go +++ b/server/cluster_test.go @@ -12,10 +12,10 @@ import ( "testing" "time" - "github.com/molecula/featurebase/v2" - "github.com/molecula/featurebase/v2/disco" - "github.com/molecula/featurebase/v2/server" - "github.com/molecula/featurebase/v2/test" + "github.com/molecula/featurebase/v3" + "github.com/molecula/featurebase/v3/disco" + "github.com/molecula/featurebase/v3/server" + "github.com/molecula/featurebase/v3/test" ) // Ensure program can send/receive broadcast messages. diff --git a/server/config.go b/server/config.go index fd319aa6a..8c6d4600b 100644 --- a/server/config.go +++ b/server/config.go @@ -15,11 +15,11 @@ import ( "strings" "time" - "github.com/molecula/featurebase/v2/authz" - petcd "github.com/molecula/featurebase/v2/etcd" - rbfcfg "github.com/molecula/featurebase/v2/rbf/cfg" - "github.com/molecula/featurebase/v2/storage" - "github.com/molecula/featurebase/v2/toml" + "github.com/molecula/featurebase/v3/authz" + petcd "github.com/molecula/featurebase/v3/etcd" + rbfcfg "github.com/molecula/featurebase/v3/rbf/cfg" + "github.com/molecula/featurebase/v3/storage" + "github.com/molecula/featurebase/v3/toml" "github.com/pkg/errors" ) diff --git a/server/config_test.go b/server/config_test.go index ce336ba59..77490d451 100644 --- a/server/config_test.go +++ b/server/config_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - "github.com/molecula/featurebase/v2/server" - "github.com/molecula/featurebase/v2/toml" + "github.com/molecula/featurebase/v3/server" + "github.com/molecula/featurebase/v3/toml" ) func Test_ValidateConfig(t *testing.T) { diff --git a/server/grpc.go b/server/grpc.go index 4fc8fd3bd..0fff11427 100644 --- a/server/grpc.go +++ b/server/grpc.go @@ -13,15 +13,15 @@ import ( "time" "github.com/improbable-eng/grpc-web/go/grpcweb" - pilosa "github.com/molecula/featurebase/v2" - "github.com/molecula/featurebase/v2/authn" - "github.com/molecula/featurebase/v2/authz" - "github.com/molecula/featurebase/v2/logger" - "github.com/molecula/featurebase/v2/pql" - pb "github.com/molecula/featurebase/v2/proto" - vdsm_pb "github.com/molecula/featurebase/v2/proto/vdsm" - "github.com/molecula/featurebase/v2/sql" - "github.com/molecula/featurebase/v2/stats" + pilosa "github.com/molecula/featurebase/v3" + "github.com/molecula/featurebase/v3/authn" + "github.com/molecula/featurebase/v3/authz" + "github.com/molecula/featurebase/v3/logger" + "github.com/molecula/featurebase/v3/pql" + pb "github.com/molecula/featurebase/v3/proto" + vdsm_pb "github.com/molecula/featurebase/v3/proto/vdsm" + "github.com/molecula/featurebase/v3/sql" + "github.com/molecula/featurebase/v3/stats" "github.com/pkg/errors" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/server/grpc_test.go b/server/grpc_test.go index 3508d03ab..55c9e65c1 100644 --- a/server/grpc_test.go +++ b/server/grpc_test.go @@ -15,15 +15,15 @@ import ( "time" "github.com/golang-jwt/jwt" - pilosa "github.com/molecula/featurebase/v2" - "github.com/molecula/featurebase/v2/authn" - "github.com/molecula/featurebase/v2/authz" - "github.com/molecula/featurebase/v2/logger" - "github.com/molecula/featurebase/v2/pql" - pb "github.com/molecula/featurebase/v2/proto" - "github.com/molecula/featurebase/v2/server" - "github.com/molecula/featurebase/v2/sql" - "github.com/molecula/featurebase/v2/test" + pilosa "github.com/molecula/featurebase/v3" + "github.com/molecula/featurebase/v3/authn" + "github.com/molecula/featurebase/v3/authz" + "github.com/molecula/featurebase/v3/logger" + "github.com/molecula/featurebase/v3/pql" + pb "github.com/molecula/featurebase/v3/proto" + "github.com/molecula/featurebase/v3/server" + "github.com/molecula/featurebase/v3/sql" + "github.com/molecula/featurebase/v3/test" "github.com/pkg/errors" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/server/handler_test.go b/server/handler_test.go index 1e1105ff4..48dddde78 100644 --- a/server/handler_test.go +++ b/server/handler_test.go @@ -18,13 +18,13 @@ import ( "testing" "time" - pilosa "github.com/molecula/featurebase/v2" - "github.com/molecula/featurebase/v2/boltdb" - "github.com/molecula/featurebase/v2/encoding/proto" - "github.com/molecula/featurebase/v2/http" - "github.com/molecula/featurebase/v2/pql" - "github.com/molecula/featurebase/v2/server" - "github.com/molecula/featurebase/v2/test" + pilosa "github.com/molecula/featurebase/v3" + "github.com/molecula/featurebase/v3/boltdb" + "github.com/molecula/featurebase/v3/encoding/proto" + "github.com/molecula/featurebase/v3/http" + "github.com/molecula/featurebase/v3/pql" + "github.com/molecula/featurebase/v3/server" + "github.com/molecula/featurebase/v3/test" ) func TestHandler_PostSchemaCluster(t *testing.T) { diff --git a/server/pg.go b/server/pg.go index 42b95d987..87b1f8fa8 100644 --- a/server/pg.go +++ b/server/pg.go @@ -12,14 +12,14 @@ import ( "strings" "time" - pilosa "github.com/molecula/featurebase/v2" - "github.com/molecula/featurebase/v2/logger" - "github.com/molecula/featurebase/v2/pg" - "github.com/molecula/featurebase/v2/sql2" + pilosa "github.com/molecula/featurebase/v3" + "github.com/molecula/featurebase/v3/logger" + "github.com/molecula/featurebase/v3/pg" + "github.com/molecula/featurebase/v3/sql2" - //"github.com/molecula/featurebase/v2/pg" - "github.com/molecula/featurebase/v2/pql" - pb "github.com/molecula/featurebase/v2/proto" + //"github.com/molecula/featurebase/v3/pg" + "github.com/molecula/featurebase/v3/pql" + pb "github.com/molecula/featurebase/v3/proto" "github.com/pkg/errors" "golang.org/x/sync/errgroup" diff --git a/server/pg_internal_test.go b/server/pg_internal_test.go index 83ed1780f..5c870b501 100644 --- a/server/pg_internal_test.go +++ b/server/pg_internal_test.go @@ -4,8 +4,8 @@ package server import ( "testing" - pilosa "github.com/molecula/featurebase/v2" - "github.com/molecula/featurebase/v2/pg" + pilosa "github.com/molecula/featurebase/v3" + "github.com/molecula/featurebase/v3/pg" ) // pg_internal_test.go tests unexported methods from server/pg.go diff --git a/server/pg_test.go b/server/pg_test.go index 8cfb21035..7250c6f7e 100644 --- a/server/pg_test.go +++ b/server/pg_test.go @@ -8,12 +8,12 @@ import ( "testing" "time" - pilosa "github.com/molecula/featurebase/v2" - "github.com/molecula/featurebase/v2/logger" - "github.com/molecula/featurebase/v2/pg" - "github.com/molecula/featurebase/v2/pg/pgtest" - "github.com/molecula/featurebase/v2/server" - "github.com/molecula/featurebase/v2/test" + pilosa "github.com/molecula/featurebase/v3" + "github.com/molecula/featurebase/v3/logger" + "github.com/molecula/featurebase/v3/pg" + "github.com/molecula/featurebase/v3/pg/pgtest" + "github.com/molecula/featurebase/v3/server" + "github.com/molecula/featurebase/v3/test" ) func TestPostgresHandler(t *testing.T) { diff --git a/server/server.go b/server/server.go index 0d38c8c78..8212f6816 100644 --- a/server/server.go +++ b/server/server.go @@ -28,23 +28,23 @@ import ( "golang.org/x/sync/errgroup" - pilosa "github.com/molecula/featurebase/v2" - "github.com/molecula/featurebase/v2/authn" - "github.com/molecula/featurebase/v2/authz" - "github.com/molecula/featurebase/v2/boltdb" - "github.com/molecula/featurebase/v2/encoding/proto" - petcd "github.com/molecula/featurebase/v2/etcd" - "github.com/molecula/featurebase/v2/gcnotify" - "github.com/molecula/featurebase/v2/gopsutil" - "github.com/molecula/featurebase/v2/http" - "github.com/molecula/featurebase/v2/logger" - pnet "github.com/molecula/featurebase/v2/net" - "github.com/molecula/featurebase/v2/prometheus" - "github.com/molecula/featurebase/v2/statik" - "github.com/molecula/featurebase/v2/stats" - "github.com/molecula/featurebase/v2/statsd" - "github.com/molecula/featurebase/v2/syswrap" - "github.com/molecula/featurebase/v2/testhook" + pilosa "github.com/molecula/featurebase/v3" + "github.com/molecula/featurebase/v3/authn" + "github.com/molecula/featurebase/v3/authz" + "github.com/molecula/featurebase/v3/boltdb" + "github.com/molecula/featurebase/v3/encoding/proto" + petcd "github.com/molecula/featurebase/v3/etcd" + "github.com/molecula/featurebase/v3/gcnotify" + "github.com/molecula/featurebase/v3/gopsutil" + "github.com/molecula/featurebase/v3/http" + "github.com/molecula/featurebase/v3/logger" + pnet "github.com/molecula/featurebase/v3/net" + "github.com/molecula/featurebase/v3/prometheus" + "github.com/molecula/featurebase/v3/statik" + "github.com/molecula/featurebase/v3/stats" + "github.com/molecula/featurebase/v3/statsd" + "github.com/molecula/featurebase/v3/syswrap" + "github.com/molecula/featurebase/v3/testhook" "github.com/pelletier/go-toml" "github.com/pkg/errors" ) diff --git a/server/server_test.go b/server/server_test.go index 551781ffb..3dfd92728 100644 --- a/server/server_test.go +++ b/server/server_test.go @@ -17,14 +17,14 @@ import ( "testing" "time" - pilosa "github.com/molecula/featurebase/v2" - "github.com/molecula/featurebase/v2/disco" - "github.com/molecula/featurebase/v2/http" - "github.com/molecula/featurebase/v2/pql" - "github.com/molecula/featurebase/v2/roaring" - "github.com/molecula/featurebase/v2/server" - "github.com/molecula/featurebase/v2/test" - "github.com/molecula/featurebase/v2/testhook" + pilosa "github.com/molecula/featurebase/v3" + "github.com/molecula/featurebase/v3/disco" + "github.com/molecula/featurebase/v3/http" + "github.com/molecula/featurebase/v3/pql" + "github.com/molecula/featurebase/v3/roaring" + "github.com/molecula/featurebase/v3/server" + "github.com/molecula/featurebase/v3/test" + "github.com/molecula/featurebase/v3/testhook" "github.com/pkg/errors" "github.com/stretchr/testify/require" "golang.org/x/sync/errgroup" diff --git a/server/sql.go b/server/sql.go index b936f89c6..6cf0a457a 100644 --- a/server/sql.go +++ b/server/sql.go @@ -4,10 +4,10 @@ package server import ( "context" - "github.com/molecula/featurebase/v2" - "github.com/molecula/featurebase/v2/logger" - pb "github.com/molecula/featurebase/v2/proto" - "github.com/molecula/featurebase/v2/sql" + "github.com/molecula/featurebase/v3" + "github.com/molecula/featurebase/v3/logger" + pb "github.com/molecula/featurebase/v3/proto" + "github.com/molecula/featurebase/v3/sql" "github.com/pkg/errors" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/server/tlsconfig.go b/server/tlsconfig.go index 82bed6693..4976fa6e5 100644 --- a/server/tlsconfig.go +++ b/server/tlsconfig.go @@ -42,7 +42,7 @@ import ( "sync" "syscall" - "github.com/molecula/featurebase/v2/logger" + "github.com/molecula/featurebase/v3/logger" "github.com/pkg/errors" ) diff --git a/server/trial.go b/server/trial.go index 057a786d1..eddc20b16 100644 --- a/server/trial.go +++ b/server/trial.go @@ -12,7 +12,7 @@ import ( "time" "github.com/beevik/ntp" - "github.com/molecula/featurebase/v2" + "github.com/molecula/featurebase/v3" ) // handleTrialDeadline checks to see if this is a trial version of Molecula that expires at some point. diff --git a/server_internal_test.go b/server_internal_test.go index 763f2dc6a..9859e950d 100644 --- a/server_internal_test.go +++ b/server_internal_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - "github.com/molecula/featurebase/v2/storage" - "github.com/molecula/featurebase/v2/testhook" + "github.com/molecula/featurebase/v3/storage" + "github.com/molecula/featurebase/v3/testhook" ) // Ensure the file handle count is working diff --git a/shardwidth/helper_test.go b/shardwidth/helper_test.go index 8966d5aad..458edb678 100644 --- a/shardwidth/helper_test.go +++ b/shardwidth/helper_test.go @@ -5,7 +5,7 @@ import ( "math/rand" "testing" - "github.com/molecula/featurebase/v2/shardwidth" + "github.com/molecula/featurebase/v3/shardwidth" ) type nextShardTestCase struct { diff --git a/snapshotqueue.go b/snapshotqueue.go index a33f90bce..ef0bda24c 100644 --- a/snapshotqueue.go +++ b/snapshotqueue.go @@ -11,8 +11,8 @@ import ( "sync/atomic" "time" - "github.com/molecula/featurebase/v2/logger" - "github.com/molecula/featurebase/v2/testhook" + "github.com/molecula/featurebase/v3/logger" + "github.com/molecula/featurebase/v3/testhook" "github.com/pkg/errors" ) diff --git a/sql/ddl.go b/sql/ddl.go index 9390e3c06..70d553304 100644 --- a/sql/ddl.go +++ b/sql/ddl.go @@ -5,8 +5,8 @@ import ( "context" "fmt" - "github.com/molecula/featurebase/v2" - pproto "github.com/molecula/featurebase/v2/proto" + "github.com/molecula/featurebase/v3" + pproto "github.com/molecula/featurebase/v3/proto" "github.com/pkg/errors" "vitess.io/vitess/go/vt/sqlparser" ) diff --git a/sql/extract.go b/sql/extract.go index 0165f5f40..73a7e795e 100644 --- a/sql/extract.go +++ b/sql/extract.go @@ -8,8 +8,8 @@ import ( "strings" "time" - "github.com/molecula/featurebase/v2" - "github.com/molecula/featurebase/v2/pql" + "github.com/molecula/featurebase/v3" + "github.com/molecula/featurebase/v3/pql" "github.com/pkg/errors" "vitess.io/vitess/go/vt/sqlparser" ) diff --git a/sql/handler_test.go b/sql/handler_test.go index 4f2e263bb..6eaba476f 100644 --- a/sql/handler_test.go +++ b/sql/handler_test.go @@ -5,8 +5,8 @@ import ( "context" "testing" - "github.com/molecula/featurebase/v2/sql" - "github.com/molecula/featurebase/v2/test" + "github.com/molecula/featurebase/v3/sql" + "github.com/molecula/featurebase/v3/test" ) func TestHandler(t *testing.T) { diff --git a/sql/mapper.go b/sql/mapper.go index 4e271bdbe..a8cec076b 100644 --- a/sql/mapper.go +++ b/sql/mapper.go @@ -4,7 +4,7 @@ package sql import ( "strings" - "github.com/molecula/featurebase/v2/logger" + "github.com/molecula/featurebase/v3/logger" "github.com/pkg/errors" "vitess.io/vitess/go/vt/sqlparser" ) diff --git a/sql/model.go b/sql/model.go index 5d87aa47a..2019814a9 100644 --- a/sql/model.go +++ b/sql/model.go @@ -4,7 +4,7 @@ package sql import ( "fmt" - "github.com/molecula/featurebase/v2" + "github.com/molecula/featurebase/v3" "github.com/pkg/errors" ) diff --git a/sql/reduce.go b/sql/reduce.go index a4cf4211d..8de56c1f0 100644 --- a/sql/reduce.go +++ b/sql/reduce.go @@ -4,9 +4,9 @@ package sql import ( "sort" - "github.com/molecula/featurebase/v2" - "github.com/molecula/featurebase/v2/pql" - pproto "github.com/molecula/featurebase/v2/proto" + "github.com/molecula/featurebase/v3" + "github.com/molecula/featurebase/v3/pql" + pproto "github.com/molecula/featurebase/v3/proto" "github.com/pkg/errors" ) diff --git a/sql/reduce_test.go b/sql/reduce_test.go index dcddba726..4efafdfa1 100644 --- a/sql/reduce_test.go +++ b/sql/reduce_test.go @@ -6,7 +6,7 @@ import ( "reflect" "testing" - pproto "github.com/molecula/featurebase/v2/proto" + pproto "github.com/molecula/featurebase/v3/proto" "github.com/pkg/errors" ) diff --git a/sql/select.go b/sql/select.go index 07385d80d..3297ee0fc 100644 --- a/sql/select.go +++ b/sql/select.go @@ -6,9 +6,9 @@ import ( "fmt" "strings" - pilosa "github.com/molecula/featurebase/v2" - "github.com/molecula/featurebase/v2/pql" - pproto "github.com/molecula/featurebase/v2/proto" + pilosa "github.com/molecula/featurebase/v3" + "github.com/molecula/featurebase/v3/pql" + pproto "github.com/molecula/featurebase/v3/proto" "github.com/pkg/errors" "vitess.io/vitess/go/vt/sqlparser" ) diff --git a/sql/show.go b/sql/show.go index 186d51923..4ceb829e5 100644 --- a/sql/show.go +++ b/sql/show.go @@ -5,8 +5,8 @@ import ( "context" "fmt" - pilosa "github.com/molecula/featurebase/v2" - pproto "github.com/molecula/featurebase/v2/proto" + pilosa "github.com/molecula/featurebase/v3" + pproto "github.com/molecula/featurebase/v3/proto" "github.com/pkg/errors" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/sql2/ast_test.go b/sql2/ast_test.go index 7523fe77d..c625393ed 100644 --- a/sql2/ast_test.go +++ b/sql2/ast_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/go-test/deep" - sql "github.com/molecula/featurebase/v2/sql2" + sql "github.com/molecula/featurebase/v3/sql2" ) func TestExprString(t *testing.T) { diff --git a/sql2/parser_test.go b/sql2/parser_test.go index 2a7be9f90..04745c9a6 100644 --- a/sql2/parser_test.go +++ b/sql2/parser_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/go-test/deep" - sql "github.com/molecula/featurebase/v2/sql2" + sql "github.com/molecula/featurebase/v3/sql2" ) func TestParser_ParseStatement(t *testing.T) { diff --git a/sql2/scanner_test.go b/sql2/scanner_test.go index 63763195d..7b9cd5436 100644 --- a/sql2/scanner_test.go +++ b/sql2/scanner_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - sql "github.com/molecula/featurebase/v2/sql2" + sql "github.com/molecula/featurebase/v3/sql2" ) func TestScanner_Scan(t *testing.T) { diff --git a/sql2/token_test.go b/sql2/token_test.go index 03e583600..773f347b6 100644 --- a/sql2/token_test.go +++ b/sql2/token_test.go @@ -4,7 +4,7 @@ package sql2_test import ( "testing" - sql "github.com/molecula/featurebase/v2/sql2" + sql "github.com/molecula/featurebase/v3/sql2" ) func TestPos_String(t *testing.T) { diff --git a/statik/filesystem.go b/statik/filesystem.go index 333a92c0a..4f0160db1 100644 --- a/statik/filesystem.go +++ b/statik/filesystem.go @@ -9,7 +9,7 @@ package statik import ( "net/http" - "github.com/molecula/featurebase/v2" + "github.com/molecula/featurebase/v3" "github.com/rakyll/statik/fs" ) diff --git a/stats/stats.go b/stats/stats.go index 7ec018479..ba634de72 100644 --- a/stats/stats.go +++ b/stats/stats.go @@ -8,7 +8,7 @@ import ( "sync" "time" - "github.com/molecula/featurebase/v2/logger" + "github.com/molecula/featurebase/v3/logger" ) // Expvar global expvar map. diff --git a/stats/stats_test.go b/stats/stats_test.go index 11e99c5ef..b2867d184 100644 --- a/stats/stats_test.go +++ b/stats/stats_test.go @@ -9,11 +9,11 @@ import ( "testing" "time" - "github.com/molecula/featurebase/v2" - "github.com/molecula/featurebase/v2/http" - "github.com/molecula/featurebase/v2/logger" - "github.com/molecula/featurebase/v2/stats" - "github.com/molecula/featurebase/v2/test" + "github.com/molecula/featurebase/v3" + "github.com/molecula/featurebase/v3/http" + "github.com/molecula/featurebase/v3/logger" + "github.com/molecula/featurebase/v3/stats" + "github.com/molecula/featurebase/v3/test" ) // TestMultiStatClient_Expvar run the multistat client with exp var diff --git a/statsd/statsd.go b/statsd/statsd.go index a21ada41d..e9975f79f 100644 --- a/statsd/statsd.go +++ b/statsd/statsd.go @@ -6,8 +6,8 @@ import ( "time" "github.com/DataDog/datadog-go/statsd" - "github.com/molecula/featurebase/v2/logger" - "github.com/molecula/featurebase/v2/stats" + "github.com/molecula/featurebase/v3/logger" + "github.com/molecula/featurebase/v3/stats" ) // StatsD protocol wrapper using the DataDog library that added Tags to the StatsD protocol diff --git a/statsd/statsd_test.go b/statsd/statsd_test.go index c466798bb..8c8b8e43a 100644 --- a/statsd/statsd_test.go +++ b/statsd/statsd_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - "github.com/molecula/featurebase/v2/statsd" - _ "github.com/molecula/featurebase/v2/test" + "github.com/molecula/featurebase/v3/statsd" + _ "github.com/molecula/featurebase/v3/test" ) func TestStatsClient_WithTags(t *testing.T) { diff --git a/stattx.go b/stattx.go index 16b4d658a..8b34ec582 100644 --- a/stattx.go +++ b/stattx.go @@ -9,10 +9,10 @@ import ( "sync" "time" - "github.com/molecula/featurebase/v2/debugstats" - "github.com/molecula/featurebase/v2/roaring" - txkey "github.com/molecula/featurebase/v2/short_txkey" - "github.com/molecula/featurebase/v2/vprint" + "github.com/molecula/featurebase/v3/debugstats" + "github.com/molecula/featurebase/v3/roaring" + txkey "github.com/molecula/featurebase/v3/short_txkey" + "github.com/molecula/featurebase/v3/vprint" ) // statTx is useful to profile on a diff --git a/test/cluster.go b/test/cluster.go index 58c27a4d6..5aea1147f 100644 --- a/test/cluster.go +++ b/test/cluster.go @@ -10,13 +10,13 @@ import ( "testing" "time" - pilosa "github.com/molecula/featurebase/v2" - "github.com/molecula/featurebase/v2/api/client" - "github.com/molecula/featurebase/v2/disco" - "github.com/molecula/featurebase/v2/logger" - "github.com/molecula/featurebase/v2/proto" - "github.com/molecula/featurebase/v2/server" - "github.com/molecula/featurebase/v2/storage" + pilosa "github.com/molecula/featurebase/v3" + "github.com/molecula/featurebase/v3/api/client" + "github.com/molecula/featurebase/v3/disco" + "github.com/molecula/featurebase/v3/logger" + "github.com/molecula/featurebase/v3/proto" + "github.com/molecula/featurebase/v3/server" + "github.com/molecula/featurebase/v3/storage" "github.com/pkg/errors" "golang.org/x/sync/errgroup" ) diff --git a/test/disco.go b/test/disco.go index 7609fea9f..abd77e59c 100644 --- a/test/disco.go +++ b/test/disco.go @@ -8,9 +8,9 @@ import ( "testing" "time" - "github.com/molecula/featurebase/v2/etcd" - "github.com/molecula/featurebase/v2/server" - "github.com/molecula/featurebase/v2/testhook" + "github.com/molecula/featurebase/v3/etcd" + "github.com/molecula/featurebase/v3/server" + "github.com/molecula/featurebase/v3/testhook" "github.com/pkg/errors" ) diff --git a/test/field.go b/test/field.go index 8554f88df..d38e4ef17 100644 --- a/test/field.go +++ b/test/field.go @@ -2,7 +2,7 @@ package test import ( - "github.com/molecula/featurebase/v2" + "github.com/molecula/featurebase/v3" ) // Field represents a test wrapper for pilosa.Field. diff --git a/test/holder.go b/test/holder.go index 8418d95a5..ec981ddf8 100644 --- a/test/holder.go +++ b/test/holder.go @@ -6,10 +6,10 @@ import ( "testing" "time" - pilosa "github.com/molecula/featurebase/v2" - "github.com/molecula/featurebase/v2/pql" - "github.com/molecula/featurebase/v2/testhook" - "github.com/molecula/featurebase/v2/vprint" + pilosa "github.com/molecula/featurebase/v3" + "github.com/molecula/featurebase/v3/pql" + "github.com/molecula/featurebase/v3/testhook" + "github.com/molecula/featurebase/v3/vprint" "github.com/pkg/errors" ) diff --git a/test/index.go b/test/index.go index 7b3edf42f..6e4ec5255 100644 --- a/test/index.go +++ b/test/index.go @@ -5,8 +5,8 @@ import ( "context" "testing" - "github.com/molecula/featurebase/v2" - "github.com/molecula/featurebase/v2/testhook" + "github.com/molecula/featurebase/v3" + "github.com/molecula/featurebase/v3/testhook" ) // Index represents a test wrapper for pilosa.Index. diff --git a/test/pilosa.go b/test/pilosa.go index 56747309e..83041998c 100644 --- a/test/pilosa.go +++ b/test/pilosa.go @@ -13,12 +13,12 @@ import ( "testing" "time" - pilosa "github.com/molecula/featurebase/v2" - "github.com/molecula/featurebase/v2/disco" - "github.com/molecula/featurebase/v2/encoding/proto" - "github.com/molecula/featurebase/v2/http" - "github.com/molecula/featurebase/v2/server" - "github.com/molecula/featurebase/v2/testhook" + pilosa "github.com/molecula/featurebase/v3" + "github.com/molecula/featurebase/v3/disco" + "github.com/molecula/featurebase/v3/encoding/proto" + "github.com/molecula/featurebase/v3/http" + "github.com/molecula/featurebase/v3/server" + "github.com/molecula/featurebase/v3/testhook" ) //////////////////////////////////////////////////////////////////////////////////// diff --git a/test/pilosa_test.go b/test/pilosa_test.go index 4feea2d92..c27a15c95 100644 --- a/test/pilosa_test.go +++ b/test/pilosa_test.go @@ -8,8 +8,8 @@ import ( "strings" "testing" - "github.com/molecula/featurebase/v2/disco" - "github.com/molecula/featurebase/v2/test" + "github.com/molecula/featurebase/v3/disco" + "github.com/molecula/featurebase/v3/test" ) func TestNewCluster(t *testing.T) { diff --git a/test/transaction.go b/test/transaction.go index 3ca524db4..1832f866f 100644 --- a/test/transaction.go +++ b/test/transaction.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/molecula/featurebase/v2" + "github.com/molecula/featurebase/v3" ) const deadlineSkew = time.Second diff --git a/testhook/auditor_test.go b/testhook/auditor_test.go index f6dad6157..9bc1b8f06 100644 --- a/testhook/auditor_test.go +++ b/testhook/auditor_test.go @@ -6,7 +6,7 @@ import ( "reflect" "testing" - "github.com/molecula/featurebase/v2/testhook" + "github.com/molecula/featurebase/v3/testhook" ) func TestAuditor_CatchError(t *testing.T) { diff --git a/topology/node.go b/topology/node.go index 73b424413..e5c33df5f 100644 --- a/topology/node.go +++ b/topology/node.go @@ -4,8 +4,8 @@ package topology import ( "fmt" - "github.com/molecula/featurebase/v2/disco" - "github.com/molecula/featurebase/v2/net" + "github.com/molecula/featurebase/v3/disco" + "github.com/molecula/featurebase/v3/net" ) // Node represents a node in the cluster. diff --git a/topology/snapshot.go b/topology/snapshot.go index 1c6c01ff6..218ab3a4e 100644 --- a/topology/snapshot.go +++ b/topology/snapshot.go @@ -5,8 +5,8 @@ import ( "encoding/binary" "hash/fnv" - "github.com/molecula/featurebase/v2/roaring" - "github.com/molecula/featurebase/v2/shardwidth" + "github.com/molecula/featurebase/v3/roaring" + "github.com/molecula/featurebase/v3/shardwidth" ) const ( diff --git a/tracing/opentracing/opentracing.go b/tracing/opentracing/opentracing.go index b6ed1034c..26a13e923 100644 --- a/tracing/opentracing/opentracing.go +++ b/tracing/opentracing/opentracing.go @@ -5,8 +5,8 @@ import ( "context" "net/http" - "github.com/molecula/featurebase/v2/logger" - "github.com/molecula/featurebase/v2/tracing" + "github.com/molecula/featurebase/v3/logger" + "github.com/molecula/featurebase/v3/tracing" "github.com/opentracing/opentracing-go" "github.com/opentracing/opentracing-go/ext" ) diff --git a/transaction.go b/transaction.go index ca09f81f8..9c912f0b1 100644 --- a/transaction.go +++ b/transaction.go @@ -8,7 +8,7 @@ import ( "sync" "time" - "github.com/molecula/featurebase/v2/logger" + "github.com/molecula/featurebase/v3/logger" "github.com/pkg/errors" ) diff --git a/transaction_test.go b/transaction_test.go index f9ed5884b..933a5013a 100644 --- a/transaction_test.go +++ b/transaction_test.go @@ -7,9 +7,9 @@ import ( "testing" "time" - "github.com/molecula/featurebase/v2" - "github.com/molecula/featurebase/v2/logger" - "github.com/molecula/featurebase/v2/test" + "github.com/molecula/featurebase/v3" + "github.com/molecula/featurebase/v3/logger" + "github.com/molecula/featurebase/v3/test" ) // TestTransactionManager currently uses an in memory transaction diff --git a/translate.go b/translate.go index be1c47306..cc36ebbe2 100644 --- a/translate.go +++ b/translate.go @@ -10,8 +10,8 @@ import ( "sort" "sync" - "github.com/molecula/featurebase/v2/ingest" - "github.com/molecula/featurebase/v2/topology" + "github.com/molecula/featurebase/v3/ingest" + "github.com/molecula/featurebase/v3/topology" "github.com/pkg/errors" ) diff --git a/translator_test.go b/translator_test.go index b9b4a08ff..38cc47c51 100644 --- a/translator_test.go +++ b/translator_test.go @@ -11,13 +11,13 @@ import ( "time" "github.com/google/go-cmp/cmp" - pilosa "github.com/molecula/featurebase/v2" - "github.com/molecula/featurebase/v2/boltdb" - "github.com/molecula/featurebase/v2/http" - "github.com/molecula/featurebase/v2/mock" - "github.com/molecula/featurebase/v2/server" - "github.com/molecula/featurebase/v2/test" - "github.com/molecula/featurebase/v2/topology" + pilosa "github.com/molecula/featurebase/v3" + "github.com/molecula/featurebase/v3/boltdb" + "github.com/molecula/featurebase/v3/http" + "github.com/molecula/featurebase/v3/mock" + "github.com/molecula/featurebase/v3/server" + "github.com/molecula/featurebase/v3/test" + "github.com/molecula/featurebase/v3/topology" "github.com/pkg/errors" "golang.org/x/sync/errgroup" ) diff --git a/tx.go b/tx.go index e8628c0e5..65a3e3c3f 100644 --- a/tx.go +++ b/tx.go @@ -2,9 +2,9 @@ package pilosa import ( - "github.com/molecula/featurebase/v2/roaring" - txkey "github.com/molecula/featurebase/v2/short_txkey" - //txkey "github.com/molecula/featurebase/v2/txkey" + "github.com/molecula/featurebase/v3/roaring" + txkey "github.com/molecula/featurebase/v3/short_txkey" + //txkey "github.com/molecula/featurebase/v3/txkey" ) // writable initializes Tx that update, use !writable for read-only. diff --git a/tx_internal_test.go b/tx_internal_test.go index 8ffa2bd45..1ab4140c1 100644 --- a/tx_internal_test.go +++ b/tx_internal_test.go @@ -6,7 +6,7 @@ import ( "sync" "testing" - "github.com/molecula/featurebase/v2/roaring" + "github.com/molecula/featurebase/v3/roaring" ) const countRangeMaxN = 8192 diff --git a/tx_test.go b/tx_test.go index f82a3f321..6f1815c8e 100644 --- a/tx_test.go +++ b/tx_test.go @@ -7,12 +7,12 @@ import ( "strings" "testing" - pilosa "github.com/molecula/featurebase/v2" - "github.com/molecula/featurebase/v2/http" - "github.com/molecula/featurebase/v2/server" - "github.com/molecula/featurebase/v2/storage" - "github.com/molecula/featurebase/v2/test" - . "github.com/molecula/featurebase/v2/vprint" // nolint:staticcheck + pilosa "github.com/molecula/featurebase/v3" + "github.com/molecula/featurebase/v3/http" + "github.com/molecula/featurebase/v3/server" + "github.com/molecula/featurebase/v3/storage" + "github.com/molecula/featurebase/v3/test" + . "github.com/molecula/featurebase/v3/vprint" // nolint:staticcheck ) func queryIRABit(m0api *pilosa.API, acctOwnerID uint64, iraField string, iraRowID uint64, index string) (bit bool) { diff --git a/txfactory.go b/txfactory.go index 12fa12981..c16208532 100644 --- a/txfactory.go +++ b/txfactory.go @@ -10,8 +10,8 @@ import ( "strings" "sync" - "github.com/molecula/featurebase/v2/testhook" - "github.com/molecula/featurebase/v2/vprint" + "github.com/molecula/featurebase/v3/testhook" + "github.com/molecula/featurebase/v3/vprint" "github.com/pkg/errors" ) diff --git a/util.go b/util.go index 7b81e9363..ad7397688 100644 --- a/util.go +++ b/util.go @@ -9,7 +9,7 @@ import ( "syscall" "time" - "github.com/molecula/featurebase/v2/roaring" + "github.com/molecula/featurebase/v3/roaring" "github.com/pkg/errors" ) diff --git a/utils_internal_test.go b/utils_internal_test.go index 30f675134..072fd5b1c 100644 --- a/utils_internal_test.go +++ b/utils_internal_test.go @@ -6,9 +6,9 @@ import ( "testing" "time" - pnet "github.com/molecula/featurebase/v2/net" - "github.com/molecula/featurebase/v2/testhook" - "github.com/molecula/featurebase/v2/topology" + pnet "github.com/molecula/featurebase/v3/net" + "github.com/molecula/featurebase/v3/testhook" + "github.com/molecula/featurebase/v3/topology" ) // utilities used by tests diff --git a/version.go b/version.go index 4aa0bd514..3383b8809 100644 --- a/version.go +++ b/version.go @@ -22,7 +22,7 @@ func VersionInfo(rename bool) string { if Version != "" { suffix = " " + Version } else { - suffix = " v2.x" + suffix = " v3.x" } buildTime := BuildTime if buildTime != "" { diff --git a/view.go b/view.go index 43eed3c34..d5e408810 100644 --- a/view.go +++ b/view.go @@ -13,11 +13,11 @@ import ( "sync/atomic" "time" - "github.com/molecula/featurebase/v2/pql" - "github.com/molecula/featurebase/v2/roaring" - "github.com/molecula/featurebase/v2/stats" - "github.com/molecula/featurebase/v2/testhook" - "github.com/molecula/featurebase/v2/vprint" + "github.com/molecula/featurebase/v3/pql" + "github.com/molecula/featurebase/v3/roaring" + "github.com/molecula/featurebase/v3/stats" + "github.com/molecula/featurebase/v3/testhook" + "github.com/molecula/featurebase/v3/vprint" "github.com/pkg/errors" "golang.org/x/sync/errgroup" ) diff --git a/view_internal_test.go b/view_internal_test.go index 98afe9487..b5a52170e 100644 --- a/view_internal_test.go +++ b/view_internal_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - "github.com/molecula/featurebase/v2/testhook" - . "github.com/molecula/featurebase/v2/vprint" // nolint:staticcheck + "github.com/molecula/featurebase/v3/testhook" + . "github.com/molecula/featurebase/v3/vprint" // nolint:staticcheck "golang.org/x/sync/errgroup" )