Skip to content

Commit 2dbf9c1

Browse files
ro-joowanro-joowan
committed
Changing parameters with DegreeOfParallelism to AnalyticsUnits
1 parent 7094d28 commit 2dbf9c1

14 files changed

+105
-100
lines changed

‎src/ResourceManager/DataLakeAnalytics/ChangeLog.md

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,16 @@
2020
## Current Release
2121
* Added a parameter called ScriptParameter to Submit-AzureRmDataLakeAnalyticsJob
2222
- Detailed information about ScriptParameter can be found using Get-Help on Submit-AzureRmDataLakeAnalyticsJob
23-
* Added an alias to MaxDegreeOfParallelism of New-AzureRmDataLakeAnalyticsAccount: MaxAnalyticsUnits
24-
* Added an alias to MaxDegreeOfParallelismPerJob of New-AzureRmDataLakeAnalyticsComputePolicy: MaxAnalyticsUnitsPerJob
25-
* Added an alias to MaxDegreeOfParallelism of Set-AzureRmDataLakeAnalyticsAccount: MaxAnalyticsUnits
26-
* Added an alias to DegreeOfParallelism of Submit-AzureRmDataLakeAnalyticsJob: AnalyticsUnits
27-
* Added an alias to MaxDegreeOfParallelismPerJob of Update-AzureRmDataLakeAnalyticsComputePolicy: MaxAnalyticsUnitsPerJob
23+
* For New-AzureRmDataLakeAnalyticsAccount, changed the parameter MaxDegreeOfParallelism to MaxAnalyticsUnits
24+
- Added an alias for the parameter MaxAnalyticsUnits: MaxDegreeOfParallelism
25+
* For New-AzureRmDataLakeAnalyticsComputePolicy, changed the parameter MaxDegreeOfParallelismPerJob to MaxAnalyticsUnitsPerJob
26+
- Added an alias for the parameter MaxAnalyticsUnitsPerJob: MaxDegreeOfParallelismPerJob
27+
* For Set-AzureRmDataLakeAnalyticsAccount, changed the parameter MaxDegreeOfParallelism to MaxAnalyticsUnits
28+
- Added an alias for the parameter MaxAnalyticsUnits: MaxDegreeOfParallelism
29+
* For Submit-AzureRmDataLakeAnalyticsJob, changed the parameter DegreeOfParallelism to AnalyticsUnits
30+
- Added an alias for the parameter AnalyticsUnits: DegreeOfParallelism
31+
* For Update-AzureRmDataLakeAnalyticsComputePolicy, changed the parameter MaxDegreeOfParallelismPerJob to MaxAnalyticsUnitsPerJob
32+
- Added an alias for the parameter MaxAnalyticsUnitsPerJob: MaxDegreeOfParallelismPerJob
2833

2934
## Version 4.0.0
3035
* NOTE: This is a breaking change release. Please see the migration guide (https://aka.ms/azps-migration-guide) for a full list of breaking changes introduced.

‎src/ResourceManager/DataLakeAnalytics/Commands.DataLakeAnalytics/Commands/NewAzureRmDataLakeAnalyticsAccount.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@ public class NewAzureDataLakeAnalyticsAccount : DataLakeAnalyticsCmdletBase
5454
public Hashtable Tags { get; set; }
5555

5656
[Parameter(ValueFromPipelineByPropertyName = true, Mandatory = false,
57-
HelpMessage = "The maximum supported degree of parallelism for this account.")]
57+
HelpMessage = "The maximum supported analytics units for this account.")]
5858
[ValidateNotNull]
5959
[ValidateRange(1, int.MaxValue)]
60-
[Alias("MaxAnalyticsUnits")]
61-
public int? MaxDegreeOfParallelism { get; set; }
60+
[Alias("MaxDegreeOfParallelism")]
61+
public int? MaxAnalyticsUnits { get; set; }
6262

6363
[Parameter(ValueFromPipelineByPropertyName = true, Mandatory = false,
6464
HelpMessage = "The maximum supported jobs running under the account at the same time.")]
@@ -118,7 +118,7 @@ public override void ExecuteCmdlet()
118118
Location,
119119
defaultStorage,
120120
customTags: Tags,
121-
maxDegreeOfParallelism: MaxDegreeOfParallelism,
121+
maxAnalyticsUnits: MaxAnalyticsUnits,
122122
maxJobCount: MaxJobCount,
123123
queryStoreRetention: QueryStoreRetention,
124124
tier: Tier)));

‎src/ResourceManager/DataLakeAnalytics/Commands.DataLakeAnalytics/Commands/NewAzureRmDataLakeAnalyticsComputePolicy.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -57,21 +57,21 @@ public class NewAzureDataLakeAnalyticsComputePolicy : DataLakeAnalyticsCmdletBas
5757
public string ObjectType { get; set; }
5858

5959
[Parameter(ValueFromPipelineByPropertyName = true, Mandatory = false,
60-
HelpMessage = "The maximum supported degree of parallelism per job for this policy. Either this, MinPriorityPerJob, or both parameters must be specified.")]
60+
HelpMessage = "The maximum supported analytics units per job for this policy. Either this, MinPriorityPerJob, or both parameters must be specified.")]
6161
[ValidateNotNull]
6262
[ValidateRange(1, int.MaxValue)]
63-
[Alias("MaxAnalyticsUnitsPerJob")]
64-
public int? MaxDegreeOfParallelismPerJob { get; set; }
63+
[Alias("MaxDegreeOfParallelismPerJob")]
64+
public int? MaxAnalyticsUnitsPerJob { get; set; }
6565

6666
[Parameter(ValueFromPipelineByPropertyName = true, Mandatory = false,
67-
HelpMessage = "The minimum supported priority per job for this policy. Either this, MaxDegreeOfParallelismPerJob, or both parameters must be specified.")]
67+
HelpMessage = "The minimum supported priority per job for this policy. Either this, MaxAnalyticsUnitsPerJob, or both parameters must be specified.")]
6868
[ValidateNotNull]
6969
[ValidateRange(0, int.MaxValue)]
7070
public int? MinPriorityPerJob { get; set; }
7171

7272
public override void ExecuteCmdlet()
7373
{
74-
if (!MinPriorityPerJob.HasValue && !MaxDegreeOfParallelismPerJob.HasValue)
74+
if (!MinPriorityPerJob.HasValue && !MaxAnalyticsUnitsPerJob.HasValue)
7575
{
7676
throw new ArgumentException(Resources.MissingComputePolicyField);
7777
}
@@ -81,7 +81,7 @@ public override void ExecuteCmdlet()
8181
Resources.NewDataLakeComputePolicy,
8282
Name,
8383
MinPriorityPerJob.HasValue ? "\r\nMinPriorityPerJob: " + MinPriorityPerJob.Value : string.Empty,
84-
MaxDegreeOfParallelismPerJob.HasValue ? "\r\nMaxDegreeOfParallelismPerJob: " + MaxDegreeOfParallelismPerJob.Value : string.Empty),
84+
MaxAnalyticsUnitsPerJob.HasValue ? "\r\nMaxAnalyticsUnitsPerJob: " + MaxAnalyticsUnitsPerJob.Value : string.Empty),
8585
Name, () =>
8686
{
8787
WriteObject(
@@ -91,7 +91,7 @@ public override void ExecuteCmdlet()
9191
Name,
9292
ObjectId,
9393
ObjectType,
94-
MaxDegreeOfParallelismPerJob,
94+
MaxAnalyticsUnitsPerJob,
9595
MinPriorityPerJob));
9696
});
9797
}

‎src/ResourceManager/DataLakeAnalytics/Commands.DataLakeAnalytics/Commands/SetAzureRmDataLakeAnalyticsAccount.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,12 @@ public class SetAzureDataLakeAnalyticsAccount : DataLakeAnalyticsCmdletBase
4343
public string ResourceGroupName { get; set; }
4444

4545
[Parameter(ValueFromPipelineByPropertyName = true, Mandatory = false,
46-
HelpMessage = "The maximum supported degree of parallelism for this account.")]
46+
HelpMessage = "The maximum supported analytics units for this account.")]
4747
[ValidateNotNull]
4848
[ValidateRange(1, int.MaxValue)]
49-
[Alias("MaxAnalyticsUnits")]
50-
public int? MaxDegreeOfParallelism { get; set; }
51-
49+
[Alias("MaxDegreeOfParallelism")]
50+
public int? MaxAnalyticsUnits { get; set; }
51+
5252
[Parameter(ValueFromPipelineByPropertyName = true, Mandatory = false,
5353
HelpMessage = "The maximum supported jobs running under the account at the same time.")]
5454
[ValidateNotNull]
@@ -104,7 +104,7 @@ public override void ExecuteCmdlet()
104104
null,
105105
null,
106106
Tags,
107-
MaxDegreeOfParallelism,
107+
MaxAnalyticsUnits,
108108
MaxJobCount,
109109
QueryStoreRetention,
110110
Tier,

‎src/ResourceManager/DataLakeAnalytics/Commands.DataLakeAnalytics/Commands/SubmitAzureRmDataLakeAnalyticsJob.cs

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public class SubmitAzureDataLakeAnalyticsJob : DataLakeAnalyticsCmdletBase
3535
internal const string USqlJobWithScriptPathAndPipeline = "SubmitUSqlJobWithScriptPathAndPipeline";
3636
internal const string USqlJobParameterSetNameAndPipeline = "SubmitUSqlJobWithPipeline";
3737

38-
private int _degreeOfParallelism = 1;
38+
private int _analyticsUnits = 1;
3939
private int _priority = 1000;
4040

4141
// TODO: Remove this once other job types are enabled
@@ -196,38 +196,38 @@ public SwitchParameter USql
196196
[Parameter(ValueFromPipelineByPropertyName = true, ParameterSetName = USqlJobWithScriptPath, Position = 6,
197197
Mandatory = false,
198198
HelpMessage =
199-
"The degree of parallelism to use for this job. Typically, a higher degree of parallelism dedicated to a script results in faster script execution time."
199+
"The analytics units to use for this job. Typically, more analytics units dedicated to a script results in faster script execution time."
200200
)]
201201
[Parameter(ValueFromPipelineByPropertyName = true, ParameterSetName = USqlJobParameterSetName, Position = 6,
202202
Mandatory = false,
203203
HelpMessage =
204-
"The degree of parallelism to use for this job. Typically, a higher degree of parallelism dedicated to a script results in faster script execution time."
204+
"The analytics units to use for this job. Typically, more analytics units dedicated to a script results in faster script execution time."
205205
)]
206206
[Parameter(ValueFromPipelineByPropertyName = true, ParameterSetName = USqlJobWithScriptPathAndRecurrence, Position = 6,
207207
Mandatory = false,
208208
HelpMessage =
209-
"The degree of parallelism to use for this job. Typically, a higher degree of parallelism dedicated to a script results in faster script execution time."
209+
"The analytics units to use for this job. Typically, more analytics units dedicated to a script results in faster script execution time."
210210
)]
211211
[Parameter(ValueFromPipelineByPropertyName = true, ParameterSetName = USqlJobParameterSetNameAndRecurrence, Position = 6,
212212
Mandatory = false,
213213
HelpMessage =
214-
"The degree of parallelism to use for this job. Typically, a higher degree of parallelism dedicated to a script results in faster script execution time."
214+
"The analytics units to use for this job. Typically, more analytics units dedicated to a script results in faster script execution time."
215215
)]
216216
[Parameter(ValueFromPipelineByPropertyName = true, ParameterSetName = USqlJobWithScriptPathAndPipeline, Position = 6,
217217
Mandatory = false,
218218
HelpMessage =
219-
"The degree of parallelism to use for this job. Typically, a higher degree of parallelism dedicated to a script results in faster script execution time."
219+
"The analytics units to use for this job. Typically, more analytics units dedicated to a script results in faster script execution time."
220220
)]
221221
[Parameter(ValueFromPipelineByPropertyName = true, ParameterSetName = USqlJobParameterSetNameAndPipeline, Position = 6,
222222
Mandatory = false,
223223
HelpMessage =
224-
"The degree of parallelism to use for this job. Typically, a higher degree of parallelism dedicated to a script results in faster script execution time."
224+
"The analytics units to use for this job. Typically, more analytics units dedicated to a script results in faster script execution time."
225225
)]
226-
[Alias("AnalyticsUnits")]
227-
public int DegreeOfParallelism
226+
[Alias("DegreeOfParallelism")]
227+
public int AnalyticsUnits
228228
{
229-
get { return _degreeOfParallelism; }
230-
set { _degreeOfParallelism = value; }
229+
get { return _analyticsUnits; }
230+
set { _analyticsUnits = value; }
231231
}
232232

233233
[Parameter(ValueFromPipelineByPropertyName = true, ParameterSetName = USqlJobWithScriptPath, Position = 7,
@@ -368,9 +368,9 @@ public int Priority
368368

369369
public override void ExecuteCmdlet()
370370
{
371-
if (DegreeOfParallelism < 1)
371+
if (AnalyticsUnits < 1)
372372
{
373-
WriteWarning(Resources.InvalidDegreeOfParallelism);
373+
WriteWarning(Resources.InvalidAnalyticsUnits);
374374
}
375375

376376
// Error handling for not passing or passing both script and script path
@@ -604,7 +604,7 @@ public override void ExecuteCmdlet()
604604
{
605605
Type = jobType,
606606
Name = Name,
607-
DegreeOfParallelism = DegreeOfParallelism,
607+
DegreeOfParallelism = AnalyticsUnits,
608608
Priority = Priority,
609609
Properties = properties,
610610
};

‎src/ResourceManager/DataLakeAnalytics/Commands.DataLakeAnalytics/Commands/UpdateAzureRmDataLakeAnalyticsComputePolicy.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,21 +46,21 @@ public class UpdateAzureDataLakeAnalyticsComputePolicy : DataLakeAnalyticsCmdlet
4646
public string Name { get; set; }
4747

4848
[Parameter(ValueFromPipelineByPropertyName = true, Mandatory = false,
49-
HelpMessage = "The maximum supported degree of parallelism per job for this policy. Either this, MinPriorityPerJob, or both parameters must be specified.")]
49+
HelpMessage = "The maximum supported analytics units per job for this policy. Either this, MinPriorityPerJob, or both parameters must be specified.")]
5050
[ValidateNotNull]
5151
[ValidateRange(1, int.MaxValue)]
52-
[Alias("MaxAnalyticsUnitsPerJob")]
53-
public int? MaxDegreeOfParallelismPerJob { get; set; }
54-
52+
[Alias("MaxDegreeOfParallelismPerJob")]
53+
public int? MaxAnalyticsUnitsPerJob { get; set; }
54+
5555
[Parameter(ValueFromPipelineByPropertyName = true, Mandatory = false,
56-
HelpMessage = "The minimum supported priority per job for this policy. Either this, MaxDegreeOfParallelismPerJob, or both parameters must be specified.")]
56+
HelpMessage = "The minimum supported priority per job for this policy. Either this, MaxAnalyticsUnitsPerJob, or both parameters must be specified.")]
5757
[ValidateNotNull]
5858
[ValidateRange(0, int.MaxValue)]
5959
public int? MinPriorityPerJob { get; set; }
6060

6161
public override void ExecuteCmdlet()
6262
{
63-
if (!MinPriorityPerJob.HasValue && !MaxDegreeOfParallelismPerJob.HasValue)
63+
if (!MinPriorityPerJob.HasValue && !MaxAnalyticsUnitsPerJob.HasValue)
6464
{
6565
throw new ArgumentException(Resources.MissingComputePolicyField);
6666
}
@@ -70,15 +70,15 @@ public override void ExecuteCmdlet()
7070
Resources.UpdateDataLakeComputePolicy,
7171
Name,
7272
MinPriorityPerJob.HasValue ? "\r\nMinPriorityPerJob: " + MinPriorityPerJob.Value : string.Empty,
73-
MaxDegreeOfParallelismPerJob.HasValue ? "\r\nMaxDegreeOfParallelismPerJob: " + MaxDegreeOfParallelismPerJob.Value : string.Empty),
73+
MaxAnalyticsUnitsPerJob.HasValue ? "\r\nMaxAnalyticsUnitsPerJob: " + MaxAnalyticsUnitsPerJob.Value : string.Empty),
7474
Name, () =>
7575
{
7676
WriteObject(
7777
this.DataLakeAnalyticsClient.UpdateComputePolicy(
7878
ResourceGroupName,
7979
Account,
8080
Name,
81-
MaxDegreeOfParallelismPerJob,
81+
MaxAnalyticsUnitsPerJob,
8282
MinPriorityPerJob));
8383
});
8484
}

‎src/ResourceManager/DataLakeAnalytics/Commands.DataLakeAnalytics/Models/DataLakeAnalyticsClient.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public DataLakeAnalyticsAccount CreateOrUpdateAccount(string resourceGroupName,
8383
IList<DataLakeStoreAccountInfo> additionalDataLakeStoreAccounts = null,
8484
IList<StorageAccountInfo> additionalStorageAccounts = null,
8585
Hashtable customTags = null,
86-
int? maxDegreeOfParallelism = 0,
86+
int? maxAnalyticsUnits = 0,
8787
int? maxJobCount = 0,
8888
int? queryStoreRetention = 0,
8989
TierType? tier = null,
@@ -131,9 +131,9 @@ public DataLakeAnalyticsAccount CreateOrUpdateAccount(string resourceGroupName,
131131
};
132132
}
133133

134-
if(maxDegreeOfParallelism.HasValue && maxDegreeOfParallelism > 0)
134+
if(maxAnalyticsUnits.HasValue && maxAnalyticsUnits > 0)
135135
{
136-
parameters.MaxDegreeOfParallelism = maxDegreeOfParallelism;
136+
parameters.MaxDegreeOfParallelism = maxAnalyticsUnits;
137137
}
138138

139139
if(maxJobCount.HasValue && maxJobCount > 0)
@@ -1118,7 +1118,7 @@ private IList<USqlType> GetTypes(string accountName, string databaseName,
11181118

11191119
#endregion
11201120
#region Compute Policy Operations
1121-
public ComputePolicy CreateComputePolicy(string resourceGroupName, string accountName, string policyName, Guid objectId, string objectType, int? maxDopPerJob = null, int? minPriorityPerJob = null)
1121+
public ComputePolicy CreateComputePolicy(string resourceGroupName, string accountName, string policyName, Guid objectId, string objectType, int? maxAnalyticsUnitsPerJob = null, int? minPriorityPerJob = null)
11221122
{
11231123
if (string.IsNullOrEmpty(resourceGroupName))
11241124
{
@@ -1129,12 +1129,12 @@ public ComputePolicy CreateComputePolicy(string resourceGroupName, string accoun
11291129
{
11301130
ObjectId = objectId,
11311131
ObjectType = objectType,
1132-
MaxDegreeOfParallelismPerJob = maxDopPerJob,
1132+
MaxDegreeOfParallelismPerJob = maxAnalyticsUnitsPerJob,
11331133
MinPriorityPerJob = minPriorityPerJob
11341134
});
11351135
}
11361136

1137-
public ComputePolicy UpdateComputePolicy(string resourceGroupName, string accountName, string policyName, int? maxDopPerJob = null, int? minPriorityPerJob = null)
1137+
public ComputePolicy UpdateComputePolicy(string resourceGroupName, string accountName, string policyName, int? maxAnalyticsUnitsPerJob = null, int? minPriorityPerJob = null)
11381138
{
11391139
if (string.IsNullOrEmpty(resourceGroupName))
11401140
{
@@ -1143,7 +1143,7 @@ public ComputePolicy UpdateComputePolicy(string resourceGroupName, string accoun
11431143

11441144
return _accountClient.ComputePolicies.Update(resourceGroupName, accountName, policyName, new ComputePolicy
11451145
{
1146-
MaxDegreeOfParallelismPerJob = maxDopPerJob,
1146+
MaxDegreeOfParallelismPerJob = maxAnalyticsUnitsPerJob,
11471147
MinPriorityPerJob = minPriorityPerJob
11481148
});
11491149
}

‎src/ResourceManager/DataLakeAnalytics/Commands.DataLakeAnalytics/Properties/Resources.Designer.cs

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)