Added unit and integration tests (#26)

* Added unit and integration tests

* Fixed docker image name

* Updated go.mod to 1.20

* Merging coverage data from unit and integration tests

* Uploading coverage report to codecov

Author: filipecosta90

.github/workflows/build.yml

@@ -0,0 +1,41 @@
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    name: build
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        go-version: [1.20.x, 1.21.x]
+
+    services:
+      redis:
+        image: redis
+        options: >-
+          --health-cmd "redis-cli ping" --health-interval 10s --health-timeout 5s --health-retries 5
+        ports:
+          - 6379:6379
+
+    steps:
+      - name: Set up ${{ matrix.go-version }}
+        uses: actions/setup-go@v4
+        with:
+          go-version: ${{ matrix.go-version }}
+
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Test
+        run: make test
+
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v4-beta
+

.gitignore

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

Makefile

@@ -23,6 +23,10 @@ endif
 .PHONY: all test coverage
 all: test build
 
+build-coverage:
+	$(GOBUILD) -cover \
+	-ldflags="-X 'main.GitSHA1=$(GIT_SHA)' -X 'main.GitDirty=$(GIT_DIRTY)'" .
+
 build:
 	$(GOBUILD) \
 	-ldflags="-X 'main.GitSHA1=$(GIT_SHA)' -X 'main.GitDirty=$(GIT_DIRTY)'" .
@@ -47,13 +51,12 @@ lint:
 get:
 	$(GOGET) -t -v ./...
 
-test: get
-	$(GOFMT) ./...
-	$(GOTEST) -race -covermode=atomic ./...
-
-coverage: get test
-	$(GOTEST) -race -coverprofile=coverage.txt -covermode=atomic .
-
+test: get build-coverage
+	@rm -fr .coverdata
+	@mkdir -p .coverdata
+	@go test -cover -args -test.gocoverdir=".coverdata" .
+	@go tool covdata percent -i=.coverdata
+	@go tool covdata textfmt -i=.coverdata -o coverage.txt
 
 release:
 	$(GOGET) github.com/mitchellh/gox

cli.go

@@ -28,8 +28,8 @@ func sample(cdf []float32) int {
 	return bucket
 }
 
-func prepareCommandsDistribution(queries arrayStringParameters, cmds [][]string, cmdRates []float64) (int, []float32) {
-	var totalDifferentCommands = len(cmds)
+func prepareCommandsDistribution(queries arrayStringParameters, cmds [][]string, cmdRates []float64) (totalDifferentCommands int, cdf []float32) {
+	totalDifferentCommands = len(cmds)
 	var totalRateSum = 0.0
 	var err error
 	for i, rawCmdString := range queries {
@@ -54,7 +54,7 @@ func prepareCommandsDistribution(queries arrayStringParameters, cmds [][]string,
 		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))
+	cdf = make([]float32, len(queries))
 	for i := 0; i < len(cmdRates); i++ {
 		pdf[i] = float32(cmdRates[i])
 		cdf[i] = 0
@@ -64,5 +64,5 @@ func prepareCommandsDistribution(queries arrayStringParameters, cmds [][]string,
 	for i := 1; i < len(cmdRates); i++ {
 		cdf[i] = cdf[i-1] + pdf[i]
 	}
-	return totalDifferentCommands, cdf
+	return
 }

common.go

@@ -2,9 +2,37 @@ package main
 
 import (
 	"context"
+	"fmt"
+	"github.com/HdrHistogram/hdrhistogram-go"
 	radix "github.com/mediocregopher/radix/v4"
+	"golang.org/x/time/rate"
+	"math"
+	"math/rand"
+	"strings"
 )
 
+var totalCommands uint64
+var totalErrors uint64
+var latencies *hdrhistogram.Histogram
+var benchmarkCommands arrayStringParameters
+var benchmarkCommandsRatios arrayStringParameters
+
+const Inf = rate.Limit(math.MaxFloat64)
+const charset = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
+
+type datapoint struct {
+	success     bool
+	duration_ms int64
+}
+
+func stringWithCharset(length int, charset string) string {
+	b := make([]byte, length)
+	for i := range b {
+		b[i] = charset[rand.Intn(len(charset))]
+	}
+	return string(b)
+}
+
 type Client interface {
 
 	// Do performs an Action on a Conn connected to the redis instance.
@@ -14,3 +42,35 @@ type Client interface {
 	// an error
 	Close() error
 }
+
+func keyBuildLogic(keyPos int, dataPos int, datasize, keyspacelen uint64, cmdS []string, charset string) (newCmdS []string, key string) {
+	newCmdS = make([]string, len(cmdS))
+	copy(newCmdS, cmdS)
+	if keyPos > -1 {
+		keyV := fmt.Sprintf("%d", rand.Int63n(int64(keyspacelen)))
+		key = strings.Replace(newCmdS[keyPos], "__key__", keyV, -1)
+		newCmdS[keyPos] = key
+	}
+	if dataPos > -1 {
+		newCmdS[dataPos] = stringWithCharset(int(datasize), charset)
+	}
+	return newCmdS, key
+}
+
+func getplaceholderpos(args []string, verbose bool) (keyPlaceOlderPos int, dataPlaceOlderPos int) {
+	keyPlaceOlderPos = -1
+	dataPlaceOlderPos = -1
+	for pos, arg := range args {
+		if arg == "__data__" {
+			dataPlaceOlderPos = pos
+		}
+
+		if strings.Contains(arg, "__key__") {
+			if verbose {
+				fmt.Println(fmt.Sprintf("Detected __key__ placeholder in pos %d", pos))
+			}
+			keyPlaceOlderPos = pos
+		}
+	}
+	return
+}

go.mod

@@ -1,13 +1,16 @@
 module github.com/filipecosta90/redis-benchmark-go
 
-go 1.14
+go 1.20
 
 require (
 	github.com/HdrHistogram/hdrhistogram-go v1.1.0
 	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
+	github.com/rueian/rueidis v0.0.100
 	golang.org/x/time v0.0.0-20191024005414-555d28b269f0
 )
+
+require (
+	github.com/tilinna/clock v1.0.2 // indirect
+	golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6 // indirect
+)