From f8a7eff2f0b5e11ef882f7100b3e13060da9695f Mon Sep 17 00:00:00 2001 From: Michael Desa Date: Thu, 31 May 2018 14:48:27 -0400 Subject: [PATCH 1/2] Use platform query package instead of ifql package --- server/ifql.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/server/ifql.go b/server/ifql.go index 026692eac9..29e953ca97 100644 --- a/server/ifql.go +++ b/server/ifql.go @@ -6,8 +6,8 @@ import ( "net/http" "github.com/bouk/httprouter" - "github.com/influxdata/ifql" - "github.com/influxdata/ifql/parser" + "github.com/influxdata/platform/query/builtin" + "github.com/influxdata/platform/query/parser" ) type Params map[string]string @@ -47,7 +47,7 @@ func (s *Service) IFQL(w http.ResponseWriter, r *http.Request) { // IFQLSuggestions returns a list of available IFQL functions for the IFQL Builder func (s *Service) IFQLSuggestions(w http.ResponseWriter, r *http.Request) { - completer := ifql.DefaultCompleter() + completer := query.DefaultCompleter() names := completer.FunctionNames() var functions []SuggestionResponse for _, name := range names { @@ -80,7 +80,7 @@ func (s *Service) IFQLSuggestions(w http.ResponseWriter, r *http.Request) { func (s *Service) IFQLSuggestion(w http.ResponseWriter, r *http.Request) { ctx := r.Context() name := httprouter.GetParamFromContext(ctx, "name") - completer := ifql.DefaultCompleter() + completer := query.DefaultCompleter() suggestion, err := completer.FunctionSuggestion(name) if err != nil { From be5a73cfdf4d574eef8a306d452f16decab7e225 Mon Sep 17 00:00:00 2001 From: Michael Desa Date: Thu, 31 May 2018 15:16:02 -0400 Subject: [PATCH 2/2] update dependencies by removing ifql and adding platform --- Gopkg.lock | 113 ++++++++++++++--------------------------------------- Gopkg.toml | 4 -- 2 files changed, 30 insertions(+), 87 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index a6cbcc5e49..3d10148a70 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -11,12 +11,6 @@ packages = ["."] revision = "3ec0642a7fb6488f65b06f9040adc67e3990296a" -[[projects]] - branch = "master" - name = "github.com/beorn7/perks" - packages = ["quantile"] - revision = "3a771d992973f24aa725d07868b467d1ddfceafb" - [[projects]] name = "github.com/boltdb/bolt" packages = ["."] @@ -46,7 +40,6 @@ [[projects]] name = "github.com/gogo/protobuf" packages = [ - "codec", "gogoproto", "jsonpb", "plugin/compare", @@ -107,25 +100,6 @@ packages = ["query"] revision = "53e6ce116135b80d037921a7fdd5138cf32d7a8a" -[[projects]] - name = "github.com/influxdata/ifql" - packages = [ - ".", - "ast", - "compiler", - "complete", - "functions", - "interpreter", - "parser", - "query", - "query/control", - "query/execute", - "query/execute/storage", - "query/plan", - "semantic" - ] - revision = "9445c4494d4421db2ab1aaaf6f4069446f11752e" - [[projects]] name = "github.com/influxdata/influxdb" packages = [ @@ -152,6 +126,35 @@ ] revision = "4f10efc41b4dcac070495cf95ba2c41cfcc2aa3a" +[[projects]] + branch = "master" + name = "github.com/influxdata/line-protocol" + packages = ["."] + revision = "32c6aa80de5eb09d190ad284a8214a531c6bce57" + +[[projects]] + branch = "master" + name = "github.com/influxdata/platform" + packages = [ + ".", + "query", + "query/ast", + "query/builtin", + "query/compiler", + "query/complete", + "query/csv", + "query/execute", + "query/functions", + "query/functions/storage", + "query/id", + "query/interpreter", + "query/parser", + "query/plan", + "query/semantic", + "query/values" + ] + revision = "6b2cf4e666447f73e6a6d7368cd6b4698f1de91f" + [[projects]] branch = "master" name = "github.com/influxdata/tdigest" @@ -163,23 +166,6 @@ packages = ["v1"] revision = "6d3895376368aa52a3a81d2a16e90f0f52371967" -[[projects]] - branch = "master" - name = "github.com/influxdata/yamux" - packages = ["."] - revision = "1f58ded512de5feabbe30b60c7d33a7a896c5f16" - -[[projects]] - branch = "master" - name = "github.com/influxdata/yarpc" - packages = [ - ".", - "codes", - "status", - "yarpcproto" - ] - revision = "f0da2db138cad2fb425541938fc28dd5a5bc6918" - [[projects]] name = "github.com/jessevdk/go-flags" packages = ["."] @@ -190,12 +176,6 @@ packages = ["."] revision = "46eb4c183bfc1ebb527d9d19bcded39476302eb8" -[[projects]] - name = "github.com/matttproud/golang_protobuf_extensions" - packages = ["pbutil"] - revision = "3247c84500bff8d9fb6d579d800f20b3e091582c" - version = "v1.0.0" - [[projects]] name = "github.com/opentracing/opentracing-go" packages = [ @@ -211,39 +191,6 @@ revision = "645ef00459ed84a119197bfb8d8205042c6df63d" version = "v0.8.0" -[[projects]] - name = "github.com/prometheus/client_golang" - packages = ["prometheus"] - revision = "c5b7fccd204277076155f10851dad72b76a49317" - version = "v0.8.0" - -[[projects]] - branch = "master" - name = "github.com/prometheus/client_model" - packages = ["go"] - revision = "99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c" - -[[projects]] - branch = "master" - name = "github.com/prometheus/common" - packages = [ - "expfmt", - "internal/bitbucket.org/ww/goautoneg", - "model" - ] - revision = "e4aa40a9169a88835b849a6efb71e05dc04b88f0" - -[[projects]] - branch = "master" - name = "github.com/prometheus/procfs" - packages = [ - ".", - "internal/util", - "nfs", - "xfs" - ] - revision = "780932d4fbbe0e69b84c34c20f5c8d0981e109ea" - [[projects]] name = "github.com/satori/go.uuid" packages = ["."] @@ -311,6 +258,6 @@ [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "177aad722546727b812f2baf43e2fcc614cc1fa209efa3fdffa4dbcafb6dfdad" + inputs-digest = "d50a9a3e46034310699abad51d2d8572c09640074aeda4e8e35149c72e78b582" solver-name = "gps-cdcl" solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml index 94cf2919fe..0bdf1567d8 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -72,10 +72,6 @@ required = ["github.com/kevinburke/go-bindata","github.com/gogo/protobuf/proto", name = "github.com/influxdata/influxdb" version = "~1.1.0" -[[constraint]] - name = "github.com/influxdata/ifql" - revision = "9445c4494d4421db2ab1aaaf6f4069446f11752e" - [[constraint]] name = "github.com/influxdata/kapacitor" revision = "4f10efc41b4dcac070495cf95ba2c41cfcc2aa3a"