update deno and oak versions and using postgresjs (TechEmpower#9877)

PanovYury · litongjava · commit 447afb5ebb38 · 2025-05-29T21:49:39.000-10:00
Co-authored-by: = &lt;=&gt;
diff --git a/frameworks/TypeScript/oak/README.md b/frameworks/TypeScript/oak/README.md
@@ -2,21 +2,21 @@
 
 ### Test Type Implementation Source Code
 
-- [PLAINTEXT](src/routes.ts#L15)
-- [JSON](src/routes.ts#L16)
-- [DB](src/routes.ts#L17)
-- [QUERY](src/routes.ts#L24)
-- [UPDATE](src/routes.ts#L37)
-- [FORTUNES](src/routes.ts#L53)
-- [CACHED QUERY](src/routes.ts#L67)
+- [PLAINTEXT](src/routes.ts#L18)
+- [JSON](src/routes.ts#L19)
+- [DB](src/routes.ts#L25)
+- [QUERY](src/routes.ts#L29)
+- [UPDATE](src/routes.ts#L39)
+- [FORTUNES](src/routes.ts#L59)
+- [CACHED QUERY](src/routes.ts#L73)
 
 ## Important Libraries
 
 The tests were run with:
 
 - [deno](https://deno.land)
 - [oak](https://deno.land/x/oak/)
-- [cotton](https://deno.land/x/cotton/)
+- [Postgres.js](https://github.com/porsager/postgres/)
 
 ## Test URLs
 
@@ -34,16 +34,16 @@ http://localhost:8080/db
 
 ### QUERY
 
-http://localhost:8080/query?q=
+http://localhost:8080/queries?q=
 
 ### UPDATE
 
-http://localhost:8080/update?q=
+http://localhost:8080/updates?q=
 
 ### FORTUNES
 
 http://localhost:8080/fortunes
 
 ### CACHED QUERY
 
-http://localhost:8080/cached_query?q=
+http://localhost:8080/cached_queries?q=
diff --git a/frameworks/TypeScript/oak/benchmark_config.json b/frameworks/TypeScript/oak/benchmark_config.json
@@ -3,6 +3,27 @@
   "tests": [
     {
       "default": {
+        "json_url": "/json",
+        "plaintext_url": "/plaintext",
+        "port": 8080,
+        "approach": "Realistic",
+        "classification": "Micro",
+        "database": "None",
+        "framework": "oak",
+        "language": "TypeScript",
+        "flavor": "deno",
+        "orm": "None",
+        "platform": "deno",
+        "webserver": "None",
+        "os": "Linux",
+        "database_os": "Linux",
+        "display_name": "oak",
+        "notes": "",
+        "versus": "nodejs"
+      }
+    },
+    {
+      "postgresjs": {
         "json_url": "/json",
         "plaintext_url": "/plaintext",
         "db_url": "/db",
@@ -12,20 +33,19 @@
         "cached_query_url": "/cached_queries?q=",
         "port": 8080,
         "approach": "Realistic",
-        "classification": "Platform",
+        "classification": "Micro",
         "database": "postgres",
-        "framework": "None",
-        "language": "Typescript",
+        "database_os": "Linux",
+        "framework": "oak",
+        "language": "TypeScript",
         "flavor": "deno",
-        "orm": "Micro",
+        "orm": "Raw",
         "platform": "deno",
         "webserver": "None",
         "os": "Linux",
-        "database_os": "Linux",
-        "display_name": "oak",
+        "display_name": "oak [postgresjs]",
         "notes": "",
-        "versus": "nodejs",
-        "tags": ["broken"]
+        "versus": "nodejs"
       }
     }
   ]
diff --git a/frameworks/TypeScript/oak/deno.json b/frameworks/TypeScript/oak/deno.json
@@ -0,0 +1,8 @@
+{
+  "imports": {
+    "oak": "jsr:@oak/oak@17.1.4",
+    "postgres": "https://deno.land/x/postgresjs@v3.4.5/mod.js",
+    "lru-cache": "jsr:@std/cache@0.2.0/lru-cache",
+    "html": "https://deno.land/x/literal_html@1.1.0/mod.ts"
+  }
+}
diff --git a/frameworks/TypeScript/oak/deno.lock b/frameworks/TypeScript/oak/deno.lock
diff --git a/frameworks/TypeScript/oak/oak-postgresjs.dockerfile b/frameworks/TypeScript/oak/oak-postgresjs.dockerfile
@@ -0,0 +1,19 @@
+FROM denoland/deno:2.3.1
+
+EXPOSE 8080
+
+WORKDIR /app
+
+USER deno
+
+ENV PG_NAME hello_world
+ENV PG_HOST tfb-database
+ENV PG_USER benchmarkdbuser
+ENV PG_PSWD benchmarkdbpass
+ENV DATABASE postgres
+
+COPY . .
+
+RUN deno install --entrypoint ./src/main.ts
+
+CMD ["deno", "serve", "--parallel", "--port", "8080", "--host", "0.0.0.0", "-A", "./src/main.ts"]
diff --git a/frameworks/TypeScript/oak/oak.dockerfile b/frameworks/TypeScript/oak/oak.dockerfile
@@ -1,12 +1,13 @@
-FROM denoland/deno
+FROM denoland/deno:2.3.1
 
 EXPOSE 8080
 
 WORKDIR /app
 
 USER deno
 
-COPY ./src/deps.ts .
-RUN deno cache deps.ts
-ADD ./src .
-CMD [ "run", "--allow-all", "main.ts" ]
+COPY . .
+
+RUN deno install --entrypoint ./src/main.ts
+
+CMD ["deno", "serve", "--parallel", "--port", "8080", "--host", "0.0.0.0", "-A", "./src/main.ts"]
diff --git a/frameworks/TypeScript/oak/src/deps.ts b/frameworks/TypeScript/oak/src/deps.ts
diff --git a/frameworks/TypeScript/oak/src/helpers.ts b/frameworks/TypeScript/oak/src/helpers.ts
@@ -1,4 +1,5 @@
-import { Context, ResponseBody, Status } from "./deps.ts";
+import { Context, Status } from "oak";
+import { ResponseBody } from "oak/response";
 
 export function Ok(ctx: Context, body: ResponseBody) {
   ctx.response.status = Status.OK;
diff --git a/frameworks/TypeScript/oak/src/main.ts b/frameworks/TypeScript/oak/src/main.ts
@@ -1,10 +1,7 @@
-import { Application, DatabaseResult, Manager } from "./deps.ts";
+import { Application } from "oak";
 import { router } from "./routes.ts";
-import { getDbClient } from "./utils.ts";
 
-const app = new Application<
-  { manager: Manager; cached_worlds: DatabaseResult[] }
->();
+const app = new Application();
 
 // headers
 app.use(async (ctx, next) => {
@@ -13,15 +10,7 @@ app.use(async (ctx, next) => {
   await next();
 });
 
-// database handling
-app.use(async (ctx, next) => {
-  const db = await getDbClient();
-  ctx.state.manager = db.getManager();
-  await next();
-  await db.disconnect();
-});
-
 app.use(router.routes());
 app.use(router.allowedMethods());
 
-await app.listen({ port: 8080 });
+export default { fetch: app.fetch };
diff --git a/frameworks/TypeScript/oak/src/models.ts b/frameworks/TypeScript/oak/src/models.ts
diff --git a/frameworks/TypeScript/oak/src/postgres.ts b/frameworks/TypeScript/oak/src/postgres.ts
@@ -0,0 +1,35 @@
+import postgres from 'postgres';
+import type { World, Fortune } from './types.ts';
+
+const sql = postgres({ 
+  host: Deno.env.get("PG_HOST"),
+  user: Deno.env.get("PG_USER"),
+  database: Deno.env.get("PG_NAME"),
+  password: Deno.env.get("PG_PSWD"),
+  max: 1
+});
+
+export function allFortunes() {
+  return sql<Fortune[]>`select id, message from fortune`;
+}
+
+export function getAllWorlds() {
+  return sql<World[]>`SELECT id, randomNumber FROM world`;
+}
+
+export async function getWorld(id: number) {
+  const result = await sql<World[]>`select id, randomNumber from world where id = ${id}`;
+  return result[0];
+}
+
+export async function bulkUpdate(worlds: World[]) {
+  const values = sql(
+    worlds
+      .map((world) => [world.id, world.randomnumber])
+      .sort((a, b) => (a[0] < b[0] ? -1 : 1))
+  );
+
+  await sql`update world set randomNumber = (update_data.randomNumber)::int
+    from (values ${values}) as update_data (id, randomNumber)
+    where world.id = (update_data.id)::int`;
+}
diff --git a/frameworks/TypeScript/oak/src/routes.ts b/frameworks/TypeScript/oak/src/routes.ts
@@ -1,57 +1,63 @@
-import { Fortune, World } from "./models.ts";
+import { Router } from "oak";
+import { LruCache } from "lru-cache";
 import { NotFound, Ok } from "./helpers.ts";
+import type { Fortune, World } from "./types.ts";
 import {
-  getDbClient,
   parseQuery,
   randomNumber,
   renderTemplate,
 } from "./utils.ts";
-import { Router } from "./deps.ts";
-
-const cached_worlds = await (await getDbClient()).getManager().query(World)
-  .limit(10000).all();
+import { 
+  getWorld, 
+  bulkUpdate, 
+  allFortunes, 
+  getAllWorlds 
+} from "./postgres.ts";
 
 export const router = new Router()
   .get("/plaintext", (ctx) => Ok(ctx, "Hello, World!"))
-  .get("/json", (ctx) => Ok(ctx, { message: "Hello, World!" }))
-  .get("/db", async (ctx) => {
-    const world = await ctx.state.manager.query(World).where(
-      "id",
-      randomNumber(),
-    ).first();
+  .get("/json", (ctx) => Ok(ctx, { message: "Hello, World!" }));
+
+if (Deno.env.has("DATABASE")) {
+  const cache = new LruCache<number, World>(10_000);
+  (await getAllWorlds()).forEach(world => cache.set(world.id, world));
+  
+  router.get("/db", async (ctx) => {
+    const world = await getWorld(randomNumber());
     Ok(ctx, world);
   })
   .get("/queries", async (ctx) => {
-    const worlds = [];
+    const worldsPromises = [];
     const queries = parseQuery(ctx);
     for (let i = 0; i < queries; i++) {
-      const world = await ctx.state.manager.query(World).where(
-        "id",
-        randomNumber(),
-      ).first();
-      worlds.push(world);
+      worldsPromises.push(getWorld(randomNumber()));
     }
 
+    const worlds = await Promise.all(worldsPromises);
     Ok(ctx, worlds);
   })
   .get("/updates", async (ctx) => {
-    const worlds = [];
+    const worldsPromises: Promise<World>[] = [];
     const queries = parseQuery(ctx);
 
     for (let i = 0; i < queries; i++) {
-      const world = await ctx.state.manager.query(World).where(
-        "id",
-        randomNumber(),
-      ).first();
+      const world = getWorld(randomNumber());
+      worldsPromises.push(world);
+    }
+
+    const worlds = await Promise.all(worldsPromises);
+
+    const newWorlds = worlds.map((world) => {
       world.randomnumber = randomNumber();
-      worlds.push(world);
+      return world;
+    });
 
-      await ctx.state.manager.save(world);
-    }
-    Ok(ctx, worlds);
+    await bulkUpdate(newWorlds);
+
+    Ok(ctx, newWorlds);
   })
   .get("/fortunes", async (ctx) => {
-    const fortunes: Fortune[] = await ctx.state.manager.query(Fortune).all();
+    const fortunes = await allFortunes();
     fortunes.push({
       id: 0,
       message: "Additional fortune added at request time.",
@@ -69,8 +75,10 @@ export const router = new Router()
     const worlds = [];
 
     for (let i = 0; i < queries; i++) {
-      worlds.push(cached_worlds[randomNumber()]);
+      worlds.push(cache.get(randomNumber()));
     }
     Ok(ctx, worlds);
   })
-  .get("/(.*)", (ctx) => NotFound(ctx));
+}
+
+router.get("/(.*)", (ctx) => NotFound(ctx));
diff --git a/frameworks/TypeScript/oak/src/types.ts b/frameworks/TypeScript/oak/src/types.ts
@@ -0,0 +1,9 @@
+export interface World {
+  id: number;
+  randomnumber: number;
+}
+
+export interface Fortune {
+  id: number;
+  message: string;
+}
diff --git a/frameworks/TypeScript/oak/src/utils.ts b/frameworks/TypeScript/oak/src/utils.ts
diff --git a/frameworks/TypeScript/oak/tsconfig.json b/frameworks/TypeScript/oak/tsconfig.json

-Original file line number
+Diff line change
@@ @@ -0,0 +1,8 @@ @@
 +{
 +  "imports": {
 +    "oak": "jsr:@oak/[email protected]",
 +    "postgres": "https://deno.land/x/[email protected]/mod.js",
 +    "lru-cache": "jsr:@std/[email protected]/lru-cache",
 +    "html": "https://deno.land/x/[email protected]/mod.ts"
 +  }
 +}