Skip to content

Commit 9ad26b3

Browse files
julienschmidtjulienschmidt
committed
Ban daryl/zeus
See #33
1 parent 18fa83b commit 9ad26b3

File tree

7 files changed

+141
-126
lines changed

7 files changed

+141
-126
lines changed

‎bench_test.go

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -258,12 +258,13 @@ func BenchmarkVulcan_Param(b *testing.B) {
258258
r, _ := http.NewRequest("GET", "/user/gordon", nil)
259259
benchRequest(b, router, r)
260260
}
261-
func BenchmarkZeus_Param(b *testing.B) {
262-
router := loadZeusSingle("GET", "/user/:name", http.HandlerFunc(httpHandlerFunc))
263261

264-
r, _ := http.NewRequest("GET", "/user/gordon", nil)
265-
benchRequest(b, router, r)
266-
}
262+
// func BenchmarkZeus_Param(b *testing.B) {
263+
// router := loadZeusSingle("GET", "/user/:name", http.HandlerFunc(httpHandlerFunc))
264+
265+
// r, _ := http.NewRequest("GET", "/user/gordon", nil)
266+
// benchRequest(b, router, r)
267+
// }
267268

268269
// Route with 5 Params (no write)
269270
const fiveColon = "/:a/:b/:c/:d/:e"
@@ -431,12 +432,13 @@ func BenchmarkVulcan_Param5(b *testing.B) {
431432
r, _ := http.NewRequest("GET", fiveRoute, nil)
432433
benchRequest(b, router, r)
433434
}
434-
func BenchmarkZeus_Param5(b *testing.B) {
435-
router := loadZeusSingle("GET", fiveColon, http.HandlerFunc(httpHandlerFunc))
436435

437-
r, _ := http.NewRequest("GET", fiveRoute, nil)
438-
benchRequest(b, router, r)
439-
}
436+
// func BenchmarkZeus_Param5(b *testing.B) {
437+
// router := loadZeusSingle("GET", fiveColon, http.HandlerFunc(httpHandlerFunc))
438+
439+
// r, _ := http.NewRequest("GET", fiveRoute, nil)
440+
// benchRequest(b, router, r)
441+
// }
440442

441443
// Route with 20 Params (no write)
442444
const twentyColon = "/:a/:b/:c/:d/:e/:f/:g/:h/:i/:j/:k/:l/:m/:n/:o/:p/:q/:r/:s/:t"
@@ -604,12 +606,13 @@ func BenchmarkVulcan_Param20(b *testing.B) {
604606
r, _ := http.NewRequest("GET", twentyRoute, nil)
605607
benchRequest(b, router, r)
606608
}
607-
func BenchmarkZeus_Param20(b *testing.B) {
608-
router := loadZeusSingle("GET", twentyColon, http.HandlerFunc(httpHandlerFunc))
609609

610-
r, _ := http.NewRequest("GET", twentyRoute, nil)
611-
benchRequest(b, router, r)
612-
}
610+
// func BenchmarkZeus_Param20(b *testing.B) {
611+
// router := loadZeusSingle("GET", twentyColon, http.HandlerFunc(httpHandlerFunc))
612+
613+
// r, _ := http.NewRequest("GET", twentyRoute, nil)
614+
// benchRequest(b, router, r)
615+
// }
613616

614617
// Route with Param and write
615618
func BenchmarkAce_ParamWrite(b *testing.B) {
@@ -777,9 +780,9 @@ func BenchmarkVulcan_ParamWrite(b *testing.B) {
777780
benchRequest(b, router, r)
778781
}
779782

780-
func BenchmarkZeus_ParamWrite(b *testing.B) {
781-
router := loadZeusSingle("GET", "/user/:name", zeusHandlerWrite)
783+
// func BenchmarkZeus_ParamWrite(b *testing.B) {
784+
// router := loadZeusSingle("GET", "/user/:name", zeusHandlerWrite)
782785

783-
r, _ := http.NewRequest("GET", "/user/gordon", nil)
784-
benchRequest(b, router, r)
785-
}
786+
// r, _ := http.NewRequest("GET", "/user/gordon", nil)
787+
// benchRequest(b, router, r)
788+
// }

‎github_test.go

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ var (
300300
githubTigerTonic http.Handler
301301
githubTraffic http.Handler
302302
githubVulcan http.Handler
303-
githubZeus http.Handler
303+
// githubZeus http.Handler
304304
)
305305

306306
func init() {
@@ -384,9 +384,9 @@ func init() {
384384
calcMem("Vulcan", func() {
385385
githubVulcan = loadVulcan(githubAPI)
386386
})
387-
calcMem("Zeus", func() {
388-
githubZeus = loadZeus(githubAPI)
389-
})
387+
// calcMem("Zeus", func() {
388+
// githubZeus = loadZeus(githubAPI)
389+
// })
390390

391391
println()
392392
}
@@ -496,10 +496,11 @@ func BenchmarkVulcan_GithubStatic(b *testing.B) {
496496
req, _ := http.NewRequest("GET", "/user/repos", nil)
497497
benchRequest(b, githubVulcan, req)
498498
}
499-
func BenchmarkZeus_GithubStatic(b *testing.B) {
500-
req, _ := http.NewRequest("GET", "/user/repos", nil)
501-
benchRequest(b, githubZeus, req)
502-
}
499+
500+
// func BenchmarkZeus_GithubStatic(b *testing.B) {
501+
// req, _ := http.NewRequest("GET", "/user/repos", nil)
502+
// benchRequest(b, githubZeus, req)
503+
// }
503504

504505
// Param
505506
func BenchmarkAce_GithubParam(b *testing.B) {
@@ -606,10 +607,11 @@ func BenchmarkVulcan_GithubParam(b *testing.B) {
606607
req, _ := http.NewRequest("GET", "/repos/julienschmidt/httprouter/stargazers", nil)
607608
benchRequest(b, githubVulcan, req)
608609
}
609-
func BenchmarkZeus_GithubParam(b *testing.B) {
610-
req, _ := http.NewRequest("GET", "/repos/julienschmidt/httprouter/stargazers", nil)
611-
benchRequest(b, githubZeus, req)
612-
}
610+
611+
// func BenchmarkZeus_GithubParam(b *testing.B) {
612+
// req, _ := http.NewRequest("GET", "/repos/julienschmidt/httprouter/stargazers", nil)
613+
// benchRequest(b, githubZeus, req)
614+
// }
613615

614616
// All routes
615617
func BenchmarkAce_GithubAll(b *testing.B) {
@@ -690,6 +692,7 @@ func BenchmarkTraffic_GithubAll(b *testing.B) {
690692
func BenchmarkVulcan_GithubAll(b *testing.B) {
691693
benchRoutes(b, githubVulcan, githubAPI)
692694
}
693-
func BenchmarkZeus_GithubAll(b *testing.B) {
694-
benchRoutes(b, githubZeus, githubAPI)
695-
}
695+
696+
// func BenchmarkZeus_GithubAll(b *testing.B) {
697+
// benchRoutes(b, githubZeus, githubAPI)
698+
// }

‎gplus_test.go

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ var (
6262
gplusTigerTonic http.Handler
6363
gplusTraffic http.Handler
6464
gplusVulcan http.Handler
65-
gplusZeus http.Handler
65+
// gplusZeus http.Handler
6666
)
6767

6868
func init() {
@@ -146,9 +146,9 @@ func init() {
146146
calcMem("Vulcan", func() {
147147
gplusVulcan = loadVulcan(gplusAPI)
148148
})
149-
calcMem("Zeus", func() {
150-
gplusZeus = loadZeus(gplusAPI)
151-
})
149+
// calcMem("Zeus", func() {
150+
// gplusZeus = loadZeus(gplusAPI)
151+
// })
152152

153153
println()
154154
}
@@ -258,10 +258,11 @@ func BenchmarkVulcan_GPlusStatic(b *testing.B) {
258258
req, _ := http.NewRequest("GET", "/people", nil)
259259
benchRequest(b, gplusVulcan, req)
260260
}
261-
func BenchmarkZeus_GPlusStatic(b *testing.B) {
262-
req, _ := http.NewRequest("GET", "/people", nil)
263-
benchRequest(b, gplusZeus, req)
264-
}
261+
262+
// func BenchmarkZeus_GPlusStatic(b *testing.B) {
263+
// req, _ := http.NewRequest("GET", "/people", nil)
264+
// benchRequest(b, gplusZeus, req)
265+
// }
265266

266267
// One Param
267268
func BenchmarkAce_GPlusParam(b *testing.B) {
@@ -368,10 +369,11 @@ func BenchmarkVulcan_GPlusParam(b *testing.B) {
368369
req, _ := http.NewRequest("GET", "/people/118051310819094153327", nil)
369370
benchRequest(b, gplusVulcan, req)
370371
}
371-
func BenchmarkZeus_GPlusParam(b *testing.B) {
372-
req, _ := http.NewRequest("GET", "/people/118051310819094153327", nil)
373-
benchRequest(b, gplusZeus, req)
374-
}
372+
373+
// func BenchmarkZeus_GPlusParam(b *testing.B) {
374+
// req, _ := http.NewRequest("GET", "/people/118051310819094153327", nil)
375+
// benchRequest(b, gplusZeus, req)
376+
// }
375377

376378
// Two Params
377379
func BenchmarkAce_GPlus2Params(b *testing.B) {
@@ -478,10 +480,11 @@ func BenchmarkVulcan_GPlus2Params(b *testing.B) {
478480
req, _ := http.NewRequest("GET", "/people/118051310819094153327/activities/123456789", nil)
479481
benchRequest(b, gplusVulcan, req)
480482
}
481-
func BenchmarkZeus_GPlus2Params(b *testing.B) {
482-
req, _ := http.NewRequest("GET", "/people/118051310819094153327/activities/123456789", nil)
483-
benchRequest(b, gplusZeus, req)
484-
}
483+
484+
// func BenchmarkZeus_GPlus2Params(b *testing.B) {
485+
// req, _ := http.NewRequest("GET", "/people/118051310819094153327/activities/123456789", nil)
486+
// benchRequest(b, gplusZeus, req)
487+
// }
485488

486489
// All Routes
487490
func BenchmarkAce_GPlusAll(b *testing.B) {
@@ -562,6 +565,7 @@ func BenchmarkTraffic_GPlusAll(b *testing.B) {
562565
func BenchmarkVulcan_GPlusAll(b *testing.B) {
563566
benchRoutes(b, gplusVulcan, gplusAPI)
564567
}
565-
func BenchmarkZeus_GPlusAll(b *testing.B) {
566-
benchRoutes(b, gplusZeus, gplusAPI)
567-
}
568+
569+
// func BenchmarkZeus_GPlusAll(b *testing.B) {
570+
// benchRoutes(b, gplusZeus, gplusAPI)
571+
// }

‎parse_test.go

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ var (
8282
parseTigerTonic http.Handler
8383
parseTraffic http.Handler
8484
parseVulcan http.Handler
85-
parseZeus http.Handler
85+
// parseZeus http.Handler
8686
)
8787

8888
func init() {
@@ -166,9 +166,9 @@ func init() {
166166
calcMem("Vulcan", func() {
167167
parseVulcan = loadVulcan(parseAPI)
168168
})
169-
calcMem("Zeus", func() {
170-
parseZeus = loadZeus(parseAPI)
171-
})
169+
// calcMem("Zeus", func() {
170+
// parseZeus = loadZeus(parseAPI)
171+
// })
172172

173173
println()
174174
}
@@ -278,10 +278,11 @@ func BenchmarkVulcan_ParseStatic(b *testing.B) {
278278
req, _ := http.NewRequest("GET", "/1/users", nil)
279279
benchRequest(b, parseVulcan, req)
280280
}
281-
func BenchmarkZeus_ParseStatic(b *testing.B) {
282-
req, _ := http.NewRequest("GET", "/1/users", nil)
283-
benchRequest(b, parseZeus, req)
284-
}
281+
282+
// func BenchmarkZeus_ParseStatic(b *testing.B) {
283+
// req, _ := http.NewRequest("GET", "/1/users", nil)
284+
// benchRequest(b, parseZeus, req)
285+
// }
285286

286287
// One Param
287288
func BenchmarkAce_ParseParam(b *testing.B) {
@@ -388,10 +389,11 @@ func BenchmarkVulcan_ParseParam(b *testing.B) {
388389
req, _ := http.NewRequest("GET", "/1/classes/go", nil)
389390
benchRequest(b, parseVulcan, req)
390391
}
391-
func BenchmarkZeus_ParseParam(b *testing.B) {
392-
req, _ := http.NewRequest("GET", "/1/classes/go", nil)
393-
benchRequest(b, parseZeus, req)
394-
}
392+
393+
// func BenchmarkZeus_ParseParam(b *testing.B) {
394+
// req, _ := http.NewRequest("GET", "/1/classes/go", nil)
395+
// benchRequest(b, parseZeus, req)
396+
// }
395397

396398
// Two Params
397399
func BenchmarkAce_Parse2Params(b *testing.B) {
@@ -498,10 +500,11 @@ func BenchmarkVulcan_Parse2Params(b *testing.B) {
498500
req, _ := http.NewRequest("GET", "/1/classes/go/123456789", nil)
499501
benchRequest(b, parseVulcan, req)
500502
}
501-
func BenchmarkZeus_Parse2Params(b *testing.B) {
502-
req, _ := http.NewRequest("GET", "/1/classes/go/123456789", nil)
503-
benchRequest(b, parseZeus, req)
504-
}
503+
504+
// func BenchmarkZeus_Parse2Params(b *testing.B) {
505+
// req, _ := http.NewRequest("GET", "/1/classes/go/123456789", nil)
506+
// benchRequest(b, parseZeus, req)
507+
// }
505508

506509
// All Routes
507510
func BenchmarkAce_ParseAll(b *testing.B) {
@@ -582,6 +585,7 @@ func BenchmarkTraffic_ParseAll(b *testing.B) {
582585
func BenchmarkVulcan_ParseAll(b *testing.B) {
583586
benchRoutes(b, parseVulcan, parseAPI)
584587
}
585-
func BenchmarkZeus_ParseAll(b *testing.B) {
586-
benchRoutes(b, parseZeus, parseAPI)
587-
}
588+
589+
// func BenchmarkZeus_ParseAll(b *testing.B) {
590+
// benchRoutes(b, parseZeus, parseAPI)
591+
// }

0 commit comments

Comments
 (0)