From 0664dbc47dcc43a8b2ac619fa8d5dfcfa3b96e1d Mon Sep 17 00:00:00 2001
From: Faith Chikwekwe <fchikwekwe@MBP15-FCHIKWEKWE.local>
Date: Tue, 5 Nov 2019 17:13:13 -0800
Subject: [PATCH] fix(cmd/influx): fix bug that causes long startup when
 running 'influx help' or related commands

---
 CHANGELOG.md        | 1 +
 cmd/influx/query.go | 6 +++++-
 cmd/influx/repl.go  | 5 ++++-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3f6384bdd10..4757642d9d8 100644
--- 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
index 8c56305a89c..e26e19d9c34 100644
--- 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
index 5efb46f3afc..1dc40494d7e 100644
--- 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