Skip to content

Commit 4e4f6cd

Browse files
vishrvishr
committed
Added echo to the list
Signed-off-by: Vishal Rana <[email protected]>
1 parent 7e96420 commit 4e4f6cd

File tree

6 files changed

+56
-55
lines changed

6 files changed

+56
-55
lines changed

‎bench_test.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ func BenchmarkBeego_Param(b *testing.B) {
8383
r, _ := http.NewRequest("GET", "/user/gordon", nil)
8484
benchRequest(b, router, r)
8585
}
86-
func BenchmarkBolt_Param(b *testing.B) {
87-
router := loadBoltSingle("GET", "/user/:name", boltHandler)
86+
func BenchmarkEcho_Param(b *testing.B) {
87+
router := loadEchoSingle("GET", "/user/:name", echoHandler)
8888

8989
r, _ := http.NewRequest("GET", "/user/gordon", nil)
9090
benchRequest(b, router, r)
@@ -243,8 +243,8 @@ func BenchmarkBeego_Param5(b *testing.B) {
243243
r, _ := http.NewRequest("GET", fiveRoute, nil)
244244
benchRequest(b, router, r)
245245
}
246-
func BenchmarkBolt_Param5(b *testing.B) {
247-
router := loadBoltSingle("GET", fiveColon, boltHandler)
246+
func BenchmarkEcho_Param5(b *testing.B) {
247+
router := loadEchoSingle("GET", fiveColon, echoHandler)
248248

249249
r, _ := http.NewRequest("GET", fiveRoute, nil)
250250
benchRequest(b, router, r)
@@ -403,8 +403,8 @@ func BenchmarkBeego_Param20(b *testing.B) {
403403
r, _ := http.NewRequest("GET", twentyRoute, nil)
404404
benchRequest(b, router, r)
405405
}
406-
func BenchmarkBolt_Param20(b *testing.B) {
407-
router := loadBoltSingle("GET", twentyColon, boltHandler)
406+
func BenchmarkEcho_Param20(b *testing.B) {
407+
router := loadEchoSingle("GET", twentyColon, echoHandler)
408408

409409
r, _ := http.NewRequest("GET", twentyRoute, nil)
410410
benchRequest(b, router, r)
@@ -559,8 +559,8 @@ func BenchmarkBeego_ParamWrite(b *testing.B) {
559559
r, _ := http.NewRequest("GET", "/user/gordon", nil)
560560
benchRequest(b, router, r)
561561
}
562-
func BenchmarkBolt_ParamWrite(b *testing.B) {
563-
router := loadBoltSingle("GET", "/user/:name", boltHandlerWrite)
562+
func BenchmarkEcho_ParamWrite(b *testing.B) {
563+
router := loadEchoSingle("GET", "/user/:name", echoHandlerWrite)
564564

565565
r, _ := http.NewRequest("GET", "/user/gordon", nil)
566566
benchRequest(b, router, r)

‎github_test.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ var (
277277
githubAce http.Handler
278278
githubBear http.Handler
279279
githubBeego http.Handler
280-
githubBolt http.Handler
280+
githubEcho http.Handler
281281
githubBone http.Handler
282282
githubDenco http.Handler
283283
githubGin http.Handler
@@ -313,8 +313,8 @@ func init() {
313313
calcMem("Beego", func() {
314314
githubBeego = loadBeego(githubAPI)
315315
})
316-
calcMem("Bolt", func() {
317-
githubBolt = loadBolt(githubAPI)
316+
calcMem("Echo", func() {
317+
githubEcho = loadEcho(githubAPI)
318318
})
319319
calcMem("Bone", func() {
320320
githubBone = loadBone(githubAPI)
@@ -396,9 +396,9 @@ func BenchmarkBeego_GithubStatic(b *testing.B) {
396396
req, _ := http.NewRequest("GET", "/user/repos", nil)
397397
benchRequest(b, githubBeego, req)
398398
}
399-
func BenchmarkBolt_GithubStatic(b *testing.B) {
399+
func BenchmarkEcho_GithubStatic(b *testing.B) {
400400
req, _ := http.NewRequest("GET", "/user/repos", nil)
401-
benchRequest(b, githubBolt, req)
401+
benchRequest(b, githubEcho, req)
402402
}
403403
func BenchmarkBone_GithubStatic(b *testing.B) {
404404
req, _ := http.NewRequest("GET", "/user/repos", nil)
@@ -498,9 +498,9 @@ func BenchmarkBeego_GithubParam(b *testing.B) {
498498
req, _ := http.NewRequest("GET", "/repos/julienschmidt/httprouter/stargazers", nil)
499499
benchRequest(b, githubBeego, req)
500500
}
501-
func BenchmarkBolt_GithubParam(b *testing.B) {
501+
func BenchmarkEcho_GithubParam(b *testing.B) {
502502
req, _ := http.NewRequest("GET", "/repos/julienschmidt/httprouter/stargazers", nil)
503-
benchRequest(b, githubBolt, req)
503+
benchRequest(b, githubEcho, req)
504504
}
505505
func BenchmarkBone_GithubParam(b *testing.B) {
506506
req, _ := http.NewRequest("GET", "/repos/julienschmidt/httprouter/stargazers", nil)
@@ -597,8 +597,8 @@ func BenchmarkBear_GithubAll(b *testing.B) {
597597
func BenchmarkBeego_GithubAll(b *testing.B) {
598598
benchRoutes(b, githubBeego, githubAPI)
599599
}
600-
func BenchmarkBolt_GithubAll(b *testing.B) {
601-
benchRoutes(b, githubBolt, githubAPI)
600+
func BenchmarkEcho_GithubAll(b *testing.B) {
601+
benchRoutes(b, githubEcho, githubAPI)
602602
}
603603
func BenchmarkBone_GithubAll(b *testing.B) {
604604
benchRoutes(b, githubBone, githubAPI)

‎gplus_test.go

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ var (
3939
gplusAce http.Handler
4040
gplusBear http.Handler
4141
gplusBeego http.Handler
42-
gplusBolt http.Handler
42+
gplusEcho http.Handler
4343
gplusBone http.Handler
4444
gplusDenco http.Handler
4545
gplusGin http.Handler
@@ -75,8 +75,8 @@ func init() {
7575
calcMem("Beego", func() {
7676
gplusBeego = loadBeego(gplusAPI)
7777
})
78-
calcMem("Bolt", func() {
79-
gplusBolt = loadBolt(gplusAPI)
78+
calcMem("Echo", func() {
79+
gplusEcho = loadEcho(gplusAPI)
8080
})
8181
calcMem("Bone", func() {
8282
gplusBone = loadBone(gplusAPI)
@@ -158,9 +158,9 @@ func BenchmarkBeego_GPlusStatic(b *testing.B) {
158158
req, _ := http.NewRequest("GET", "/people", nil)
159159
benchRequest(b, gplusBeego, req)
160160
}
161-
func BenchmarkBolt_GPlusStatic(b *testing.B) {
161+
func BenchmarkEcho_GPlusStatic(b *testing.B) {
162162
req, _ := http.NewRequest("GET", "/people", nil)
163-
benchRequest(b, gplusBolt, req)
163+
benchRequest(b, gplusEcho, req)
164164
}
165165
func BenchmarkBone_GPlusStatic(b *testing.B) {
166166
req, _ := http.NewRequest("GET", "/people", nil)
@@ -260,9 +260,9 @@ func BenchmarkBeego_GPlusParam(b *testing.B) {
260260
req, _ := http.NewRequest("GET", "/people/118051310819094153327", nil)
261261
benchRequest(b, gplusBeego, req)
262262
}
263-
func BenchmarkBolt_GPlusParam(b *testing.B) {
263+
func BenchmarkEcho_GPlusParam(b *testing.B) {
264264
req, _ := http.NewRequest("GET", "/people/118051310819094153327", nil)
265-
benchRequest(b, gplusBolt, req)
265+
benchRequest(b, gplusEcho, req)
266266
}
267267
func BenchmarkBone_GPlusParam(b *testing.B) {
268268
req, _ := http.NewRequest("GET", "/people/118051310819094153327", nil)
@@ -362,9 +362,9 @@ func BenchmarkBeego_GPlus2Params(b *testing.B) {
362362
req, _ := http.NewRequest("GET", "/people/118051310819094153327/activities/123456789", nil)
363363
benchRequest(b, gplusBeego, req)
364364
}
365-
func BenchmarkBolt_GPlus2Params(b *testing.B) {
365+
func BenchmarkEcho_GPlus2Params(b *testing.B) {
366366
req, _ := http.NewRequest("GET", "/people/118051310819094153327/activities/123456789", nil)
367-
benchRequest(b, gplusBolt, req)
367+
benchRequest(b, gplusEcho, req)
368368
}
369369
func BenchmarkBone_GPlus2Params(b *testing.B) {
370370
req, _ := http.NewRequest("GET", "/people/118051310819094153327/activities/123456789", nil)
@@ -461,8 +461,8 @@ func BenchmarkBear_GPlusAll(b *testing.B) {
461461
func BenchmarkBeego_GPlusAll(b *testing.B) {
462462
benchRoutes(b, gplusBeego, gplusAPI)
463463
}
464-
func BenchmarkBolt_GPlusAll(b *testing.B) {
465-
benchRoutes(b, gplusBolt, gplusAPI)
464+
func BenchmarkEcho_GPlusAll(b *testing.B) {
465+
benchRoutes(b, gplusEcho, gplusAPI)
466466
}
467467
func BenchmarkBone_GPlusAll(b *testing.B) {
468468
benchRoutes(b, gplusBone, gplusAPI)

‎parse_test.go

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ var (
5959
parseAce http.Handler
6060
parseBear http.Handler
6161
parseBeego http.Handler
62-
parseBolt http.Handler
62+
parseEcho http.Handler
6363
parseBone http.Handler
6464
parseDenco http.Handler
6565
parseGin http.Handler
@@ -95,8 +95,8 @@ func init() {
9595
calcMem("Beego", func() {
9696
parseBeego = loadBeego(parseAPI)
9797
})
98-
calcMem("Bolt", func() {
99-
parseBolt = loadBolt(parseAPI)
98+
calcMem("Echo", func() {
99+
parseEcho = loadEcho(parseAPI)
100100
})
101101
calcMem("Bone", func() {
102102
parseBone = loadBone(parseAPI)
@@ -178,9 +178,9 @@ func BenchmarkBeego_ParseStatic(b *testing.B) {
178178
req, _ := http.NewRequest("GET", "/1/users", nil)
179179
benchRequest(b, parseBeego, req)
180180
}
181-
func BenchmarkBolt_ParseStatic(b *testing.B) {
181+
func BenchmarkEcho_ParseStatic(b *testing.B) {
182182
req, _ := http.NewRequest("GET", "/1/users", nil)
183-
benchRequest(b, parseBolt, req)
183+
benchRequest(b, parseEcho, req)
184184
}
185185
func BenchmarkBone_ParseStatic(b *testing.B) {
186186
req, _ := http.NewRequest("GET", "/1/users", nil)
@@ -280,9 +280,9 @@ func BenchmarkBeego_ParseParam(b *testing.B) {
280280
req, _ := http.NewRequest("GET", "/1/classes/go", nil)
281281
benchRequest(b, parseBeego, req)
282282
}
283-
func BenchmarkBolt_ParseParam(b *testing.B) {
283+
func BenchmarkEcho_ParseParam(b *testing.B) {
284284
req, _ := http.NewRequest("GET", "/1/classes/go", nil)
285-
benchRequest(b, parseBolt, req)
285+
benchRequest(b, parseEcho, req)
286286
}
287287
func BenchmarkBone_ParseParam(b *testing.B) {
288288
req, _ := http.NewRequest("GET", "/1/classes/go", nil)
@@ -382,9 +382,9 @@ func BenchmarkBeego_Parse2Params(b *testing.B) {
382382
req, _ := http.NewRequest("GET", "/1/classes/go/123456789", nil)
383383
benchRequest(b, parseBeego, req)
384384
}
385-
func BenchmarkBolt_Parse2Params(b *testing.B) {
385+
func BenchmarkEcho_Parse2Params(b *testing.B) {
386386
req, _ := http.NewRequest("GET", "/1/classes/go/123456789", nil)
387-
benchRequest(b, parseBolt, req)
387+
benchRequest(b, parseEcho, req)
388388
}
389389
func BenchmarkBone_Parse2Params(b *testing.B) {
390390
req, _ := http.NewRequest("GET", "/1/classes/go/123456789", nil)
@@ -481,8 +481,8 @@ func BenchmarkBear_ParseAll(b *testing.B) {
481481
func BenchmarkBeego_ParseAll(b *testing.B) {
482482
benchRoutes(b, parseBeego, parseAPI)
483483
}
484-
func BenchmarkBolt_ParseAll(b *testing.B) {
485-
benchRoutes(b, parseBolt, parseAPI)
484+
func BenchmarkEcho_ParseAll(b *testing.B) {
485+
benchRoutes(b, parseEcho, parseAPI)
486486
}
487487
func BenchmarkBone_ParseAll(b *testing.B) {
488488
benchRoutes(b, parseBone, parseAPI)

‎routers.go

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import (
3131
"github.com/gocraft/web"
3232
"github.com/gorilla/mux"
3333
"github.com/julienschmidt/httprouter"
34-
"github.com/labstack/bolt"
34+
"github.com/labstack/echo"
3535
"github.com/lunny/tango"
3636
vulcan "github.com/mailgun/route"
3737
"github.com/naoina/denco"
@@ -196,25 +196,26 @@ func loadBeegoSingle(method, path string, handler beego.FilterFunc) http.Handler
196196
return app
197197
}
198198

199-
// Bolt
200-
func boltHandler(*bolt.Context) {}
199+
// Echo
200+
func echoHandler(*echo.Context) {}
201201

202-
func boltHandlerWrite(c *bolt.Context) {
202+
func echoHandlerWrite(c *echo.Context) {
203203
io.WriteString(c.Response, c.Param("name"))
204204
}
205205

206-
func loadBolt(routes []route) http.Handler {
207-
router := bolt.New().Router
206+
func loadEcho(routes []route) http.Handler {
207+
router := echo.New().Router
208208
for _, r := range routes {
209-
router.Add(r.method, r.path, boltHandler)
209+
router.Add(r.method, r.path, echoHandler)
210210
}
211211
return router
212212
}
213213

214-
func loadBoltSingle(method, path string, handler bolt.HandlerFunc) http.Handler {
215-
router := bolt.New(bolt.MaxParam(20)).Router
216-
router.Add(method, path, boltHandler)
217-
return router
214+
func loadEchoSingle(method, path string, handler echo.HandlerFunc) http.Handler {
215+
e := echo.New()
216+
e.MaxParam(20)
217+
e.Router.Add(method, path, echoHandler)
218+
return e.Router
218219
}
219220

220221
// bone

‎static_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ var (
175175
staticAce http.Handler
176176
staticBear http.Handler
177177
staticBeego http.Handler
178-
staticBolt http.Handler
178+
staticEcho http.Handler
179179
staticBone http.Handler
180180
staticDenco http.Handler
181181
staticGin http.Handler
@@ -219,8 +219,8 @@ func init() {
219219
calcMem("Beego", func() {
220220
staticBeego = loadBeego(staticRoutes)
221221
})
222-
calcMem("Bolt", func() {
223-
staticBolt = loadBolt(staticRoutes)
222+
calcMem("Echo", func() {
223+
staticEcho = loadEcho(staticRoutes)
224224
})
225225
calcMem("Bone", func() {
226226
staticBone = loadBone(staticRoutes)
@@ -303,8 +303,8 @@ func BenchmarkBeego_StaticAll(b *testing.B) {
303303
func BenchmarkBear_StaticAll(b *testing.B) {
304304
benchRoutes(b, staticBear, staticRoutes)
305305
}
306-
func BenchmarkBolt_StaticAll(b *testing.B) {
307-
benchRoutes(b, staticBolt, staticRoutes)
306+
func BenchmarkEcho_StaticAll(b *testing.B) {
307+
benchRoutes(b, staticEcho, staticRoutes)
308308
}
309309
func BenchmarkBone_StaticAll(b *testing.B) {
310310
benchRoutes(b, staticBone, staticRoutes)

0 commit comments

Comments
 (0)