Home Explore Help
Sign In
compsci-industry
/
TechEmpower.FrameworkBenchmarks
mirror of https://github.com/TechEmpower/FrameworkBenchmarks.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

Add fortune test

Zane Kansil 10 years ago
parent
009cb61aba
commit
4a43f8fccc
4 changed files with 79 additions and 2 deletions
Unified View Show Diff Stats
  1. 1 1
      frameworks/Go/goji/benchmark_config
  2. 55 1
      frameworks/Go/goji/src/goji/server.go
  3. 14 0
      frameworks/Go/goji/templates/fortune.html
  4. 9 0
      frameworks/Go/goji/templates/layout.html

+ 1 - 1
frameworks/Go/goji/benchmark_config
View File 

@@ -6,7 +6,7 @@
 
       "json_url": "/json",
 
       "json_url": "/json",
 
       "db_url": "/db",
 
       "db_url": "/db",
 
       "query_url": "/queries?queries=",
 
       "query_url": "/queries?queries=",
 
-      "fortune_url": "/fortune",
 
+      "fortune_url": "/fortunes",
 
       "update_url": "/update?queries=",
 
       "update_url": "/update?queries=",
 
       "plaintext_url": "/plaintext",
 
       "plaintext_url": "/plaintext",
 
       "port": 8080,
 
       "port": 8080,

+ 55 - 1
frameworks/Go/goji/src/goji/server.go
View File 

@@ -10,6 +10,8 @@ import (
 
 	"log"
 
 	"log"
 
 	"math/rand"
 
 	"math/rand"
 
 	"strconv"
 
 	"strconv"
 
+	"html/template"
 
+	"sort"
 
 
 
 	_ "github.com/go-sql-driver/mysql"
 
 	_ "github.com/go-sql-driver/mysql"
 
 
 
@@ -27,11 +29,14 @@ const (
 
 	maxConnectionCount = 256
 
 	maxConnectionCount = 256
 
 
 
 	helloWorldString = "Hello, World!"
 
 	helloWorldString = "Hello, World!"
 
+	extraFortuneMessage = "Additional fortune added at request time."
 
 )
 
 )
 
 
 
 var (
 
 var (
 
 	// Templates
 
 	// Templates
 
-	// tmpl = template.Must(template.ParseFiles("templates/layout.html", "templates/fortune.html"))
 
+	tmpl = template.Must(template.
 
+		ParseFiles("templates/layout.html",
 
+			       "templates/fortune.html"))
 
 
 
 	// Database
 
 	// Database
 
 	worldStatement   *sql.Stmt
 
 	worldStatement   *sql.Stmt
 
@@ -54,6 +59,29 @@ func randomRow() *sql.Row {
 
 	return worldStatement.QueryRow(rand.Intn(worldRowCount) + 1)
 
 	return worldStatement.QueryRow(rand.Intn(worldRowCount) + 1)
 
 }
 
 }
 
 
 
+type Fortune struct {
 
+	Id      uint16 `json:"id"`
 
+	Message string `json:"message"`
 
+}
 
+
 
+type Fortunes []*Fortune
 
+
 
+func (s Fortunes) Len() int {
 
+	return len(s)
 
+}
 
+
 
+func (s Fortunes) Swap(i, j int) {
 
+	s[i], s[j] = s[j], s[i]
 
+}
 
+
 
+type ByMessage struct {
 
+	Fortunes
 
+}
 
+
 
+func (s ByMessage) Less(i, j int) bool {
 
+	return s.Fortunes[i].Message < s.Fortunes[j].Message
 
+}
 
+
 
 // Test 1: Json Serialization
 
 // Test 1: Json Serialization
 
 func serializeJson(c web.C, w http.ResponseWriter, r *http.Request) {
 
 func serializeJson(c web.C, w http.ResponseWriter, r *http.Request) {
 
 	w.Header().Set("Content-Type", "application/json")
 
 	w.Header().Set("Content-Type", "application/json")
 
@@ -98,6 +126,31 @@ func multipleQueries(c web.C, w http.ResponseWriter, r *http.Request) {
 
 	json.NewEncoder(w).Encode(worlds)
 
 	json.NewEncoder(w).Encode(worlds)
 
 }
 
 }
 
 
 
+// Test 4: Fortunes
 
+func fortunes(c web.C, w http.ResponseWriter, r *http.Request) {
 
+	rows, err := fortuneStatement.Query()
 
+	if err != nil {
 
+		log.Fatalf("Error preparing statement: %v", err)
 
+	}
 
+
 
+	fortunes := make(Fortunes, 0, 16)
 
+
 
+	for rows.Next() {
 
+		fortune := Fortune{}
 
+		if err := rows.Scan(&fortune.Id, &fortune.Message); err != nil {
 
+			log.Fatalf("Error scanning fortune row: %s", err.Error())
 
+		}
 
+		fortunes = append(fortunes, &fortune)
 
+	}
 
+	fortunes = append(fortunes, &Fortune{Message: extraFortuneMessage})
 
+
 
+	sort.Sort(ByMessage{fortunes})
 
+	w.Header().Set("Content-Type", "text/html")
 
+	if err := tmpl.Execute(w, fortunes); err != nil {
 
+		http.Error(w, err.Error(), http.StatusInternalServerError)
 
+	}
 
+}
 
+
 
 // Test 6: Plaintext
 
 // Test 6: Plaintext
 
 func plaintext(c web.C, w http.ResponseWriter, r *http.Request) {
 
 func plaintext(c web.C, w http.ResponseWriter, r *http.Request) {
 
 	fmt.Fprintf(w, "Hello, World!")
 
 	fmt.Fprintf(w, "Hello, World!")
 
@@ -128,6 +181,7 @@ func main() {
 
 	goji.Get("/json", serializeJson)
 
 	goji.Get("/json", serializeJson)
 
 	goji.Get("/db", singleQuery)
 
 	goji.Get("/db", singleQuery)
 
 	goji.Get("/queries", multipleQueries)
 
 	goji.Get("/queries", multipleQueries)
 
+	goji.Get("/fortunes", fortunes)
 
 	goji.Get("/plaintext", plaintext)
 
 	goji.Get("/plaintext", plaintext)
 
 	goji.Serve()
 
 	goji.Serve()
 
 }
 
 }

+ 14 - 0
frameworks/Go/goji/templates/fortune.html
View File 

@@ -0,0 +1,14 @@
 
+{{define "content"}}
 
+<table>
 
+<tr>
 
+<th>id</th>
 
+<th>message</th>
 
+</tr>
 
+{{range .}}
 
+<tr>
 
+<td>{{.Id}}</td>
 
+<td>{{.Message}}</td>
 
+</tr>
 
+{{end}}
 
+</table>
 
+{{end}}

+ 9 - 0
frameworks/Go/goji/templates/layout.html
View File 

@@ -0,0 +1,9 @@
 
+<!DOCTYPE html>
 
+<html>
 
+<head>
 
+<title>Fortunes</title>
 
+</head>
 
+<body>
 
+{{template "content" .}}
 
+</body>
 
+</html>