From 0887b38a655d1c742e228f0e149420b5bf64956e Mon Sep 17 00:00:00 2001 From: Stuart Carnie Date: Wed, 27 Jun 2018 11:43:10 -0700 Subject: [PATCH] =?UTF-8?q?chore(influx=5Ftools):=20Rename=20command=20inf?= =?UTF-8?q?lux-tools=20=E2=86=92=20influx=5Ftools?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../compact/command.go | 10 +++++----- .../compact/shardfiles.go | 0 cmd/{influx-tools => influx_tools}/export/README.md | 0 cmd/{influx-tools => influx_tools}/export/bucket.go | 0 .../export/bucket_test.go | 0 cmd/{influx-tools => influx_tools}/export/command.go | 10 +++++----- .../export/exporter.go | 6 +++--- cmd/{influx-tools => influx_tools}/help/help.go | 0 .../importer/README.md | 0 .../importer/command.go | 6 +++--- .../importer/importer.go | 6 +++--- .../importer/series_writer.go | 2 +- .../internal/errlist/errlist.go | 0 .../internal/format/binary/binary.pb.go | 0 .../internal/format/binary/binary.proto | 0 .../internal/format/binary/common.go | 0 .../internal/format/binary/messagetype_string.go | 0 .../internal/format/binary/reader.go | 2 +- .../internal/format/binary/reader_test.go | 2 +- .../internal/format/binary/writer.go | 4 ++-- .../internal/format/binary/writer_test.go | 4 ++-- .../internal/format/conflictwriter.go | 0 .../internal/format/line/writer.go | 2 +- .../internal/format/text/writer.go | 2 +- .../internal/format/writer.go | 2 +- .../internal/shard/writer.go | 2 +- .../internal/storage/resultset.go | 0 .../internal/storage/series_cursor.go | 0 .../internal/storage/store.go | 0 .../internal/tlv/tlv.go | 0 .../internal/tlv/tlv_test.go | 2 +- cmd/{influx-tools => influx_tools}/main.go | 12 ++++++------ cmd/{influx-tools => influx_tools}/server/server.go | 0 33 files changed, 37 insertions(+), 37 deletions(-) rename cmd/{influx-tools => influx_tools}/compact/command.go (96%) rename cmd/{influx-tools => influx_tools}/compact/shardfiles.go (100%) rename cmd/{influx-tools => influx_tools}/export/README.md (100%) rename cmd/{influx-tools => influx_tools}/export/bucket.go (100%) rename cmd/{influx-tools => influx_tools}/export/bucket_test.go (100%) rename cmd/{influx-tools => influx_tools}/export/command.go (93%) rename cmd/{influx-tools => influx_tools}/export/exporter.go (96%) rename cmd/{influx-tools => influx_tools}/help/help.go (100%) rename cmd/{influx-tools => influx_tools}/importer/README.md (100%) rename cmd/{influx-tools => influx_tools}/importer/command.go (94%) rename cmd/{influx-tools => influx_tools}/importer/importer.go (96%) rename cmd/{influx-tools => influx_tools}/importer/series_writer.go (97%) rename cmd/{influx-tools => influx_tools}/internal/errlist/errlist.go (100%) rename cmd/{influx-tools => influx_tools}/internal/format/binary/binary.pb.go (100%) rename cmd/{influx-tools => influx_tools}/internal/format/binary/binary.proto (100%) rename cmd/{influx-tools => influx_tools}/internal/format/binary/common.go (100%) rename cmd/{influx-tools => influx_tools}/internal/format/binary/messagetype_string.go (100%) rename cmd/{influx-tools => influx_tools}/internal/format/binary/reader.go (98%) rename cmd/{influx-tools => influx_tools}/internal/format/binary/reader_test.go (99%) rename cmd/{influx-tools => influx_tools}/internal/format/binary/writer.go (98%) rename cmd/{influx-tools => influx_tools}/internal/format/binary/writer_test.go (95%) rename cmd/{influx-tools => influx_tools}/internal/format/conflictwriter.go (100%) rename cmd/{influx-tools => influx_tools}/internal/format/line/writer.go (98%) rename cmd/{influx-tools => influx_tools}/internal/format/text/writer.go (98%) rename cmd/{influx-tools => influx_tools}/internal/format/writer.go (98%) rename cmd/{influx-tools => influx_tools}/internal/shard/writer.go (97%) rename cmd/{influx-tools => influx_tools}/internal/storage/resultset.go (100%) rename cmd/{influx-tools => influx_tools}/internal/storage/series_cursor.go (100%) rename cmd/{influx-tools => influx_tools}/internal/storage/store.go (100%) rename cmd/{influx-tools => influx_tools}/internal/tlv/tlv.go (100%) rename cmd/{influx-tools => influx_tools}/internal/tlv/tlv_test.go (93%) rename cmd/{influx-tools => influx_tools}/main.go (90%) rename cmd/{influx-tools => influx_tools}/server/server.go (100%) diff --git a/cmd/influx-tools/compact/command.go b/cmd/influx_tools/compact/command.go similarity index 96% rename from cmd/influx-tools/compact/command.go rename to cmd/influx_tools/compact/command.go index 3d42bd0556f..1afc3ddc046 100644 --- a/cmd/influx-tools/compact/command.go +++ b/cmd/influx_tools/compact/command.go @@ -13,11 +13,11 @@ import ( "strconv" "strings" - "github.com/influxdata/influxdb/cmd/influx-tools/internal/format/binary" - "github.com/influxdata/influxdb/cmd/influx-tools/internal/format/line" - "github.com/influxdata/influxdb/cmd/influx-tools/internal/shard" - "github.com/influxdata/influxdb/cmd/influx-tools/internal/storage" - "github.com/influxdata/influxdb/cmd/influx-tools/server" + "github.com/influxdata/influxdb/cmd/influx_tools/internal/format/binary" + "github.com/influxdata/influxdb/cmd/influx_tools/internal/format/line" + "github.com/influxdata/influxdb/cmd/influx_tools/internal/shard" + "github.com/influxdata/influxdb/cmd/influx_tools/internal/storage" + "github.com/influxdata/influxdb/cmd/influx_tools/server" "github.com/influxdata/influxdb/models" "github.com/influxdata/influxdb/tsdb" "github.com/influxdata/influxdb/tsdb/engine/tsm1" diff --git a/cmd/influx-tools/compact/shardfiles.go b/cmd/influx_tools/compact/shardfiles.go similarity index 100% rename from cmd/influx-tools/compact/shardfiles.go rename to cmd/influx_tools/compact/shardfiles.go diff --git a/cmd/influx-tools/export/README.md b/cmd/influx_tools/export/README.md similarity index 100% rename from cmd/influx-tools/export/README.md rename to cmd/influx_tools/export/README.md diff --git a/cmd/influx-tools/export/bucket.go b/cmd/influx_tools/export/bucket.go similarity index 100% rename from cmd/influx-tools/export/bucket.go rename to cmd/influx_tools/export/bucket.go diff --git a/cmd/influx-tools/export/bucket_test.go b/cmd/influx_tools/export/bucket_test.go similarity index 100% rename from cmd/influx-tools/export/bucket_test.go rename to cmd/influx_tools/export/bucket_test.go diff --git a/cmd/influx-tools/export/command.go b/cmd/influx_tools/export/command.go similarity index 93% rename from cmd/influx-tools/export/command.go rename to cmd/influx_tools/export/command.go index 6d6cdfc06e7..d193483f361 100644 --- a/cmd/influx-tools/export/command.go +++ b/cmd/influx_tools/export/command.go @@ -12,11 +12,11 @@ import ( "strings" "time" - "github.com/influxdata/influxdb/cmd/influx-tools/internal/format" - "github.com/influxdata/influxdb/cmd/influx-tools/internal/format/binary" - "github.com/influxdata/influxdb/cmd/influx-tools/internal/format/line" - "github.com/influxdata/influxdb/cmd/influx-tools/internal/format/text" - "github.com/influxdata/influxdb/cmd/influx-tools/server" + "github.com/influxdata/influxdb/cmd/influx_tools/internal/format" + "github.com/influxdata/influxdb/cmd/influx_tools/internal/format/binary" + "github.com/influxdata/influxdb/cmd/influx_tools/internal/format/line" + "github.com/influxdata/influxdb/cmd/influx_tools/internal/format/text" + "github.com/influxdata/influxdb/cmd/influx_tools/server" "go.uber.org/zap" ) diff --git a/cmd/influx-tools/export/exporter.go b/cmd/influx_tools/export/exporter.go similarity index 96% rename from cmd/influx-tools/export/exporter.go rename to cmd/influx_tools/export/exporter.go index 85737590cfd..8dfdc19df3d 100644 --- a/cmd/influx-tools/export/exporter.go +++ b/cmd/influx_tools/export/exporter.go @@ -8,9 +8,9 @@ import ( "text/tabwriter" "time" - "github.com/influxdata/influxdb/cmd/influx-tools/internal/format" - "github.com/influxdata/influxdb/cmd/influx-tools/internal/storage" - "github.com/influxdata/influxdb/cmd/influx-tools/server" + "github.com/influxdata/influxdb/cmd/influx_tools/internal/format" + "github.com/influxdata/influxdb/cmd/influx_tools/internal/storage" + "github.com/influxdata/influxdb/cmd/influx_tools/server" "github.com/influxdata/influxdb/models" "github.com/influxdata/influxdb/services/meta" "github.com/influxdata/influxdb/tsdb" diff --git a/cmd/influx-tools/help/help.go b/cmd/influx_tools/help/help.go similarity index 100% rename from cmd/influx-tools/help/help.go rename to cmd/influx_tools/help/help.go diff --git a/cmd/influx-tools/importer/README.md b/cmd/influx_tools/importer/README.md similarity index 100% rename from cmd/influx-tools/importer/README.md rename to cmd/influx_tools/importer/README.md diff --git a/cmd/influx-tools/importer/command.go b/cmd/influx_tools/importer/command.go similarity index 94% rename from cmd/influx-tools/importer/command.go rename to cmd/influx_tools/importer/command.go index 91cde566fb1..ce9df6fe25d 100644 --- a/cmd/influx-tools/importer/command.go +++ b/cmd/influx_tools/importer/command.go @@ -7,10 +7,10 @@ import ( "os" "time" - "github.com/influxdata/influxdb/cmd/influx-tools/internal/errlist" + "github.com/influxdata/influxdb/cmd/influx_tools/internal/errlist" - "github.com/influxdata/influxdb/cmd/influx-tools/internal/format/binary" - "github.com/influxdata/influxdb/cmd/influx-tools/server" + "github.com/influxdata/influxdb/cmd/influx_tools/internal/format/binary" + "github.com/influxdata/influxdb/cmd/influx_tools/server" "github.com/influxdata/influxdb/services/meta" "github.com/influxdata/influxdb/tsdb/engine/tsm1" "go.uber.org/zap" diff --git a/cmd/influx-tools/importer/importer.go b/cmd/influx_tools/importer/importer.go similarity index 96% rename from cmd/influx-tools/importer/importer.go rename to cmd/influx_tools/importer/importer.go index c11dab14f22..c428c779dcf 100644 --- a/cmd/influx-tools/importer/importer.go +++ b/cmd/influx_tools/importer/importer.go @@ -8,9 +8,9 @@ import ( "strconv" "time" - "github.com/influxdata/influxdb/cmd/influx-tools/internal/errlist" - "github.com/influxdata/influxdb/cmd/influx-tools/internal/shard" - "github.com/influxdata/influxdb/cmd/influx-tools/server" + "github.com/influxdata/influxdb/cmd/influx_tools/internal/errlist" + "github.com/influxdata/influxdb/cmd/influx_tools/internal/shard" + "github.com/influxdata/influxdb/cmd/influx_tools/server" "github.com/influxdata/influxdb/services/meta" "github.com/influxdata/influxdb/tsdb" "github.com/influxdata/influxdb/tsdb/engine/tsm1" diff --git a/cmd/influx-tools/importer/series_writer.go b/cmd/influx_tools/importer/series_writer.go similarity index 97% rename from cmd/influx-tools/importer/series_writer.go rename to cmd/influx_tools/importer/series_writer.go index 158405af743..3c4815ef04d 100644 --- a/cmd/influx-tools/importer/series_writer.go +++ b/cmd/influx_tools/importer/series_writer.go @@ -5,7 +5,7 @@ import ( "path/filepath" "strconv" - "github.com/influxdata/influxdb/cmd/influx-tools/internal/errlist" + "github.com/influxdata/influxdb/cmd/influx_tools/internal/errlist" "github.com/influxdata/influxdb/models" "github.com/influxdata/influxdb/tsdb" "github.com/influxdata/influxdb/tsdb/engine/tsm1" diff --git a/cmd/influx-tools/internal/errlist/errlist.go b/cmd/influx_tools/internal/errlist/errlist.go similarity index 100% rename from cmd/influx-tools/internal/errlist/errlist.go rename to cmd/influx_tools/internal/errlist/errlist.go diff --git a/cmd/influx-tools/internal/format/binary/binary.pb.go b/cmd/influx_tools/internal/format/binary/binary.pb.go similarity index 100% rename from cmd/influx-tools/internal/format/binary/binary.pb.go rename to cmd/influx_tools/internal/format/binary/binary.pb.go diff --git a/cmd/influx-tools/internal/format/binary/binary.proto b/cmd/influx_tools/internal/format/binary/binary.proto similarity index 100% rename from cmd/influx-tools/internal/format/binary/binary.proto rename to cmd/influx_tools/internal/format/binary/binary.proto diff --git a/cmd/influx-tools/internal/format/binary/common.go b/cmd/influx_tools/internal/format/binary/common.go similarity index 100% rename from cmd/influx-tools/internal/format/binary/common.go rename to cmd/influx_tools/internal/format/binary/common.go diff --git a/cmd/influx-tools/internal/format/binary/messagetype_string.go b/cmd/influx_tools/internal/format/binary/messagetype_string.go similarity index 100% rename from cmd/influx-tools/internal/format/binary/messagetype_string.go rename to cmd/influx_tools/internal/format/binary/messagetype_string.go diff --git a/cmd/influx-tools/internal/format/binary/reader.go b/cmd/influx_tools/internal/format/binary/reader.go similarity index 98% rename from cmd/influx-tools/internal/format/binary/reader.go rename to cmd/influx_tools/internal/format/binary/reader.go index 1a828418fa4..0a40bb7e434 100644 --- a/cmd/influx-tools/internal/format/binary/reader.go +++ b/cmd/influx_tools/internal/format/binary/reader.go @@ -6,7 +6,7 @@ import ( "fmt" "io" - "github.com/influxdata/influxdb/cmd/influx-tools/internal/tlv" + "github.com/influxdata/influxdb/cmd/influx_tools/internal/tlv" "github.com/influxdata/influxdb/tsdb" "github.com/influxdata/influxdb/tsdb/engine/tsm1" ) diff --git a/cmd/influx-tools/internal/format/binary/reader_test.go b/cmd/influx_tools/internal/format/binary/reader_test.go similarity index 99% rename from cmd/influx-tools/internal/format/binary/reader_test.go rename to cmd/influx_tools/internal/format/binary/reader_test.go index 5c138a15210..da4a31ced90 100644 --- a/cmd/influx-tools/internal/format/binary/reader_test.go +++ b/cmd/influx_tools/internal/format/binary/reader_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/influxdata/influxdb/cmd/influx-tools/internal/format/binary" + "github.com/influxdata/influxdb/cmd/influx_tools/internal/format/binary" "github.com/influxdata/influxdb/models" "github.com/influxdata/influxql" ) diff --git a/cmd/influx-tools/internal/format/binary/writer.go b/cmd/influx_tools/internal/format/binary/writer.go similarity index 98% rename from cmd/influx-tools/internal/format/binary/writer.go rename to cmd/influx_tools/internal/format/binary/writer.go index 58dac274b5d..bf363acdf37 100644 --- a/cmd/influx-tools/internal/format/binary/writer.go +++ b/cmd/influx_tools/internal/format/binary/writer.go @@ -6,8 +6,8 @@ import ( "io" "time" - "github.com/influxdata/influxdb/cmd/influx-tools/internal/format" - "github.com/influxdata/influxdb/cmd/influx-tools/internal/tlv" + "github.com/influxdata/influxdb/cmd/influx_tools/internal/format" + "github.com/influxdata/influxdb/cmd/influx_tools/internal/tlv" "github.com/influxdata/influxdb/models" "github.com/influxdata/influxdb/tsdb" "github.com/influxdata/influxql" diff --git a/cmd/influx-tools/internal/format/binary/writer_test.go b/cmd/influx_tools/internal/format/binary/writer_test.go similarity index 95% rename from cmd/influx-tools/internal/format/binary/writer_test.go rename to cmd/influx_tools/internal/format/binary/writer_test.go index b0cf4d2712b..32a8b367cc2 100644 --- a/cmd/influx-tools/internal/format/binary/writer_test.go +++ b/cmd/influx_tools/internal/format/binary/writer_test.go @@ -7,8 +7,8 @@ import ( "time" "github.com/google/go-cmp/cmp" - "github.com/influxdata/influxdb/cmd/influx-tools/internal/format/binary" - "github.com/influxdata/influxdb/cmd/influx-tools/internal/tlv" + "github.com/influxdata/influxdb/cmd/influx_tools/internal/format/binary" + "github.com/influxdata/influxdb/cmd/influx_tools/internal/tlv" "github.com/influxdata/influxdb/models" "github.com/influxdata/influxql" ) diff --git a/cmd/influx-tools/internal/format/conflictwriter.go b/cmd/influx_tools/internal/format/conflictwriter.go similarity index 100% rename from cmd/influx-tools/internal/format/conflictwriter.go rename to cmd/influx_tools/internal/format/conflictwriter.go diff --git a/cmd/influx-tools/internal/format/line/writer.go b/cmd/influx_tools/internal/format/line/writer.go similarity index 98% rename from cmd/influx-tools/internal/format/line/writer.go rename to cmd/influx_tools/internal/format/line/writer.go index c9f1f590a13..2d1707c22ba 100644 --- a/cmd/influx-tools/internal/format/line/writer.go +++ b/cmd/influx_tools/internal/format/line/writer.go @@ -7,7 +7,7 @@ import ( "strconv" "time" - "github.com/influxdata/influxdb/cmd/influx-tools/internal/format" + "github.com/influxdata/influxdb/cmd/influx_tools/internal/format" "github.com/influxdata/influxdb/models" "github.com/influxdata/influxdb/pkg/escape" "github.com/influxdata/influxdb/tsdb" diff --git a/cmd/influx-tools/internal/format/text/writer.go b/cmd/influx_tools/internal/format/text/writer.go similarity index 98% rename from cmd/influx-tools/internal/format/text/writer.go rename to cmd/influx_tools/internal/format/text/writer.go index 6d27061ba89..26a3adc5413 100644 --- a/cmd/influx-tools/internal/format/text/writer.go +++ b/cmd/influx_tools/internal/format/text/writer.go @@ -5,7 +5,7 @@ import ( "io" "strconv" - "github.com/influxdata/influxdb/cmd/influx-tools/internal/format" + "github.com/influxdata/influxdb/cmd/influx_tools/internal/format" "github.com/influxdata/influxdb/models" "github.com/influxdata/influxdb/pkg/escape" "github.com/influxdata/influxdb/tsdb" diff --git a/cmd/influx-tools/internal/format/writer.go b/cmd/influx_tools/internal/format/writer.go similarity index 98% rename from cmd/influx-tools/internal/format/writer.go rename to cmd/influx_tools/internal/format/writer.go index 904d48ca3a2..e7043049ac7 100644 --- a/cmd/influx-tools/internal/format/writer.go +++ b/cmd/influx_tools/internal/format/writer.go @@ -3,7 +3,7 @@ package format import ( "fmt" - "github.com/influxdata/influxdb/cmd/influx-tools/internal/storage" + "github.com/influxdata/influxdb/cmd/influx_tools/internal/storage" "github.com/influxdata/influxdb/models" "github.com/influxdata/influxdb/tsdb" "github.com/influxdata/influxql" diff --git a/cmd/influx-tools/internal/shard/writer.go b/cmd/influx_tools/internal/shard/writer.go similarity index 97% rename from cmd/influx-tools/internal/shard/writer.go rename to cmd/influx_tools/internal/shard/writer.go index d61b2605d83..f7136be4e22 100644 --- a/cmd/influx-tools/internal/shard/writer.go +++ b/cmd/influx_tools/internal/shard/writer.go @@ -6,7 +6,7 @@ import ( "path/filepath" "strconv" - "github.com/influxdata/influxdb/cmd/influx-tools/internal/errlist" + "github.com/influxdata/influxdb/cmd/influx_tools/internal/errlist" "github.com/influxdata/influxdb/tsdb/engine/tsm1" ) diff --git a/cmd/influx-tools/internal/storage/resultset.go b/cmd/influx_tools/internal/storage/resultset.go similarity index 100% rename from cmd/influx-tools/internal/storage/resultset.go rename to cmd/influx_tools/internal/storage/resultset.go diff --git a/cmd/influx-tools/internal/storage/series_cursor.go b/cmd/influx_tools/internal/storage/series_cursor.go similarity index 100% rename from cmd/influx-tools/internal/storage/series_cursor.go rename to cmd/influx_tools/internal/storage/series_cursor.go diff --git a/cmd/influx-tools/internal/storage/store.go b/cmd/influx_tools/internal/storage/store.go similarity index 100% rename from cmd/influx-tools/internal/storage/store.go rename to cmd/influx_tools/internal/storage/store.go diff --git a/cmd/influx-tools/internal/tlv/tlv.go b/cmd/influx_tools/internal/tlv/tlv.go similarity index 100% rename from cmd/influx-tools/internal/tlv/tlv.go rename to cmd/influx_tools/internal/tlv/tlv.go diff --git a/cmd/influx-tools/internal/tlv/tlv_test.go b/cmd/influx_tools/internal/tlv/tlv_test.go similarity index 93% rename from cmd/influx-tools/internal/tlv/tlv_test.go rename to cmd/influx_tools/internal/tlv/tlv_test.go index d9d03350164..320d6f9a424 100644 --- a/cmd/influx-tools/internal/tlv/tlv_test.go +++ b/cmd/influx_tools/internal/tlv/tlv_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/influxdata/influxdb/cmd/influx-tools/internal/tlv" + "github.com/influxdata/influxdb/cmd/influx_tools/internal/tlv" ) func TestReadLV_LengthExceedsMax(t *testing.T) { diff --git a/cmd/influx-tools/main.go b/cmd/influx_tools/main.go similarity index 90% rename from cmd/influx-tools/main.go rename to cmd/influx_tools/main.go index f7c3eff16ba..bea0b2419c6 100644 --- a/cmd/influx-tools/main.go +++ b/cmd/influx_tools/main.go @@ -1,4 +1,4 @@ -// The influx-tools command displays detailed information about InfluxDB data files. +// The influx_tools command displays detailed information about InfluxDB data files. package main import ( @@ -8,11 +8,11 @@ import ( "os" "github.com/influxdata/influxdb/cmd" - "github.com/influxdata/influxdb/cmd/influx-tools/compact" - "github.com/influxdata/influxdb/cmd/influx-tools/export" - "github.com/influxdata/influxdb/cmd/influx-tools/help" - "github.com/influxdata/influxdb/cmd/influx-tools/importer" - "github.com/influxdata/influxdb/cmd/influx-tools/server" + "github.com/influxdata/influxdb/cmd/influx_tools/compact" + "github.com/influxdata/influxdb/cmd/influx_tools/export" + "github.com/influxdata/influxdb/cmd/influx_tools/help" + "github.com/influxdata/influxdb/cmd/influx_tools/importer" + "github.com/influxdata/influxdb/cmd/influx_tools/server" "github.com/influxdata/influxdb/cmd/influxd/run" "github.com/influxdata/influxdb/services/meta" "github.com/influxdata/influxdb/tsdb" diff --git a/cmd/influx-tools/server/server.go b/cmd/influx_tools/server/server.go similarity index 100% rename from cmd/influx-tools/server/server.go rename to cmd/influx_tools/server/server.go