@milaboratories/pl-middle-layer 1.37.99 → 1.37.100
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.js +5 -5
- package/dist/index.js.map +1 -1
- package/dist/index.mjs +88 -81
- package/dist/index.mjs.map +1 -1
- package/dist/pool/driver.d.ts +1 -1
- package/dist/pool/driver.d.ts.map +1 -1
- package/package.json +12 -12
- package/src/pool/driver.ts +17 -2
package/dist/pool/driver.d.ts
CHANGED
|
@@ -48,7 +48,7 @@ export declare class PFrameDriver implements InternalPFrameDriver {
|
|
|
48
48
|
static init(blobDriver: DownloadDriver, logger: MiLogger, spillPath: string): Promise<PFrameDriver>;
|
|
49
49
|
private constructor();
|
|
50
50
|
createPFrame(def: PFrameDef<PlTreeNodeAccessor | PColumnValues | DataInfo<PlTreeNodeAccessor>>, ctx: ComputableCtx): PFrameHandle;
|
|
51
|
-
createPTable(
|
|
51
|
+
createPTable(rawDef: PTableDef<PColumn<PlTreeNodeAccessor | PColumnValues | DataInfo<PlTreeNodeAccessor>>>, ctx: ComputableCtx): PTableHandle;
|
|
52
52
|
findColumns(handle: PFrameHandle, request: FindColumnsRequest): Promise<FindColumnsResponse>;
|
|
53
53
|
getColumnSpec(handle: PFrameHandle, columnId: PObjectId): Promise<PColumnSpec>;
|
|
54
54
|
listColumns(handle: PFrameHandle): Promise<PColumnIdAndSpec[]>;
|
|
@@ -1 +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,EACb,QAAQ,EAET,MAAM,sBAAsB,CAAC;AAW9B,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"driver.d.ts","sourceRoot":"","sources":["../../src/pool/driver.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@milaboratories/pl-middle-layer",
|
|
3
|
-
"version": "1.37.
|
|
3
|
+
"version": "1.37.100",
|
|
4
4
|
"description": "Pl Middle Layer",
|
|
5
5
|
"engines": {
|
|
6
6
|
"node": ">=20.16.0"
|
|
@@ -32,27 +32,27 @@
|
|
|
32
32
|
"yaml": "^2.7.0",
|
|
33
33
|
"zod": "~3.23.8",
|
|
34
34
|
"remeda": "^2.22.6",
|
|
35
|
-
"@milaboratories/resolve-helper": "^1.1.0",
|
|
36
35
|
"@milaboratories/computable": "^2.5.1",
|
|
37
36
|
"@milaboratories/pl-http": "^1.1.4",
|
|
38
|
-
"@
|
|
39
|
-
"@milaboratories/
|
|
40
|
-
"@
|
|
41
|
-
"@milaboratories/pl-model-middle-layer": "^1.7.
|
|
37
|
+
"@milaboratories/pl-model-common": "^1.15.9",
|
|
38
|
+
"@milaboratories/resolve-helper": "^1.1.0",
|
|
39
|
+
"@platforma-sdk/block-tools": "^2.5.61",
|
|
40
|
+
"@milaboratories/pl-model-middle-layer": "^1.7.43",
|
|
42
41
|
"@milaboratories/pl-client": "^2.11.2",
|
|
43
|
-
"@milaboratories/pl-
|
|
44
|
-
"@platforma-sdk/model": "^1.37.18",
|
|
42
|
+
"@milaboratories/pl-drivers": "^1.5.79",
|
|
45
43
|
"@milaboratories/pl-tree": "^1.6.12",
|
|
44
|
+
"@milaboratories/pl-model-backend": "^1.1.2",
|
|
45
|
+
"@platforma-sdk/model": "^1.38.0",
|
|
46
46
|
"@milaboratories/ts-helpers": "^1.4.1",
|
|
47
|
-
"@platforma-sdk/workflow-tengo": "4.9.2",
|
|
48
47
|
"@milaboratories/pl-config": "^1.6.1",
|
|
49
|
-
"@
|
|
50
|
-
"@milaboratories/pl-errors": "^1.1.9"
|
|
48
|
+
"@platforma-sdk/workflow-tengo": "4.9.2",
|
|
49
|
+
"@milaboratories/pl-errors": "^1.1.9",
|
|
50
|
+
"@milaboratories/pl-deployments": "^2.4.3"
|
|
51
51
|
},
|
|
52
52
|
"devDependencies": {
|
|
53
53
|
"semver": "^7.7.2",
|
|
54
54
|
"@types/semver": "^7.7.0",
|
|
55
|
-
"typescript": "~5.
|
|
55
|
+
"typescript": "~5.6.3",
|
|
56
56
|
"vite": "^6.3.5",
|
|
57
57
|
"vitest": "^2.1.9",
|
|
58
58
|
"@types/jest": "^29.5.14",
|
package/src/pool/driver.ts
CHANGED
|
@@ -81,6 +81,20 @@ function migrateFilters(filters: PTableRecordFilter[]): PTableRecordFilter[] {
|
|
|
81
81
|
return filtersV2;
|
|
82
82
|
}
|
|
83
83
|
|
|
84
|
+
function migratePTableDef(
|
|
85
|
+
def: PTableDef<PColumn<PlTreeNodeAccessor | PColumnValues | DataInfo<PlTreeNodeAccessor>>>,
|
|
86
|
+
): PTableDef<PColumn<PlTreeNodeAccessor | PColumnValues | DataInfo<PlTreeNodeAccessor>>> {
|
|
87
|
+
if (!('partitionFilters' in (def as Omit<typeof def, 'partitionFilters'>))) {
|
|
88
|
+
// For old blocks make all filters partition filters
|
|
89
|
+
return {
|
|
90
|
+
...def,
|
|
91
|
+
partitionFilters: def.filters,
|
|
92
|
+
filters: [],
|
|
93
|
+
};
|
|
94
|
+
}
|
|
95
|
+
return def;
|
|
96
|
+
}
|
|
97
|
+
|
|
84
98
|
const bigintReplacer = (_: string, v: unknown) => (typeof v === 'bigint' ? v.toString() : v);
|
|
85
99
|
|
|
86
100
|
class PFrameHolder implements PFrameInternal.PFrameDataSource, Disposable {
|
|
@@ -324,7 +338,7 @@ export class PFrameDriver implements InternalPFrameDriver {
|
|
|
324
338
|
|
|
325
339
|
const table = pFrameHolder.pFrame.createTable({
|
|
326
340
|
src: joinEntryToInternal(params.def.src),
|
|
327
|
-
filters: migrateFilters(params.def.filters),
|
|
341
|
+
filters: migrateFilters([...params.def.partitionFilters, ...params.def.filters]),
|
|
328
342
|
});
|
|
329
343
|
|
|
330
344
|
let sortedTable = table;
|
|
@@ -370,9 +384,10 @@ export class PFrameDriver implements InternalPFrameDriver {
|
|
|
370
384
|
}
|
|
371
385
|
|
|
372
386
|
public createPTable(
|
|
373
|
-
|
|
387
|
+
rawDef: PTableDef<PColumn<PlTreeNodeAccessor | PColumnValues | DataInfo<PlTreeNodeAccessor>>>,
|
|
374
388
|
ctx: ComputableCtx,
|
|
375
389
|
): PTableHandle {
|
|
390
|
+
const def = migratePTableDef(rawDef);
|
|
376
391
|
const pFrameHandle = this.createPFrame(extractAllColumns(def.src), ctx);
|
|
377
392
|
const defIds = mapPTableDef(def, (c) => c.id);
|
|
378
393
|
const res = this.pTables.acquire({ def: defIds, pFrameHandle });
|