@milaboratories/pf-driver 1.0.5 → 1.0.7

package/src/driver_impl.ts

@@ -227,7 +227,7 @@ implements AbstractInternalPFrameDriver<PColumnData> {
     };
   }
 
-  public async getColumnSpec(handle: PFrameHandle, columnId: PObjectId): Promise<PColumnSpec> {
+  public async getColumnSpec(handle: PFrameHandle, columnId: PObjectId): Promise<PColumnSpec | null> {
     const { pFramePromise } = this.pFrames.getByKey(handle);
     const pFrame = await pFramePromise;
     return await pFrame.getColumnSpec(columnId);
@@ -271,7 +271,6 @@ implements AbstractInternalPFrameDriver<PColumnData> {
         });
 
         const overallSize = await pTable.getFootprint({
-          withPredecessors: true,
           signal: combinedSignal,
         });
         this.pTableCachePerFrame.cache(table, overallSize);
@@ -340,7 +339,6 @@ implements AbstractInternalPFrameDriver<PColumnData> {
       });
 
       const overallSize = await pTable.getFootprint({
-        withPredecessors: true,
         signal: combinedSignal,
       });
 
@@ -371,7 +369,6 @@ implements AbstractInternalPFrameDriver<PColumnData> {
       });
 
       const overallSize = await pTable.getFootprint({
-        withPredecessors: true,
         signal: combinedSignal,
       });
 

package/src/pframe_pool.ts

@@ -29,13 +29,14 @@ export interface RemoteBlobProvider<TreeEntry extends JsonSerializable> {
 }
 
 export class PFrameHolder<TreeEntry extends JsonSerializable> implements Disposable {
-  public readonly pFramePromise: Promise<PFrameInternal.PFrameV12>;
+  public readonly pFramePromise: Promise<PFrameInternal.PFrameV13>;
   private readonly abortController = new AbortController();
 
   private readonly localBlobs: PoolEntry<PFrameInternal.PFrameBlobId>[] = [];
   private readonly remoteBlobs: PoolEntry<PFrameInternal.PFrameBlobId>[] = [];
 
   constructor(
+    frameId: PFrameInternal.PFrameId,
     private readonly localBlobProvider: LocalBlobProvider<TreeEntry>,
     private readonly remoteBlobProvider: RemoteBlobProvider<TreeEntry>,
     logger: PFrameInternal.Logger,
@@ -92,7 +93,7 @@ export class PFrameHolder<TreeEntry extends JsonSerializable> implements Disposa
     }));
 
     try {
-      const pFrame = PFrameFactory.createPFrame({ spillPath: this.spillPath, logger });
+      const pFrame = PFrameFactory.createPFrame({ frameId, spillPath: this.spillPath, logger });
       pFrame.setDataSource({
         ...this.localBlobProvider.makeDataSource(this.disposeSignal),
         parquetServer: this.remoteBlobProvider.httpServerInfo(),
@@ -171,6 +172,7 @@ export class PFramePool<TreeEntry extends JsonSerializable>
       );
     }
     return new PFrameHolder(
+      key,
       this.localBlobProvider,
       this.remoteBlobProvider,
       this.logger,

package/src/ptable_pool.ts

@@ -23,7 +23,7 @@ export class PTableHolder implements Disposable {
   constructor(
     public readonly pFrame: PFrameHandle,
     pFrameDisposeSignal: AbortSignal,
-    public readonly pTablePromise: Promise<PFrameInternal.PTableV7>,
+    public readonly pTablePromise: Promise<PFrameInternal.PTableV8>,
     private readonly predecessor?: PoolEntry<PTableHandle, PTableHolder>,
   ) {
     this.combinedDisposeSignal = AbortSignal.any([pFrameDisposeSignal, this.abortController.signal]);
@@ -80,7 +80,7 @@ export class PTablePool<TreeEntry extends JsonSerializable>
         },
       });
       const { resource: { pTablePromise } } = predecessor;
-      const sortedTable = pTablePromise.then((pTable) => pTable.sort(params.def.sorting));
+      const sortedTable = pTablePromise.then((pTable) => pTable.sort(key, params.def.sorting));
       return new PTableHolder(handle, combinedSignal, sortedTable, predecessor);
     }
 
@@ -94,12 +94,12 @@ export class PTablePool<TreeEntry extends JsonSerializable>
         },
       });
       const { resource: { pTablePromise } } = predecessor;
-      const filteredTable = pTablePromise.then((pTable) => pTable.filter(params.def.filters));
+      const filteredTable = pTablePromise.then((pTable) => pTable.filter(key, params.def.filters));
       return new PTableHolder(handle, combinedSignal, filteredTable, predecessor);
     }
 
     // 1. Join
-    const table = pFramePromise.then((pFrame) => pFrame.createTable({
+    const table = pFramePromise.then((pFrame) => pFrame.createTable(key, {
       src: joinEntryToInternal(params.def.src),
       // `params.def.filters` would be non-empty only when join has artificial columns
       filters: [...params.def.partitionFilters, ...params.def.filters],