Merge branch 'seiflotfy-fix6294'

influxdata · Apr 14, 2016 · 8838843 · 8838843
2 parents 03bbff1 + 64a4808
commit 8838843
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -23,6 +23,7 @@
 - [#6202](https://github.com/influxdata/influxdb/pull/6202): Check default SHARD DURATION when recreating the same database.
 - [#6296](https://github.com/influxdata/influxdb/issues/6296): Allow the implicit time field to be renamed again.
 - [#6379](https://github.com/influxdata/influxdb/issues/6379): Validate the first argument to percentile() is a variable.
+- [#6294](https://github.com/influxdata/influxdb/issues/6294): Fix panic running influx_inspect info.
 
 ## v0.12.0 [2016-04-05]
 ### Release Notes

diff --git a/cmd/influx_inspect/info.go b/cmd/influx_inspect/info.go
@@ -62,6 +62,9 @@ func cmdInfo(path string) {
 			for _, shardID := range shardIDs {
 				shard := tstore.Shard(shardID)
 				codec := shard.FieldCodec(m.Name)
+				if codec == nil {
+					continue
+				}
 				for _, field := range codec.Fields() {
 					ft := fmt.Sprintf("%s:%s", field.Name, field.Type)
 					fmt.Fprintf(tw, "%d\t%s\t%s\t%d/%d\t%d [%s]\t%d\n", shardID, db, m.Name, len(tags), tagValues,