Upgrade to v2

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