Skip to content

Commit 72f66cd

Browse files
author
SDKAuto
committed
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
1 parent 73ee2a4 commit 72f66cd

File tree

2 files changed

+53
-168
lines changed

2 files changed

+53
-168
lines changed

‎schemas/2017-09-01-preview/Microsoft.DataFactory.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12175,4 +12175,4 @@
1217512175
"description": "Zoho server dataset."
1217612176
}
1217712177
}
12178-
}
12178+
}

‎schemas/2018-06-01/Microsoft.DataFactory.json‎

Lines changed: 52 additions & 167 deletions
Original file line numberDiff line numberDiff line change
@@ -4955,20 +4955,9 @@
49554955
"type": "object",
49564956
"properties": {
49574957
"partitionOption": {
4958-
"oneOf": [
4959-
{
4960-
"type": "string",
4961-
"enum": [
4962-
"None",
4963-
"PhysicalPartitionsOfTable",
4964-
"DynamicRange"
4965-
]
4966-
},
4967-
{
4968-
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
4969-
}
4970-
],
4971-
"description": "The partition mechanism that will be used for Sql read in parallel."
4958+
"type": "object",
4959+
"properties": {},
4960+
"description": "The partition mechanism that will be used for Sql read in parallel. Possible values include: \"None\", \"PhysicalPartitionsOfTable\", \"DynamicRange\"."
49724961
},
49734962
"partitionSettings": {
49744963
"oneOf": [
@@ -10616,6 +10605,11 @@
1061610605
],
1061710606
"description": "Compute properties for data flow activity."
1061810607
},
10608+
"continueOnError": {
10609+
"type": "object",
10610+
"properties": {},
10611+
"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)"
10612+
},
1061910613
"dataFlow": {
1062010614
"oneOf": [
1062110615
{
@@ -10638,6 +10632,11 @@
1063810632
],
1063910633
"description": "Integration runtime reference type."
1064010634
},
10635+
"runConcurrently": {
10636+
"type": "object",
10637+
"properties": {},
10638+
"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)"
10639+
},
1064110640
"staging": {
1064210641
"oneOf": [
1064310642
{
@@ -10648,6 +10647,11 @@
1064810647
}
1064910648
],
1065010649
"description": "Staging info for execute data flow activity."
10650+
},
10651+
"traceLevel": {
10652+
"type": "object",
10653+
"properties": {},
10654+
"description": "Trace level setting used for data flow monitoring output. Supported values are: 'coarse', 'fine', and 'none'. Type: string (or Expression with resultType string)"
1065110655
}
1065210656
},
1065310657
"required": [
@@ -10659,31 +10663,14 @@
1065910663
"type": "object",
1066010664
"properties": {
1066110665
"computeType": {
10662-
"oneOf": [
10663-
{
10664-
"type": "string",
10665-
"enum": [
10666-
"General",
10667-
"MemoryOptimized",
10668-
"ComputeOptimized"
10669-
]
10670-
},
10671-
{
10672-
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
10673-
}
10674-
],
10675-
"description": "Compute type of the cluster which will execute data flow job."
10666+
"type": "object",
10667+
"properties": {},
10668+
"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)"
1067610669
},
1067710670
"coreCount": {
10678-
"oneOf": [
10679-
{
10680-
"type": "integer"
10681-
},
10682-
{
10683-
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
10684-
}
10685-
],
10686-
"description": "Core count of the cluster which will execute data flow job. Supported values are: 8, 16, 32, 48, 80, 144 and 272."
10671+
"type": "object",
10672+
"properties": {},
10673+
"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)"
1068710674
}
1068810675
},
1068910676
"description": "Compute properties for data flow activity."
@@ -18419,20 +18406,9 @@
1841918406
"type": "object",
1842018407
"properties": {
1842118408
"partitionOption": {
18422-
"oneOf": [
18423-
{
18424-
"type": "string",
18425-
"enum": [
18426-
"None",
18427-
"DataSlice",
18428-
"DynamicRange"
18429-
]
18430-
},
18431-
{
18432-
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
18433-
}
18434-
],
18435-
"description": "The partition mechanism that will be used for Netezza read in parallel."
18409+
"type": "object",
18410+
"properties": {},
18411+
"description": "The partition mechanism that will be used for Netezza read in parallel. Possible values include: \"None\", \"DataSlice\", \"DynamicRange\"."
1843618412
},
1843718413
"partitionSettings": {
1843818414
"oneOf": [
@@ -19300,20 +19276,9 @@
1930019276
"description": "Oracle reader query. Type: string (or Expression with resultType string)."
1930119277
},
1930219278
"partitionOption": {
19303-
"oneOf": [
19304-
{
19305-
"type": "string",
19306-
"enum": [
19307-
"None",
19308-
"PhysicalPartitionsOfTable",
19309-
"DynamicRange"
19310-
]
19311-
},
19312-
{
19313-
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
19314-
}
19315-
],
19316-
"description": "The partition mechanism that will be used for Oracle read in parallel."
19279+
"type": "object",
19280+
"properties": {},
19281+
"description": "The partition mechanism that will be used for Oracle read in parallel. Possible values include: \"None\", \"PhysicalPartitionsOfTable\", \"DynamicRange\"."
1931719282
},
1931819283
"partitionSettings": {
1931919284
"oneOf": [
@@ -22574,20 +22539,9 @@
2257422539
"description": "The packet size of data read from SAP HANA. Type: integer(or Expression with resultType integer)."
2257522540
},
2257622541
"partitionOption": {
22577-
"oneOf": [
22578-
{
22579-
"type": "string",
22580-
"enum": [
22581-
"None",
22582-
"PhysicalPartitionsOfTable",
22583-
"SapHanaDynamicRange"
22584-
]
22585-
},
22586-
{
22587-
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
22588-
}
22589-
],
22590-
"description": "The partition mechanism that will be used for SAP HANA read in parallel."
22542+
"type": "object",
22543+
"properties": {},
22544+
"description": "The partition mechanism that will be used for SAP HANA read in parallel. Possible values include: \"None\", \"PhysicalPartitionsOfTable\", \"SapHanaDynamicRange\". "
2259122545
},
2259222546
"partitionSettings": {
2259322547
"oneOf": [
@@ -23039,23 +22993,9 @@
2303922993
"description": "Specifies the custom RFC function module that will be used to read data from SAP Table. Type: string (or Expression with resultType string)."
2304022994
},
2304122995
"partitionOption": {
23042-
"oneOf": [
23043-
{
23044-
"type": "string",
23045-
"enum": [
23046-
"None",
23047-
"PartitionOnInt",
23048-
"PartitionOnCalendarYear",
23049-
"PartitionOnCalendarMonth",
23050-
"PartitionOnCalendarDate",
23051-
"PartitionOnTime"
23052-
]
23053-
},
23054-
{
23055-
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
23056-
}
23057-
],
23058-
"description": "The partition mechanism that will be used for SAP table read in parallel."
22996+
"type": "object",
22997+
"properties": {},
22998+
"description": "The partition mechanism that will be used for SAP table read in parallel. Possible values include: \"None\", \"PartitionOnInt\", \"PartitionOnCalendarYear\", \"PartitionOnCalendarMonth\", \"PartitionOnCalendarDate\", \"PartitionOnTime\"."
2305922999
},
2306023000
"partitionSettings": {
2306123001
"oneOf": [
@@ -24612,20 +24552,9 @@
2461224552
"type": "object",
2461324553
"properties": {
2461424554
"partitionOption": {
24615-
"oneOf": [
24616-
{
24617-
"type": "string",
24618-
"enum": [
24619-
"None",
24620-
"PhysicalPartitionsOfTable",
24621-
"DynamicRange"
24622-
]
24623-
},
24624-
{
24625-
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
24626-
}
24627-
],
24628-
"description": "The partition mechanism that will be used for Sql read in parallel."
24555+
"type": "object",
24556+
"properties": {},
24557+
"description": "The partition mechanism that will be used for Sql read in parallel. Possible values include: \"None\", \"PhysicalPartitionsOfTable\", \"DynamicRange\"."
2462924558
},
2463024559
"partitionSettings": {
2463124560
"oneOf": [
@@ -24724,20 +24653,9 @@
2472424653
"type": "object",
2472524654
"properties": {
2472624655
"partitionOption": {
24727-
"oneOf": [
24728-
{
24729-
"type": "string",
24730-
"enum": [
24731-
"None",
24732-
"PhysicalPartitionsOfTable",
24733-
"DynamicRange"
24734-
]
24735-
},
24736-
{
24737-
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
24738-
}
24739-
],
24740-
"description": "The partition mechanism that will be used for Sql read in parallel."
24656+
"type": "object",
24657+
"properties": {},
24658+
"description": "The partition mechanism that will be used for Sql read in parallel. Possible values include: \"None\", \"PhysicalPartitionsOfTable\", \"DynamicRange\"."
2474124659
},
2474224660
"partitionSettings": {
2474324661
"oneOf": [
@@ -24934,20 +24852,9 @@
2493424852
"type": "object",
2493524853
"properties": {
2493624854
"partitionOption": {
24937-
"oneOf": [
24938-
{
24939-
"type": "string",
24940-
"enum": [
24941-
"None",
24942-
"PhysicalPartitionsOfTable",
24943-
"DynamicRange"
24944-
]
24945-
},
24946-
{
24947-
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
24948-
}
24949-
],
24950-
"description": "The partition mechanism that will be used for Sql read in parallel."
24855+
"type": "object",
24856+
"properties": {},
24857+
"description": "The partition mechanism that will be used for Sql read in parallel. Possible values include: \"None\", \"PhysicalPartitionsOfTable\", \"DynamicRange\"."
2495124858
},
2495224859
"partitionSettings": {
2495324860
"oneOf": [
@@ -25169,20 +25076,9 @@
2516925076
"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)."
2517025077
},
2517125078
"partitionOption": {
25172-
"oneOf": [
25173-
{
25174-
"type": "string",
25175-
"enum": [
25176-
"None",
25177-
"PhysicalPartitionsOfTable",
25178-
"DynamicRange"
25179-
]
25180-
},
25181-
{
25182-
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
25183-
}
25184-
],
25185-
"description": "The partition mechanism that will be used for Sql read in parallel."
25079+
"type": "object",
25080+
"properties": {},
25081+
"description": "The partition mechanism that will be used for Sql read in parallel. Possible values include: \"None\", \"PhysicalPartitionsOfTable\", \"DynamicRange\"."
2518625082
},
2518725083
"partitionSettings": {
2518825084
"oneOf": [
@@ -26452,20 +26348,9 @@
2645226348
"type": "object",
2645326349
"properties": {
2645426350
"partitionOption": {
26455-
"oneOf": [
26456-
{
26457-
"type": "string",
26458-
"enum": [
26459-
"None",
26460-
"Hash",
26461-
"DynamicRange"
26462-
]
26463-
},
26464-
{
26465-
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
26466-
}
26467-
],
26468-
"description": "The partition mechanism that will be used for teradata read in parallel."
26351+
"type": "object",
26352+
"properties": {},
26353+
"description": "The partition mechanism that will be used for teradata read in parallel. Possible values include: \"None\", \"Hash\", \"DynamicRange\"."
2646926354
},
2647026355
"partitionSettings": {
2647126356
"oneOf": [
@@ -28195,4 +28080,4 @@
2819528080
"description": "A copy activity Zoho server source."
2819628081
}
2819728082
}
28198-
}
28083+
}

0 commit comments

Comments
 (0)