Auto-checkout filters branch on setup. Update to work with newest filters CLs.

revel/setup.py

@@ -7,6 +7,7 @@ import time
 def start(args):
   setup_util.replace_text("revel/src/benchmark/conf/app.conf", "tcp\(.*:3306\)", "tcp(" + args.database_host + ":3306)")
   subprocess.call("go get github.com/robfig/revel/cmd", shell=True, cwd="revel")
+  subprocess.call("git checkout filters", shell=True, cwd="revel/src/github.com/robfig/revel")
   subprocess.call("go build -o bin/revel github.com/robfig/revel/cmd", shell=True, cwd="revel")
   subprocess.Popen("bin/revel run benchmark prod".rsplit(" "), cwd="revel")
   return 0
@@ -18,4 +19,5 @@ def stop():
     if 'revel' in line:
       pid = int(line.split(None, 2)[1])
       os.kill(pid, 9)
+  subprocess.call("git checkout master", shell=True, cwd="revel/src/github.com/robfig/revel")
   return 0

revel/src/benchmark/app/controllers/app.go

@@ -2,7 +2,6 @@ package controllers
 
 import (
 	"database/sql"
-	// _ "github.com/go-sql-driver/mysql"
 	"github.com/robfig/revel"
 	"github.com/robfig/revel/modules/db/app"
 	"math/rand"
@@ -41,7 +40,7 @@ func init() {
 	revel.OnAppStart(func() {
 		var err error
 		runtime.GOMAXPROCS(runtime.NumCPU())
-		db.DbFilter{}.OnAppStart()
+		db.Init()
 		db.Db.SetMaxIdleConns(MaxConnectionCount)
 		if worldStatement, err = db.Db.Prepare(WorldSelect); err != nil {
 			revel.ERROR.Fatalln(err)
@@ -62,10 +61,9 @@ func (c App) Json() revel.Result {
 }
 
 func (c App) Db(queries int) revel.Result {
-	rowNum := rand.Intn(WorldRowCount) + 1
 	if queries <= 1 {
 		var w World
-		worldStatement.QueryRow(rowNum).Scan(&w.Id, &w.RandomNumber)
+		worldStatement.QueryRow(rand.Intn(WorldRowCount)+1).Scan(&w.Id, &w.RandomNumber)
 		return c.RenderJson(w)
 	}
 
@@ -74,7 +72,8 @@ func (c App) Db(queries int) revel.Result {
 	wg.Add(queries)
 	for i := 0; i < queries; i++ {
 		go func(i int) {
-			err := worldStatement.QueryRow(rowNum).Scan(&ww[i].Id, &ww[i].RandomNumber)
+			err := worldStatement.QueryRow(rand.Intn(WorldRowCount)+1).
+				Scan(&ww[i].Id, &ww[i].RandomNumber)
 			if err != nil {
 				revel.ERROR.Fatalf("Error scanning world row: %v", err)
 			}