Skip to content

Commit

Permalink
Update flux version to v0.33.2 (#14208)
Browse files Browse the repository at this point in the history
The flux in influxdb has been upgraded to use v0.33.2. A lot of
interfaces for the storage engine were changed during this so code had
to change to accomodate the new interfaces and remove the old ones.

Included in this commit is a patch file for the changes that were made.
A patch was generated for the following packages:

* `flux/stdlib/influxdata/influxdb`
* `storage/reads`
* `tsdb/cursors`

These are the three packages that are in common with version 2 of the
database and the first of these packages contains the specific
implementations that are used for version 1.

It is very possible that the next time we upgrade this, the patch will
not apply cleanly just like it wouldn't have applied cleanly to this
update. The patch is mostly meant to document exactly what changed
during the copy over to help ensure we don't forget things when adapting
the interfaces.

Add a patch file to hopefully make this easier in the future
  • Loading branch information
jsternberg authored Jun 27, 2019
1 parent aa7deb4 commit 7ca4e64
Show file tree
Hide file tree
Showing 52 changed files with 7,887 additions and 3,232 deletions.
180 changes: 68 additions & 112 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,11 @@

[[constraint]]
name = "github.com/influxdata/flux"
version = "= 0.24.0"
version = "~ 0.33.2"

[[constraint]]
name = "github.com/apache/arrow"
revision = "338c62a2a20574072fde5c478fcd42bf27a2d4b6"

[[constraint]]
name = "github.com/influxdata/influxql"
Expand Down
2 changes: 2 additions & 0 deletions cmd/store/help/help.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
//+build ignore

// Package help contains the help for the store command.
package help

Expand Down
2 changes: 2 additions & 0 deletions cmd/store/main.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
//+build ignore

// The store command displays detailed information about InfluxDB data files.
package main

Expand Down
2 changes: 2 additions & 0 deletions cmd/store/query/query.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
//+build ignore

package query

import (
Expand Down
3 changes: 2 additions & 1 deletion flux/client/http.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import (
"github.com/influxdata/flux"
"github.com/influxdata/flux/csv"
"github.com/influxdata/flux/lang"
"github.com/influxdata/flux/repl"
iclient "github.com/influxdata/influxdb/client"
"github.com/pkg/errors"
)
Expand Down Expand Up @@ -132,7 +133,7 @@ func QueryRequestFromProxyRequest(req *ProxyRequest) (*QueryRequest, error) {
case lang.FluxCompiler:
qr.Type = "flux"
qr.Query = c.Query
case lang.SpecCompiler:
case repl.Compiler:
qr.Type = "flux"
qr.Spec = c.Spec
default:
Expand Down
3 changes: 2 additions & 1 deletion flux/client/request.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"github.com/influxdata/flux"
"github.com/influxdata/flux/csv"
"github.com/influxdata/flux/lang"
"github.com/influxdata/flux/repl"
"github.com/pkg/errors"
"github.com/prometheus/client_golang/prometheus"
)
Expand Down Expand Up @@ -110,7 +111,7 @@ func (r QueryRequest) ProxyRequest() *ProxyRequest {
Query: r.Query,
}
} else if r.Spec != nil {
compiler = lang.SpecCompiler{
compiler = repl.Compiler{
Spec: r.Spec,
}
}
Expand Down
Loading

0 comments on commit 7ca4e64

Please sign in to comment.