From c720ddc28e325f186a30601a2c7dc63e02636f0b Mon Sep 17 00:00:00 2001 From: jaffee Date: Mon, 19 Dec 2016 12:39:05 -0600 Subject: [PATCH] few more json fixes --- bench/client.go | 3 ++- bench/import.go | 2 +- bench/sliceheight.go | 8 ++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/bench/client.go b/bench/client.go index 0025d93d2..3742bdca3 100644 --- a/bench/client.go +++ b/bench/client.go @@ -2,6 +2,7 @@ package bench import ( "fmt" + "github.com/pilosa/pilosa" ) @@ -22,7 +23,7 @@ func roundRobinClient(hosts []string, agentNum int) (*pilosa.Client, error) { // provides the Init method, a ClientType argument and a cli internal variable. type HasClient struct { cli *pilosa.Client - ClientType string + ClientType string `json:"client-type"` } // Init for HasClient looks at the ClientType field and creates a pilosa client diff --git a/bench/import.go b/bench/import.go index 5a584933a..8a249abbb 100644 --- a/bench/import.go +++ b/bench/import.go @@ -31,7 +31,7 @@ type Import struct { MaxBitsPerMap int64 `json:"max-bits-per-map"` AgentControls string `json:"agent-controls"` Seed int64 `json:"seed"` - numbits int `json:""` + numbits int *pilosactl.ImportCommand } diff --git a/bench/sliceheight.go b/bench/sliceheight.go index d405c89a5..31aad4531 100644 --- a/bench/sliceheight.go +++ b/bench/sliceheight.go @@ -24,7 +24,7 @@ func NewSliceHeight(stdin io.Reader, stdout, stderr io.Writer) *SliceHeight { // a single slice on query time. type SliceHeight struct { MaxTime time.Duration `json:"max-time"` - hosts []string `json:""` + hosts []string MinBitsPerMap int64 `json:"min-bits-per-map"` MaxBitsPerMap int64 `json:"max-bits-per-map"` @@ -32,9 +32,9 @@ type SliceHeight struct { Database string `json:"database"` Frame string `json:"frame"` - Stdin io.Reader `json:""` - Stdout io.Writer `json:""` - Stderr io.Writer `json:""` + Stdin io.Reader `json:"-"` + Stdout io.Writer `json:"-"` + Stderr io.Writer `json:"-"` } func (b *SliceHeight) Usage() string {