wip

.github/workflows/release.yml

@@ -13,4 +13,4 @@ jobs:
         with:
           github-token: ${{ secrets.YDB_PLATFORM_BOT_TOKEN_REPO }}
           npm-token: ${{ secrets.NODE_AUTH_TOKEN }}
-          npm-dist-tag: beta
+          npm-dist-tag: rc

package.json

@@ -42,7 +42,7 @@
     "luxon": "^3.2.1",
     "reflect-metadata": "^0.1.13",
     "uuid": "^8.3.2",
-    "ydb-sdk-proto": "^1.1.0"
+    "ydb-sdk-proto": "^1.2.1"
   },
   "devDependencies": {
     "@commitlint/cli": "^17.6.1",

query/index.ts

@@ -0,0 +1 @@
+export * from './query-client';

query/query-client.ts

@@ -0,0 +1,68 @@
+import {Ydb} from "ydb-sdk-proto";
+import QueryService = Ydb.Query.V1.QueryService;
+import CreateSessionRequest = Ydb.Query.CreateSessionRequest;
+import CreateSessionResult = Ydb.Query.CreateSessionResult;
+import EventEmitter from "events";
+import {IClientSettings, SessionPool} from "./session-pool";
+import {Endpoint} from "../discovery";
+import {IAuthService} from "../credentials";
+import {Logger} from "../logging";
+import {ISslCredentials} from "../ssl-credentials";
+import {AuthenticatedService, ClientOptions, getOperationPayload, pessimizable} from "../utils";
+import {SessionCreator} from "../table";
+import {retryable} from "../retries";
+import {QuerySession} from "./query-session";
+
+export class QuerySessionCreator extends AuthenticatedService<QueryService> {
+    public endpoint: Endpoint;
+    private readonly logger: Logger;
+
+    constructor(endpoint: Endpoint, database: string, authService: IAuthService, logger: Logger, sslCredentials?: ISslCredentials, clientOptions?: ClientOptions) {
+        const host = endpoint.toString();
+        super(host, database, 'Ydb.Query.V1.QueryService', QueryService, authService, sslCredentials, clientOptions);
+        this.endpoint = endpoint;
+        this.logger = logger;
+    }
+
+    @retryable()
+    @pessimizable
+    async create(): Promise<QuerySession> {
+        const response = await this.api.createSession(CreateSessionRequest.create());
+        const payload = getOperationPayload(response);
+        const {sessionId} = CreateSessionResult.decode(payload);
+        return new QuerySession(this.api, this.endpoint, sessionId, this.logger, this.getResponseMetadata.bind(this));
+    }
+}
+
+class QuerySessionPool extends SessionPool<QuerySession> {
+    protected getSessionServiceCreator(
+        endpoint: Endpoint,
+        database: string,
+        authService: IAuthService,
+        logger: Logger,
+        sslCredentials: ISslCredentials | undefined,
+        clientOptions: ClientOptions | undefined): SessionCreator<QuerySession> {
+        return new QuerySessionCreator(endpoint, database, authService, logger, sslCredentials, clientOptions);
+    }
+}
+
+export class QueryClient extends EventEmitter {
+    private pool: QuerySessionPool;
+
+    constructor(settings: IClientSettings) {
+        super();
+        this.pool = new QuerySessionPool(settings);
+    }
+
+    public async withSession<T>(callback: (session: QuerySession) => Promise<T>, timeout: number = 0): Promise<T> {
+        return this.pool.withSession(callback, timeout);
+    }
+
+    public async withSessionRetry<T>(callback: (session: QuerySession) => Promise<T>, timeout: number = 0, maxRetries = 10): Promise<T> {
+        return this.pool.withSessionRetry(callback, timeout, maxRetries);
+    }
+
+    public async destroy() {
+        await this.pool.destroy();
+    }
+}

query/query-session.ts

@@ -0,0 +1,21 @@
+import {Session} from "../table";
+import {Endpoint} from "../discovery";
+import {Logger} from "../logging";
+import * as grpc from "@grpc/grpc-js";
+import {Ydb} from "ydb-sdk-proto";
+import QueryService = Ydb.Query.V1.QueryService;
+
+export class QuerySession extends Session<any> {
+
+    constructor(
+        api: QueryService,
+        endpoint: Endpoint,
+        sessionId: string,
+        logger: Logger,
+        getResponseMetadata: (request: object) => grpc.Metadata | undefined
+    ) {
+        super(api, endpoint, sessionId, logger, getResponseMetadata);
+    }
+
+    // TODO: Add methods
+}

src/__tests__/alter-table.test.ts

@@ -6,7 +6,7 @@ import {
     Column,
     TableDescription,
     TableIndex,
-} from '../table/table-client';
+} from '../table/table-session';
 import { Types } from '../types';
 import {OperationParams} from "../table/session";
 

src/__tests__/bulk-upsert.test.ts

@@ -7,7 +7,7 @@ import {
     Row,
     TABLE
 } from '../test-utils';
-import {TableSession} from '../table/table-client';
+import {TableSession} from '../table/table-session';
 import {Ydb} from 'ydb-sdk-proto';
 
 async function readTable(session: TableSession): Promise<Row[]> {

src/__tests__/bytestring-identity.test.ts

@@ -1,6 +1,6 @@
 import Driver from '../driver';
 import {destroyDriver, initDriver, TABLE} from '../test-utils';
-import {Column, TableSession, TableDescription} from '../table/table-client';
+import {Column, TableSession, TableDescription} from '../table/table-session';
 import {declareType, TypedData, Types} from '../types';
 import {withRetries} from '../retries';
 

src/__tests__/create-table.test.ts

@@ -1,6 +1,6 @@
 import Driver from '../driver';
 import {destroyDriver, initDriver} from '../test-utils';
-import {Column, DescribeTableSettings, TableDescription} from '../table/table-client';
+import {Column, DescribeTableSettings, TableDescription} from '../table/table-session';
 import {TypedValues, Types} from '../types';
 import Long from 'long';
 import {Ydb} from 'ydb-sdk-proto';

src/__tests__/read-table.test.ts

@@ -7,7 +7,7 @@ import {
     Row,
     TABLE
 } from '../test-utils';
-import {ReadTableSettings, TableSession} from '../table/table-client';
+import {ReadTableSettings, TableSession} from '../table/table-session';
 import {TypedValues, TypedData} from '../types';
 
 async function readTable(session: TableSession, settings: ReadTableSettings): Promise<TypedData[]> {

src/__tests__/scan-query.test.ts

@@ -7,7 +7,7 @@ import {
     initDriver,
     Row,
 } from '../test-utils';
-import {TableSession} from '../table/table-client';
+import {TableSession} from '../table/table-session';
 import {TypedData} from '../types';
 
 async function executeScanQuery(session: TableSession): Promise<TypedData[]> {

src/driver.ts

@@ -1,14 +1,14 @@
 import DiscoveryService from './discovery';
-import {TableClient} from './table/table-client';
-import SchemeService from './scheme';
+import {SchemeClient} from './scheme';
+// import {QueryClient} from './query/query-client';
 import {ENDPOINT_DISCOVERY_PERIOD} from './constants';
 import {IAuthService} from './credentials';
 import {TimeoutExpired} from './errors';
 import {getLogger, Logger} from './logging';
-import SchemeClient from './scheme';
 import {ClientOptions} from './utils';
 import {parseConnectionString} from './parse-connection-string';
 import {makeSslCredentials, ISslCredentials} from './ssl-credentials';
+import {TableClient} from "./table/table-client";
 
 export interface IPoolSettings {
     minLimit?: number;
@@ -38,7 +38,8 @@ export default class Driver {
     private discoveryService: DiscoveryService;
 
     public tableClient: TableClient;
-    public schemeClient: SchemeService;
+    public schemeClient: SchemeClient;
+    // public queryClient: QueryClient;
 
     constructor(settings: IDriverSettings) {
         this.logger = settings.logger || getLogger();
@@ -79,6 +80,15 @@ export default class Driver {
             discoveryService: this.discoveryService,
             logger: this.logger,
         });
+        // this.queryClient = new QueryClient({
+        //     database: this.database,
+        //     authService: this.authService,
+        //     sslCredentials: this.sslCredentials,
+        //     poolSettings: this.poolSettings,
+        //     clientOptions: this.clientOptions,
+        //     discoveryService: this.discoveryService,
+        //     logger: this.logger,
+        // });
         this.schemeClient = new SchemeClient({
             database: this.database,
             authService: this.authService,

src/index.ts

@@ -51,7 +51,7 @@ export {
     ExecutionPolicy,
     CachingPolicy,
 
-} from './table/table-client';
+} from './table/table-session';
 export {
     MakeDirectorySettings,
     RemoveDirectorySettings,

src/scheme.ts

@@ -70,7 +70,7 @@ interface ISchemeClientSettings {
     logger: Logger;
 }
 
-export default class SchemeClient extends EventEmitter {
+export class SchemeClient extends EventEmitter {
     private schemeServices: Map<Endpoint, SchemeService>;
 
     constructor(private settings: ISchemeClientSettings) {

src/table/index.ts

@@ -1,3 +1,4 @@
 export * from './session-pool';
 export * from './session';
 export * from './table-client';
+export * from './table-session';