Time millisecond calculation and serialization fixes

gmarz · gmarz · commit d103a6bd4122 · 2016-03-14T15:46:39.000-04:00
Closes #1880 Closes #1860
diff --git a/src/Benchmarking/Properties/AssemblyInfo.cs b/src/Benchmarking/Properties/AssemblyInfo.cs
@@ -7,8 +7,8 @@
 [assembly: AssemblyCompanyAttribute("Elasticsearch")]
 [assembly: AssemblyConfigurationAttribute("Release")]
 [assembly: AssemblyVersionAttribute("2.0.0")]
-[assembly: AssemblyFileVersionAttribute("2.0.3")]
-[assembly: AssemblyInformationalVersionAttribute("2.0.3")]
+[assembly: AssemblyFileVersionAttribute("2.0.4")]
+[assembly: AssemblyInformationalVersionAttribute("2.0.4")]
 namespace System {
     internal static class AssemblyVersionInformation {
         internal const string Version = "2.0.0";
diff --git a/src/Benchmarking/project.json b/src/Benchmarking/project.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.0.3",
+  "version": "2.0.4",
   "compilationOptions": {
     "warningsAsErrors": false,
     "define": [ "LINQ", "NDESK_OPTIONS" ],
diff --git a/src/CodeGeneration/CodeGeneration.LowLevelClient/Properties/AssemblyInfo.cs b/src/CodeGeneration/CodeGeneration.LowLevelClient/Properties/AssemblyInfo.cs
@@ -7,8 +7,8 @@
 [assembly: AssemblyCompanyAttribute("Elasticsearch")]
 [assembly: AssemblyConfigurationAttribute("Release")]
 [assembly: AssemblyVersionAttribute("2.0.0")]
-[assembly: AssemblyFileVersionAttribute("2.0.3")]
-[assembly: AssemblyInformationalVersionAttribute("2.0.3")]
+[assembly: AssemblyFileVersionAttribute("2.0.4")]
+[assembly: AssemblyInformationalVersionAttribute("2.0.4")]
 namespace System {
     internal static class AssemblyVersionInformation {
         internal const string Version = "2.0.0";
diff --git a/src/CodeGeneration/CodeGeneration.LowLevelClient/project.json b/src/CodeGeneration/CodeGeneration.LowLevelClient/project.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.0.3",
+  "version": "2.0.4",
   "compilationOptions": {
     "warningsAsErrors": false,
     "emitEntryPoint": true
diff --git a/src/CodeGeneration/Nest.Litterateur/Properties/AssemblyInfo.cs b/src/CodeGeneration/Nest.Litterateur/Properties/AssemblyInfo.cs
@@ -7,8 +7,8 @@
 [assembly: AssemblyCompanyAttribute("Elasticsearch")]
 [assembly: AssemblyConfigurationAttribute("Release")]
 [assembly: AssemblyVersionAttribute("2.0.0")]
-[assembly: AssemblyFileVersionAttribute("2.0.3")]
-[assembly: AssemblyInformationalVersionAttribute("2.0.3")]
+[assembly: AssemblyFileVersionAttribute("2.0.4")]
+[assembly: AssemblyInformationalVersionAttribute("2.0.4")]
 namespace System {
     internal static class AssemblyVersionInformation {
         internal const string Version = "2.0.0";
diff --git a/src/CodeGeneration/Nest.Litterateur/project.json b/src/CodeGeneration/Nest.Litterateur/project.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.0.3",
+  "version": "2.0.4",
   "compilationOptions": {
     "warningsAsErrors": false,
     "emitEntryPoint": true
diff --git a/src/Elasticsearch.Net/Properties/AssemblyInfo.cs b/src/Elasticsearch.Net/Properties/AssemblyInfo.cs
@@ -7,8 +7,8 @@
 [assembly: AssemblyCompanyAttribute("Elasticsearch")]
 [assembly: AssemblyConfigurationAttribute("Release")]
 [assembly: AssemblyVersionAttribute("2.0.0")]
-[assembly: AssemblyFileVersionAttribute("2.0.3")]
-[assembly: AssemblyInformationalVersionAttribute("2.0.3")]
+[assembly: AssemblyFileVersionAttribute("2.0.4")]
+[assembly: AssemblyInformationalVersionAttribute("2.0.4")]
 namespace System {
     internal static class AssemblyVersionInformation {
         internal const string Version = "2.0.0";
diff --git a/src/Elasticsearch.Net/project.json b/src/Elasticsearch.Net/project.json
@@ -24,7 +24,7 @@
     "url": "https://github.com/elastic/elasticsearch-net"
   },
   "copyright": "2014-2016 Elasticsearch BV",
-  "version": "2.0.3",
+  "version": "2.0.4",
   "compilationOptions": {
     "warningsAsErrors": false
   },
diff --git a/src/Nest/CommonAbstractions/Extensions/Extensions.cs b/src/Nest/CommonAbstractions/Extensions/Extensions.cs
@@ -72,7 +72,7 @@ internal static IEnumerable<T> DistinctBy<T, TKey>(this IEnumerable<T> items, Fu
 		}
 
 		internal static ConcurrentDictionary<string, object> _enumCache = new ConcurrentDictionary<string, object>();
-		internal static T? ToEnum<T>(this string str) where T : struct
+		internal static T? ToEnum<T>(this string str, StringComparison comparison = StringComparison.OrdinalIgnoreCase) where T : struct
 		{
 			var enumType = typeof(T);
 			var key = $"{enumType.Name}.{str}";
@@ -82,7 +82,7 @@ internal static IEnumerable<T> DistinctBy<T, TKey>(this IEnumerable<T> items, Fu
 
 			foreach (var name in Enum.GetNames(enumType))
 			{
-				if (name.Equals(str, StringComparison.OrdinalIgnoreCase))
+				if (name.Equals(str, comparison))
 				{
 					var v = (T)Enum.Parse(enumType, name, true);
 					_enumCache.TryAdd(key, v);
@@ -99,7 +99,6 @@ internal static IEnumerable<T> DistinctBy<T, TKey>(this IEnumerable<T> items, Fu
 				}
 
 				var alternativeEnumMemberAttribute = enumFieldInfo.GetCustomAttribute<AlternativeEnumMemberAttribute>();
-
 				if (alternativeEnumMemberAttribute?.Value == str)
 				{
 					var v = (T) Enum.Parse(enumType, name);
diff --git a/src/Nest/CommonOptions/DateMath/DateMath.cs b/src/Nest/CommonOptions/DateMath/DateMath.cs
@@ -71,7 +71,7 @@ public static DateMath FromString(string dateMath)
 
 			if (match.Groups["rounding"].Success)
 			{
-				var rounding = match.Groups["rounding"].Value.Substring(1).ToEnum<TimeUnit>();
+				var rounding = match.Groups["rounding"].Value.Substring(1).ToEnum<TimeUnit>(StringComparison.Ordinal);
 				if (rounding.HasValue)
 					return math.RoundTo(rounding.Value);
 			}
diff --git a/src/Nest/CommonOptions/TimeUnit/Time.cs b/src/Nest/CommonOptions/TimeUnit/Time.cs
@@ -8,9 +8,10 @@ namespace Nest
 	[JsonConverter(typeof(TimeJsonConverter))]
 	public class Time : IComparable<Time>, IEquatable<Time>
 	{
-		private static readonly Regex _expressionRegex = new Regex(@"^(?<factor>\d+(?:\.\d+)?)(?<interval>(?:y|M|w|d|h|m|s|ms))?$", RegexOptions.Compiled | RegexOptions.ExplicitCapture);
+		private static readonly Regex _expressionRegex = new Regex(@"^(?<factor>[-+]?\d+(?:\.\d+)?)(?<interval>(?:y|M|w|d|h|m|s|ms))?$", RegexOptions.Compiled | RegexOptions.ExplicitCapture);
 
-		private static readonly double _year = TimeSpan.FromDays(365).TotalMilliseconds;
+		private static readonly double _yearApproximate = TimeSpan.FromDays(365).TotalMilliseconds;
+		private static readonly double _monthApproximate = TimeSpan.FromDays(30).TotalMilliseconds;
 		private static readonly double _week = TimeSpan.FromDays(7).TotalMilliseconds;
 		private static readonly double _day = TimeSpan.FromDays(1).TotalMilliseconds;
 		private static readonly double _hour = TimeSpan.FromHours(1).TotalMilliseconds;
@@ -19,33 +20,15 @@ public class Time : IComparable<Time>, IEquatable<Time>
 
 		public double? Factor { get; private set; }
 		public TimeUnit? Interval { get; private set; }
+
+		// TODO make nullable in 3.0
 		public double Milliseconds { get; private set; }
+		private double ApproximateMilliseconds { get; set; }
 
 		public static implicit operator Time(TimeSpan span) => new Time(span);
 		public static implicit operator Time(double milliseconds) => new Time(milliseconds);
 		public static implicit operator Time(string expression) => new Time(expression);
 
-		public Time(double factor, TimeUnit interval)
-		{
-			this.Factor = factor;
-			this.Interval = interval;
-
-			if (interval == TimeUnit.Year)
-				Milliseconds = (long)factor * _year;
-			else if (interval == TimeUnit.Week)
-				Milliseconds = (long)factor * _week;
-			else if (interval == TimeUnit.Day)
-				Milliseconds = (long)factor * _day;
-			else if (interval == TimeUnit.Hour)
-				Milliseconds = (long)factor * _hour;
-			else if (interval == TimeUnit.Minute)
-				Milliseconds = (long)factor * _minute;
-			else if (interval == TimeUnit.Second)
-				Milliseconds = (long)factor * _second;
-			else //ms
-				Milliseconds = (long)factor;
-		}
-
 		public Time(TimeSpan timeSpan)
 		{
 			Reduce(timeSpan.TotalMilliseconds);
@@ -56,38 +39,36 @@ public Time(double milliseconds)
 			Reduce(milliseconds);
 		}
 
+		public Time(double factor, TimeUnit interval)
+		{
+			this.Factor = factor;
+			this.Interval = interval;
+			SetMilliseconds(this.Interval, this.Factor.Value);
+		}
+
 		public Time(string timeUnit)
 		{
 			if (timeUnit.IsNullOrEmpty()) throw new ArgumentException("Time expression string is empty", nameof(timeUnit));
 			var match = _expressionRegex.Match(timeUnit);
 			if (!match.Success) throw new ArgumentException($"Time expression '{timeUnit}' string is invalid", nameof(timeUnit));
 
 			this.Factor = double.Parse(match.Groups["factor"].Value, CultureInfo.InvariantCulture);
-			this.Interval = match.Groups["interval"].Success
-				? match.Groups["interval"].Value.ToEnum<TimeUnit>()
-				: TimeUnit.Millisecond;
-
-			if (this.Interval == TimeUnit.Year)
-				Milliseconds = (long)(this.Factor * _year);
-			else if (this.Interval == TimeUnit.Week)
-				Milliseconds = (long)(this.Factor * _week);
-			else if (this.Interval == TimeUnit.Day)
-				Milliseconds = (long)(this.Factor * _day);
-			else if (this.Interval == TimeUnit.Hour)
-				Milliseconds = (long)(this.Factor * _hour);
-			else if (this.Interval == TimeUnit.Minute)
-				Milliseconds = (long)(this.Factor * _minute);
-			else if (this.Interval == TimeUnit.Second)
-				Milliseconds = (long)(this.Factor * _second);
-			else //ms
-				Milliseconds = (long)this.Factor;
+
+			if (this.Factor > 0)
+			{
+				this.Interval = match.Groups["interval"].Success
+					? match.Groups["interval"].Value.ToEnum<TimeUnit>(StringComparison.Ordinal)
+					: TimeUnit.Millisecond;
+			}
+
+			SetMilliseconds(this.Interval, this.Factor.Value);
 		}
 
 		public int CompareTo(Time other)
 		{
 			if (other == null) return 1;
-			if (this.Milliseconds == other.Milliseconds) return 0;
-			if (this.Milliseconds < other.Milliseconds) return -1;
+			if (this.ApproximateMilliseconds == other.ApproximateMilliseconds) return 0;
+			if (this.ApproximateMilliseconds < other.ApproximateMilliseconds) return -1;
 			return 1;
 		}
 
@@ -115,7 +96,7 @@ public bool Equals(Time other)
 		{
 			if (ReferenceEquals(null, other)) return false;
 			if (ReferenceEquals(this, other)) return true;
-			return Milliseconds == other.Milliseconds;
+			return (this.ApproximateMilliseconds == other.ApproximateMilliseconds);
 		}
 
 		public override bool Equals(object obj)
@@ -126,18 +107,57 @@ public override bool Equals(object obj)
 			return Equals((Time)obj);
 		}
 
-		public override int GetHashCode() => this.Milliseconds.GetHashCode();
+		public override int GetHashCode() => this.ApproximateMilliseconds.GetHashCode();
 
-		private void Reduce(double ms)
+		private void SetMilliseconds(TimeUnit? interval, double factor)
 		{
-			this.Milliseconds = ms;
+			this.Milliseconds = interval.HasValue ? GetExactMilliseconds(interval.Value, factor) : factor;
+			this.ApproximateMilliseconds = interval.HasValue ? GetApproximateMilliseconds(interval.Value, factor) : factor;
+		}
 
-			if (ms >= _year)
+		private double GetExactMilliseconds(TimeUnit interval, double factor)
+		{
+			switch (interval)
 			{
-				Factor = ms / _year;
-				Interval = TimeUnit.Year;
+
+				case TimeUnit.Week:
+					return factor * _week;
+				case TimeUnit.Day:
+					return factor * _day;
+				case TimeUnit.Hour:
+					return factor * _hour;
+				case TimeUnit.Minute:
+					return factor * _minute;
+				case TimeUnit.Second:
+					return factor * _second;
+				case TimeUnit.Year:
+				case TimeUnit.Month:
+					// Cannot calculate exact milliseconds for non-fixed intervals
+					return -1;
+				default: // ms
+					return factor;
 			}
-			else if (ms >= _week)
+		}
+
+		private double GetApproximateMilliseconds(TimeUnit interval, double factor)
+		{
+			switch (interval)
+			{
+				case TimeUnit.Year:
+					return factor * _yearApproximate;
+				case TimeUnit.Month:
+					return factor * _monthApproximate;
+				default:
+					return GetExactMilliseconds(interval, factor);
+			}
+		}
+
+		private void Reduce(double ms)
+		{
+			this.Milliseconds = ms;
+			this.ApproximateMilliseconds = ms;
+
+			if (ms >= _week)
 			{
 				Factor = ms / _week;
 				Interval = TimeUnit.Week;
@@ -165,10 +185,9 @@ private void Reduce(double ms)
 			else
 			{
 				Factor = ms;
-				// If milliseconds is < 0 then don't set an interval.
+				// If milliseconds is <= 0 then don't set an interval.
 				// This is used when setting things like index.refresh_interval = -1 (the only case where a unit isn't required)
-				if (ms > 0)
-					Interval = TimeUnit.Millisecond;
+				Interval = (ms > 0) ? (TimeUnit?)TimeUnit.Millisecond : null;
 			}
 		}
 	}
diff --git a/src/Nest/Document/Multiple/MultiTermVectors/MultiTermVectorsResponse.cs b/src/Nest/Document/Multiple/MultiTermVectors/MultiTermVectorsResponse.cs
@@ -11,6 +11,8 @@ public interface IMultiTermVectorsResponse : IResponse
 	[JsonObject]
 	public class MultiTermVectorsResponse : ResponseBase, IMultiTermVectorsResponse
 	{
+		// TODO For 3.0 we should create a separate term vector object rather than using TermVectorsResponse
+		// since it contains general response data that isn't relevant (i.e. ApiCall, StatusCode, etc...)
 		[JsonProperty("docs")]
 		public IEnumerable<TermVectorsResponse> Documents { get; internal set; } = new List<TermVectorsResponse>();
 	}
diff --git a/src/Nest/Properties/AssemblyInfo.cs b/src/Nest/Properties/AssemblyInfo.cs
@@ -7,8 +7,8 @@
 [assembly: AssemblyCompanyAttribute("Elasticsearch")]
 [assembly: AssemblyConfigurationAttribute("Release")]
 [assembly: AssemblyVersionAttribute("2.0.0")]
-[assembly: AssemblyFileVersionAttribute("2.0.3")]
-[assembly: AssemblyInformationalVersionAttribute("2.0.3")]
+[assembly: AssemblyFileVersionAttribute("2.0.4")]
+[assembly: AssemblyInformationalVersionAttribute("2.0.4")]
 namespace System {
     internal static class AssemblyVersionInformation {
         internal const string Version = "2.0.0";
diff --git a/src/Nest/project.json b/src/Nest/project.json
@@ -24,7 +24,7 @@
     "url": "https://github.com/elastic/elasticsearch-net"
   },
   "copyright": "2014-2016 Elasticsearch BV",
-  "version": "2.0.3",
+  "version": "2.0.4",
   "compilationOptions": {
     "warningsAsErrors": false
   },
diff --git a/src/Profiling/Properties/AssemblyInfo.cs b/src/Profiling/Properties/AssemblyInfo.cs
@@ -7,8 +7,8 @@
 [assembly: AssemblyCompanyAttribute("Elasticsearch")]
 [assembly: AssemblyConfigurationAttribute("Release")]
 [assembly: AssemblyVersionAttribute("2.0.0")]
-[assembly: AssemblyFileVersionAttribute("2.0.3")]
-[assembly: AssemblyInformationalVersionAttribute("2.0.3")]
+[assembly: AssemblyFileVersionAttribute("2.0.4")]
+[assembly: AssemblyInformationalVersionAttribute("2.0.4")]
 namespace System {
     internal static class AssemblyVersionInformation {
         internal const string Version = "2.0.0";
diff --git a/src/Tests/CommonOptions/TimeUnit/TimeUnits.doc.cs b/src/Tests/CommonOptions/TimeUnit/TimeUnits.doc.cs
diff --git a/src/Tests/Document/Multiple/MultiTermVectors/MultiTermVectorsApiTests.cs b/src/Tests/Document/Multiple/MultiTermVectors/MultiTermVectorsApiTests.cs
diff --git a/src/Tests/Properties/AssemblyInfo.cs b/src/Tests/Properties/AssemblyInfo.cs
diff --git a/src/Tests/project.json b/src/Tests/project.json
diff --git a/src/Tests/tests.yaml b/src/Tests/tests.yaml

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "version": "2.0.3",`
	`2`	`+ "version": "2.0.4",`
`3`	`3`	`"compilationOptions": {`
`4`	`4`	`"warningsAsErrors": false,`
`5`	`5`	`"define": [ "LINQ", "NDESK_OPTIONS" ],`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ internal static IEnumerable<T> DistinctBy<T, TKey>(this IEnumerable<T> items, Fu`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`internal static ConcurrentDictionary<string, object> _enumCache = new ConcurrentDictionary<string, object>();`
`75`		`- internal static T? ToEnum<T>(this string str) where T : struct`
	`75`	`+ internal static T? ToEnum<T>(this string str, StringComparison comparison = StringComparison.OrdinalIgnoreCase) where T : struct`
`76`	`76`	`{`
`77`	`77`	`var enumType = typeof(T);`
`78`	`78`	`var key = $"{enumType.Name}.{str}";`
`@@ -82,7 +82,7 @@ internal static IEnumerable<T> DistinctBy<T, TKey>(this IEnumerable<T> items, Fu`
`82`	`82`
`83`	`83`	`foreach (var name in Enum.GetNames(enumType))`
`84`	`84`	`{`
`85`		`- if (name.Equals(str, StringComparison.OrdinalIgnoreCase))`
	`85`	`+ if (name.Equals(str, comparison))`
`86`	`86`	`{`
`87`	`87`	`var v = (T)Enum.Parse(enumType, name, true);`
`88`	`88`	`_enumCache.TryAdd(key, v);`
`@@ -99,7 +99,6 @@ internal static IEnumerable<T> DistinctBy<T, TKey>(this IEnumerable<T> items, Fu`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`var alternativeEnumMemberAttribute = enumFieldInfo.GetCustomAttribute<AlternativeEnumMemberAttribute>();`
`102`		`-`
`103`	`102`	`if (alternativeEnumMemberAttribute?.Value == str)`
`104`	`103`	`{`
`105`	`104`	`var v = (T) Enum.Parse(enumType, name);`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public static DateMath FromString(string dateMath)`
`71`	`71`
`72`	`72`	`if (match.Groups["rounding"].Success)`
`73`	`73`	`{`
`74`		`- var rounding = match.Groups["rounding"].Value.Substring(1).ToEnum<TimeUnit>();`
	`74`	`+ var rounding = match.Groups["rounding"].Value.Substring(1).ToEnum<TimeUnit>(StringComparison.Ordinal);`
`75`	`75`	`if (rounding.HasValue)`
`76`	`76`	`return math.RoundTo(rounding.Value);`
`77`	`77`	`}`