From 4647e85ee86490db74bae538cc7a33245b110860 Mon Sep 17 00:00:00 2001 From: Haoran Sun Date: Mon, 12 Aug 2019 16:58:18 +0800 Subject: [PATCH 1/5] add property blockSizeInMB for blobsink and blobFSsink --- .../stable/2018-06-01/entityTypes/Pipeline.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json index 7ea44c70f4b5..1327ad3c67a1 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json @@ -2761,6 +2761,10 @@ "copyBehavior": { "description": "The type of copy behavior for copy sink.", "type": "object" + }, + "blockSizeInMB": { + "description": "Indicates the block size(MB) when writing data to blob. Type: integer (or Expression with resultType integer).", + "type": "integer" } } }, @@ -3104,6 +3108,10 @@ "copyBehavior": { "description": "The type of copy behavior for copy sink.", "type": "object" + }, + "blockSizeInMB": { + "type": "integer", + "description": "Indicates the block size(MB) when writing data to blobFS. Type: integer." } } }, From 27dfe73a643b81caf698643f276868d9a1a53681 Mon Sep 17 00:00:00 2001 From: Haoran Sun Date: Tue, 13 Aug 2019 11:06:13 +0800 Subject: [PATCH 2/5] fix property type --- .../stable/2018-06-01/entityTypes/Pipeline.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json index 1327ad3c67a1..3ba642ebdf88 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json @@ -2764,7 +2764,7 @@ }, "blockSizeInMB": { "description": "Indicates the block size(MB) when writing data to blob. Type: integer (or Expression with resultType integer).", - "type": "integer" + "type": "object" } } }, @@ -3110,8 +3110,8 @@ "type": "object" }, "blockSizeInMB": { - "type": "integer", - "description": "Indicates the block size(MB) when writing data to blobFS. Type: integer." + "description": "Indicates the block size(MB) when writing data to blobFS. Type: integer (or Expression with resultType integer).", + "type": "object" } } }, From 976b4986db37161c972ba6df7acfde9976a981b0 Mon Sep 17 00:00:00 2001 From: Haoran Sun Date: Tue, 13 Aug 2019 14:04:42 +0800 Subject: [PATCH 3/5] Move property from BlobSink (datasetV1) to AzureBlobStorageWriteSettings (datasetV2) --- .../2018-06-01/entityTypes/Pipeline.json | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json index 3ba642ebdf88..7005b653d3de 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json @@ -559,7 +559,13 @@ { "$ref": "#/definitions/StoreWriteSettings" } - ] + ], + "properties": { + "blockSizeInMB": { + "description": "Indicates the block size(MB) when writing data to blob. Type: integer (or Expression with resultType integer).", + "type": "object" + } + } }, "AzureBlobFSWriteSettings": { "description": "Azure blobFS write settings.", @@ -568,7 +574,13 @@ { "$ref": "#/definitions/StoreWriteSettings" } - ] + ], + "properties": { + "blockSizeInMB": { + "description": "Indicates the block size(MB) when writing data to blob. Type: integer (or Expression with resultType integer).", + "type": "object" + } + } }, "AzureDataLakeStoreWriteSettings": { "description": "Azure data lake store write settings.", @@ -2732,7 +2744,7 @@ ], "properties": { "storeSettings": { - "$ref": "#/definitions/StoreReadSettings", + "$ref": "#/definitions/StoreWriteSettings", "description": "Binary store settings." } } @@ -2761,10 +2773,6 @@ "copyBehavior": { "description": "The type of copy behavior for copy sink.", "type": "object" - }, - "blockSizeInMB": { - "description": "Indicates the block size(MB) when writing data to blob. Type: integer (or Expression with resultType integer).", - "type": "object" } } }, @@ -3108,10 +3116,6 @@ "copyBehavior": { "description": "The type of copy behavior for copy sink.", "type": "object" - }, - "blockSizeInMB": { - "description": "Indicates the block size(MB) when writing data to blobFS. Type: integer (or Expression with resultType integer).", - "type": "object" } } }, From a23c6a9c110d089b8995ad93c1e7e031093377e5 Mon Sep 17 00:00:00 2001 From: Haoran Sun Date: Tue, 13 Aug 2019 15:23:54 +0800 Subject: [PATCH 4/5] Enable override for StoreWriteSettings --- .../stable/2018-06-01/entityTypes/Pipeline.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json index 7005b653d3de..df2398c094ac 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json @@ -530,6 +530,7 @@ }, "StoreWriteSettings": { "description": "Connector write settings.", + "discriminator": "type", "type": "object", "properties": { "type": { @@ -554,6 +555,7 @@ }, "AzureBlobStorageWriteSettings": { "description": "Azure blob write settings.", + "x-ms-discriminator-value": "AzureBlobStorageWriteSettings", "type": "object", "allOf": [ { @@ -569,6 +571,7 @@ }, "AzureBlobFSWriteSettings": { "description": "Azure blobFS write settings.", + "x-ms-discriminator-value": "AzureBlobFSWriteSettings", "type": "object", "allOf": [ { From 2658bfcd4e5ede36535616ef4e44125701d14366 Mon Sep 17 00:00:00 2001 From: Haoran Sun Date: Wed, 14 Aug 2019 11:00:15 +0800 Subject: [PATCH 5/5] remove redundant property --- .../stable/2018-06-01/entityTypes/Pipeline.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json index df2398c094ac..bb1a048b9274 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Pipeline.json @@ -555,7 +555,6 @@ }, "AzureBlobStorageWriteSettings": { "description": "Azure blob write settings.", - "x-ms-discriminator-value": "AzureBlobStorageWriteSettings", "type": "object", "allOf": [ { @@ -571,7 +570,6 @@ }, "AzureBlobFSWriteSettings": { "description": "Azure blobFS write settings.", - "x-ms-discriminator-value": "AzureBlobFSWriteSettings", "type": "object", "allOf": [ {