Skip to content

Commit 40cbba7

Browse files
committed
Do not error on n != int
1 parent 2e40124 commit 40cbba7

File tree

4 files changed

+13
-23
lines changed

4 files changed

+13
-23
lines changed

frameworks/Go/indigo/benchmark_config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"query_url": "/query?n=",
99
"update_url": "/update?n=",
1010
"cached_query_url": "/cached-query?n=",
11-
"fortune_url": "/fortune",
11+
"fortune_url": "/fortunes",
1212
"plaintext_url": "/plaintext",
1313
"port": 8080,
1414
"approach": "Realistic",

frameworks/Go/indigo/config.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ urls.db = "/db"
77
urls.query = "/query?n="
88
urls.update = "/update?n="
99
urls.cached_query = "/cached-query?n="
10-
urls.fortune = "/fortune"
10+
urls.fortune = "/fortunes"
1111
urls.plaintext = "/plaintext"
1212
approach = "Realistic"
1313
classification = "Platform"

frameworks/Go/indigo/src/app.go

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package main
22

33
import (
44
"context"
5-
"fmt"
65
"math/rand/v2"
76
"slices"
87
"strconv"
@@ -59,18 +58,15 @@ func (app *App) HandleDB(request *http.Request) *http.Response {
5958
}
6059

6160
func (app *App) HandleQuery(request *http.Request) *http.Response {
62-
n, err := normalizeNumber(request.Params.Get("n"))
63-
if err != nil {
64-
return http.Error(request, err)
65-
}
61+
n := normalizeNumber(request.Params.Get("n"))
6662

6763
i, worlds := 0, make(models.Worlds, n)
6864

6965
for i = range worlds {
7066
worlds[i].ID = rand.IntN(10000) + 1
7167
}
7268

73-
err = app.DB.FillWorldsByID(context.Background(), worlds)
69+
err := app.DB.FillWorldsByID(context.Background(), worlds)
7470
if err != nil {
7571
return http.Error(request, err)
7672
}
@@ -79,18 +75,15 @@ func (app *App) HandleQuery(request *http.Request) *http.Response {
7975
}
8076

8177
func (app *App) HandleUpdate(request *http.Request) *http.Response {
82-
n, err := normalizeNumber(request.Params.Get("n"))
83-
if err != nil {
84-
return http.Error(request, err)
85-
}
78+
n := normalizeNumber(request.Params.Get("n"))
8679

8780
i, worlds := 0, make(models.Worlds, n)
8881

8982
for i = range worlds {
9083
worlds[i].ID = rand.IntN(10000) + 1
9184
}
9285

93-
err = app.DB.FillWorldsByID(context.Background(), worlds)
86+
err := app.DB.FillWorldsByID(context.Background(), worlds)
9487
if err != nil {
9588
return http.Error(request, err)
9689
}
@@ -112,10 +105,7 @@ func (app *App) HandleUpdate(request *http.Request) *http.Response {
112105
}
113106

114107
func (app *App) HandleCachedQuery(request *http.Request) *http.Response {
115-
n, err := normalizeNumber(request.Params.Get("n"))
116-
if err != nil {
117-
return http.Error(request, err)
118-
}
108+
n := normalizeNumber(request.Params.Get("n"))
119109

120110
i, worlds := 0, make(models.Worlds, n)
121111

@@ -150,17 +140,17 @@ func (app *App) HandleFortune(request *http.Request) *http.Response {
150140
}
151141

152142
func (app *App) HandlePlaintext(request *http.Request) *http.Response {
153-
return request.Respond().Header("Date", time.Now().Format(time.RFC1123)).Header("Server", "indigo").String("Hello, World!")
143+
return request.Respond().Header("Date", time.Now().Format(time.RFC1123)).Header("Server", "indigo").ContentType(mime.Plain).String("Hello, World!")
154144
}
155145

156-
func normalizeNumber(nString string, found bool) (int, error) {
146+
func normalizeNumber(nString string, found bool) int {
157147
if !found {
158-
return 0, fmt.Errorf("not found")
148+
nString = "0"
159149
}
160150

161151
n, err := strconv.Atoi(nString)
162152
if err != nil {
163-
return 0, err
153+
n = 0
164154
}
165155

166156
if n < 1 {
@@ -169,5 +159,5 @@ func normalizeNumber(nString string, found bool) (int, error) {
169159
n = 500
170160
}
171161

172-
return n, nil
162+
return n
173163
}

frameworks/Go/indigo/src/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ func main() {
3838
router.Resource("/query").Get(app.HandleQuery)
3939
router.Resource("/update").Get(app.HandleUpdate)
4040
router.Resource("/cached-query").Get(app.HandleCachedQuery)
41-
router.Resource("/fortune").Get(app.HandleFortune)
41+
router.Resource("/fortunes").Get(app.HandleFortune)
4242
router.Resource("/plaintext").Get(app.HandlePlaintext)
4343

4444
err = indigo.New(":8080").Serve(router)

0 commit comments

Comments
 (0)