From 41f158f8f2dc9fd42d88752800dc8b6e861a4aed Mon Sep 17 00:00:00 2001 From: Hongfeng Sun Date: Fri, 7 Sep 2018 11:51:17 -0700 Subject: [PATCH 1/4] Add degreeOfParallelismPercent to JobInformationBasic --- .../stable/2016-11-01/job.json | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/specification/datalake-analytics/data-plane/Microsoft.DataLakeAnalytics/stable/2016-11-01/job.json b/specification/datalake-analytics/data-plane/Microsoft.DataLakeAnalytics/stable/2016-11-01/job.json index 54fa082fa4ec..b57a78fd60a1 100644 --- a/specification/datalake-analytics/data-plane/Microsoft.DataLakeAnalytics/stable/2016-11-01/job.json +++ b/specification/datalake-analytics/data-plane/Microsoft.DataLakeAnalytics/stable/2016-11-01/job.json @@ -1387,7 +1387,12 @@ "type": "integer", "default": 1, "format": "int32", - "description": "the degree of parallelism to use for this job. This must be greater than 0, if set to less than 0 it will default to 1." + "description": "the degree of parallelism used for this job. At most one of degreeOfParallelism and degreeOfParallelismPercent should be specified. If none, a default value of 1 will be used." + }, + "degreeOfParallelismPercent": { + "type": "number", + "format": "double", + "description": "the degree of parallelism in percentage used for this job. At most one of degreeOfParallelism and degreeOfParallelismPercent should be specified. If none, a default value of 1 will be used for degreeOfParallelism." }, "priority": { "type": "integer", @@ -1483,7 +1488,12 @@ "type": "integer", "default": 1, "format": "int32", - "description": "the degree of parallelism used for this job. This must be greater than 0, if set to less than 0 it will default to 1." + "description": "the degree of parallelism used for this job. At most one of degreeOfParallelism and degreeOfParallelismPercent should be specified. If none, a default value of 1 will be used." + }, + "degreeOfParallelismPercent": { + "type": "number", + "format": "double", + "description": "the degree of parallelism in percentage used for this job. At most one of degreeOfParallelism and degreeOfParallelismPercent should be specified. If none, a default value of 1 will be used for degreeOfParallelism." }, "priority": { "type": "integer", From c03348768042f6788ab9ee5f51ad1bd8413115f5 Mon Sep 17 00:00:00 2001 From: Hongfeng Sun Date: Fri, 7 Sep 2018 11:51:17 -0700 Subject: [PATCH 2/4] Add degreeOfParallelismPercent to JobInformationBasic --- .../stable/2016-11-01/job.json | 23 +++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/specification/datalake-analytics/data-plane/Microsoft.DataLakeAnalytics/stable/2016-11-01/job.json b/specification/datalake-analytics/data-plane/Microsoft.DataLakeAnalytics/stable/2016-11-01/job.json index 54fa082fa4ec..933e5bc289fc 100644 --- a/specification/datalake-analytics/data-plane/Microsoft.DataLakeAnalytics/stable/2016-11-01/job.json +++ b/specification/datalake-analytics/data-plane/Microsoft.DataLakeAnalytics/stable/2016-11-01/job.json @@ -865,14 +865,17 @@ "properties": { "runtimeVersion": { "type": "string", + "readOnly": true, "description": "the runtime version of the Data Lake Analytics engine to use for the specific type of job being run." }, "script": { "type": "string", + "readOnly": true, "description": "the script to run. Please note that the maximum script size is 3 MB." }, "type": { "type": "string", + "readOnly": true, "description": "the job type of the current job (i.e. Hive or USql)." } }, @@ -1387,7 +1390,12 @@ "type": "integer", "default": 1, "format": "int32", - "description": "the degree of parallelism to use for this job. This must be greater than 0, if set to less than 0 it will default to 1." + "description": "the degree of parallelism used for this job. At most one of degreeOfParallelism and degreeOfParallelismPercent should be specified. If none, a default value of 1 will be used." + }, + "degreeOfParallelismPercent": { + "type": "number", + "format": "double", + "description": "the degree of parallelism in percentage used for this job. At most one of degreeOfParallelism and degreeOfParallelismPercent should be specified. If none, a default value of 1 will be used for degreeOfParallelism." }, "priority": { "type": "integer", @@ -1460,10 +1468,12 @@ }, "name": { "type": "string", + "readOnly": true, "description": "the friendly name of the job." }, "type": { "type": "string", + "readOnly": true, "description": "the job type of the current job (Hive or USql).", "enum": [ "USql", @@ -1483,11 +1493,19 @@ "type": "integer", "default": 1, "format": "int32", - "description": "the degree of parallelism used for this job. This must be greater than 0, if set to less than 0 it will default to 1." + "readOnly": true, + "description": "the degree of parallelism used for this job. At most one of degreeOfParallelism and degreeOfParallelismPercent should be specified. If none, a default value of 1 will be used." + }, + "degreeOfParallelismPercent": { + "type": "number", + "format": "double", + "readOnly": true, + "description": "the degree of parallelism in percentage used for this job. At most one of degreeOfParallelism and degreeOfParallelismPercent should be specified. If none, a default value of 1 will be used for degreeOfParallelism." }, "priority": { "type": "integer", "format": "int32", + "readOnly": true, "description": "the priority value for the current job. Lower numbers have a higher priority. By default, a job has a priority of 1000. This must be greater than 0." }, "submitTime": { @@ -1554,6 +1572,7 @@ "items": { "type": "string" }, + "readOnly": true, "description": "the list of log file name patterns to find in the logFolder. '*' is the only matching character allowed. Example format: jobExecution*.log or *mylog*.txt" }, "related": { From 45cd6ed7e4e3baf6cf2e6a9a02cb051d7b19189b Mon Sep 17 00:00:00 2001 From: Hongfeng Sun Date: Tue, 18 Sep 2018 12:31:49 -0700 Subject: [PATCH 3/4] add hierarchyQueueNode to JobInformation(Basic) --- .../preview/2015-11-01-preview/job.json | 5 +++++ .../preview/2016-03-20-preview/job.json | 5 +++++ .../preview/2017-09-01-preview/job.json | 5 +++++ .../Microsoft.DataLakeAnalytics/stable/2016-11-01/job.json | 5 +++++ 4 files changed, 20 insertions(+) diff --git a/specification/datalake-analytics/data-plane/Microsoft.DataLakeAnalytics/preview/2015-11-01-preview/job.json b/specification/datalake-analytics/data-plane/Microsoft.DataLakeAnalytics/preview/2015-11-01-preview/job.json index 90b44489aee0..62c0782c97dd 100644 --- a/specification/datalake-analytics/data-plane/Microsoft.DataLakeAnalytics/preview/2015-11-01-preview/job.json +++ b/specification/datalake-analytics/data-plane/Microsoft.DataLakeAnalytics/preview/2015-11-01-preview/job.json @@ -962,6 +962,11 @@ }, "description": "Gets the job state audit records, indicating when various operations have been performed on this job." }, + "hierarchyQueueNode": { + "type": "string", + "readOnly": true, + "description": "the name of hierarchy queue node this job is assigned to, null if job has not been assigned yet or the account doesn't have hierarchy queue." + }, "properties": { "$ref": "#/definitions/JobProperties", "description": "Gets or sets the job specific properties." diff --git a/specification/datalake-analytics/data-plane/Microsoft.DataLakeAnalytics/preview/2016-03-20-preview/job.json b/specification/datalake-analytics/data-plane/Microsoft.DataLakeAnalytics/preview/2016-03-20-preview/job.json index 763c6c704d8c..453b306eb2f5 100644 --- a/specification/datalake-analytics/data-plane/Microsoft.DataLakeAnalytics/preview/2016-03-20-preview/job.json +++ b/specification/datalake-analytics/data-plane/Microsoft.DataLakeAnalytics/preview/2016-03-20-preview/job.json @@ -1018,6 +1018,11 @@ }, "description": "the job state audit records, indicating when various operations have been performed on this job." }, + "hierarchyQueueNode": { + "type": "string", + "readOnly": true, + "description": "the name of hierarchy queue node this job is assigned to, null if job has not been assigned yet or the account doesn't have hierarchy queue." + }, "properties": { "$ref": "#/definitions/JobProperties", "description": "the job specific properties." diff --git a/specification/datalake-analytics/data-plane/Microsoft.DataLakeAnalytics/preview/2017-09-01-preview/job.json b/specification/datalake-analytics/data-plane/Microsoft.DataLakeAnalytics/preview/2017-09-01-preview/job.json index 124f6d86ad52..3d571ccba645 100644 --- a/specification/datalake-analytics/data-plane/Microsoft.DataLakeAnalytics/preview/2017-09-01-preview/job.json +++ b/specification/datalake-analytics/data-plane/Microsoft.DataLakeAnalytics/preview/2017-09-01-preview/job.json @@ -778,6 +778,11 @@ "type": "string" }, "description": "The key-value pairs used to add additional metadata to the job information. (Only for use internally with Scope job type.)" + }, + "hierarchyQueueNode": { + "type": "string", + "readOnly": true, + "description": "the name of hierarchy queue node this job is assigned to, null if job has not been assigned yet or the account doesn't have hierarchy queue." } }, "description": "The common Data Lake Analytics job information properties." diff --git a/specification/datalake-analytics/data-plane/Microsoft.DataLakeAnalytics/stable/2016-11-01/job.json b/specification/datalake-analytics/data-plane/Microsoft.DataLakeAnalytics/stable/2016-11-01/job.json index 42d8fdbaa2a1..083bd538bbc6 100644 --- a/specification/datalake-analytics/data-plane/Microsoft.DataLakeAnalytics/stable/2016-11-01/job.json +++ b/specification/datalake-analytics/data-plane/Microsoft.DataLakeAnalytics/stable/2016-11-01/job.json @@ -1574,6 +1574,11 @@ "related": { "$ref": "#/definitions/JobRelationshipProperties", "description": "the recurring job relationship information properties." + }, + "hierarchyQueueNode": { + "type": "string", + "readOnly": true, + "description": "the name of hierarchy queue node this job is assigned to, null if job has not been assigned yet or the account doesn't have hierarchy queue." } }, "required": [ From 18f52ee03b87ca51b4b83de1d868a847771661fa Mon Sep 17 00:00:00 2001 From: Hongfeng Sun Date: Wed, 19 Sep 2018 11:31:38 -0700 Subject: [PATCH 4/4] Tiny change to test github merge --- .../preview/2017-09-01-preview/job.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/datalake-analytics/data-plane/Microsoft.DataLakeAnalytics/preview/2017-09-01-preview/job.json b/specification/datalake-analytics/data-plane/Microsoft.DataLakeAnalytics/preview/2017-09-01-preview/job.json index 3d571ccba645..c40b8f92d7c5 100644 --- a/specification/datalake-analytics/data-plane/Microsoft.DataLakeAnalytics/preview/2017-09-01-preview/job.json +++ b/specification/datalake-analytics/data-plane/Microsoft.DataLakeAnalytics/preview/2017-09-01-preview/job.json @@ -782,7 +782,7 @@ "hierarchyQueueNode": { "type": "string", "readOnly": true, - "description": "the name of hierarchy queue node this job is assigned to, null if job has not been assigned yet or the account doesn't have hierarchy queue." + "description": "the name of hierarchy queue node this job is assigned to, Null if job has not been assigned yet or the account doesn't have hierarchy queue." } }, "description": "The common Data Lake Analytics job information properties."