Fixup types and metrics #1144
Fixup types and metrics #1144
Conversation
packages/core/src/common/metrics.ts
Outdated
| @@ -57,6 +57,10 @@ export class MetricsService { | |||
| ponder_rpc_request_duration: prometheus.Histogram<"network" | "method">; | |||
| ponder_rpc_request_lag: prometheus.Histogram<"network" | "method">; | |||
|
|
|||
| ponder_pglite_pool_connections: prometheus.Gauge<"pool" | "kind"> = null!; | |||
There was a problem hiding this comment.
I'm pretty sure the PGlite driver does not maintain a connection pool in the traditional sense. It may have some kind of internal queue (which would be analogous to the node-postgres connection pool query queue) but it doesn't look like it's exposed.
For now, let's remove all pglite-specific metrics. We can still increment the ponder_postgres_query_total in the PGlite codepath, but the pool_connections and query_queue_size metrics will just remain at zero on the pglite path.
packages/core/src/database/index.ts
Outdated
| const poolConfig: PoolConfig = { | ||
| max: 20, | ||
| }; | ||
|
|
||
| // driver = { | ||
| // user: createSqliteDatabase(userFile), | ||
| // readonly: createReadonlySqliteDatabase(userFile), | ||
| // sync: createSqliteDatabase(syncFile), | ||
| // }; | ||
| driver = { | ||
| internal: createPool(poolConfig), | ||
| user: createPool(poolConfig), | ||
| readonly: createReadonlyPool(poolConfig), | ||
| sync: createPool(poolConfig), | ||
| }; |
There was a problem hiding this comment.
PGlite is single user/connection. And at the moment, it doesn't seem to support opening a database in readonly mode while another database is writing. So for now, we'll need to combine the internal, readonly and user drivers into one that we'll call user (those all touch the same tables). The sync can still be its own database and driver.
Here's what I'm thinking:
import { PGlite } from "pglite";
// ...
const userDir = path.join(args.databaseConfig.directory, "public");
const syncDir = path.join(args.databaseConfig.directory, "sync");
const userPglite = await PGlite.create(userDir)
const syncPglite = await PGlite.create(syncDir)
driver = {
user: userPglite,
sync: syncPglite,
}The driver object should contain the low-level drivers so that we can safely tear them down them in the kill function.
packages/core/src/database/index.ts
Outdated
|
|
||
| qb = { | ||
| internal: new HeadlessKysely({ | ||
| name: "internal", | ||
| common: args.common, | ||
| dialect: new SqliteDialect({ database: driver.user }), | ||
| dialect: new PostgresDialect({ pool: driver.internal }), |
There was a problem hiding this comment.
Now, when we create the query builder (Kysely) objects, we can use the kysely-pglite driver (https://github.com/dnlsandiego/kysely-pglite/tree/main).
We should use the user driver for the internal, user, and readonly qb objects. I think this qb object should look identical to the one below for postgres except for the dialect option.
No description provided.