Merge pull request #720 from elasticsearch/feature/copyto

Mpdreamz · Mpdreamz · commit 6ea115cfcd7b · 2014-06-17T16:34:22.000+02:00
added copy to field mapping support for appropriate types
diff --git a/.editorconfig b/.editorconfig
@@ -19,3 +19,7 @@ indent_size = 4
 [*.markdown]
 indent_style = spaces
 indent_size = 2
+
+[*.json]
+indent_style = spaces
+indent_size = 2
diff --git a/src/Nest/Domain/Mapping/Descriptors/BinaryMappingDescriptor.cs b/src/Nest/Domain/Mapping/Descriptors/BinaryMappingDescriptor.cs
@@ -1,4 +1,5 @@
 ﻿using System;
+using System.Linq;
 using System.Linq.Expressions;
 using Nest.Resolvers;
 
@@ -25,5 +26,16 @@ public BinaryMappingDescriptor<T> IndexName(string indexName)
 			return this;
 		}
 
+		public BinaryMappingDescriptor<T> CopyTo(params string[] fields)
+		{
+			this._Mapping.CopyTo = fields.Select(f => (PropertyPathMarker)f);
+			return this;
+		}
+
+		public BinaryMappingDescriptor<T> CopyTo(params Expression<Func<T, object>>[] objectPaths)
+		{
+			this._Mapping.CopyTo = objectPaths.Select(e => (PropertyPathMarker)e);
+			return this;
+		}
 	}
 }
diff --git a/src/Nest/Domain/Mapping/Descriptors/BooleanMappingDescriptor.cs b/src/Nest/Domain/Mapping/Descriptors/BooleanMappingDescriptor.cs
@@ -1,4 +1,5 @@
 ﻿using System;
+using System.Linq;
 using System.Linq.Expressions;
 using Nest.Resolvers;
 
@@ -52,6 +53,16 @@ public BooleanMappingDescriptor<T> IncludeInAll(bool includeInAll = true)
 			return this;
 		}
 
+		public BooleanMappingDescriptor<T> CopyTo(params string[] fields)
+		{
+			this._Mapping.CopyTo = fields.Select(f => (PropertyPathMarker)f);
+			return this;
+		}
 
+		public BooleanMappingDescriptor<T> CopyTo(params Expression<Func<T, object>>[] objectPaths)
+		{
+			this._Mapping.CopyTo = objectPaths.Select(e => (PropertyPathMarker)e);
+			return this;
+		}
 	}
 }
diff --git a/src/Nest/Domain/Mapping/Descriptors/StringMappingDescriptor.cs b/src/Nest/Domain/Mapping/Descriptors/StringMappingDescriptor.cs
@@ -1,4 +1,5 @@
-﻿using System;
+﻿using System;
+using System.Linq;
 using System.Linq.Expressions;
 using Nest.Resolvers;
 
@@ -92,5 +93,16 @@ public StringMappingDescriptor<T> PositionOffsetGap(int positionOffsetGap)
 			return this;
 		}
 
+		public StringMappingDescriptor<T> CopyTo(params string[] fields)
+		{
+			this._Mapping.CopyTo = fields.Select(f => (PropertyPathMarker)f);
+			return this;
+		}
+
+		public StringMappingDescriptor<T> CopyTo(params Expression<Func<T, object>>[] objectPaths)
+		{
+			this._Mapping.CopyTo = objectPaths.Select(e => (PropertyPathMarker)e);
+			return this;
+		}
 	}
 }
diff --git a/src/Nest/Domain/Mapping/Types/BinaryMapping.cs b/src/Nest/Domain/Mapping/Types/BinaryMapping.cs
@@ -24,5 +24,8 @@ public class BinaryMapping : IElasticType, IElasticCoreType
 		/// </summary>
 		[JsonProperty("index_name")]
 		public string IndexName { get; set; }
+
+		[JsonProperty("copy_to")]
+		public IEnumerable<PropertyPathMarker> CopyTo { get; set; }
 	}
 }
diff --git a/src/Nest/Domain/Mapping/Types/BooleanMapping.cs b/src/Nest/Domain/Mapping/Types/BooleanMapping.cs
@@ -40,5 +40,7 @@ public class BooleanMapping : IElasticType, IElasticCoreType
 		[JsonProperty("include_in_all")]
 		public bool? IncludeInAll { get; set; }
 
+		[JsonProperty("copy_to")]
+		public IEnumerable<PropertyPathMarker> CopyTo { get; set; }
 	}
 }
diff --git a/src/Nest/Domain/Mapping/Types/StringMapping.cs b/src/Nest/Domain/Mapping/Types/StringMapping.cs
@@ -62,7 +62,9 @@ public class StringMapping : IElasticType, IElasticCoreType
 		public bool? IncludeInAll { get; set; }
 
 		[JsonProperty("position_offset_gap")]
-		public int? PositionOffsetGap { get; set; }
-
+		public int? PositionOffsetGap { get; set; }
+
+		[JsonProperty("copy_to")]
+		public IEnumerable<PropertyPathMarker> CopyTo { get; set; }
 	}
 }
diff --git a/src/Tests/Nest.Tests.Unit/Core/Map/FluentMappingFullExampleTests.cs b/src/Tests/Nest.Tests.Unit/Core/Map/FluentMappingFullExampleTests.cs
@@ -138,6 +138,7 @@ public void MapFluentFull()
 						.Store()
 						.TermVector(TermVectorOption.with_positions_offsets)
 						.Boost(1.1)
+						.CopyTo(p => p.Content)
 					)
 					.Number(s => s
 						.Name(p => p.LOC)
diff --git a/src/Tests/Nest.Tests.Unit/Core/Map/Properties/BinaryProperty.json b/src/Tests/Nest.Tests.Unit/Core/Map/Properties/BinaryProperty.json
@@ -1,10 +1,11 @@
-  {
-  "elasticsearchprojects": {
-    "properties": {
-      "myBinaryField": {
-        "type": "binary",
-        "index_name": "binz"
-      }
-    }
-  }
-}
+{
+	"elasticsearchprojects": {
+		"properties": {
+			"myBinaryField": {
+				"type": "binary",
+				"index_name": "binz",
+				"copy_to": [ "another_field" ]
+			}
+		}
+	}
+}
diff --git a/src/Tests/Nest.Tests.Unit/Core/Map/Properties/BooleanProperty.json b/src/Tests/Nest.Tests.Unit/Core/Map/Properties/BooleanProperty.json
@@ -1,15 +1,16 @@
-  {
-  "elasticsearchprojects": {
-    "properties": {
-      "boolValue": {
-        "type": "boolean",
-        "index_name": "bool_name_in_lucene_index",
-        "store": "yes",
-        "index": "analyzed",
-        "boost": 1.4,
-        "null_value": false,
-        "include_in_all": true
-      }
-    }
-  }
-}
+{
+	"elasticsearchprojects": {
+		"properties": {
+			"boolValue": {
+				"type": "boolean",
+				"index_name": "bool_name_in_lucene_index",
+				"store": "yes",
+				"index": "analyzed",
+				"boost": 1.4,
+				"null_value": false,
+				"include_in_all": true,
+				"copy_to": [ "content" ]
+			}
+		}
+	}
+}
diff --git a/src/Tests/Nest.Tests.Unit/Core/Map/Properties/PropertiesTests.cs b/src/Tests/Nest.Tests.Unit/Core/Map/Properties/PropertiesTests.cs
@@ -28,6 +28,7 @@ public void StringProperty()
 						.Store()
 						.TermVector(TermVectorOption.with_positions_offsets)
 						.Boost(1.1)
+						.CopyTo(p => p.Content, p => p.Country)
 					)
 				)
 			);
@@ -88,6 +89,7 @@ public void BooleanProperty()
 						.IndexName("bool_name_in_lucene_index")
 						.NullValue(false)
 						.Store()
+						.CopyTo(p => p.Content)
 					)
 				)
 			);
@@ -101,6 +103,7 @@ public void BinaryProperty()
 					.Binary(s => s
 						.Name(p => p.MyBinaryField)
 						.IndexName("binz")
+						.CopyTo("another_field")
 					)
 				)
 			);
diff --git a/src/Tests/Nest.Tests.Unit/Core/Map/Properties/StringProperty.json b/src/Tests/Nest.Tests.Unit/Core/Map/Properties/StringProperty.json
@@ -1,21 +1,22 @@
-  {
-  "elasticsearchprojects": {
-    "properties": {
-      "name": {
-        "type": "string",
-        "index_name": "my_crazy_name_i_want_in_lucene",
-        "store": "yes",
-        "index": "analyzed",
-        "term_vector": "with_positions_offsets",
-        "boost": 1.1,
-        "null_value": "my_special_null_value",
-        "omit_norms": true,
-        "index_options": "positions",
-        "index_analyzer": "standard",
-        "search_analyzer": "standard",
-        "include_in_all": true,
-        "position_offset_gap": 1
-      }
-    }
-  }
-}
+{
+	"elasticsearchprojects": {
+		"properties": {
+			"name": {
+				"type": "string",
+				"index_name": "my_crazy_name_i_want_in_lucene",
+				"store": "yes",
+				"index": "analyzed",
+				"term_vector": "with_positions_offsets",
+				"boost": 1.1,
+				"null_value": "my_special_null_value",
+				"omit_norms": true,
+				"index_options": "positions",
+				"index_analyzer": "standard",
+				"search_analyzer": "standard",
+				"include_in_all": true,
+				"position_offset_gap": 1,
+				"copy_to": [ "content", "country" ]
+			}
+		}
+	}
+}

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using System;`
	`2`	`+using System.Linq;`
`2`	`3`	`using System.Linq.Expressions;`
`3`	`4`	`using Nest.Resolvers;`
`4`	`5`
`@@ -52,6 +53,16 @@ public BooleanMappingDescriptor<T> IncludeInAll(bool includeInAll = true)`
`52`	`53`	`return this;`
`53`	`54`	`}`
`54`	`55`
	`56`	`+ public BooleanMappingDescriptor<T> CopyTo(params string[] fields)`
	`57`	`+ {`
	`58`	`+ this._Mapping.CopyTo = fields.Select(f => (PropertyPathMarker)f);`
	`59`	`+ return this;`
	`60`	`+ }`
`55`	`61`
	`62`	`+ public BooleanMappingDescriptor<T> CopyTo(params Expression<Func<T, object>>[] objectPaths)`
	`63`	`+ {`
	`64`	`+ this._Mapping.CopyTo = objectPaths.Select(e => (PropertyPathMarker)e);`
	`65`	`+ return this;`
	`66`	`+ }`
`56`	`67`	`}`
`57`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,5 +24,8 @@ public class BinaryMapping : IElasticType, IElasticCoreType`
`24`	`24`	`/// </summary>`
`25`	`25`	`[JsonProperty("index_name")]`
`26`	`26`	`public string IndexName { get; set; }`
	`27`	`+`
	`28`	`+ [JsonProperty("copy_to")]`
	`29`	`+ public IEnumerable<PropertyPathMarker> CopyTo { get; set; }`
`27`	`30`	`}`
`28`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,5 +40,7 @@ public class BooleanMapping : IElasticType, IElasticCoreType`
`40`	`40`	`[JsonProperty("include_in_all")]`
`41`	`41`	`public bool? IncludeInAll { get; set; }`
`42`	`42`
	`43`	`+ [JsonProperty("copy_to")]`
	`44`	`+ public IEnumerable<PropertyPathMarker> CopyTo { get; set; }`
`43`	`45`	`}`
`44`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,9 @@ public class StringMapping : IElasticType, IElasticCoreType`
`62`	`62`	`public bool? IncludeInAll { get; set; }`
`63`	`63`
`64`	`64`	`[JsonProperty("position_offset_gap")]`
`65`		`- public int? PositionOffsetGap { get; set; }`
`66`		`-`
	`65`	`+ public int? PositionOffsetGap { get; set; }`
	`66`	`+`
	`67`	`+ [JsonProperty("copy_to")]`
	`68`	`+ public IEnumerable<PropertyPathMarker> CopyTo { get; set; }`
`67`	`69`	`}`
`68`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -138,6 +138,7 @@ public void MapFluentFull()`
`138`	`138`	`.Store()`
`139`	`139`	`.TermVector(TermVectorOption.with_positions_offsets)`
`140`	`140`	`.Boost(1.1)`
	`141`	`+ .CopyTo(p => p.Content)`
`141`	`142`	`)`
`142`	`143`	`.Number(s => s`
`143`	`144`	`.Name(p => p.LOC)`
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@ public void StringProperty()`
`28`	`28`	`.Store()`
`29`	`29`	`.TermVector(TermVectorOption.with_positions_offsets)`
`30`	`30`	`.Boost(1.1)`
	`31`	`+ .CopyTo(p => p.Content, p => p.Country)`
`31`	`32`	`)`
`32`	`33`	`)`
`33`	`34`	`);`
`@@ -88,6 +89,7 @@ public void BooleanProperty()`
`88`	`89`	`.IndexName("bool_name_in_lucene_index")`
`89`	`90`	`.NullValue(false)`
`90`	`91`	`.Store()`
	`92`	`+ .CopyTo(p => p.Content)`
`91`	`93`	`)`
`92`	`94`	`)`
`93`	`95`	`);`
`@@ -101,6 +103,7 @@ public void BinaryProperty()`
`101`	`103`	`.Binary(s => s`
`102`	`104`	`.Name(p => p.MyBinaryField)`
`103`	`105`	`.IndexName("binz")`
	`106`	`+ .CopyTo("another_field")`
`104`	`107`	`)`
`105`	`108`	`)`
`106`	`109`	`);`