Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

refactor(repl): remove the querier from the repl (#17031) 

The repl no longer takes in a querier and it will run everything
locally. The spec interface will now not be used and will be removed
from the http endpoint at some point.
pull/17036/head
Jonathan A. Sternberg 2020-02-27 15:06:38 -06:00 committed by GitHub
parent 935180e9bd
commit ff848bcd55
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 34 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
cmd/influx/query.go
View File

@ -42,19 +42,20 @@ func fluxQueryF(cmd *cobra.Command, args []string) error {
return fmt.Errorf("failed to load query: %v", err) return fmt.Errorf("failed to load query: %v", err)
} }
orgSvc, err := newOrganizationService() // TODO(jsternberg): Restore this when the influxdb client source is merged.
if err != nil { // orgSvc, err := newOrganizationService()
return fmt.Errorf("failed to initialized organization service client: %v", err) // if err != nil {
} // return fmt.Errorf("failed to initialized organization service client: %v", err)
// }
orgID, err := queryFlags.org.getID(orgSvc) //
if err != nil { // orgID, err := queryFlags.org.getID(orgSvc)
return err // if err != nil {
} // return err
// }
runtime.FinalizeBuiltIns() runtime.FinalizeBuiltIns()
r, err := getFluxREPL(flags.host, flags.token, flags.skipVerify, orgID) r, err := getFluxREPL()
if err != nil { if err != nil {
return fmt.Errorf("failed to get the flux REPL: %v", err) return fmt.Errorf("failed to get the flux REPL: %v", err)
} }

43
cmd/influx/repl.go
View File

@ -5,12 +5,10 @@ import (
"fmt" "fmt"
"github.com/influxdata/flux" "github.com/influxdata/flux"
"github.com/influxdata/flux/dependencies/filesystem"
"github.com/influxdata/flux/repl" "github.com/influxdata/flux/repl"
"github.com/influxdata/flux/runtime" "github.com/influxdata/flux/runtime"
_ "github.com/influxdata/flux/stdlib" _ "github.com/influxdata/flux/stdlib"
platform "github.com/influxdata/influxdb"
"github.com/influxdata/influxdb/http"
"github.com/influxdata/influxdb/query"
_ "github.com/influxdata/influxdb/query/stdlib" _ "github.com/influxdata/influxdb/query/stdlib"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )
@ -40,19 +38,20 @@ func replF(cmd *cobra.Command, args []string) error {
return err return err
} }
orgSVC, err := newOrganizationService() // TODO(jsternberg): Restore the repl by merging the influxdb client.
if err != nil { // orgSVC, err := newOrganizationService()
return err // if err != nil {
} // return err
// }
orgID, err := replFlags.org.getID(orgSVC) //
if err != nil { // orgID, err := replFlags.org.getID(orgSVC)
return err // if err != nil {
} // return err
// }
runtime.FinalizeBuiltIns() runtime.FinalizeBuiltIns()
r, err := getFluxREPL(flags.host, flags.token, flags.skipVerify, orgID) r, err := getFluxREPL()
if err != nil { if err != nil {
return err return err
} }
@ -61,17 +60,9 @@ func replF(cmd *cobra.Command, args []string) error {
return nil return nil
} }
func getFluxREPL(addr, token string, skipVerify bool, orgID platform.ID) (*repl.REPL, error) { func getFluxREPL() (*repl.REPL, error) {
qs := &http.FluxQueryService{ deps := flux.NewDefaultDependencies()
Addr: addr, deps.Deps.FilesystemService = filesystem.SystemFS
Token: token, ctx := deps.Inject(context.Background())
InsecureSkipVerify: skipVerify, return repl.New(ctx, deps), nil
}
q := &query.REPLQuerier{
OrganizationID: orgID,
QueryService: qs,
}
// background context is OK here, and DefaultDependencies are noop deps. Also safe
// since we send all queries to the server side.
return repl.New(context.Background(), flux.NewDefaultDependencies(), q), nil
} }

2
go.mod
View File

@ -42,7 +42,7 @@ require (
github.com/hashicorp/raft v1.0.0 // indirect github.com/hashicorp/raft v1.0.0 // indirect
github.com/hashicorp/vault/api v1.0.2 github.com/hashicorp/vault/api v1.0.2
github.com/influxdata/cron v0.0.0-20191112133922-ad5847cfab62 github.com/influxdata/cron v0.0.0-20191112133922-ad5847cfab62
github.com/influxdata/flux v0.60.1-0.20200225201047-16af5831aa38 github.com/influxdata/flux v0.60.1-0.20200227152158-9f38d6a339f2
github.com/influxdata/httprouter v1.3.1-0.20191122104820-ee83e2772f69 github.com/influxdata/httprouter v1.3.1-0.20191122104820-ee83e2772f69
github.com/influxdata/influxql v0.0.0-20180925231337-1cbfca8e56b6 github.com/influxdata/influxql v0.0.0-20180925231337-1cbfca8e56b6
github.com/influxdata/usage-client v0.0.0-20160829180054-6d3895376368 github.com/influxdata/usage-client v0.0.0-20160829180054-6d3895376368

4
go.sum
View File

@ -240,8 +240,8 @@ github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NH
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
github.com/influxdata/cron v0.0.0-20191112133922-ad5847cfab62 h1:YipnPuvJKPAzyBhr7eXIMA49L2Eooga/NSytWdLLI8U= github.com/influxdata/cron v0.0.0-20191112133922-ad5847cfab62 h1:YipnPuvJKPAzyBhr7eXIMA49L2Eooga/NSytWdLLI8U=
github.com/influxdata/cron v0.0.0-20191112133922-ad5847cfab62/go.mod h1:XabtPPW2qsCg0tl+kjaPU+cFS+CjQXEXbT1VJvHT4og= github.com/influxdata/cron v0.0.0-20191112133922-ad5847cfab62/go.mod h1:XabtPPW2qsCg0tl+kjaPU+cFS+CjQXEXbT1VJvHT4og=
github.com/influxdata/flux v0.60.1-0.20200225201047-16af5831aa38 h1:o2NmZqM5uu80aErKWfbmifrpDzxMsRLbIeLKY71ZrEQ= github.com/influxdata/flux v0.60.1-0.20200227152158-9f38d6a339f2 h1:sJzGdrFAeUz+qjb+h24P5wc7VDsMYUZtq5edPHu33NU=
github.com/influxdata/flux v0.60.1-0.20200225201047-16af5831aa38/go.mod h1:T5bbA6I4vC3gEf4uqdCKBYrXiZfTOoB69OsAZO881vQ= github.com/influxdata/flux v0.60.1-0.20200227152158-9f38d6a339f2/go.mod h1:T5bbA6I4vC3gEf4uqdCKBYrXiZfTOoB69OsAZO881vQ=
github.com/influxdata/goreleaser v0.97.0-influx h1:jT5OrcW7WfS0e2QxfwmTBjhLvpIC9CDLRhNgZJyhj8s= github.com/influxdata/goreleaser v0.97.0-influx h1:jT5OrcW7WfS0e2QxfwmTBjhLvpIC9CDLRhNgZJyhj8s=
github.com/influxdata/goreleaser v0.97.0-influx/go.mod h1:MnjA0e0Uq6ISqjG1WxxMAl+3VS1QYjILSWVnMYDxasE= github.com/influxdata/goreleaser v0.97.0-influx/go.mod h1:MnjA0e0Uq6ISqjG1WxxMAl+3VS1QYjILSWVnMYDxasE=
github.com/influxdata/httprouter v1.3.1-0.20191122104820-ee83e2772f69 h1:WQsmW0fXO4ZE/lFGIE84G6rIV5SJN3P3sjIXAP1a8eU= github.com/influxdata/httprouter v1.3.1-0.20191122104820-ee83e2772f69 h1:WQsmW0fXO4ZE/lFGIE84G6rIV5SJN3P3sjIXAP1a8eU=

2
query/promql/internal/promqltests/go.mod
View File

@ -7,7 +7,7 @@ require (
github.com/glycerine/goconvey v0.0.0-20190410193231-58a59202ab31 // indirect github.com/glycerine/goconvey v0.0.0-20190410193231-58a59202ab31 // indirect
github.com/gogo/protobuf v1.3.0 // indirect github.com/gogo/protobuf v1.3.0 // indirect
github.com/google/go-cmp v0.3.1 github.com/google/go-cmp v0.3.1
github.com/influxdata/flux v0.60.1-0.20200225201047-16af5831aa38 github.com/influxdata/flux v0.60.1-0.20200227152158-9f38d6a339f2
github.com/influxdata/influxdb v0.0.0-20190925213338-8af36d5aaedd github.com/influxdata/influxdb v0.0.0-20190925213338-8af36d5aaedd
github.com/influxdata/influxql v1.0.1 // indirect github.com/influxdata/influxql v1.0.1 // indirect
github.com/influxdata/promql/v2 v2.12.0 github.com/influxdata/promql/v2 v2.12.0

5
query/promql/internal/promqltests/go.sum
View File

@ -286,9 +286,8 @@ github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NH
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
github.com/influxdata/cron v0.0.0-20191112133922-ad5847cfab62 h1:YipnPuvJKPAzyBhr7eXIMA49L2Eooga/NSytWdLLI8U= github.com/influxdata/cron v0.0.0-20191112133922-ad5847cfab62 h1:YipnPuvJKPAzyBhr7eXIMA49L2Eooga/NSytWdLLI8U=
github.com/influxdata/cron v0.0.0-20191112133922-ad5847cfab62/go.mod h1:XabtPPW2qsCg0tl+kjaPU+cFS+CjQXEXbT1VJvHT4og= github.com/influxdata/cron v0.0.0-20191112133922-ad5847cfab62/go.mod h1:XabtPPW2qsCg0tl+kjaPU+cFS+CjQXEXbT1VJvHT4og=
github.com/influxdata/flux v0.60.1-0.20200221220910-5416e8e69d66 h1:9SxufhGiuxU+W0P5hzkfxH2dmOHyE4MqCIoCpQyizzo= github.com/influxdata/flux v0.60.1-0.20200227152158-9f38d6a339f2 h1:sJzGdrFAeUz+qjb+h24P5wc7VDsMYUZtq5edPHu33NU=
github.com/influxdata/flux v0.60.1-0.20200221220910-5416e8e69d66/go.mod h1:T5bbA6I4vC3gEf4uqdCKBYrXiZfTOoB69OsAZO881vQ= github.com/influxdata/flux v0.60.1-0.20200227152158-9f38d6a339f2/go.mod h1:T5bbA6I4vC3gEf4uqdCKBYrXiZfTOoB69OsAZO881vQ=
github.com/influxdata/flux v0.60.1-0.20200225201047-16af5831aa38/go.mod h1:T5bbA6I4vC3gEf4uqdCKBYrXiZfTOoB69OsAZO881vQ=
github.com/influxdata/httprouter v1.3.1-0.20191122104820-ee83e2772f69 h1:WQsmW0fXO4ZE/lFGIE84G6rIV5SJN3P3sjIXAP1a8eU= github.com/influxdata/httprouter v1.3.1-0.20191122104820-ee83e2772f69 h1:WQsmW0fXO4ZE/lFGIE84G6rIV5SJN3P3sjIXAP1a8eU=
github.com/influxdata/httprouter v1.3.1-0.20191122104820-ee83e2772f69/go.mod h1:pwymjR6SrP3gD3pRj9RJwdl1j5s3doEEV8gS4X9qSzA= github.com/influxdata/httprouter v1.3.1-0.20191122104820-ee83e2772f69/go.mod h1:pwymjR6SrP3gD3pRj9RJwdl1j5s3doEEV8gS4X9qSzA=
github.com/influxdata/influxql v0.0.0-20180925231337-1cbfca8e56b6/go.mod h1:KpVI7okXjK6PRi3Z5B+mtKZli+R1DnZgb3N+tzevNgo= github.com/influxdata/influxql v0.0.0-20180925231337-1cbfca8e56b6/go.mod h1:KpVI7okXjK6PRi3Z5B+mtKZli+R1DnZgb3N+tzevNgo=