Skip to content

Add shard_min_doc_count to Significant Terms Aggregation #2958

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

Merged
merged 3 commits into from
Dec 18, 2017
Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,16 @@ public interface ISignificantTermsAggregation : IBucketAggregation
/// number of hits
/// </summary>
[JsonProperty("min_doc_count")]
int? MinimumDocumentCount { get; set; }
long? MinimumDocumentCount { get; set; }

/// <summary>
/// Regulates the certainty a shard has if the term should actually be added to the candidate
/// list or not with respect to the <see cref="MinimumDocumentCount"/>.
/// Terms will only be considered if their local shard frequency within
/// the set is higher than the <see cref="ShardMinimumDocumentCount"/>.
/// </summary>
[JsonProperty("shard_min_doc_count")]
long? ShardMinimumDocumentCount { get; set; }

/// <summary>
/// Determines the mechanism by which aggregations are executed
Expand Down Expand Up @@ -97,7 +106,6 @@ public interface ISignificantTermsAggregation : IBucketAggregation
/// </summary>
[JsonProperty("background_filter")]
QueryContainer BackgroundFilter { get; set; }

}

public class SignificantTermsAggregation : BucketAggregationBase, ISignificantTermsAggregation
Expand All @@ -109,13 +117,13 @@ public class SignificantTermsAggregation : BucketAggregationBase, ISignificantTe
/// <inheritdoc />
public int? ShardSize { get; set; }
/// <inheritdoc />
public int? MinimumDocumentCount { get; set; }
public long? MinimumDocumentCount { get; set; }
/// <inheritdoc />
public long? ShardMinimumDocumentCount { get; set; }
/// <inheritdoc />
public TermsAggregationExecutionHint? ExecutionHint { get; set; }

/// <inheritdoc />
public SignificantTermsIncludeExclude Include { get; set; }

/// <inheritdoc />
public SignificantTermsIncludeExclude Exclude { get; set; }
/// <inheritdoc />
Expand Down Expand Up @@ -149,7 +157,9 @@ public class SignificantTermsAggregationDescriptor<T>

int? ISignificantTermsAggregation.ShardSize { get; set; }

int? ISignificantTermsAggregation.MinimumDocumentCount { get; set; }
long? ISignificantTermsAggregation.MinimumDocumentCount { get; set; }

long? ISignificantTermsAggregation.ShardMinimumDocumentCount { get; set; }

TermsAggregationExecutionHint? ISignificantTermsAggregation.ExecutionHint { get; set; }

Expand Down Expand Up @@ -201,9 +211,13 @@ public SignificantTermsAggregationDescriptor<T> Exclude(IEnumerable<string> valu
public SignificantTermsAggregationDescriptor<T> ShardSize(int shardSize) => Assign(a => a.ShardSize = shardSize);

/// <inheritdoc />
public SignificantTermsAggregationDescriptor<T> MinimumDocumentCount(int minimumDocumentCount) =>
public SignificantTermsAggregationDescriptor<T> MinimumDocumentCount(long minimumDocumentCount) =>
Assign(a => a.MinimumDocumentCount = minimumDocumentCount);

/// <inheritdoc />
public SignificantTermsAggregationDescriptor<T> ShardMinimumDocumentCount(long shardMinimumDocumentCount) =>
Assign(a => a.ShardMinimumDocumentCount = shardMinimumDocumentCount);

/// <inheritdoc />
public SignificantTermsAggregationDescriptor<T> MutualInformation(Func<MutualInformationHeuristicDescriptor, IMutualInformationHeuristic> mutualInformationSelector = null) =>
Assign(a => a.MutualInformation = mutualInformationSelector.InvokeOrDefault(new MutualInformationHeuristicDescriptor()));
Expand Down