Skip to content

Commit

Permalink
Refactoring changes in order to match with Ben's refactoring changes (#…
Browse files Browse the repository at this point in the history 
…1452)

* There is no functional change in this commit

* This change is purely for refactoring related to Ben's refactoring
changes (which has already been accepted):
#1429

* Reordering fields in the example files to match with Ben's refactoring
changes

* Other minor changes or moving code around
  • Loading branch information
@ro-joowan @vishrutshah
ro-joowan authored and vishrutshah committed Jul 24, 2017
1 parent 7370412 commit 91edc30
Show file tree
Hide file tree
Showing 13 changed files with 236 additions and 184 deletions.
30 changes: 23 additions & 7 deletions ...-analytics/data-plane/Microsoft.DataLakeAnalytics/2016-11-01/examples/Adla_Job_Build.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,42 @@
"parameters": {
"api-version": "2016-11-01",
"parameters": {
"name": "test_name",
"type": "USql",
"properties": {
"runtimeVersion": "test_runtime_version",
"script": "test_script",
"type": "USql"
}
},
"name": "test_name"
}
},
"responses": {
"200": {
"body": {
"jobId": "076713da-9018-41ae-a3bd-9eab14e54d09",
"name": "test_name",
"type": "USql",
"submitter": "test_submitter",
"degreeOfParallelism": 1,
"priority": 1,
"submitTime": "2017-04-18T11:16:49.0748958-07:00",
"startTime": "2017-04-18T11:16:49.0748958-07:00",
"endTime": "2017-04-18T11:16:49.0748958-07:00",
"state": "Accepted",
"result": "Succeeded",
"logFolder": "adl://contosoadla.azuredatalakestore.net/system/jobservice/jobs/Usql/2016/03/13/17/18/5fe51957-93bc-4de0-8ddc-c5a4753b068b/logs/",
"logFilePatterns": [
"test_log_file_pattern_1",
"test_log_file_pattern_2"
],
"related": {
"pipelineId": "076713da-9018-41ae-a3bd-9eab14e54d09",
"pipelineName": "test_pipeline_name",
"pipelineUri": "https://account123.contosopipelineservice.com/076713da-9018-41ae-a3bd-9eab14e54d09",
"runId": "67034c12-b250-468e-992d-39fb978bde2c",
"recurrenceId": "67034c12-b250-468e-992d-39fb978bde2d",
"recurrenceName": "test_recurrence_name"
},
"errorMessage": [{
"description": "test_description",
"details": "test_details",
Expand Down Expand Up @@ -45,11 +66,6 @@
"source": "SYSTEM",
"startOffset": 1
}],
"submitTime": "2017-04-18T11:16:49.0748958-07:00",
"startTime": "2017-04-18T11:16:49.0748958-07:00",
"endTime": "2017-04-18T11:16:49.0748958-07:00",
"state": "Accepted",
"result": "Succeeded",
"stateAuditRecords": [{
"newState": "test_new_state",
"timeStamp": "2017-04-18T11:16:49.0748958-07:00",
Expand Down
56 changes: 42 additions & 14 deletions ...analytics/data-plane/Microsoft.DataLakeAnalytics/2016-11-01/examples/Adla_Job_Create.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@
"api-version": "2016-11-01",
"jobIdentity": "076713da-9018-41ae-a3bd-9eab14e54d09",
"parameters": {
"name": "test_name",
"type": "USql",
"properties": {
"runtimeVersion": "test_runtime_version",
"script": "test_script",
"type": "USql"
},
"name": "test_name",
"degreeOfParallelism": 1,
"priority": 1,
"logFilePatterns": [
"test_log_file_pattern_1",
"test_log_file_pattern_2"
],
"properties": {
"runtimeVersion": "test_runtime_version",
"script": "test_script",
"type": "USql"
},
"related": {
"pipelineId": "076713da-9018-41ae-a3bd-9eab14e54d09",
"pipelineName": "test_pipeline_name",
Expand Down Expand Up @@ -45,6 +45,42 @@
"test_log_file_pattern_1",
"test_log_file_pattern_2"
],
"related": {
"pipelineId": "076713da-9018-41ae-a3bd-9eab14e54d09",
"pipelineName": "test_pipeline_name",
"pipelineUri": "https://account123.contosopipelineservice.com/076713da-9018-41ae-a3bd-9eab14e54d09",
"runId": "67034c12-b250-468e-992d-39fb978bde2c",
"recurrenceId": "67034c12-b250-468e-992d-39fb978bde2d",
"recurrenceName": "test_recurrence_name"
},
"errorMessage": [{
"description": "test_description",
"details": "test_details",
"endOffset": 1,
"errorId": "test_error_id",
"filePath": "adl://contosoadla.azuredatalakestore.net/system/jobservice/jobs/Usql/2016/03/13/17/18/5fe51957-93bc-4de0-8ddc-c5a4753b068b/test_file.txt",
"helpLink": "https://azure.microsoft.com/en-us/blog/introducing-azure-data-lake/",
"internalDiagnostics": "test_internal_diagnostics",
"lineNumber": 1,
"message": "test_message",
"resolution": "test_resolution",
"innerError": {
"diagnosticCode": 1,
"severity": "Warning",
"details": "test_details",
"component": "test_component",
"errorId": "test_error_id",
"helpLink": "https://azure.microsoft.com/en-us/blog/introducing-azure-data-lake/",
"internalDiagnostics": "test_internal_diagnostics",
"message": "test_message",
"resolution": "test_resolution",
"source": "SYSTEM",
"description": "test_description"
},
"severity": "Warning",
"source": "SYSTEM",
"startOffset": 1
}],
"stateAuditRecords": [{
"newState": "test_new_state",
"timeStamp": "2017-04-18T11:16:49.0748958-07:00",
Expand All @@ -55,14 +91,6 @@
"runtimeVersion": "test_runtime_version",
"script": "test_script",
"type": "USql"
},
"related": {
"pipelineId": "076713da-9018-41ae-a3bd-9eab14e54d09",
"pipelineName": "test_pipeline_name",
"pipelineUri": "https://account123.contosopipelineservice.com/076713da-9018-41ae-a3bd-9eab14e54d09",
"runId": "67034c12-b250-468e-992d-39fb978bde2c",
"recurrenceId": "67034c12-b250-468e-992d-39fb978bde2d",
"recurrenceName": "test_recurrence_name"
}
}
}
Expand Down
42 changes: 21 additions & 21 deletions ...ke-analytics/data-plane/Microsoft.DataLakeAnalytics/2016-11-01/examples/Adla_Job_Get.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,26 @@
"name": "test_name",
"type": "USql",
"submitter": "test_submitter",
"degreeOfParallelism": 1,
"priority": 1,
"submitTime": "2017-04-18T11:16:49.0748958-07:00",
"startTime": "2017-04-18T11:16:49.0748958-07:00",
"endTime": "2017-04-18T11:16:49.0748958-07:00",
"state": "Accepted",
"result": "Succeeded",
"logFolder": "adl://contosoadla.azuredatalakestore.net/system/jobservice/jobs/Usql/2016/03/13/17/18/5fe51957-93bc-4de0-8ddc-c5a4753b068b/logs/",
"logFilePatterns": [
"test_log_file_pattern_1",
"test_log_file_pattern_2"
],
"related": {
"pipelineId": "076713da-9018-41ae-a3bd-9eab14e54d09",
"pipelineName": "test_pipeline_name",
"pipelineUri": "https://account123.contosopipelineservice.com/076713da-9018-41ae-a3bd-9eab14e54d09",
"runId": "67034c12-b250-468e-992d-39fb978bde2c",
"recurrenceId": "67034c12-b250-468e-992d-39fb978bde2d",
"recurrenceName": "test_recurrence_name"
},
"errorMessage": [{
"description": "test_description",
"details": "test_details",
Expand Down Expand Up @@ -38,18 +58,6 @@
"source": "SYSTEM",
"startOffset": 1
}],
"degreeOfParallelism": 1,
"priority": 1,
"submitTime": "2017-04-18T11:16:49.0748958-07:00",
"startTime": "2017-04-18T11:16:49.0748958-07:00",
"endTime": "2017-04-18T11:16:49.0748958-07:00",
"state": "Accepted",
"result": "Succeeded",
"logFolder": "adl://contosoadla.azuredatalakestore.net/system/jobservice/jobs/Usql/2016/03/13/17/18/5fe51957-93bc-4de0-8ddc-c5a4753b068b/logs/",
"logFilePatterns": [
"test_log_file_pattern_1",
"test_log_file_pattern_2"
],
"stateAuditRecords": [{
"newState": "test_new_state",
"timeStamp": "2017-04-18T11:16:49.0748958-07:00",
Expand All @@ -59,15 +67,7 @@
"properties": {
"runtimeVersion": "test_runtime_version",
"script": "test_script",
"type": "Hive"
},
"related": {
"pipelineId": "076713da-9018-41ae-a3bd-9eab14e54d09",
"pipelineName": "test_pipeline_name",
"pipelineUri": "https://account123.contosopipelineservice.com/076713da-9018-41ae-a3bd-9eab14e54d09",
"runId": "67034c12-b250-468e-992d-39fb978bde2c",
"recurrenceId": "67034c12-b250-468e-992d-39fb978bde2d",
"recurrenceName": "test_recurrence_name"
"type": "USql"
}
}
}
Expand Down
62 changes: 31 additions & 31 deletions specification/datalake-analytics/data-plane/Microsoft.DataLakeAnalytics/2016-11-01/job.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"application/json"
],
"paths": {
"/pipelines" : {
"/pipelines": {
"get": {
"tags": [
"Pipeline"
Expand Down Expand Up @@ -128,7 +128,7 @@
}
}
},
"/recurrences" : {
"/recurrences": {
"get": {
"tags": [
"Recurrence"
Expand Down Expand Up @@ -352,14 +352,14 @@
}
},
"/Jobs/{jobIdentity}": {
"get": {
"put": {
"tags": [
"Job"
],
"operationId": "Job_Get",
"description": "Gets the job information for the specified job ID.",
"operationId": "Job_Create",
"description": "Submits a job to the specified Data Lake Analytics account.",
"x-ms-examples": {
"Gets the job information for the specified job ID": { "$ref": "./examples/Adla_Job_Get.json" }
"Submits a job to the specified Data Lake Analytics account": { "$ref": "./examples/Adla_Job_Create.json" }
},
"parameters": [
{
Expand All @@ -368,29 +368,38 @@
"required": true,
"type": "string",
"format": "uuid",
"description": "JobInfo ID."
"description": "The job ID (a GUID) for the job being submitted."
},
{
"name": "parameters",
"in": "body",
"required": true,
"schema": {
"$ref": "#/definitions/CreateJobParameters"
},
"description": "The parameters to submit a job."
},
{
"$ref": "#/parameters/ApiVersionParameter"
}
],
"responses": {
"200": {
"description": "Successfully retrieved details of the specified job.",
"description": "Successfully submitted the job.",
"schema": {
"$ref": "#/definitions/JobInformation"
}
}
}
},
"put": {
"get": {
"tags": [
"Job"
],
"operationId": "Job_Create",
"description": "Submits a job to the specified Data Lake Analytics account.",
"operationId": "Job_Get",
"description": "Gets the job information for the specified job ID.",
"x-ms-examples": {
"Submits a job to the specified Data Lake Analytics account": { "$ref": "./examples/Adla_Job_Create.json" }
"Gets the job information for the specified job ID": { "$ref": "./examples/Adla_Job_Get.json" }
},
"parameters": [
{
Expand All @@ -399,24 +408,15 @@
"required": true,
"type": "string",
"format": "uuid",
"description": "The job ID (a GUID) for the job being submitted."
},
{
"name": "parameters",
"in": "body",
"required": true,
"schema": {
"$ref": "#/definitions/CreateJobParameters"
},
"description": "The parameters to submit a job."
"description": "JobInfo ID."
},
{
"$ref": "#/parameters/ApiVersionParameter"
}
],
"responses": {
"200": {
"description": "Successfully submitted the job.",
"description": "Successfully retrieved details of the specified job.",
"schema": {
"$ref": "#/definitions/JobInformation"
}
Expand Down Expand Up @@ -695,7 +695,7 @@
"details": {
"type": "string",
"readOnly": true,
"description": " the details of the audit log."
"description": "the details of the audit log."
}
},
"description": "The Data Lake Analytics job state audit records for tracking the lifecycle of a job."
Expand Down Expand Up @@ -926,32 +926,32 @@
},
"description": "The common Data Lake Analytics job properties for job submission."
},
"Diagnostics" : {
"Diagnostics": {
"properties": {
"columnNumber" : {
"columnNumber": {
"description": "the column where the error occured.",
"type": "integer",
"format": "int32",
"readOnly": true
},
"end" : {
"end": {
"description": "the ending index of the error.",
"type": "integer",
"format": "int32",
"readOnly": true
},
"lineNumber" : {
"lineNumber": {
"description": "the line number the error occured on.",
"type": "integer",
"format": "int32",
"readOnly": true
},
"message" : {
"message": {
"description": "the error message.",
"type": "string",
"readOnly": true
},
"severity" : {
"severity": {
"description": "the severity of the error.",
"readOnly": true,
"type": "string",
Expand All @@ -968,7 +968,7 @@
"modelAsString": false
}
},
"start" : {
"start": {
"description": "the starting index of the error.",
"type": "integer",
"format": "int32",
Expand Down
8 changes: 4 additions & 4 deletions ...n/datalake-analytics/resource-manager/Microsoft.DataLakeAnalytics/2016-11-01/account.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1443,14 +1443,14 @@
}
],
"responses": {
"201": {
"description": "Successfully initiated creation of the specified account.",
"200": {
"description": "Successfully created the specified account.",
"schema": {
"$ref": "#/definitions/DataLakeAnalyticsAccount"
}
},
"200": {
"description": "Successfully created the specified account.",
"201": {
"description": "Successfully initiated creation of the specified account.",
"schema": {
"$ref": "#/definitions/DataLakeAnalyticsAccount"
}
Expand Down
Loading

0 comments on commit 91edc30

Please sign in to comment.