Merge pull request #644 from danp60/feature/doc_values

Support doc_values attributes on numeric and string mappings and in ElasticProperty attributes

Author: Mpdreamz

src/Nest/Domain/Mapping/Attributes/ElasticPropertyAttribute.cs

@@ -21,9 +21,11 @@ public class ElasticPropertyAttribute : Attribute, IElasticPropertyAttribute
 		public string Analyzer { get; set; }
 		public string IndexAnalyzer { get; set; }
 		public string SearchAnalyzer { get; set; }
-	    public string SortAnalyzer { get; set; }
+		public string SortAnalyzer { get; set; }
 		public string NullValue { get; set; }
-		public string Similarity { get; set; }
+		public string Similarity { get; set; }
+
+		public bool DocValues { get; set; }
 
 		public bool OmitNorms { get; set; }
 		public bool OmitTermFrequencyAndPositions { get; set; }

src/Nest/Domain/Mapping/Attributes/IElasticPropertyAttribute.cs

@@ -2,7 +2,7 @@
     public interface IElasticPropertyAttribute
     {
         bool AddSortField { get; set; }
-		
+        
         bool OptOut { get; set; }
         string Name { get; set; }
 
@@ -22,7 +22,9 @@ public interface IElasticPropertyAttribute
         bool OmitNorms { get; set; }
         bool OmitTermFrequencyAndPositions { get; set; }
         bool IncludeInAll { get; set; }
-        bool Store { get; set; }
+        bool Store { get; set; }
+
+        bool DocValues { get; set; }
 
         string Similarity { get; set; }
 

src/Nest/Domain/Mapping/Descriptors/NumberMappingDescriptor.cs

@@ -60,6 +60,12 @@ public NumberMappingDescriptor<T> PrecisionStep(int precisionStep)
 			return this;
 		}
 
+		public NumberMappingDescriptor<T> DocValues(bool docValues = true)
+		{
+			this._Mapping.DocValues = docValues;
+			return this;
+		}
+
 		public NumberMappingDescriptor<T> IncludeInAll(bool includeInAll = true)
 		{
 			this._Mapping.IncludeInAll = includeInAll;

src/Nest/Domain/Mapping/Descriptors/StringMappingDescriptor.cs

@@ -76,6 +76,11 @@ public StringMappingDescriptor<T> SearchAnalyzer(string searchAnalyzer)
 			this._Mapping.SearchAnalyzer = searchAnalyzer;
 			return this;
 		}
+		public StringMappingDescriptor<T> DocValues(bool docValues = true)
+		{
+			this._Mapping.DocValues = docValues;
+			return this;
+		}
 		public StringMappingDescriptor<T> IncludeInAll(bool includeInAll = true)
 		{
 			this._Mapping.IncludeInAll = includeInAll;

src/Nest/Domain/Mapping/Types/NumberMapping.cs

@@ -40,6 +40,9 @@ public class NumberMapping : IElasticType, IElasticCoreType
 		[JsonProperty("null_value")]
 		public double? NullValue { get; set; }
 
+		[JsonProperty("doc_values")]
+		public bool? DocValues { get; set; }
+
 		[JsonProperty("include_in_all")]
 		public bool? IncludeInAll { get; set; }
 

src/Nest/Domain/Mapping/Types/StringMapping.cs

@@ -55,6 +55,9 @@ public class StringMapping : IElasticType, IElasticCoreType
 		[JsonProperty("search_analyzer")]
 		public string SearchAnalyzer { get; set; }
 
+		[JsonProperty("doc_values")]
+		public bool? DocValues { get; set; }
+
 		[JsonProperty("include_in_all")]
 		public bool? IncludeInAll { get; set; }
 

src/Nest/Resolvers/Writers/WritePropertiesFromAttributeVisitor.cs

@@ -88,6 +88,11 @@ public void VisitBaseAttribute(IElasticPropertyAttribute att) {
                 this._jsonWriter.WritePropertyName("omit_norms");
                 this._jsonWriter.WriteValue("true");
             }
+            if (att.DocValues)
+            {
+                this._jsonWriter.WritePropertyName("doc_values");
+                this._jsonWriter.WriteValue("true");
+            }
             if (att.OmitTermFrequencyAndPositions)
             {
                 this._jsonWriter.WritePropertyName("omit_term_freq_and_positions");

src/Tests/Nest.Tests.Unit/Core/Map/Properties/DocValuesProperty.json

@@ -0,0 +1,13 @@
+{
+  "docvaluesfoo": {
+    "properties": {
+      "id": {
+        "type": "integer"
+      },
+      "value": {
+        "type": "integer",
+        "doc_values": true
+      }
+    }
+  }
+}

src/Tests/Nest.Tests.Unit/Core/Map/Properties/PropertiesTests.cs

@@ -246,6 +246,31 @@ public void GeoShapeProperty()
 				)
 			);
 			this.JsonEquals(result.ConnectionStatus.Request, MethodInfo.GetCurrentMethod());
+		}
+
+		public class DocValuesFoo
+		{
+			public int Id { get; set; }
+			[ElasticProperty(DocValues=true)]
+			public int Value { get; set; }
+		}
+
+		[Test]
+		public void DocValuesProperty()
+		{
+			var result = this._client.Map<DocValuesFoo>(m => m.MapFromAttributes());
+			this.JsonEquals(result.ConnectionStatus.Request, MethodInfo.GetCurrentMethod());
+
+			var result2 = this._client.Map<DocValuesFoo>(m => m
+				.Properties(props => props
+					.Number(nmd => nmd
+						.Name("id")
+						.Type(NumberType.integer))
+					.Number(nmd => nmd
+						.Name("value")
+						.Type(NumberType.integer)
+						.DocValues())));
+			this.JsonEquals(result2.ConnectionStatus.Request, MethodInfo.GetCurrentMethod());
 		}
 
 	}