Merge branch 'develop' into feature/appdomain-warmer

gmarz · gmarz · commit 9b04a317413c · 2014-07-14T15:55:44.000-04:00
diff --git a/src/Nest/DSL/Rescore/RescoreQueryDescriptor.cs b/src/Nest/DSL/Rescore/RescoreQueryDescriptor.cs
@@ -16,13 +16,17 @@ public interface IRescoreQuery
 
 		[JsonProperty("rescore_query_weight")]
 		double? RescoreQueryWeight { get; set; }
+
+		[JsonProperty("score_mode")]
+		ScoreMode? ScoreMode { get; set; }
 	}
 	
 	public class RescoreQuery : IRescoreQuery
 	{
 		public IQueryContainer Query { get; set; }
 		public double? QueryWeight { get; set; }
 		public double? RescoreQueryWeight { get; set; }
+		public ScoreMode? ScoreMode { get; set; }
 	}
 
 	public class RescoreQueryDescriptor<T> : IRescoreQuery where T : class
@@ -35,6 +39,8 @@ public class RescoreQueryDescriptor<T> : IRescoreQuery where T : class
 
 		double? IRescoreQuery.RescoreQueryWeight { get; set; }
 
+		ScoreMode? IRescoreQuery.ScoreMode { get; set; }
+
 		public virtual RescoreQueryDescriptor<T> QueryWeight(double queryWeight)
 		{
 			Self.QueryWeight = queryWeight;
@@ -47,6 +53,12 @@ public virtual RescoreQueryDescriptor<T> RescoreQueryWeight(double rescoreQueryW
 			return this;
 		}
 
+		public virtual RescoreQueryDescriptor<T> ScoreMode(ScoreMode scoreMode)
+		{
+			Self.ScoreMode = scoreMode;
+			return this;
+		}
+
 		public virtual RescoreQueryDescriptor<T> Query(Func<QueryDescriptor<T>, QueryContainer> query)
 		{
 			query.ThrowIfNull("query");
diff --git a/src/Nest/Enums/FieldType.cs b/src/Nest/Enums/FieldType.cs
@@ -25,6 +25,11 @@ public enum FieldType
 		[EnumMember(Value = "geo_point")]
 		GeoPoint,
 		/// <summary>
+		/// Geo shape type.
+		/// </summary>
+		[EnumMember(Value = "geo_shape")]
+		GeoShape,
+		/// <summary>
 		/// The attachment type allows to index different “attachment” type field (encoded as base64), for example, microsoft office formats, open document formats, ePub, HTML...
 		/// </summary>
 		[EnumMember(Value = "attachment")]
diff --git a/src/Nest/Resolvers/Writers/TypeMappingWriter.cs b/src/Nest/Resolvers/Writers/TypeMappingWriter.cs
@@ -211,6 +211,8 @@ private string GetElasticSearchTypeFromFieldType(FieldType? fieldType)
 			{
 				case FieldType.GeoPoint:
 					return "geo_point";
+				case FieldType.GeoShape:
+					return "geo_shape";
 				case FieldType.Attachment:
 					return "attachment";
 				case FieldType.Ip:
diff --git a/src/Tests/Nest.Tests.Integration/Nest.Tests.Integration.csproj b/src/Tests/Nest.Tests.Integration/Nest.Tests.Integration.csproj
@@ -154,17 +154,17 @@
     <Compile Include="Indices\ExistsTests.cs" />
     <Compile Include="Indices\StatsTests.cs" />
     <Compile Include="Core\AsyncTests.cs" />
-    <Compile Include="Integration\Filter\AndOrNotFilterTests.cs" />
-    <Compile Include="Integration\Filter\ScriptFilterTests.cs" />
-    <Compile Include="Integration\Filter\MissingExistsFilterTests.cs" />
-    <Compile Include="Integration\Filter\PrefixFilterTests.cs" />
-    <Compile Include="Integration\Filter\RangeFilterTests.cs" />
-    <Compile Include="Integration\Query\BoolQueryResults.cs" />
-    <Compile Include="Integration\Query\TermToString.cs" />
+    <Compile Include="Search\Filter\AndOrNotFilterTests.cs" />
+    <Compile Include="Search\Filter\ScriptFilterTests.cs" />
+    <Compile Include="Search\Filter\MissingExistsFilterTests.cs" />
+    <Compile Include="Search\Filter\PrefixFilterTests.cs" />
+    <Compile Include="Search\Filter\RangeFilterTests.cs" />
+    <Compile Include="Search\Query\BoolQueryResults.cs" />
+    <Compile Include="Search\Query\TermToString.cs" />
     <Compile Include="Core\UpdateTests.cs" />
-    <Compile Include="Integration\Filter\BoolFilterTests.cs" />
-    <Compile Include="Integration\HighlightTests.cs" />
-    <Compile Include="Integration\Query\TermQueryDynamic.cs" />
+    <Compile Include="Search\Filter\BoolFilterTests.cs" />
+    <Compile Include="Search\HighlightTests.cs" />
+    <Compile Include="Search\Query\TermQueryDynamic.cs" />
     <Compile Include="RawCalls\HasUsefultServerExceptionTests.cs" />
     <Compile Include="RawCalls\DynamicNullTests.cs" />
     <Compile Include="Mapping\NotAnalyzedTest.cs" />
@@ -248,9 +248,7 @@
     </None>
     <None Include="packages.config" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="LowLevel\" />
-  </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/src/Tests/Nest.Tests.Integration/Search/Filter/AndOrNotFilterTests.cs b/src/Tests/Nest.Tests.Integration/Search/Filter/AndOrNotFilterTests.cs
@@ -3,7 +3,7 @@
 using Nest.Tests.MockData;
 using Nest.Tests.MockData.Domain;
 
-namespace Nest.Tests.Integration.Integration.Filter
+namespace Nest.Tests.Integration.Search.Filter
 {
 	/// <summary>
 	/// Integrated tests of AndFilter, OrFilter and NotFilter with elasticsearch.
diff --git a/src/Tests/Nest.Tests.Integration/Search/Filter/BoolFilterTests.cs b/src/Tests/Nest.Tests.Integration/Search/Filter/BoolFilterTests.cs
@@ -2,7 +2,7 @@
 using NUnit.Framework;
 using Nest.Tests.MockData.Domain;
 
-namespace Nest.Tests.Integration.Integration.Filter
+namespace Nest.Tests.Integration.Search.Filter
 {
 	[TestFixture]
 	public class BoolFilterTests : IntegrationTests
diff --git a/src/Tests/Nest.Tests.Integration/Search/Filter/MissingExistsFilterTests.cs b/src/Tests/Nest.Tests.Integration/Search/Filter/MissingExistsFilterTests.cs
@@ -7,7 +7,7 @@
 using Nest.Tests.MockData;
 using Nest.Tests.MockData.Domain;
 
-namespace Nest.Tests.Integration.Integration.Filter
+namespace Nest.Tests.Integration.Search.Filter
 {
 	/// <summary>
 	/// Integrated tests of RangeFilter with elasticsearch.
diff --git a/src/Tests/Nest.Tests.Integration/Search/Filter/PrefixFilterTests.cs b/src/Tests/Nest.Tests.Integration/Search/Filter/PrefixFilterTests.cs
@@ -3,7 +3,7 @@
 using Nest.Tests.MockData;
 using Nest.Tests.MockData.Domain;
 
-namespace Nest.Tests.Integration.Integration.Filter
+namespace Nest.Tests.Integration.Search.Filter
 {
 	/// <summary>
 	/// Integrated tests of PrefixFilter with elasticsearch.
diff --git a/src/Tests/Nest.Tests.Integration/Search/Filter/RangeFilterTests.cs b/src/Tests/Nest.Tests.Integration/Search/Filter/RangeFilterTests.cs
@@ -5,7 +5,7 @@
 using Nest.Tests.MockData;
 using Nest.Tests.MockData.Domain;
 
-namespace Nest.Tests.Integration.Integration.Filter
+namespace Nest.Tests.Integration.Search.Filter
 {
 	/// <summary>
 	/// Integrated tests of RangeFilter with elasticsearch.
diff --git a/src/Tests/Nest.Tests.Integration/Search/Filter/ScriptFilterTests.cs b/src/Tests/Nest.Tests.Integration/Search/Filter/ScriptFilterTests.cs
@@ -5,7 +5,7 @@
 using Nest.Tests.MockData;
 using Nest.Tests.MockData.Domain;
 
-namespace Nest.Tests.Integration.Integration.Filter
+namespace Nest.Tests.Integration.Search.Filter
 {
 	/// <summary>
 	/// Integrated tests of ScriptFilter with elasticsearch.
diff --git a/src/Tests/Nest.Tests.Integration/Search/HighlightTests.cs b/src/Tests/Nest.Tests.Integration/Search/HighlightTests.cs
@@ -3,7 +3,7 @@
 using Nest.Tests.MockData.Domain;
 using Elasticsearch.Net;
 
-namespace Nest.Tests.Integration.Integration
+namespace Nest.Tests.Integration.Search
 {
 	[TestFixture]
 	public class HighlightIntegrationTests : IntegrationTests
diff --git a/src/Tests/Nest.Tests.Integration/Search/Query/BoolQueryResults.cs b/src/Tests/Nest.Tests.Integration/Search/Query/BoolQueryResults.cs
@@ -7,7 +7,7 @@
 using Nest.Tests.MockData;
 using Nest.Tests.MockData.Domain;
 
-namespace Nest.Tests.Integration.Integration.Query
+namespace Nest.Tests.Integration.Search.Query
 {
 	[TestFixture]
 	public class BoolQueryResults : IntegrationTests
diff --git a/src/Tests/Nest.Tests.Integration/Search/Query/TermQueryDynamic.cs b/src/Tests/Nest.Tests.Integration/Search/Query/TermQueryDynamic.cs
@@ -2,7 +2,7 @@
 using NUnit.Framework;
 using Nest.Tests.MockData.Domain;
 
-namespace Nest.Tests.Integration.Integration.Query
+namespace Nest.Tests.Integration.Search.Query
 {
 	[TestFixture]
 	public class TermQueryDynamic : IntegrationTests
diff --git a/src/Tests/Nest.Tests.Integration/Search/Query/TermToString.cs b/src/Tests/Nest.Tests.Integration/Search/Query/TermToString.cs
@@ -7,7 +7,7 @@
 using Nest.Tests.MockData;
 using Nest.Tests.MockData.Domain;
 
-namespace Nest.Tests.Integration.Integration.Query
+namespace Nest.Tests.Integration.Search.Query
 {
 	[TestFixture]
 	public class TermToStringJson : IntegrationTests
diff --git a/src/Tests/Nest.Tests.Unit/Search/Filter/Singles/RangeFilterJson.cs b/src/Tests/Nest.Tests.Unit/Search/Filter/Singles/RangeFilterJson.cs
@@ -1,4 +1,5 @@
 ﻿using System;
+using System.Globalization;
 using NUnit.Framework;
 using Nest.Tests.MockData.Domain;
 
@@ -147,8 +148,8 @@ public void RangeDatesCustom()
 				filter : {
 						range: {
 							""startedOn"": {
-								gte: """ + lowerBound.ToString(format) + @""",
-								lt: """ + upperBound.ToString(format) + @""",
+								gte: """ + lowerBound.ToString(format, CultureInfo.InvariantCulture) + @""",
+								lt: """ + upperBound.ToString(format, CultureInfo.InvariantCulture) + @""",
 							}
 						}
 
diff --git a/src/Tests/Nest.Tests.Unit/Search/Rescoring/RescoreSerializes.json b/src/Tests/Nest.Tests.Unit/Search/Rescoring/RescoreSerializes.json
@@ -12,10 +12,11 @@
         }
       },
       "query_weight": 1.0,
-      "rescore_query_weight": 2.0
+      "rescore_query_weight": 2.0,
+      "score_mode": "multiply"
     }
   },
   "query": {
-    "match_all": {}
+    "match_all": { }
   },
-}
+}
diff --git a/src/Tests/Nest.Tests.Unit/Search/Rescoring/RescoreTests.cs b/src/Tests/Nest.Tests.Unit/Search/Rescoring/RescoreTests.cs
@@ -29,6 +29,7 @@ public void RescoreSerializes()
 					.RescoreQuery(rq=>rq
 						.QueryWeight(1.0)
 						.RescoreQueryWeight(2.0)
+						.ScoreMode(ScoreMode.Multiply)
 						.Query(q=>q.Term(p=>p.Name, "nest"))
 					)
 				);

Original file line number	Diff line number	Diff line change
`@@ -16,13 +16,17 @@ public interface IRescoreQuery`
`16`	`16`
`17`	`17`	`[JsonProperty("rescore_query_weight")]`
`18`	`18`	`double? RescoreQueryWeight { get; set; }`
	`19`	`+`
	`20`	`+ [JsonProperty("score_mode")]`
	`21`	`+ ScoreMode? ScoreMode { get; set; }`
`19`	`22`	`}`
`20`	`23`
`21`	`24`	`public class RescoreQuery : IRescoreQuery`
`22`	`25`	`{`
`23`	`26`	`public IQueryContainer Query { get; set; }`
`24`	`27`	`public double? QueryWeight { get; set; }`
`25`	`28`	`public double? RescoreQueryWeight { get; set; }`
	`29`	`+ public ScoreMode? ScoreMode { get; set; }`
`26`	`30`	`}`
`27`	`31`
`28`	`32`	`public class RescoreQueryDescriptor<T> : IRescoreQuery where T : class`
`@@ -35,6 +39,8 @@ public class RescoreQueryDescriptor<T> : IRescoreQuery where T : class`
`35`	`39`
`36`	`40`	`double? IRescoreQuery.RescoreQueryWeight { get; set; }`
`37`	`41`
	`42`	`+ ScoreMode? IRescoreQuery.ScoreMode { get; set; }`
	`43`	`+`
`38`	`44`	`public virtual RescoreQueryDescriptor<T> QueryWeight(double queryWeight)`
`39`	`45`	`{`
`40`	`46`	`Self.QueryWeight = queryWeight;`
`@@ -47,6 +53,12 @@ public virtual RescoreQueryDescriptor<T> RescoreQueryWeight(double rescoreQueryW`
`47`	`53`	`return this;`
`48`	`54`	`}`
`49`	`55`
	`56`	`+ public virtual RescoreQueryDescriptor<T> ScoreMode(ScoreMode scoreMode)`
	`57`	`+ {`
	`58`	`+ Self.ScoreMode = scoreMode;`
	`59`	`+ return this;`
	`60`	`+ }`
	`61`	`+`
`50`	`62`	`public virtual RescoreQueryDescriptor<T> Query(Func<QueryDescriptor<T>, QueryContainer> query)`
`51`	`63`	`{`
`52`	`64`	`query.ThrowIfNull("query");`
Original file line number	Diff line number	Diff line change
`@@ -211,6 +211,8 @@ private string GetElasticSearchTypeFromFieldType(FieldType? fieldType)`
`211`	`211`	`{`
`212`	`212`	`case FieldType.GeoPoint:`
`213`	`213`	`return "geo_point";`
	`214`	`+ case FieldType.GeoShape:`
	`215`	`+ return "geo_shape";`
`214`	`216`	`case FieldType.Attachment:`
`215`	`217`	`return "attachment";`
`216`	`218`	`case FieldType.Ip:`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`using Nest.Tests.MockData;`
`4`	`4`	`using Nest.Tests.MockData.Domain;`
`5`	`5`
`6`		`-namespace Nest.Tests.Integration.Integration.Filter`
	`6`	`+namespace Nest.Tests.Integration.Search.Filter`
`7`	`7`	`{`
`8`	`8`	`/// <summary>`
`9`	`9`	`/// Integrated tests of AndFilter, OrFilter and NotFilter with elasticsearch.`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`using NUnit.Framework;`
`3`	`3`	`using Nest.Tests.MockData.Domain;`
`4`	`4`
`5`		`-namespace Nest.Tests.Integration.Integration.Filter`
	`5`	`+namespace Nest.Tests.Integration.Search.Filter`
`6`	`6`	`{`
`7`	`7`	`[TestFixture]`
`8`	`8`	`public class BoolFilterTests : IntegrationTests`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`using Nest.Tests.MockData;`
`8`	`8`	`using Nest.Tests.MockData.Domain;`
`9`	`9`
`10`		`-namespace Nest.Tests.Integration.Integration.Filter`
	`10`	`+namespace Nest.Tests.Integration.Search.Filter`
`11`	`11`	`{`
`12`	`12`	`/// <summary>`
`13`	`13`	`/// Integrated tests of RangeFilter with elasticsearch.`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`using Nest.Tests.MockData;`
`6`	`6`	`using Nest.Tests.MockData.Domain;`
`7`	`7`
`8`		`-namespace Nest.Tests.Integration.Integration.Filter`
	`8`	`+namespace Nest.Tests.Integration.Search.Filter`
`9`	`9`	`{`
`10`	`10`	`/// <summary>`
`11`	`11`	`/// Integrated tests of RangeFilter with elasticsearch.`