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

Merge from master

Browse Source
This commit is contained in:
Raj Musuku
2019-02-21 17:56:04 -08:00
parent 5a146e34fa
commit 666ae11639
11482 changed files with 119352 additions and 255574 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/mssql/src/constants.ts
View File

@@ -20,7 +20,7 @@ export const userPropName = 'user';
export const knoxPortPropName = 'knoxport';
export const passwordPropName = 'password';
export const groupIdPropName = 'groupId';
export const defaultKnoxPort = '30443';
export const defaultKnoxPort = 30443;
export const groupIdName = 'groupId';
export const sqlProviderName = 'MSSQL';
export const dataService = 'Data Services';

2
extensions/mssql/src/objectExplorerNodeProvider/connection.ts
View File

@@ -39,7 +39,7 @@ export class SqlClusterConnection {
public get connection(): sqlops.connection.Connection { return this._connection; }
public get profile(): sqlops.IConnectionProfile { return this._profile; }
public get host(): string { return this._host; }
public get port(): string { return this._port || constants.defaultKnoxPort; }
public get port(): number { return this._port ? Number.parseInt(this._port) : constants.defaultKnoxPort; }
public get user(): string { return this._user; }
public get password(): string { return this._password; }

4
extensions/mssql/src/objectExplorerNodeProvider/fileSources.ts
View File

@@ -72,7 +72,7 @@ export interface IHttpAuthentication {
}
export interface IHdfsOptions {
host?: string;
port?: string;
port?: number;
protocol?: string;
user?: string;
path?: string;
@@ -224,7 +224,7 @@ export class FileSourceFactory {
let optionsHost: string = options.host;
if (options.host.indexOf(delimeter) > -1) {
options.host = options.host.slice(0, options.host.indexOf(delimeter));
options.port = optionsHost.replace(options.host + delimeter, '');
options.port = Number.parseInt(optionsHost.replace(options.host + delimeter, ''));
}
return options;
}

4
extensions/mssql/src/sparkFeature/dialog/sparkJobSubmission/sparkJobSubmissionService.ts
View File

@@ -157,7 +157,7 @@ export class SparkJobSubmissionInput {
private readonly _pyFileList: string,
private readonly _otherFileList: string,
private _host?: string,
private _port?: string,
private _port?: number,
private _livyPath?: string,
private _user?: string,
private _passWord?: string) {
@@ -171,7 +171,7 @@ export class SparkJobSubmissionInput {
public get otherFileList(): string { return this._otherFileList; }
public get pyFileList(): string { return this._pyFileList; }
public get host(): string { return this._host; }
public get port(): string { return this._port; }
public get port(): number { return this._port; }
public get livyPath(): string { return this._livyPath; }
public get user(): string { return this._user; }
public get password(): string { return this._passWord; }

4
extensions/mssql/src/sparkFeature/historyTask.ts
View File

@@ -35,11 +35,11 @@ export class OpenSparkYarnHistoryTask {
}
}
private generateSparkHistoryUrl(host: string, port: string): string {
private generateSparkHistoryUrl(host: string, port: number): string {
return `https://${host}:${port}/gateway/default/sparkhistory/`;
}
private generateYarnHistoryUrl(host: string, port: string): string {
private generateYarnHistoryUrl(host: string, port: number): string {
return `https://${host}:${port}/gateway/default/yarn/cluster/apps`;
}
}