From 77e22afadeb17e3e00a5b89d6971c85c34a6fb4c Mon Sep 17 00:00:00 2001
From: Jingshu Pan <v-jinpan@microsoft.com>
Date: Fri, 11 Jun 2021 09:25:07 +0800
Subject: [PATCH 1/2] [DataFacory]Update avroCompressionCodec and
 orcCompressionCodec from string to object

---
 .../2018-06-01/entityTypes/Dataset.json       | 54 +++++++++++--------
 1 file changed, 31 insertions(+), 23 deletions(-)

diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Dataset.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Dataset.json
index d403dc5bc04d..5ac9ba46a7a9 100644
--- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Dataset.json
+++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Dataset.json
@@ -646,18 +646,8 @@
           "description": "The location of the avro storage."
         },
         "avroCompressionCodec": {
-          "type": "string",
-          "enum": [
-            "none",
-            "deflate",
-            "snappy",
-            "xz",
-            "bzip2"
-          ],
-          "x-ms-enum": {
-            "name": "avroCompressionCodec",
-            "modelAsString": true
-          }
+          "type": "object",
+          "description": "The data avroCompressionCodec. Type: string (or Expression with resultType string)."
         },
         "avroCompressionLevel": {
           "type": "integer",
@@ -669,6 +659,20 @@
         "location"
       ]
     },
+    "AvroCompressionCodec":{
+      "type": "string",
+      "enum": [
+        "none",
+        "deflate",
+        "snappy",
+        "xz",
+        "bzip2"
+      ],
+      "x-ms-enum": {
+        "name": "avroCompressionCodec",
+        "modelAsString": true
+      }
+    },
     "ExcelDataset": {
       "x-ms-discriminator-value": "Excel",
       "description": "Excel dataset.",
@@ -943,23 +947,27 @@
           "description": "The location of the ORC data storage."
         },
         "orcCompressionCodec": {
-          "type": "string",
-          "enum": [
-            "none",
-            "zlib",
-            "snappy",
-            "lzo"
-          ],
-          "x-ms-enum": {
-            "name": "orcCompressionCodec",
-            "modelAsString": true
-          }
+          "type": "object",
+          "description": "The data orcCompressionCodec. Type: string (or Expression with resultType string)."
         }
       },
       "required": [
         "location"
       ]
     },
+    "OrcCompressionCodec": {
+      "type": "string",
+      "enum": [
+        "none",
+        "zlib",
+        "snappy",
+        "lzo"
+      ],
+      "x-ms-enum": {
+        "name": "orcCompressionCodec",
+        "modelAsString": true
+      }
+    },
     "BinaryDataset": {
       "x-ms-discriminator-value": "Binary",
       "description": "Binary dataset.",

From 41f6db577eb6c0b330bd568bedbf3b256a0f1ac3 Mon Sep 17 00:00:00 2001
From: Jingshu Pan <v-jinpan@microsoft.com>
Date: Thu, 17 Jun 2021 09:31:03 +0800
Subject: [PATCH 2/2] update json

---
 .../stable/2018-06-01/entityTypes/Dataset.json                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Dataset.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Dataset.json
index 5ac9ba46a7a9..be57d507c018 100644
--- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Dataset.json
+++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Dataset.json
@@ -659,7 +659,7 @@
         "location"
       ]
     },
-    "AvroCompressionCodec":{
+    "AvroCompressionCodec": {
       "type": "string",
       "enum": [
         "none",