Add support for ip_range datatype (Backport of #3202 to 5.x) #3215
Conversation
This file contains hidden or 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
codebrain
changed the title
russcam
suggested changes
Apr 26, 2018
| [JsonProperty(PropertyName = "ranges")] | ||
| IEnumerable<IIpRange> Ranges { get; set; } | ||
| [JsonProperty("ranges")] | ||
| IEnumerable<IIpRangeAggregationRange> Ranges { get; set; } |
| { | ||
| public Field Field { get; set; } | ||
| public IEnumerable<IIpRange> Ranges { get; set; } | ||
| public IEnumerable<IIpRangeAggregationRange> Ranges { get; set; } |
| Field IIpRangeAggregation.Field { get; set; } | ||
|
|
||
| IEnumerable<IIpRange> IIpRangeAggregation.Ranges { get; set; } | ||
| IEnumerable<IIpRangeAggregationRange> IIpRangeAggregation.Ranges { get; set; } |
|
|
||
| public IpRangeAggregationDescriptor<T> Ranges(params Func<IpRangeDescriptor, IIpRange>[] ranges) => | ||
| Assign(a => a.Ranges = ranges?.Select(r => r(new IpRangeDescriptor()))); | ||
| public IpRangeAggregationDescriptor<T> Ranges(params Func<IpRangeAggregationRangeDescriptor, IIpRangeAggregationRange>[] ranges) => |
| public IpRangeAggregationDescriptor<T> Ranges(params Func<IpRangeDescriptor, IIpRange>[] ranges) => | ||
| Assign(a => a.Ranges = ranges?.Select(r => r(new IpRangeDescriptor()))); | ||
| public IpRangeAggregationDescriptor<T> Ranges(params Func<IpRangeAggregationRangeDescriptor, IIpRangeAggregationRange>[] ranges) => | ||
| Assign(a => a.Ranges = ranges?.Select(r => r(new IpRangeAggregationRangeDescriptor()))); |
|
|
||
| namespace Nest | ||
| { | ||
| public class IpRangeAttribute : RangePropertyAttributeBase, IIpRangeProperty |
Contributor
There was a problem hiding this comment.
IpAddressRangeAttribute, to align with IpAddressRange?
| namespace Nest | ||
| { | ||
| [JsonObject(MemberSerialization.OptIn)] | ||
| public interface IIpRangeProperty : IRangeProperty { } |
| [JsonObject(MemberSerialization.OptIn)] | ||
| public interface IIpRangeProperty : IRangeProperty { } | ||
|
|
||
| public class IpRangeProperty : RangePropertyBase, IIpRangeProperty |
| public IpRangeProperty() : base(RangeType.IpRange) { } | ||
| } | ||
|
|
||
| public class IpRangePropertyDescriptor<T> |
Contributor
There was a problem hiding this comment.
IpAddressRangePropertyDescriptor?
russcam
suggested changes
Apr 26, 2018
Contributor
russcam
left a comment
russcam
left a comment
There was a problem hiding this comment.
LGTM, just some small changes for naming consistency
src/Nest/Mapping/Types/Properties.cs
Outdated
| using System.Linq; | ||
| using System.Linq.Expressions; | ||
| using System.Reflection; | ||
| using Elasticsearch.Net; |
|
|
||
| namespace Tests.Mapping.Types.Core.Range.IpRange | ||
| { | ||
| public class IpRangeTest |
Contributor
There was a problem hiding this comment.
IpAddressRangeTest for consistency?
| } | ||
|
|
||
| [SkipVersion("<5.5.0", "ip range type is a new 5.5.0 feature")] | ||
| public class IpRangeAttributeTests : AttributeTestsBase<IpRangeTest> |
Contributor
There was a problem hiding this comment.
IpAddressRangeAttributeTests for consistency?
| namespace Tests.Mapping.Types.Core.Range.IpRange | ||
| { | ||
| [SkipVersion("<5.5.0", "ip range type is a new 5.5.0 feature")] | ||
| public class IpRangePropertyTests : PropertyTestsBase |
Contributor
There was a problem hiding this comment.
IpAddressRangePropertyTests for consistency?
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.
This commit adds support for the ip_range datatype.
The existing IpRange type used for IpRangeAggregation renamed to
IpRangeAggregationRange to allow for the introduction of an IpRange type
whose name aligns with other range datatypes.