Skip to content

[WIP] refactor: optimize block creation with caching #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
six-ddc wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[WIP] refactor: optimize block creation with caching #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion src/plugins/fast-input/BlockTypeInfo.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ export class BlockTypeInfo {
}
for (const workspaceBlock of flyoutWorkspace.getTopBlocks()) {
blocks.push(
...BlockTypeInfo._createBlocks(
...BlockTypeInfo._createBlocksWithCache(
workspace,
vm,
Blockly,
Expand All @@ -404,6 +404,18 @@ export class BlockTypeInfo {
return blocks;
}

static btiCache = {};

static _createBlocksWithCache(workspace, vm, Blockly, locale, workspaceForm, domForm) {
let blocks = BlockTypeInfo.btiCache[workspaceForm.id];
if (blocks !== undefined) {
return blocks;
}
blocks = BlockTypeInfo._createBlocks(workspace, vm, Blockly, locale, workspaceForm, domForm);
BlockTypeInfo.btiCache[workspaceForm.id] = blocks;
return blocks;
}

static _createBlocks(workspace, vm, Blockly, locale, workspaceForm, domForm) {
let parts = [];
let inputs = [];
Expand Down
10 changes: 9 additions & 1 deletion src/plugins/fast-input/WorkspaceQuerier.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1229,6 +1229,10 @@ export default class WorkspaceQuerier {
*/
static MAX_TOKENS = 50000;

constructor() {
this._blockCache = {};
}

/**
* Indexes a workspace in preparation for querying it.
* @param {BlockTypeInfo[]} blocks The list of blocks in the workspace.
Expand Down Expand Up @@ -1435,7 +1439,11 @@ export default class WorkspaceQuerier {

for (const block of blocks) {
// console.log("block", typeof block, block);
const blockTokenType = new TokenTypeBlock(this, block);
let blockTokenType = this._blockCache[block.id];
if (!blockTokenType) {
blockTokenType = new TokenTypeBlock(this, block);
this._blockCache[block.id] = blockTokenType;
}
switch (block.shape) {
case BlockShape.Round:
this.tokenGroupRoundBlocks.pushProviders([blockTokenType]);
Expand Down