scriptoriumadmin/featurebase
1
0
Fork 0
mirror of https://github.com/featurebasedb/featurebase.git synced 2026-09-06 00:25:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rename QueryMaker -> QueryGenerator

Browse source
This commit is contained in:
jaffee 2016-11-28 10:00:29 -07:00
parent 406efcaca3
commit ea88941cff
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
bench/query.go
View file

@ -5,21 +5,21 @@ import (
"math/rand"
)
func NewQueryMaker(seed int64) *QueryMaker {
return &QueryMaker{
func NewQueryGenerator(seed int64) *QueryGenerator {
return &QueryGenerator{
IDToFrameFn: func(id uint64) string { return "frame.n" },
R: rand.New(rand.NewSource(seed)),
Frames: []string{"frame.n"},
}
}
type QueryMaker struct {
type QueryGenerator struct {
IDToFrameFn func(id uint64) string
R *rand.Rand
Frames []string
}
func (q *QueryMaker) Random(maxN, depth, maxargs int, idmin, idmax uint64) pql.Call {
func (q *QueryGenerator) Random(maxN, depth, maxargs int, idmin, idmax uint64) pql.Call {
// TODO: handle depth==1 or 0
val := q.R.Intn(5)
switch val {
@ -30,7 +30,7 @@ func (q *QueryMaker) Random(maxN, depth, maxargs int, idmin, idmax uint64) pql.C
}
}
func (q *QueryMaker) RandomTopN(maxN, depth, maxargs int, idmin, idmax uint64) *pql.TopN {
func (q *QueryGenerator) RandomTopN(maxN, depth, maxargs int, idmin, idmax uint64) *pql.TopN {
frameIdx := q.R.Intn(len(q.Frames))
return &pql.TopN{
Frame: q.Frames[frameIdx],
@ -39,7 +39,7 @@ func (q *QueryMaker) RandomTopN(maxN, depth, maxargs int, idmin, idmax uint64) *
}
}
func (q *QueryMaker) RandomBitmapCall(depth, maxargs int, idmin, idmax uint64) pql.BitmapCall {
func (q *QueryGenerator) RandomBitmapCall(depth, maxargs int, idmin, idmax uint64) pql.BitmapCall {
if depth <= 1 {
bitmapID := q.R.Int63n(int64(idmax)-int64(idmin)) + int64(idmin)
return Bitmap(uint64(bitmapID), q.IDToFrameFn(uint64(bitmapID)))

4
bench/query_test.go
View file

@ -6,14 +6,14 @@ import (
)
func TestRandomBitmapCall(t *testing.T) {
qm := bench.NewQueryMaker(5)
qm := bench.NewQueryGenerator(5)
bmc := qm.RandomBitmapCall(4, 3, 0, 1000)
t.Log(bmc.String())
}
func TestRandom(t *testing.T) {
for i := 99; i < 120; i++ {
qm := bench.NewQueryMaker(int64(i))
qm := bench.NewQueryGenerator(int64(i))
call := qm.Random(10, 4, 3, 0, 1000)
t.Log(call)
}

2
bench/randquery.go
View file

@ -89,7 +89,7 @@ func (b *RandomQuery) Run(agentNum int) map[string]interface{} {
results["error"] = fmt.Errorf("No client set for RandomQuery agent: %v", agentNum)
return results
}
qm := NewQueryMaker(seed)
qm := NewQueryGenerator(seed)
s := NewStats()
var start time.Time
for n := 0; n < b.Iterations; n++ {