diff --git a/bench/import.go b/bench/import.go index 3688d2625..5a584933a 100644 --- a/bench/import.go +++ b/bench/import.go @@ -22,16 +22,16 @@ func NewImport(stdin io.Reader, stdout, stderr io.Writer) *Import { // Import sets bits with increasing profile id and bitmap id. type Import struct { - BaseBitmapID int64 - MaxBitmapID int64 - BaseProfileID int64 - MaxProfileID int64 - RandomBitmapOrder bool - MinBitsPerMap int64 - MaxBitsPerMap int64 - AgentControls string - Seed int64 - numbits int + BaseBitmapID int64 `json:"base-bitmap-id"` + MaxBitmapID int64 `json:"max-bitmap-id"` + BaseProfileID int64 `json:"base-profile-id"` + MaxProfileID int64 `json:"max-profile-id"` + RandomBitmapOrder bool `json:"random-bitmap-order"` + MinBitsPerMap int64 `json:"min-bits-per-map"` + MaxBitsPerMap int64 `json:"max-bits-per-map"` + AgentControls string `json:"agent-controls"` + Seed int64 `json:"seed"` + numbits int `json:""` *pilosactl.ImportCommand } diff --git a/bench/randquery.go b/bench/randquery.go index b844b4e3e..3d6228f74 100644 --- a/bench/randquery.go +++ b/bench/randquery.go @@ -12,15 +12,14 @@ import ( // RandomQuery queries randomly and deterministically based on a seed. type RandomQuery struct { HasClient - MaxDepth int - MaxArgs int - MaxN int - BaseBitmapID int64 - BitmapIDRange int64 - Iterations int // number of queries - Seed int64 - DBs []string // DBs to query. - + MaxDepth int `json:"max-depth"` + MaxArgs int `json:"max-args"` + MaxN int `json:"max-n"` + BaseBitmapID int64 `json:"base-bitmap-id"` + BitmapIDRange int64 `json:"bitmap-id-range"` + Iterations int `json:"iterations"` + Seed int64 `json:"seed"` + DBs []string `json:"dbs"` } func (b *RandomQuery) Usage() string { diff --git a/bench/sliceheight.go b/bench/sliceheight.go index bc3484b8d..d405c89a5 100644 --- a/bench/sliceheight.go +++ b/bench/sliceheight.go @@ -23,18 +23,18 @@ func NewSliceHeight(stdin io.Reader, stdout, stderr io.Writer) *SliceHeight { // SliceHeight benchmark tests the effect of an increasing number of bitmaps in // a single slice on query time. type SliceHeight struct { - MaxTime time.Duration - hosts []string + MaxTime time.Duration `json:"max-time"` + hosts []string `json:""` - MinBitsPerMap int64 - MaxBitsPerMap int64 - Seed int64 - Database string - Frame string + MinBitsPerMap int64 `json:"min-bits-per-map"` + MaxBitsPerMap int64 `json:"max-bits-per-map"` + Seed int64 `json:"seed"` + Database string `json:"database"` + Frame string `json:"frame"` - Stdin io.Reader - Stdout io.Writer - Stderr io.Writer + Stdin io.Reader `json:""` + Stdout io.Writer `json:""` + Stderr io.Writer `json:""` } func (b *SliceHeight) Usage() string {