diff --git a/custom-words.txt b/custom-words.txt index 5f40b17935c0..450f29ebda2b 100644 --- a/custom-words.txt +++ b/custom-words.txt @@ -2716,4 +2716,5 @@ Spza xlargerc largerc mediumrc -smallrc \ No newline at end of file +smallrc +Autotune \ No newline at end of file diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/bigDataPool.json b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/bigDataPool.json index 1f3643750243..673b26632662 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/bigDataPool.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/bigDataPool.json @@ -417,6 +417,11 @@ "type": "boolean", "description": "Whether compute isolation is required or not." }, + "isAutotuneEnabled": { + "type": "boolean", + "title": "Enable Autotune", + "description": "Whether autotune is required or not." + }, "sessionLevelPackagesEnabled": { "type": "boolean", "description": "Whether session level packages enabled." diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/CreateOrUpdateBigDataPool.json b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/CreateOrUpdateBigDataPool.json index 60be54d9f058..5e275f0cd0b8 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/CreateOrUpdateBigDataPool.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/CreateOrUpdateBigDataPool.json @@ -29,7 +29,8 @@ "content": "", "filename": "requirements.txt" }, - "defaultSparkLogFolder": "/logs" + "defaultSparkLogFolder": "/logs", + "isAutotuneEnabled": false } } }, @@ -66,7 +67,8 @@ "filename": "requirements.txt" }, "defaultSparkLogFolder": "/logs", - "lastSucceededTimestamp": "1970-01-01T10:00:00Z" + "lastSucceededTimestamp": "1970-01-01T10:00:00Z", + "isAutotuneEnabled": false } } }, @@ -101,7 +103,8 @@ "content": "", "filename": "requirements.txt" }, - "defaultSparkLogFolder": "/logs" + "defaultSparkLogFolder": "/logs", + "isAutotuneEnabled": false } } }, diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/DeleteBigDataPool.json b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/DeleteBigDataPool.json index 1ff09c932e51..3c7dee68bcdb 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/DeleteBigDataPool.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/DeleteBigDataPool.json @@ -37,7 +37,8 @@ "content": "", "filename": "requirements.txt" }, - "defaultSparkLogFolder": "/logs" + "defaultSparkLogFolder": "/logs", + "isAutotuneEnabled": false } } }, @@ -70,7 +71,8 @@ "content": "", "filename": "requirements.txt" }, - "defaultSparkLogFolder": "/logs" + "defaultSparkLogFolder": "/logs", + "isAutotuneEnabled": false } } }, diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/GetBigDataPool.json b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/GetBigDataPool.json index b7f16d209f36..16d6435a93bf 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/GetBigDataPool.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/GetBigDataPool.json @@ -36,7 +36,8 @@ "content": "", "filename": "requirements.txt" }, - "defaultSparkLogFolder": "/logs" + "defaultSparkLogFolder": "/logs", + "isAutotuneEnabled": false } } }, diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/ListBigDataPoolsInWorkspace.json b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/ListBigDataPoolsInWorkspace.json index 6e5a6bbf6762..ea57860c7513 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/ListBigDataPoolsInWorkspace.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/ListBigDataPoolsInWorkspace.json @@ -37,7 +37,8 @@ "content": "", "filename": "requirements.txt" }, - "defaultSparkLogFolder": "/logs" + "defaultSparkLogFolder": "/logs", + "isAutotuneEnabled": false } }, { @@ -68,7 +69,8 @@ "content": "", "filename": "requirements.txt" }, - "defaultSparkLogFolder": "/logs" + "defaultSparkLogFolder": "/logs", + "isAutotuneEnabled": false } } ], diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/SparkConfiguration_Get.json b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/SparkConfiguration_Get.json index 54c023929441..9b6845c61585 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/SparkConfiguration_Get.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/SparkConfiguration_Get.json @@ -35,7 +35,15 @@ "createdBy": "test@microsoft.com", "created": "1970-01-01T00:00:00Z" }, - "etag": "1500474f-0000-0200-0000-5cbe090d0000" + "etag": "1500474f-0000-0200-0000-5cbe090d0000", + "configMergeRule": { + "currentOperation.spark.key1": "append", + "currentOperation.append.separator.spark.key1": "space", + "currentOperation.spark.key2": "append", + "currentOperation.append.separator.spark.key2": "comma", + "allowedNextOperations.spark.key1": "replace,delete", + "allowedNextOperations.spark.key2": "replace,delete,append" + } } } } diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/SparkConfigurations_ListByWorkspace.json b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/SparkConfigurations_ListByWorkspace.json index 8745a7d52053..cea8c00e73a9 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/SparkConfigurations_ListByWorkspace.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/SparkConfigurations_ListByWorkspace.json @@ -36,7 +36,15 @@ "createdBy": "test@microsoft.com", "created": "1970-01-01T00:00:00Z" }, - "etag": "1500474f-0000-0200-0000-5cbe090d0000" + "etag": "1500474f-0000-0200-0000-5cbe090d0000", + "configMergeRule": { + "currentOperation.spark.key1": "append", + "currentOperation.append.separator.spark.key1": "space", + "currentOperation.spark.key2": "append", + "currentOperation.append.separator.spark.key2": "comma", + "allowedNextOperations.spark.key1": "replace,delete", + "allowedNextOperations.spark.key2": "replace,delete,append" + } }, { "id": "/subscriptions/12345678-1234-1234-1234-12345678abc/resourceGroups/exampleResourceGroup/providers/Microsoft.Synapse/workspaces/exampleWorkspace/sparkconfigurations/exampleSparkConfigurationName2", @@ -57,7 +65,15 @@ "createdBy": "test@microsoft.com", "created": "1970-01-01T00:00:00Z" }, - "etag": "1500474f-0000-0200-0000-5cbe090d0000" + "etag": "1500474f-0000-0200-0000-5cbe090d0000", + "configMergeRule": { + "currentOperation.spark.key1": "append", + "currentOperation.append.separator.spark.key1": "space", + "currentOperation.spark.key2": "append", + "currentOperation.append.separator.spark.key2": "comma", + "allowedNextOperations.spark.key1": "replace,delete", + "allowedNextOperations.spark.key2": "replace,delete,append" + } } ], "nextLink": "" diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/UpdateBigDataPool.json b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/UpdateBigDataPool.json index 78071ce7274d..c916f31b4347 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/UpdateBigDataPool.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/examples/UpdateBigDataPool.json @@ -43,7 +43,8 @@ "content": "", "filename": "requirements.txt" }, - "defaultSparkLogFolder": "/logs" + "defaultSparkLogFolder": "/logs", + "isAutotuneEnabled": false } } }, diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/sparkConfiguration.json b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/sparkConfiguration.json index 6e9ec9617c56..c0c50a40a468 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/sparkConfiguration.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/preview/2021-06-01-preview/sparkConfiguration.json @@ -209,6 +209,13 @@ "type": "string", "format": "date-time", "description": "The timestamp of resource creation." + }, + "configMergeRule": { + "type": "object", + "description": "SparkConfiguration merge configs.", + "additionalProperties": { + "type": "string" + } } }, "required": [ diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/bigDataPool.json b/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/bigDataPool.json index a7cc2b1256e2..fbe4ff84d9b1 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/bigDataPool.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/bigDataPool.json @@ -417,6 +417,11 @@ "type": "boolean", "description": "Whether compute isolation is required or not." }, + "isAutotuneEnabled": { + "type": "boolean", + "title": "Enable Autotune", + "description": "Whether autotune is required or not." + }, "sessionLevelPackagesEnabled": { "type": "boolean", "description": "Whether session level packages enabled." @@ -447,7 +452,7 @@ "description": "List of custom libraries/packages associated with the spark pool.", "type": "array", "items": { - "$ref": "#/definitions/LibraryInfo" + "$ref": "../../../../common/v1/types.json#/definitions/LibraryInfo" } }, "sparkConfigProperties": { @@ -558,45 +563,6 @@ } } }, - "LibraryInfo": { - "type": "object", - "description": "Library/package information of a Big Data pool powered by Apache Spark", - "title": "Information about a library/package created at the workspace level.", - "properties": { - "name": { - "type": "string", - "description": "Name of the library." - }, - "path": { - "type": "string", - "description": "Storage blob path of library." - }, - "containerName": { - "type": "string", - "description": "Storage blob container name." - }, - "uploadedTimestamp": { - "type": "string", - "format": "date-time", - "description": "The last update time of the library.", - "readOnly": true - }, - "type": { - "type": "string", - "description": "Type of the library." - }, - "provisioningStatus": { - "readOnly": true, - "type": "string", - "description": "Provisioning status of the library/package." - }, - "creatorId": { - "readOnly": true, - "type": "string", - "description": "Creator Id of the library/package." - } - } - }, "LibraryRequirements": { "type": "object", "description": "Library requirements for a Big Data pool powered by Apache Spark", diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/CreateOrUpdateBigDataPool.json b/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/CreateOrUpdateBigDataPool.json index 6c999ee51662..0425528e2e50 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/CreateOrUpdateBigDataPool.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/CreateOrUpdateBigDataPool.json @@ -29,7 +29,8 @@ "content": "", "filename": "requirements.txt" }, - "defaultSparkLogFolder": "/logs" + "defaultSparkLogFolder": "/logs", + "isAutotuneEnabled": false } } }, @@ -66,7 +67,8 @@ "filename": "requirements.txt" }, "defaultSparkLogFolder": "/logs", - "lastSucceededTimestamp": "1970-01-01T10:00:00Z" + "lastSucceededTimestamp": "1970-01-01T10:00:00Z", + "isAutotuneEnabled": false } } }, @@ -101,7 +103,8 @@ "content": "", "filename": "requirements.txt" }, - "defaultSparkLogFolder": "/logs" + "defaultSparkLogFolder": "/logs", + "isAutotuneEnabled": false } } }, diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/DeleteBigDataPool.json b/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/DeleteBigDataPool.json index d714ad98f058..94c96518bdf9 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/DeleteBigDataPool.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/DeleteBigDataPool.json @@ -37,7 +37,8 @@ "content": "", "filename": "requirements.txt" }, - "defaultSparkLogFolder": "/logs" + "defaultSparkLogFolder": "/logs", + "isAutotuneEnabled": false } } }, @@ -70,7 +71,8 @@ "content": "", "filename": "requirements.txt" }, - "defaultSparkLogFolder": "/logs" + "defaultSparkLogFolder": "/logs", + "isAutotuneEnabled": false } } }, diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/GetBigDataPool.json b/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/GetBigDataPool.json index 6999bd2bbb6d..5035029d5511 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/GetBigDataPool.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/GetBigDataPool.json @@ -36,7 +36,8 @@ "content": "", "filename": "requirements.txt" }, - "defaultSparkLogFolder": "/logs" + "defaultSparkLogFolder": "/logs", + "isAutotuneEnabled": false } } }, diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/ListBigDataPoolsInWorkspace.json b/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/ListBigDataPoolsInWorkspace.json index 185bdc01b8cb..ac9e98d48a30 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/ListBigDataPoolsInWorkspace.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/ListBigDataPoolsInWorkspace.json @@ -37,7 +37,8 @@ "content": "", "filename": "requirements.txt" }, - "defaultSparkLogFolder": "/logs" + "defaultSparkLogFolder": "/logs", + "isAutotuneEnabled": false } }, { @@ -68,7 +69,8 @@ "content": "", "filename": "requirements.txt" }, - "defaultSparkLogFolder": "/logs" + "defaultSparkLogFolder": "/logs", + "isAutotuneEnabled": false } } ], diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/UpdateBigDataPool.json b/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/UpdateBigDataPool.json index d4202a498a0b..76fffed58336 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/UpdateBigDataPool.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/examples/UpdateBigDataPool.json @@ -43,7 +43,8 @@ "content": "", "filename": "requirements.txt" }, - "defaultSparkLogFolder": "/logs" + "defaultSparkLogFolder": "/logs", + "isAutotuneEnabled": false } } }, diff --git a/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/library.json b/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/library.json index 45891bd682e5..b4c834904595 100644 --- a/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/library.json +++ b/specification/synapse/resource-manager/Microsoft.Synapse/stable/2021-06-01/library.json @@ -164,7 +164,7 @@ ], "properties": { "properties": { - "$ref": "./bigDataPool.json#/definitions/LibraryInfo", + "$ref": "../../../../common/v1/types.json#/definitions/LibraryInfo", "description": "Library/package properties.", "x-ms-client-flatten": true }