[fix] Fixed value passing of rg.Graph

Author: filipecosta90

Makefile

@@ -8,8 +8,8 @@ GOGET=$(GOCMD) get
 GOMOD=$(GOCMD) mod
 GOFMT=$(GOCMD) fmt
 
-.PHONY: all test coverage
-all: test coverage build
+.PHONY: all test coverage build checkfmt lint fmt
+all: test coverage build checkfmt lint fmt
 
 build:
 	$(GOBUILD) .
@@ -27,6 +27,9 @@ lint:
 	$(GOGET) github.com/golangci/golangci-lint/cmd/golangci-lint
 	golangci-lint run
 
+fmt:
+	$(GOFMT) ./...
+
 get:
 	$(GOGET) -t -v ./...
 
@@ -37,12 +40,7 @@ test: get
 coverage: get test
 	$(GOTEST) -race -coverprofile=coverage.txt -covermode=atomic .
 
-
 release:
 	$(GOGET) github.com/mitchellh/gox
 	$(GOGET) github.com/tcnksm/ghr
 	GO111MODULE=on gox  -osarch "linux/amd64 darwin/amd64" -output "dist/redisgraph-benchmark-go_{{.OS}}_{{.Arch}}" .
-
-fmt:
-	$(GOFMT) ./...
-

redisgraph-bechmark-go.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	hdrhistogram "github.com/HdrHistogram/hdrhistogram-go"
 	"github.com/RedisGraph/redisgraph-go"
+	"github.com/gomodule/redigo/redis"
 	"golang.org/x/time/rate"
 	"log"
 	"math"
@@ -32,14 +33,14 @@ var graphRunTimeLatencies *hdrhistogram.Histogram
 
 const Inf = rate.Limit(math.MaxFloat64)
 
-func ingestionRoutine(rg redisgraph.Graph, continueOnError bool, cmdS string, number_samples uint64, loop bool, debug_level int, wg *sync.WaitGroup, useLimiter bool, rateLimiter *rate.Limiter) {
+func ingestionRoutine(rg *redisgraph.Graph, continueOnError bool, cmdS string, number_samples uint64, loop bool, debug_level int, wg *sync.WaitGroup, useLimiter bool, rateLimiter *rate.Limiter) {
 	defer wg.Done()
 	for i := 0; uint64(i) < number_samples || loop; i++ {
 		sendCmdLogic(rg, cmdS, continueOnError, debug_level, useLimiter, rateLimiter)
 	}
 }
 
-func sendCmdLogic(rg redisgraph.Graph, query string, continueOnError bool, debug_level int, useRateLimiter bool, rateLimiter *rate.Limiter) {
+func sendCmdLogic(rg *redisgraph.Graph, query string, continueOnError bool, debug_level int, useRateLimiter bool, rateLimiter *rate.Limiter) {
 	if useRateLimiter {
 		r := rateLimiter.ReserveN(time.Now(), int(1))
 		time.Sleep(r.Delay())
@@ -128,20 +129,30 @@ func main() {
 		fmt.Printf("Running in loop until you hit Ctrl+C\n")
 	}
 	query := strings.Join(args, " ")
+	rgs := make([]redisgraph.Graph, *clients, *clients)
+	conns := make([]redis.Conn, *clients, *clients)
 
-	for channel_id := 1; uint64(channel_id) <= *clients; channel_id++ {
+	for client_id := 0; uint64(client_id) < *clients; client_id++ {
 		wg.Add(1)
 		cmd := make([]string, len(args))
 		copy(cmd, args)
-		go ingestionRoutine(getStandaloneConn(*graphKey, "tcp", connectionStr), true, query, samplesPerClient, *loop, *debug, &wg, useRateLimiter, rateLimiter)
+		rgs[client_id], conns[client_id] = getStandaloneConn(*graphKey, "tcp", connectionStr)
+		go ingestionRoutine(&rgs[client_id], true, query, samplesPerClient, *loop, *debug, &wg, useRateLimiter, rateLimiter)
 	}
 
 	// listen for C-c
 	c := make(chan os.Signal, 1)
 	signal.Notify(c, os.Interrupt)
 
 	tick := time.NewTicker(time.Duration(client_update_tick) * time.Second)
+
+	// enter the update loop
 	closed, _, duration, totalMessages, _ := updateCLI(tick, c, *numberRequests, *loop)
+
+	// benchmarked ended, close the connections
+	for _, standaloneConn := range conns {
+		standaloneConn.Close()
+	}
 	messageRate := float64(totalMessages) / float64(duration.Seconds())
 	p50IngestionMs := float64(latencies.ValueAtQuantile(50.0)) / 1000.0
 	p95IngestionMs := float64(latencies.ValueAtQuantile(95.0)) / 1000.0

standalone_conn.go

@@ -6,14 +6,11 @@ import (
 	"log"
 )
 
-func getStandaloneConn(graphName, network, addr string) rg.Graph {
+func getStandaloneConn(graphName, network, addr string) (rg.Graph, redis.Conn) {
 	conn, err := redis.Dial(network, addr)
 	if err != nil {
 		log.Fatalf("Error preparing for benchmark, while creating new connection. error = %v", err)
 	}
 	graph := rg.GraphNew(graphName, conn)
-	// retrieve properties and labels prior benchmark ( if any )
-	graph.PropertyKeys()
-	graph.Labels()
-	return graph
+	return graph, conn
 }