Added multi command support via -cmd and -cmd-ratio (#21)

* Added multi command support via -cmd and -cmd-ratio

* Enabled setting the delay between client setup.

* Enable cluster benchmarks on multi-command

Author: filipecosta90

.gitignore

@@ -3,3 +3,4 @@ coverage.txt
 redis-benchmark-go
 dist
 *.json
+dump.rdb

cli.go

@@ -0,0 +1,68 @@
+package main
+
+import (
+	shellwords "github.com/mattn/go-shellwords"
+	"log"
+	"math"
+	"math/rand"
+	"strconv"
+)
+
+type arrayStringParameters []string
+
+func (i *arrayStringParameters) String() string {
+	return "my string representation"
+}
+
+func (i *arrayStringParameters) Set(value string) error {
+	*i = append(*i, value)
+	return nil
+}
+
+func sample(cdf []float32) int {
+	r := rand.Float32()
+	bucket := 0
+	for r > cdf[bucket] {
+		bucket++
+	}
+	return bucket
+}
+
+func prepareCommandsDistribution(queries arrayStringParameters, cmds [][]string, cmdRates []float64) (int, []float32) {
+	var totalDifferentCommands = len(cmds)
+	var totalRateSum = 0.0
+	var err error
+	for i, rawCmdString := range queries {
+		cmds[i], _ = shellwords.Parse(rawCmdString)
+		if i >= len(benchmarkCommandsRatios) {
+			cmdRates[i] = 1
+
+		} else {
+			cmdRates[i], err = strconv.ParseFloat(benchmarkCommandsRatios[i], 64)
+			if err != nil {
+				log.Fatalf("Error while converting query-rate param %s: %v", benchmarkCommandsRatios[i], err)
+			}
+		}
+		totalRateSum += cmdRates[i]
+	}
+	// probability density function
+	if math.Abs(1.0-totalRateSum) > 0.01 {
+		log.Fatalf("Total ratio should be 1.0 ( currently is %f )", totalRateSum)
+	}
+	// probability density function
+	if len(benchmarkCommandsRatios) > 0 && (len(benchmarkCommandsRatios) != (len(benchmarkCommands))) {
+		log.Fatalf("When specifiying -cmd-ratio parameter, you need to have the same number of -cmd and -cmd-ratio parameters. Number of time -cmd ( %d ) != Number of times -cmd-ratio ( %d )", len(benchmarkCommands), len(benchmarkCommandsRatios))
+	}
+	pdf := make([]float32, len(queries))
+	cdf := make([]float32, len(queries))
+	for i := 0; i < len(cmdRates); i++ {
+		pdf[i] = float32(cmdRates[i])
+		cdf[i] = 0
+	}
+	// get cdf
+	cdf[0] = pdf[0]
+	for i := 1; i < len(cmdRates); i++ {
+		cdf[i] = cdf[i-1] + pdf[i]
+	}
+	return totalDifferentCommands, cdf
+}

cluster_conn.go

@@ -6,28 +6,36 @@ import (
 	"log"
 )
 
-func getOSSClusterConn(addr string, opts radix.Dialer, clients uint64) *radix.Cluster {
+func getOSSClusterConn(addr string, dialer radix.Dialer, clients uint64) *radix.Cluster {
 	var err error
 	var vanillaCluster *radix.Cluster
 	var size int = int(clients)
 	ctx := context.Background()
 	laddr := make([]string, 1)
 	laddr[0] = addr
 	poolConfig := radix.PoolConfig{}
-	poolConfig.Dialer = opts
+	poolConfig.Dialer = dialer
 	poolConfig.Size = size
 
+	poolConfig.Dialer.CustomConn = func(ctx context.Context, network, addr string) (radix.Conn, error) {
+		conn, err := dialer.Dial(ctx, network, addr)
+		if err != nil {
+			return nil, err
+		}
+		return conn, nil
+	}
+
 	clusterConfig := radix.ClusterConfig{}
 	clusterConfig.PoolConfig = poolConfig
 
 	vanillaCluster, err = clusterConfig.New(ctx, laddr)
 	if err != nil {
-		log.Fatalf("Error preparing for benchmark, while creating new connection. error = %v", err)
+		log.Fatalf("Error preparing for benchmark, while creating new connection to %s. error = %v", addr, err)
 	}
 	// Issue CLUSTER SLOTS command
 	err = vanillaCluster.Sync(ctx)
 	if err != nil {
-		log.Fatalf("Error preparing for benchmark, while issuing CLUSTER SLOTS. error = %v", err)
+		log.Fatalf("Error preparing for benchmark, while issuing CLUSTER SLOTS to %s. error = %v", addr, err)
 	}
 	return vanillaCluster
 }

go.mod

@@ -4,8 +4,10 @@ go 1.14
 
 require (
 	github.com/HdrHistogram/hdrhistogram-go v1.1.0
-	github.com/google/go-cmp v0.5.5 // indirect
+	github.com/mattn/go-shellwords v1.0.12
 	github.com/mediocregopher/radix/v4 v4.1.2
+	github.com/mitchellh/gox v1.0.1 // indirect
+	github.com/tcnksm/ghr v0.16.0 // indirect
 	golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6 // indirect
 	golang.org/x/time v0.0.0-20191024005414-555d28b269f0
 )