Skip to content
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

Jump to bottom

Remove chaining execution #14451

Merged
merged 2 commits into from
Oct 30, 2023
Merged

Remove chaining execution #14451

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b671fc9
Remove chaining execution
DonJayamanne Oct 6, 2023
f823414
Remove ChainingExecuteRequester class from kernel
DonJayamanne Oct 27, 2023
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
51 changes: 0 additions & 51 deletions src/kernels/common/chainingExecuteRequester.ts
View file
Open in desktop

This file was deleted.

179 changes: 0 additions & 179 deletions src/kernels/common/delayedFutureExecute.ts
View file
Open in desktop

This file was deleted.

4 changes: 1 addition & 3 deletions src/kernels/jupyter/baseKernelConnectionWrapper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,11 @@ import type { JSONObject } from '@lumino/coreutils';
import { Signal } from '@lumino/signaling';
import { Disposable } from 'vscode';
import { IDisposable } from '../../platform/common/types';
import { ChainingExecuteRequester } from '../common/chainingExecuteRequester';

/**
* Wrapper around a Kernel.IKernelConnection.
*/
export abstract class BaseKernelConnectionWrapper implements Kernel.IKernelConnection {
private chainingExecute = new ChainingExecuteRequester();
public readonly statusChanged = new Signal<this, Kernel.Status>(this);
public readonly connectionStatusChanged = new Signal<this, Kernel.ConnectionStatus>(this);
public readonly iopubMessage = new Signal<this, IIOPubMessage<IOPubMessageType>>(this);
Expand Down Expand Up @@ -159,7 +157,7 @@ export abstract class BaseKernelConnectionWrapper implements Kernel.IKernelConne
disposeOnDone?: boolean,
metadata?: JSONObject
): Kernel.IShellFuture<IExecuteRequestMsg, IExecuteReplyMsg> {
return this.chainingExecute.requestExecute(this.getKernelConnection(), content, disposeOnDone, metadata);
return this.getKernelConnection()!.requestExecute(content, disposeOnDone, metadata);
}
requestDebug(
content: {
Expand Down
4 changes: 1 addition & 3 deletions src/kernels/raw/session/rawKernelConnection.node.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import { IKernelSocket, LocalKernelConnectionMetadata } from '../../types';
import { suppressShutdownErrors } from '../../common/baseJupyterSession';
import { Signal } from '@lumino/signaling';
import type { IIOPubMessage, IMessage, IOPubMessageType, MessageType } from '@jupyterlab/services/lib/kernel/messages';
import { ChainingExecuteRequester } from '../../common/chainingExecuteRequester';
import { CancellationError, CancellationToken, CancellationTokenSource, Uri } from 'vscode';
import { KernelProgressReporter } from '../../../platform/progress/kernelProgressReporter';
import { DataScience } from '../../../platform/common/utils/localize';
Expand All @@ -45,7 +44,6 @@ to a raw IPython kernel running on the local machine. RawKernel is in charge of
input request, translating them, sending them to an IPython kernel over ZMQ, then passing back the messages
*/
export class RawKernelConnection implements Kernel.IKernelConnection {
private chainingExecute = new ChainingExecuteRequester();
public readonly statusChanged = new Signal<this, Kernel.Status>(this);
public readonly connectionStatusChanged = new Signal<this, Kernel.ConnectionStatus>(this);
public readonly iopubMessage = new Signal<this, IIOPubMessage<IOPubMessageType>>(this);
Expand Down Expand Up @@ -378,7 +376,7 @@ export class RawKernelConnection implements Kernel.IKernelConnection {
disposeOnDone?: boolean,
metadata?: import('@lumino/coreutils').JSONObject
): Kernel.IShellFuture<KernelMessage.IExecuteRequestMsg, KernelMessage.IExecuteReplyMsg> {
return this.chainingExecute.requestExecute(this.realKernel!, content, disposeOnDone, metadata);
return this.realKernel!.requestExecute(content, disposeOnDone, metadata);
}
public requestDebug(
// eslint-disable-next-line no-caller,no-eval
Expand Down
Loading