@milaboratories/pl-middle-layer 1.27.8 → 1.27.9

package/dist/pool/driver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"driver.d.ts","sourceRoot":"","sources":["../../src/pool/driver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAEjE,OAAO,KAAK,EAAE,kBAAkB,EAAgB,MAAM,yBAAyB,CAAC;AAEhF,OAAO,KAAK,EAAE,aAAa,EAA2B,MAAM,4BAA4B,CAAC;AACzF,OAAO,KAAK,EACV,yBAAyB,EACzB,0BAA0B,EAC1B,kBAAkB,EAClB,mBAAmB,EAEnB,gBAAgB,EAChB,WAAW,EACX,YAAY,EACZ,SAAS,EACT,gBAAgB,EAChB,YAAY,EACZ,WAAW,EACX,YAAY,EACZ,UAAU,EACV,mBAAmB,EACnB,oBAAoB,EACpB,YAAY,IAAI,eAAe,EAC/B,OAAO,EACP,SAAS,EAET,SAAS,EAIT,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAS9C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAoM3D,qBAAa,YAAa,YAAW,eAAe;IAQhD,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,MAAM;IARzB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAyD;IACjF,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAwE;IAChG,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAA+B;IAChE,0FAA0F;IAC1F,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAA8B;gBAG9C,UAAU,EAAE,cAAc,EAC1B,MAAM,EAAE,QAAQ;IAoE5B,YAAY,CACjB,GAAG,EAAE,SAAS,CAAC,kBAAkB,GAAG,aAAa,CAAC,EAClD,GAAG,EAAE,aAAa,GACjB,YAAY;IAaR,YAAY,CACjB,GAAG,EAAE,SAAS,CAAC,OAAO,CAAC,kBAAkB,GAAG,aAAa,CAAC,CAAC,EAC3D,GAAG,EAAE,aAAa,GACjB,YAAY;IAmBF,WAAW,CACtB,MAAM,EAAE,YAAY,EACpB,OAAO,EAAE,kBAAkB,GAC1B,OAAO,CAAC,mBAAmB,CAAC;IA6BlB,aAAa,CAAC,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC;IAM9E,WAAW,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAM9D,kBAAkB,CAC7B,MAAM,EAAE,YAAY,EACpB,OAAO,EAAE,yBAAyB,CAAC,SAAS,CAAC,GAC5C,OAAO,CAAC,0BAA0B,CAAC;IAiCzB,eAAe,CAC1B,MAAM,EAAE,YAAY,EACpB,OAAO,EAAE,mBAAmB,GAC3B,OAAO,CAAC,oBAAoB,CAAC;IAkBnB,QAAQ,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,WAAW,CAAC;IAKpD,OAAO,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAK1D,OAAO,CAClB,MAAM,EAAE,YAAY,EACpB,aAAa,EAAE,MAAM,EAAE,EACvB,KAAK,CAAC,EAAE,UAAU,GACjB,OAAO,CAAC,YAAY,EAAE,CAAC;CAM3B"}
+{"version":3,"file":"driver.d.ts","sourceRoot":"","sources":["../../src/pool/driver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAEjE,OAAO,KAAK,EAAE,kBAAkB,EAAgB,MAAM,yBAAyB,CAAC;AAEhF,OAAO,KAAK,EAAE,aAAa,EAA2B,MAAM,4BAA4B,CAAC;AACzF,OAAO,KAAK,EACV,yBAAyB,EACzB,0BAA0B,EAC1B,kBAAkB,EAClB,mBAAmB,EAEnB,gBAAgB,EAChB,WAAW,EACX,YAAY,EACZ,SAAS,EACT,gBAAgB,EAChB,YAAY,EACZ,WAAW,EACX,YAAY,EACZ,UAAU,EACV,mBAAmB,EACnB,oBAAoB,EACpB,YAAY,IAAI,eAAe,EAC/B,OAAO,EACP,SAAS,EAET,SAAS,EAIT,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAS9C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AA2M3D,qBAAa,YAAa,YAAW,eAAe;IAQhD,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,MAAM;IARzB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAyD;IACjF,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAwE;IAChG,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAA+B;IAChE,0FAA0F;IAC1F,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAA8B;gBAG9C,UAAU,EAAE,cAAc,EAC1B,MAAM,EAAE,QAAQ;IAqE5B,YAAY,CACjB,GAAG,EAAE,SAAS,CAAC,kBAAkB,GAAG,aAAa,CAAC,EAClD,GAAG,EAAE,aAAa,GACjB,YAAY;IAaR,YAAY,CACjB,GAAG,EAAE,SAAS,CAAC,OAAO,CAAC,kBAAkB,GAAG,aAAa,CAAC,CAAC,EAC3D,GAAG,EAAE,aAAa,GACjB,YAAY;IAmBF,WAAW,CACtB,MAAM,EAAE,YAAY,EACpB,OAAO,EAAE,kBAAkB,GAC1B,OAAO,CAAC,mBAAmB,CAAC;IA+BlB,aAAa,CAAC,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC;IAQ9E,WAAW,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAQ9D,kBAAkB,CAC7B,MAAM,EAAE,YAAY,EACpB,OAAO,EAAE,yBAAyB,CAAC,SAAS,CAAC,GAC5C,OAAO,CAAC,0BAA0B,CAAC;IAiCzB,eAAe,CAC1B,MAAM,EAAE,YAAY,EACpB,OAAO,EAAE,mBAAmB,GAC3B,OAAO,CAAC,oBAAoB,CAAC;IAkBnB,QAAQ,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,WAAW,CAAC;IAKpD,OAAO,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAK1D,OAAO,CAClB,MAAM,EAAE,YAAY,EACpB,aAAa,EAAE,MAAM,EAAE,EACvB,KAAK,CAAC,EAAE,UAAU,GACjB,OAAO,CAAC,YAAY,EAAE,CAAC;CAM3B"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@milaboratories/pl-middle-layer",
-  "version": "1.27.8",
+  "version": "1.27.9",
   "description": "Pl Middle Layer",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",
@@ -35,15 +35,15 @@
     "@milaboratories/pl-drivers": "^1.5.16",
     "@platforma-sdk/block-tools": "^2.5.9",
     "@milaboratories/pl-client": "^2.7.4",
-    "@milaboratories/pl-model-middle-layer": "^1.7.2",
     "@milaboratories/pl-model-common": "^1.10.5",
-    "@milaboratories/pl-model-backend": "^1.0.1",
+    "@milaboratories/pl-model-middle-layer": "^1.7.2",
     "@milaboratories/pl-tree": "^1.4.23",
+    "@milaboratories/pl-model-backend": "^1.0.1",
     "@platforma-sdk/model": "^1.22.18",
-    "@milaboratories/pl-config": "^1.4.0",
+    "@milaboratories/ts-helpers": "^1.1.3",
     "@milaboratories/pl-deployments": "^1.1.3",
-    "@platforma-sdk/workflow-tengo": "2.9.10",
-    "@milaboratories/ts-helpers": "^1.1.3"
+    "@milaboratories/pl-config": "^1.4.0",
+    "@platforma-sdk/workflow-tengo": "2.9.10"
   },
   "devDependencies": {
     "semver": "^7.6.3",
@@ -55,8 +55,8 @@
     "jest": "^29.7.0",
     "@jest/globals": "^29.7.0",
     "ts-jest": "^29.2.5",
-    "@milaboratories/platforma-build-configs": "1.0.2",
-    "@milaboratories/eslint-config": "^1.0.1"
+    "@milaboratories/eslint-config": "^1.0.1",
+    "@milaboratories/platforma-build-configs": "1.0.2"
   },
   "scripts": {
     "type-check": "tsc --noEmit --composite false",

package/src/pool/driver.ts

@@ -81,6 +81,7 @@ function migrateFilters(filters: PTableRecordFilter[]): PTableRecordSingleValueF
 const bigintReplacer = (_: string, v: unknown) => (typeof v === 'bigint' ? v.toString() : v);
 
 class PFrameHolder implements PFrameInternal.PFrameDataSource, Disposable {
+  public readonly rustPFrame: PFrameInternal.PFrameV2;
   public readonly specPFrame: PFrameInternal.PFrameV2;
   private readonly blobIdToResource = new Map<string, ResourceInfo>();
   private readonly blobHandleComputables = new Map<
@@ -131,35 +132,43 @@ class PFrameHolder implements PFrameInternal.PFrameDataSource, Disposable {
       )).values(),
     ];
 
-    const createSpecPFrame = (): PFrameInternal.PFrameV2 => {
+    this.rustPFrame = ((): PFrameInternal.PFrameV2 => {
       try {
-        if (getDebugFlags().usePFrameRs) {
-          const pFrame = new PFrameRs(getDebugFlags().logPFrameRequests ? logFunc : undefined);
-          for (const column of distinct_columns) {
+        const pFrame = new PFrameRs(getDebugFlags().logPFrameRequests ? logFunc : undefined);
+        pFrame.setDataSource(this);
+        for (const column of distinct_columns) {
+          pFrame.addColumnSpec(column.id, column.spec);
+          pFrame.setColumnData(column.id, column.data);
+        }
+        return pFrame;
+      } catch (err: unknown) {
+        throw new Error(
+          `Rust PFrame creation failed, columns: ${JSON.stringify(distinct_columns)}, error: ${err as Error}`,
+        );
+      }
+    })();
+
+    this.specPFrame = ((): PFrameInternal.PFrameV2 => {
+      try {
+        const pFrame = getDebugFlags().logPFrameRequests ? new PFrame(logFunc) : new PFrame();
+        for (const column of distinct_columns) {
+          try {
             pFrame.addColumnSpec(column.id, column.spec);
+          } catch (err: unknown) {
+            throw new Error(
+              `Adding column ${column.id} to PFrame failed: ${err as Error}; Spec: ${JSON.stringify(column.spec)}.`,
+            );
           }
-          return pFrame;
-        } else {
-          const pFrame = getDebugFlags().logPFrameRequests ? new PFrame(logFunc) : new PFrame();
-          for (const column of distinct_columns) {
-            try {
-              pFrame.addColumnSpec(column.id, column.spec);
-            } catch (err: unknown) {
-              throw new Error(
-                `Adding column ${column.id} to PFrame failed: ${err as Error}; Spec: ${JSON.stringify(column.spec)}.`,
-              );
-            }
-          }
-          return pFrame;
         }
+        return pFrame;
       } catch (err: unknown) {
         throw new Error(
           `Spec PFrame creation failed, columns: ${JSON.stringify(distinct_columns)}, error: ${err as Error}`,
         );
       }
-    };
+    })();
 
-    const createDataPFrame = (): PFrameInternal.PFrameV2 => {
+    this.createDataPFrame = (): PFrameInternal.PFrameV2 => {
       try {
         const pFrame = getDebugFlags().logPFrameRequests ? new PFrame(logFunc) : new PFrame();
         pFrame.setDataSource(this);
@@ -180,9 +189,6 @@ class PFrameHolder implements PFrameInternal.PFrameDataSource, Disposable {
         );
       }
     };
-
-    this.specPFrame = createSpecPFrame();
-    this.createDataPFrame = createDataPFrame;
   }
 
   private getOrCreateComputableForBlob(blobId: string) {
@@ -224,6 +230,7 @@ class PFrameHolder implements PFrameInternal.PFrameDataSource, Disposable {
 
   [Symbol.dispose](): void {
     for (const computable of this.blobHandleComputables.values()) computable.resetState();
+    this.rustPFrame.dispose();
     this.specPFrame.dispose();
   }
 }
@@ -249,8 +256,9 @@ export class PFrameDriver implements SdkPFrameDriver {
       fetchMethod: async (key) => await fsp.readFile(key),
       sizeCalculation: (v) => v.length,
     });
-    const concurrencyLimiter = new ConcurrencyLimitingExecutor(1);
     this.blobContentCache = blobContentCache;
+
+    const concurrencyLimiter = new ConcurrencyLimitingExecutor(1);
     this.concurrencyLimiter = concurrencyLimiter;
 
     this.pFrames = new (class extends RefCountResourcePool<InternalPFrameData, PFrameHolder> {
@@ -366,9 +374,11 @@ export class PFrameDriver implements SdkPFrameDriver {
             }]
           : [],
     };
-    const responce = await this.concurrencyLimiter.run(
-      async () => await this.pFrames.getByKey(handle).specPFrame.findColumns(iRequest),
-    );
+    const responce = getDebugFlags().usePFrameRs
+      ? await this.pFrames.getByKey(handle).rustPFrame.findColumns(iRequest)
+      : await this.concurrencyLimiter.run(
+        async () => await this.pFrames.getByKey(handle).specPFrame.findColumns(iRequest),
+      );
     return {
       hits: responce.hits
         .filter((h) => // only exactly matching columns
@@ -381,15 +391,19 @@ export class PFrameDriver implements SdkPFrameDriver {
   }
 
   public async getColumnSpec(handle: PFrameHandle, columnId: PObjectId): Promise<PColumnSpec> {
-    return await this.concurrencyLimiter.run(
-      async () => await this.pFrames.getByKey(handle).specPFrame.getColumnSpec(columnId),
-    );
+    return getDebugFlags().usePFrameRs
+      ? await this.pFrames.getByKey(handle).rustPFrame.getColumnSpec(columnId)
+      : await this.concurrencyLimiter.run(
+        async () => await this.pFrames.getByKey(handle).specPFrame.getColumnSpec(columnId),
+      );
   }
 
   public async listColumns(handle: PFrameHandle): Promise<PColumnIdAndSpec[]> {
-    return await this.concurrencyLimiter.run(
-      async () => await this.pFrames.getByKey(handle).specPFrame.listColumns(),
-    );
+    return getDebugFlags().usePFrameRs
+      ? await this.pFrames.getByKey(handle).rustPFrame.listColumns()
+      : await this.concurrencyLimiter.run(
+        async () => await this.pFrames.getByKey(handle).specPFrame.listColumns(),
+      );
   }
 
   public async calculateTableData(