From a11d7a25ef0ca9d2d122730236f561ffe2da0985 Mon Sep 17 00:00:00 2001 From: Zhiyong Yang Date: Wed, 18 Nov 2020 09:56:13 +0800 Subject: [PATCH] Change PartitionOption to object to allow expression (#11613) * add httpRequestTimeout to odata based connector activities * add httpRequestTimeout to odata based connector activities * add sql parallel read properties * change partitionOption to object * change ParallelOption to object --- .../2018-06-01/entityTypes/Pipeline.json | 182 ++++++++++-------- 1 file changed, 101 insertions(+), 81 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 e95dfdc4db65..a5d6919314f6 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 @@ -2046,17 +2046,8 @@ "description": "The packet size of data read from SAP HANA. Type: integer(or Expression with resultType integer)." }, "partitionOption": { - "description": "The partition mechanism that will be used for SAP HANA read in parallel.", - "type": "string", - "enum": [ - "None", - "PhysicalPartitionsOfTable", - "SapHanaDynamicRange" - ], - "x-ms-enum": { - "name": "SapHanaPartitionOption", - "modelAsString": true - } + "description": "The partition mechanism that will be used for SAP HANA read in parallel. Possible values include: \"None\", \"PhysicalPartitionsOfTable\", \"SapHanaDynamicRange\". ", + "type": "object" }, "partitionSettings": { "description": "The settings that will be leveraged for SAP HANA source partitioning.", @@ -2139,20 +2130,8 @@ "description": "The single character that will be used as delimiter passed to SAP RFC as well as splitting the output data retrieved. Type: string (or Expression with resultType string)." }, "partitionOption": { - "description": "The partition mechanism that will be used for SAP table read in parallel.", - "type": "string", - "enum": [ - "None", - "PartitionOnInt", - "PartitionOnCalendarYear", - "PartitionOnCalendarMonth", - "PartitionOnCalendarDate", - "PartitionOnTime" - ], - "x-ms-enum": { - "name": "SapTablePartitionOption", - "modelAsString": true - } + "description": "The partition mechanism that will be used for SAP table read in parallel. Possible values include: \"None\", \"PartitionOnInt\", \"PartitionOnCalendarYear\", \"PartitionOnCalendarMonth\", \"PartitionOnCalendarDate\", \"PartitionOnTime\".", + "type": "object" }, "partitionSettings": { "description": "The settings that will be leveraged for SAP table source partitioning.", @@ -2284,8 +2263,8 @@ "type": "object" }, "partitionOption": { - "description": "The partition mechanism that will be used for Sql read in parallel.", - "$ref": "#/definitions/SqlPartitionOption" + "description": "The partition mechanism that will be used for Sql read in parallel. Possible values include: \"None\", \"PhysicalPartitionsOfTable\", \"DynamicRange\".", + "type": "object" }, "partitionSettings": { "description": "The settings that will be leveraged for Sql source partitioning.", @@ -2322,8 +2301,8 @@ "type": "object" }, "partitionOption": { - "description": "The partition mechanism that will be used for Sql read in parallel.", - "$ref": "#/definitions/SqlPartitionOption" + "description": "The partition mechanism that will be used for Sql read in parallel. Possible values include: \"None\", \"PhysicalPartitionsOfTable\", \"DynamicRange\".", + "type": "object" }, "partitionSettings": { "description": "The settings that will be leveraged for Sql source partitioning.", @@ -2360,8 +2339,8 @@ "type": "object" }, "partitionOption": { - "description": "The partition mechanism that will be used for Sql read in parallel.", - "$ref": "#/definitions/SqlPartitionOption" + "description": "The partition mechanism that will be used for Sql read in parallel. Possible values include: \"None\", \"PhysicalPartitionsOfTable\", \"DynamicRange\".", + "type": "object" }, "partitionSettings": { "description": "The settings that will be leveraged for Sql source partitioning.", @@ -2398,8 +2377,8 @@ "type": "object" }, "partitionOption": { - "description": "The partition mechanism that will be used for Sql read in parallel.", - "$ref": "#/definitions/SqlPartitionOption" + "description": "The partition mechanism that will be used for Sql read in parallel. Possible values include: \"None\", \"PhysicalPartitionsOfTable\", \"DynamicRange\".", + "type": "object" }, "partitionSettings": { "description": "The settings that will be leveraged for Sql source partitioning.", @@ -2429,8 +2408,8 @@ "description": "Value and type setting for stored procedure parameters. Example: \"{Parameter1: {value: \"1\", type: \"int\"}}\". Type: object (or Expression with resultType object), itemType: StoredProcedureParameter." }, "partitionOption": { - "description": "The partition mechanism that will be used for Sql read in parallel.", - "$ref": "#/definitions/SqlPartitionOption" + "description": "The partition mechanism that will be used for Sql read in parallel. Possible values include: \"None\", \"PhysicalPartitionsOfTable\", \"DynamicRange\".", + "type": "object" }, "partitionSettings": { "description": "The settings that will be leveraged for Sql source partitioning.", @@ -2456,19 +2435,6 @@ } } }, - "SqlPartitionOption": { - "description": "The partition mechanism that will be used for Sql read in parallel.", - "type": "string", - "enum": [ - "None", - "PhysicalPartitionsOfTable", - "DynamicRange" - ], - "x-ms-enum": { - "name": "SqlPartitionOption", - "modelAsString": true - } - }, "FileSystemSource": { "description": "A copy activity file system source.", "type": "object", @@ -2598,17 +2564,8 @@ "description": "Query timeout. Type: string (or Expression with resultType string), pattern: ((\\d+)\\.)?(\\d\\d):(60|([0-5][0-9])):(60|([0-5][0-9]))." }, "partitionOption": { - "description": "The partition mechanism that will be used for Oracle read in parallel.", - "type": "string", - "enum": [ - "None", - "PhysicalPartitionsOfTable", - "DynamicRange" - ], - "x-ms-enum": { - "name": "OraclePartitionOption", - "modelAsString": true - } + "description": "The partition mechanism that will be used for Oracle read in parallel. Possible values include: \"None\", \"PhysicalPartitionsOfTable\", \"DynamicRange\".", + "type": "object" }, "partitionSettings": { "description": "The settings that will be leveraged for Oracle source partitioning.", @@ -2663,17 +2620,8 @@ "description": "Teradata query. Type: string (or Expression with resultType string)." }, "partitionOption": { - "description": "The partition mechanism that will be used for teradata read in parallel.", - "type": "string", - "enum": [ - "None", - "Hash", - "DynamicRange" - ], - "x-ms-enum": { - "name": "TeradataPartitionOption", - "modelAsString": true - } + "description": "The partition mechanism that will be used for teradata read in parallel. Possible values include: \"None\", \"Hash\", \"DynamicRange\".", + "type": "object" }, "partitionSettings": { "description": "The settings that will be leveraged for teradata source partitioning.", @@ -3438,17 +3386,8 @@ "description": "A query to retrieve data from source. Type: string (or Expression with resultType string)." }, "partitionOption": { - "description": "The partition mechanism that will be used for Netezza read in parallel.", - "type": "string", - "enum": [ - "None", - "DataSlice", - "DynamicRange" - ], - "x-ms-enum": { - "name": "NetezzaPartitionOption", - "modelAsString": true - } + "description": "The partition mechanism that will be used for Netezza read in parallel. Possible values include: \"None\", \"DataSlice\", \"DynamicRange\".", + "type": "object" }, "partitionSettings": { "description": "The settings that will be leveraged for Netezza source partitioning.", @@ -6965,6 +6904,87 @@ "description": "The wait time to get a response from SharePoint Online. Default value is 5 minutes (00:05:00). Type: string (or Expression with resultType string), pattern: ((\\d+)\\.)?(\\d\\d):(60|([0-5][0-9])):(60|([0-5][0-9]))." } } + }, + "SqlPartitionOption": { + "description": "The partition mechanism that will be used for Sql read in parallel.", + "type": "string", + "enum": [ + "None", + "PhysicalPartitionsOfTable", + "DynamicRange" + ], + "x-ms-enum": { + "name": "SqlPartitionOption", + "modelAsString": true + } + }, + "SapHanaPartitionOption": { + "description": "The partition mechanism that will be used for SAP HANA read in parallel.", + "type": "string", + "enum": [ + "None", + "PhysicalPartitionsOfTable", + "SapHanaDynamicRange" + ], + "x-ms-enum": { + "name": "SapHanaPartitionOption", + "modelAsString": true + } + }, + "SapTablePartitionOption": { + "description": "The partition mechanism that will be used for SAP table read in parallel.", + "type": "string", + "enum": [ + "None", + "PartitionOnInt", + "PartitionOnCalendarYear", + "PartitionOnCalendarMonth", + "PartitionOnCalendarDate", + "PartitionOnTime" + ], + "x-ms-enum": { + "name": "SapTablePartitionOption", + "modelAsString": true + } + }, + "OraclePartitionOption": { + "description": "The partition mechanism that will be used for Oracle read in parallel.", + "type": "string", + "enum": [ + "None", + "PhysicalPartitionsOfTable", + "DynamicRange" + ], + "x-ms-enum": { + "name": "OraclePartitionOption", + "modelAsString": true + } + }, + "TeradataPartitionOption": { + "description": "The partition mechanism that will be used for teradata read in parallel.", + "type": "string", + "enum": [ + "None", + "Hash", + "DynamicRange" + ], + "x-ms-enum": { + "name": "TeradataPartitionOption", + "modelAsString": true + } + }, + "NetezzaPartitionOption": { + "description": "The partition mechanism that will be used for Netezza read in parallel.", + "type": "string", + "enum": [ + "None", + "DataSlice", + "DynamicRange" + ], + "x-ms-enum": { + "name": "NetezzaPartitionOption", + "modelAsString": true + } } } }