rewrite imports

Makefile

@@ -8,16 +8,16 @@ export GO_GENERATE=go generate $(GO_ARGS)
 SOURCES := $(shell find . -name '*.go' -not -name '*_test.go')
 SOURCES_NO_VENDOR := $(shell find . -path ./vendor -prune -o -name "*.go" -not -name '*_test.go' -print)
 
-all: Gopkg.lock $(SUBDIRS) bin/ifql bin/ifqld
+all: Gopkg.lock $(SUBDIRS) bin/platform/query bin/ifqld
 
 $(SUBDIRS): bin/pigeon bin/cmpgen
 	$(MAKE) -C $@ $(MAKECMDGOALS)
 
-bin/ifql: $(SOURCES) bin/pigeon bin/cmpgen
-	$(GO_BUILD) -i -o bin/ifql ./cmd/ifql
+bin/platform/query: $(SOURCES) bin/pigeon bin/cmpgen
+	$(GO_BUILD) -i -o bin/platform/query ./cmd/ifql
 
-bin/ifqld: $(SOURCES) bin/pigeon bin/cmpgen
-	$(GO_BUILD) -i -o bin/ifqld ./cmd/ifqld
+bin/platform/queryd: $(SOURCES) bin/pigeon bin/cmpgen
+	$(GO_BUILD) -i -o bin/platform/queryd ./cmd/ifqld
 
 bin/pigeon: ./vendor/github.com/mna/pigeon/main.go
 	go build -i -o bin/pigeon  ./vendor/github.com/mna/pigeon
@@ -37,13 +37,13 @@ fmt: $(SOURCES_NO_VENDOR)
 update:
 	dep ensure -v -update
 
-test: Gopkg.lock bin/ifql
+test: Gopkg.lock bin/platform/query
 	$(GO_TEST) ./...
 
-test-race: Gopkg.lock bin/ifql
+test-race: Gopkg.lock bin/platform/query
 	$(GO_TEST) -race ./...
 
-bench: Gopkg.lock bin/ifql
+bench: Gopkg.lock bin/platform/query
 	$(GO_TEST) -bench=. -run=^$$ ./...
 
 bin/goreleaser:
@@ -55,10 +55,10 @@ dist: bin/goreleaser
 release: dist release-docker
 
 release-docker:
-	docker build -t quay.io/influxdb/ifqld:latest .
-	docker tag quay.io/influxdb/ifqld:latest quay.io/influxdb/ifqld:${VERSION}
-	docker push quay.io/influxdb/ifqld:latest
-	docker push quay.io/influxdb/ifqld:${VERSION}
+	docker build -t quay.io/influxdb/platform/queryd:latest .
+	docker tag quay.io/influxdb/platform/queryd:latest quay.io/influxdb/ifqld:${VERSION}
+	docker push quay.io/influxdb/platform/queryd:latest
+	docker push quay.io/influxdb/platform/queryd:${VERSION}
 
 clean: $(SUBDIRS)
 	rm -rf bin dist

README.md

@@ -6,7 +6,7 @@ servers.
 `ifqld` runs on port `8093` by default
 
 ### Specification
-Here is the rough design specification for details until we get documentation up: http://bit.ly/ifql-spec
+Here is the rough design specification for details until we get documentation up: http://bit.ly/platform/query-spec
 
 ### INSTALLATION
 1. Upgrade to InfluxDB >= 1.4.1
@@ -25,7 +25,7 @@ the InfluxDB server. InfluxDB will open port `8082` to accept **IFQL** queries.
   bind-address = ":8082"
 ```
 
-3. Download `ifqld` and install from https://github.com/influxdata/ifql/releases
+3. Download `ifqld` and install from https://github.com/influxdata/platform/query/releases
 
 4. Start `ifqld` with the InfluxDB host and port of `8082`. To run in federated
 mode (see below), add the `--host` option for each InfluxDB host.

ast/asttest/cmpgen/main.go

@@ -20,7 +20,7 @@ func main() {
 	}
 	defer f.Close()
 
-	pkg, err := importer.For("source", nil).Import("github.com/influxdata/ifql/ast")
+	pkg, err := importer.For("source", nil).Import("github.com/influxdata/platform/query/ast")
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -34,7 +34,7 @@ func main() {
 	fmt.Fprintln(f, `import (`)
 	fmt.Fprintln(f, `	"github.com/google/go-cmp/cmp"`)
 	fmt.Fprintln(f, `	"github.com/google/go-cmp/cmp/cmpopts"`)
-	fmt.Fprintln(f, `	"github.com/influxdata/ifql/ast"`)
+	fmt.Fprintln(f, `	"github.com/influxdata/platform/query/ast"`)
 	fmt.Fprintln(f, `)`)
 	fmt.Fprintln(f)
 	fmt.Fprintln(f, `var IgnoreBaseNodeOptions = []cmp.Option{`)

ast/asttest/cmpopts.go

@@ -5,7 +5,7 @@ package asttest
 import (
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
-	"github.com/influxdata/ifql/ast"
+	"github.com/influxdata/platform/query/ast"
 )
 
 var IgnoreBaseNodeOptions = []cmp.Option{

ast/json_test.go

@@ -8,8 +8,8 @@ import (
 	"time"
 
 	"github.com/google/go-cmp/cmp"
-	"github.com/influxdata/ifql/ast"
-	"github.com/influxdata/ifql/ast/asttest"
+	"github.com/influxdata/platform/query/ast"
+	"github.com/influxdata/platform/query/ast/asttest"
 )
 
 func TestJSONMarshal(t *testing.T) {

compile.go

@@ -7,10 +7,10 @@ import (
 	"regexp"
 	"time"
 
-	"github.com/influxdata/ifql/interpreter"
-	"github.com/influxdata/ifql/parser"
-	"github.com/influxdata/ifql/semantic"
-	"github.com/influxdata/ifql/values"
+	"github.com/influxdata/platform/query/interpreter"
+	"github.com/influxdata/platform/query/parser"
+	"github.com/influxdata/platform/query/semantic"
+	"github.com/influxdata/platform/query/values"
 	opentracing "github.com/opentracing/opentracing-go"
 	"github.com/pkg/errors"
 )

compiler/compiler.go

@@ -4,8 +4,8 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/influxdata/ifql/semantic"
-	"github.com/influxdata/ifql/values"
+	"github.com/influxdata/platform/query/semantic"
+	"github.com/influxdata/platform/query/values"
 )
 
 func Compile(f *semantic.FunctionExpression, inTypes map[string]semantic.Type, builtinScope Scope, builtinDeclarations semantic.DeclarationScope) (Func, error) {

compiler/compiler_test.go

@@ -5,11 +5,11 @@ import (
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
-	"github.com/influxdata/ifql/ast"
-	"github.com/influxdata/ifql/compiler"
-	"github.com/influxdata/ifql/semantic"
-	"github.com/influxdata/ifql/semantic/semantictest"
-	"github.com/influxdata/ifql/values"
+	"github.com/influxdata/platform/query/ast"
+	"github.com/influxdata/platform/query/compiler"
+	"github.com/influxdata/platform/query/semantic"
+	"github.com/influxdata/platform/query/semantic/semantictest"
+	"github.com/influxdata/platform/query/values"
 )
 
 var CmpOptions []cmp.Option

compiler/runtime.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"regexp"
 
-	"github.com/influxdata/ifql/ast"
-	"github.com/influxdata/ifql/semantic"
-	"github.com/influxdata/ifql/values"
+	"github.com/influxdata/platform/query/ast"
+	"github.com/influxdata/platform/query/semantic"
+	"github.com/influxdata/platform/query/values"
 )
 
 type Evaluator interface {

complete/complete.go

@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"sort"
 
-	"github.com/influxdata/ifql/interpreter"
-	"github.com/influxdata/ifql/semantic"
+	"github.com/influxdata/platform/query/interpreter"
+	"github.com/influxdata/platform/query/semantic"
 )
 
 type functionType interface {

complete/complete_test.go

@@ -4,11 +4,11 @@ import (
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
-	_ "github.com/influxdata/ifql/functions"
-	"github.com/influxdata/ifql/interpreter"
-	"github.com/influxdata/ifql/query"
-	"github.com/influxdata/ifql/semantic"
-	"github.com/influxdata/ifql/values"
+	_ "github.com/influxdata/platform/query/functions"
+	"github.com/influxdata/platform/query/interpreter"
+	"github.com/influxdata/platform/query"
+	"github.com/influxdata/platform/query/semantic"
+	"github.com/influxdata/platform/query/values"
 )
 
 var scope *interpreter.Scope

control/controller.go

@@ -7,10 +7,10 @@ import (
 	"sync"
 	"time"
 
-	"github.com/influxdata/ifql/id"
-	"github.com/influxdata/ifql/query"
-	"github.com/influxdata/ifql/query/execute"
-	"github.com/influxdata/ifql/query/plan"
+	"github.com/influxdata/platform/query/id"
+	"github.com/influxdata/platform/query"
+	"github.com/influxdata/platform/query/execute"
+	"github.com/influxdata/platform/query/plan"
 	opentracing "github.com/opentracing/opentracing-go"
 	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"

csv/result.go

@@ -9,8 +9,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/influxdata/ifql/query/execute"
-	"github.com/influxdata/ifql/values"
+	"github.com/influxdata/platform/query/execute"
+	"github.com/influxdata/platform/query/values"
 	"github.com/influxdata/platform"
 	"github.com/pkg/errors"
 )

csv/result_test.go

@@ -8,9 +8,9 @@ import (
 
 	"github.com/andreyvit/diff"
 	"github.com/google/go-cmp/cmp"
-	"github.com/influxdata/ifql/query/execute"
-	"github.com/influxdata/ifql/query/execute/executetest"
-	"github.com/influxdata/ifql/values"
+	"github.com/influxdata/platform/query/execute"
+	"github.com/influxdata/platform/query/execute/executetest"
+	"github.com/influxdata/platform/query/values"
 	"github.com/influxdata/platform/query/csv"
 )
 

dependency.go

@@ -3,7 +3,7 @@ package query
 import (
 	"context"
 
-	"github.com/influxdata/ifql/id"
+	"github.com/influxdata/platform/query/id"
 	"github.com/influxdata/platform"
 )
 

docs/Language.md

@@ -9,7 +9,7 @@ The IFQL langauage is used to construct query specifications.
 
 # Syntax
 
-The langauage syntax is defined by the ifql/ifql.peg grammar.
+The langauage syntax is defined by the ifql/platform/query.peg grammar.
 
 ## Keyword Arguments