Merge pull request #899 from elasticsearch/feature/field-data-mapping

Mpdreamz · Mpdreamz · commit 50d57aab5047 · 2014-08-25T14:39:28.000+02:00
Add field data mapping support
diff --git a/src/Nest/Domain/Mapping/Descriptors/FieldDataFilterDescriptor.cs b/src/Nest/Domain/Mapping/Descriptors/FieldDataFilterDescriptor.cs
@@ -0,0 +1,33 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Nest
+{
+	public class FieldDataFilterDescriptor
+	{
+		internal FieldDataFilter Filter { get; private set; }
+
+		public FieldDataFilterDescriptor()
+		{
+			this.Filter = new FieldDataFilter();
+		}
+
+		public FieldDataFilterDescriptor Frequency(
+			Func<FieldDataFrequencyFilterDescriptor, FieldDataFrequencyFilterDescriptor> frequencyFilterSelector)
+		{
+			var selector = frequencyFilterSelector(new FieldDataFrequencyFilterDescriptor());
+			this.Filter.Frequency = selector.FrequencyFilter;
+			return this;
+		}
+
+		public FieldDataFilterDescriptor Regex(
+			Func<FieldDataRegexFilterDescriptor, FieldDataRegexFilterDescriptor> regexFilterSelector)
+		{
+			var selector = regexFilterSelector(new FieldDataRegexFilterDescriptor());
+			this.Filter.Regex = selector.RegexFilter;
+			return this;
+		}
+	}
+}
diff --git a/src/Nest/Domain/Mapping/Descriptors/FieldDataFrequencyFilterDescriptor.cs b/src/Nest/Domain/Mapping/Descriptors/FieldDataFrequencyFilterDescriptor.cs
@@ -0,0 +1,35 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Nest
+{
+	public class FieldDataFrequencyFilterDescriptor
+	{
+		internal FieldDataFrequencyFilter FrequencyFilter { get; private set; }
+
+		public FieldDataFrequencyFilterDescriptor()
+		{
+			this.FrequencyFilter = new FieldDataFrequencyFilter();
+		}
+
+		public FieldDataFrequencyFilterDescriptor Min(double min)
+		{
+			this.FrequencyFilter.Min = min;
+			return this;
+		}
+
+		public FieldDataFrequencyFilterDescriptor Max(double max)
+		{
+			this.FrequencyFilter.Max = max;
+			return this;
+		}
+
+		public FieldDataFrequencyFilterDescriptor MinSegmentSize(int minSegmentSize)
+		{
+			this.FrequencyFilter.MinSegmentSize = minSegmentSize;
+			return this;
+		}
+	}
+}
diff --git a/src/Nest/Domain/Mapping/Descriptors/FieldDataNonStringMappingDescriptor.cs b/src/Nest/Domain/Mapping/Descriptors/FieldDataNonStringMappingDescriptor.cs
@@ -0,0 +1,37 @@
+﻿
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Nest
+{
+	public class FieldDataNonStringMappingDescriptor
+	{
+		internal FieldDataNonStringMapping FieldData { get; private set; }
+
+		public FieldDataNonStringMappingDescriptor()
+		{
+			this.FieldData = new FieldDataNonStringMapping();
+		}
+		
+		public FieldDataNonStringMappingDescriptor Format(FieldDataNonStringFormat format)
+		{
+			this.FieldData.Format = format;
+			return this;
+		}
+
+		public FieldDataNonStringMappingDescriptor Loading(FieldDataLoading loading)
+		{
+			this.FieldData.Loading = loading;
+			return this;
+		}
+
+		public FieldDataNonStringMappingDescriptor Filter(Func<FieldDataFilterDescriptor, FieldDataFilterDescriptor> filterSelector)
+		{
+			var selector = filterSelector(new FieldDataFilterDescriptor());
+			this.FieldData.Filter = selector.Filter;
+			return this;
+		}
+	}
+}
diff --git a/src/Nest/Domain/Mapping/Descriptors/FieldDataRegexFilterDescriptor.cs b/src/Nest/Domain/Mapping/Descriptors/FieldDataRegexFilterDescriptor.cs
@@ -0,0 +1,24 @@
+﻿
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Nest
+{
+	public class FieldDataRegexFilterDescriptor
+	{
+		internal FieldDataRegexFilter RegexFilter { get; private set; }
+
+		public FieldDataRegexFilterDescriptor()
+		{
+			this.RegexFilter = new FieldDataRegexFilter();
+		}
+
+		public FieldDataRegexFilterDescriptor Pattern(string pattern)
+		{
+			this.RegexFilter.Pattern = pattern;
+			return this;
+		}
+	}
+}
diff --git a/src/Nest/Domain/Mapping/Descriptors/FieldDataStringMappingDescriptor.cs b/src/Nest/Domain/Mapping/Descriptors/FieldDataStringMappingDescriptor.cs
@@ -0,0 +1,36 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Nest
+{
+	public class FieldDataStringMappingDescriptor
+	{
+		internal FieldDataStringMapping FieldData { get; private set; }
+
+		public FieldDataStringMappingDescriptor()
+		{
+			this.FieldData = new FieldDataStringMapping();
+		}
+		
+		public FieldDataStringMappingDescriptor Format(FieldDataStringFormat format)
+		{
+			this.FieldData.Format = format;
+			return this;
+		}
+
+		public FieldDataStringMappingDescriptor Loading(FieldDataLoading loading)
+		{
+			this.FieldData.Loading = loading;
+			return this;
+		}
+
+		public FieldDataStringMappingDescriptor Filter(Func<FieldDataFilterDescriptor, FieldDataFilterDescriptor> filterSelector)
+		{
+			var selector = filterSelector(new FieldDataFilterDescriptor());
+			this.FieldData.Filter = selector.Filter;
+			return this;
+		}
+	}
+}
diff --git a/src/Nest/Domain/Mapping/Descriptors/GeoPointMappingDescriptor.cs b/src/Nest/Domain/Mapping/Descriptors/GeoPointMappingDescriptor.cs
@@ -35,5 +35,19 @@ public GeoPointMappingDescriptor<T> GeoHashPrecision(int geoHashPrecision)
 			this._Mapping.GeoHashPrecision = geoHashPrecision;
 			return this;
 		}
+
+		public GeoPointMappingDescriptor<T> FieldData(Func<FieldDataNonStringMappingDescriptor, FieldDataNonStringMappingDescriptor> fieldDataSelector)
+		{
+			fieldDataSelector.ThrowIfNull("fieldDataSelector");
+			var selector = fieldDataSelector(new FieldDataNonStringMappingDescriptor());
+			this._Mapping.FieldData = selector.FieldData;
+			return this;
+		}
+
+		public GeoPointMappingDescriptor<T> FieldData(FieldDataNonStringMapping fieldData)
+		{
+			this._Mapping.FieldData = fieldData;
+			return this;
+		}
 	}
 }
diff --git a/src/Nest/Domain/Mapping/Descriptors/NumberMappingDescriptor.cs b/src/Nest/Domain/Mapping/Descriptors/NumberMappingDescriptor.cs
@@ -100,6 +100,20 @@ public NumberMappingDescriptor<T> Fields(Func<CorePropertiesDescriptor<T>, CoreP
 				_Mapping.Fields[p.Key] = value;
 			}
 			return this;
+		}
+
+		public NumberMappingDescriptor<T> FieldData(Func<FieldDataNonStringMappingDescriptor, FieldDataNonStringMappingDescriptor> fieldDataSelector)
+		{
+			fieldDataSelector.ThrowIfNull("fieldDataSelector");
+			var selector = fieldDataSelector(new FieldDataNonStringMappingDescriptor());
+			this._Mapping.FieldData = selector.FieldData;
+			return this;
+		}
+
+		public NumberMappingDescriptor<T> FieldData(FieldDataNonStringMapping fieldData)
+		{
+			this._Mapping.FieldData = fieldData;
+			return this;
 		}
 	}
 }
diff --git a/src/Nest/Domain/Mapping/Descriptors/StringMappingDescriptor.cs b/src/Nest/Domain/Mapping/Descriptors/StringMappingDescriptor.cs
@@ -140,5 +140,19 @@ public StringMappingDescriptor<T> Fields(Func<CorePropertiesDescriptor<T>, CoreP
 			}
 			return this;
 		}
+
+		public StringMappingDescriptor<T> FieldData(Func<FieldDataStringMappingDescriptor, FieldDataStringMappingDescriptor> fieldDataSelector)
+		{
+			fieldDataSelector.ThrowIfNull("fieldDataSelector");
+			var selector = fieldDataSelector(new FieldDataStringMappingDescriptor());
+			this._Mapping.FieldData = selector.FieldData;
+			return this;
+		}
+
+		public StringMappingDescriptor<T> FieldData(FieldDataStringMapping fieldData)
+		{
+			this._Mapping.FieldData = fieldData;
+			return this;
+		}
 	}
 }
diff --git a/src/Nest/Domain/Mapping/SubMappings/FieldData/FieldDataFilter.cs b/src/Nest/Domain/Mapping/SubMappings/FieldData/FieldDataFilter.cs
@@ -0,0 +1,18 @@
+﻿using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Nest
+{
+	[JsonObject(MemberSerialization.OptIn)]
+	public class FieldDataFilter
+	{
+		[JsonProperty("frequency")]
+		public FieldDataFrequencyFilter Frequency { get; set; }
+
+		[JsonProperty("regex")]
+		public FieldDataRegexFilter Regex { get; set; }
+	}
+}
diff --git a/src/Nest/Domain/Mapping/SubMappings/FieldData/FieldDataFrequencyFilter.cs b/src/Nest/Domain/Mapping/SubMappings/FieldData/FieldDataFrequencyFilter.cs
@@ -0,0 +1,21 @@
+﻿using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Nest
+{
+	[JsonObject(MemberSerialization.OptIn)]
+	public class FieldDataFrequencyFilter
+	{
+		[JsonProperty("min")]
+		public double? Min { get; set; }
+
+		[JsonProperty("max")]
+		public double? Max { get; set; }
+
+		[JsonProperty("min_segment_size")]
+		public int? MinSegmentSize { get; set; }
+	}
+}
diff --git a/src/Nest/Domain/Mapping/SubMappings/FieldData/FieldDataMapping.cs b/src/Nest/Domain/Mapping/SubMappings/FieldData/FieldDataMapping.cs
@@ -0,0 +1,18 @@
+﻿using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Nest
+{
+	[JsonObject(MemberSerialization.OptIn)]
+	public abstract class FieldDataMapping
+	{
+		[JsonProperty("loading")]
+		public FieldDataLoading? Loading { get; set; }
+
+		[JsonProperty("filter")]
+		public FieldDataFilter Filter { get; set; }
+	}
+}
diff --git a/src/Nest/Domain/Mapping/SubMappings/FieldData/FieldDataNonStringMapping.cs b/src/Nest/Domain/Mapping/SubMappings/FieldData/FieldDataNonStringMapping.cs
@@ -0,0 +1,15 @@
+﻿using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Nest
+{
+	[JsonObject(MemberSerialization.OptIn)]
+	public class FieldDataNonStringMapping : FieldDataMapping
+	{
+		[JsonProperty("format")]
+		public FieldDataNonStringFormat? Format { get; set; }
+	}
+}
diff --git a/src/Nest/Domain/Mapping/SubMappings/FieldData/FieldDataRegexFilter.cs b/src/Nest/Domain/Mapping/SubMappings/FieldData/FieldDataRegexFilter.cs
@@ -0,0 +1,15 @@
+﻿using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Nest
+{
+	[JsonObject(MemberSerialization.OptIn)]
+	public class FieldDataRegexFilter
+	{
+		[JsonProperty("pattern")]
+		public string Pattern { get; set; }
+	}
+}
diff --git a/src/Nest/Domain/Mapping/SubMappings/FieldData/FieldDataStringMapping.cs b/src/Nest/Domain/Mapping/SubMappings/FieldData/FieldDataStringMapping.cs
@@ -0,0 +1,15 @@
+﻿using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Nest
+{
+	[JsonObject(MemberSerialization.OptIn)]
+	public class FieldDataStringMapping : FieldDataMapping
+	{
+		[JsonProperty("format")]
+		public FieldDataStringFormat? Format { get; set; }
+	}
+}
diff --git a/src/Nest/Domain/Mapping/Types/GeoPointMapping.cs b/src/Nest/Domain/Mapping/Types/GeoPointMapping.cs
@@ -23,5 +23,8 @@ public class GeoPointMapping : IElasticType
 
 		[JsonProperty("geohash_precision")]
 		public int? GeoHashPrecision { get; set; }
+
+		[JsonProperty("fielddata")]
+		public FieldDataNonStringMapping FieldData { get; set; }
 	}
 }
diff --git a/src/Nest/Domain/Mapping/Types/NumberMapping.cs b/src/Nest/Domain/Mapping/Types/NumberMapping.cs
@@ -43,5 +43,7 @@ public NumberMapping()
 		[JsonProperty("coerce")]
 		public bool? Coerce { get; set; }
 
+		[JsonProperty("fielddata")]
+		public FieldDataNonStringMapping FieldData { get; set; }
 	}
 }
diff --git a/src/Nest/Domain/Mapping/Types/StringMapping.cs b/src/Nest/Domain/Mapping/Types/StringMapping.cs
@@ -61,6 +61,9 @@ public StringMapping():base("string")
 		public int? PositionOffsetGap { get; set; }
 
 		[JsonProperty("copy_to")]
-		public IEnumerable<PropertyPathMarker> CopyTo { get; set; }
+		public IEnumerable<PropertyPathMarker> CopyTo { get; set; }
+
+		[JsonProperty("fielddata")]
+		public FieldDataStringMapping FieldData { get; set; }
 	}
 }
diff --git a/src/Nest/Enums/FieldDataLoading.cs b/src/Nest/Enums/FieldDataLoading.cs
@@ -0,0 +1,19 @@
+﻿using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Serialization;
+using System.Text;
+
+namespace Nest
+{
+	[JsonConverter(typeof(StringEnumConverter))]
+	public enum FieldDataLoading
+	{
+		[EnumMember(Value = "eager")]
+		Eager,
+		[EnumMember(Value = "eager_global_ordinals")]
+		EagerGlobalOrdinals
+	}
+}
diff --git a/src/Nest/Enums/FieldDataNonStringFormat.cs b/src/Nest/Enums/FieldDataNonStringFormat.cs
diff --git a/src/Nest/Enums/FieldDataStringFormat.cs b/src/Nest/Enums/FieldDataStringFormat.cs
diff --git a/src/Nest/Nest.csproj b/src/Nest/Nest.csproj
diff --git a/src/Tests/Nest.Tests.Unit/Core/Map/Properties/GeoPointProperty.json b/src/Tests/Nest.Tests.Unit/Core/Map/Properties/GeoPointProperty.json
diff --git a/src/Tests/Nest.Tests.Unit/Core/Map/Properties/NumberProperty.json b/src/Tests/Nest.Tests.Unit/Core/Map/Properties/NumberProperty.json
diff --git a/src/Tests/Nest.Tests.Unit/Core/Map/Properties/PropertiesTests.cs b/src/Tests/Nest.Tests.Unit/Core/Map/Properties/PropertiesTests.cs
diff --git a/src/Tests/Nest.Tests.Unit/Core/Map/Properties/StringProperty.json b/src/Tests/Nest.Tests.Unit/Core/Map/Properties/StringProperty.json

Original file line number	Diff line number	Diff line change
`@@ -100,6 +100,20 @@ public NumberMappingDescriptor<T> Fields(Func<CorePropertiesDescriptor<T>, CoreP`
`100`	`100`	`_Mapping.Fields[p.Key] = value;`
`101`	`101`	`}`
`102`	`102`	`return this;`
	`103`	`+ }`
	`104`	`+`
	`105`	`+ public NumberMappingDescriptor<T> FieldData(Func<FieldDataNonStringMappingDescriptor, FieldDataNonStringMappingDescriptor> fieldDataSelector)`
	`106`	`+ {`
	`107`	`+ fieldDataSelector.ThrowIfNull("fieldDataSelector");`
	`108`	`+ var selector = fieldDataSelector(new FieldDataNonStringMappingDescriptor());`
	`109`	`+ this._Mapping.FieldData = selector.FieldData;`
	`110`	`+ return this;`
	`111`	`+ }`
	`112`	`+`
	`113`	`+ public NumberMappingDescriptor<T> FieldData(FieldDataNonStringMapping fieldData)`
	`114`	`+ {`
	`115`	`+ this._Mapping.FieldData = fieldData;`
	`116`	`+ return this;`
`103`	`117`	`}`
`104`	`118`	`}`
`105`	`119`	`}`
Original file line number	Diff line number	Diff line change
`@@ -140,5 +140,19 @@ public StringMappingDescriptor<T> Fields(Func<CorePropertiesDescriptor<T>, CoreP`
`140`	`140`	`}`
`141`	`141`	`return this;`
`142`	`142`	`}`
	`143`	`+`
	`144`	`+ public StringMappingDescriptor<T> FieldData(Func<FieldDataStringMappingDescriptor, FieldDataStringMappingDescriptor> fieldDataSelector)`
	`145`	`+ {`
	`146`	`+ fieldDataSelector.ThrowIfNull("fieldDataSelector");`
	`147`	`+ var selector = fieldDataSelector(new FieldDataStringMappingDescriptor());`
	`148`	`+ this._Mapping.FieldData = selector.FieldData;`
	`149`	`+ return this;`
	`150`	`+ }`
	`151`	`+`
	`152`	`+ public StringMappingDescriptor<T> FieldData(FieldDataStringMapping fieldData)`
	`153`	`+ {`
	`154`	`+ this._Mapping.FieldData = fieldData;`
	`155`	`+ return this;`
	`156`	`+ }`
`143`	`157`	`}`
`144`	`158`	`}`