refactor: update semantic builtin lookups to use runtime now (#17066)
parent
25b0e37522
commit
0872af8553
2
go.mod
2
go.mod
|
@ -42,7 +42,7 @@ require (
|
|||
github.com/hashicorp/raft v1.0.0 // indirect
|
||||
github.com/hashicorp/vault/api v1.0.2
|
||||
github.com/influxdata/cron v0.0.0-20191112133922-ad5847cfab62
|
||||
github.com/influxdata/flux v0.60.1-0.20200227172559-d850334cc41d
|
||||
github.com/influxdata/flux v0.60.1-0.20200302202538-702c71c7587d
|
||||
github.com/influxdata/httprouter v1.3.1-0.20191122104820-ee83e2772f69
|
||||
github.com/influxdata/influxql v0.0.0-20180925231337-1cbfca8e56b6
|
||||
github.com/influxdata/usage-client v0.0.0-20160829180054-6d3895376368
|
||||
|
|
4
go.sum
4
go.sum
|
@ -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/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/flux v0.60.1-0.20200227172559-d850334cc41d h1:66x777HXKqJQCXgzta4ClT856qwapJcizo7z8oX8EHY=
|
||||
github.com/influxdata/flux v0.60.1-0.20200227172559-d850334cc41d/go.mod h1:BRxpm1xTUAZ+s+Mq6t0NZyaYtlGrw/8YoHoifso9vS8=
|
||||
github.com/influxdata/flux v0.60.1-0.20200302202538-702c71c7587d h1:URBSuryrRlDsWnafCD+D99TZCwh9RWJbbpZwle/C8uE=
|
||||
github.com/influxdata/flux v0.60.1-0.20200302202538-702c71c7587d/go.mod h1:BRxpm1xTUAZ+s+Mq6t0NZyaYtlGrw/8YoHoifso9vS8=
|
||||
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/httprouter v1.3.1-0.20191122104820-ee83e2772f69 h1:WQsmW0fXO4ZE/lFGIE84G6rIV5SJN3P3sjIXAP1a8eU=
|
||||
|
|
|
@ -7,7 +7,7 @@ require (
|
|||
github.com/glycerine/goconvey v0.0.0-20190410193231-58a59202ab31 // indirect
|
||||
github.com/gogo/protobuf v1.3.0 // indirect
|
||||
github.com/google/go-cmp v0.3.1
|
||||
github.com/influxdata/flux v0.60.1-0.20200227172559-d850334cc41d
|
||||
github.com/influxdata/flux v0.60.1-0.20200302202538-702c71c7587d
|
||||
github.com/influxdata/influxdb v0.0.0-20190925213338-8af36d5aaedd
|
||||
github.com/influxdata/influxql v1.0.1 // indirect
|
||||
github.com/influxdata/promql/v2 v2.12.0
|
||||
|
|
|
@ -286,8 +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/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/flux v0.60.1-0.20200227172559-d850334cc41d h1:66x777HXKqJQCXgzta4ClT856qwapJcizo7z8oX8EHY=
|
||||
github.com/influxdata/flux v0.60.1-0.20200227172559-d850334cc41d/go.mod h1:BRxpm1xTUAZ+s+Mq6t0NZyaYtlGrw/8YoHoifso9vS8=
|
||||
github.com/influxdata/flux v0.60.1-0.20200302202538-702c71c7587d h1:URBSuryrRlDsWnafCD+D99TZCwh9RWJbbpZwle/C8uE=
|
||||
github.com/influxdata/flux v0.60.1-0.20200302202538-702c71c7587d/go.mod h1:BRxpm1xTUAZ+s+Mq6t0NZyaYtlGrw/8YoHoifso9vS8=
|
||||
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/influxql v0.0.0-20180925231337-1cbfca8e56b6/go.mod h1:KpVI7okXjK6PRi3Z5B+mtKZli+R1DnZgb3N+tzevNgo=
|
||||
|
|
|
@ -34,7 +34,7 @@ type ToOpSpec struct {
|
|||
}
|
||||
|
||||
func init() {
|
||||
toSignature := semantic.MustLookupBuiltinType("experimental", "to")
|
||||
toSignature := runtime.MustLookupBuiltinType("experimental", "to")
|
||||
runtime.ReplacePackageValue("experimental", "to", flux.MustValue(flux.FunctionValueWithSideEffect("to", createToOpSpec, toSignature)))
|
||||
flux.RegisterOpSpec(ExperimentalToKind, func() flux.OperationSpec { return &ToOpSpec{} })
|
||||
plan.RegisterProcedureSpecWithSideEffect(ExperimentalToKind, newToProcedure, ExperimentalToKind)
|
||||
|
|
|
@ -7,7 +7,6 @@ import (
|
|||
"github.com/influxdata/flux/codes"
|
||||
"github.com/influxdata/flux/plan"
|
||||
"github.com/influxdata/flux/runtime"
|
||||
"github.com/influxdata/flux/semantic"
|
||||
"github.com/influxdata/flux/stdlib/influxdata/influxdb"
|
||||
platform "github.com/influxdata/influxdb"
|
||||
)
|
||||
|
@ -20,7 +19,7 @@ type FromOpSpec struct {
|
|||
}
|
||||
|
||||
func init() {
|
||||
fromSignature := semantic.MustLookupBuiltinType("influxdata/influxdb", "from")
|
||||
fromSignature := runtime.MustLookupBuiltinType("influxdata/influxdb", "from")
|
||||
runtime.ReplacePackageValue("influxdata/influxdb", influxdb.FromKind, flux.MustValue(flux.FunctionValue(FromKind, createFromOpSpec, fromSignature)))
|
||||
flux.RegisterOpSpec(FromKind, newFromOp)
|
||||
plan.RegisterProcedureSpec(FromKind, newFromProcedure, FromKind)
|
||||
|
|
|
@ -49,7 +49,7 @@ type ToOpSpec struct {
|
|||
}
|
||||
|
||||
func init() {
|
||||
toSignature := semantic.MustLookupBuiltinType("influxdata/influxdb", ToKind)
|
||||
toSignature := runtime.MustLookupBuiltinType("influxdata/influxdb", ToKind)
|
||||
runtime.ReplacePackageValue("influxdata/influxdb", "to", flux.MustValue(flux.FunctionValueWithSideEffect(ToKind, createToOpSpec, toSignature)))
|
||||
flux.RegisterOpSpec(ToKind, func() flux.OperationSpec { return &ToOpSpec{} })
|
||||
plan.RegisterProcedureSpecWithSideEffect(ToKind, newToProcedure, ToKind)
|
||||
|
|
|
@ -10,7 +10,6 @@ import (
|
|||
"github.com/influxdata/flux/memory"
|
||||
"github.com/influxdata/flux/plan"
|
||||
"github.com/influxdata/flux/runtime"
|
||||
"github.com/influxdata/flux/semantic"
|
||||
"github.com/influxdata/flux/stdlib/influxdata/influxdb/v1"
|
||||
"github.com/influxdata/flux/values"
|
||||
platform "github.com/influxdata/influxdb"
|
||||
|
@ -24,7 +23,7 @@ type DatabasesOpSpec struct {
|
|||
}
|
||||
|
||||
func init() {
|
||||
databasesSignature := semantic.MustLookupBuiltinType("influxdata/influxdb/v1", DatabasesKind)
|
||||
databasesSignature := runtime.MustLookupBuiltinType("influxdata/influxdb/v1", DatabasesKind)
|
||||
runtime.ReplacePackageValue("influxdata/influxdb/v1", DatabasesKind, flux.MustValue(flux.FunctionValue(DatabasesKind, createDatabasesOpSpec, databasesSignature)))
|
||||
flux.RegisterOpSpec(DatabasesKind, newDatabasesOp)
|
||||
plan.RegisterProcedureSpec(DatabasesKind, newDatabasesProcedure, DatabasesKind)
|
||||
|
|
Loading…
Reference in New Issue