diff --git a/_tools/tmpl/main.go b/_tools/tmpl/main.go index 191a6f3cc7..4f44aafe09 100644 --- a/_tools/tmpl/main.go +++ b/_tools/tmpl/main.go @@ -248,4 +248,4 @@ func StripComments(raw []byte) []byte { } return buf.Bytes() -} \ No newline at end of file +} diff --git a/_tools/tmpl/main_test.go b/_tools/tmpl/main_test.go index c24fb7e0ca..cbb1f07e8f 100644 --- a/_tools/tmpl/main_test.go +++ b/_tools/tmpl/main_test.go @@ -54,4 +54,4 @@ func TestStripComments(t *testing.T) { } }) } -} \ No newline at end of file +} diff --git a/cmd/influx_tools/internal/format/binary/binary.pb.go b/cmd/influx_tools/internal/format/binary/binary.pb.go index 3d037e61ff..77af751281 100644 --- a/cmd/influx_tools/internal/format/binary/binary.pb.go +++ b/cmd/influx_tools/internal/format/binary/binary.pb.go @@ -21,14 +21,19 @@ */ package binary -import proto "github.com/gogo/protobuf/proto" -import fmt "fmt" -import math "math" -import _ "github.com/gogo/protobuf/gogoproto" +import ( + fmt "fmt" -import time "time" + proto "github.com/gogo/protobuf/proto" -import io "io" + math "math" + + _ "github.com/gogo/protobuf/gogoproto" + + time "time" + + io "io" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal diff --git a/cmd/influx_tsm/tsdb/internal/meta.pb.go b/cmd/influx_tsm/tsdb/internal/meta.pb.go index 1397774b83..ba05a9119e 100644 --- a/cmd/influx_tsm/tsdb/internal/meta.pb.go +++ b/cmd/influx_tsm/tsdb/internal/meta.pb.go @@ -15,9 +15,13 @@ It has these top-level messages: */ package internal -import proto "github.com/gogo/protobuf/proto" -import fmt "fmt" -import math "math" +import ( + fmt "fmt" + + proto "github.com/gogo/protobuf/proto" + + math "math" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal diff --git a/cmd/influxd/backup_util/backup_util.go b/cmd/influxd/backup_util/backup_util.go index 2632da4696..a8fc5ce1a7 100644 --- a/cmd/influxd/backup_util/backup_util.go +++ b/cmd/influxd/backup_util/backup_util.go @@ -6,15 +6,15 @@ import ( "encoding/json" "fmt" "io" + "io/ioutil" "os" + "path/filepath" "sort" "strings" "github.com/gogo/protobuf/proto" internal "github.com/influxdata/influxdb/cmd/influxd/backup_util/internal" "github.com/influxdata/influxdb/services/snapshotter" - "io/ioutil" - "path/filepath" ) //go:generate protoc --gogo_out=. internal/data.proto diff --git a/cmd/influxd/backup_util/internal/data.pb.go b/cmd/influxd/backup_util/internal/data.pb.go index f6762af1b4..edcd345183 100644 --- a/cmd/influxd/backup_util/internal/data.pb.go +++ b/cmd/influxd/backup_util/internal/data.pb.go @@ -13,9 +13,13 @@ It has these top-level messages: */ package backup_util -import proto "github.com/gogo/protobuf/proto" -import fmt "fmt" -import math "math" +import ( + fmt "fmt" + + proto "github.com/gogo/protobuf/proto" + + math "math" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal diff --git a/flux/stdlib/influxdata/influxdb/v1/databases.go b/flux/stdlib/influxdata/influxdb/v1/databases.go index 1779f411c5..bcada5913c 100644 --- a/flux/stdlib/influxdata/influxdb/v1/databases.go +++ b/flux/stdlib/influxdata/influxdb/v1/databases.go @@ -9,7 +9,7 @@ import ( "github.com/influxdata/flux/execute" "github.com/influxdata/flux/memory" "github.com/influxdata/flux/plan" - "github.com/influxdata/flux/stdlib/influxdata/influxdb/v1" + v1 "github.com/influxdata/flux/stdlib/influxdata/influxdb/v1" "github.com/influxdata/flux/values" "github.com/influxdata/influxdb/flux/stdlib/influxdata/influxdb" "github.com/influxdata/influxdb/services/meta" diff --git a/pkg/tracing/wire/binary.pb.go b/pkg/tracing/wire/binary.pb.go index 377bea888e..1f1ac0cd86 100644 --- a/pkg/tracing/wire/binary.pb.go +++ b/pkg/tracing/wire/binary.pb.go @@ -15,17 +15,23 @@ */ package wire -import proto "github.com/gogo/protobuf/proto" -import fmt "fmt" -import math "math" -import _ "github.com/gogo/protobuf/gogoproto" -import _ "github.com/gogo/protobuf/types" +import ( + fmt "fmt" -import time "time" + proto "github.com/gogo/protobuf/proto" -import github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" + math "math" -import io "io" + _ "github.com/gogo/protobuf/gogoproto" + + _ "github.com/gogo/protobuf/types" + + time "time" + + github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" + + io "io" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal diff --git a/prometheus/remote/remote.pb.go b/prometheus/remote/remote.pb.go index a9e78261e1..4481f4a91f 100644 --- a/prometheus/remote/remote.pb.go +++ b/prometheus/remote/remote.pb.go @@ -21,11 +21,15 @@ */ package remote -import proto "github.com/gogo/protobuf/proto" -import fmt "fmt" -import math "math" +import ( + fmt "fmt" -import io "io" + proto "github.com/gogo/protobuf/proto" + + math "math" + + io "io" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal diff --git a/query/internal/internal.pb.go b/query/internal/internal.pb.go index dd76e1b023..dd31790687 100644 --- a/query/internal/internal.pb.go +++ b/query/internal/internal.pb.go @@ -19,9 +19,13 @@ It has these top-level messages: */ package query -import proto "github.com/gogo/protobuf/proto" -import fmt "fmt" -import math "math" +import ( + fmt "fmt" + + proto "github.com/gogo/protobuf/proto" + + math "math" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal diff --git a/services/meta/internal/meta.pb.go b/services/meta/internal/meta.pb.go index 403b868317..a294853f9e 100644 --- a/services/meta/internal/meta.pb.go +++ b/services/meta/internal/meta.pb.go @@ -55,9 +55,13 @@ It has these top-level messages: */ package meta -import proto "github.com/gogo/protobuf/proto" -import fmt "fmt" -import math "math" +import ( + fmt "fmt" + + proto "github.com/gogo/protobuf/proto" + + math "math" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal diff --git a/services/storage/source.pb.go b/services/storage/source.pb.go index 186b9bc50c..a5456d73c8 100644 --- a/services/storage/source.pb.go +++ b/services/storage/source.pb.go @@ -12,12 +12,17 @@ */ package storage -import proto "github.com/gogo/protobuf/proto" -import fmt "fmt" -import math "math" -import _ "github.com/gogo/protobuf/gogoproto" +import ( + fmt "fmt" -import io "io" + proto "github.com/gogo/protobuf/proto" + + math "math" + + _ "github.com/gogo/protobuf/gogoproto" + + io "io" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal diff --git a/storage/reads/datatypes/predicate.pb.go b/storage/reads/datatypes/predicate.pb.go index 068385c250..41e32a2c29 100644 --- a/storage/reads/datatypes/predicate.pb.go +++ b/storage/reads/datatypes/predicate.pb.go @@ -6,10 +6,11 @@ package datatypes import ( encoding_binary "encoding/binary" fmt "fmt" - _ "github.com/gogo/protobuf/gogoproto" - proto "github.com/gogo/protobuf/proto" io "io" math "math" + + _ "github.com/gogo/protobuf/gogoproto" + proto "github.com/gogo/protobuf/proto" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/storage/reads/datatypes/storage_common.pb.go b/storage/reads/datatypes/storage_common.pb.go index f963f5bcc7..3bd52d40b1 100644 --- a/storage/reads/datatypes/storage_common.pb.go +++ b/storage/reads/datatypes/storage_common.pb.go @@ -7,12 +7,13 @@ import ( context "context" encoding_binary "encoding/binary" fmt "fmt" + io "io" + math "math" + _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" types "github.com/gogo/protobuf/types" grpc "google.golang.org/grpc" - io "io" - math "math" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/stress/v2/main.go b/stress/v2/main.go index 0675809a28..ddf6ed232f 100644 --- a/stress/v2/main.go +++ b/stress/v2/main.go @@ -6,7 +6,7 @@ import ( "time" influx "github.com/influxdata/influxdb/client/v2" - "github.com/influxdata/influxdb/stress/v2/stress_client" + stressClient "github.com/influxdata/influxdb/stress/v2/stress_client" "github.com/influxdata/influxdb/stress/v2/stressql" ) diff --git a/stress/v2/statement/exec.go b/stress/v2/statement/exec.go index b82f71c0aa..9f090bb154 100644 --- a/stress/v2/statement/exec.go +++ b/stress/v2/statement/exec.go @@ -3,7 +3,7 @@ package statement import ( "time" - "github.com/influxdata/influxdb/stress/v2/stress_client" + stressClient "github.com/influxdata/influxdb/stress/v2/stress_client" ) // ExecStatement run outside scripts. This functionality is not built out diff --git a/stress/v2/statement/exec_test.go b/stress/v2/statement/exec_test.go index 06c433eac2..82e2c911c2 100644 --- a/stress/v2/statement/exec_test.go +++ b/stress/v2/statement/exec_test.go @@ -3,7 +3,7 @@ package statement import ( "testing" - "github.com/influxdata/influxdb/stress/v2/stress_client" + stressClient "github.com/influxdata/influxdb/stress/v2/stress_client" ) func TestExecSetID(t *testing.T) { diff --git a/stress/v2/statement/go.go b/stress/v2/statement/go.go index e1d61e7e0f..3e0c580873 100644 --- a/stress/v2/statement/go.go +++ b/stress/v2/statement/go.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/influxdata/influxdb/stress/v2/stress_client" + stressClient "github.com/influxdata/influxdb/stress/v2/stress_client" ) // GoStatement is a Statement Implementation to allow other statements to be run concurrently diff --git a/stress/v2/statement/go_test.go b/stress/v2/statement/go_test.go index c9ebba3969..16f1c125a3 100644 --- a/stress/v2/statement/go_test.go +++ b/stress/v2/statement/go_test.go @@ -3,7 +3,7 @@ package statement import ( "testing" - "github.com/influxdata/influxdb/stress/v2/stress_client" + stressClient "github.com/influxdata/influxdb/stress/v2/stress_client" ) func TestGoSetID(t *testing.T) { diff --git a/stress/v2/statement/influxql.go b/stress/v2/statement/influxql.go index 2a1eca2c4b..9fb9ace300 100644 --- a/stress/v2/statement/influxql.go +++ b/stress/v2/statement/influxql.go @@ -4,7 +4,7 @@ import ( "log" "time" - "github.com/influxdata/influxdb/stress/v2/stress_client" + stressClient "github.com/influxdata/influxdb/stress/v2/stress_client" ) // InfluxqlStatement is a Statement Implementation that allows statements that parse in InfluxQL to be passed directly to the target instance diff --git a/stress/v2/statement/influxql_test.go b/stress/v2/statement/influxql_test.go index 74c8b45077..6504dfc2fc 100644 --- a/stress/v2/statement/influxql_test.go +++ b/stress/v2/statement/influxql_test.go @@ -3,7 +3,7 @@ package statement import ( "testing" - "github.com/influxdata/influxdb/stress/v2/stress_client" + stressClient "github.com/influxdata/influxdb/stress/v2/stress_client" ) func TestInfluxQlSetID(t *testing.T) { diff --git a/stress/v2/statement/insert.go b/stress/v2/statement/insert.go index bfa0b242f2..73e641f3c2 100644 --- a/stress/v2/statement/insert.go +++ b/stress/v2/statement/insert.go @@ -9,7 +9,7 @@ import ( "sync" "time" - "github.com/influxdata/influxdb/stress/v2/stress_client" + stressClient "github.com/influxdata/influxdb/stress/v2/stress_client" ) // InsertStatement is a Statement Implementation that creates points to be written to the target InfluxDB instance diff --git a/stress/v2/statement/insert_test.go b/stress/v2/statement/insert_test.go index 4fc0418232..9a1f22669d 100644 --- a/stress/v2/statement/insert_test.go +++ b/stress/v2/statement/insert_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "github.com/influxdata/influxdb/stress/v2/stress_client" + stressClient "github.com/influxdata/influxdb/stress/v2/stress_client" ) func TestInsertSetID(t *testing.T) { diff --git a/stress/v2/statement/query.go b/stress/v2/statement/query.go index b9d9032e0f..179626d620 100644 --- a/stress/v2/statement/query.go +++ b/stress/v2/statement/query.go @@ -6,7 +6,7 @@ import ( "time" "github.com/influxdata/influxdb/models" - "github.com/influxdata/influxdb/stress/v2/stress_client" + stressClient "github.com/influxdata/influxdb/stress/v2/stress_client" ) // QueryStatement is a Statement Implementation to run queries on the target InfluxDB instance diff --git a/stress/v2/statement/query_test.go b/stress/v2/statement/query_test.go index b9b607f8f4..4aa3ce795d 100644 --- a/stress/v2/statement/query_test.go +++ b/stress/v2/statement/query_test.go @@ -3,7 +3,7 @@ package statement import ( "testing" - "github.com/influxdata/influxdb/stress/v2/stress_client" + stressClient "github.com/influxdata/influxdb/stress/v2/stress_client" ) func TestQuerySetID(t *testing.T) { diff --git a/stress/v2/statement/set.go b/stress/v2/statement/set.go index 825c74f3b1..0af5794d6a 100644 --- a/stress/v2/statement/set.go +++ b/stress/v2/statement/set.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/influxdata/influxdb/stress/v2/stress_client" + stressClient "github.com/influxdata/influxdb/stress/v2/stress_client" ) // SetStatement set state variables for the test diff --git a/stress/v2/statement/set_test.go b/stress/v2/statement/set_test.go index c6c9febb4f..88d1ea0360 100644 --- a/stress/v2/statement/set_test.go +++ b/stress/v2/statement/set_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/influxdata/influxdb/stress/v2/stress_client" + stressClient "github.com/influxdata/influxdb/stress/v2/stress_client" ) func TestSetSetID(t *testing.T) { diff --git a/stress/v2/statement/statement.go b/stress/v2/statement/statement.go index 53cd40060f..81afaf746e 100644 --- a/stress/v2/statement/statement.go +++ b/stress/v2/statement/statement.go @@ -4,7 +4,7 @@ import ( "log" "strconv" - "github.com/influxdata/influxdb/stress/v2/stress_client" + stressClient "github.com/influxdata/influxdb/stress/v2/stress_client" ) // Statement is the common interface to shape the testing environment and prepare database requests diff --git a/stress/v2/statement/wait.go b/stress/v2/statement/wait.go index e047761d86..c0966daf51 100644 --- a/stress/v2/statement/wait.go +++ b/stress/v2/statement/wait.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/influxdata/influxdb/stress/v2/stress_client" + stressClient "github.com/influxdata/influxdb/stress/v2/stress_client" ) // WaitStatement is a Statement Implementation to prevent the test from returning to early when running GoStatements diff --git a/stress/v2/statement/wait_test.go b/stress/v2/statement/wait_test.go index 5ad0b32a9c..255ea3d4dd 100644 --- a/stress/v2/statement/wait_test.go +++ b/stress/v2/statement/wait_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - "github.com/influxdata/influxdb/stress/v2/stress_client" + stressClient "github.com/influxdata/influxdb/stress/v2/stress_client" ) func TestWaitSetID(t *testing.T) { diff --git a/tests/backup_restore_test.go b/tests/backup_restore_test.go index 4d3bee6ae6..a215e7320d 100644 --- a/tests/backup_restore_test.go +++ b/tests/backup_restore_test.go @@ -1,19 +1,18 @@ package tests import ( + "fmt" "io/ioutil" "net" "os" "path/filepath" + "strings" "testing" "time" - "fmt" - "github.com/influxdata/influxdb/cmd/influxd/backup" "github.com/influxdata/influxdb/cmd/influxd/restore" "github.com/influxdata/influxdb/toml" - "strings" ) func TestServer_BackupAndRestore(t *testing.T) { diff --git a/tsdb/engine/tsm1/engine_internal_test.go b/tsdb/engine/tsm1/engine_internal_test.go index 2c6d434cd8..65ebd0fdfb 100644 --- a/tsdb/engine/tsm1/engine_internal_test.go +++ b/tsdb/engine/tsm1/engine_internal_test.go @@ -1,16 +1,17 @@ package tsm1 import ( - "github.com/influxdata/influxdb/logger" - "github.com/influxdata/influxdb/models" - "github.com/influxdata/influxdb/tsdb" - "github.com/influxdata/influxdb/tsdb/index/inmem" "io/ioutil" "os" "path/filepath" "runtime" "testing" "time" + + "github.com/influxdata/influxdb/logger" + "github.com/influxdata/influxdb/models" + "github.com/influxdata/influxdb/tsdb" + "github.com/influxdata/influxdb/tsdb/index/inmem" ) func TestEngine_ConcurrentShardSnapshots(t *testing.T) { diff --git a/tsdb/internal/meta.pb.go b/tsdb/internal/meta.pb.go index b09b9d74b3..af601763d4 100644 --- a/tsdb/internal/meta.pb.go +++ b/tsdb/internal/meta.pb.go @@ -3,11 +3,15 @@ package tsdb -import proto "github.com/gogo/protobuf/proto" -import fmt "fmt" -import math "math" +import ( + fmt "fmt" -import io "io" + proto "github.com/gogo/protobuf/proto" + + math "math" + + io "io" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal