26506641809

Committed 27 May 2026 10:49AM UTC coverage: 75.237% (+0.05%) from 75.184%

Build # 26506641809

Build Type

Pull #1125

github

Committed by

web-flow

Commit Message

Merge 6a9a1da28 into 4778d471d

Pull Request Pull Request #1125: fix: rebalance pool in place

Coverage Stats

4257 of 6229 branches covered (68.34%)

Branch coverage included in aggregate %.

17 of 18 new or added lines in 2 files covered. (94.44%)

167 existing lines in 4 files now uncovered.

8437 of 10643 relevant lines covered (79.27%)

364.66 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

59.68

/src/http/plugins/vector.ts

import { getTenantConfig, multitenantKnex } from '@internal/database'
import { deriveVectorDatabaseUrl } from '@internal/database/vector-store-url'
import { ERRORS } from '@internal/errors'
import {
  BucketScopedSingleShard,
  KnexShardStoreFactory,
  ShardCatalog,
  Sharder,
  SingleShard,
} from '@internal/sharding'
import {
  createS3VectorClient,
  KnexVectorMetadataDB,
  PgVectorStore,
  S3Vector,
  VectorStore,
  VectorStoreManager,
} from '@storage/protocols/vector'
import { FastifyInstance } from 'fastify'
import fastifyPlugin from 'fastify-plugin'
import Knex from 'knex'
import { getConfig } from '../../config'

declare module 'fastify' {
  interface FastifyRequest {
    s3Vector: VectorStoreManager
  }
}

export const s3vector = fastifyPlugin(async function (fastify: FastifyInstance) {
  const config = getConfig()
  const {
    vectorBucketProvider,
    vectorDatabaseURL,
    vectorS3Buckets,
    isMultitenant,
    databaseApplicationName,
  } = config

  // S3 mode: build a singleton client+adapter at boot.
  let s3Adapter: S3Vector | undefined
  if (vectorBucketProvider === 's3' && vectorS3Buckets.length > 0) {
    s3Adapter = new S3Vector(createS3VectorClient())
  }

  // pgvector + single-tenant: VECTOR_DATABASE_URL is the maintenance URL the
  // migration runner used to CREATE DATABASE; the runtime pool targets the
  // derived `storage_vectors` database on the same server.
  let stPgVectorAdapter: PgVectorStore | undefined
  if (vectorBucketProvider === 'pgvector' && !isMultitenant && vectorDatabaseURL) {
    const vectorKnex = Knex({
      client: 'pg',
      connection: {
        connectionString: deriveVectorDatabaseUrl(vectorDatabaseURL),
        application_name: databaseApplicationName,
      },
      pool: { min: 0, max: 10 },
    })
    stPgVectorAdapter = new PgVectorStore(vectorKnex)
    fastify.addHook('onClose', async () => {
      await vectorKnex.destroy()
    })
  }

  const featureEnabled =
    (vectorBucketProvider === 's3' && Boolean(s3Adapter)) ||
    (vectorBucketProvider === 'pgvector' && (isMultitenant || Boolean(stPgVectorAdapter)))

  fastify.addHook('preHandler', async (req) => {
    if (!featureEnabled) {
      throw ERRORS.FeatureNotEnabled('vector', 'Vector service not configured')
    }

    const { vectorMaxBucketsCount, vectorMaxIndexesCount } = config

    let maxBucketCount = vectorMaxBucketsCount
    let maxIndexCount = vectorMaxIndexesCount

    if (isMultitenant) {
      const { features } = await getTenantConfig(req.tenantId)
      maxBucketCount = features?.vectorBuckets?.maxBuckets || vectorMaxBucketsCount
      maxIndexCount = features?.vectorBuckets?.maxIndexes || vectorMaxIndexesCount
    }

    const db = req.db.pool.acquire()
    const store = new KnexVectorMetadataDB(db)

    // Pick the adapter. In multi-tenant pgvector mode the adapter binds to the
    // request's own tenant pool (vectors live in the tenant DB); ST pgvector
    // uses the singleton; s3 uses the singleton S3 client.
    let adapter: VectorStore
    if (vectorBucketProvider === 'pgvector') {
      adapter = isMultitenant ? new PgVectorStore(db) : stPgVectorAdapter!
    } else {
      adapter = s3Adapter!
    }

    let shard: Sharder
    if (vectorBucketProvider === 'pgvector') {
      shard = new BucketScopedSingleShard({
        keyPrefix: 'pgvector__',
        capacity: Number.MAX_SAFE_INTEGER,
      })
    } else if (isMultitenant) {
      shard = new ShardCatalog(new KnexShardStoreFactory(multitenantKnex))
    } else {
      shard = new SingleShard({
        shardKey: vectorS3Buckets[0],
        capacity: 10000,
      })
    }

    req.s3Vector = new VectorStoreManager(adapter, store, shard, {
      tenantId: req.tenantId,
      maxBucketCount,
      maxIndexCount,
    })
  })
})

1	import { getTenantConfig, multitenantKnex } from '@internal/database'
2	import { deriveVectorDatabaseUrl } from '@internal/database/vector-store-url'
3	import { ERRORS } from '@internal/errors'
4	import {
5	BucketScopedSingleShard,
6	KnexShardStoreFactory,
7	ShardCatalog,
8	Sharder,
9	SingleShard,
10	} from '@internal/sharding'
11	import {
12	createS3VectorClient,
13	KnexVectorMetadataDB,
14	PgVectorStore,
15	S3Vector,
16	VectorStore,
17	VectorStoreManager,
18	} from '@storage/protocols/vector'
19	import { FastifyInstance } from 'fastify'
20	import fastifyPlugin from 'fastify-plugin'
21	import Knex from 'knex'
22	import { getConfig } from '../../config'
23
24	declare module 'fastify' {
25	interface FastifyRequest {
26	s3Vector: VectorStoreManager
27	}
28	}
29
30	export const s3vector = fastifyPlugin(async function (fastify: FastifyInstance) {	29✔
31	const config = getConfig()	270✔
32	const {
33	vectorBucketProvider,
34	vectorDatabaseURL,
35	vectorS3Buckets,
36	isMultitenant,
37	databaseApplicationName,
38	} = config	270✔
39
40	// S3 mode: build a singleton client+adapter at boot.
41	let s3Adapter: S3Vector \| undefined
42	if (vectorBucketProvider === 's3' && vectorS3Buckets.length > 0) {	270✔
43	s3Adapter = new S3Vector(createS3VectorClient())	269✔
44	}
45
46	// pgvector + single-tenant: VECTOR_DATABASE_URL is the maintenance URL the
47	// migration runner used to CREATE DATABASE; the runtime pool targets the
48	// derived `storage_vectors` database on the same server.
49	let stPgVectorAdapter: PgVectorStore \| undefined
50	if (vectorBucketProvider === 'pgvector' && !isMultitenant && vectorDatabaseURL) {	270!
UNCOV 51	const vectorKnex = Knex({	×
52	client: 'pg',
53	connection: {
54	connectionString: deriveVectorDatabaseUrl(vectorDatabaseURL),
55	application_name: databaseApplicationName,
56	},
57	pool: { min: 0, max: 10 },
58	})
UNCOV 59	stPgVectorAdapter = new PgVectorStore(vectorKnex)	×
UNCOV 60	fastify.addHook('onClose', async () => {	×
UNCOV 61	await vectorKnex.destroy()	×
62	})
63	}
64
65	const featureEnabled =
66	(vectorBucketProvider === 's3' && Boolean(s3Adapter)) \|\|	270!
67	(vectorBucketProvider === 'pgvector' && (isMultitenant \|\| Boolean(stPgVectorAdapter)))
68
69	fastify.addHook('preHandler', async (req) => {	270✔
70	if (!featureEnabled) {	118✔
71	throw ERRORS.FeatureNotEnabled('vector', 'Vector service not configured')	1✔
72	}
73
74	const { vectorMaxBucketsCount, vectorMaxIndexesCount } = config	117✔
75
76	let maxBucketCount = vectorMaxBucketsCount	117✔
77	let maxIndexCount = vectorMaxIndexesCount	117✔
78
79	if (isMultitenant) {	117!
UNCOV 80	const { features } = await getTenantConfig(req.tenantId)	×
UNCOV 81	maxBucketCount = features?.vectorBuckets?.maxBuckets \|\| vectorMaxBucketsCount	×
UNCOV 82	maxIndexCount = features?.vectorBuckets?.maxIndexes \|\| vectorMaxIndexesCount	×
83	}
84
85	const db = req.db.pool.acquire()	117✔
86	const store = new KnexVectorMetadataDB(db)	117✔
87
88	// Pick the adapter. In multi-tenant pgvector mode the adapter binds to the
89	// request's own tenant pool (vectors live in the tenant DB); ST pgvector
90	// uses the singleton; s3 uses the singleton S3 client.
91	let adapter: VectorStore
92	if (vectorBucketProvider === 'pgvector') {	117!
UNCOV 93	adapter = isMultitenant ? new PgVectorStore(db) : stPgVectorAdapter!	×
94	} else {
95	adapter = s3Adapter!	117✔
96	}
97
98	let shard: Sharder
99	if (vectorBucketProvider === 'pgvector') {	117!
UNCOV 100	shard = new BucketScopedSingleShard({	×
101	keyPrefix: 'pgvector__',
102	capacity: Number.MAX_SAFE_INTEGER,
103	})
104	} else if (isMultitenant) {	117!
UNCOV 105	shard = new ShardCatalog(new KnexShardStoreFactory(multitenantKnex))	×
106	} else {
107	shard = new SingleShard({	117✔
108	shardKey: vectorS3Buckets[0],
109	capacity: 10000,
110	})
111	}
112
113	req.s3Vector = new VectorStoreManager(adapter, store, shard, {	117✔
114	tenantId: req.tenantId,
115	maxBucketCount,
116	maxIndexCount,
117	})
118	})
119	})

supabase / storage / 26506641809

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous