Skip to content

Add connection pooling #109

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add connection pooling #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 24 additions & 4 deletions packages/js-client-grpc/src/qdrant-client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ export type QdrantClientParams = {
host?: string;
timeout?: number;
checkCompatibility?: boolean;
poolSize?: number;
};

export class QdrantClient {
Expand All @@ -19,8 +20,10 @@ export class QdrantClient {
private _port: number | null;
private _prefix: string;
private _host: string;
private _grcpClients: GrpcClients;
private _restUri: string;
private _grcpClients: GrpcClients[];
private _nextClientIndex: number = 0;
private _poolSize: number;

constructor({
url,
Expand All @@ -31,11 +34,16 @@ export class QdrantClient {
port = 6334,
timeout = 300_000,
checkCompatibility = true,
poolSize = 3,
}: QdrantClientParams = {}) {
this._https = https ?? typeof apiKey === 'string';
this._scheme = this._https ? 'https' : 'http';
this._prefix = prefix ?? '';

// Ensure pool is always >= 1.
poolSize = Math.max(poolSize, 1);
this._poolSize = poolSize;

if (this._prefix.length > 0 && !this._prefix.startsWith('/')) {
this._prefix = `/${this._prefix}`;
}
Expand Down Expand Up @@ -81,10 +89,15 @@ export class QdrantClient {
const address = this._port ? `${this._host}:${this._port}` : this._host;
this._restUri = `${this._scheme}://${address}${this._prefix}`;

this._grcpClients = createApis(this._restUri, {apiKey, timeout});
// Initialize multiple clients.
const clients: GrpcClients[] = [];
for (let i = 0; i < poolSize; i++) {
clients.push(createApis(this._restUri, {apiKey, timeout}));
}
this._grcpClients = clients;

if (checkCompatibility) {
this._grcpClients.service
this._grcpClients[0].service
.healthCheck({})
.then((response) => {
const serverVersion = response.version;
Expand All @@ -105,10 +118,17 @@ export class QdrantClient {
/**
* API getter
*
* To make use of connection pooling, this function must be called for each request individually.
*
* @param string Name of api
* @returns An instance of a namespaced API, generated from grpc services.
*/
api<T extends keyof GrpcClients>(name: T): GrpcClients[T] {
return this._grcpClients[name];
if (this._poolSize == 1) {
return this._grcpClients[0][name];
}

const index = this._nextClientIndex++;
return this._grcpClients[index % this._poolSize][name];
}
}
5 changes: 4 additions & 1 deletion packages/js-client-rest/src/qdrant-client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ export class QdrantClient {
port = 6333,
timeout = 300_000,
checkCompatibility = true,
maxConnections = 3,
...args
}: QdrantClientParams = {}) {
this._https = https ?? typeof apiKey === 'string';
Expand Down Expand Up @@ -112,7 +113,9 @@ export class QdrantClient {

const address = this._port ? `${this._host}:${this._port}` : this._host;
this._restUri = `${this._scheme}://${address}${this._prefix}`;
const connections = args.maxConnections;

const connections = maxConnections;

const restArgs: RestArgs = {headers, timeout, connections};

this._openApiClient = createApis(this._restUri, restArgs);
Expand Down