From c7c9c1e1d7fbc5a385e8edfbdb6593198a3e24b9 Mon Sep 17 00:00:00 2001 From: Ben Johnson Date: Tue, 8 Oct 2019 09:01:43 -0600 Subject: [PATCH] v2.0.0 Co-authored-by: Cody Soyland --- Makefile | 6 +++--- api.go | 8 ++++---- api_test.go | 6 +++--- attr.go | 2 +- attr_test.go | 4 ++-- boltdb/attrstore.go | 2 +- cache.go | 4 ++-- cache_test.go | 2 +- cluster.go | 8 ++++---- cluster_internal_test.go | 4 ++-- cmd/check.go | 2 +- cmd/config.go | 4 ++-- cmd/export.go | 2 +- cmd/export_test.go | 2 +- cmd/generate_config.go | 2 +- cmd/import.go | 4 ++-- cmd/import_test.go | 4 ++-- cmd/inspect.go | 2 +- cmd/pilosa/main.go | 2 +- cmd/root.go | 2 +- cmd/root_test.go | 2 +- cmd/server.go | 8 ++++---- cmd/server_test.go | 6 +++--- ctl/check.go | 4 ++-- ctl/common.go | 4 ++-- 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 | 4 ++-- ctl/inspect.go | 4 ++-- ctl/server.go | 2 +- ctl/server_test.go | 2 +- diagnostics.go | 2 +- diagnostics_internal_test.go | 2 +- encoding/proto/proto.go | 6 +++--- executor.go | 6 +++--- executor_internal_test.go | 2 +- executor_test.go | 6 +++--- field.go | 12 ++++++------ field_internal_test.go | 4 ++-- field_test.go | 6 +++--- fragment.go | 16 ++++++++-------- fragment_internal_test.go | 4 ++-- gcnotify/gcnotify.go | 2 +- go.mod | 2 +- gopsutil/systeminfo.go | 2 +- gopsutil/systeminfo_test.go | 4 ++-- gossip/gossip.go | 8 ++++---- holder.go | 8 ++++---- holder_internal_test.go | 2 +- holder_test.go | 4 ++-- http/client.go | 6 +++--- http/client_test.go | 10 +++++----- http/handler.go | 6 +++--- http/handler_internal_test.go | 2 +- http/handler_test.go | 4 ++-- http/translator.go | 2 +- http/translator_test.go | 10 +++++----- index.go | 8 ++++---- index_test.go | 4 ++-- inmem/translator.go | 2 +- inmem/translator_test.go | 2 +- internal/clustertests/cluster_test.go | 4 ++-- internal/test/querygenerator.go | 2 +- internal/test/querygenerator_test.go | 2 +- iterator.go | 2 +- mock/translator.go | 2 +- pilosa_test.go | 4 ++-- pql/ast_test.go | 2 +- pql/parser_test.go | 4 ++-- prometheus/prometheus.go | 4 ++-- prometheus/prometheus_test.go | 2 +- roaring/roaring_stats.go | 2 +- roaring/roaring_test.go | 6 +++--- row.go | 2 +- row_test.go | 2 +- server.go | 6 +++--- server/cluster_test.go | 4 ++-- server/config.go | 4 ++-- server/config_test.go | 4 ++-- server/enterprise.go | 2 +- server/handler_test.go | 10 +++++----- server/server.go | 24 ++++++++++++------------ server/server_test.go | 10 +++++----- server/setup_logger.go | 2 +- server/setup_logger_arm64.go | 2 +- stats/stats.go | 2 +- stats/stats_test.go | 10 +++++----- statsd/statsd.go | 4 ++-- statsd/statsd_test.go | 4 ++-- test/field.go | 2 +- test/holder.go | 4 ++-- test/index.go | 2 +- test/pilosa.go | 8 ++++---- test/pilosa_test.go | 4 ++-- tracing/opentracing/opentracing.go | 2 +- translate.go | 2 +- translate_test.go | 2 +- view.go | 8 ++++---- 102 files changed, 224 insertions(+), 224 deletions(-) diff --git a/Makefile b/Makefile index 9757af157..969624d90 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ BRANCH := $(if $(TRAVIS_BRANCH),$(TRAVIS_BRANCH),$(if $(CIRCLE_BRANCH),$(CIRCLE_ BRANCH_ID := $(BRANCH)-$(GOOS)-$(GOARCH) BUILD_TIME := $(shell date -u +%FT%T%z) SHARD_WIDTH = 20 -LDFLAGS="-X github.com/pilosa/pilosa.Version=$(VERSION) -X github.com/pilosa/pilosa.BuildTime=$(BUILD_TIME) -X github.com/pilosa/pilosa.Enterprise=$(if $(ENTERPRISE_ENABLED),1)" +LDFLAGS="-X github.com/pilosa/pilosa/v2.Version=$(VERSION) -X github.com/pilosa/pilosa/v2.BuildTime=$(BUILD_TIME) -X github.com/pilosa/pilosa/v2.Enterprise=$(if $(ENTERPRISE_ENABLED),1)" GO_VERSION=latest ENTERPRISE ?= 0 ENTERPRISE_ENABLED = $(subst 0,,$(ENTERPRISE)) @@ -106,11 +106,11 @@ install: # `go generate` protocol buffers generate-protoc: require-protoc require-protoc-gen-gofast - go generate github.com/pilosa/pilosa/internal + go generate github.com/pilosa/pilosa/v2/internal # `go generate` stringers generate-stringer: - go generate github.com/pilosa/pilosa + go generate github.com/pilosa/pilosa/v2 generate-pql: require-peg cd pql && peg -inline pql.peg && cd .. diff --git a/api.go b/api.go index 913868414..1785c5b7b 100644 --- a/api.go +++ b/api.go @@ -28,10 +28,10 @@ import ( "sync" "time" - "github.com/pilosa/pilosa/pql" - "github.com/pilosa/pilosa/roaring" - "github.com/pilosa/pilosa/stats" - "github.com/pilosa/pilosa/tracing" + "github.com/pilosa/pilosa/v2/pql" + "github.com/pilosa/pilosa/v2/roaring" + "github.com/pilosa/pilosa/v2/stats" + "github.com/pilosa/pilosa/v2/tracing" "github.com/pkg/errors" "golang.org/x/sync/errgroup" ) diff --git a/api_test.go b/api_test.go index 0cde55d59..098cf6895 100644 --- a/api_test.go +++ b/api_test.go @@ -22,9 +22,9 @@ import ( "strings" "testing" - "github.com/pilosa/pilosa" - "github.com/pilosa/pilosa/server" - "github.com/pilosa/pilosa/test" + "github.com/pilosa/pilosa/v2" + "github.com/pilosa/pilosa/v2/server" + "github.com/pilosa/pilosa/v2/test" ) func TestAPI_Import(t *testing.T) { diff --git a/attr.go b/attr.go index b813696e6..3502688d1 100644 --- a/attr.go +++ b/attr.go @@ -19,7 +19,7 @@ import ( "sort" "github.com/gogo/protobuf/proto" - "github.com/pilosa/pilosa/internal" + "github.com/pilosa/pilosa/v2/internal" ) // Attribute data type enum. diff --git a/attr_test.go b/attr_test.go index 3d76c4d63..38af27c5a 100644 --- a/attr_test.go +++ b/attr_test.go @@ -22,8 +22,8 @@ import ( "sync" "testing" - "github.com/pilosa/pilosa" - "github.com/pilosa/pilosa/boltdb" + "github.com/pilosa/pilosa/v2" + "github.com/pilosa/pilosa/v2/boltdb" ) // Ensure database can set and retrieve column attributes. diff --git a/boltdb/attrstore.go b/boltdb/attrstore.go index e8c770fde..f29cec183 100644 --- a/boltdb/attrstore.go +++ b/boltdb/attrstore.go @@ -26,7 +26,7 @@ import ( "github.com/cespare/xxhash" "github.com/boltdb/bolt" - "github.com/pilosa/pilosa" + "github.com/pilosa/pilosa/v2" "github.com/pkg/errors" ) diff --git a/cache.go b/cache.go index 0bf4cd09d..de836b8c8 100644 --- a/cache.go +++ b/cache.go @@ -22,8 +22,8 @@ import ( "sync" "time" - "github.com/pilosa/pilosa/lru" - "github.com/pilosa/pilosa/stats" + "github.com/pilosa/pilosa/v2/lru" + "github.com/pilosa/pilosa/v2/stats" ) const ( diff --git a/cache_test.go b/cache_test.go index 21d8acf07..de1bd3a0b 100644 --- a/cache_test.go +++ b/cache_test.go @@ -17,7 +17,7 @@ package pilosa_test import ( "testing" - "github.com/pilosa/pilosa" + "github.com/pilosa/pilosa/v2" ) // Ensure a bitmap query can be executed. diff --git a/cluster.go b/cluster.go index c972daadd..80419263e 100644 --- a/cluster.go +++ b/cluster.go @@ -30,10 +30,10 @@ import ( "time" "github.com/gogo/protobuf/proto" - "github.com/pilosa/pilosa/internal" - "github.com/pilosa/pilosa/logger" - "github.com/pilosa/pilosa/roaring" - "github.com/pilosa/pilosa/tracing" + "github.com/pilosa/pilosa/v2/internal" + "github.com/pilosa/pilosa/v2/logger" + "github.com/pilosa/pilosa/v2/roaring" + "github.com/pilosa/pilosa/v2/tracing" "github.com/pkg/errors" uuid "github.com/satori/go.uuid" "golang.org/x/sync/errgroup" diff --git a/cluster_internal_test.go b/cluster_internal_test.go index a30d98271..79a28f4ae 100644 --- a/cluster_internal_test.go +++ b/cluster_internal_test.go @@ -33,8 +33,8 @@ import ( "github.com/davecgh/go-spew/spew" "github.com/gorilla/mux" - "github.com/pilosa/pilosa/logger" - "github.com/pilosa/pilosa/roaring" + "github.com/pilosa/pilosa/v2/logger" + "github.com/pilosa/pilosa/v2/roaring" "github.com/pkg/errors" ) diff --git a/cmd/check.go b/cmd/check.go index 19e0519a8..4d075e4ad 100644 --- a/cmd/check.go +++ b/cmd/check.go @@ -21,7 +21,7 @@ import ( "github.com/spf13/cobra" - "github.com/pilosa/pilosa/ctl" + "github.com/pilosa/pilosa/v2/ctl" ) var checker *ctl.CheckCommand diff --git a/cmd/config.go b/cmd/config.go index 73464ba65..db59580ff 100644 --- a/cmd/config.go +++ b/cmd/config.go @@ -20,8 +20,8 @@ import ( "github.com/spf13/cobra" - "github.com/pilosa/pilosa/ctl" - "github.com/pilosa/pilosa/server" + "github.com/pilosa/pilosa/v2/ctl" + "github.com/pilosa/pilosa/v2/server" ) var conf *ctl.ConfigCommand diff --git a/cmd/export.go b/cmd/export.go index c2ab5a1a2..25ca5f5a0 100644 --- a/cmd/export.go +++ b/cmd/export.go @@ -20,7 +20,7 @@ import ( "github.com/spf13/cobra" - "github.com/pilosa/pilosa/ctl" + "github.com/pilosa/pilosa/v2/ctl" ) var Exporter *ctl.ExportCommand diff --git a/cmd/export_test.go b/cmd/export_test.go index 6f7a49b8f..bd14eaba1 100644 --- a/cmd/export_test.go +++ b/cmd/export_test.go @@ -18,7 +18,7 @@ import ( "strings" "testing" - "github.com/pilosa/pilosa/cmd" + "github.com/pilosa/pilosa/v2/cmd" ) func TestExportHelp(t *testing.T) { diff --git a/cmd/generate_config.go b/cmd/generate_config.go index 8c8553aa4..82230159c 100644 --- a/cmd/generate_config.go +++ b/cmd/generate_config.go @@ -20,7 +20,7 @@ import ( "github.com/spf13/cobra" - "github.com/pilosa/pilosa/ctl" + "github.com/pilosa/pilosa/v2/ctl" ) var generateConf *ctl.GenerateConfigCommand diff --git a/cmd/import.go b/cmd/import.go index 5173ddbd0..a84d719a9 100644 --- a/cmd/import.go +++ b/cmd/import.go @@ -18,8 +18,8 @@ import ( "context" "io" - "github.com/pilosa/pilosa" - "github.com/pilosa/pilosa/ctl" + "github.com/pilosa/pilosa/v2" + "github.com/pilosa/pilosa/v2/ctl" "github.com/spf13/cobra" ) diff --git a/cmd/import_test.go b/cmd/import_test.go index 7b566ce65..fc7899851 100644 --- a/cmd/import_test.go +++ b/cmd/import_test.go @@ -18,9 +18,9 @@ import ( "strings" "testing" - "github.com/pilosa/pilosa" + "github.com/pilosa/pilosa/v2" - "github.com/pilosa/pilosa/cmd" + "github.com/pilosa/pilosa/v2/cmd" ) func TestImportHelp(t *testing.T) { diff --git a/cmd/inspect.go b/cmd/inspect.go index 570e7aae3..4a2e852f6 100644 --- a/cmd/inspect.go +++ b/cmd/inspect.go @@ -21,7 +21,7 @@ import ( "github.com/spf13/cobra" - "github.com/pilosa/pilosa/ctl" + "github.com/pilosa/pilosa/v2/ctl" ) var inspector *ctl.InspectCommand diff --git a/cmd/pilosa/main.go b/cmd/pilosa/main.go index 648b41866..c880d5e6b 100644 --- a/cmd/pilosa/main.go +++ b/cmd/pilosa/main.go @@ -21,7 +21,7 @@ import ( "fmt" "os" - "github.com/pilosa/pilosa/cmd" + "github.com/pilosa/pilosa/v2/cmd" ) func main() { diff --git a/cmd/root.go b/cmd/root.go index 6d0ad9ee2..f59423232 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -19,7 +19,7 @@ import ( "io" "strings" - "github.com/pilosa/pilosa" + "github.com/pilosa/pilosa/v2" "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 6807aaf3c..fc052db60 100644 --- a/cmd/root_test.go +++ b/cmd/root_test.go @@ -25,7 +25,7 @@ import ( "time" - "github.com/pilosa/pilosa/cmd" + "github.com/pilosa/pilosa/v2/cmd" "github.com/spf13/cobra" ) diff --git a/cmd/server.go b/cmd/server.go index f57678d52..90efc7150 100644 --- a/cmd/server.go +++ b/cmd/server.go @@ -17,10 +17,10 @@ package cmd import ( "io" - "github.com/pilosa/pilosa/ctl" - "github.com/pilosa/pilosa/server" - "github.com/pilosa/pilosa/tracing" - "github.com/pilosa/pilosa/tracing/opentracing" + "github.com/pilosa/pilosa/v2/ctl" + "github.com/pilosa/pilosa/v2/server" + "github.com/pilosa/pilosa/v2/tracing" + "github.com/pilosa/pilosa/v2/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 3efabe741..4a7eff8d9 100644 --- a/cmd/server_test.go +++ b/cmd/server_test.go @@ -20,9 +20,9 @@ import ( "testing" "time" - "github.com/pilosa/pilosa/cmd" - _ "github.com/pilosa/pilosa/test" - "github.com/pilosa/pilosa/toml" + "github.com/pilosa/pilosa/v2/cmd" + _ "github.com/pilosa/pilosa/v2/test" + "github.com/pilosa/pilosa/v2/toml" "github.com/pkg/errors" ) diff --git a/ctl/check.go b/ctl/check.go index 0beee5bc5..fe8145389 100644 --- a/ctl/check.go +++ b/ctl/check.go @@ -22,8 +22,8 @@ import ( "path/filepath" "syscall" - "github.com/pilosa/pilosa" - "github.com/pilosa/pilosa/roaring" + "github.com/pilosa/pilosa/v2" + "github.com/pilosa/pilosa/v2/roaring" "github.com/pkg/errors" ) diff --git a/ctl/common.go b/ctl/common.go index f0595b793..db788246e 100644 --- a/ctl/common.go +++ b/ctl/common.go @@ -17,8 +17,8 @@ package ctl import ( "log" - "github.com/pilosa/pilosa/http" - "github.com/pilosa/pilosa/server" + "github.com/pilosa/pilosa/v2/http" + "github.com/pilosa/pilosa/v2/server" "github.com/pkg/errors" "github.com/spf13/pflag" ) diff --git a/ctl/config.go b/ctl/config.go index bb349c274..14cf6c7f5 100644 --- a/ctl/config.go +++ b/ctl/config.go @@ -20,8 +20,8 @@ import ( "io" toml "github.com/pelletier/go-toml" - "github.com/pilosa/pilosa" - "github.com/pilosa/pilosa/server" + "github.com/pilosa/pilosa/v2" + "github.com/pilosa/pilosa/v2/server" ) // ConfigCommand represents a command for printing a default config. diff --git a/ctl/config_test.go b/ctl/config_test.go index b9a5dc0b5..a8f94562d 100644 --- a/ctl/config_test.go +++ b/ctl/config_test.go @@ -22,7 +22,7 @@ import ( "strings" "testing" - "github.com/pilosa/pilosa/server" + "github.com/pilosa/pilosa/v2/server" ) func TestConfigCommand_Run(t *testing.T) { diff --git a/ctl/export.go b/ctl/export.go index 7f1be98f6..40e5b2bbf 100644 --- a/ctl/export.go +++ b/ctl/export.go @@ -19,8 +19,8 @@ import ( "io" "os" - "github.com/pilosa/pilosa" - "github.com/pilosa/pilosa/server" + "github.com/pilosa/pilosa/v2" + "github.com/pilosa/pilosa/v2/server" "github.com/pkg/errors" ) diff --git a/ctl/export_test.go b/ctl/export_test.go index e9f7db8a7..82c57816b 100644 --- a/ctl/export_test.go +++ b/ctl/export_test.go @@ -21,8 +21,8 @@ import ( "strings" "testing" - "github.com/pilosa/pilosa" - "github.com/pilosa/pilosa/test" + "github.com/pilosa/pilosa/v2" + "github.com/pilosa/pilosa/v2/test" ) func TestExportCommand_Validation(t *testing.T) { diff --git a/ctl/generate_config.go b/ctl/generate_config.go index 5a7e0db9f..f58ff71c4 100644 --- a/ctl/generate_config.go +++ b/ctl/generate_config.go @@ -20,8 +20,8 @@ import ( "io" "github.com/pelletier/go-toml" - "github.com/pilosa/pilosa" - "github.com/pilosa/pilosa/server" + "github.com/pilosa/pilosa/v2" + "github.com/pilosa/pilosa/v2/server" "github.com/pkg/errors" ) diff --git a/ctl/import.go b/ctl/import.go index b4c784ec0..d5b9da8be 100644 --- a/ctl/import.go +++ b/ctl/import.go @@ -25,9 +25,9 @@ import ( "strconv" "time" - "github.com/pilosa/pilosa" - "github.com/pilosa/pilosa/http" - "github.com/pilosa/pilosa/server" + "github.com/pilosa/pilosa/v2" + "github.com/pilosa/pilosa/v2/http" + "github.com/pilosa/pilosa/v2/server" "github.com/pkg/errors" ) diff --git a/ctl/import_test.go b/ctl/import_test.go index dd4d4a9e6..ec8ed7666 100644 --- a/ctl/import_test.go +++ b/ctl/import_test.go @@ -26,8 +26,8 @@ import ( "strings" "testing" - "github.com/pilosa/pilosa" - "github.com/pilosa/pilosa/test" + "github.com/pilosa/pilosa/v2" + "github.com/pilosa/pilosa/v2/test" ) func TestImportCommand_Validation(t *testing.T) { diff --git a/ctl/inspect.go b/ctl/inspect.go index 98222d0de..48924b89d 100644 --- a/ctl/inspect.go +++ b/ctl/inspect.go @@ -24,8 +24,8 @@ import ( "time" "unsafe" - "github.com/pilosa/pilosa" - "github.com/pilosa/pilosa/roaring" + "github.com/pilosa/pilosa/v2" + "github.com/pilosa/pilosa/v2/roaring" "github.com/pkg/errors" ) diff --git a/ctl/server.go b/ctl/server.go index 04ebfd09b..464323fc8 100644 --- a/ctl/server.go +++ b/ctl/server.go @@ -17,7 +17,7 @@ package ctl import ( "time" - "github.com/pilosa/pilosa/server" + "github.com/pilosa/pilosa/v2/server" "github.com/spf13/cobra" ) diff --git a/ctl/server_test.go b/ctl/server_test.go index 9866b497d..b99a2ed25 100644 --- a/ctl/server_test.go +++ b/ctl/server_test.go @@ -18,7 +18,7 @@ import ( "bytes" "testing" - "github.com/pilosa/pilosa/server" + "github.com/pilosa/pilosa/v2/server" "github.com/spf13/cobra" ) diff --git a/diagnostics.go b/diagnostics.go index c16cd9b0d..5176c7c89 100644 --- a/diagnostics.go +++ b/diagnostics.go @@ -24,7 +24,7 @@ import ( "sync" "time" - "github.com/pilosa/pilosa/logger" + "github.com/pilosa/pilosa/v2/logger" "github.com/pkg/errors" ) diff --git a/diagnostics_internal_test.go b/diagnostics_internal_test.go index 6ddc98b32..3966b2684 100644 --- a/diagnostics_internal_test.go +++ b/diagnostics_internal_test.go @@ -23,7 +23,7 @@ import ( "strings" "testing" - "github.com/pilosa/pilosa/logger" + "github.com/pilosa/pilosa/v2/logger" ) func TestDiagnosticsClient(t *testing.T) { diff --git a/encoding/proto/proto.go b/encoding/proto/proto.go index c34d9ad00..d525c8399 100644 --- a/encoding/proto/proto.go +++ b/encoding/proto/proto.go @@ -19,9 +19,9 @@ import ( "sort" "github.com/gogo/protobuf/proto" - "github.com/pilosa/pilosa" - "github.com/pilosa/pilosa/internal" - "github.com/pilosa/pilosa/roaring" + "github.com/pilosa/pilosa/v2" + "github.com/pilosa/pilosa/v2/internal" + "github.com/pilosa/pilosa/v2/roaring" "github.com/pkg/errors" ) diff --git a/executor.go b/executor.go index 4d1d3e4c9..842ba1cef 100644 --- a/executor.go +++ b/executor.go @@ -22,9 +22,9 @@ import ( "sync" "time" - "github.com/pilosa/pilosa/pql" - "github.com/pilosa/pilosa/shardwidth" - "github.com/pilosa/pilosa/tracing" + "github.com/pilosa/pilosa/v2/pql" + "github.com/pilosa/pilosa/v2/shardwidth" + "github.com/pilosa/pilosa/v2/tracing" "github.com/pkg/errors" ) diff --git a/executor_internal_test.go b/executor_internal_test.go index ffb091d49..3243bd1ac 100644 --- a/executor_internal_test.go +++ b/executor_internal_test.go @@ -21,7 +21,7 @@ import ( "strings" "testing" - "github.com/pilosa/pilosa/pql" + "github.com/pilosa/pilosa/v2/pql" ) func TestExecutor_TranslateGroupByCall(t *testing.T) { diff --git a/executor_test.go b/executor_test.go index 76a8300bd..e0c3c77ba 100644 --- a/executor_test.go +++ b/executor_test.go @@ -31,9 +31,9 @@ import ( "github.com/davecgh/go-spew/spew" "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - "github.com/pilosa/pilosa" - "github.com/pilosa/pilosa/server" - "github.com/pilosa/pilosa/test" + "github.com/pilosa/pilosa/v2" + "github.com/pilosa/pilosa/v2/server" + "github.com/pilosa/pilosa/v2/test" "github.com/pkg/errors" ) diff --git a/field.go b/field.go index 39c6c5363..adf301293 100644 --- a/field.go +++ b/field.go @@ -28,12 +28,12 @@ import ( "time" "github.com/gogo/protobuf/proto" - "github.com/pilosa/pilosa/internal" - "github.com/pilosa/pilosa/logger" - "github.com/pilosa/pilosa/pql" - "github.com/pilosa/pilosa/roaring" - "github.com/pilosa/pilosa/stats" - "github.com/pilosa/pilosa/tracing" + "github.com/pilosa/pilosa/v2/internal" + "github.com/pilosa/pilosa/v2/logger" + "github.com/pilosa/pilosa/v2/pql" + "github.com/pilosa/pilosa/v2/roaring" + "github.com/pilosa/pilosa/v2/stats" + "github.com/pilosa/pilosa/v2/tracing" "github.com/pkg/errors" "golang.org/x/sync/errgroup" ) diff --git a/field_internal_test.go b/field_internal_test.go index 1ce7c8237..7cadb2dc8 100644 --- a/field_internal_test.go +++ b/field_internal_test.go @@ -23,8 +23,8 @@ import ( "testing" "time" - "github.com/pilosa/pilosa/pql" - "github.com/pilosa/pilosa/roaring" + "github.com/pilosa/pilosa/v2/pql" + "github.com/pilosa/pilosa/v2/roaring" ) // Ensure a bsiGroup can adjust to its baseValue. diff --git a/field_test.go b/field_test.go index c60c9a833..6e7a5d353 100644 --- a/field_test.go +++ b/field_test.go @@ -20,9 +20,9 @@ import ( "testing" "github.com/google/go-cmp/cmp" - "github.com/pilosa/pilosa" - "github.com/pilosa/pilosa/roaring" - "github.com/pilosa/pilosa/test" + "github.com/pilosa/pilosa/v2" + "github.com/pilosa/pilosa/v2/roaring" + "github.com/pilosa/pilosa/v2/test" ) // Ensure a field can set & read a bsiGroup value. diff --git a/fragment.go b/fragment.go index ad43b2503..03fc11b66 100644 --- a/fragment.go +++ b/fragment.go @@ -36,14 +36,14 @@ import ( "github.com/cespare/xxhash" "github.com/gogo/protobuf/proto" - "github.com/pilosa/pilosa/internal" - "github.com/pilosa/pilosa/logger" - "github.com/pilosa/pilosa/pql" - "github.com/pilosa/pilosa/roaring" - "github.com/pilosa/pilosa/shardwidth" - "github.com/pilosa/pilosa/stats" - "github.com/pilosa/pilosa/syswrap" - "github.com/pilosa/pilosa/tracing" + "github.com/pilosa/pilosa/v2/internal" + "github.com/pilosa/pilosa/v2/logger" + "github.com/pilosa/pilosa/v2/pql" + "github.com/pilosa/pilosa/v2/roaring" + "github.com/pilosa/pilosa/v2/shardwidth" + "github.com/pilosa/pilosa/v2/stats" + "github.com/pilosa/pilosa/v2/syswrap" + "github.com/pilosa/pilosa/v2/tracing" "github.com/pkg/errors" ) diff --git a/fragment_internal_test.go b/fragment_internal_test.go index 333f15b42..1181d5e82 100644 --- a/fragment_internal_test.go +++ b/fragment_internal_test.go @@ -33,8 +33,8 @@ import ( "golang.org/x/sync/errgroup" "github.com/davecgh/go-spew/spew" - "github.com/pilosa/pilosa/pql" - "github.com/pilosa/pilosa/roaring" + "github.com/pilosa/pilosa/v2/pql" + "github.com/pilosa/pilosa/v2/roaring" "github.com/pkg/errors" ) diff --git a/gcnotify/gcnotify.go b/gcnotify/gcnotify.go index 54313403d..ae1676ccc 100644 --- a/gcnotify/gcnotify.go +++ b/gcnotify/gcnotify.go @@ -16,7 +16,7 @@ package gcnotify import ( "github.com/CAFxX/gcnotifier" - "github.com/pilosa/pilosa" + "github.com/pilosa/pilosa/v2" ) // Ensure ActiveGCNotifier implements interface. diff --git a/go.mod b/go.mod index e8a9ae2cc..0dd222daa 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/pilosa/pilosa +module github.com/pilosa/pilosa/v2 replace github.com/hashicorp/memberlist => github.com/pilosa/memberlist v0.1.4-0.20190415211605-f6512523c021 diff --git a/gopsutil/systeminfo.go b/gopsutil/systeminfo.go index 13ada756e..cb526ca4d 100644 --- a/gopsutil/systeminfo.go +++ b/gopsutil/systeminfo.go @@ -18,7 +18,7 @@ import ( "runtime" "strings" - "github.com/pilosa/pilosa" + "github.com/pilosa/pilosa/v2" "github.com/shirou/gopsutil/cpu" "github.com/shirou/gopsutil/host" "github.com/shirou/gopsutil/mem" diff --git a/gopsutil/systeminfo_test.go b/gopsutil/systeminfo_test.go index 28d09e66a..330535c97 100644 --- a/gopsutil/systeminfo_test.go +++ b/gopsutil/systeminfo_test.go @@ -17,8 +17,8 @@ package gopsutil_test import ( "testing" - "github.com/pilosa/pilosa" - "github.com/pilosa/pilosa/gopsutil" + "github.com/pilosa/pilosa/v2" + "github.com/pilosa/pilosa/v2/gopsutil" ) func TestSystemInfo(t *testing.T) { diff --git a/gossip/gossip.go b/gossip/gossip.go index 1eee9dc3d..84f914975 100644 --- a/gossip/gossip.go +++ b/gossip/gossip.go @@ -29,10 +29,10 @@ import ( "time" "github.com/hashicorp/memberlist" - "github.com/pilosa/pilosa" - "github.com/pilosa/pilosa/logger" - "github.com/pilosa/pilosa/roaring" - "github.com/pilosa/pilosa/toml" + "github.com/pilosa/pilosa/v2" + "github.com/pilosa/pilosa/v2/logger" + "github.com/pilosa/pilosa/v2/roaring" + "github.com/pilosa/pilosa/v2/toml" "github.com/pkg/errors" ) diff --git a/holder.go b/holder.go index ad26838d1..a1e8cadac 100644 --- a/holder.go +++ b/holder.go @@ -27,10 +27,10 @@ import ( "syscall" "time" - "github.com/pilosa/pilosa/logger" - "github.com/pilosa/pilosa/roaring" - "github.com/pilosa/pilosa/stats" - "github.com/pilosa/pilosa/tracing" + "github.com/pilosa/pilosa/v2/logger" + "github.com/pilosa/pilosa/v2/roaring" + "github.com/pilosa/pilosa/v2/stats" + "github.com/pilosa/pilosa/v2/tracing" "github.com/pkg/errors" uuid "github.com/satori/go.uuid" ) diff --git a/holder_internal_test.go b/holder_internal_test.go index 0c96a81ea..062b3e808 100644 --- a/holder_internal_test.go +++ b/holder_internal_test.go @@ -22,7 +22,7 @@ import ( "strings" "testing" - "github.com/pilosa/pilosa/roaring" + "github.com/pilosa/pilosa/v2/roaring" ) type tHolder struct { diff --git a/holder_test.go b/holder_test.go index 525ca1dc7..3f88703e5 100644 --- a/holder_test.go +++ b/holder_test.go @@ -24,8 +24,8 @@ import ( "testing" "time" - "github.com/pilosa/pilosa" - "github.com/pilosa/pilosa/test" + "github.com/pilosa/pilosa/v2" + "github.com/pilosa/pilosa/v2/test" ) func TestHolder_Open(t *testing.T) { diff --git a/http/client.go b/http/client.go index 74706588d..b23678c77 100644 --- a/http/client.go +++ b/http/client.go @@ -27,9 +27,9 @@ import ( "sort" "strconv" - "github.com/pilosa/pilosa" - "github.com/pilosa/pilosa/encoding/proto" - "github.com/pilosa/pilosa/tracing" + "github.com/pilosa/pilosa/v2" + "github.com/pilosa/pilosa/v2/encoding/proto" + "github.com/pilosa/pilosa/v2/tracing" "github.com/pkg/errors" ) diff --git a/http/client_test.go b/http/client_test.go index b4c32932d..4e715a0e7 100644 --- a/http/client_test.go +++ b/http/client_test.go @@ -26,11 +26,11 @@ import ( "time" "github.com/davecgh/go-spew/spew" - "github.com/pilosa/pilosa" - "github.com/pilosa/pilosa/http" - "github.com/pilosa/pilosa/pql" - "github.com/pilosa/pilosa/server" - "github.com/pilosa/pilosa/test" + "github.com/pilosa/pilosa/v2" + "github.com/pilosa/pilosa/v2/http" + "github.com/pilosa/pilosa/v2/pql" + "github.com/pilosa/pilosa/v2/server" + "github.com/pilosa/pilosa/v2/test" ) // Test distributed TopN Row count across 3 nodes. diff --git a/http/handler.go b/http/handler.go index d1ea07ae9..97ff4b13a 100644 --- a/http/handler.go +++ b/http/handler.go @@ -35,9 +35,9 @@ import ( "github.com/gorilla/handlers" "github.com/gorilla/mux" - "github.com/pilosa/pilosa" - "github.com/pilosa/pilosa/logger" - "github.com/pilosa/pilosa/tracing" + "github.com/pilosa/pilosa/v2" + "github.com/pilosa/pilosa/v2/logger" + "github.com/pilosa/pilosa/v2/tracing" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus/promhttp" ) diff --git a/http/handler_internal_test.go b/http/handler_internal_test.go index 0cb90655f..f9d67a077 100644 --- a/http/handler_internal_test.go +++ b/http/handler_internal_test.go @@ -21,7 +21,7 @@ import ( "strings" "testing" - "github.com/pilosa/pilosa" + "github.com/pilosa/pilosa/v2" ) // Test custom UnmarshalJSON for postIndexRequest object diff --git a/http/handler_test.go b/http/handler_test.go index 49d24ffec..d275d450e 100644 --- a/http/handler_test.go +++ b/http/handler_test.go @@ -18,8 +18,8 @@ import ( "net" "testing" - "github.com/pilosa/pilosa" - "github.com/pilosa/pilosa/http" + "github.com/pilosa/pilosa/v2" + "github.com/pilosa/pilosa/v2/http" ) func TestHandlerOptions(t *testing.T) { diff --git a/http/translator.go b/http/translator.go index 3f37e6545..232462c21 100644 --- a/http/translator.go +++ b/http/translator.go @@ -24,7 +24,7 @@ import ( "net/url" "strconv" - "github.com/pilosa/pilosa" + "github.com/pilosa/pilosa/v2" ) // Ensure implementation implements inteface. diff --git a/http/translator_test.go b/http/translator_test.go index 87bb4366d..04f76b7ee 100644 --- a/http/translator_test.go +++ b/http/translator_test.go @@ -22,11 +22,11 @@ import ( "testing" "time" - "github.com/pilosa/pilosa" - "github.com/pilosa/pilosa/http" - "github.com/pilosa/pilosa/mock" - "github.com/pilosa/pilosa/server" - "github.com/pilosa/pilosa/test" + "github.com/pilosa/pilosa/v2" + "github.com/pilosa/pilosa/v2/http" + "github.com/pilosa/pilosa/v2/mock" + "github.com/pilosa/pilosa/v2/server" + "github.com/pilosa/pilosa/v2/test" ) func TestTranslateStore_Reader(t *testing.T) { diff --git a/index.go b/index.go index e02557501..036bb7d04 100644 --- a/index.go +++ b/index.go @@ -25,10 +25,10 @@ import ( "time" "github.com/gogo/protobuf/proto" - "github.com/pilosa/pilosa/internal" - "github.com/pilosa/pilosa/logger" - "github.com/pilosa/pilosa/roaring" - "github.com/pilosa/pilosa/stats" + "github.com/pilosa/pilosa/v2/internal" + "github.com/pilosa/pilosa/v2/logger" + "github.com/pilosa/pilosa/v2/roaring" + "github.com/pilosa/pilosa/v2/stats" "github.com/pkg/errors" "golang.org/x/sync/errgroup" ) diff --git a/index_test.go b/index_test.go index ee5625cf3..13084e322 100644 --- a/index_test.go +++ b/index_test.go @@ -19,8 +19,8 @@ import ( "reflect" "testing" - "github.com/pilosa/pilosa" - "github.com/pilosa/pilosa/test" + "github.com/pilosa/pilosa/v2" + "github.com/pilosa/pilosa/v2/test" "github.com/pkg/errors" ) diff --git a/inmem/translator.go b/inmem/translator.go index c5f976ea2..782f20d37 100644 --- a/inmem/translator.go +++ b/inmem/translator.go @@ -19,7 +19,7 @@ import ( "io" "sync" - "github.com/pilosa/pilosa" + "github.com/pilosa/pilosa/v2" ) // Ensure type implements interface. diff --git a/inmem/translator_test.go b/inmem/translator_test.go index 0a7c6eb34..961b3a709 100644 --- a/inmem/translator_test.go +++ b/inmem/translator_test.go @@ -20,7 +20,7 @@ import ( "reflect" "testing" - "github.com/pilosa/pilosa/inmem" + "github.com/pilosa/pilosa/v2/inmem" ) func TestTranslateStore_TranslateColumn(t *testing.T) { diff --git a/internal/clustertests/cluster_test.go b/internal/clustertests/cluster_test.go index 5c8f4ed6b..95e804ec0 100644 --- a/internal/clustertests/cluster_test.go +++ b/internal/clustertests/cluster_test.go @@ -21,8 +21,8 @@ import ( "testing" "time" - "github.com/pilosa/pilosa" - picli "github.com/pilosa/pilosa/http" + "github.com/pilosa/pilosa/v2" + picli "github.com/pilosa/pilosa/v2/http" ) func TestClusterStuff(t *testing.T) { diff --git a/internal/test/querygenerator.go b/internal/test/querygenerator.go index ea0dc81c0..1964b4ba9 100644 --- a/internal/test/querygenerator.go +++ b/internal/test/querygenerator.go @@ -19,7 +19,7 @@ import ( "strconv" "strings" - "github.com/pilosa/pilosa/pql" + "github.com/pilosa/pilosa/v2/pql" ) type Args map[string]interface{} diff --git a/internal/test/querygenerator_test.go b/internal/test/querygenerator_test.go index 9bb404ab4..840c209c2 100644 --- a/internal/test/querygenerator_test.go +++ b/internal/test/querygenerator_test.go @@ -17,7 +17,7 @@ package test import ( "testing" - "github.com/pilosa/pilosa/pql" + "github.com/pilosa/pilosa/v2/pql" ) func TestPQL_Generator(t *testing.T) { diff --git a/iterator.go b/iterator.go index 6a4cc6552..c8b17c199 100644 --- a/iterator.go +++ b/iterator.go @@ -17,7 +17,7 @@ package pilosa import ( "fmt" - "github.com/pilosa/pilosa/roaring" + "github.com/pilosa/pilosa/v2/roaring" ) // iterator is an interface for looping over row/column pairs. diff --git a/mock/translator.go b/mock/translator.go index ca5ef1e8e..580d549dc 100644 --- a/mock/translator.go +++ b/mock/translator.go @@ -18,7 +18,7 @@ import ( "context" "io" - "github.com/pilosa/pilosa" + "github.com/pilosa/pilosa/v2" ) var _ pilosa.TranslateStore = (*TranslateStore)(nil) diff --git a/pilosa_test.go b/pilosa_test.go index 1c98686e5..59b6fe082 100644 --- a/pilosa_test.go +++ b/pilosa_test.go @@ -18,8 +18,8 @@ import ( "strings" "testing" - "github.com/pilosa/pilosa" - _ "github.com/pilosa/pilosa/test" + "github.com/pilosa/pilosa/v2" + _ "github.com/pilosa/pilosa/v2/test" ) func TestAddressWithDefaults(t *testing.T) { diff --git a/pql/ast_test.go b/pql/ast_test.go index 4b130c610..e9bda934e 100644 --- a/pql/ast_test.go +++ b/pql/ast_test.go @@ -18,7 +18,7 @@ import ( "reflect" "testing" - "github.com/pilosa/pilosa/pql" + "github.com/pilosa/pilosa/v2/pql" ) // Ensure call can be converted into a string. diff --git a/pql/parser_test.go b/pql/parser_test.go index 416746691..3e3ef719c 100644 --- a/pql/parser_test.go +++ b/pql/parser_test.go @@ -18,8 +18,8 @@ import ( "reflect" "testing" - "github.com/pilosa/pilosa/pql" - _ "github.com/pilosa/pilosa/test" + "github.com/pilosa/pilosa/v2/pql" + _ "github.com/pilosa/pilosa/v2/test" ) // Ensure the parser can parse PQL. diff --git a/prometheus/prometheus.go b/prometheus/prometheus.go index b29267019..cc6392c77 100644 --- a/prometheus/prometheus.go +++ b/prometheus/prometheus.go @@ -20,8 +20,8 @@ import ( "sync" "time" - "github.com/pilosa/pilosa/logger" - "github.com/pilosa/pilosa/stats" + "github.com/pilosa/pilosa/v2/logger" + "github.com/pilosa/pilosa/v2/stats" "github.com/prometheus/client_golang/prometheus" ) diff --git a/prometheus/prometheus_test.go b/prometheus/prometheus_test.go index d40a0ecd8..6b960e278 100644 --- a/prometheus/prometheus_test.go +++ b/prometheus/prometheus_test.go @@ -19,7 +19,7 @@ import ( "testing" "time" - pilosaPrometheus "github.com/pilosa/pilosa/prometheus" + pilosaPrometheus "github.com/pilosa/pilosa/v2/prometheus" "github.com/prometheus/client_golang/prometheus" io_prometheus_client "github.com/prometheus/client_model/go" ) diff --git a/roaring/roaring_stats.go b/roaring/roaring_stats.go index 046c0f087..c43362c99 100644 --- a/roaring/roaring_stats.go +++ b/roaring/roaring_stats.go @@ -17,7 +17,7 @@ package roaring import ( - "github.com/pilosa/pilosa/stats" + "github.com/pilosa/pilosa/v2/stats" ) var statsEv = stats.NewExpvarStatsClient() diff --git a/roaring/roaring_test.go b/roaring/roaring_test.go index dc3fc4c76..836fd8de3 100644 --- a/roaring/roaring_test.go +++ b/roaring/roaring_test.go @@ -25,9 +25,9 @@ import ( "testing/quick" "time" - "github.com/pilosa/pilosa" - "github.com/pilosa/pilosa/roaring" - _ "github.com/pilosa/pilosa/test" + "github.com/pilosa/pilosa/v2" + "github.com/pilosa/pilosa/v2/roaring" + _ "github.com/pilosa/pilosa/v2/test" ) func TestContainerCount(t *testing.T) { diff --git a/row.go b/row.go index 09a3390dc..fd2104967 100644 --- a/row.go +++ b/row.go @@ -18,7 +18,7 @@ import ( "encoding/json" "sort" - "github.com/pilosa/pilosa/roaring" + "github.com/pilosa/pilosa/v2/roaring" "github.com/pkg/errors" ) diff --git a/row_test.go b/row_test.go index 49559f131..a1fd7de4b 100644 --- a/row_test.go +++ b/row_test.go @@ -19,7 +19,7 @@ import ( "reflect" "testing" - "github.com/pilosa/pilosa" + "github.com/pilosa/pilosa/v2" ) // Ensure a row can be merged diff --git a/server.go b/server.go index c2b9d7970..907745be6 100644 --- a/server.go +++ b/server.go @@ -27,9 +27,9 @@ import ( "sync" "time" - "github.com/pilosa/pilosa/logger" - "github.com/pilosa/pilosa/roaring" - "github.com/pilosa/pilosa/stats" + "github.com/pilosa/pilosa/v2/logger" + "github.com/pilosa/pilosa/v2/roaring" + "github.com/pilosa/pilosa/v2/stats" "github.com/pkg/errors" "golang.org/x/sync/errgroup" ) diff --git a/server/cluster_test.go b/server/cluster_test.go index b6f6cf6bf..342d2f65e 100644 --- a/server/cluster_test.go +++ b/server/cluster_test.go @@ -24,8 +24,8 @@ import ( "testing" "time" - "github.com/pilosa/pilosa" - "github.com/pilosa/pilosa/test" + "github.com/pilosa/pilosa/v2" + "github.com/pilosa/pilosa/v2/test" "golang.org/x/sync/errgroup" ) diff --git a/server/config.go b/server/config.go index 7f38fa872..d33af0596 100644 --- a/server/config.go +++ b/server/config.go @@ -24,8 +24,8 @@ import ( "strings" "time" - "github.com/pilosa/pilosa/gossip" - "github.com/pilosa/pilosa/toml" + "github.com/pilosa/pilosa/v2/gossip" + "github.com/pilosa/pilosa/v2/toml" "github.com/pkg/errors" jaeger "github.com/uber/jaeger-client-go" ) diff --git a/server/config_test.go b/server/config_test.go index 78b66b5d5..593551463 100644 --- a/server/config_test.go +++ b/server/config_test.go @@ -19,8 +19,8 @@ import ( "testing" "time" - "github.com/pilosa/pilosa/server" - "github.com/pilosa/pilosa/toml" + "github.com/pilosa/pilosa/v2/server" + "github.com/pilosa/pilosa/v2/toml" ) func Test_NewConfig(t *testing.T) { diff --git a/server/enterprise.go b/server/enterprise.go index 021c00e7c..3db4a5a8b 100644 --- a/server/enterprise.go +++ b/server/enterprise.go @@ -17,5 +17,5 @@ package server import ( - _ "github.com/pilosa/pilosa/enterprise" + _ "github.com/pilosa/pilosa/v2/enterprise" ) diff --git a/server/handler_test.go b/server/handler_test.go index c4e98d7f3..cf58a5154 100644 --- a/server/handler_test.go +++ b/server/handler_test.go @@ -30,11 +30,11 @@ import ( "testing" "time" - "github.com/pilosa/pilosa" - "github.com/pilosa/pilosa/encoding/proto" - "github.com/pilosa/pilosa/http" - "github.com/pilosa/pilosa/server" - "github.com/pilosa/pilosa/test" + "github.com/pilosa/pilosa/v2" + "github.com/pilosa/pilosa/v2/encoding/proto" + "github.com/pilosa/pilosa/v2/http" + "github.com/pilosa/pilosa/v2/server" + "github.com/pilosa/pilosa/v2/test" ) func TestHandler_PostSchemaCluster(t *testing.T) { diff --git a/server/server.go b/server/server.go index 394cf3a87..d4b1c7b07 100644 --- a/server/server.go +++ b/server/server.go @@ -36,18 +36,18 @@ import ( "golang.org/x/sync/errgroup" - "github.com/pilosa/pilosa" - "github.com/pilosa/pilosa/boltdb" - "github.com/pilosa/pilosa/encoding/proto" - "github.com/pilosa/pilosa/gcnotify" - "github.com/pilosa/pilosa/gopsutil" - "github.com/pilosa/pilosa/gossip" - "github.com/pilosa/pilosa/http" - "github.com/pilosa/pilosa/logger" - "github.com/pilosa/pilosa/prometheus" - "github.com/pilosa/pilosa/stats" - "github.com/pilosa/pilosa/statsd" - "github.com/pilosa/pilosa/syswrap" + "github.com/pilosa/pilosa/v2" + "github.com/pilosa/pilosa/v2/boltdb" + "github.com/pilosa/pilosa/v2/encoding/proto" + "github.com/pilosa/pilosa/v2/gcnotify" + "github.com/pilosa/pilosa/v2/gopsutil" + "github.com/pilosa/pilosa/v2/gossip" + "github.com/pilosa/pilosa/v2/http" + "github.com/pilosa/pilosa/v2/logger" + "github.com/pilosa/pilosa/v2/prometheus" + "github.com/pilosa/pilosa/v2/stats" + "github.com/pilosa/pilosa/v2/statsd" + "github.com/pilosa/pilosa/v2/syswrap" "github.com/pkg/errors" ) diff --git a/server/server_test.go b/server/server_test.go index d968792ff..66556856e 100644 --- a/server/server_test.go +++ b/server/server_test.go @@ -31,11 +31,11 @@ import ( "time" "github.com/pelletier/go-toml" - "github.com/pilosa/pilosa" - "github.com/pilosa/pilosa/http" - "github.com/pilosa/pilosa/roaring" - "github.com/pilosa/pilosa/server" - "github.com/pilosa/pilosa/test" + "github.com/pilosa/pilosa/v2" + "github.com/pilosa/pilosa/v2/http" + "github.com/pilosa/pilosa/v2/roaring" + "github.com/pilosa/pilosa/v2/server" + "github.com/pilosa/pilosa/v2/test" "golang.org/x/sync/errgroup" ) diff --git a/server/setup_logger.go b/server/setup_logger.go index 3473faa43..3dd0ff849 100644 --- a/server/setup_logger.go +++ b/server/setup_logger.go @@ -20,7 +20,7 @@ import ( "os" "syscall" - "github.com/pilosa/pilosa/logger" + "github.com/pilosa/pilosa/v2/logger" "github.com/pkg/errors" ) diff --git a/server/setup_logger_arm64.go b/server/setup_logger_arm64.go index 090ac1395..4a0591582 100644 --- a/server/setup_logger_arm64.go +++ b/server/setup_logger_arm64.go @@ -18,7 +18,7 @@ import ( "os" "syscall" - "github.com/pilosa/pilosa/logger" + "github.com/pilosa/pilosa/v2/logger" "github.com/pkg/errors" ) diff --git a/stats/stats.go b/stats/stats.go index 169df0d6d..9c6944d4e 100644 --- a/stats/stats.go +++ b/stats/stats.go @@ -21,7 +21,7 @@ import ( "sync" "time" - "github.com/pilosa/pilosa/logger" + "github.com/pilosa/pilosa/v2/logger" ) // Expvar global expvar map. diff --git a/stats/stats_test.go b/stats/stats_test.go index 483befcb0..5c730bf97 100644 --- a/stats/stats_test.go +++ b/stats/stats_test.go @@ -21,11 +21,11 @@ import ( "testing" "time" - "github.com/pilosa/pilosa" - "github.com/pilosa/pilosa/http" - "github.com/pilosa/pilosa/logger" - "github.com/pilosa/pilosa/stats" - "github.com/pilosa/pilosa/test" + "github.com/pilosa/pilosa/v2" + "github.com/pilosa/pilosa/v2/http" + "github.com/pilosa/pilosa/v2/logger" + "github.com/pilosa/pilosa/v2/stats" + "github.com/pilosa/pilosa/v2/test" ) // TestMultiStatClient_Expvar run the multistat client with exp var diff --git a/statsd/statsd.go b/statsd/statsd.go index eaf8facf1..ccd7afd39 100644 --- a/statsd/statsd.go +++ b/statsd/statsd.go @@ -19,8 +19,8 @@ import ( "time" "github.com/DataDog/datadog-go/statsd" - "github.com/pilosa/pilosa/logger" - "github.com/pilosa/pilosa/stats" + "github.com/pilosa/pilosa/v2/logger" + "github.com/pilosa/pilosa/v2/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 38228349b..e060b2b18 100644 --- a/statsd/statsd_test.go +++ b/statsd/statsd_test.go @@ -19,8 +19,8 @@ import ( "testing" "time" - "github.com/pilosa/pilosa/statsd" - _ "github.com/pilosa/pilosa/test" + "github.com/pilosa/pilosa/v2/statsd" + _ "github.com/pilosa/pilosa/v2/test" ) func TestStatsClient_WithTags(t *testing.T) { diff --git a/test/field.go b/test/field.go index 362ff5c2b..b95e4f88b 100644 --- a/test/field.go +++ b/test/field.go @@ -19,7 +19,7 @@ import ( "os" "testing" - "github.com/pilosa/pilosa" + "github.com/pilosa/pilosa/v2" ) // Field represents a test wrapper for pilosa.Field. diff --git a/test/holder.go b/test/holder.go index 8d080e493..b5e7c1260 100644 --- a/test/holder.go +++ b/test/holder.go @@ -19,8 +19,8 @@ import ( "os" "time" - "github.com/pilosa/pilosa" - "github.com/pilosa/pilosa/boltdb" + "github.com/pilosa/pilosa/v2" + "github.com/pilosa/pilosa/v2/boltdb" ) // Holder is a test wrapper for pilosa.Holder. diff --git a/test/index.go b/test/index.go index 066ea615f..7f461b927 100644 --- a/test/index.go +++ b/test/index.go @@ -18,7 +18,7 @@ import ( "io/ioutil" "os" - "github.com/pilosa/pilosa" + "github.com/pilosa/pilosa/v2" ) // Index represents a test wrapper for pilosa.Index. diff --git a/test/pilosa.go b/test/pilosa.go index 4a2cd2973..f742939a2 100644 --- a/test/pilosa.go +++ b/test/pilosa.go @@ -28,10 +28,10 @@ import ( "testing" "time" - "github.com/pilosa/pilosa" - "github.com/pilosa/pilosa/encoding/proto" - "github.com/pilosa/pilosa/http" - "github.com/pilosa/pilosa/server" + "github.com/pilosa/pilosa/v2" + "github.com/pilosa/pilosa/v2/encoding/proto" + "github.com/pilosa/pilosa/v2/http" + "github.com/pilosa/pilosa/v2/server" "github.com/pkg/errors" ) diff --git a/test/pilosa_test.go b/test/pilosa_test.go index 1d0feb237..3ba9d432a 100644 --- a/test/pilosa_test.go +++ b/test/pilosa_test.go @@ -21,8 +21,8 @@ import ( "strings" "testing" - "github.com/pilosa/pilosa" - "github.com/pilosa/pilosa/test" + "github.com/pilosa/pilosa/v2" + "github.com/pilosa/pilosa/v2/test" ) func TestNewCluster(t *testing.T) { diff --git a/tracing/opentracing/opentracing.go b/tracing/opentracing/opentracing.go index 47ec439fc..79daf5abc 100644 --- a/tracing/opentracing/opentracing.go +++ b/tracing/opentracing/opentracing.go @@ -21,7 +21,7 @@ import ( "github.com/opentracing/opentracing-go" "github.com/opentracing/opentracing-go/ext" - "github.com/pilosa/pilosa/tracing" + "github.com/pilosa/pilosa/v2/tracing" ) // Ensure type implements interface. diff --git a/translate.go b/translate.go index 1b6eb6244..1dcb3e47a 100644 --- a/translate.go +++ b/translate.go @@ -29,7 +29,7 @@ import ( "time" "github.com/cespare/xxhash" - "github.com/pilosa/pilosa/logger" + "github.com/pilosa/pilosa/v2/logger" "github.com/pkg/errors" ) diff --git a/translate_test.go b/translate_test.go index 344a820d5..a722dd6cc 100644 --- a/translate_test.go +++ b/translate_test.go @@ -29,7 +29,7 @@ import ( "time" "github.com/google/go-cmp/cmp" - "github.com/pilosa/pilosa" + "github.com/pilosa/pilosa/v2" ) func TestTranslateFile_TranslateColumn(t *testing.T) { diff --git a/view.go b/view.go index 60841c190..72700c9b6 100644 --- a/view.go +++ b/view.go @@ -25,10 +25,10 @@ import ( "sync" "time" - "github.com/pilosa/pilosa/logger" - "github.com/pilosa/pilosa/pql" - "github.com/pilosa/pilosa/roaring" - "github.com/pilosa/pilosa/stats" + "github.com/pilosa/pilosa/v2/logger" + "github.com/pilosa/pilosa/v2/pql" + "github.com/pilosa/pilosa/v2/roaring" + "github.com/pilosa/pilosa/v2/stats" "github.com/pkg/errors" "golang.org/x/sync/errgroup" )