Browse Source

remove temp variable

Rob Figueiredo 12 years ago
parent
commit
08fe3bc7ad
1 changed files with 6 additions and 9 deletions
  1. 6 9
      revel/src/benchmark/app/controllers/app.go

+ 6 - 9
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"
@@ -68,9 +67,8 @@ func (c App) Json() revel.Result {
 
 func (c App) Db(queries int) revel.Result {
 	if queries <= 1 {
-		rowNum := rand.Intn(WorldRowCount) + 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)
 	}
 
@@ -79,8 +77,8 @@ func (c App) Db(queries int) revel.Result {
 	wg.Add(queries)
 	for i := 0; i < queries; i++ {
 		go func(i int) {
-			rowNum := rand.Intn(WorldRowCount) + 1
-			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)
 			}
@@ -93,9 +91,8 @@ func (c App) Db(queries int) revel.Result {
 
 func (c App) Update(queries int) revel.Result {
 	if queries <= 1 {
-		rowNum := rand.Intn(WorldRowCount) + 1
 		var w World
-		worldStatement.QueryRow(rowNum).Scan(&w.Id, &w.RandomNumber)
+		worldStatement.QueryRow(rand.Intn(WorldRowCount)+1).Scan(&w.Id, &w.RandomNumber)
 		w.RandomNumber = uint16(rand.Intn(WorldRowCount) + 1)
 		updateStatement.Exec(w.RandomNumber, w.Id)
 		return c.RenderJson(&w)
@@ -108,8 +105,8 @@ func (c App) Update(queries int) revel.Result {
 	wg.Add(queries)
 	for i := 0; i < queries; i++ {
 		go func(i int) {
-			rowNum := rand.Intn(WorldRowCount) + 1
-			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)
 			}