ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-02 01:25:39 -05:00
Code Issues Packages Projects Releases Wiki Activity

Queue concurrent calls when initializing contents in BookModel (#14586) (#14619)

Browse Source 
* Initial work for handling concurrent operations when calling initialized books

* fixes to init contents

* create a queue of deferred promises for initializing books

* resolve active promise and set to undefined

* remove duplicated variable

* address pr comments
This commit is contained in:
Barbara Valdez
2021-03-10 19:04:20 -08:00
committed by GitHub
parent 4772be5dcc
commit 9ae254c91e
1 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
extensions/notebook/src/book/bookModel.ts
View File

@@ -14,6 +14,7 @@ import * as loc from '../common/localizedConstants';
import { IJupyterBookToc, JupyterBookSection } from '../contracts/content';
import { convertFrom, getContentPath, BookVersion } from './bookVersionHandler';
import { debounce } from '../common/utils';
import { Deferred } from '../common/promise';
const fsPromises = fileServices.promises;
const content = 'content';
@@ -26,6 +27,8 @@ export class BookModel {
private _bookVersion: BookVersion;
private _rootPath: string;
private _errorMessage: string;
private _activePromise: Deferred<void> | undefined = undefined;
private _queuedPromises: Deferred<void>[] = [];
constructor(
public readonly bookPath: string,
@@ -56,14 +59,31 @@ export class BookModel {
}
public async initializeContents(): Promise<void> {
this._bookItems = [];
this._allNotebooks = new Map<string, BookTreeItem>();
if (this.isNotebook) {
this.readNotebook();
} else {
await this.readBookStructure();
await this.loadTableOfContentFiles();
await this.readBooks();
const deferred = new Deferred<void>();
if (!this._activePromise && this._queuedPromises.length === 0) {
this._activePromise = deferred;
}
else {
// If there's an active promise, then we need to add the new promise to the queue.
this._queuedPromises.push(deferred);
await deferred.promise;
}
try {
this._bookItems = [];
this._allNotebooks = new Map<string, BookTreeItem>();
if (this.isNotebook) {
this.readNotebook();
} else {
await this.readBookStructure();
await this.loadTableOfContentFiles();
await this.readBooks();
}
}
finally {
// Resolve next promise in queue
const queuedPromise = this._queuedPromises.shift();
queuedPromise?.resolve();
this._activePromise = queuedPromise;
}
}