Skip to content

Commit

Permalink
build(flux): update flux to v0.178.0 (#23615)
Browse files Browse the repository at this point in the history
  • Loading branch information
Christopher M. Wolff authored Aug 9, 2022
1 parent cd4f93b commit 78c969e
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 33 deletions.
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ require (
github.com/google/go-jsonnet v0.17.0
github.com/hashicorp/vault/api v1.0.2
github.com/influxdata/cron v0.0.0-20201006132531-4bb0a200dcbe
github.com/influxdata/flux v0.177.1
github.com/influxdata/flux v0.178.0
github.com/influxdata/httprouter v1.3.1-0.20191122104820-ee83e2772f69
github.com/influxdata/influx-cli/v2 v2.2.1-0.20220318222112-88ba3464cd07
github.com/influxdata/influxql v1.1.1-0.20211004132434-7e7d61973256
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -503,8 +503,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-20201006132531-4bb0a200dcbe h1:7j4SdN/BvQwN6WoUq7mv0kg5U9NhnFBxPGMafYRKym0=
github.com/influxdata/cron v0.0.0-20201006132531-4bb0a200dcbe/go.mod h1:XabtPPW2qsCg0tl+kjaPU+cFS+CjQXEXbT1VJvHT4og=
github.com/influxdata/flux v0.177.1 h1:juFzLmEhz47ZNKtdB+vDDPG4uCSkDA5bc0U1ZqVXGnE=
github.com/influxdata/flux v0.177.1/go.mod h1:FY4XAM6a/04xK/pyKyGKQJ3Ovo98h87I5cbT1758b0M=
github.com/influxdata/flux v0.178.0 h1:UoXmr5Z0qNnXYuR81SD9iAVXkXSa1BrnYrzbKk5sIY4=
github.com/influxdata/flux v0.178.0/go.mod h1:FY4XAM6a/04xK/pyKyGKQJ3Ovo98h87I5cbT1758b0M=
github.com/influxdata/gosnowflake v1.6.9 h1:BhE39Mmh8bC+Rvd4QQsP2gHypfeYIH1wqW1AjGWxxrE=
github.com/influxdata/gosnowflake v1.6.9/go.mod h1:9W/BvCXOKx2gJtQ+jdi1Vudev9t9/UDOEHnlJZ/y1nU=
github.com/influxdata/httprouter v1.3.1-0.20191122104820-ee83e2772f69 h1:WQsmW0fXO4ZE/lFGIE84G6rIV5SJN3P3sjIXAP1a8eU=
Expand Down
2 changes: 1 addition & 1 deletion query/stdlib/influxdata/influxdb/buckets.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ func (rule LocalBucketsRule) Name() string {
}

func (rule LocalBucketsRule) Pattern() plan.Pattern {
return plan.Pat(influxdb.BucketsKind)
return plan.MultiSuccessor(influxdb.BucketsKind)
}

func (rule LocalBucketsRule) Rewrite(ctx context.Context, node plan.Node) (plan.Node, bool, error) {
Expand Down
56 changes: 28 additions & 28 deletions query/stdlib/influxdata/influxdb/rules.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ func (rule FromStorageRule) Name() string {
}

func (rule FromStorageRule) Pattern() plan.Pattern {
return plan.Pat(influxdb.FromKind)
return plan.MultiSuccessor(influxdb.FromKind)
}

func (rule FromStorageRule) Rewrite(ctx context.Context, node plan.Node) (plan.Node, bool, error) {
Expand All @@ -76,7 +76,7 @@ func (rule PushDownGroupRule) Name() string {
}

func (rule PushDownGroupRule) Pattern() plan.Pattern {
return plan.Pat(universe.GroupKind, plan.Pat(ReadRangePhysKind))
return plan.MultiSuccessor(universe.GroupKind, plan.SingleSuccessor(ReadRangePhysKind))
}

func (rule PushDownGroupRule) Rewrite(ctx context.Context, node plan.Node) (plan.Node, bool, error) {
Expand Down Expand Up @@ -115,7 +115,7 @@ func (rule PushDownRangeRule) Name() string {

// Pattern matches 'from |> range'
func (rule PushDownRangeRule) Pattern() plan.Pattern {
return plan.Pat(universe.RangeKind, plan.Pat(FromKind))
return plan.MultiSuccessor(universe.RangeKind, plan.SingleSuccessor(FromKind))
}

// Rewrite converts 'from |> range' into 'ReadRange'
Expand All @@ -140,7 +140,7 @@ func (PushDownFilterRule) Name() string {
}

func (PushDownFilterRule) Pattern() plan.Pattern {
return plan.Pat(universe.FilterKind, plan.Pat(ReadRangePhysKind))
return plan.MultiSuccessor(universe.FilterKind, plan.SingleSuccessor(ReadRangePhysKind))
}

func (PushDownFilterRule) Rewrite(ctx context.Context, pn plan.Node) (plan.Node, bool, error) {
Expand Down Expand Up @@ -237,10 +237,10 @@ func (rule PushDownReadTagKeysRule) Name() string {
}

func (rule PushDownReadTagKeysRule) Pattern() plan.Pattern {
return plan.Pat(universe.DistinctKind,
plan.Pat(universe.SchemaMutationKind,
plan.Pat(universe.KeysKind,
plan.Pat(ReadRangePhysKind))))
return plan.MultiSuccessor(universe.DistinctKind,
plan.SingleSuccessor(universe.SchemaMutationKind,
plan.SingleSuccessor(universe.KeysKind,
plan.SingleSuccessor(ReadRangePhysKind))))
}

func (rule PushDownReadTagKeysRule) Rewrite(ctx context.Context, pn plan.Node) (plan.Node, bool, error) {
Expand Down Expand Up @@ -299,10 +299,10 @@ func (rule PushDownReadTagValuesRule) Name() string {
}

func (rule PushDownReadTagValuesRule) Pattern() plan.Pattern {
return plan.Pat(universe.DistinctKind,
plan.Pat(universe.GroupKind,
plan.Pat(universe.SchemaMutationKind,
plan.Pat(ReadRangePhysKind))))
return plan.MultiSuccessor(universe.DistinctKind,
plan.SingleSuccessor(universe.GroupKind,
plan.SingleSuccessor(universe.SchemaMutationKind,
plan.SingleSuccessor(ReadRangePhysKind))))
}

func (rule PushDownReadTagValuesRule) Rewrite(ctx context.Context, pn plan.Node) (plan.Node, bool, error) {
Expand Down Expand Up @@ -613,7 +613,7 @@ func (SortedPivotRule) Name() string {
}

func (SortedPivotRule) Pattern() plan.Pattern {
return plan.Pat(universe.PivotKind, plan.Pat(ReadRangePhysKind))
return plan.MultiSuccessor(universe.PivotKind, plan.SingleSuccessor(ReadRangePhysKind))
}

func (SortedPivotRule) Rewrite(ctx context.Context, pn plan.Node) (plan.Node, bool, error) {
Expand Down Expand Up @@ -677,8 +677,8 @@ var windowPushableAggs = []plan.ProcedureKind{
}

func (rule PushDownWindowAggregateRule) Pattern() plan.Pattern {
return plan.OneOf(windowPushableAggs,
plan.Pat(universe.WindowKind, plan.Pat(ReadRangePhysKind)))
return plan.MultiSuccessorOneOf(windowPushableAggs,
plan.SingleSuccessor(universe.WindowKind, plan.SingleSuccessor(ReadRangePhysKind)))
}

func canPushWindowedAggregate(ctx context.Context, fnNode plan.Node) bool {
Expand Down Expand Up @@ -771,8 +771,8 @@ func (PushDownWindowForceAggregateRule) Name() string {
}

func (PushDownWindowForceAggregateRule) Pattern() plan.Pattern {
return plan.Pat(table.FillKind,
plan.Pat(ReadWindowAggregatePhysKind))
return plan.MultiSuccessor(table.FillKind,
plan.SingleSuccessor(ReadWindowAggregatePhysKind))
}

func (PushDownWindowForceAggregateRule) Rewrite(ctx context.Context, pn plan.Node) (plan.Node, bool, error) {
Expand Down Expand Up @@ -807,9 +807,9 @@ func (PushDownWindowAggregateByTimeRule) Name() string {
}

func (PushDownWindowAggregateByTimeRule) Pattern() plan.Pattern {
return plan.Pat(universe.WindowKind,
plan.Pat(universe.SchemaMutationKind,
plan.Pat(ReadWindowAggregatePhysKind)))
return plan.MultiSuccessor(universe.WindowKind,
plan.SingleSuccessor(universe.SchemaMutationKind,
plan.SingleSuccessor(ReadWindowAggregatePhysKind)))
}

func (PushDownWindowAggregateByTimeRule) Rewrite(ctx context.Context, pn plan.Node) (plan.Node, bool, error) {
Expand Down Expand Up @@ -865,8 +865,8 @@ func (p PushDownAggregateWindowRule) Name() string {
}

func (p PushDownAggregateWindowRule) Pattern() plan.Pattern {
return plan.Pat(universe.AggregateWindowKind,
plan.Pat(ReadRangePhysKind))
return plan.MultiSuccessor(universe.AggregateWindowKind,
plan.SingleSuccessor(ReadRangePhysKind))
}

func (p PushDownAggregateWindowRule) Rewrite(ctx context.Context, pn plan.Node) (plan.Node, bool, error) {
Expand Down Expand Up @@ -918,8 +918,8 @@ func (p PushDownBareAggregateRule) Name() string {
}

func (p PushDownBareAggregateRule) Pattern() plan.Pattern {
return plan.OneOf(windowPushableAggs,
plan.Pat(ReadRangePhysKind))
return plan.MultiSuccessorOneOf(windowPushableAggs,
plan.SingleSuccessor(ReadRangePhysKind))
}

func (p PushDownBareAggregateRule) Rewrite(ctx context.Context, pn plan.Node) (plan.Node, bool, error) {
Expand Down Expand Up @@ -962,8 +962,8 @@ var windowMergeablePushAggs = []plan.ProcedureKind{
}

func (p GroupWindowAggregateTransposeRule) Pattern() plan.Pattern {
return plan.OneOf(windowMergeablePushAggs,
plan.Pat(universe.WindowKind, plan.Pat(ReadGroupPhysKind)))
return plan.MultiSuccessorOneOf(windowMergeablePushAggs,
plan.SingleSuccessor(universe.WindowKind, plan.SingleSuccessor(ReadGroupPhysKind)))
}

func (p GroupWindowAggregateTransposeRule) Rewrite(ctx context.Context, pn plan.Node) (plan.Node, bool, error) {
Expand Down Expand Up @@ -1051,7 +1051,7 @@ func (PushDownGroupAggregateRule) Name() string {
}

func (rule PushDownGroupAggregateRule) Pattern() plan.Pattern {
return plan.OneOf(
return plan.MultiSuccessorOneOf(
[]plan.ProcedureKind{
universe.CountKind,
universe.SumKind,
Expand All @@ -1060,7 +1060,7 @@ func (rule PushDownGroupAggregateRule) Pattern() plan.Pattern {
universe.MinKind,
universe.MaxKind,
},
plan.Pat(ReadGroupPhysKind))
plan.SingleSuccessor(ReadGroupPhysKind))
}

func (PushDownGroupAggregateRule) Rewrite(ctx context.Context, pn plan.Node) (plan.Node, bool, error) {
Expand Down
2 changes: 1 addition & 1 deletion query/stdlib/influxdata/influxdb/v1/databases.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ func (rule LocalDatabasesRule) Name() string {
}

func (rule LocalDatabasesRule) Pattern() plan.Pattern {
return plan.Pat(v1.DatabasesKind)
return plan.MultiSuccessor(v1.DatabasesKind)
}

func (rule LocalDatabasesRule) Rewrite(ctx context.Context, node plan.Node) (plan.Node, bool, error) {
Expand Down

0 comments on commit 78c969e

Please sign in to comment.