v2.0.0

Co-authored-by: Cody Soyland <codysoyland@gmail.com>

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 ..

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"
 )

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) {

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.

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.

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"
 )
 

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 (

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.

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"

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"
 )
 

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

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

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

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) {

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

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"
 )
 

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) {

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

cmd/pilosa/main.go

@@ -21,7 +21,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/pilosa/pilosa/cmd"
+	"github.com/pilosa/pilosa/v2/cmd"
 )
 
 func main() {

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"

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"
 )
 

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"

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"
 )
 

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"
 )
 

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"
 )

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.

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) {

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"
 )
 

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) {

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"
 )
 

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"
 )
 

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) {

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"
 )
 

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"
 )
 

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"
 )
 

diagnostics.go

@@ -24,7 +24,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/pilosa/pilosa/logger"
+	"github.com/pilosa/pilosa/v2/logger"
 	"github.com/pkg/errors"
 )
 

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) {

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"
 )
 

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"
 )
 

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) {

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"
 )
 

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"
 )

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.

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.

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"
 )
 

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"
 )
 

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.

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
 

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"

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) {

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"
 )
 

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"
 )

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 {

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) {

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"
 )
 

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.

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"
 )

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

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) {

http/translator.go

@@ -24,7 +24,7 @@ import (
 	"net/url"
 	"strconv"
 
-	"github.com/pilosa/pilosa"
+	"github.com/pilosa/pilosa/v2"
 )
 
 // Ensure implementation implements inteface.

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) {

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"
 )

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"
 )
 

inmem/translator.go

@@ -19,7 +19,7 @@ import (
 	"io"
 	"sync"
 
-	"github.com/pilosa/pilosa"
+	"github.com/pilosa/pilosa/v2"
 )
 
 // Ensure type implements interface.

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) {

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) {

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{}

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) {

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.

mock/translator.go

@@ -18,7 +18,7 @@ import (
 	"context"
 	"io"
 
-	"github.com/pilosa/pilosa"
+	"github.com/pilosa/pilosa/v2"
 )
 
 var _ pilosa.TranslateStore = (*TranslateStore)(nil)

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) {

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.

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.

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"
 )
 

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"
 )

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()

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) {

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"
 )
 

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

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"
 )

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"
 )
 

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"
 )

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) {

server/enterprise.go

@@ -17,5 +17,5 @@
 package server
 
 import (
-	_ "github.com/pilosa/pilosa/enterprise"
+	_ "github.com/pilosa/pilosa/v2/enterprise"
 )

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) {

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"
 )
 

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"
 )
 

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"
 )
 

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"
 )
 

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.

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

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

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) {

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.

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.

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.

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"
 )
 

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) {

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.

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"
 )