Fix #3317 and #3322 add after_key support to composite aggregation re… #3367
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
russcam
suggested changes
Aug 20, 2018
| @@ -34,6 +34,20 @@ public class MultiBucketAggregate<TBucket> : IAggregate | |||
| public IReadOnlyCollection<TBucket> Buckets { get; set; } = EmptyReadOnly<TBucket>.Collection; | |||
| } | |||
|
|
|||
| public class CompositeBucketAggregate : IAggregate | |||
There was a problem hiding this comment.
if this were to derive from MultiBucketAggregate<CompositeBucket>, I think binary compatibility would be maintained.
| /// If all buckets are filtered/removed by a pipeline aggregation, the after_key will contain the last bucket before filtering. | ||
| /// </summary> | ||
| /// <remarks> Valid for Elasticsearch 6.3.0+ </remarks> | ||
| public IReadOnlyDictionary<string, object> AfterKey { get; set; } = EmptyReadOnly<string, object>.Dictionary; |
| await this.AssertOnAllResponses(r => r.ShouldHaveExpectedIsValid(this.ExpectIsValid)); | ||
|
|
||
| [I] public async Task ReturnsExpectedResponse() => await this.AssertOnAllResponses(ExpectResponse); | ||
| [I] public virtual async Task ReturnsExpectedResponse() => await this.AssertOnAllResponses(ExpectResponse); |
There was a problem hiding this comment.
doesn't look like this needs to be virtual?
| await this.AssertOnAllResponses(r => r.ApiCall.HttpStatusCode.Should().Be(this.ExpectStatusCode)); | ||
|
|
||
| [I] public async Task ReturnsExpectedIsValid() => | ||
| [I] public virtual async Task ReturnsExpectedIsValid() => |
There was a problem hiding this comment.
doesn't look like this needs to be virtual?
| @@ -32,13 +32,13 @@ public abstract class ApiIntegrationTestBase<TCluster, TResponse, TInterface, TD | |||
| public override IElasticClient Client => this.Cluster.Client; | |||
| protected override TInitializer Initializer => Activator.CreateInstance<TInitializer>(); | |||
|
|
|||
| [I] public async Task ReturnsExpectedStatusCode() => | |||
| [I] public virtual async Task ReturnsExpectedStatusCode() => | |||
There was a problem hiding this comment.
doesn't look like this needs to be virtual?
russcam
approved these changes
Aug 20, 2018
This was referenced Aug 20, 2018
Mpdreamz
added a commit
that referenced
this pull request
Sep 3, 2018
#3367) Fix #3317 and #3322 add after_key support to composite aggregation result and allow format to be set for date histogram composite source Introduce CompositeBucketAggregate derived from MultiBucketAggregate<CompositeBucket> to introduce AfterKey property. Bump dotnet-xunit .NET tool to official release
Mpdreamz
added a commit
that referenced
this pull request
Sep 3, 2018
#3367) Fix #3317 and #3322 add after_key support to composite aggregation result and allow format to be set for date histogram composite source Introduce CompositeBucketAggregate derived from MultiBucketAggregate<CompositeBucket> to introduce AfterKey property. Bump dotnet-xunit .NET tool to official release
Mpdreamz
added a commit
that referenced
this pull request
Sep 6, 2018
#3367) Fix #3317 and #3322 add after_key support to composite aggregation result and allow format to be set for date histogram composite source Introduce CompositeBucketAggregate derived from MultiBucketAggregate<CompositeBucket> to introduce AfterKey property. Bump dotnet-xunit .NET tool to official release (cherry picked from commit 69775d6)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
…sult and allow format to be set for date histogram composite source