Revert "Merge pull request #162 from supabase/feat/pg-meta-cache"

This reverts commit 82ecaab, reversing
changes made to 5cb1917.

Author: soedirgo

package-lock.json

@@ -57,7 +57,6 @@
   },
   "dependencies": {
     "@sinclair/typebox": "^0.25.1",
-    "lru-cache": "^7.18.1",
     "pg": "^8.7.1",
     "pg-format": "^1.0.4",
     "pgsql-parser": "^13.3.0",
@@ -71,7 +70,6 @@
     "@fastify/type-provider-typebox": "^2.4.0",
     "@types/crypto-js": "^4.1.1",
     "@types/jest": "^29.2.4",
-    "@types/lru-cache": "^7.10.10",
     "@types/node": "^16.18.3",
     "@types/pg": "^8.6.5",
     "@types/pg-format": "^1.0.1",

package.json

@@ -25,6 +25,5 @@ export const GENERATE_TYPES =
 export const GENERATE_TYPES_INCLUDED_SCHEMAS =
   GENERATE_TYPES && process.argv[5] === '--include-schemas' ? process.argv[6]?.split(',') ?? [] : []
 
-export const CONNECTIONS_CACHE_SIZE = Number(process.env.PG_META_CONNECTIONS_CACHE_SIZE || '100')
 export const DEFAULT_POOL_CONFIG = { max: 1, connectionTimeoutMillis: PG_CONN_TIMEOUT_SECS * 1000 }
 export const PG_META_REQ_HEADER = process.env.PG_META_REQ_HEADER || 'request-id'

src/server/constants.ts

@@ -1,5 +1,6 @@
 import { FastifyInstance } from 'fastify'
-import PgMetaCache from '../pgMetaCache.js'
+import { PostgresMeta } from '../../lib/index.js'
+import { DEFAULT_POOL_CONFIG } from '../constants.js'
 import { extractRequestForLogging } from '../utils.js'
 
 export default async (fastify: FastifyInstance) => {
@@ -21,14 +22,15 @@ export default async (fastify: FastifyInstance) => {
     const limit = request.query.limit
     const offset = request.query.offset
 
-    const pgMeta = PgMetaCache.get(connectionString)
+    const pgMeta = new PostgresMeta({ ...DEFAULT_POOL_CONFIG, connectionString })
     const { data, error } = await pgMeta.columns.list({
       includeSystemSchemas,
       includedSchemas,
       excludedSchemas,
       limit,
       offset,
     })
+    await pgMeta.end()
     if (error) {
       request.log.error({ error, request: extractRequestForLogging(request) })
       reply.code(500)
@@ -58,13 +60,14 @@ export default async (fastify: FastifyInstance) => {
       } = request
       const includeSystemSchemas = request.query.include_system_schemas === 'true'
 
-      const pgMeta = PgMetaCache.get(connectionString)
+      const pgMeta: PostgresMeta = new PostgresMeta({ ...DEFAULT_POOL_CONFIG, connectionString })
       const { data, error } = await pgMeta.columns.list({
         tableId: Number(tableId),
         includeSystemSchemas,
         limit: Number(limit),
         offset: Number(offset),
       })
+      await pgMeta.end()
       if (error) {
         request.log.error({ error, request: extractRequestForLogging(request) })
         reply.code(500)
@@ -79,8 +82,9 @@ export default async (fastify: FastifyInstance) => {
       } = request
       const ordinalPosition = ordinalPositionWithDot.slice(1)
 
-      const pgMeta = PgMetaCache.get(connectionString)
+      const pgMeta = new PostgresMeta({ ...DEFAULT_POOL_CONFIG, connectionString })
       const { data, error } = await pgMeta.columns.retrieve({ id: `${tableId}.${ordinalPosition}` })
+      await pgMeta.end()
       if (error) {
         request.log.error({ error, request: extractRequestForLogging(request) })
         reply.code(400)
@@ -100,8 +104,9 @@ export default async (fastify: FastifyInstance) => {
   }>('/', async (request, reply) => {
     const connectionString = request.headers.pg
 
-    const pgMeta = PgMetaCache.get(connectionString)
+    const pgMeta = new PostgresMeta({ ...DEFAULT_POOL_CONFIG, connectionString })
     const { data, error } = await pgMeta.columns.create(request.body as any)
+    await pgMeta.end()
     if (error) {
       request.log.error({ error, request: extractRequestForLogging(request) })
       reply.code(400)
@@ -121,8 +126,9 @@ export default async (fastify: FastifyInstance) => {
   }>('/:id(\\d+\\.\\d+)', async (request, reply) => {
     const connectionString = request.headers.pg
 
-    const pgMeta = PgMetaCache.get(connectionString)
+    const pgMeta = new PostgresMeta({ ...DEFAULT_POOL_CONFIG, connectionString })
     const { data, error } = await pgMeta.columns.update(request.params.id, request.body as any)
+    await pgMeta.end()
     if (error) {
       request.log.error({ error, request: extractRequestForLogging(request) })
       reply.code(400)
@@ -145,8 +151,9 @@ export default async (fastify: FastifyInstance) => {
     const connectionString = request.headers.pg
     const cascade = request.query.cascade === 'true'
 
-    const pgMeta = PgMetaCache.get(connectionString)
+    const pgMeta = new PostgresMeta({ ...DEFAULT_POOL_CONFIG, connectionString })
     const { data, error } = await pgMeta.columns.remove(request.params.id, { cascade })
+    await pgMeta.end()
     if (error) {
       request.log.error({ error, request: extractRequestForLogging(request) })
       reply.code(400)