ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 18:46:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove unused ClientSession members. (#21031)

Browse Source
This commit is contained in:
Cory Rivera
2022-10-28 15:37:59 -07:00
committed by GitHub
parent 82adcc0f20
commit f4711d3c9c
4 changed files with 0 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/sql/workbench/contrib/notebook/test/stubs.ts
View File

@@ -60,9 +60,6 @@ export class NotebookModelStub implements INotebookModel {
get kernelChanged(): vsEvent.Event<nb.IKernelChangedArgs> { get kernelChanged(): vsEvent.Event<nb.IKernelChangedArgs> {
throw new Error('method not implemented.'); throw new Error('method not implemented.');
} }
get kernelsChanged(): vsEvent.Event<nb.IKernel> {
throw new Error('method not implemented.');
}
get layoutChanged(): vsEvent.Event<void> { get layoutChanged(): vsEvent.Event<void> {
throw new Error('method not implemented.'); throw new Error('method not implemented.');
} }
@@ -357,21 +354,9 @@ export class ClientSessionStub implements IClientSession {
shutdown(): Promise<void> { shutdown(): Promise<void> {
throw new Error('Method not implemented.'); throw new Error('Method not implemented.');
} }
selectKernel(): Promise<void> {
throw new Error('Method not implemented.');
}
restart(): Promise<void> { restart(): Promise<void> {
throw new Error('Method not implemented.'); throw new Error('Method not implemented.');
} }
setPath(path: string): Promise<void> {
throw new Error('Method not implemented.');
}
setName(name: string): Promise<void> {
throw new Error('Method not implemented.');
}
setType(type: string): Promise<void> {
throw new Error('Method not implemented.');
}
updateConnection(connection: IConnectionProfile): Promise<void> { updateConnection(connection: IConnectionProfile): Promise<void> {
throw new Error('Method not implemented.'); throw new Error('Method not implemented.');
} }
@@ -381,36 +366,12 @@ export class ClientSessionStub implements IClientSession {
dispose(): void { dispose(): void {
throw new Error('Method not implemented.'); throw new Error('Method not implemented.');
} }
get terminated(): vsEvent.Event<void> {
throw new Error('Method not implemented.');
}
get kernelChanged(): vsEvent.Event<nb.IKernelChangedArgs> {
throw new Error('Method not implemented.');
}
get statusChanged(): vsEvent.Event<nb.ISession> {
throw new Error('Method not implemented.');
}
get iopubMessage(): vsEvent.Event<nb.IMessage> {
throw new Error('Method not implemented.');
}
get unhandledMessage(): vsEvent.Event<nb.IMessage> {
throw new Error('Method not implemented.');
}
get propertyChanged(): vsEvent.Event<'path' | 'name' | 'type'> {
throw new Error('Method not implemented.');
}
get kernel(): nb.IKernel | null { get kernel(): nb.IKernel | null {
throw new Error('Method not implemented.'); throw new Error('Method not implemented.');
} }
get notebookUri(): URI { get notebookUri(): URI {
throw new Error('Method not implemented.'); throw new Error('Method not implemented.');
} }
get name(): string {
throw new Error('Method not implemented.');
}
get type(): string {
throw new Error('Method not implemented.');
}
get status(): nb.KernelStatus { get status(): nb.KernelStatus {
throw new Error('Method not implemented.'); throw new Error('Method not implemented.');
} }
@@ -423,9 +384,6 @@ export class ClientSessionStub implements IClientSession {
get kernelChangeCompleted(): Promise<void> { get kernelChangeCompleted(): Promise<void> {
throw new Error('Method not implemented.'); throw new Error('Method not implemented.');
} }
get kernelDisplayName(): string {
throw new Error('Method not implemented.');
}
get errorMessage(): string { get errorMessage(): string {
throw new Error('Method not implemented.'); throw new Error('Method not implemented.');
} }

76
src/sql/workbench/services/notebook/browser/models/clientSession.ts
View File

@@ -7,7 +7,6 @@
import { nb } from 'azdata'; import { nb } from 'azdata';
import { URI } from 'vs/base/common/uri'; import { URI } from 'vs/base/common/uri';
import { Event, Emitter } from 'vs/base/common/event';
import { localize } from 'vs/nls'; import { localize } from 'vs/nls';
import { getErrorMessage } from 'vs/base/common/errors'; import { getErrorMessage } from 'vs/base/common/errors';
@@ -23,19 +22,10 @@ type KernelChangeHandler = (kernel: nb.IKernelChangedArgs) => Promise<void>;
*/ */
export class ClientSession implements IClientSession { export class ClientSession implements IClientSession {
//#region private fields with public accessors //#region private fields with public accessors
private _terminatedEmitter = new Emitter<void>();
private _kernelChangedEmitter = new Emitter<nb.IKernelChangedArgs>();
private _statusChangedEmitter = new Emitter<nb.ISession>();
private _iopubMessageEmitter = new Emitter<nb.IMessage>();
private _unhandledMessageEmitter = new Emitter<nb.IMessage>();
private _propertyChangedEmitter = new Emitter<'path' | 'name' | 'type'>();
private _notebookUri: URI; private _notebookUri: URI;
private _type: string = '';
private _name: string = '';
private _isReady: boolean; private _isReady: boolean;
private _ready: Deferred<void>; private _ready: Deferred<void>;
private _kernelChangeCompleted: Deferred<void>; private _kernelChangeCompleted: Deferred<void>;
private _kernelDisplayName: string = '';
private _errorMessage: string = ''; private _errorMessage: string = '';
private _cachedKernelSpec: nb.IKernelSpec | undefined; private _cachedKernelSpec: nb.IKernelSpec | undefined;
private _kernelChangeHandlers: KernelChangeHandler[] = []; private _kernelChangeHandlers: KernelChangeHandler[] = [];
@@ -130,7 +120,6 @@ export class ClientSession implements IClientSession {
} }
this._session = session; this._session = session;
await this.runKernelConfigActions(kernelSpec.name); await this.runKernelConfigActions(kernelSpec.name);
this._statusChangedEmitter.fire(session);
} }
private async runKernelConfigActions(kernelName: string): Promise<void> { private async runKernelConfigActions(kernelName: string): Promise<void> {
@@ -153,42 +142,17 @@ export class ClientSession implements IClientSession {
//#region IClientSession Properties //#region IClientSession Properties
public get terminated(): Event<void> {
return this._terminatedEmitter.event;
}
public get kernelChanged(): Event<nb.IKernelChangedArgs> {
return this._kernelChangedEmitter.event;
}
public onKernelChanging(changeHandler: (kernel: nb.IKernelChangedArgs) => Promise<void>): void { public onKernelChanging(changeHandler: (kernel: nb.IKernelChangedArgs) => Promise<void>): void {
if (changeHandler) { if (changeHandler) {
this._kernelChangeHandlers.push(changeHandler); this._kernelChangeHandlers.push(changeHandler);
} }
} }
public get statusChanged(): Event<nb.ISession> {
return this._statusChangedEmitter.event;
}
public get iopubMessage(): Event<nb.IMessage> {
return this._iopubMessageEmitter.event;
}
public get unhandledMessage(): Event<nb.IMessage> {
return this._unhandledMessageEmitter.event;
}
public get propertyChanged(): Event<'path' | 'name' | 'type'> {
return this._propertyChangedEmitter.event;
}
public get kernel(): nb.IKernel | undefined { public get kernel(): nb.IKernel | undefined {
return this._session ? this._session.kernel : undefined; return this._session ? this._session.kernel : undefined;
} }
public get notebookUri(): URI { public get notebookUri(): URI {
return this._notebookUri; return this._notebookUri;
} }
public get name(): string {
return this._name;
}
public get type(): string {
return this._type;
}
public get status(): nb.KernelStatus { public get status(): nb.KernelStatus {
if (!this.isReady) { if (!this.isReady) {
return 'starting'; return 'starting';
@@ -204,9 +168,6 @@ export class ClientSession implements IClientSession {
public get kernelChangeCompleted(): Promise<void> { public get kernelChangeCompleted(): Promise<void> {
return this._kernelChangeCompleted.promise; return this._kernelChangeCompleted.promise;
} }
public get kernelDisplayName(): string {
return this._kernelDisplayName;
}
public get errorMessage(): string { public get errorMessage(): string {
return this._errorMessage; return this._errorMessage;
} }
@@ -256,7 +217,6 @@ export class ClientSession implements IClientSession {
await Promise.all(changePromises); await Promise.all(changePromises);
// Wait on connection configuration to complete before resolving full kernel change // Wait on connection configuration to complete before resolving full kernel change
this._kernelChangeCompleted.resolve(); this._kernelChangeCompleted.resolve();
this._kernelChangedEmitter.fire(changeArgs);
} }
private async updateCachedKernelSpec(): Promise<void> { private async updateCachedKernelSpec(): Promise<void> {
@@ -313,13 +273,6 @@ export class ClientSession implements IClientSession {
} }
} }
/**
* Select a kernel for the session.
*/
selectKernel(): Promise<void> {
throw new Error('Not implemented');
}
/** /**
* Restart the session. * Restart the session.
* *
@@ -345,34 +298,5 @@ export class ClientSession implements IClientSession {
}); });
return restartCompleted.promise; return restartCompleted.promise;
} }
/**
* Change the session path.
*
* @param path - The new session path.
*
* @returns A promise that resolves when the session has renamed.
*
* #### Notes
* This uses the Jupyter REST API, and the response is validated.
* The promise is fulfilled on a valid response and rejected otherwise.
*/
setPath(path: string): Promise<void> {
throw new Error('Not implemented');
}
/**
* Change the session name.
*/
setName(name: string): Promise<void> {
throw new Error('Not implemented');
}
/**
* Change the session type.
*/
setType(type: string): Promise<void> {
throw new Error('Not implemented');
}
//#endregion //#endregion
} }

79
src/sql/workbench/services/notebook/browser/models/modelInterfaces.ts
View File

@@ -55,36 +55,6 @@ export interface IClientSessionOptions {
* kernel, and can start a new kernel at any time. * kernel, and can start a new kernel at any time.
*/ */
export interface IClientSession extends IDisposable { export interface IClientSession extends IDisposable {
/**
* A signal emitted when the session is shut down.
*/
readonly terminated: Event<void>;
/**
* A signal emitted when the kernel changes.
*/
readonly kernelChanged: Event<nb.IKernelChangedArgs>;
/**
* A signal emitted when the kernel status changes.
*/
readonly statusChanged: Event<nb.ISession>;
/**
* A signal emitted for a kernel messages.
*/
readonly iopubMessage: Event<nb.IMessage>;
/**
* A signal emitted for an unhandled kernel message.
*/
readonly unhandledMessage: Event<nb.IMessage>;
/**
* A signal emitted when a session property changes.
*/
readonly propertyChanged: Event<'path' | 'name' | 'type'>;
/** /**
* The current kernel associated with the document. * The current kernel associated with the document.
*/ */
@@ -95,16 +65,6 @@ export interface IClientSession extends IDisposable {
*/ */
readonly notebookUri: URI; readonly notebookUri: URI;
/**
* The current name associated with the client session.
*/
readonly name: string;
/**
* The type of the client session.
*/
readonly type: string;
/** /**
* The current status of the client session. * The current status of the client session.
*/ */
@@ -134,11 +94,6 @@ export interface IClientSession extends IDisposable {
*/ */
readonly kernelChangeCompleted: Promise<void>; readonly kernelChangeCompleted: Promise<void>;
/**
* The display name of the kernel.
*/
readonly kernelDisplayName: string;
readonly cachedKernelSpec: nb.IKernelSpec | undefined; readonly cachedKernelSpec: nb.IKernelSpec | undefined;
/** /**
@@ -171,11 +126,6 @@ export interface IClientSession extends IDisposable {
*/ */
shutdown(): Promise<void>; shutdown(): Promise<void>;
/**
* Select a kernel for the session.
*/
selectKernel(): Promise<void>;
/** /**
* Restart the session. * Restart the session.
* *
@@ -188,29 +138,6 @@ export interface IClientSession extends IDisposable {
*/ */
restart(): Promise<void>; restart(): Promise<void>;
/**
* Change the session path.
*
* @param path - The new session path.
*
* @returns A promise that resolves when the session has renamed.
*
* #### Notes
* This uses the Jupyter REST API, and the response is validated.
* The promise is fulfilled on a valid response and rejected otherwise.
*/
setPath(path: string): Promise<void>;
/**
* Change the session name.
*/
setName(name: string): Promise<void>;
/**
* Change the session type.
*/
setType(type: string): Promise<void>;
/** /**
* Updates the connection * Updates the connection
*/ */
@@ -272,12 +199,6 @@ export interface INotebookModel {
*/ */
readonly layoutChanged: Event<void>; readonly layoutChanged: Event<void>;
/**
* Event fired on first initialization of the kernels and
* on subsequent change events
*/
readonly kernelsChanged: Event<nb.IKernel>;
/** /**
* Default kernel * Default kernel
*/ */

8
src/sql/workbench/services/notebook/browser/models/notebookModel.ts
View File

@@ -83,7 +83,6 @@ export class NotebookModel extends Disposable implements INotebookModel {
private _contextsChangedEmitter = new Emitter<void>(); private _contextsChangedEmitter = new Emitter<void>();
private _contextsLoadingEmitter = new Emitter<void>(); private _contextsLoadingEmitter = new Emitter<void>();
private _contentChangedEmitter = new Emitter<NotebookContentChange>(); private _contentChangedEmitter = new Emitter<NotebookContentChange>();
private _kernelsChangedEmitter = new Emitter<nb.IKernel>();
private _kernelsAddedEmitter = new Emitter<nb.IKernel>(); private _kernelsAddedEmitter = new Emitter<nb.IKernel>();
private _kernelChangedEmitter = new Emitter<nb.IKernelChangedArgs>(); private _kernelChangedEmitter = new Emitter<nb.IKernelChangedArgs>();
private _viewModeChangedEmitter = new Emitter<ViewMode>(); private _viewModeChangedEmitter = new Emitter<ViewMode>();
@@ -264,10 +263,6 @@ export class NotebookModel extends Disposable implements INotebookModel {
return this._kernelChangedEmitter.event; return this._kernelChangedEmitter.event;
} }
public get kernelsChanged(): Event<nb.IKernel> {
return this._kernelsChangedEmitter.event;
}
/** /**
* Event that gets fired when new kernels are added to the model from new notebook providers in the registry. * Event that gets fired when new kernels are added to the model from new notebook providers in the registry.
*/ */
@@ -1031,9 +1026,6 @@ export class NotebookModel extends Disposable implements INotebookModel {
clientSession.onKernelChanging(async (e) => { clientSession.onKernelChanging(async (e) => {
await this.loadActiveContexts(e); await this.loadActiveContexts(e);
}); });
clientSession.statusChanged(async (session) => {
this._kernelsChangedEmitter.fire(session.kernel);
});
await clientSession.initialize().then(() => { await clientSession.initialize().then(() => {
this._sessionLoadFinished.resolve(); this._sessionLoadFinished.resolve();
}); });