Merge branch 'master' into db-specific-slices

Godeps/Godeps.json

@@ -1,5 +1,5 @@
 {
-	"ImportPath": "github.com/umbel/pilosa",
+	"ImportPath": "github.com/pilosa/pilosa",
 	"GoVersion": "go1.7",
 	"GodepVersion": "v75",
 	"Packages": [

README-dev.md

@@ -4,21 +4,21 @@ Development Environment
 
 Install Go versions 1.6.2+ or 1.7 for your platform.
 
-Fork `github.com/umbel/pilosa` to your own account. The forked repo will be private.
+Fork `github.com/pilosa/pilosa` to your own account. The forked repo will be private.
 
 Make sure `$GOPATH` environment variable points to your Go working directory and `$PATH` incudes `$GOPATH/bin`.
 
-Create a directory (note that we use `github.com/umbel`, NOT `github.com/USER`) and clone your own Pilosa repo:
+Create a directory (note that we use `github.com/pilosa`, NOT `github.com/USER`) and clone your own Pilosa repo:
 
 ```sh
-mkdir -p ${GOPATH}/src/github.com/umbel && cd $_
+mkdir -p ${GOPATH}/src/github.com/pilosa && cd $_
 git clone git@github.com:${USER}/pilosa.git
 ```
 
 `cd` to your pilosa directory:
 
 ```sh
-cd ${GOPATH}/src/github.com/umbel/pilosa
+cd ${GOPATH}/src/github.com/pilosa/pilosa
 ```
 
 Install `godep` to manage dependencies:
@@ -30,16 +30,16 @@ go get -u github.com/tools/godep
 Install Pilosa command line tools:
 
 ```sh
-go install github.com/umbel/pilosa/...
+go install github.com/pilosa/pilosa/...
 ```
 
 Running `pilosa` should now run a Pilosa instance.
 
-In order to sync your fork with upstream Umbel repo, add an *upstream* to your repo:
+In order to sync your fork with upstream Pilosa repo, add an *upstream* to your repo:
 
 ```sh
-cd ${GOPATH}/src/github.com/umbel/pilosa
-git remote add upstream git@github.com:umbel/pilosa.git
+cd ${GOPATH}/src/github.com/pilosa/pilosa
+git remote add upstream git@github.com:pilosa/pilosa.git
 ```
 
 Before starting to work on a task, sync your branch with the upstream:

README.md

@@ -10,13 +10,13 @@ Pilosa requires Go 1.7 or greater.
 You can download the source by running `go get`:
 
 ```sh
-$ go get github.com/umbel/pilosa
+$ go get github.com/pilosa/pilosa
 ```
 
 Now you can install the `pilosa` binary:
 
 ```sh
-$ go install github.com/umbel/pilosa/...
+$ go install github.com/pilosa/pilosa/...
 ```
 
 Now run `pilosa` with the default configuration:

attr.go

@@ -11,7 +11,7 @@ import (
 
 	"github.com/boltdb/bolt"
 	"github.com/gogo/protobuf/proto"
-	"github.com/umbel/pilosa/internal"
+	"github.com/pilosa/pilosa/internal"
 )
 
 // AttrBlockSize is the size of attribute blocks for anti-entropy.

attr_test.go

@@ -6,7 +6,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/umbel/pilosa"
+	"github.com/pilosa/pilosa"
 )
 
 // Ensure database can set and retrieve profile attributes.

bitmap.go

@@ -6,8 +6,8 @@ import (
 	"encoding/json"
 	"sort"
 
-	"github.com/umbel/pilosa/internal"
-	"github.com/umbel/pilosa/roaring"
+	"github.com/pilosa/pilosa/internal"
+	"github.com/pilosa/pilosa/roaring"
 )
 
 // Bitmap represents a set of bits.

cache.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/gogo/protobuf/proto"
 	"github.com/golang/groupcache/lru"
-	"github.com/umbel/pilosa/internal"
+	"github.com/pilosa/pilosa/internal"
 )
 
 // Cache represents a cache for bitmap counts.

client.go

@@ -18,7 +18,7 @@ import (
 	"time"
 
 	"github.com/gogo/protobuf/proto"
-	"github.com/umbel/pilosa/internal"
+	"github.com/pilosa/pilosa/internal"
 )
 
 // Client represents a client to the Pilosa cluster.

client_test.go

@@ -7,7 +7,7 @@ import (
 	"testing"
 
 	"github.com/davecgh/go-spew/spew"
-	"github.com/umbel/pilosa"
+	"github.com/pilosa/pilosa"
 )
 
 // Ensure client can bulk import data.

cluster_test.go

@@ -8,7 +8,7 @@ import (
 	"testing/quick"
 
 	"github.com/davecgh/go-spew/spew"
-	"github.com/umbel/pilosa"
+	"github.com/pilosa/pilosa"
 )
 
 // Ensure the cluster can fairly distribute partitions across the nodes.

cmd/pilosa-bench/main.go

@@ -11,7 +11,7 @@ import (
 	"path/filepath"
 	"strconv"
 
-	"github.com/umbel/pilosa"
+	"github.com/pilosa/pilosa"
 )
 
 // BasePort is the initial port used when generating a cluster.

cmd/pilosa-bench/main_test.go

@@ -6,7 +6,7 @@ import (
 	"os"
 	"testing"
 
-	main "github.com/umbel/pilosa/cmd/pilosa-bench"
+	main "github.com/pilosa/pilosa/cmd/pilosa-bench"
 )
 
 // Ensure server count flag can be parsed.

cmd/pilosa/main.go

@@ -14,7 +14,7 @@ import (
 	"time"
 
 	"github.com/BurntSushi/toml"
-	"github.com/umbel/pilosa"
+	"github.com/pilosa/pilosa"
 )
 
 // Build holds the build information passed in at compile time.

cmd/pilosa/main_test.go

@@ -17,8 +17,8 @@ import (
 	"testing/quick"
 
 	"github.com/BurntSushi/toml"
-	"github.com/umbel/pilosa"
-	main "github.com/umbel/pilosa/cmd/pilosa"
+	"github.com/pilosa/pilosa"
+	main "github.com/pilosa/pilosa/cmd/pilosa"
 )
 
 // Ensure program can process queries and maintain consistency.

cmd/pilosactl/main.go

@@ -21,8 +21,8 @@ import (
 	"time"
 	"unsafe"
 
-	"github.com/umbel/pilosa"
-	"github.com/umbel/pilosa/roaring"
+	"github.com/pilosa/pilosa"
+	"github.com/pilosa/pilosa/roaring"
 )
 
 var (

datadog/datadog.go

@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/DataDog/datadog-go/statsd"
-	"github.com/umbel/pilosa"
+	"github.com/pilosa/pilosa"
 )
 
 const (

datadog/datadog_test.go

@@ -4,7 +4,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/umbel/pilosa/datadog"
+	"github.com/pilosa/pilosa/datadog"
 )
 
 func TestStatsClient_WithTags(t *testing.T) {

db_test.go

@@ -5,7 +5,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/umbel/pilosa"
+	"github.com/pilosa/pilosa"
 )
 
 // Ensure database can open and retrieve a frame.

executor.go

@@ -12,8 +12,8 @@ import (
 	"time"
 
 	"github.com/gogo/protobuf/proto"
-	"github.com/umbel/pilosa/internal"
-	"github.com/umbel/pilosa/pql"
+	"github.com/pilosa/pilosa/internal"
+	"github.com/pilosa/pilosa/pql"
 )
 
 // DefaultFrame is the frame used if one is not specified.

executor_test.go

@@ -7,8 +7,8 @@ import (
 	"testing"
 
 	"github.com/davecgh/go-spew/spew"
-	"github.com/umbel/pilosa"
-	"github.com/umbel/pilosa/pql"
+	"github.com/pilosa/pilosa"
+	"github.com/pilosa/pilosa/pql"
 )
 
 // Ensure a bitmap query can be executed.

fragment.go

@@ -22,8 +22,8 @@ import (
 	"unsafe"
 
 	"github.com/gogo/protobuf/proto"
-	"github.com/umbel/pilosa/internal"
-	"github.com/umbel/pilosa/roaring"
+	"github.com/pilosa/pilosa/internal"
+	"github.com/pilosa/pilosa/roaring"
 )
 
 const (

fragment_test.go

@@ -10,7 +10,7 @@ import (
 	"testing"
 
 	"github.com/davecgh/go-spew/spew"
-	"github.com/umbel/pilosa"
+	"github.com/pilosa/pilosa"
 )
 
 // Test flags

frame_test.go

@@ -5,7 +5,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/umbel/pilosa"
+	"github.com/pilosa/pilosa"
 )
 
 // Ensure frame can open and retrieve a fragment.

handler.go

@@ -18,8 +18,8 @@ import (
 	"time"
 
 	"github.com/gogo/protobuf/proto"
-	"github.com/umbel/pilosa/internal"
-	"github.com/umbel/pilosa/pql"
+	"github.com/pilosa/pilosa/internal"
+	"github.com/pilosa/pilosa/pql"
 )
 
 // Handler represents an HTTP handler.

handler_test.go

@@ -15,9 +15,9 @@ import (
 	"testing"
 
 	"github.com/gogo/protobuf/proto"
-	"github.com/umbel/pilosa"
-	"github.com/umbel/pilosa/internal"
-	"github.com/umbel/pilosa/pql"
+	"github.com/pilosa/pilosa"
+	"github.com/pilosa/pilosa/internal"
+	"github.com/pilosa/pilosa/pql"
 )
 
 // Ensure the handler returns "not found" for invalid paths.

index_test.go

@@ -8,8 +8,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/umbel/pilosa"
-	"github.com/umbel/pilosa/pql"
+	"github.com/pilosa/pilosa"
+	"github.com/pilosa/pilosa/pql"
 )
 
 // Ensure index can delete a database and its underlying files.

iterator.go

@@ -3,7 +3,7 @@ package pilosa
 import (
 	"fmt"
 
-	"github.com/umbel/pilosa/roaring"
+	"github.com/pilosa/pilosa/roaring"
 )
 
 // Iterator is an interface for looping over bitmap/profile pairs.

iterator_test.go

@@ -4,7 +4,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/umbel/pilosa"
+	"github.com/pilosa/pilosa"
 )
 
 // Ensure slice iterator and iterate over a set of pairs.

pilosa.go

@@ -4,7 +4,7 @@ import (
 	"errors"
 
 	"github.com/gogo/protobuf/proto"
-	"github.com/umbel/pilosa/internal"
+	"github.com/pilosa/pilosa/internal"
 )
 
 //go:generate protoc --gogo_out=. internal/internal.proto

pql/ast_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/umbel/pilosa/pql"
+	"github.com/pilosa/pilosa/pql"
 )
 
 // Ensure the Bitmap call can be converted into a string.

pql/parser_test.go

@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/davecgh/go-spew/spew"
-	"github.com/umbel/pilosa/pql"
+	"github.com/pilosa/pilosa/pql"
 )
 
 // Ensure the parser can parse a "Bitmap()" function with keyed args.

pql/scanner_test.go

@@ -4,7 +4,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/umbel/pilosa/pql"
+	"github.com/pilosa/pilosa/pql"
 )
 
 func TestScanner_Scan(t *testing.T) {

roaring/roaring_test.go

@@ -10,7 +10,7 @@ import (
 	"testing"
 	"testing/quick"
 
-	"github.com/umbel/pilosa/roaring"
+	"github.com/pilosa/pilosa/roaring"
 )
 
 // Ensure an empty bitmap returns false if checking for existence.

server.go

@@ -15,7 +15,7 @@ import (
 	"time"
 
 	"github.com/gogo/protobuf/proto"
-	"github.com/umbel/pilosa/internal"
+	"github.com/pilosa/pilosa/internal"
 )
 
 // Default server settings.

time_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/umbel/pilosa"
+	"github.com/pilosa/pilosa"
 )
 
 func TestTimeIDsFromRange_1h_0(t *testing.T) {