Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[PR] - Add JSON dataset support in ADF #6739

Closed
wants to merge 4 commits into from
Closed

[PR] - Add JSON dataset support in ADF #6739

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
29e561c
Add json dataset
shawnxzq Jul 16, 2019
55333d2
Added JSON v2 dataset
shawnxzq Jul 18, 2019
76fa69d
Fixed description messages
shawnxzq Jul 19, 2019
d49776e
Improved description message according to review comments
shawnxzq Jul 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 37 additions & 0 deletions ...factory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Dataset.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -651,6 +651,43 @@
}
}
},
"JsonDataset": {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please update examples that showcase the new models that have been added.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The dataset model itself is not new, and it already have examples for the dataset model. The JsonDataset is just one type of the dataset, and we usually don't have examples to cover all types of datasets since it has 80+ types. However, we will definitely add serialization/deserialization tests in SDK to cover all dataset types.

"x-ms-discriminator-value": "Json",
"description": "Json dataset.",
"type": "object",
"allOf": [
{
"$ref": "#/definitions/Dataset"
}
],
"properties": {
"typeProperties": {
"description": "Json dataset properties.",
"x-ms-client-flatten": true,
"$ref": "#/definitions/JsonDatasetTypeProperties"
}
}
},
"JsonDatasetTypeProperties": {
"description": "Json dataset properties.",
"properties": {
"location": {
"$ref": "#/definitions/DatasetLocation",
"description": "The location of the json data storage."
},
"encodingName": {
"type": "object",
"description": "The code page name of the preferred encoding. If not specified, the default value is UTF-8, unless BOM denotes another Unicode encoding. Refer to the name column of the table in the following link to set supported values: https://msdn.microsoft.com/library/system.text.encoding.aspx. Type: string (or Expression with resultType string)."
},
"compression": {
"description": "The data compression method used for the json dataset.",
"$ref": "#/definitions/DatasetCompression"
}
},
"required": [
"location"
]
},
"AzureBlobDatasetTypeProperties": {
"description": "Azure Blob dataset properties.",
"properties": {
Expand Down
57 changes: 57 additions & 0 deletions ...actory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -657,6 +657,29 @@
"fileExtension"
]
},
"JsonWriteSettings": {
"description": "Json write settings.",
"type": "object",
"allOf": [
{
"$ref": "#/definitions/FormatWriteSettings"
}
],
"properties": {
"filePattern": {
"description": "File pattern of JSON. This setting controls the way a collection of JSON objects will be treated. The default value is 'setOfObjects'. It is case-sensitive.",
"type": "string",
"enum": [
"setOfObjects",
"arrayOfObjects"
],
"x-ms-enum": {
"name": "JsonWriteFilePattern",
"modelAsString": true
}
}
}
},
"ParquetSource": {
"description": "A copy activity Parquet source.",
"type": "object",
Expand Down Expand Up @@ -691,6 +714,21 @@
}
}
},
"JsonSource": {
"description": "A copy activity Json source.",
"type": "object",
"allOf": [
{
"$ref": "#/definitions/CopySource"
}
],
"properties": {
"storeSettings": {
"$ref": "#/definitions/StoreReadSettings",
"description": "Json store settings."
}
}
},
"DelimitedTextSink": {
"description": "A copy activity DelimitedText sink.",
"type": "object",
Expand All @@ -710,6 +748,25 @@
}
}
},
"JsonSink": {
"description": "A copy activity Json sink.",
"type": "object",
"allOf": [
{
"$ref": "#/definitions/CopySink"
}
],
"properties": {
"storeSettings": {
"$ref": "#/definitions/StoreWriteSettings",
"description": "Json store settings."
},
"formatSettings": {
"$ref": "#/definitions/JsonWriteSettings",
"description": "Json format settings."
}
}
},
"CopyActivity": {
"x-ms-discriminator-value": "Copy",
"description": "Copy activity.",
Expand Down