@openrewrite/rewrite 8.87.4 → 8.87.5
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/reference.d.ts +1 -0
- package/dist/reference.d.ts.map +1 -1
- package/dist/reference.js +3 -0
- package/dist/reference.js.map +1 -1
- package/dist/rewrite-javascript-version.txt +1 -1
- package/dist/rpc/request/batch-visit.d.ts +1 -1
- package/dist/rpc/request/batch-visit.d.ts.map +1 -1
- package/dist/rpc/request/batch-visit.js +2 -1
- package/dist/rpc/request/batch-visit.js.map +1 -1
- package/dist/rpc/request/metrics.d.ts +5 -0
- package/dist/rpc/request/metrics.d.ts.map +1 -1
- package/dist/rpc/request/metrics.js +11 -2
- package/dist/rpc/request/metrics.js.map +1 -1
- package/dist/rpc/request/visit.d.ts +1 -1
- package/dist/rpc/request/visit.d.ts.map +1 -1
- package/dist/rpc/request/visit.js +2 -1
- package/dist/rpc/request/visit.js.map +1 -1
- package/dist/rpc/rewrite-rpc.d.ts +4 -0
- package/dist/rpc/rewrite-rpc.d.ts.map +1 -1
- package/dist/rpc/rewrite-rpc.js +41 -2
- package/dist/rpc/rewrite-rpc.js.map +1 -1
- package/package.json +1 -1
- package/src/reference.ts +4 -0
- package/src/rpc/request/batch-visit.ts +2 -0
- package/src/rpc/request/metrics.ts +11 -2
- package/src/rpc/request/visit.ts +2 -0
- package/src/rpc/rewrite-rpc.ts +47 -3
package/dist/reference.d.ts
CHANGED
package/dist/reference.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reference.d.ts","sourceRoot":"","sources":["../src/reference.ts"],"names":[],"mappings":"AAeA,QAAA,MAAM,aAAa,eAA8C,CAAC;AAElE,MAAM,WAAW,SAAS;IACtB,CAAC,aAAa,CAAC,EAAE,IAAI,CAAC;CACzB;AAED,wBAAgB,KAAK,CAAC,CAAC,SAAS,EAAE,GAAG,SAAS,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,SAAS,SAAS,GAAG,SAAS,GAAG,CAAC,GAAG,SAAS,CAiBvG;AAED,wBAAgB,KAAK,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,IAAI,SAAS,CAEhD;AAED,qBAAa,YAAY;IACrB,OAAO,CAAC,IAAI,CAAoC;IAChD,OAAO,CAAC,QAAQ,CAAgC;IAChD,OAAO,CAAC,QAAQ,CAAK;IAErB,GAAG,CAAC,GAAG,EAAE,SAAS,GAAG,OAAO;IAI5B,GAAG,CAAC,GAAG,EAAE,SAAS,GAAG,MAAM,GAAG,SAAS;IAIvC,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS;IAIhD,MAAM,CAAC,GAAG,EAAE,SAAS,GAAG,MAAM;IAO9B,KAAK;IAML,aAAa,CAAC,KAAK,EAAE,MAAM;IAQ3B,GAAG,CAAC,GAAG,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM;IAKjC,QAAQ,IAAI,MAAM;IAIlB,UAAU,CAAC,aAAa,EAAE,MAAM,GAAG,IAAI;CAU1C"}
|
|
1
|
+
{"version":3,"file":"reference.d.ts","sourceRoot":"","sources":["../src/reference.ts"],"names":[],"mappings":"AAeA,QAAA,MAAM,aAAa,eAA8C,CAAC;AAElE,MAAM,WAAW,SAAS;IACtB,CAAC,aAAa,CAAC,EAAE,IAAI,CAAC;CACzB;AAED,wBAAgB,KAAK,CAAC,CAAC,SAAS,EAAE,GAAG,SAAS,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,SAAS,SAAS,GAAG,SAAS,GAAG,CAAC,GAAG,SAAS,CAiBvG;AAED,wBAAgB,KAAK,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,IAAI,SAAS,CAEhD;AAED,qBAAa,YAAY;IACrB,OAAO,CAAC,IAAI,CAAoC;IAChD,OAAO,CAAC,QAAQ,CAAgC;IAChD,OAAO,CAAC,QAAQ,CAAK;IAErB,GAAG,CAAC,GAAG,EAAE,SAAS,GAAG,OAAO;IAI5B,GAAG,CAAC,GAAG,EAAE,SAAS,GAAG,MAAM,GAAG,SAAS;IAIvC,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS;IAIhD,MAAM,CAAC,GAAG,EAAE,SAAS,GAAG,MAAM;IAO9B,KAAK;IAML,aAAa,CAAC,KAAK,EAAE,MAAM;IAQ3B,GAAG,CAAC,GAAG,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM;IAKjC,QAAQ,IAAI,MAAM;IAIlB,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED,UAAU,CAAC,aAAa,EAAE,MAAM,GAAG,IAAI;CAU1C"}
|
package/dist/reference.js
CHANGED
package/dist/reference.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reference.js","sourceRoot":"","sources":["../src/reference.ts"],"names":[],"mappings":";;;AAqBA,sBAiBC;AAED,sBAEC;AA1CD;;;;;;;;;;;;;;GAcG;AACH,MAAM,aAAa,GAAG,MAAM,CAAC,GAAG,CAAC,+BAA+B,CAAC,CAAC;AAMlE,SAAgB,KAAK,CAA2B,GAAM;IAClD,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;QACpB,OAAO,SAAgB,CAAC;IAC5B,CAAC;SAAM,IAAI,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;QACpB,OAAO,GAAU,CAAC;IACtB,CAAC;IACD,IAAI,CAAC;QACD,2EAA2E;QAC3E,8CAA8C;QAC7C,GAAW,CAAC,aAAa,CAAC,GAAG,IAAI,CAAC;QACnC,OAAO,GAAU,CAAC;IACtB,CAAC;IAAC,WAAM,CAAC;QACL,qEAAqE;QACrE,MAAM,MAAM,qBAAO,GAAU,CAAC,CAAC;QAC/B,MAAM,CAAC,aAAa,CAAC,GAAG,IAAI,CAAC;QAC7B,OAAO,MAAM,CAAC;IAClB,CAAC;AACL,CAAC;AAED,SAAgB,KAAK,CAAC,GAAQ;IAC1B,OAAO,GAAG,KAAK,SAAS,IAAI,GAAG,KAAK,IAAI,IAAI,GAAG,CAAC,aAAa,CAAC,KAAK,IAAI,CAAC;AAC5E,CAAC;AAED,MAAa,YAAY;IAAzB;QACY,SAAI,GAAG,IAAI,OAAO,EAAqB,CAAC;QACxC,aAAQ,GAAG,IAAI,GAAG,EAAqB,CAAC;QACxC,aAAQ,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"reference.js","sourceRoot":"","sources":["../src/reference.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
8.87.
|
|
1
|
+
8.87.5
|
|
@@ -23,6 +23,6 @@ export interface BatchVisitRequest {
|
|
|
23
23
|
visitors: BatchVisitItem[];
|
|
24
24
|
}
|
|
25
25
|
export declare class BatchVisit {
|
|
26
|
-
static handle(connection: rpc.MessageConnection, localObjects: Map<string, any>, preparedRecipes: Map<String, Recipe>, recipeCursors: WeakMap<Recipe, Cursor>, getObject: (id: string, sourceFileType?: string) => any, getCursor: (cursorIds: string[] | undefined, sourceFileType?: string) => Promise<Cursor>, dataTableStore: () => DataTableStore | undefined, metricsCsv?: string): void;
|
|
26
|
+
static handle(connection: rpc.MessageConnection, localObjects: Map<string, any>, preparedRecipes: Map<String, Recipe>, recipeCursors: WeakMap<Recipe, Cursor>, getObject: (id: string, sourceFileType?: string) => any, captureRefCheckpoint: (treeId: string) => void, getCursor: (cursorIds: string[] | undefined, sourceFileType?: string) => Promise<Cursor>, dataTableStore: () => DataTableStore | undefined, metricsCsv?: string): void;
|
|
27
27
|
}
|
|
28
28
|
//# sourceMappingURL=batch-visit.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"batch-visit.d.ts","sourceRoot":"","sources":["../../../src/rpc/request/batch-visit.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAC3C,OAAO,EAAC,MAAM,EAAC,MAAM,cAAc,CAAC;AACpC,OAAO,EAAC,MAAM,EAAO,MAAM,YAAY,CAAC;AAKxC,OAAO,EAAmB,cAAc,EAAC,MAAM,kBAAkB,CAAC;AAGlE,MAAM,WAAW,cAAc;IAC3B,OAAO,EAAE,MAAM,CAAA;IACf,cAAc,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;CACpC;AAED,MAAM,WAAW,gBAAgB;IAC7B,QAAQ,EAAE,OAAO,CAAA;IACjB,OAAO,EAAE,OAAO,CAAA;IAChB,cAAc,EAAE,OAAO,CAAA;IACvB,eAAe,EAAE,MAAM,EAAE,CAAA;CAC5B;AAED,MAAM,WAAW,kBAAkB;IAC/B,OAAO,EAAE,gBAAgB,EAAE,CAAA;CAC9B;AAED,MAAM,WAAW,iBAAiB;IAC9B,cAAc,EAAE,MAAM,CAAA;IACtB,MAAM,EAAE,MAAM,CAAA;IACd,CAAC,EAAE,MAAM,CAAA;IACT,MAAM,CAAC,EAAE,MAAM,EAAE,CAAA;IACjB,QAAQ,EAAE,cAAc,EAAE,CAAA;CAC7B;AAiBD,qBAAa,UAAU;IACnB,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,GAAG,CAAC,iBAAiB,EACjC,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,EAC9B,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EACpC,aAAa,EAAE,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,EACtC,SAAS,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,MAAM,KAAK,GAAG,EACvD,SAAS,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,SAAS,EAAE,cAAc,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,EACxF,cAAc,EAAE,MAAM,cAAc,GAAG,SAAS,EAChD,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI;
|
|
1
|
+
{"version":3,"file":"batch-visit.d.ts","sourceRoot":"","sources":["../../../src/rpc/request/batch-visit.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAC3C,OAAO,EAAC,MAAM,EAAC,MAAM,cAAc,CAAC;AACpC,OAAO,EAAC,MAAM,EAAO,MAAM,YAAY,CAAC;AAKxC,OAAO,EAAmB,cAAc,EAAC,MAAM,kBAAkB,CAAC;AAGlE,MAAM,WAAW,cAAc;IAC3B,OAAO,EAAE,MAAM,CAAA;IACf,cAAc,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;CACpC;AAED,MAAM,WAAW,gBAAgB;IAC7B,QAAQ,EAAE,OAAO,CAAA;IACjB,OAAO,EAAE,OAAO,CAAA;IAChB,cAAc,EAAE,OAAO,CAAA;IACvB,eAAe,EAAE,MAAM,EAAE,CAAA;CAC5B;AAED,MAAM,WAAW,kBAAkB;IAC/B,OAAO,EAAE,gBAAgB,EAAE,CAAA;CAC9B;AAED,MAAM,WAAW,iBAAiB;IAC9B,cAAc,EAAE,MAAM,CAAA;IACtB,MAAM,EAAE,MAAM,CAAA;IACd,CAAC,EAAE,MAAM,CAAA;IACT,MAAM,CAAC,EAAE,MAAM,EAAE,CAAA;IACjB,QAAQ,EAAE,cAAc,EAAE,CAAA;CAC7B;AAiBD,qBAAa,UAAU;IACnB,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,GAAG,CAAC,iBAAiB,EACjC,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,EAC9B,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EACpC,aAAa,EAAE,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,EACtC,SAAS,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,MAAM,KAAK,GAAG,EACvD,oBAAoB,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,EAC9C,SAAS,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,SAAS,EAAE,cAAc,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,EACxF,cAAc,EAAE,MAAM,cAAc,GAAG,SAAS,EAChD,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI;CA6E3C"}
|
|
@@ -71,13 +71,14 @@ async function collectSearchResultIds(tree) {
|
|
|
71
71
|
return ids;
|
|
72
72
|
}
|
|
73
73
|
class BatchVisit {
|
|
74
|
-
static handle(connection, localObjects, preparedRecipes, recipeCursors, getObject, getCursor, dataTableStore, metricsCsv) {
|
|
74
|
+
static handle(connection, localObjects, preparedRecipes, recipeCursors, getObject, captureRefCheckpoint, getCursor, dataTableStore, metricsCsv) {
|
|
75
75
|
connection.onRequest(new rpc.RequestType("BatchVisit"), (0, metrics_1.withMetrics)("BatchVisit", metricsCsv, (_context) => async (request) => {
|
|
76
76
|
const p = await getObject(request.p, undefined);
|
|
77
77
|
const store = dataTableStore();
|
|
78
78
|
if (store && p instanceof execution_1.ExecutionContext) {
|
|
79
79
|
p.messages[data_table_1.DATA_TABLE_STORE] = store;
|
|
80
80
|
}
|
|
81
|
+
captureRefCheckpoint(request.treeId);
|
|
81
82
|
let tree = await getObject(request.treeId, request.sourceFileType);
|
|
82
83
|
const cursor = await getCursor(request.cursor, request.sourceFileType);
|
|
83
84
|
const results = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"batch-visit.js","sourceRoot":"","sources":["../../../src/rpc/request/batch-visit.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"batch-visit.js","sourceRoot":"","sources":["../../../src/rpc/request/batch-visit.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,10 @@
|
|
|
1
1
|
import * as rpc from "vscode-jsonrpc/node";
|
|
2
2
|
import { Cursor } from "../../tree";
|
|
3
|
+
export declare function setCacheSizeProvider(provider: () => {
|
|
4
|
+
local: number;
|
|
5
|
+
remote: number;
|
|
6
|
+
refs: number;
|
|
7
|
+
}): void;
|
|
3
8
|
/**
|
|
4
9
|
* Extracts the sourcePath from a tree object, either directly from a SourceFile
|
|
5
10
|
* or by finding the nearest SourceFile via a cursor.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metrics.d.ts","sourceRoot":"","sources":["../../../src/rpc/request/metrics.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAC3C,OAAO,EAAC,MAAM,EAA2B,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"metrics.d.ts","sourceRoot":"","sources":["../../../src/rpc/request/metrics.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAC3C,OAAO,EAAC,MAAM,EAA2B,MAAM,YAAY,CAAC;AAQ5D,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,MAAM;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAE1G;AAED;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAapE;AAED;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,GAAG,CAAC,MAAM,GAAG,IAAI,CA2BnF;AAED;;;;;;;GAOG;AACH,wBAAgB,WAAW,CAAC,CAAC,EAAE,CAAC,EAC5B,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,cAAc,EAAE,CAAC,OAAO,EAAE;IAAC,MAAM,EAAE,MAAM,CAAA;CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,GAC1E,CAAC,OAAO,EAAE,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,CAsB5B;AAED;;;;;;;GAOG;AACH,wBAAgB,YAAY,CAAC,CAAC,EAC1B,WAAW,EAAE,MAAM,EACnB,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,cAAc,EAAE,CAAC,OAAO,EAAE;IAAC,MAAM,EAAE,MAAM,CAAA;CAAC,KAAK,MAAM,OAAO,CAAC,CAAC,CAAC,GAChE,CAAC,KAAK,EAAE,GAAG,KAAK,OAAO,CAAC,CAAC,CAAC,CAsB5B"}
|
|
@@ -33,6 +33,7 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
33
33
|
};
|
|
34
34
|
})();
|
|
35
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
|
+
exports.setCacheSizeProvider = setCacheSizeProvider;
|
|
36
37
|
exports.extractSourcePath = extractSourcePath;
|
|
37
38
|
exports.initializeMetricsCsv = initializeMetricsCsv;
|
|
38
39
|
exports.withMetrics = withMetrics;
|
|
@@ -54,7 +55,13 @@ exports.withMetrics0 = withMetrics0;
|
|
|
54
55
|
*/
|
|
55
56
|
const fs = __importStar(require("fs"));
|
|
56
57
|
const tree_1 = require("../../tree");
|
|
57
|
-
const CSV_HEADER = 'request,target,durationMs,memoryUsedBytes,memoryMaxBytes';
|
|
58
|
+
const CSV_HEADER = 'request,target,durationMs,memoryUsedBytes,memoryMaxBytes,localObjects,remoteObjects,refs';
|
|
59
|
+
// Optional provider of current RPC cache sizes, appended to each metrics row so a profile
|
|
60
|
+
// shows cache residency (flat with per-file Evict, monotonic without). Set by RewriteRpc.
|
|
61
|
+
let cacheSizeProvider;
|
|
62
|
+
function setCacheSizeProvider(provider) {
|
|
63
|
+
cacheSizeProvider = provider;
|
|
64
|
+
}
|
|
58
65
|
/**
|
|
59
66
|
* Extracts the sourcePath from a tree object, either directly from a SourceFile
|
|
60
67
|
* or by finding the nearest SourceFile via a cursor.
|
|
@@ -166,12 +173,14 @@ function withMetrics0(requestType, metricsCsv, handlerFactory) {
|
|
|
166
173
|
};
|
|
167
174
|
}
|
|
168
175
|
function recordMetrics(metricsCsv, target, request, startTime) {
|
|
176
|
+
var _a;
|
|
169
177
|
const endTime = Date.now();
|
|
170
178
|
const memEnd = process.memoryUsage();
|
|
171
179
|
const durationMs = endTime - startTime;
|
|
172
180
|
const memoryUsedBytes = memEnd.heapUsed;
|
|
173
181
|
const memoryMaxBytes = memEnd.heapTotal;
|
|
174
|
-
const
|
|
182
|
+
const cache = (_a = cacheSizeProvider === null || cacheSizeProvider === void 0 ? void 0 : cacheSizeProvider()) !== null && _a !== void 0 ? _a : { local: 0, remote: 0, refs: 0 };
|
|
183
|
+
const csvRow = `${request},${target},${durationMs},${memoryUsedBytes},${memoryMaxBytes},${cache.local},${cache.remote},${cache.refs}\n`;
|
|
175
184
|
try {
|
|
176
185
|
fs.appendFileSync(metricsCsv, csvRow);
|
|
177
186
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metrics.js","sourceRoot":"","sources":["../../../src/rpc/request/metrics.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"metrics.js","sourceRoot":"","sources":["../../../src/rpc/request/metrics.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,7 +14,7 @@ export declare class Visit {
|
|
|
14
14
|
readonly p: string;
|
|
15
15
|
readonly cursor: string[] | undefined;
|
|
16
16
|
constructor(visitor: string, sourceFileType: string, visitorOptions: Map<string, any> | undefined, treeId: string, p: string, cursor: string[] | undefined);
|
|
17
|
-
static handle(connection: rpc.MessageConnection, localObjects: Map<string, any>, preparedRecipes: Map<String, Recipe>, recipeCursors: WeakMap<Recipe, Cursor>, getObject: (id: string, sourceFileType?: string) => any, getCursor: (cursorIds: string[] | undefined, sourceFileType?: string) => Promise<Cursor>, dataTableStore: () => DataTableStore | undefined, metricsCsv?: string): void;
|
|
17
|
+
static handle(connection: rpc.MessageConnection, localObjects: Map<string, any>, preparedRecipes: Map<String, Recipe>, recipeCursors: WeakMap<Recipe, Cursor>, getObject: (id: string, sourceFileType?: string) => any, captureRefCheckpoint: (treeId: string) => void, getCursor: (cursorIds: string[] | undefined, sourceFileType?: string) => Promise<Cursor>, dataTableStore: () => DataTableStore | undefined, metricsCsv?: string): void;
|
|
18
18
|
static instantiateVisitor(request: {
|
|
19
19
|
visitor: string;
|
|
20
20
|
visitorOptions?: Map<string, any>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"visit.d.ts","sourceRoot":"","sources":["../../../src/rpc/request/visit.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAC3C,OAAO,EAAC,MAAM,EAAiB,MAAM,cAAc,CAAC;AACpD,OAAO,EAAC,MAAM,EAA+B,MAAM,YAAY,CAAC;AAChE,OAAO,EAAC,WAAW,EAAC,MAAM,eAAe,CAAC;AAE1C,OAAO,EAAmB,cAAc,EAAC,MAAM,kBAAkB,CAAC;AAIlE,MAAM,WAAW,aAAa;IAC1B,QAAQ,EAAE,OAAO,CAAA;CACpB;AAMD,qBAAa,KAAK;IACF,QAAQ,CAAC,OAAO,EAAE,MAAM;IACxB,QAAQ,CAAC,cAAc,EAAE,MAAM;IAC/B,QAAQ,CAAC,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,SAAS;IACrD,QAAQ,CAAC,MAAM,EAAE,MAAM;IACvB,QAAQ,CAAC,CAAC,EAAE,MAAM;IAClB,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,SAAS;gBAL5B,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,MAAM,EACtB,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,SAAS,EAC5C,MAAM,EAAE,MAAM,EACd,CAAC,EAAE,MAAM,EACT,MAAM,EAAE,MAAM,EAAE,GAAG,SAAS;IAGjD,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,GAAG,CAAC,iBAAiB,EACjC,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,EAC9B,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EACpC,aAAa,EAAE,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,EACtC,SAAS,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,MAAM,KAAK,GAAG,EACvD,SAAS,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,SAAS,EAAE,cAAc,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,EACxF,cAAc,EAAE,MAAM,cAAc,GAAG,SAAS,EAChD,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI;
|
|
1
|
+
{"version":3,"file":"visit.d.ts","sourceRoot":"","sources":["../../../src/rpc/request/visit.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAC3C,OAAO,EAAC,MAAM,EAAiB,MAAM,cAAc,CAAC;AACpD,OAAO,EAAC,MAAM,EAA+B,MAAM,YAAY,CAAC;AAChE,OAAO,EAAC,WAAW,EAAC,MAAM,eAAe,CAAC;AAE1C,OAAO,EAAmB,cAAc,EAAC,MAAM,kBAAkB,CAAC;AAIlE,MAAM,WAAW,aAAa;IAC1B,QAAQ,EAAE,OAAO,CAAA;CACpB;AAMD,qBAAa,KAAK;IACF,QAAQ,CAAC,OAAO,EAAE,MAAM;IACxB,QAAQ,CAAC,cAAc,EAAE,MAAM;IAC/B,QAAQ,CAAC,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,SAAS;IACrD,QAAQ,CAAC,MAAM,EAAE,MAAM;IACvB,QAAQ,CAAC,CAAC,EAAE,MAAM;IAClB,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,SAAS;gBAL5B,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,MAAM,EACtB,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,SAAS,EAC5C,MAAM,EAAE,MAAM,EACd,CAAC,EAAE,MAAM,EACT,MAAM,EAAE,MAAM,EAAE,GAAG,SAAS;IAGjD,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,GAAG,CAAC,iBAAiB,EACjC,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,EAC9B,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EACpC,aAAa,EAAE,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,EACtC,SAAS,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,MAAM,KAAK,GAAG,EACvD,oBAAoB,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,EAC9C,SAAS,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,SAAS,EAAE,cAAc,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,EACxF,cAAc,EAAE,MAAM,cAAc,GAAG,SAAS,EAChD,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI;WAgC3B,kBAAkB,CAAC,OAAO,EAAE;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,cAAc,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;KAAC,EAC3D,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EACpC,aAAa,EAAE,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,EACtC,CAAC,EAAE,GAAG,GAAG,OAAO,CAAC,WAAW,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;CAiE5E"}
|
|
@@ -67,13 +67,14 @@ class Visit {
|
|
|
67
67
|
this.p = p;
|
|
68
68
|
this.cursor = cursor;
|
|
69
69
|
}
|
|
70
|
-
static handle(connection, localObjects, preparedRecipes, recipeCursors, getObject, getCursor, dataTableStore, metricsCsv) {
|
|
70
|
+
static handle(connection, localObjects, preparedRecipes, recipeCursors, getObject, captureRefCheckpoint, getCursor, dataTableStore, metricsCsv) {
|
|
71
71
|
connection.onRequest(new rpc.RequestType("Visit"), (0, metrics_1.withMetrics)("Visit", metricsCsv, (context) => async (request) => {
|
|
72
72
|
const p = await getObject(request.p, undefined);
|
|
73
73
|
const store = dataTableStore();
|
|
74
74
|
if (store && p instanceof execution_1.ExecutionContext) {
|
|
75
75
|
p.messages[data_table_1.DATA_TABLE_STORE] = store;
|
|
76
76
|
}
|
|
77
|
+
captureRefCheckpoint(request.treeId);
|
|
77
78
|
const before = await getObject(request.treeId, request.sourceFileType);
|
|
78
79
|
const cursor = await getCursor(request.cursor, request.sourceFileType);
|
|
79
80
|
context.target = (0, metrics_1.extractSourcePath)(before, cursor);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"visit.js","sourceRoot":"","sources":["../../../src/rpc/request/visit.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"visit.js","sourceRoot":"","sources":["../../../src/rpc/request/visit.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,6 +30,10 @@ export declare class RewriteRpc {
|
|
|
30
30
|
readonly remoteObjects: Map<string, any>;
|
|
31
31
|
readonly remoteRefs: Map<number, any>;
|
|
32
32
|
readonly localRefs: ReferenceMap;
|
|
33
|
+
readonly refCheckpoints: Map<string, {
|
|
34
|
+
send: number;
|
|
35
|
+
recvMax: number;
|
|
36
|
+
}>;
|
|
33
37
|
private remoteLanguages?;
|
|
34
38
|
private readonly logger?;
|
|
35
39
|
private traceGetObject;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rewrite-rpc.d.ts","sourceRoot":"","sources":["../../src/rpc/rewrite-rpc.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAC3C,OAAO,EAAC,iBAAiB,EAAC,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAC,MAAM,EAAoC,UAAU,EAAE,IAAI,EAAC,MAAM,SAAS,CAAC;AAsBnF,OAAO,EAAC,iBAAiB,EAAC,MAAM,gBAAgB,CAAC;AAGjD,OAAO,EAAC,SAAS,EAAC,MAAM,UAAU,CAAC;AACnC,OAAO,EAAC,gBAAgB,EAAC,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAiB,sBAAsB,EAAC,MAAM,2BAA2B,CAAC;AACjF,OAAO,EAAC,WAAW,EAAC,MAAM,WAAW,CAAC;AACtC,OAAO,EAAC,YAAY,EAAC,MAAM,cAAc,CAAC;AAG1C,qBAAa,UAAU;
|
|
1
|
+
{"version":3,"file":"rewrite-rpc.d.ts","sourceRoot":"","sources":["../../src/rpc/rewrite-rpc.ts"],"names":[],"mappings":"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"}
|
package/dist/rpc/rewrite-rpc.js
CHANGED
|
@@ -71,23 +71,44 @@ class RewriteRpc {
|
|
|
71
71
|
this.remoteObjects = new Map();
|
|
72
72
|
this.remoteRefs = new Map();
|
|
73
73
|
this.localRefs = new reference_1.ReferenceMap();
|
|
74
|
+
// Ref high-water per source file, captured before it is first visited so an Evict rolls
|
|
75
|
+
// back exactly the refs it introduced. `send` = localRefs snapshot, `recvMax` = max remoteRefs key.
|
|
76
|
+
this.refCheckpoints = new Map();
|
|
74
77
|
this.traceGetObject = { receive: false, send: false };
|
|
75
78
|
// Initialize metrics CSV file if configured
|
|
76
79
|
(0, metrics_1.initializeMetricsCsv)(options.metricsCsv, options.logger);
|
|
80
|
+
(0, metrics_1.setCacheSizeProvider)(() => ({
|
|
81
|
+
local: this.localObjects.size,
|
|
82
|
+
remote: this.remoteObjects.size,
|
|
83
|
+
refs: this.remoteRefs.size + this.localRefs.size,
|
|
84
|
+
}));
|
|
77
85
|
this.logger = options.logger;
|
|
78
86
|
const preparedRecipes = new Map();
|
|
79
87
|
const recipeCursors = new WeakMap();
|
|
80
88
|
// Need this indirection, otherwise `this` will be undefined when executed in the handlers.
|
|
81
89
|
const getObject = (id, sourceFileType) => this.getObject(id, sourceFileType);
|
|
82
90
|
const getCursor = (cursorIds, sourceFileType) => this.getCursor(cursorIds, sourceFileType);
|
|
91
|
+
// First visit of the file wins.
|
|
92
|
+
const captureRefCheckpoint = (treeId) => {
|
|
93
|
+
if (this.refCheckpoints.has(treeId)) {
|
|
94
|
+
return;
|
|
95
|
+
}
|
|
96
|
+
let recvMax = -1;
|
|
97
|
+
for (const k of this.remoteRefs.keys()) {
|
|
98
|
+
if (k > recvMax) {
|
|
99
|
+
recvMax = k;
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
this.refCheckpoints.set(treeId, { send: this.localRefs.snapshot(), recvMax });
|
|
103
|
+
};
|
|
83
104
|
const traceGetObject = () => this.traceGetObject.send;
|
|
84
105
|
const dataTableStore = () => this.configuredDataTableStore;
|
|
85
106
|
const marketplace = options.marketplace || new marketplace_1.RecipeMarketplace();
|
|
86
107
|
// Recipe name -> the package that contributed it, recorded during InstallRecipes and read when
|
|
87
108
|
// GetMarketplace builds rows so the host can attribute each recipe to its own bundle.
|
|
88
109
|
const recipeOrigin = new Map();
|
|
89
|
-
request_1.Visit.handle(this.connection, this.localObjects, preparedRecipes, recipeCursors, getObject, getCursor, dataTableStore, options.metricsCsv);
|
|
90
|
-
request_1.BatchVisit.handle(this.connection, this.localObjects, preparedRecipes, recipeCursors, getObject, getCursor, dataTableStore, options.metricsCsv);
|
|
110
|
+
request_1.Visit.handle(this.connection, this.localObjects, preparedRecipes, recipeCursors, getObject, captureRefCheckpoint, getCursor, dataTableStore, options.metricsCsv);
|
|
111
|
+
request_1.BatchVisit.handle(this.connection, this.localObjects, preparedRecipes, recipeCursors, getObject, captureRefCheckpoint, getCursor, dataTableStore, options.metricsCsv);
|
|
91
112
|
request_1.Generate.handle(this.connection, this.localObjects, preparedRecipes, recipeCursors, getObject, dataTableStore, options.metricsCsv);
|
|
92
113
|
request_1.SetDataTableStore.handle(this.connection, store => this.configuredDataTableStore = store, options.metricsCsv);
|
|
93
114
|
request_1.GetObject.handle(this.connection, this.remoteObjects, this.localObjects, this.localRefs, (options === null || options === void 0 ? void 0 : options.batchSize) || 1000, traceGetObject, options.metricsCsv);
|
|
@@ -111,6 +132,7 @@ class RewriteRpc {
|
|
|
111
132
|
this.remoteObjects.clear();
|
|
112
133
|
this.remoteRefs.clear();
|
|
113
134
|
this.localRefs.clear();
|
|
135
|
+
this.refCheckpoints.clear();
|
|
114
136
|
preparedRecipes.clear();
|
|
115
137
|
this.remoteLanguages = undefined;
|
|
116
138
|
};
|
|
@@ -122,6 +144,23 @@ class RewriteRpc {
|
|
|
122
144
|
clearLocalState();
|
|
123
145
|
return true;
|
|
124
146
|
});
|
|
147
|
+
// Drop one source file's tree + roll back the refs it introduced. Fire-and-forget
|
|
148
|
+
// notification (no reply), so recipe/accumulator/context state is left intact.
|
|
149
|
+
this.connection.onNotification(new rpc.NotificationType("Evict"), (params) => {
|
|
150
|
+
const id = params.id;
|
|
151
|
+
this.localObjects.delete(id);
|
|
152
|
+
this.remoteObjects.delete(id);
|
|
153
|
+
const cp = this.refCheckpoints.get(id);
|
|
154
|
+
if (cp !== undefined) {
|
|
155
|
+
this.localRefs.rollbackTo(cp.send);
|
|
156
|
+
for (const k of [...this.remoteRefs.keys()]) {
|
|
157
|
+
if (k > cp.recvMax) {
|
|
158
|
+
this.remoteRefs.delete(k);
|
|
159
|
+
}
|
|
160
|
+
}
|
|
161
|
+
this.refCheckpoints.delete(id);
|
|
162
|
+
}
|
|
163
|
+
});
|
|
125
164
|
RewriteRpc.set(this);
|
|
126
165
|
this.connection.listen();
|
|
127
166
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rewrite-rpc.js","sourceRoot":"","sources":["../../src/rpc/rewrite-rpc.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"rewrite-rpc.js","sourceRoot":"","sources":["../../src/rpc/rewrite-rpc.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/reference.ts
CHANGED
|
@@ -89,6 +89,10 @@ export class ReferenceMap {
|
|
|
89
89
|
return this.refCount;
|
|
90
90
|
}
|
|
91
91
|
|
|
92
|
+
get size(): number {
|
|
93
|
+
return this.refsById.size;
|
|
94
|
+
}
|
|
95
|
+
|
|
92
96
|
rollbackTo(savedRefCount: number): void {
|
|
93
97
|
for (let i = savedRefCount; i < this.refCount; i++) {
|
|
94
98
|
const obj = this.refsById.get(i);
|
|
@@ -68,6 +68,7 @@ export class BatchVisit {
|
|
|
68
68
|
preparedRecipes: Map<String, Recipe>,
|
|
69
69
|
recipeCursors: WeakMap<Recipe, Cursor>,
|
|
70
70
|
getObject: (id: string, sourceFileType?: string) => any,
|
|
71
|
+
captureRefCheckpoint: (treeId: string) => void,
|
|
71
72
|
getCursor: (cursorIds: string[] | undefined, sourceFileType?: string) => Promise<Cursor>,
|
|
72
73
|
dataTableStore: () => DataTableStore | undefined,
|
|
73
74
|
metricsCsv?: string): void {
|
|
@@ -82,6 +83,7 @@ export class BatchVisit {
|
|
|
82
83
|
if (store && p instanceof ExecutionContext) {
|
|
83
84
|
p.messages[DATA_TABLE_STORE] = store;
|
|
84
85
|
}
|
|
86
|
+
captureRefCheckpoint(request.treeId);
|
|
85
87
|
let tree: Tree = await getObject(request.treeId, request.sourceFileType);
|
|
86
88
|
const cursor = await getCursor(request.cursor, request.sourceFileType);
|
|
87
89
|
|
|
@@ -17,7 +17,15 @@ import * as fs from 'fs';
|
|
|
17
17
|
import * as rpc from "vscode-jsonrpc/node";
|
|
18
18
|
import {Cursor, isSourceFile, SourceFile} from "../../tree";
|
|
19
19
|
|
|
20
|
-
const CSV_HEADER = 'request,target,durationMs,memoryUsedBytes,memoryMaxBytes';
|
|
20
|
+
const CSV_HEADER = 'request,target,durationMs,memoryUsedBytes,memoryMaxBytes,localObjects,remoteObjects,refs';
|
|
21
|
+
|
|
22
|
+
// Optional provider of current RPC cache sizes, appended to each metrics row so a profile
|
|
23
|
+
// shows cache residency (flat with per-file Evict, monotonic without). Set by RewriteRpc.
|
|
24
|
+
let cacheSizeProvider: (() => { local: number; remote: number; refs: number }) | undefined;
|
|
25
|
+
|
|
26
|
+
export function setCacheSizeProvider(provider: () => { local: number; remote: number; refs: number }): void {
|
|
27
|
+
cacheSizeProvider = provider;
|
|
28
|
+
}
|
|
21
29
|
|
|
22
30
|
/**
|
|
23
31
|
* Extracts the sourcePath from a tree object, either directly from a SourceFile
|
|
@@ -162,8 +170,9 @@ function recordMetrics(
|
|
|
162
170
|
|
|
163
171
|
const memoryUsedBytes = memEnd.heapUsed;
|
|
164
172
|
const memoryMaxBytes = memEnd.heapTotal;
|
|
173
|
+
const cache = cacheSizeProvider?.() ?? {local: 0, remote: 0, refs: 0};
|
|
165
174
|
|
|
166
|
-
const csvRow = `${request},${target},${durationMs},${memoryUsedBytes},${memoryMaxBytes}\n`;
|
|
175
|
+
const csvRow = `${request},${target},${durationMs},${memoryUsedBytes},${memoryMaxBytes},${cache.local},${cache.remote},${cache.refs}\n`;
|
|
167
176
|
|
|
168
177
|
try {
|
|
169
178
|
fs.appendFileSync(metricsCsv, csvRow);
|
package/src/rpc/request/visit.ts
CHANGED
|
@@ -44,6 +44,7 @@ export class Visit {
|
|
|
44
44
|
preparedRecipes: Map<String, Recipe>,
|
|
45
45
|
recipeCursors: WeakMap<Recipe, Cursor>,
|
|
46
46
|
getObject: (id: string, sourceFileType?: string) => any,
|
|
47
|
+
captureRefCheckpoint: (treeId: string) => void,
|
|
47
48
|
getCursor: (cursorIds: string[] | undefined, sourceFileType?: string) => Promise<Cursor>,
|
|
48
49
|
dataTableStore: () => DataTableStore | undefined,
|
|
49
50
|
metricsCsv?: string): void {
|
|
@@ -58,6 +59,7 @@ export class Visit {
|
|
|
58
59
|
if (store && p instanceof ExecutionContext) {
|
|
59
60
|
p.messages[DATA_TABLE_STORE] = store;
|
|
60
61
|
}
|
|
62
|
+
captureRefCheckpoint(request.treeId);
|
|
61
63
|
const before: Tree = await getObject(request.treeId, request.sourceFileType);
|
|
62
64
|
const cursor = await getCursor(request.cursor, request.sourceFileType);
|
|
63
65
|
context.target = extractSourcePath(before, cursor);
|
package/src/rpc/rewrite-rpc.ts
CHANGED
|
@@ -38,7 +38,7 @@ import {
|
|
|
38
38
|
} from "./request";
|
|
39
39
|
import {DataTableStore} from "../data-table";
|
|
40
40
|
import {RecipeMarketplace} from "../marketplace";
|
|
41
|
-
import {initializeMetricsCsv} from "./request/metrics";
|
|
41
|
+
import {initializeMetricsCsv, setCacheSizeProvider} from "./request/metrics";
|
|
42
42
|
import {RpcObjectData, RpcObjectState, RpcReceiveQueue} from "./queue";
|
|
43
43
|
import {RpcRecipe} from "./recipe";
|
|
44
44
|
import {ExecutionContext} from "../execution";
|
|
@@ -74,6 +74,10 @@ export class RewriteRpc {
|
|
|
74
74
|
readonly remoteRefs: Map<number, any> = new Map();
|
|
75
75
|
readonly localRefs: ReferenceMap = new ReferenceMap();
|
|
76
76
|
|
|
77
|
+
// Ref high-water per source file, captured before it is first visited so an Evict rolls
|
|
78
|
+
// back exactly the refs it introduced. `send` = localRefs snapshot, `recvMax` = max remoteRefs key.
|
|
79
|
+
readonly refCheckpoints: Map<string, { send: number, recvMax: number }> = new Map();
|
|
80
|
+
|
|
77
81
|
private remoteLanguages?: string[];
|
|
78
82
|
private readonly logger?: rpc.Logger;
|
|
79
83
|
private traceGetObject: TraceGetObject = {receive: false, send: false};
|
|
@@ -93,6 +97,11 @@ export class RewriteRpc {
|
|
|
93
97
|
}) {
|
|
94
98
|
// Initialize metrics CSV file if configured
|
|
95
99
|
initializeMetricsCsv(options.metricsCsv, options.logger);
|
|
100
|
+
setCacheSizeProvider(() => ({
|
|
101
|
+
local: this.localObjects.size,
|
|
102
|
+
remote: this.remoteObjects.size,
|
|
103
|
+
refs: this.remoteRefs.size + this.localRefs.size,
|
|
104
|
+
}));
|
|
96
105
|
this.logger = options.logger;
|
|
97
106
|
|
|
98
107
|
const preparedRecipes: Map<String, Recipe> = new Map();
|
|
@@ -101,6 +110,19 @@ export class RewriteRpc {
|
|
|
101
110
|
// Need this indirection, otherwise `this` will be undefined when executed in the handlers.
|
|
102
111
|
const getObject = (id: string, sourceFileType?: string) => this.getObject(id, sourceFileType);
|
|
103
112
|
const getCursor = (cursorIds: string[] | undefined, sourceFileType?: string) => this.getCursor(cursorIds, sourceFileType);
|
|
113
|
+
// First visit of the file wins.
|
|
114
|
+
const captureRefCheckpoint = (treeId: string) => {
|
|
115
|
+
if (this.refCheckpoints.has(treeId)) {
|
|
116
|
+
return;
|
|
117
|
+
}
|
|
118
|
+
let recvMax = -1;
|
|
119
|
+
for (const k of this.remoteRefs.keys()) {
|
|
120
|
+
if (k > recvMax) {
|
|
121
|
+
recvMax = k;
|
|
122
|
+
}
|
|
123
|
+
}
|
|
124
|
+
this.refCheckpoints.set(treeId, {send: this.localRefs.snapshot(), recvMax});
|
|
125
|
+
};
|
|
104
126
|
const traceGetObject = () => this.traceGetObject.send;
|
|
105
127
|
const dataTableStore = () => this.configuredDataTableStore;
|
|
106
128
|
|
|
@@ -109,8 +131,8 @@ export class RewriteRpc {
|
|
|
109
131
|
// GetMarketplace builds rows so the host can attribute each recipe to its own bundle.
|
|
110
132
|
const recipeOrigin: Map<string, string> = new Map();
|
|
111
133
|
|
|
112
|
-
Visit.handle(this.connection, this.localObjects, preparedRecipes, recipeCursors, getObject, getCursor, dataTableStore, options.metricsCsv);
|
|
113
|
-
BatchVisit.handle(this.connection, this.localObjects, preparedRecipes, recipeCursors, getObject, getCursor, dataTableStore, options.metricsCsv);
|
|
134
|
+
Visit.handle(this.connection, this.localObjects, preparedRecipes, recipeCursors, getObject, captureRefCheckpoint, getCursor, dataTableStore, options.metricsCsv);
|
|
135
|
+
BatchVisit.handle(this.connection, this.localObjects, preparedRecipes, recipeCursors, getObject, captureRefCheckpoint, getCursor, dataTableStore, options.metricsCsv);
|
|
114
136
|
Generate.handle(this.connection, this.localObjects, preparedRecipes, recipeCursors, getObject, dataTableStore, options.metricsCsv);
|
|
115
137
|
SetDataTableStore.handle(this.connection, store => this.configuredDataTableStore = store, options.metricsCsv);
|
|
116
138
|
GetObject.handle(this.connection, this.remoteObjects, this.localObjects,
|
|
@@ -140,6 +162,7 @@ export class RewriteRpc {
|
|
|
140
162
|
this.remoteObjects.clear();
|
|
141
163
|
this.remoteRefs.clear();
|
|
142
164
|
this.localRefs.clear();
|
|
165
|
+
this.refCheckpoints.clear();
|
|
143
166
|
preparedRecipes.clear();
|
|
144
167
|
this.remoteLanguages = undefined;
|
|
145
168
|
};
|
|
@@ -156,6 +179,27 @@ export class RewriteRpc {
|
|
|
156
179
|
}
|
|
157
180
|
)
|
|
158
181
|
|
|
182
|
+
// Drop one source file's tree + roll back the refs it introduced. Fire-and-forget
|
|
183
|
+
// notification (no reply), so recipe/accumulator/context state is left intact.
|
|
184
|
+
this.connection.onNotification(
|
|
185
|
+
new rpc.NotificationType<{ id: string }>("Evict"),
|
|
186
|
+
(params) => {
|
|
187
|
+
const id = params.id;
|
|
188
|
+
this.localObjects.delete(id);
|
|
189
|
+
this.remoteObjects.delete(id);
|
|
190
|
+
const cp = this.refCheckpoints.get(id);
|
|
191
|
+
if (cp !== undefined) {
|
|
192
|
+
this.localRefs.rollbackTo(cp.send);
|
|
193
|
+
for (const k of [...this.remoteRefs.keys()]) {
|
|
194
|
+
if (k > cp.recvMax) {
|
|
195
|
+
this.remoteRefs.delete(k);
|
|
196
|
+
}
|
|
197
|
+
}
|
|
198
|
+
this.refCheckpoints.delete(id);
|
|
199
|
+
}
|
|
200
|
+
}
|
|
201
|
+
)
|
|
202
|
+
|
|
159
203
|
RewriteRpc.set(this);
|
|
160
204
|
this.connection.listen();
|
|
161
205
|
}
|