CodeGen from PR 11613 in Azure/azure-rest-api-specs

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
Azure · Nov 18, 2020 · 72f66cd · 72f66cd
1 parent 73ee2a4
commit 72f66cd
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 168 deletions.
diff --git a/schemas/2017-09-01-preview/Microsoft.DataFactory.json b/schemas/2017-09-01-preview/Microsoft.DataFactory.json
@@ -12175,4 +12175,4 @@
       "description": "Zoho server dataset."
     }
   }
-}
+}
diff --git a/schemas/2018-06-01/Microsoft.DataFactory.json b/schemas/2018-06-01/Microsoft.DataFactory.json
@@ -4955,20 +4955,9 @@
       "type": "object",
       "properties": {
         "partitionOption": {
-          "oneOf": [
-            {
-              "type": "string",
-              "enum": [
-                "None",
-                "PhysicalPartitionsOfTable",
-                "DynamicRange"
-              ]
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The partition mechanism that will be used for Sql read in parallel."
+          "type": "object",
+          "properties": {},
+          "description": "The partition mechanism that will be used for Sql read in parallel. Possible values include: \"None\", \"PhysicalPartitionsOfTable\", \"DynamicRange\"."
         },
         "partitionSettings": {
           "oneOf": [
@@ -10616,6 +10605,11 @@
           ],
           "description": "Compute properties for data flow activity."
         },
+        "continueOnError": {
+          "type": "object",
+          "properties": {},
+          "description": "Continue on error setting used for data flow execution. Enables processing to continue if a sink fails. Type: boolean (or Expression with resultType boolean)"
+        },
         "dataFlow": {
           "oneOf": [
             {
@@ -10638,6 +10632,11 @@
           ],
           "description": "Integration runtime reference type."
         },
+        "runConcurrently": {
+          "type": "object",
+          "properties": {},
+          "description": "Concurrent run setting used for data flow execution. Allows sinks with the same save order to be processed concurrently. Type: boolean (or Expression with resultType boolean)"
+        },
         "staging": {
           "oneOf": [
             {
@@ -10648,6 +10647,11 @@
             }
           ],
           "description": "Staging info for execute data flow activity."
+        },
+        "traceLevel": {
+          "type": "object",
+          "properties": {},
+          "description": "Trace level setting used for data flow monitoring output. Supported values are: 'coarse', 'fine', and 'none'. Type: string (or Expression with resultType string)"
         }
       },
       "required": [
@@ -10659,31 +10663,14 @@
       "type": "object",
       "properties": {
         "computeType": {
-          "oneOf": [
-            {
-              "type": "string",
-              "enum": [
-                "General",
-                "MemoryOptimized",
-                "ComputeOptimized"
-              ]
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Compute type of the cluster which will execute data flow job."
+          "type": "object",
+          "properties": {},
+          "description": "Compute type of the cluster which will execute data flow job. Possible values include: 'General', 'MemoryOptimized', 'ComputeOptimized'. Type: string (or Expression with resultType string)"
         },
         "coreCount": {
-          "oneOf": [
-            {
-              "type": "integer"
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "Core count of the cluster which will execute data flow job. Supported values are: 8, 16, 32, 48, 80, 144 and 272."
+          "type": "object",
+          "properties": {},
+          "description": "Core count of the cluster which will execute data flow job. Supported values are: 8, 16, 32, 48, 80, 144 and 272. Type: integer (or Expression with resultType integer)"
         }
       },
       "description": "Compute properties for data flow activity."
@@ -18419,20 +18406,9 @@
       "type": "object",
       "properties": {
         "partitionOption": {
-          "oneOf": [
-            {
-              "type": "string",
-              "enum": [
-                "None",
-                "DataSlice",
-                "DynamicRange"
-              ]
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The partition mechanism that will be used for Netezza read in parallel."
+          "type": "object",
+          "properties": {},
+          "description": "The partition mechanism that will be used for Netezza read in parallel. Possible values include: \"None\", \"DataSlice\", \"DynamicRange\"."
         },
         "partitionSettings": {
           "oneOf": [
@@ -19300,20 +19276,9 @@
           "description": "Oracle reader query. Type: string (or Expression with resultType string)."
         },
         "partitionOption": {
-          "oneOf": [
-            {
-              "type": "string",
-              "enum": [
-                "None",
-                "PhysicalPartitionsOfTable",
-                "DynamicRange"
-              ]
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The partition mechanism that will be used for Oracle read in parallel."
+          "type": "object",
+          "properties": {},
+          "description": "The partition mechanism that will be used for Oracle read in parallel. Possible values include: \"None\", \"PhysicalPartitionsOfTable\", \"DynamicRange\"."
         },
         "partitionSettings": {
           "oneOf": [
@@ -22574,20 +22539,9 @@
           "description": "The packet size of data read from SAP HANA. Type: integer(or Expression with resultType integer)."
         },
         "partitionOption": {
-          "oneOf": [
-            {
-              "type": "string",
-              "enum": [
-                "None",
-                "PhysicalPartitionsOfTable",
-                "SapHanaDynamicRange"
-              ]
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The partition mechanism that will be used for SAP HANA read in parallel."
+          "type": "object",
+          "properties": {},
+          "description": "The partition mechanism that will be used for SAP HANA read in parallel. Possible values include: \"None\", \"PhysicalPartitionsOfTable\", \"SapHanaDynamicRange\". "
         },
         "partitionSettings": {
           "oneOf": [
@@ -23039,23 +22993,9 @@
           "description": "Specifies the custom RFC function module that will be used to read data from SAP Table. Type: string (or Expression with resultType string)."
         },
         "partitionOption": {
-          "oneOf": [
-            {
-              "type": "string",
-              "enum": [
-                "None",
-                "PartitionOnInt",
-                "PartitionOnCalendarYear",
-                "PartitionOnCalendarMonth",
-                "PartitionOnCalendarDate",
-                "PartitionOnTime"
-              ]
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The partition mechanism that will be used for SAP table read in parallel."
+          "type": "object",
+          "properties": {},
+          "description": "The partition mechanism that will be used for SAP table read in parallel. Possible values include: \"None\", \"PartitionOnInt\", \"PartitionOnCalendarYear\", \"PartitionOnCalendarMonth\", \"PartitionOnCalendarDate\", \"PartitionOnTime\"."
         },
         "partitionSettings": {
           "oneOf": [
@@ -24612,20 +24552,9 @@
       "type": "object",
       "properties": {
         "partitionOption": {
-          "oneOf": [
-            {
-              "type": "string",
-              "enum": [
-                "None",
-                "PhysicalPartitionsOfTable",
-                "DynamicRange"
-              ]
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The partition mechanism that will be used for Sql read in parallel."
+          "type": "object",
+          "properties": {},
+          "description": "The partition mechanism that will be used for Sql read in parallel. Possible values include: \"None\", \"PhysicalPartitionsOfTable\", \"DynamicRange\"."
         },
         "partitionSettings": {
           "oneOf": [
@@ -24724,20 +24653,9 @@
       "type": "object",
       "properties": {
         "partitionOption": {
-          "oneOf": [
-            {
-              "type": "string",
-              "enum": [
-                "None",
-                "PhysicalPartitionsOfTable",
-                "DynamicRange"
-              ]
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The partition mechanism that will be used for Sql read in parallel."
+          "type": "object",
+          "properties": {},
+          "description": "The partition mechanism that will be used for Sql read in parallel. Possible values include: \"None\", \"PhysicalPartitionsOfTable\", \"DynamicRange\"."
         },
         "partitionSettings": {
           "oneOf": [
@@ -24934,20 +24852,9 @@
       "type": "object",
       "properties": {
         "partitionOption": {
-          "oneOf": [
-            {
-              "type": "string",
-              "enum": [
-                "None",
-                "PhysicalPartitionsOfTable",
-                "DynamicRange"
-              ]
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The partition mechanism that will be used for Sql read in parallel."
+          "type": "object",
+          "properties": {},
+          "description": "The partition mechanism that will be used for Sql read in parallel. Possible values include: \"None\", \"PhysicalPartitionsOfTable\", \"DynamicRange\"."
         },
         "partitionSettings": {
           "oneOf": [
@@ -25169,20 +25076,9 @@
           "description": "Specifies the transaction locking behavior for the SQL source. Allowed values: ReadCommitted/ReadUncommitted/RepeatableRead/Serializable/Snapshot. The default value is ReadCommitted. Type: string (or Expression with resultType string)."
         },
         "partitionOption": {
-          "oneOf": [
-            {
-              "type": "string",
-              "enum": [
-                "None",
-                "PhysicalPartitionsOfTable",
-                "DynamicRange"
-              ]
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The partition mechanism that will be used for Sql read in parallel."
+          "type": "object",
+          "properties": {},
+          "description": "The partition mechanism that will be used for Sql read in parallel. Possible values include: \"None\", \"PhysicalPartitionsOfTable\", \"DynamicRange\"."
         },
         "partitionSettings": {
           "oneOf": [
@@ -26452,20 +26348,9 @@
       "type": "object",
       "properties": {
         "partitionOption": {
-          "oneOf": [
-            {
-              "type": "string",
-              "enum": [
-                "None",
-                "Hash",
-                "DynamicRange"
-              ]
-            },
-            {
-              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
-            }
-          ],
-          "description": "The partition mechanism that will be used for teradata read in parallel."
+          "type": "object",
+          "properties": {},
+          "description": "The partition mechanism that will be used for teradata read in parallel. Possible values include: \"None\", \"Hash\", \"DynamicRange\"."
         },
         "partitionSettings": {
           "oneOf": [
@@ -28195,4 +28080,4 @@
       "description": "A copy activity Zoho server source."
     }
   }
-}
+}