fix(cmd/influx): fix bug that causes long startup when running 'influ…

…x help' or related commands
influxdata · Nov 6, 2019 · 0664dbc · 0664dbc
1 parent 7b758a4
commit 0664dbc
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ### Bug Fixes
 
+1. [15777](https://github.com/influxdata/influxdb/pull/15777): Fix long startup when running 'influx help'
 1. [15731](https://github.com/influxdata/influxdb/pull/15731): Ensure array cursor iterator stats accumulate all cursor stats
 
 ## v2.0.0-alpha.19 [2019-10-30]

diff --git a/cmd/influx/query.go b/cmd/influx/query.go
@@ -4,9 +4,11 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/influxdata/flux"
 	"github.com/influxdata/flux/repl"
+	_ "github.com/influxdata/flux/stdlib"
 	platform "github.com/influxdata/influxdb"
-	_ "github.com/influxdata/influxdb/query/builtin"
+	_ "github.com/influxdata/influxdb/query/stdlib"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 )
@@ -76,6 +78,8 @@ func fluxQueryF(cmd *cobra.Command, args []string) error {
 		orgID = o.ID
 	}
 
+	flux.FinalizeBuiltIns()
+
 	r, err := getFluxREPL(flags.host, flags.token, orgID)
 	if err != nil {
 		return fmt.Errorf("failed to get the flux REPL: %v", err)

diff --git a/cmd/influx/repl.go b/cmd/influx/repl.go
@@ -6,10 +6,11 @@ import (
 
 	"github.com/influxdata/flux"
 	"github.com/influxdata/flux/repl"
+	_ "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/builtin"
+	_ "github.com/influxdata/influxdb/query/stdlib"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 )
@@ -70,6 +71,8 @@ func replF(cmd *cobra.Command, args []string) error {
 		}
 	}
 
+	flux.FinalizeBuiltIns()
+
 	r, err := getFluxREPL(flags.host, flags.token, orgID)
 	if err != nil {
 		return err