From ec112148bf30430557ff3fac0c74f0706b1042de Mon Sep 17 00:00:00 2001
From: zhanyu2014 <zhanyu@microsoft.com>
Date: Wed, 31 Jul 2019 13:52:43 +0800
Subject: [PATCH 1/2] Enable Avro Dataset in public swagger

---
 .../2018-06-01/entityTypes/Dataset.json       | 50 ++++++++++++++++-
 .../2018-06-01/entityTypes/Pipeline.json      | 53 +++++++++++++++++++
 2 files changed, 102 insertions(+), 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 89d826313586..9469bbe4de48 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
@@ -36,7 +36,7 @@
           "description": "Parameters for dataset."
         },
         "annotations": {
-          "description": "List of tags that can be used for describing the Dataset.",
+          "description": "List of tags that can be used for describing the Dataset",
           "type": "array",
           "items": {
             "type": "object"
@@ -516,6 +516,54 @@
         "bucketName"
       ]
     },
+    "AvroDataset": {
+      "x-ms-discriminator-value": "Avro",
+      "description": "Avro dataset.",
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/Dataset"
+        }
+      ],
+      "properties": {
+        "typeProperties": {
+          "description": "Avro dataset properties.",
+          "x-ms-client-flatten": true,
+          "$ref": "#/definitions/AvroDatasetTypeProperties"
+        }
+      }
+    },
+    "AvroDatasetTypeProperties": {
+      "description": "Avro dataset properties.",
+      "properties": {
+        "location": {
+          "$ref": "#/definitions/DatasetLocation",
+          "description": "The location of the avro storage."
+        },
+        "avroCompressionCodec": {
+          "type": "string",
+          "enum": [
+            "none",
+            "deflate",
+            "snappy",
+            "xz",
+            "bzip2"
+          ],
+          "x-ms-enum": {
+            "name": "avroCompressionCodec",
+            "modelAsString": true
+          }
+        },
+        "avroCompressionLevel": {
+          "type": "integer",
+          "minimum": 1,
+          "maximum": 9
+        }
+      },
+      "required": [
+        "location"
+      ]
+    },
     "ParquetDataset": {
       "x-ms-discriminator-value": "Parquet",
       "description": "Parquet dataset.",
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 fbd07f22fd75..edb39af6ee76 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
@@ -635,6 +635,25 @@
         "type"
       ]
     },
+    "AvroWriteSettings": {
+      "description": "Avro write settings.",
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/FormatWriteSettings"
+        }
+      ],
+      "properties": {
+        "recordName": {
+          "type": "string",
+          "description": "Top level record name in write result, which is required in AVRO spec."
+        },
+        "recordNamespace": {
+          "type": "string",
+          "description": "Record namespace in the write result."
+        }
+      }
+    },
     "DelimitedTextWriteSettings": {
       "description": "Delimited text write settings.",
       "type": "object",
@@ -657,6 +676,21 @@
         "fileExtension"
       ]
     },
+    "AvroSource": {
+      "description": "A copy activity Avro source.",
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/CopySource"
+        }
+      ],
+      "properties": {
+        "storeSettings": {
+          "$ref": "#/definitions/StoreReadSettings",
+          "description": "Avro store settings."
+        }
+      }
+    },
     "ParquetSource": {
       "description": "A copy activity Parquet source.",
       "type": "object",
@@ -2578,6 +2612,25 @@
         }
       }
     },
+    "AvroSink": {
+      "description": "A copy activity Avro sink.",
+      "type": "object",
+      "allOf": [
+        {
+          "$ref": "#/definitions/CopySink"
+        }
+      ],
+      "properties": {
+        "storeSettings": {
+          "$ref": "#/definitions/StoreWriteSettings",
+          "description": "Avro store settings."
+        },
+        "formatSettings": {
+          "$ref": "#/definitions/AvroWriteSettings",
+          "description": "Avro format settings."
+        }
+      }
+    },
     "ParquetSink": {
       "description": "A copy activity Parquet sink.",
       "type": "object",

From e41431428e45beaa5bbb12344d3332479c095e31 Mon Sep 17 00:00:00 2001
From: zhanyu2014 <zhanyu@microsoft.com>
Date: Wed, 31 Jul 2019 15:04:45 +0800
Subject: [PATCH 2/2] UPDATE

---
 .../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 9469bbe4de48..5f4e5fc824f4 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
@@ -36,7 +36,7 @@
           "description": "Parameters for dataset."
         },
         "annotations": {
-          "description": "List of tags that can be used for describing the Dataset",
+          "description": "List of tags that can be used for describing the Dataset.",
           "type": "array",
           "items": {
             "type": "object"