Update Readme, config and so

Author: c-cesar

frameworks/V/veb/README.md

@@ -1,67 +1,13 @@
-# Congratulations!
+# [veb](https://modules.vlang.io/veb.html) Benchmarking Test
 
-You have successfully built a new test in the suite!
-
-There are some remaining tasks to do before you are ready to open a pull request, however.
-
-## Next Steps
-
-1. Gather your source code.
-
-You will need to ensure that your source code is beneath this directory. The most common solution is to include a `src` directory and place your source code there.
-
-2. Edit `benchmark_config.json`
-
-You will need alter `benchmark_config.json` to have the appropriate end-points and port specified.
-
-3. Create `veb.dockerfile`
-
-This is the dockerfile that is built into a docker image and run when a benchmark test is run. Specifically, this file tells the suite how to build and start your test application.
-
-You can create multiple implementations and they will all conform to `[name in benchmark_config.json].dockerfile`. For example, the `default` implementation in `benchmark_config.json` will be `veb.dockerfile`, but if you wanted to make another implementation that did only the database tests for MySQL, you could make `veb-mysql.dockerfile` and have an entry in your `benchmark_config.json` for `veb-mysql`.
-
-4. Test your application
-
-        $ tfb --mode verify --test veb
-
-This will run the suite in `verify` mode for your test. This means that no benchmarks will be captured and we will test that we can hit your implementation end-points specified by `benchmark_config.json` and that the response is correct.
-
-Once you are able to successfully run your test through our suite in this way **and** your test passes our validation, you may move on to the next step.
-
-5. Add your test to `.github/workflows/build.yml`
-
-Edit `.github/workflows/build.yml` to ensure that Github Actions will automatically run our verification tests against your new test. This file is kept in alphabetical order, so find where `TESTDIR=V/veb` should be inserted under `env > matrix` and put it there.
-
-6. Fix this `README.md` and open a pull request
-
-Starting on line 49 is your actual `README.md` that will sit with your test implementation. Update all the dummy values to their correct values so that when people visit your test in our Github repository, they will be greated with information on how your test implementation works and where to look for useful source code.
-
-After you have the real `README.md` file in place, delete everything above line 59 and you are ready to open a pull request.
-
-Thanks and Cheers!
-
-
-
-
-
-
-
-# veb Benchmarking Test
+Veb is the default V language web framework. This test uses veb and V native ORM.
 
 ### Test Type Implementation Source Code
 
-* [JSON](Relative/Path/To/Your/Source/File)
-* [PLAINTEXT](Relative/Path/To/Your/Source/File)
-* [DB](Relative/Path/To/Your/Source/File)
-* [QUERY](Relative/Path/To/Your/Source/File)
-* [CACHED QUERY](Relative/Path/To/Your/Source/File)
-* [UPDATE](Relative/Path/To/Your/Source/File)
-* [FORTUNES](Relative/Path/To/Your/Source/File)
+All tests in a 95 lines [main.v] and a html [template](fortunes.html)
+### Database
 
-## Important Libraries
-The tests were run with:
-* [Software](https://www.example1.com/)
-* [Example](http://www.example2.com/)
+PostgresQL
 
 ## Test URLs
 ### JSON
@@ -78,11 +24,7 @@ http://localhost:8080/db
 
 ### QUERY
 
-http://localhost:8080/query?queries=
-
-### CACHED QUERY
-
-http://localhost:8080/cached_query?queries=
+http://localhost:8080/query?q=
 
 ### UPDATE
 

frameworks/V/veb/benchmark_config.json

@@ -6,14 +6,17 @@
         "json_url": "/json",
         "plaintext_url": "/plaintext",
         "db_url": "/db",
+        "query_url": "/queries?q=",
+        "fortune_url": "/fortunes",
+        "update_url": "/update?q=",
         "port": 8080,
         "approach": "Realistic",
         "classification": "Fullstack",
         "database": "Postgres",
         "framework": "veb",
         "language": "V",
         "flavor": "None",
-        "orm": "Full",
+        "orm": "Micro",
         "platform": "None",
         "webserver": "None",
         "os": "Linux",

frameworks/V/veb/config.toml

@@ -5,12 +5,15 @@ name = "veb"
 urls.plaintext = "/plaintext"
 urls.json = "/json"
 urls.db = "/db"
+urls.query = "/queries?q="
+urls.update = "/update?q="
+urls.fortune = "/fortunes"
 approach = "Realistic"
 classification = "Fullstack"
 database = "Postgres"
 database_os = "Linux"
 os = "Linux"
-orm = "Full"
+orm = "Micro"
 platform = "None"
 webserver = "None"
 versus = "None"

frameworks/V/veb/main.v

@@ -3,8 +3,6 @@ import time
 import rand
 import db.pg
 
-import log
-
 pub struct Context {
     veb.Context
 }
@@ -15,14 +13,12 @@ pub mut:
 }
 
 pub fn (app &App) plaintext(mut ctx Context) veb.Result {
-	log.error('plain')
-    ctx.set_header(.date, time.now().as_utc().custom_format('ddd, DD MMM YYYY HH:MM:ss') + ' GMT')
+	ctx.set_header(.date, time.now().as_utc().custom_format('ddd, DD MMM YYYY HH:MM:ss') + ' GMT')
 	ctx.set_header(.server, 'veb')
 	return ctx.text('Hello, World!')
 }
 
 pub fn (app &App) json(mut ctx Context) veb.Result {
-	log.error('json')
 	obj := {'message': 'Hello, World!'}
 	ctx.set_header(.date, time.now().as_utc().custom_format('ddd, DD MMM YYYY HH:MM:ss') + ' GMT')
 	ctx.set_header(.server, 'veb')
@@ -31,17 +27,69 @@ pub fn (app &App) json(mut ctx Context) veb.Result {
 
 struct World {
 	id           int @[primary; sql: serial]
+mut:
 	randomnumber int
 }
 
 pub fn (app &App) db(mut ctx Context) veb.Result {
 	r := rand.int_in_range(1, 10000) or { return ctx.text('rand error') }
-	result := sql app.db {
+	mut world := sql app.db {
 		select from World where id == r
-	} or { return ctx.text(app.db.last_id().str()) }
+	} or { return ctx.text('db error') }
+	ctx.set_header(.date, time.now().as_utc().custom_format('ddd, DD MMM YYYY HH:MM:ss') + ' GMT')
+	ctx.set_header(.server, 'veb')
+	return ctx.json(world.first())
+}
+
+pub fn (app &App) queries(mut ctx Context) veb.Result {
+	mut q := ctx.query['q'].int()
+	if q < 1 { q = 1 } else if q > 500 { q = 500 }
+	mut world := []World{}
+	for _ in 0..q {
+		r := rand.int_in_range(1, 10000) or { return ctx.text('rand error') }
+		world << sql app.db {
+			select from World where id == r
+		} or { return ctx.text('db error') }
+	}
+	ctx.set_header(.date, time.now().as_utc().custom_format('ddd, DD MMM YYYY HH:MM:ss') + ' GMT')
+	ctx.set_header(.server, 'veb')
+	return ctx.json(world)
+}
+
+pub fn (app &App) update(mut ctx Context) veb.Result {
+	mut q := ctx.query['q'].int()
+	if q < 1 { q = 1 } else if q > 500 { q = 500 }
+	mut world := []World{}
+	for _ in 0..q {
+		r := rand.int_in_range(1, 10000) or { return ctx.text('rand error') }
+		world << sql app.db {
+			select from World where id == r
+		} or { return ctx.text('db error') }
+		world.last().randomnumber = rand.int_in_range(1, 10000) or { return ctx.text('rand error') }
+		sql app.db {
+			update World set randomnumber = world.last().randomnumber where id == world.last().id
+		} or { return ctx.text('db error') }
+	}
+	ctx.set_header(.date, time.now().as_utc().custom_format('ddd, DD MMM YYYY HH:MM:ss') + ' GMT')
+	ctx.set_header(.server, 'veb')
+	return ctx.json(world)
+}
+
+struct Fortune {
+	id      int @[primary; sql: serial]
+	message string
+}
+
+pub fn (app &App) fortunes(mut ctx Context) veb.Result {
+	mut fortunes := sql app.db {
+		select from Fortune
+	} or { return ctx.text('db error') }
+	fortunes.insert(0, Fortune{id: 0, message: 'Additional fortune added at request time.'})
+	fortunes.sort(a.message < b.message)
 	ctx.set_header(.date, time.now().as_utc().custom_format('ddd, DD MMM YYYY HH:MM:ss') + ' GMT')
 	ctx.set_header(.server, 'veb')
-	return ctx.json({'id': r, 'randomNumber': result[0].randomnumber})
+	ctx.content_type = 'text/html; charset=utf-8'
+	return $veb.html()
 }
 
 fn main() {
@@ -53,21 +101,6 @@ fn main() {
 			password: 'benchmarkdbpass'
 			dbname:   'hello_world'
 		}) !
-		//db: pg.connect_with_conninfo('postgresql://benchmarkdbuser:benchmarkdbpass@tfb-database:5432/hello_world?sslmode=disable') !
 	}
 	veb.run[App, Context](mut app,  8080)
 }
-
-/*
-pub fn (app &App) queries(mut ctx Context) veb.Result {
-	return 
-}
-
-pub fn (app &App) updates(mut ctx Context) veb.Result {
-	return 
-}
-
-pub fn (app &App) fortunes(mut ctx Context) veb.Result {
-	return 
-}
-*/

frameworks/V/veb/veb.dockerfile

@@ -1,12 +1,9 @@
 FROM thevlang/vlang:debian-dev
 RUN apt update && apt install -y libpq-dev
 
-# Compile veb
 WORKDIR /app
-COPY ./main.v run.sh ./
+COPY ./main.v run.sh fortunes.html ./
 RUN v -prod -cflags '-std=gnu11 -Wall -O3 -march=native -mtune=native -flto' main.v
 
-# Run veb
 EXPOSE 8080
 CMD sh run.sh
-#CMD ./main