Browse Source

Upgrade atreugo to v11.2.1 (#5699)

Sergio Andrés Virviescas Santana 5 years ago
parent
commit
064e30fcc2

+ 0 - 1
frameworks/Go/atreugo/README.md

@@ -11,5 +11,4 @@ This is the go portion of a [benchmarking test suite](https://www.techempower.co
     http://localhost:8080/db
     http://localhost:8080/db
     http://localhost:8080/queries?queries=[1-500]
     http://localhost:8080/queries?queries=[1-500]
     http://localhost:8080/fortune
     http://localhost:8080/fortune
-    http://localhost:8080/fortune-quick
     http://localhost:8080/update?queries=[1-500]
     http://localhost:8080/update?queries=[1-500]

+ 1 - 1
frameworks/Go/atreugo/atreugo-prefork-quicktemplate.dockerfile

@@ -12,4 +12,4 @@ RUN go generate ./templates
 RUN easyjson -pkg
 RUN easyjson -pkg
 RUN go build -ldflags="-s -w" -o app .
 RUN go build -ldflags="-s -w" -o app .
 
 
-CMD ./app -prefork -db pgx
+CMD ./app -prefork -db pgx -quicktemplate

+ 1 - 1
frameworks/Go/atreugo/atreugo-quicktemplate.dockerfile

@@ -12,4 +12,4 @@ RUN go generate ./templates
 RUN easyjson -pkg
 RUN easyjson -pkg
 RUN go build -ldflags="-s -w" -o app .
 RUN go build -ldflags="-s -w" -o app .
 
 
-CMD ./app -db pgx
+CMD ./app -db pgx -quicktemplate

+ 2 - 2
frameworks/Go/atreugo/benchmark_config.json

@@ -133,7 +133,7 @@
         "versus": "go"
         "versus": "go"
       },
       },
       "quicktemplate": {
       "quicktemplate": {
-        "fortune_url": "/fortune-quick",
+        "fortune_url": "/fortune",
         "port": 8080,
         "port": 8080,
         "approach": "Realistic",
         "approach": "Realistic",
         "classification": "Platform",
         "classification": "Platform",
@@ -151,7 +151,7 @@
         "versus": "go"
         "versus": "go"
       },
       },
       "prefork-quicktemplate": {
       "prefork-quicktemplate": {
-        "fortune_url": "/fortune-quick",
+        "fortune_url": "/fortune",
         "port": 8080,
         "port": 8080,
         "approach": "Realistic",
         "approach": "Realistic",
         "classification": "Platform",
         "classification": "Platform",

+ 1 - 1
frameworks/Go/atreugo/src/go.mod

@@ -5,7 +5,7 @@ go 1.14
 require (
 require (
 	github.com/jackc/pgx/v4 v4.6.0
 	github.com/jackc/pgx/v4 v4.6.0
 	github.com/mailru/easyjson v0.7.1
 	github.com/mailru/easyjson v0.7.1
-	github.com/savsgio/atreugo/v11 v11.2.0
+	github.com/savsgio/atreugo/v11 v11.2.1
 	github.com/tidwall/sjson v1.1.1
 	github.com/tidwall/sjson v1.1.1
 	github.com/valyala/quicktemplate v1.5.0
 	github.com/valyala/quicktemplate v1.5.0
 	go.mongodb.org/mongo-driver v1.3.3
 	go.mongodb.org/mongo-driver v1.3.3

+ 4 - 4
frameworks/Go/atreugo/src/go.sum

@@ -7,8 +7,8 @@ github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7Do
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/fasthttp/router v1.1.1 h1:V3IONYo/5S/QSGR0Wdc9fYTA2zrBFaUN9GbPIYIZJ+o=
-github.com/fasthttp/router v1.1.1/go.mod h1:3ZGZormG7E+VbnYeToF+zmcF4oBGcAKOD8a8XL+fOZo=
+github.com/fasthttp/router v1.1.2 h1:vrteqZ+0WXNzF/pnJWzl1R2uMo1Af8YswAunA3s4Riw=
+github.com/fasthttp/router v1.1.2/go.mod h1:3ZGZormG7E+VbnYeToF+zmcF4oBGcAKOD8a8XL+fOZo=
 github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=
 github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/gobuffalo/attrs v0.0.0-20190224210810-a9411de4debd/go.mod h1:4duuawTqi2wkkpB4ePgWMaai6/Kc6WEz83bhFwpHzj0=
 github.com/gobuffalo/attrs v0.0.0-20190224210810-a9411de4debd/go.mod h1:4duuawTqi2wkkpB4ePgWMaai6/Kc6WEz83bhFwpHzj0=
@@ -135,8 +135,8 @@ github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=
 github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU=
 github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU=
 github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThCjNc=
 github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThCjNc=
 github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
 github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
-github.com/savsgio/atreugo/v11 v11.2.0 h1:Oe+iJ8JYEPR7fUvzyUzk0tGpmlPQ+JX1w34VCVaptpw=
-github.com/savsgio/atreugo/v11 v11.2.0/go.mod h1:z5gwueTdtwP+JMHcgwvgh+Jr3NFBGFO200eQYmM2uOc=
+github.com/savsgio/atreugo/v11 v11.2.1 h1:tXbhbaEmEaHD1znHOKj3O+Vv/XgKHjykA/tl3f0MMvU=
+github.com/savsgio/atreugo/v11 v11.2.1/go.mod h1:9pWT8criq+ZpueSNMyudrJg3nXTsZh88Ps+U68pkoVA=
 github.com/savsgio/go-logger/v2 v2.0.0 h1:9CzMIHfAzHoMJoY+0ODI9DJGfBxRIVqI7jZkg47MRrQ=
 github.com/savsgio/go-logger/v2 v2.0.0 h1:9CzMIHfAzHoMJoY+0ODI9DJGfBxRIVqI7jZkg47MRrQ=
 github.com/savsgio/go-logger/v2 v2.0.0/go.mod h1:fog+sZsg75Or4EENyd1jrS/Ps44s39hd6lccqALz0C8=
 github.com/savsgio/go-logger/v2 v2.0.0/go.mod h1:fog+sZsg75Or4EENyd1jrS/Ps44s39hd6lccqALz0C8=
 github.com/savsgio/gotils v0.0.0-20200413113635-8c468ce75cca h1:Qe7Mtuhjkk38HVpRtvWdziZJcwG3Qup1mfyvyOrcnyM=
 github.com/savsgio/gotils v0.0.0-20200413113635-8c468ce75cca h1:Qe7Mtuhjkk38HVpRtvWdziZJcwG3Qup1mfyvyOrcnyM=

+ 10 - 3
frameworks/Go/atreugo/src/main.go

@@ -13,7 +13,7 @@ import (
 )
 )
 
 
 var bindHost, jsonEncoder, dbDriver, dbConnectionString string
 var bindHost, jsonEncoder, dbDriver, dbConnectionString string
-var prefork bool
+var prefork, useQuickTemplate bool
 
 
 func init() {
 func init() {
 	// init flags
 	// init flags
@@ -22,6 +22,7 @@ func init() {
 	flag.StringVar(&jsonEncoder, "json_encoder", "none", "json encoder: none, easyjson or sjson")
 	flag.StringVar(&jsonEncoder, "json_encoder", "none", "json encoder: none, easyjson or sjson")
 	flag.StringVar(&dbDriver, "db", "none", "db connection driver [values: none or pgx or mongo]")
 	flag.StringVar(&dbDriver, "db", "none", "db connection driver [values: none or pgx or mongo]")
 	flag.StringVar(&dbConnectionString, "db_connection_string", "", "db connection string")
 	flag.StringVar(&dbConnectionString, "db_connection_string", "", "db connection string")
+	flag.BoolVar(&useQuickTemplate, "quicktemplate", false, "use quicktemplate")
 
 
 	flag.Parse()
 	flag.Parse()
 }
 }
@@ -60,6 +61,13 @@ func main() {
 	var dbHandler atreugo.View
 	var dbHandler atreugo.View
 	var queriesHandler atreugo.View
 	var queriesHandler atreugo.View
 	var updateHandler atreugo.View
 	var updateHandler atreugo.View
+	var fortuneHandler atreugo.View
+
+	if useQuickTemplate {
+		fortuneHandler = handlers.FortuneQuickHandler(db)
+	} else {
+		fortuneHandler = handlers.FortuneHandler(db)
+	}
 
 
 	switch jsonEncoder {
 	switch jsonEncoder {
 	case "easyjson":
 	case "easyjson":
@@ -91,8 +99,7 @@ func main() {
 	server.GET("/json", jsonHandler)
 	server.GET("/json", jsonHandler)
 	server.GET("/db", dbHandler)
 	server.GET("/db", dbHandler)
 	server.GET("/queries", queriesHandler)
 	server.GET("/queries", queriesHandler)
-	server.GET("/fortune", handlers.FortuneHandler(db))
-	server.GET("/fortune-quick", handlers.FortuneQuickHandler(db))
+	server.GET("/fortune", fortuneHandler)
 	server.GET("/update", updateHandler)
 	server.GET("/update", updateHandler)
 
 
 	if err := server.ListenAndServe(); err != nil {
 	if err := server.ListenAndServe(); err != nil {