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

Wait for clientSession to become available before running a cell. (#10796)

Browse Source
This commit is contained in:
Cory Rivera
2020-06-09 05:30:13 -07:00
committed by GitHub
parent c8a3fbca47
commit 59575aa305
5 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
extensions/integration-tests/src/test/notebook.test.ts
View File

@@ -84,7 +84,7 @@ suite('Notebook integration test suite', function () {
} }
}); });
test('Sql NB run cells above and below test @UNSTABLE@', async function () { test('Sql NB run cells above and below test', async function () {
let notebook = await openNotebook(sqlNotebookMultipleCellsContent, sqlKernelMetadata, this.test.title + this.invocationCount++); let notebook = await openNotebook(sqlNotebookMultipleCellsContent, sqlKernelMetadata, this.test.title + this.invocationCount++);
// When running all cells above a cell, ensure that only cells preceding current cell have output // When running all cells above a cell, ensure that only cells preceding current cell have output
await runCells(notebook, true, undefined, notebook.document.cells[1]); await runCells(notebook, true, undefined, notebook.document.cells[1]);
@@ -101,13 +101,13 @@ suite('Notebook integration test suite', function () {
assert(notebook.document.cells[2].contents.outputs.length === 3, `Expected length: '3', Actual: '${notebook.document.cells[2].contents.outputs.length}'`); assert(notebook.document.cells[2].contents.outputs.length === 3, `Expected length: '3', Actual: '${notebook.document.cells[2].contents.outputs.length}'`);
}); });
test('Clear cell output - SQL notebook @UNSTABLE@', async function () { test('Clear cell output - SQL notebook', async function () {
let notebook = await openNotebook(sqlNotebookContent, sqlKernelMetadata, this.test.title + this.invocationCount++); let notebook = await openNotebook(sqlNotebookContent, sqlKernelMetadata, this.test.title + this.invocationCount++);
await runCell(notebook); await runCell(notebook);
await verifyClearOutputs(notebook); await verifyClearOutputs(notebook);
}); });
test('Clear all outputs - SQL notebook @UNSTABLE@', async function () { test('Clear all outputs - SQL notebook', async function () {
let notebook = await openNotebook(sqlNotebookContent, sqlKernelMetadata, this.test.title + this.invocationCount++); let notebook = await openNotebook(sqlNotebookContent, sqlKernelMetadata, this.test.title + this.invocationCount++);
await runCell(notebook); await runCell(notebook);
await verifyClearAllOutputs(notebook); await verifyClearAllOutputs(notebook);

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

@@ -39,6 +39,9 @@ export class NotebookModelStub implements INotebookModel {
get clientSession(): IClientSession { get clientSession(): IClientSession {
throw new Error('method not implemented.'); throw new Error('method not implemented.');
} }
get sessionLoadFinished(): Promise<void> {
throw new Error('method not implemented.');
}
get notebookManagers(): INotebookManager[] { get notebookManagers(): INotebookManager[] {
throw new Error('method not implemented.'); throw new Error('method not implemented.');
} }

4
src/sql/workbench/services/notebook/browser/models/cell.ts
View File

@@ -373,12 +373,14 @@ export class CellModel implements ICellModel {
private async getOrStartKernel(notificationService: INotificationService): Promise<nb.IKernel> { private async getOrStartKernel(notificationService: INotificationService): Promise<nb.IKernel> {
let model = this._options.notebook; let model = this._options.notebook;
if (model) {
await model.sessionLoadFinished;
}
let clientSession = model && model.clientSession; let clientSession = model && model.clientSession;
if (!clientSession) { if (!clientSession) {
this.sendNotification(notificationService, Severity.Error, localize('notebookNotReady', "The session for this notebook is not yet ready")); this.sendNotification(notificationService, Severity.Error, localize('notebookNotReady', "The session for this notebook is not yet ready"));
return undefined; return undefined;
} else if (!clientSession.isReady || clientSession.status === 'dead') { } else if (!clientSession.isReady || clientSession.status === 'dead') {
this.sendNotification(notificationService, Severity.Info, localize('sessionNotReady', "The session for this notebook will start momentarily")); this.sendNotification(notificationService, Severity.Info, localize('sessionNotReady', "The session for this notebook will start momentarily"));
await clientSession.kernelChangeCompleted; await clientSession.kernelChangeCompleted;
} }

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

@@ -233,6 +233,10 @@ export interface INotebookModel {
* Client Session in the notebook, used for sending requests to the notebook service * Client Session in the notebook, used for sending requests to the notebook service
*/ */
readonly clientSession: IClientSession; readonly clientSession: IClientSession;
/**
* Promise indicating when client session is ready to use.
*/
readonly sessionLoadFinished: Promise<void>;
/** /**
* LanguageInfo saved in the notebook * LanguageInfo saved in the notebook
*/ */

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

@@ -29,6 +29,7 @@ import { find, firstIndex } from 'vs/base/common/arrays';
import { startsWith } from 'vs/base/common/strings'; import { startsWith } from 'vs/base/common/strings';
import { notebookConstants } from 'sql/workbench/services/notebook/browser/interfaces'; import { notebookConstants } from 'sql/workbench/services/notebook/browser/interfaces';
import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry'; import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry';
import { Deferred } from 'sql/base/common/promise';
/* /*
* Used to control whether a message in a dialog/wizard is displayed as an error, * Used to control whether a message in a dialog/wizard is displayed as an error,
@@ -54,7 +55,7 @@ export class NotebookModel extends Disposable implements INotebookModel {
private _layoutChanged = new Emitter<void>(); private _layoutChanged = new Emitter<void>();
private _inErrorState: boolean = false; private _inErrorState: boolean = false;
private _activeClientSession: IClientSession; private _activeClientSession: IClientSession;
private _sessionLoadFinished: Promise<void>; private _sessionLoadFinished = new Deferred<void>();
private _onClientSessionReady = new Emitter<IClientSession>(); private _onClientSessionReady = new Emitter<IClientSession>();
private _onProviderIdChanged = new Emitter<string>(); private _onProviderIdChanged = new Emitter<string>();
private _trustedMode: boolean; private _trustedMode: boolean;
@@ -148,7 +149,6 @@ export class NotebookModel extends Disposable implements INotebookModel {
return this._contentChangedEmitter.event; return this._contentChangedEmitter.event;
} }
public get isSessionReady(): boolean { public get isSessionReady(): boolean {
return !!this._activeClientSession; return !!this._activeClientSession;
} }
@@ -492,7 +492,9 @@ export class NotebookModel extends Disposable implements INotebookModel {
clientSession.statusChanged(async (session) => { clientSession.statusChanged(async (session) => {
this._kernelsChangedEmitter.fire(session.kernel); this._kernelsChangedEmitter.fire(session.kernel);
}); });
await clientSession.initialize(); await clientSession.initialize().then(() => {
this._sessionLoadFinished.resolve();
});
// By somehow we have to wait for ready, otherwise may not be called for some cases. // By somehow we have to wait for ready, otherwise may not be called for some cases.
await clientSession.ready; await clientSession.ready;
if (clientSession.kernel) { if (clientSession.kernel) {