Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Data Factory]Add property blockSizeInMB for AzureBlobStorageWriteSettings and AzureBlobFSWriteSettings #7339

Merged
merged 8 commits into from
Aug 29, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions eng/mgmt/mgmtmetadata/datafactory_resource-manager.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ AutoRest installed successfully.
Commencing code generation
Generating CSharp code
Executing AutoRest command
cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/datafactory/resource-manager/readme.md --csharp --version=latest --reflect-api-versions --tag=package-2018-06 --csharp-sdks-folder=D:\Git\azure-sdk-for-net\sdk
2019-08-16 09:08:46 UTC
cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/datafactory/resource-manager/readme.md --csharp --version=latest --reflect-api-versions --tag=package-2018-06 --csharp-sdks-folder=C:\azure-sdk-for-net\sdk
2019-08-22 15:02:19 UTC
Azure-rest-api-specs repository information
GitHub fork: Azure
Branch: master
Commit: 23326b92394ef630c59833f27e512544162ef4dd
Commit: fb8f078deac2367f3dbcfbd8a542c77083c28a5b
AutoRest information
Requested version: latest
Bootstrapper version: autorest@2.0.4283
Original file line number Diff line number Diff line change
Expand Up @@ -457,6 +457,8 @@ private void Initialize()
DeserializationSettings.Converters.Add(new PolymorphicDeserializeJsonConverter<DatasetStorageFormat>("type"));
SerializationSettings.Converters.Add(new PolymorphicSerializeJsonConverter<CopySource>("type"));
DeserializationSettings.Converters.Add(new PolymorphicDeserializeJsonConverter<CopySource>("type"));
SerializationSettings.Converters.Add(new PolymorphicSerializeJsonConverter<StoreWriteSettings>("type"));
DeserializationSettings.Converters.Add(new PolymorphicDeserializeJsonConverter<StoreWriteSettings>("type"));
SerializationSettings.Converters.Add(new PolymorphicSerializeJsonConverter<CopySink>("type"));
DeserializationSettings.Converters.Add(new PolymorphicDeserializeJsonConverter<CopySink>("type"));
SerializationSettings.Converters.Add(new PolymorphicSerializeJsonConverter<LinkedIntegrationRuntimeType>("authorizationType"));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,22 +73,5 @@ public AvroSink()
[JsonProperty(PropertyName = "formatSettings")]
public AvroWriteSettings FormatSettings { get; set; }

/// <summary>
/// Validate the object.
/// </summary>
/// <exception cref="Rest.ValidationException">
/// Thrown if validation fails
/// </exception>
public virtual void Validate()
{
if (StoreSettings != null)
{
StoreSettings.Validate();
}
if (FormatSettings != null)
{
FormatSettings.Validate();
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

namespace Microsoft.Azure.Management.DataFactory.Models
{
using Newtonsoft.Json;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
Expand All @@ -30,17 +31,20 @@ public AzureBlobFSWriteSettings()
/// <summary>
/// Initializes a new instance of the AzureBlobFSWriteSettings class.
/// </summary>
/// <param name="type">The write setting type.</param>
/// <param name="additionalProperties">Unmatched properties from the
/// message are deserialized this collection</param>
/// <param name="maxConcurrentConnections">The maximum concurrent
/// connection count for the source data store. Type: integer (or
/// Expression with resultType integer).</param>
/// <param name="copyBehavior">The type of copy behavior for copy
/// sink.</param>
public AzureBlobFSWriteSettings(string type, IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), object maxConcurrentConnections = default(object), object copyBehavior = default(object))
: base(type, additionalProperties, maxConcurrentConnections, copyBehavior)
/// <param name="blockSizeInMB">Indicates the block size(MB) when
/// writing data to blob. Type: integer (or Expression with resultType
/// integer).</param>
public AzureBlobFSWriteSettings(IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), object maxConcurrentConnections = default(object), object copyBehavior = default(object), object blockSizeInMB = default(object))
: base(additionalProperties, maxConcurrentConnections, copyBehavior)
{
BlockSizeInMB = blockSizeInMB;
CustomInit();
}

Expand All @@ -50,14 +54,11 @@ public AzureBlobFSWriteSettings()
partial void CustomInit();

/// <summary>
/// Validate the object.
/// Gets or sets indicates the block size(MB) when writing data to
/// blob. Type: integer (or Expression with resultType integer).
/// </summary>
/// <exception cref="Rest.ValidationException">
/// Thrown if validation fails
/// </exception>
public override void Validate()
{
base.Validate();
}
[JsonProperty(PropertyName = "blockSizeInMB")]
public object BlockSizeInMB { get; set; }

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

namespace Microsoft.Azure.Management.DataFactory.Models
{
using Newtonsoft.Json;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
Expand All @@ -32,17 +33,20 @@ public AzureBlobStorageWriteSettings()
/// Initializes a new instance of the AzureBlobStorageWriteSettings
/// class.
/// </summary>
/// <param name="type">The write setting type.</param>
/// <param name="additionalProperties">Unmatched properties from the
/// message are deserialized this collection</param>
/// <param name="maxConcurrentConnections">The maximum concurrent
/// connection count for the source data store. Type: integer (or
/// Expression with resultType integer).</param>
/// <param name="copyBehavior">The type of copy behavior for copy
/// sink.</param>
public AzureBlobStorageWriteSettings(string type, IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), object maxConcurrentConnections = default(object), object copyBehavior = default(object))
: base(type, additionalProperties, maxConcurrentConnections, copyBehavior)
/// <param name="blockSizeInMB">Indicates the block size(MB) when
/// writing data to blob. Type: integer (or Expression with resultType
/// integer).</param>
public AzureBlobStorageWriteSettings(IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), object maxConcurrentConnections = default(object), object copyBehavior = default(object), object blockSizeInMB = default(object))
: base(additionalProperties, maxConcurrentConnections, copyBehavior)
{
BlockSizeInMB = blockSizeInMB;
CustomInit();
}

Expand All @@ -52,14 +56,11 @@ public AzureBlobStorageWriteSettings()
partial void CustomInit();

/// <summary>
/// Validate the object.
/// Gets or sets indicates the block size(MB) when writing data to
/// blob. Type: integer (or Expression with resultType integer).
/// </summary>
/// <exception cref="Rest.ValidationException">
/// Thrown if validation fails
/// </exception>
public override void Validate()
{
base.Validate();
}
[JsonProperty(PropertyName = "blockSizeInMB")]
public object BlockSizeInMB { get; set; }

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,15 @@ public AzureDataLakeStoreWriteSettings()
/// Initializes a new instance of the AzureDataLakeStoreWriteSettings
/// class.
/// </summary>
/// <param name="type">The write setting type.</param>
/// <param name="additionalProperties">Unmatched properties from the
/// message are deserialized this collection</param>
/// <param name="maxConcurrentConnections">The maximum concurrent
/// connection count for the source data store. Type: integer (or
/// Expression with resultType integer).</param>
/// <param name="copyBehavior">The type of copy behavior for copy
/// sink.</param>
public AzureDataLakeStoreWriteSettings(string type, IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), object maxConcurrentConnections = default(object), object copyBehavior = default(object))
: base(type, additionalProperties, maxConcurrentConnections, copyBehavior)
public AzureDataLakeStoreWriteSettings(IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), object maxConcurrentConnections = default(object), object copyBehavior = default(object))
: base(additionalProperties, maxConcurrentConnections, copyBehavior)
{
CustomInit();
}
Expand All @@ -51,15 +50,5 @@ public AzureDataLakeStoreWriteSettings()
/// </summary>
partial void CustomInit();

/// <summary>
/// Validate the object.
/// </summary>
/// <exception cref="Rest.ValidationException">
/// Thrown if validation fails
/// </exception>
public override void Validate()
{
base.Validate();
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -65,18 +65,5 @@ public BinarySink()
[JsonProperty(PropertyName = "storeSettings")]
public StoreWriteSettings StoreSettings { get; set; }

/// <summary>
/// Validate the object.
/// </summary>
/// <exception cref="Rest.ValidationException">
/// Thrown if validation fails
/// </exception>
public virtual void Validate()
{
if (StoreSettings != null)
{
StoreSettings.Validate();
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,6 @@ public DelimitedTextSink()
/// </exception>
public virtual void Validate()
{
if (StoreSettings != null)
{
StoreSettings.Validate();
}
if (FormatSettings != null)
{
FormatSettings.Validate();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,15 @@ public FileServerWriteSettings()
/// <summary>
/// Initializes a new instance of the FileServerWriteSettings class.
/// </summary>
/// <param name="type">The write setting type.</param>
/// <param name="additionalProperties">Unmatched properties from the
/// message are deserialized this collection</param>
/// <param name="maxConcurrentConnections">The maximum concurrent
/// connection count for the source data store. Type: integer (or
/// Expression with resultType integer).</param>
/// <param name="copyBehavior">The type of copy behavior for copy
/// sink.</param>
public FileServerWriteSettings(string type, IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), object maxConcurrentConnections = default(object), object copyBehavior = default(object))
: base(type, additionalProperties, maxConcurrentConnections, copyBehavior)
public FileServerWriteSettings(IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), object maxConcurrentConnections = default(object), object copyBehavior = default(object))
: base(additionalProperties, maxConcurrentConnections, copyBehavior)
{
CustomInit();
}
Expand All @@ -49,15 +48,5 @@ public FileServerWriteSettings()
/// </summary>
partial void CustomInit();

/// <summary>
/// Validate the object.
/// </summary>
/// <exception cref="Rest.ValidationException">
/// Thrown if validation fails
/// </exception>
public override void Validate()
{
base.Validate();
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -73,22 +73,5 @@ public JsonSink()
[JsonProperty(PropertyName = "formatSettings")]
public JsonWriteSettings FormatSettings { get; set; }

/// <summary>
/// Validate the object.
/// </summary>
/// <exception cref="Rest.ValidationException">
/// Thrown if validation fails
/// </exception>
public virtual void Validate()
{
if (StoreSettings != null)
{
StoreSettings.Validate();
}
if (FormatSettings != null)
{
FormatSettings.Validate();
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -65,18 +65,5 @@ public ParquetSink()
[JsonProperty(PropertyName = "storeSettings")]
public StoreWriteSettings StoreSettings { get; set; }

/// <summary>
/// Validate the object.
/// </summary>
/// <exception cref="Rest.ValidationException">
/// Thrown if validation fails
/// </exception>
public virtual void Validate()
{
if (StoreSettings != null)
{
StoreSettings.Validate();
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

namespace Microsoft.Azure.Management.DataFactory.Models
{
using Microsoft.Rest;
using Newtonsoft.Json;
using System.Collections;
using System.Collections.Generic;
Expand All @@ -32,18 +31,16 @@ public StoreWriteSettings()
/// <summary>
/// Initializes a new instance of the StoreWriteSettings class.
/// </summary>
/// <param name="type">The write setting type.</param>
/// <param name="additionalProperties">Unmatched properties from the
/// message are deserialized this collection</param>
/// <param name="maxConcurrentConnections">The maximum concurrent
/// connection count for the source data store. Type: integer (or
/// Expression with resultType integer).</param>
/// <param name="copyBehavior">The type of copy behavior for copy
/// sink.</param>
public StoreWriteSettings(string type, IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), object maxConcurrentConnections = default(object), object copyBehavior = default(object))
public StoreWriteSettings(IDictionary<string, object> additionalProperties = default(IDictionary<string, object>), object maxConcurrentConnections = default(object), object copyBehavior = default(object))
{
AdditionalProperties = additionalProperties;
Type = type;
MaxConcurrentConnections = maxConcurrentConnections;
CopyBehavior = copyBehavior;
CustomInit();
Expand All @@ -61,12 +58,6 @@ public StoreWriteSettings()
[JsonExtensionData]
public IDictionary<string, object> AdditionalProperties { get; set; }

/// <summary>
/// Gets or sets the write setting type.
/// </summary>
[JsonProperty(PropertyName = "type")]
public string Type { get; set; }

/// <summary>
/// Gets or sets the maximum concurrent connection count for the source
/// data store. Type: integer (or Expression with resultType integer).
Expand All @@ -80,18 +71,5 @@ public StoreWriteSettings()
[JsonProperty(PropertyName = "copyBehavior")]
public object CopyBehavior { get; set; }

/// <summary>
/// Validate the object.
/// </summary>
/// <exception cref="ValidationException">
/// Thrown if validation fails
/// </exception>
public virtual void Validate()
{
if (Type == null)
{
throw new ValidationException(ValidationRules.CannotBeNull, "Type");
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ public static IEnumerable<Tuple<string, string, string>> ApiInfo_DataFactoryMana
// BEGIN: Code Generation Metadata Section
public static readonly String AutoRestVersion = "latest";
public static readonly String AutoRestBootStrapperVersion = "autorest@2.0.4283";
public static readonly String AutoRestCmdExecuted = "cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/datafactory/resource-manager/readme.md --csharp --version=latest --reflect-api-versions --tag=package-2018-06 --csharp-sdks-folder=D:\\Git\\azure-sdk-for-net\\sdk";
public static readonly String AutoRestCmdExecuted = "cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/datafactory/resource-manager/readme.md --csharp --version=latest --reflect-api-versions --tag=package-2018-06 --csharp-sdks-folder=C:\\azure-sdk-for-net\\sdk";
public static readonly String GithubForkName = "Azure";
public static readonly String GithubBranchName = "master";
public static readonly String GithubCommidId = "23326b92394ef630c59833f27e512544162ef4dd";
public static readonly String GithubCommidId = "fb8f078deac2367f3dbcfbd8a542c77083c28a5b";
public static readonly String CodeGenerationErrors = "";
public static readonly String GithubRepoName = "azure-rest-api-specs";
// END: Code Generation Metadata Section
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@
<PropertyGroup>
<PackageId>Microsoft.Azure.Management.DataFactory</PackageId>
<Description>Azure Data Factory V2 is the data integration platform that goes beyond Azure Data Factory V1's orchestration and batch-processing of time-series data, with a general purpose app model supporting modern data warehousing patterns and scenarios, lift-and-shift SSIS, and data-driven SaaS applications. Compose and manage reliable and secure data integration workflows at scale. Use native ADF data connectors and Integration Runtimes to move and transform cloud and on-premises data that can be unstructured, semi-structured, and structured with Hadoop, Azure Data Lake, Spark, SQL Server, Cosmos DB and many other data platforms.</Description>
<Version>4.1.2</Version>
<Version>4.1.3</Version>
<AssemblyName>Microsoft.Azure.Management.DataFactory</AssemblyName>
<PackageTags>Microsoft Azure resource management;Data Factory;ADF;</PackageTags>
<PackageReleaseNotes><![CDATA[
- Added support for customizing write block size for BlobFS and Blob sink in ADF
- Added SapBwCube and Sybase dataset
- Added support for the follwoing new datasets in ADF - AvroDataset, along with source and sink for Copy activity
- AvroDataset will support following locations AzureBlobStorageLocation, AzureBlobFSLocation, AzureDataLakeStoreLocation, AmazonS3Location, FileServerLocation, FtpServerLocation, SftpLocation, HttpServerLocation, HdfsLocation
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
[assembly: AssemblyTitle("Microsoft Azure Data Factory Management Library")]
[assembly: AssemblyDescription("Provides management functionality for Microsoft Azure Data Factory Resources.")]
[assembly: AssemblyVersion("4.1.0.0")]
[assembly: AssemblyFileVersion("4.1.2.0")]
[assembly: AssemblyFileVersion("4.1.3.0")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Microsoft")]
[assembly: AssemblyProduct("Microsoft Azure .NET SDK")]
Expand Down
Loading