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

Handle future done in SQL for multiple batches (#4654)

Browse Source
This commit is contained in:
Chris LaFreniere
2019-03-21 13:47:01 -07:00
committed by GitHub
parent ee5a76bb0c
commit 82da64d66d
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/sql/workbench/services/notebook/sql/sqlSessionManager.ts
View File

@@ -312,7 +312,7 @@ export class SQLFuture extends Disposable implements FutureInternal {
private doneHandler: nb.MessageHandler<nb.IShellMessage>; private doneHandler: nb.MessageHandler<nb.IShellMessage>;
private doneDeferred = new Deferred<nb.IShellMessage>(); private doneDeferred = new Deferred<nb.IShellMessage>();
private configuredMaxRows: number = MAX_ROWS; private configuredMaxRows: number = MAX_ROWS;
private _outputAddedPromises: Promise<void>[] = [];
constructor(private _queryRunner: QueryRunner, private _executionCount: number | undefined, private configurationService: IConfigurationService) { constructor(private _queryRunner: QueryRunner, private _executionCount: number | undefined, private configurationService: IConfigurationService) {
super(); super();
let config = configurationService.getValue(NotebookConfigSectionName); let config = configurationService.getValue(NotebookConfigSectionName);
@@ -341,6 +341,16 @@ export class SQLFuture extends Disposable implements FutureInternal {
} }
public handleDone(err?: Error): void { public handleDone(err?: Error): void {
this.handleDoneAsync(err);
// TODO we should reject where some failure happened?
}
private async handleDoneAsync(err?: Error): Promise<void> {
// must wait on all outstanding output updates to complete
if (this._outputAddedPromises && this._outputAddedPromises.length > 0) {
// Do not care about error handling as this is handled elsewhere
await Promise.all(this._outputAddedPromises).catch((err) => undefined);
}
let msg: nb.IExecuteReplyMsg = { let msg: nb.IExecuteReplyMsg = {
channel: 'shell', channel: 'shell',
type: 'execute_reply', type: 'execute_reply',
@@ -357,7 +367,6 @@ export class SQLFuture extends Disposable implements FutureInternal {
this.doneHandler.handle(msg); this.doneHandler.handle(msg);
} }
this.doneDeferred.resolve(msg); this.doneDeferred.resolve(msg);
// TODO we should reject where some failure happened?
} }
sendInputReply(content: nb.IInputReply): void { sendInputReply(content: nb.IInputReply): void {
@@ -391,7 +400,7 @@ export class SQLFuture extends Disposable implements FutureInternal {
public handleBatchEnd(batch: BatchSummary): void { public handleBatchEnd(batch: BatchSummary): void {
if (this.ioHandler) { if (this.ioHandler) {
this.handleMessage(strings.format(elapsedTimeLabel, batch.executionElapsed)); this.handleMessage(strings.format(elapsedTimeLabel, batch.executionElapsed));
this.processResultSets(batch); this._outputAddedPromises.push(this.processResultSets(batch));
} }
} }