@milaboratories/pl-middle-layer 1.29.1 → 1.29.3

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":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@milaboratories/pl-middle-layer",
-  "version": "1.29.1",
+  "version": "1.29.3",
   "description": "Pl Middle Layer",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",
@@ -20,7 +20,7 @@
   "license": "UNLICENSED",
   "dependencies": {
     "@milaboratories/pframes-node": "2.1.13",
-    "@milaboratories/pframes-rs-node": "1.0.16",
+    "@milaboratories/pframes-rs-node": "1.0.18",
     "canonicalize": "~2.0.0",
     "denque": "^2.1.0",
     "lru-cache": "^11.0.2",
@@ -29,19 +29,19 @@
     "utility-types": "^3.11.0",
     "yaml": "^2.6.1",
     "zod": "~3.23.8",
-    "@milaboratories/pl-http": "^1.1.0",
     "@milaboratories/computable": "^2.3.5",
+    "@milaboratories/pl-http": "^1.1.0",
+    "@milaboratories/pl-client": "^2.7.11",
     "@milaboratories/resolve-helper": "^1.0.2",
     "@platforma-sdk/block-tools": "^2.5.18",
-    "@milaboratories/pl-client": "^2.7.11",
     "@milaboratories/pl-drivers": "^1.5.24",
     "@milaboratories/pl-model-common": "^1.10.6",
     "@milaboratories/pl-model-middle-layer": "^1.7.6",
     "@milaboratories/pl-tree": "^1.4.30",
+    "@platforma-sdk/model": "^1.22.59",
     "@milaboratories/pl-model-backend": "^1.0.2",
     "@milaboratories/ts-helpers": "^1.1.4",
-    "@platforma-sdk/model": "^1.22.59",
-    "@platforma-sdk/workflow-tengo": "2.15.1",
+    "@platforma-sdk/workflow-tengo": "2.15.2",
     "@milaboratories/pl-config": "^1.4.3",
     "@milaboratories/pl-deployments": "^1.2.4"
   },

package/src/pool/driver.ts

@@ -336,28 +336,43 @@ export class PFrameDriver implements InternalPFrameDriver {
 
       protected createNewResource(params: FullPTableDef): PTableHolder {
         const handle: PFrameHandle = params.pFrameHandle;
-        const tablePromise = concurrencyLimiter.run(async () => {
-          if (getDebugFlags().logPFrameRequests)
-            logger.info(
-              `PTable creation (pTableHandle = ${this.calculateParamsKey(params)}): ${JSON.stringify(params, bigintReplacer)}`,
-            );
+        if (getDebugFlags().logPFrameRequests) {
+          logger.info(
+            `PTable creation (pTableHandle = ${this.calculateParamsKey(params)}): ${JSON.stringify(params, bigintReplacer)}`,
+          );
+        }
+        const tablePromise = (async () => {
           if (getDebugFlags().usePFrameRs && allFiltersAreRustSupported(params.def.filters)) {
-            return await this.pFrames.getByKey(handle).rustPFrame.createTable({
+            return this.pFrames.getByKey(handle).rustPFrame.createTable({
               src: joinEntryToInternal(params.def.src),
               filters: migrateFilters(params.def.filters),
-            }, params.signal);
+            }, params.signal).then(async (table) => {
+              if (params.def.sorting.length > 0) {
+                const sortedTable = await table.sort(params.def.sorting, params.signal);
+                table.dispose();
+                return sortedTable;
+              }
+              return table;
+            });
           } else {
-            using disposableDataPFrame = this.pFrames.getByKey(handle).disposableDataPFrame;
-            return await disposableDataPFrame.dataPFrame.createTable({
-              src: joinEntryToInternal(params.def.src),
-              filters: migrateFilters(params.def.filters),
-            }, params.signal);
+            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) {
+                const sortedTable = await concurrencyLimiter.run(async () => {
+                  return await table.sort(params.def.sorting, params.signal);
+                });
+                table.dispose();
+                return sortedTable;
+              }
+              return table;
+            });
           }
-        }).then(async (table) =>
-          params.def.sorting.length !== 0
-            ? await table.sort(params.def.sorting, params.signal)
-            : table,
-        );
+        })();
         return new PTableHolder(tablePromise);
       }
 
@@ -453,43 +468,59 @@ export class PFrameDriver implements InternalPFrameDriver {
     request: CalculateTableDataRequest<PObjectId>,
     signal?: AbortSignal,
   ): Promise<CalculateTableDataResponse> {
-    let table = await this.concurrencyLimiter.run(async () => {
-      if (getDebugFlags().logPFrameRequests)
-        this.logger.info(
-          `Call calculateTableData, handle = ${handle}, request = ${JSON.stringify(request, bigintReplacer)}`,
-        );
-      if (getDebugFlags().usePFrameRs && allFiltersAreRustSupported(request.filters)) {
-        return await this.pFrames.getByKey(handle).rustPFrame.createTable({
-          src: joinEntryToInternal(request.src),
-          filters: migrateFilters(request.filters),
-        }, signal);
-      } else {
+    if (getDebugFlags().logPFrameRequests) {
+      this.logger.info(
+        `Call calculateTableData, handle = ${handle}, request = ${JSON.stringify(request, bigintReplacer)}`,
+      );
+    }
+    if (getDebugFlags().usePFrameRs && allFiltersAreRustSupported(request.filters)) {
+      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) {
+          const sortedTable = await table.sort(request.sorting, signal);
+          table.dispose();
+          return sortedTable;
+        }
+        return table;
+      }).then(async (table) => {
+        const spec = table.getSpec();
+        const data = await table.getData([...spec.keys()]);
+        table.dispose();
+        return spec.map((spec, i) => ({
+          spec: spec,
+          data: data[i],
+        }));
+      });
+    } else {
+      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);
-      }
-    });
-
-    if (request.sorting.length > 0) {
-      const sortedTable = await this.concurrencyLimiter.run(
-        async () => await table.sort(request.sorting, signal),
-      );
-      table.dispose();
-      table = sortedTable;
+      }).then(async (table) => {
+        if (request.sorting.length > 0) {
+          const sortedTable = await this.concurrencyLimiter.run(async () => {
+            return await table.sort(request.sorting, signal);
+          });
+          table.dispose();
+          return sortedTable;
+        }
+        return table;
+      }).then(async (table) => {
+        const spec = table.getSpec();
+        const data = await this.concurrencyLimiter.run(
+          async () => await table.getData([...spec.keys()]),
+        );
+        table.dispose();
+        return spec.map((spec, i) => ({
+          spec: spec,
+          data: data[i],
+        }));
+      });
     }
-
-    const spec = table.getSpec();
-    const data = await this.concurrencyLimiter.run(
-      async () => await table.getData([...spec.keys()]),
-    );
-    table.dispose();
-
-    return spec.map((spec, i) => ({
-      spec: spec,
-      data: data[i],
-    }));
   }
 
   public async getUniqueValues(
@@ -515,13 +546,13 @@ export class PFrameDriver implements InternalPFrameDriver {
   //
 
   public async getShape(handle: PTableHandle): Promise<PTableShape> {
-    const pTable = await this.pTables.getByKey(handle).table; // internally concurrency limited
+    const pTable = await this.pTables.getByKey(handle).table;
     return pTable.getShape();
   }
 
   public async getSpec(handle: PTableHandle): Promise<PTableColumnSpec[]> {
-    const pTable = await this.pTables.getByKey(handle).table; // internally concurrency limited
-    return pTable.getSpec(); // sync operation
+    const pTable = await this.pTables.getByKey(handle).table;
+    return pTable.getSpec();
   }
 
   public async getData(
@@ -529,7 +560,7 @@ export class PFrameDriver implements InternalPFrameDriver {
     columnIndices: number[],
     range?: TableRange,
   ): Promise<PTableVector[]> {
-    const pTable = await this.pTables.getByKey(handle).table; // internally concurrency limited
+    const pTable = await this.pTables.getByKey(handle).table;
     return await this.concurrencyLimiter.run(
       async () => await pTable.getData(columnIndices, range),
     );