Skip to content

Fix code lens perf for interactive window #11142

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

Merged
Rich Chiodo (rchiodo) merged 12 commits into from
Apr 14, 2020
Merged

Fix code lens perf for interactive window #11142

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
18d8968
Eliminate first level of redundancy
rchiodo Apr 13, 2020
f02d847
Working with a cache
rchiodo Apr 13, 2020
6be574a
Add test to verify no more generating cell ranges
rchiodo Apr 13, 2020
82605b0
Add news entry
rchiodo Apr 13, 2020
09c2b49
Clean up on closing
rchiodo Apr 13, 2020
d17058b
Make sure close and reopen works
rchiodo Apr 13, 2020
1806922
Fix sonar errors
rchiodo Apr 13, 2020
7d5a6dc
Fix restart
rchiodo Apr 13, 2020
916d77b
Fix wrong IDisposable type
rchiodo Apr 13, 2020
f1e7138
Rename restartedKernel to onKernelRestarted
rchiodo Apr 13, 2020
6c87fb1
Recompute when changing settings
rchiodo Apr 13, 2020
18f7582
Clear out document close event when document closes
rchiodo Apr 13, 2020
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
1 change: 1 addition & 0 deletions news/2 Fixes/10971.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix perf problems after running the interactive window for an extended period of time.
2 changes: 1 addition & 1 deletion src/client/datascience/cellFactory.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ export function hasCells(document: TextDocument, settings?: IDataScienceSettings
}

// CellRange is used as the basis for creating new ICells. We only use it in this file.
interface ICellRange {
export interface ICellRange {
range: Range;
title: string;
cell_type: string;
Expand Down
48 changes: 0 additions & 48 deletions src/client/datascience/editor-integration/cellhashLogger.ts
View file
Open in desktop

This file was deleted.

30 changes: 8 additions & 22 deletions src/client/datascience/editor-integration/cellhashprovider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,13 @@ import { noop } from '../../common/utils/misc';
import { getCellResource } from '../cellFactory';
import { CellMatcher } from '../cellMatcher';
import { Identifiers } from '../constants';
import { InteractiveWindowMessages, SysInfoReason } from '../interactive-common/interactiveWindowTypes';
import {
ICell,
ICellHash,
ICellHashListener,
ICellHashProvider,
IFileHashes,
IInteractiveWindowListener
INotebookExecutionLogger
} from '../types';

interface IRangedCellHash extends ICellHash {
Expand All @@ -35,7 +34,7 @@ interface IRangedCellHash extends ICellHash {
// This class provides hashes for debugging jupyter cells. Call getHashes just before starting debugging to compute all of the
// hashes for cells.
@injectable()
export class CellHashProvider implements ICellHashProvider, IInteractiveWindowListener {
export class CellHashProvider implements ICellHashProvider, INotebookExecutionLogger {
// tslint:disable-next-line: no-any
private postEmitter: EventEmitter<{ message: string; payload: any }> = new EventEmitter<{
message: string;
Expand Down Expand Up @@ -71,25 +70,6 @@ export class CellHashProvider implements ICellHashProvider, IInteractiveWindowLi
return this.postEmitter.event;
}

// tslint:disable-next-line: no-any
public onMessage(message: string, payload?: any): void {
switch (message) {
case InteractiveWindowMessages.AddedSysInfo:
if (payload && payload.type) {
const reason = payload.type as SysInfoReason;
if (reason !== SysInfoReason.Interrupt) {
this.hashes.clear();
this.executionCount = 0;
this.updateEventEmitter.fire();
}
}
break;

default:
break;
}
}

public getHashes(): IFileHashes[] {
return [...this.hashes.entries()]
.map((e) => {
Expand All @@ -101,6 +81,12 @@ export class CellHashProvider implements ICellHashProvider, IInteractiveWindowLi
.filter((e) => e.hashes.length > 0);
}

public restartedKernel() {

@DonJayamanne Don Jayamanne (DonJayamanne) Apr 13, 2020

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
public restartedKernel() {
public onKernelRestarted() {

As we're reacting to an event that took place (i.e. this is meant to be an event handler), I think onKernelRestarted is better

@rchiodo Rich Chiodo (rchiodo) Apr 13, 2020

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure.

In reply to: 407773224 [](ancestors = 407773224)

this.hashes.clear();
this.executionCount = 0;
this.updateEventEmitter.fire();
}

public async preExecute(cell: ICell, silent: boolean): Promise<void> {
try {
if (!silent) {
Expand Down
Loading