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

Fix Spark kernel connections and switch from Kusto to Spark kernels (#12436) (#12441)

Browse Source 
* Fix connection dialog for Spark and issue when switching from Kusto to Spark

* Address comments
This commit is contained in:
Vasu Bhog
2020-09-17 23:32:03 -05:00
committed by GitHub
parent b158180ef4
commit e7798a8e32
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/sql/workbench/contrib/notebook/browser/notebookActions.ts
View File

@@ -457,8 +457,15 @@ export class AttachToDropdown extends SelectBox {
try { try {
// Get all providers to show all available connections in connection dialog // Get all providers to show all available connections in connection dialog
let providers = this.model.getApplicableConnectionProviderIds(this.model.clientSession.kernel.name); let providers = this.model.getApplicableConnectionProviderIds(this.model.clientSession.kernel.name);
for (let alias of this.model.kernelAliases) { // Spark kernels are unable to get providers from above, therefore ensure that we get the
providers = providers.concat(this.model.getApplicableConnectionProviderIds(alias)); // correct providers for the selected kernel and load the proper connections for the connection dialog
// Example Scenario: Spark Kernels should only have MSSQL connections in connection dialog
if (!this.model.kernelAliases.includes(this.model.selectedKernelDisplayName) && this.model.clientSession.kernel.name !== 'SQL') {
providers = providers.concat(this.model.getApplicableConnectionProviderIds(this.model.selectedKernelDisplayName));
} else {
for (let alias of this.model.kernelAliases) {
providers = providers.concat(this.model.getApplicableConnectionProviderIds(alias));
}
} }
let connection = await this._connectionDialogService.openDialogAndWait(this._connectionManagementService, let connection = await this._connectionDialogService.openDialogAndWait(this._connectionManagementService,
{ {

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

@@ -658,8 +658,11 @@ export class NotebookModel extends Disposable implements INotebookModel {
let providerFeatures = this._capabilitiesService.getCapabilities(profile.providerName); let providerFeatures = this._capabilitiesService.getCapabilities(profile.providerName);
if (connectionProviderIds?.length) { if (connectionProviderIds?.length) {
this._currentKernelAlias = providerFeatures?.connection.notebookKernelAlias; this._currentKernelAlias = providerFeatures?.connection.notebookKernelAlias;
// Adds Kernel Alias and Connection Provider to Map if new Notebook connection contains notebookKernelAlias // Switching from Kusto to another kernel should set the currentKernelAlias to undefined
if (this._currentKernelAlias) { if (this._selectedKernelDisplayName !== this._currentKernelAlias && this._selectedKernelDisplayName) {
this._currentKernelAlias = undefined;
} else {
// Adds Kernel Alias and Connection Provider to Map if new Notebook connection contains notebookKernelAlias
this._kernelDisplayNameToConnectionProviderIds.set(this._currentKernelAlias, [profile.providerName]); this._kernelDisplayNameToConnectionProviderIds.set(this._currentKernelAlias, [profile.providerName]);
} }
} }