diff --git a/eng/mgmt/mgmtmetadata/search_data-plane_Microsoft.Azure.Search.Service.txt b/eng/mgmt/mgmtmetadata/search_data-plane_Microsoft.Azure.Search.Service.txt new file mode 100644 index 0000000000000..e84e664eb864b --- /dev/null +++ b/eng/mgmt/mgmtmetadata/search_data-plane_Microsoft.Azure.Search.Service.txt @@ -0,0 +1,14 @@ +Installing AutoRest version: latest +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/search/data-plane/Microsoft.Azure.Search.Service/readme.md --csharp --version=latest --reflect-api-versions --csharp-sdks-folder=C:\repos\azure-sdk-for-net\sdk +2019-07-25 22:29:05 UTC +Azure-rest-api-specs repository information +GitHub fork: Azure +Branch: master +Commit: a28a3fca492d332b0e515f0017551cb692772b29 +AutoRest information +Requested version: latest +Bootstrapper version: autorest@2.0.4283 diff --git a/sdk/search/Microsoft.Azure.Search.Service/src/Generated/Models/IndexerExecutionInfo.cs b/sdk/search/Microsoft.Azure.Search.Service/src/Generated/Models/IndexerExecutionInfo.cs index b921e8812840c..9ef67b5d04d64 100644 --- a/sdk/search/Microsoft.Azure.Search.Service/src/Generated/Models/IndexerExecutionInfo.cs +++ b/sdk/search/Microsoft.Azure.Search.Service/src/Generated/Models/IndexerExecutionInfo.cs @@ -37,11 +37,13 @@ public IndexerExecutionInfo() /// in-progress indexer execution. /// History of the recent indexer /// executions, sorted in reverse chronological order. - public IndexerExecutionInfo(IndexerStatus status = default(IndexerStatus), IndexerExecutionResult lastResult = default(IndexerExecutionResult), IList executionHistory = default(IList)) + /// The execution limits for the indexer. + public IndexerExecutionInfo(IndexerStatus status = default(IndexerStatus), IndexerExecutionResult lastResult = default(IndexerExecutionResult), IList executionHistory = default(IList), IndexerLimits limits = default(IndexerLimits)) { Status = status; LastResult = lastResult; ExecutionHistory = executionHistory; + Limits = limits; CustomInit(); } @@ -71,5 +73,11 @@ public IndexerExecutionInfo() [JsonProperty(PropertyName = "executionHistory")] public IList ExecutionHistory { get; private set; } + /// + /// Gets the execution limits for the indexer. + /// + [JsonProperty(PropertyName = "limits")] + public IndexerLimits Limits { get; private set; } + } } diff --git a/sdk/search/Microsoft.Azure.Search.Service/src/Generated/Models/IndexerLimits.cs b/sdk/search/Microsoft.Azure.Search.Service/src/Generated/Models/IndexerLimits.cs new file mode 100644 index 0000000000000..a3acec68d6ef9 --- /dev/null +++ b/sdk/search/Microsoft.Azure.Search.Service/src/Generated/Models/IndexerLimits.cs @@ -0,0 +1,72 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Search.Models +{ + using Newtonsoft.Json; + using System.Linq; + + public partial class IndexerLimits + { + /// + /// Initializes a new instance of the IndexerLimits class. + /// + public IndexerLimits() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the IndexerLimits class. + /// + /// The maximum duration that the indexer is + /// permitted to run for one execution. + /// The maximum size of a + /// document, in bytes, which will be considered valid for + /// indexing. + /// The maximum + /// number of characters that will be extracted from a document picked + /// up for indexing. + public IndexerLimits(System.TimeSpan? maxRunTime = default(System.TimeSpan?), double? maxDocumentExtractionSize = default(double?), double? maxDocumentContentCharactersToExtract = default(double?)) + { + MaxRunTime = maxRunTime; + MaxDocumentExtractionSize = maxDocumentExtractionSize; + MaxDocumentContentCharactersToExtract = maxDocumentContentCharactersToExtract; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets the maximum duration that the indexer is permitted to run for + /// one execution. + /// + [JsonProperty(PropertyName = "maxRunTime")] + public System.TimeSpan? MaxRunTime { get; private set; } + + /// + /// Gets the maximum size of a document, in bytes, which will be + /// considered valid for indexing. + /// + [JsonProperty(PropertyName = "maxDocumentExtractionSize")] + public double? MaxDocumentExtractionSize { get; private set; } + + /// + /// Gets the maximum number of characters that will be extracted from a + /// document picked up for indexing. + /// + [JsonProperty(PropertyName = "maxDocumentContentCharactersToExtract")] + public double? MaxDocumentContentCharactersToExtract { get; private set; } + + } +} diff --git a/sdk/search/Microsoft.Azure.Search.Service/src/Generated/Models/ServiceLimits.cs b/sdk/search/Microsoft.Azure.Search.Service/src/Generated/Models/ServiceLimits.cs index fa676bc54074e..21fcb7bd176d6 100644 --- a/sdk/search/Microsoft.Azure.Search.Service/src/Generated/Models/ServiceLimits.cs +++ b/sdk/search/Microsoft.Azure.Search.Service/src/Generated/Models/ServiceLimits.cs @@ -37,11 +37,15 @@ public ServiceLimits() /// The maximum number /// of fields of type Collection(Edm.ComplexType) allowed in an /// index. - public ServiceLimits(int? maxFieldsPerIndex = default(int?), int? maxFieldNestingDepthPerIndex = default(int?), int? maxComplexCollectionFieldsPerIndex = default(int?)) + /// The maximum + /// number of objects in complex collections allowed per + /// document. + public ServiceLimits(int? maxFieldsPerIndex = default(int?), int? maxFieldNestingDepthPerIndex = default(int?), int? maxComplexCollectionFieldsPerIndex = default(int?), int? maxComplexObjectsInCollectionsPerDocument = default(int?)) { MaxFieldsPerIndex = maxFieldsPerIndex; MaxFieldNestingDepthPerIndex = maxFieldNestingDepthPerIndex; MaxComplexCollectionFieldsPerIndex = maxComplexCollectionFieldsPerIndex; + MaxComplexObjectsInCollectionsPerDocument = maxComplexObjectsInCollectionsPerDocument; CustomInit(); } @@ -71,5 +75,12 @@ public ServiceLimits() [JsonProperty(PropertyName = "maxComplexCollectionFieldsPerIndex")] public int? MaxComplexCollectionFieldsPerIndex { get; set; } + /// + /// Gets or sets the maximum number of objects in complex collections + /// allowed per document. + /// + [JsonProperty(PropertyName = "maxComplexObjectsInCollectionsPerDocument")] + public int? MaxComplexObjectsInCollectionsPerDocument { get; set; } + } } diff --git a/sdk/search/Microsoft.Azure.Search.Service/src/Generated/SdkInfo_SearchServiceClient.cs b/sdk/search/Microsoft.Azure.Search.Service/src/Generated/SdkInfo_SearchServiceClient.cs index de2cc232f0d77..d5e93f38faddd 100644 --- a/sdk/search/Microsoft.Azure.Search.Service/src/Generated/SdkInfo_SearchServiceClient.cs +++ b/sdk/search/Microsoft.Azure.Search.Service/src/Generated/SdkInfo_SearchServiceClient.cs @@ -31,10 +31,10 @@ public static IEnumerable> ApiInfo_SearchServiceCl // 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/search/data-plane/Microsoft.Azure.Search.Service/readme.md --csharp --version=latest --reflect-api-versions --csharp-sdks-folder=E:\\github\\azure-sdk-for-net\\src\\SDKs"; + public static readonly String AutoRestCmdExecuted = "cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/search/data-plane/Microsoft.Azure.Search.Service/readme.md --csharp --version=latest --reflect-api-versions --csharp-sdks-folder=C:\\repos\\azure-sdk-for-net\\sdk"; public static readonly String GithubForkName = "Azure"; public static readonly String GithubBranchName = "master"; - public static readonly String GithubCommidId = "fd4cebfb65fed63d5136e872ab8431dd324d8c40"; + public static readonly String GithubCommidId = "a28a3fca492d332b0e515f0017551cb692772b29"; public static readonly String CodeGenerationErrors = ""; public static readonly String GithubRepoName = "azure-rest-api-specs"; // END: Code Generation Metadata Section diff --git a/sdk/search/Microsoft.Azure.Search/tests/Tests/IndexerTests.cs b/sdk/search/Microsoft.Azure.Search/tests/Tests/IndexerTests.cs index 4c2207d2c31a3..d58994b2cc71c 100644 --- a/sdk/search/Microsoft.Azure.Search/tests/Tests/IndexerTests.cs +++ b/sdk/search/Microsoft.Azure.Search/tests/Tests/IndexerTests.cs @@ -307,6 +307,11 @@ public void CanRunIndexerAndGetIndexerStatus() Assert.Equal(IndexerExecutionStatus.InProgress, info.LastResult.Status); Assert.Equal(3, info.ExecutionHistory.Count); + Assert.NotNull(info.Limits); + Assert.Equal(100000, info.Limits.MaxDocumentContentCharactersToExtract); + Assert.Equal(1000, info.Limits.MaxDocumentExtractionSize); + Assert.Equal(TimeSpan.FromDays(1), info.Limits.MaxRunTime); + IndexerExecutionResult newestResult = info.ExecutionHistory[0]; IndexerExecutionResult middleResult = info.ExecutionHistory[1]; IndexerExecutionResult oldestResult = info.ExecutionHistory[2]; diff --git a/sdk/search/Microsoft.Azure.Search/tests/Tests/ServiceStatsTests.cs b/sdk/search/Microsoft.Azure.Search/tests/Tests/ServiceStatsTests.cs index af3464705785c..531403ce765c1 100644 --- a/sdk/search/Microsoft.Azure.Search/tests/Tests/ServiceStatsTests.cs +++ b/sdk/search/Microsoft.Azure.Search/tests/Tests/ServiceStatsTests.cs @@ -31,7 +31,8 @@ public void GetServiceStatsReturnsCorrectDefinition() { MaxFieldsPerIndex = 1000, MaxFieldNestingDepthPerIndex = 10, - MaxComplexCollectionFieldsPerIndex = 40 + MaxComplexCollectionFieldsPerIndex = 40, + MaxComplexObjectsInCollectionsPerDocument = 3000 } };