@milaboratories/pl-middle-layer 1.32.5 → 1.32.6

package/dist/pool/driver.d.ts

@@ -23,8 +23,6 @@ export declare class PFrameDriver implements InternalPFrameDriver {
     private readonly pFrames;
     private readonly pTables;
     private readonly blobContentCache;
-    /** Limits concurrent requests to PFrame API to prevent deadlock with Node's IO threads */
-    private readonly concurrencyLimiter;
     constructor(blobDriver: DownloadDriver, logger: MiLogger);
     createPFrame(def: PFrameDef<PlTreeNodeAccessor | PColumnValues | DataInfo<PlTreeNodeAccessor>>, ctx: ComputableCtx): PFrameHandle;
     createPTable(def: PTableDef<PColumn<PlTreeNodeAccessor | PColumnValues | DataInfo<PlTreeNodeAccessor>>>, ctx: ComputableCtx, signal?: AbortSignal): PTableHandle;

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

@@ -1 +1 @@
-{"version":3,"file":"driver.d.ts","sourceRoot":"","sources":["../../src/pool/driver.ts"],"names":[],"mappings":"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"}
+{"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,EACb,QAAQ,EACT,MAAM,sBAAsB,CAAC;AAW9B,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AA2J3D;;;GAGG;AACH,MAAM,WAAW,oBAAqB,SAAQ,eAAe;IAC3D,0BAA0B;IAC1B,YAAY,CACV,GAAG,EAAE,SAAS,CAAC,kBAAkB,GAAG,aAAa,GAAG,QAAQ,CAAC,kBAAkB,CAAC,CAAC,EACjF,GAAG,EAAE,aAAa,GACjB,YAAY,CAAC;IAEhB,0BAA0B;IAC1B,YAAY,CACV,GAAG,EAAE,SAAS,CAAC,OAAO,CAAC,kBAAkB,GAAG,aAAa,GAAG,QAAQ,CAAC,kBAAkB,CAAC,CAAC,CAAC,EAC1F,GAAG,EAAE,aAAa,EAClB,MAAM,CAAC,EAAE,WAAW,GACnB,YAAY,CAAC;IAEhB,mFAAmF;IACnF,kBAAkB,CAChB,MAAM,EAAE,YAAY,EACpB,OAAO,EAAE,yBAAyB,CAAC,SAAS,CAAC,EAC7C,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,0BAA0B,CAAC,CAAC;IAEvC,yFAAyF;IACzF,eAAe,CACb,MAAM,EAAE,YAAY,EACpB,OAAO,EAAE,mBAAmB,EAC5B,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,oBAAoB,CAAC,CAAC;CAClC;AAED,qBAAa,YAAa,YAAW,oBAAoB;IAMrD,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,MAAM;IANzB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAyD;IACjF,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAoD;IAC5E,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAA+B;gBAG7C,UAAU,EAAE,cAAc,EAC1B,MAAM,EAAE,QAAQ;IAuE5B,YAAY,CACjB,GAAG,EAAE,SAAS,CAAC,kBAAkB,GAAG,aAAa,GAAG,QAAQ,CAAC,kBAAkB,CAAC,CAAC,EACjF,GAAG,EAAE,aAAa,GACjB,YAAY;IAiBR,YAAY,CACjB,GAAG,EAAE,SAAS,CAAC,OAAO,CAAC,kBAAkB,GAAG,aAAa,GAAG,QAAQ,CAAC,kBAAkB,CAAC,CAAC,CAAC,EAC1F,GAAG,EAAE,aAAa,EAClB,MAAM,CAAC,EAAE,WAAW,GACnB,YAAY;IAmBF,WAAW,CACtB,MAAM,EAAE,YAAY,EACpB,OAAO,EAAE,kBAAkB,GAC1B,OAAO,CAAC,mBAAmB,CAAC;IA2BlB,aAAa,CAAC,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC;IAI9E,WAAW,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAI9D,kBAAkB,CAC7B,MAAM,EAAE,YAAY,EACpB,OAAO,EAAE,yBAAyB,CAAC,SAAS,CAAC,EAC7C,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,0BAA0B,CAAC;IA8BzB,eAAe,CAC1B,MAAM,EAAE,YAAY,EACpB,OAAO,EAAE,mBAAmB,EAC5B,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,oBAAoB,CAAC;IAgBnB,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;CAI3B"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@milaboratories/pl-middle-layer",
-  "version": "1.32.5",
+  "version": "1.32.6",
   "description": "Pl Middle Layer",
   "engines": {
     "node": ">=20.16.0"
@@ -22,8 +22,7 @@
   "keywords": [],
   "license": "UNLICENSED",
   "dependencies": {
-    "@milaboratories/pframes-node": "2.1.20",
-    "@milaboratories/pframes-rs-node": "1.0.24",
+    "@milaboratories/pframes-rs-node": "1.0.26",
     "canonicalize": "~2.1.0",
     "denque": "^2.1.0",
     "lru-cache": "^11.1.0",
@@ -34,20 +33,20 @@
     "zod": "~3.23.8",
     "@milaboratories/pl-http": "^1.1.2",
     "@milaboratories/computable": "^2.4.2",
-    "@milaboratories/resolve-helper": "^1.1.0",
-    "@platforma-sdk/block-tools": "^2.5.32",
-    "@milaboratories/pl-drivers": "^1.5.38",
-    "@milaboratories/pl-model-common": "^1.13.1",
     "@milaboratories/pl-client": "^2.7.14",
-    "@milaboratories/pl-model-middle-layer": "^1.7.19",
+    "@milaboratories/resolve-helper": "^1.1.0",
+    "@milaboratories/pl-drivers": "^1.5.39",
+    "@platforma-sdk/block-tools": "^2.5.33",
+    "@milaboratories/pl-model-common": "^1.13.2",
     "@milaboratories/pl-model-backend": "^1.0.3",
-    "@platforma-sdk/model": "^1.27.6",
+    "@milaboratories/pl-model-middle-layer": "^1.7.20",
+    "@platforma-sdk/model": "^1.27.8",
     "@milaboratories/pl-tree": "^1.5.2",
+    "@platforma-sdk/workflow-tengo": "3.2.1",
     "@milaboratories/ts-helpers": "^1.1.5",
+    "@milaboratories/pl-errors": "^1.0.3",
     "@milaboratories/pl-config": "^1.4.5",
-    "@platforma-sdk/workflow-tengo": "3.2.1",
-    "@milaboratories/pl-deployments": "^1.7.1",
-    "@milaboratories/pl-errors": "^1.0.3"
+    "@milaboratories/pl-deployments": "^1.7.1"
   },
   "devDependencies": {
     "semver": "^7.6.3",

package/src/debug/index.ts

@@ -1,6 +1,5 @@
 export type MlDebugFlags = {
   logPFrameRequests: boolean;
-  usePFrameRs: boolean;
   logTreeStats?: 'cumulative' | 'per-request';
   dumpInitialTreeState: boolean;
 };
@@ -10,7 +9,6 @@ export function getDebugFlags() {
   if (flags) return flags;
   flags = {
     logPFrameRequests: process.env.MI_LOG_PFRAMES !== undefined,
-    usePFrameRs: process.env.MI_USE_PFRAMES_RS !== undefined,
     dumpInitialTreeState: process.env.MI_DUMP_INITIAL_TREE_STATE !== undefined,
   };
   if (process.env.MI_LOG_TREE_STAT)

package/src/pool/driver.ts

@@ -44,11 +44,9 @@ import { createHash } from 'node:crypto';
 import type { MiLogger } from '@milaboratories/ts-helpers';
 import { assertNever } from '@milaboratories/ts-helpers';
 import canonicalize from 'canonicalize';
-import { PFrame } from '@milaboratories/pframes-node';
 import { PFrame as PFrameRs } from '@milaboratories/pframes-rs-node';
 import * as fsp from 'node:fs/promises';
 import { LRUCache } from 'lru-cache';
-import { ConcurrencyLimitingExecutor } from '@milaboratories/ts-helpers';
 import { getDebugFlags } from '../debug';
 
 function blobKey(res: ResourceInfo): string {
@@ -82,48 +80,16 @@ function migrateFilters(filters: PTableRecordFilter[]): PTableRecordFilter[] {
   return filtersV2;
 }
 
-function pframesDispatch<T>(params: {
-  cppCallback: () => Promise<T>;
-  rustCallback: () => Promise<T>;
-  logger: MiLogger;
-  filters?: PTableRecordFilter[];
-  signal?: AbortSignal;
-}): Promise<T> {
-  if (getDebugFlags().usePFrameRs) return params.rustCallback();
-
-  return params.rustCallback().catch((error: unknown) => {
-    if (params.signal?.aborted === false) {
-      if (error instanceof Error) {
-        params.logger.warn(`PFrames Rust failed, error: ${error.message}`);
-      }
-      return params.cppCallback();
-    } else {
-      throw error;
-    }
-  });
-}
-
 const bigintReplacer = (_: string, v: unknown) => (typeof v === 'bigint' ? v.toString() : v);
 
 class PFrameHolder implements PFrameInternal.PFrameDataSource, Disposable {
-  public readonly rustPFrame: PFrameInternal.PFrameV3;
+  public readonly rustPFrame: PFrameInternal.PFrameV4;
   private readonly blobIdToResource = new Map<string, ResourceInfo>();
   private readonly blobHandleComputables = new Map<
     string,
     ComputableStableDefined<LocalBlobHandleAndSize>
   >();
 
-  private readonly createDataPFrame: () => PFrameInternal.PFrameV3;
-  public get disposableDataPFrame() {
-    const dataPFrame = this.createDataPFrame();
-    return {
-      dataPFrame,
-      [Symbol.dispose]: () => {
-        dataPFrame.dispose();
-      },
-    };
-  }
-
   constructor(
     private readonly blobDriver: DownloadDriver,
     private readonly logger: MiLogger,
@@ -156,43 +122,19 @@ class PFrameHolder implements PFrameInternal.PFrameDataSource, Disposable {
       )).values(),
     ];
 
-    this.rustPFrame = ((): PFrameInternal.PFrameV3 => {
-      try {
-        const pFrame = new PFrameRs(getDebugFlags().logPFrameRequests ? logFunc : undefined);
-        pFrame.setDataSource(this);
-        for (const column of distinctСolumns) {
-          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Сolumns)}, error: ${err as Error}`,
-        );
-      }
-    })();
-
-    this.createDataPFrame = (): PFrameInternal.PFrameV3 => {
-      try {
-        const pFrame = getDebugFlags().logPFrameRequests ? new PFrame(logFunc) : new PFrame();
-        pFrame.setDataSource(this);
-        for (const column of distinctСolumns) {
-          try {
-            pFrame.addColumnSpec(column.id, column.spec);
-            pFrame.setColumnData(column.id, column.data);
-          } catch (err: unknown) {
-            throw new Error(
-              `Adding column ${column.id} to PFrame failed: ${err as Error}; Spec: ${JSON.stringify(column.spec)}, DataInfo: ${JSON.stringify(column.data)}.`,
-            );
-          }
-        }
-        return pFrame;
-      } catch (err: unknown) {
-        throw new Error(
-          `Data PFrame creation failed, columns: ${JSON.stringify(distinctСolumns)}, error: ${err as Error}`,
-        );
+    try {
+      const pFrame = new PFrameRs(getDebugFlags().logPFrameRequests ? logFunc : undefined);
+      pFrame.setDataSource(this);
+      for (const column of distinctСolumns) {
+        pFrame.addColumnSpec(column.id, column.spec);
+        pFrame.setColumnData(column.id, column.data);
       }
-    };
+      this.rustPFrame = pFrame;
+    } catch (err: unknown) {
+      throw new Error(
+        `Rust PFrame creation failed, columns: ${JSON.stringify(distinctСolumns)}, error: ${err as Error}`,
+      );
+    }
   }
 
   private getOrCreateComputableForBlob(blobId: string) {
@@ -291,8 +233,6 @@ export class PFrameDriver implements InternalPFrameDriver {
   private readonly pFrames: RefCountResourcePool<InternalPFrameData, PFrameHolder>;
   private readonly pTables: RefCountResourcePool<FullPTableDef, PTableHolder>;
   private readonly blobContentCache: LRUCache<string, Uint8Array>;
-  /** Limits concurrent requests to PFrame API to prevent deadlock with Node's IO threads */
-  private readonly concurrencyLimiter: ConcurrencyLimitingExecutor;
 
   constructor(
     private readonly blobDriver: DownloadDriver,
@@ -305,9 +245,6 @@ export class PFrameDriver implements InternalPFrameDriver {
     });
     this.blobContentCache = blobContentCache;
 
-    const concurrencyLimiter = new ConcurrencyLimitingExecutor(1);
-    this.concurrencyLimiter = concurrencyLimiter;
-
     this.pFrames = new (class extends RefCountResourcePool<InternalPFrameData, PFrameHolder> {
       constructor(
         private readonly blobDriver: DownloadDriver,
@@ -346,41 +283,16 @@ export class PFrameDriver implements InternalPFrameDriver {
             `PTable creation (pTableHandle = ${this.calculateParamsKey(params)}): ${JSON.stringify(params, bigintReplacer)}`,
           );
         }
-        const tablePromise = pframesDispatch({
-          cppCallback: () => {
-            return concurrencyLimiter.run(async () => {
-              using disposableDataPFrame = this.pFrames.getByKey(handle).disposableDataPFrame;
-              return await disposableDataPFrame.dataPFrame.createTable({
-                src: joinEntryToInternal(params.def.src),
-                filters: migrateFilters(params.def.filters),
-              }, params.signal);
-            }).then(async (table) => {
-              if (params.def.sorting.length === 0) return table;
-              try {
-                return await concurrencyLimiter.run(async () => {
-                  return await table.sort(params.def.sorting, params.signal);
-                });
-              } finally {
-                table.dispose();
-              }
-            });
-          },
-          rustCallback: () => {
-            return this.pFrames.getByKey(handle).rustPFrame.createTable({
-              src: joinEntryToInternal(params.def.src),
-              filters: migrateFilters(params.def.filters),
-            }, params.signal).then(async (table) => {
-              if (params.def.sorting.length === 0) return table;
-              try {
-                return await table.sort(params.def.sorting, params.signal);
-              } finally {
-                table.dispose();
-              }
-            });
-          },
-          logger,
-          filters: params.def.filters,
-          signal: params.signal,
+        const tablePromise = this.pFrames.getByKey(handle).rustPFrame.createTable({
+          src: joinEntryToInternal(params.def.src),
+          filters: migrateFilters(params.def.filters),
+        }, params.signal).then(async (table) => {
+          if (params.def.sorting.length === 0) return table;
+          try {
+            return await table.sort(params.def.sorting, params.signal);
+          } finally {
+            table.dispose();
+          }
         });
         return new PTableHolder(tablePromise);
       }
@@ -486,65 +398,27 @@ export class PFrameDriver implements InternalPFrameDriver {
         `Call calculateTableData, handle = ${handle}, request = ${JSON.stringify(request, bigintReplacer)}`,
       );
     }
-    return await pframesDispatch({
-      cppCallback: async () => {
-        return await this.concurrencyLimiter.run(async () => {
-          using disposableDataPFrame = this.pFrames.getByKey(handle).disposableDataPFrame;
-          return await disposableDataPFrame.dataPFrame.createTable({
-            src: joinEntryToInternal(request.src),
-            filters: migrateFilters(request.filters),
-          }, signal);
-        }).then(async (table) => {
-          if (request.sorting.length === 0) return table;
-          try {
-            return await this.concurrencyLimiter.run(async () => {
-              return await table.sort(request.sorting, signal);
-            });
-          } finally {
-            table.dispose();
-          }
-        }).then(async (table) => {
-          try {
-            const spec = table.getSpec();
-            const data = await this.concurrencyLimiter.run(
-              async () => await table.getData([...spec.keys()]),
-            );
-            return spec.map((spec, i) => ({
-              spec: spec,
-              data: data[i],
-            }));
-          } finally {
-            table.dispose();
-          }
-        });
-      },
-      rustCallback: async () => {
-        return await this.pFrames.getByKey(handle).rustPFrame.createTable({
-          src: joinEntryToInternal(request.src),
-          filters: migrateFilters(request.filters),
-        }, signal).then(async (table) => {
-          if (request.sorting.length === 0) return table;
-          try {
-            return await table.sort(request.sorting, signal);
-          } finally {
-            table.dispose();
-          }
-        }).then(async (table) => {
-          try {
-            const spec = table.getSpec();
-            const data = await table.getData([...spec.keys()]);
-            return spec.map((spec, i) => ({
-              spec: spec,
-              data: data[i],
-            }));
-          } finally {
-            table.dispose();
-          }
-        });
-      },
-      logger: this.logger,
-      filters: request.filters,
-      signal,
+    return await this.pFrames.getByKey(handle).rustPFrame.createTable({
+      src: joinEntryToInternal(request.src),
+      filters: migrateFilters(request.filters),
+    }, signal).then(async (table) => {
+      if (request.sorting.length === 0) return table;
+      try {
+        return await table.sort(request.sorting, signal);
+      } finally {
+        table.dispose();
+      }
+    }).then(async (table) => {
+      try {
+        const spec = table.getSpec();
+        const data = await table.getData([...spec.keys()]);
+        return spec.map((spec, i) => ({
+          spec: spec,
+          data: data[i],
+        }));
+      } finally {
+        table.dispose();
+      }
     });
   }
 
@@ -558,26 +432,10 @@ export class PFrameDriver implements InternalPFrameDriver {
         `Call getUniqueValues, handle = ${handle}, request = ${JSON.stringify(request, bigintReplacer)}`,
       );
     }
-    return await pframesDispatch({
-      cppCallback: async () => {
-        return await this.concurrencyLimiter.run(async () => {
-          using disposableDataPFrame = this.pFrames.getByKey(handle).disposableDataPFrame;
-          return await disposableDataPFrame.dataPFrame.getUniqueValues({
-            ...request,
-            filters: migrateFilters(request.filters),
-          }, signal);
-        });
-      },
-      rustCallback: async () => {
-        return await this.pFrames.getByKey(handle).rustPFrame.getUniqueValues({
-          ...request,
-          filters: migrateFilters(request.filters),
-        }, signal);
-      },
-      logger: this.logger,
-      filters: request.filters,
-      signal,
-    });
+    return await this.pFrames.getByKey(handle).rustPFrame.getUniqueValues({
+      ...request,
+      filters: migrateFilters(request.filters),
+    }, signal);
   }
 
   //
@@ -600,19 +458,23 @@ export class PFrameDriver implements InternalPFrameDriver {
     range?: TableRange,
   ): Promise<PTableVector[]> {
     const pTable = await this.pTables.getByKey(handle).table;
-    return await this.concurrencyLimiter.run(
-      async () => await pTable.getData(columnIndices, range),
-    );
+    return await pTable.getData(columnIndices, range);
   }
 }
 
-function joinEntryToInternal(entry: JoinEntry<PObjectId>): PFrameInternal.JoinEntry {
+function joinEntryToInternal(entry: JoinEntry<PObjectId>): PFrameInternal.JoinEntryV2 {
   switch (entry.type) {
     case 'column':
       return {
         type: 'column',
         columnId: entry.column,
-        qualifications: [],
+      };
+    case 'slicedColumn':
+      return {
+        type: 'slicedColumn',
+        columnId: entry.column,
+        newId: entry.newId,
+        axisFilters: entry.axisFilters,
       };
     case 'inner':
     case 'full':