Bumb fiber v1.0.1 (#5490)

* Bumb 1.4.3

* Fix fiber

frameworks/Go/fiber/benchmark_config.json

@@ -22,6 +22,28 @@
       "display_name": "Fiber",
       "notes": "",
       "versus": "go"
+    },
+    "prefork": {
+      "json_url": "/json",
+      "db_url": "/db",
+      "query_url": "/queries?queries=",
+      "update_url": "/update?queries=",
+      "plaintext_url": "/plaintext",
+      "port": 8080,
+      "approach": "Realistic",
+      "classification": "Platform",
+      "database": "Postgres",
+      "framework": "Fiber",
+      "language": "Go",
+      "flavor": "None",
+      "orm": "Raw",
+      "platform": "None",
+      "webserver": "None",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "Fiber-prefork",
+      "notes": "",
+      "versus": "go"
     }
   }]
 }

frameworks/Go/fiber/fiber-prefork.dockerfile

@@ -0,0 +1,14 @@
+FROM golang:1.13
+
+ENV GO111MODULE on
+WORKDIR /fiber
+
+COPY ./src /fiber
+
+RUN go clean --modcache
+
+RUN go mod download
+
+RUN go build -o server server.go
+
+CMD ./server -fiber-prefork

frameworks/Go/fiber/fiber.dockerfile

@@ -1,10 +1,14 @@
 FROM golang:1.13
 
+ENV GO111MODULE on
 WORKDIR /fiber
 
 COPY ./src /fiber
 
+RUN go clean --modcache
+
 RUN go mod download
-RUN go build -o server *.go
+
+RUN go build -o server server.go
 
 CMD ./server

frameworks/Go/fiber/src/go.mod

@@ -3,8 +3,8 @@ module fiber
 go 1.13
 
 require (
-	github.com/gofiber/fiber v1.3.2
-	github.com/jackc/pgx/v4 v4.3.0
-	github.com/tidwall/gjson v1.4.0 // indirect
+	github.com/gofiber/fiber v1.0.1
+	github.com/jackc/pgx/v4 v4.4.0
+	github.com/tidwall/gjson v1.5.0 // indirect
 	github.com/tidwall/sjson v1.0.4
 )

frameworks/Go/fiber/src/server.go

@@ -2,20 +2,26 @@ package main
 
 import (
 	"context"
+	"flag"
+	"fmt"
+	"math/rand"
+	"runtime"
 	"sort"
+	"strconv"
+	"sync"
 
 	"github.com/gofiber/fiber"
 	pgx "github.com/jackc/pgx/v4"
+	"github.com/jackc/pgx/v4/pgxpool"
 	"github.com/tidwall/sjson"
 )
 
 func main() {
+
 	initDatabase()
 
 	app := fiber.New()
-
-	app.Server = "Go"
-	app.Prefork = true
+	app.Settings.ServerHeader = "go"
 
 	app.Get("/json", jsonHandler)
 	app.Get("/db", dbHandler)
@@ -26,50 +32,180 @@ func main() {
 	app.Listen(8080)
 }
 
+const (
+	worldcount     = 10000
+	helloworld     = "Hello, World!"
+	worldselectsql = "SELECT id, randomNumber FROM World WHERE id = $1"
+	worldupdatesql = "UPDATE World SET randomNumber = $1 WHERE id = $2"
+)
+
+var (
+	db          *pgxpool.Pool
+	sjsonStruct = []byte(`{"message":""}`)
+	sjsonKey    = "message"
+	sjsonValue  = []byte(`"Hello, World!"`)
+	sjsonOpt    = &sjson.Options{
+		Optimistic: true,
+	}
+)
+
+// Message ...
+type Message struct {
+	Message string `json:"message"`
+}
+
+// Worlds ...
+type Worlds []World
+
+// World ...
+type World struct {
+	Id           int32 `json:"id"`
+	RandomNumber int32 `json:"randomNumber"`
+}
+
+// JSONpool ...
+var JSONpool = sync.Pool{
+	New: func() interface{} {
+		return new(Message)
+	},
+}
+
+// AcquireJSON ...
+func AcquireJSON() *Message {
+	return JSONpool.Get().(*Message)
+}
+
+// ReleaseJSON ...
+func ReleaseJSON(json *Message) {
+	json.Message = ""
+	JSONpool.Put(json)
+}
+
+// WorldPool ...
+var WorldPool = sync.Pool{
+	New: func() interface{} {
+		return new(World)
+	},
+}
+
+// AcquireWorld ...
+func AcquireWorld() *World {
+	return WorldPool.Get().(*World)
+}
+
+// ReleaseWorld ...
+func ReleaseWorld(w *World) {
+	w.Id = 0
+	w.RandomNumber = 0
+	WorldPool.Put(w)
+}
+
+// WorldsPool ...
+var WorldsPool = sync.Pool{
+	New: func() interface{} {
+		return make(Worlds, 0, 512)
+	},
+}
+
+// AcquireWorlds ...
+func AcquireWorlds() Worlds {
+	return WorldsPool.Get().(Worlds)
+}
+
+// ReleaseWorlds ...ReleaseWorlds
+func ReleaseWorlds(w Worlds) {
+	w = w[:0]
+	WorldsPool.Put(w)
+}
+
+// initDatabase :
+func initDatabase() {
+	child := flag.Bool("child", false, "is child proc")
+	flag.Parse()
+
+	maxConn := runtime.NumCPU()
+	if maxConn == 0 {
+		maxConn = 8
+	}
+	maxConn = maxConn * 4
+	if *child {
+		maxConn = runtime.NumCPU()
+	}
+
+	var err error
+	db, err = pgxpool.Connect(context.Background(), fmt.Sprintf("host=%s port=%d user=%s password=%s dbname=%s pool_max_conns=%d", "tfb-database", 5432, "benchmarkdbuser", "benchmarkdbpass", "hello_world", maxConn))
+	if err != nil {
+		panic(err)
+	}
+}
+
+// jsonHandler :
 func jsonHandler(c *fiber.Ctx) {
-	json, _ := sjson.SetBytesOptions(jsonRaw, jsonPath, helloRaw, jsonOpt)
-	c.JsonBytes(json)
+	raw, _ := sjson.SetRawBytesOptions(sjsonStruct, sjsonKey, sjsonValue, sjsonOpt)
+	c.Set("Content-Type", fiber.MIMEApplicationJSON)
+	c.SendBytes(raw)
 }
 
+// dbHandler :
 func dbHandler(c *fiber.Ctx) {
 	w := AcquireWorld()
-	db.QueryRow(context.Background(), worldSelectSQL, RandomWorld()).Scan(&w.Id, &w.RandomNumber)
-	c.Json(w)
+	db.QueryRow(context.Background(), worldselectsql, RandomWorld()).Scan(&w.Id, &w.RandomNumber)
+	c.JSON(w)
 	ReleaseWorld(w)
 }
 
+// queriesHandler :
 func queriesHandler(c *fiber.Ctx) {
 	n := QueriesCount(c)
 	worlds := AcquireWorlds()[:n]
 	for i := 0; i < n; i++ {
 		w := &worlds[i]
-		db.QueryRow(context.Background(), worldSelectSQL, RandomWorld()).Scan(&w.Id, &w.RandomNumber)
+		db.QueryRow(context.Background(), worldselectsql, RandomWorld()).Scan(&w.Id, &w.RandomNumber)
 	}
-	c.Json(Worlds(worlds))
+	c.JSON(Worlds(worlds))
 	ReleaseWorlds(worlds)
 }
 
+// updateHandler :
 func updateHandler(c *fiber.Ctx) {
 	n := QueriesCount(c)
 	worlds := AcquireWorlds()[:n]
 	for i := 0; i < n; i++ {
 		w := &worlds[i]
-		db.QueryRow(context.Background(), worldSelectSQL, RandomWorld()).Scan(&w.Id, &w.RandomNumber)
+		db.QueryRow(context.Background(), worldselectsql, RandomWorld()).Scan(&w.Id, &w.RandomNumber)
 		w.RandomNumber = int32(RandomWorld())
 	}
+	// sorting is required for insert deadlock prevention.
 	sort.Slice(worlds, func(i, j int) bool {
 		return worlds[i].Id < worlds[j].Id
 	})
 
 	batch := pgx.Batch{}
 	for _, w := range worlds {
-		batch.Queue(worldUpdateSQL, w.RandomNumber, w.Id)
+		batch.Queue(worldupdatesql, w.RandomNumber, w.Id)
 	}
 	db.SendBatch(context.Background(), &batch).Close()
-	c.Json(Worlds(worlds))
+	c.JSON(Worlds(worlds))
 	ReleaseWorlds(worlds)
 }
 
+// plaintextHandler :
 func plaintextHandler(c *fiber.Ctx) {
-	c.SendString(helloText)
+	c.SendString(helloworld)
+}
+
+// RandomWorld :
+func RandomWorld() int {
+	return rand.Intn(worldcount) + 1
+}
+
+// QueriesCount :
+func QueriesCount(c *fiber.Ctx) int {
+	n, _ := strconv.Atoi(c.Query("queries"))
+	if n < 1 {
+		n = 1
+	} else if n > 500 {
+		n = 500
+	}
+	return n
 }

frameworks/Go/fiber/src/utils.go

@@ -1,106 +0,0 @@
-package main
-
-import (
-	"context"
-	"fmt"
-	"math/rand"
-	"runtime"
-	"strconv"
-	"sync"
-
-	"github.com/gofiber/fiber"
-	"github.com/jackc/pgx/v4/pgxpool"
-	"github.com/tidwall/sjson"
-)
-
-const (
-	helloText      = "Hello, World!"
-	jsonPath       = "message"
-	worldCount     = 10000
-	worldSelectSQL = "SELECT id, randomNumber FROM World WHERE id = $1"
-	worldUpdateSQL = "UPDATE World SET randomNumber = $1 WHERE id = $2"
-)
-
-// https://github.com/tidwall/sjson
-var (
-	db       *pgxpool.Pool
-	helloRaw = []byte(helloText)
-	jsonRaw  = []byte(`{"message":""}`)
-	jsonOpt  = &sjson.Options{
-		Optimistic: true,
-	}
-)
-
-// Worlds ...
-type Worlds []World
-
-// World ...
-type World struct {
-	Id           int32 `json:"id"`
-	RandomNumber int32 `json:"randomNumber"`
-}
-
-// WorldPool ...
-var WorldPool = sync.Pool{
-	New: func() interface{} {
-		return new(World)
-	},
-}
-
-// AcquireWorld ...
-func AcquireWorld() *World {
-	return WorldPool.Get().(*World)
-}
-
-// ReleaseWorld ...
-func ReleaseWorld(w *World) {
-	w.Id = 0
-	w.RandomNumber = 0
-	WorldPool.Put(w)
-}
-
-// WorldsPool ...
-var WorldsPool = sync.Pool{
-	New: func() interface{} {
-		return make(Worlds, 0, 512)
-	},
-}
-
-// AcquireWorlds ...
-func AcquireWorlds() Worlds {
-	return WorldsPool.Get().(Worlds)
-}
-
-// ReleaseWorlds ...ReleaseWorlds
-func ReleaseWorlds(w Worlds) {
-	w = w[:0]
-	WorldsPool.Put(w)
-}
-
-// initDatabase :
-func initDatabase() {
-	maxConn := runtime.NumCPU()
-	if maxConn == 0 {
-		maxConn = 8
-	}
-	var err error
-	db, err = pgxpool.Connect(context.Background(), fmt.Sprintf("host=%s port=%d user=%s password=%s dbname=%s pool_max_conns=%d", "tfb-database", 5432, "benchmarkdbuser", "benchmarkdbpass", "hello_world", maxConn))
-	if err != nil {
-		panic(err)
-	}
-}
-
-func RandomWorld() int {
-	return rand.Intn(worldCount) + 1
-}
-
-// QueriesCount :
-func QueriesCount(c *fiber.Ctx) int {
-	n, _ := strconv.Atoi(c.Query("queries"))
-	if n < 1 {
-		n = 1
-	} else if n > 500 {
-		n = 500
-	}
-	return n
-}