Skip to content
This repository has been archived by the owner on Feb 21, 2024. It is now read-only.

Commit

Permalink
Upgrade to v2 (#2072)
Browse files Browse the repository at this point in the history 
Upgrade to v2
  • Loading branch information
@benbjohnson
benbjohnson committed Oct 9, 2019
2 parents 61dace4 + c7c9c1e commit f9e4787
Show file tree
Hide file tree
Showing 102 changed files with 224 additions and 224 deletions.
6 changes: 3 additions & 3 deletions Makefile
View file
Expand Up @@ -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))
Expand Down Expand Up @@ -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 ..
Expand Down
8 changes: 4 additions & 4 deletions api.go
View file
Expand Up @@ -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"
)
Expand Down
6 changes: 3 additions & 3 deletions api_test.go
View file
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion attr.go
View file
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions attr_test.go
View file
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion boltdb/attrstore.go
View file
Expand Up @@ -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"
)

Expand Down
4 changes: 2 additions & 2 deletions cache.go
View file
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion cache_test.go
View file
Expand Up @@ -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.
Expand Down
8 changes: 4 additions & 4 deletions cluster.go
View file
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions cluster_internal_test.go
View file
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/check.go
View file
Expand Up @@ -21,7 +21,7 @@ import (

"github.com/spf13/cobra"

"github.com/pilosa/pilosa/ctl"
"github.com/pilosa/pilosa/v2/ctl"
)

var checker *ctl.CheckCommand
Expand Down
4 changes: 2 additions & 2 deletions cmd/config.go
View file
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cmd/export.go
View file
Expand Up @@ -20,7 +20,7 @@ import (

"github.com/spf13/cobra"

"github.com/pilosa/pilosa/ctl"
"github.com/pilosa/pilosa/v2/ctl"
)

var Exporter *ctl.ExportCommand
Expand Down
2 changes: 1 addition & 1 deletion cmd/export_test.go
View file
Expand Up @@ -18,7 +18,7 @@ import (
"strings"
"testing"

"github.com/pilosa/pilosa/cmd"
"github.com/pilosa/pilosa/v2/cmd"
)

func TestExportHelp(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion cmd/generate_config.go
View file
Expand Up @@ -20,7 +20,7 @@ import (

"github.com/spf13/cobra"

"github.com/pilosa/pilosa/ctl"
"github.com/pilosa/pilosa/v2/ctl"
)

var generateConf *ctl.GenerateConfigCommand
Expand Down
4 changes: 2 additions & 2 deletions cmd/import.go
View file
Expand Up @@ -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"
)

Expand Down
4 changes: 2 additions & 2 deletions cmd/import_test.go
View file
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion cmd/inspect.go
View file
Expand Up @@ -21,7 +21,7 @@ import (

"github.com/spf13/cobra"

"github.com/pilosa/pilosa/ctl"
"github.com/pilosa/pilosa/v2/ctl"
)

var inspector *ctl.InspectCommand
Expand Down
2 changes: 1 addition & 1 deletion cmd/pilosa/main.go
View file
Expand Up @@ -21,7 +21,7 @@ import (
"fmt"
"os"

"github.com/pilosa/pilosa/cmd"
"github.com/pilosa/pilosa/v2/cmd"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion cmd/root.go
View file
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cmd/root_test.go
View file
Expand Up @@ -25,7 +25,7 @@ import (

"time"

"github.com/pilosa/pilosa/cmd"
"github.com/pilosa/pilosa/v2/cmd"
"github.com/spf13/cobra"
)

Expand Down
8 changes: 4 additions & 4 deletions cmd/server.go
View file
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions cmd/server_test.go
View file
Expand Up @@ -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"
)

Expand Down
4 changes: 2 additions & 2 deletions ctl/check.go
View file
Expand Up @@ -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"
)

Expand Down
4 changes: 2 additions & 2 deletions ctl/common.go
View file
Expand Up @@ -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"
)
Expand Down
4 changes: 2 additions & 2 deletions ctl/config.go
View file
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion ctl/config_test.go
View file
Expand Up @@ -22,7 +22,7 @@ import (
"strings"
"testing"

"github.com/pilosa/pilosa/server"
"github.com/pilosa/pilosa/v2/server"
)

func TestConfigCommand_Run(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions ctl/export.go
View file
Expand Up @@ -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"
)

Expand Down
4 changes: 2 additions & 2 deletions ctl/export_test.go
View file
Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions ctl/generate_config.go
View file
Expand Up @@ -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"
)

Expand Down
6 changes: 3 additions & 3 deletions ctl/import.go
View file
Expand Up @@ -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"
)

Expand Down
4 changes: 2 additions & 2 deletions ctl/import_test.go
View file
Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions ctl/inspect.go
View file
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion ctl/server.go
View file
Expand Up @@ -17,7 +17,7 @@ package ctl
import (
"time"

"github.com/pilosa/pilosa/server"
"github.com/pilosa/pilosa/v2/server"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion ctl/server_test.go
View file
Expand Up @@ -18,7 +18,7 @@ import (
"bytes"
"testing"

"github.com/pilosa/pilosa/server"
"github.com/pilosa/pilosa/v2/server"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion diagnostics.go
View file
Expand Up @@ -24,7 +24,7 @@ import (
"sync"
"time"

"github.com/pilosa/pilosa/logger"
"github.com/pilosa/pilosa/v2/logger"
"github.com/pkg/errors"
)

Expand Down

0 comments on commit f9e4787

Please sign in to comment.