Avoid doing multiple dictionary lookups (get key hash, find bucket, iterate bucket) (#3580)

Henr1k80 · russcam · commit 641df53f5fa6 · 2019-03-06T15:51:41.000+10:00
(cherry picked from commit 750b4ec)
diff --git a/src/Elasticsearch.Net/Serialization/SimpleJson.cs b/src/Elasticsearch.Net/Serialization/SimpleJson.cs
@@ -267,7 +267,7 @@ public void Clear()
 		/// </returns>
 		public bool Contains(KeyValuePair<string, object> item)
 		{
-			return _members.ContainsKey(item.Key) && _members[item.Key] == item.Value;
+			return _members.TryGetValue(item.Key, out object value) && value == item.Value;
 		}
 
 		/// <summary>
diff --git a/src/Elasticsearch.Net/Transport/Sniff/SniffResponse.cs b/src/Elasticsearch.Net/Transport/Sniff/SniffResponse.cs
@@ -79,8 +79,8 @@ internal bool HttpEnabled
 		{
 			get
 			{
-				if (settings != null && settings.ContainsKey("http.enabled"))
-					return Convert.ToBoolean(settings["http.enabled"]);
+				if (settings != null && settings.TryGetValue("http.enabled", out object httpEnabled))
+					return Convert.ToBoolean(httpEnabled);
 
 				return http != null;
 			}
diff --git a/src/Nest/Aggregations/Metric/PercentileRanks/PercentileRanksAggregationJsonConverter.cs b/src/Nest/Aggregations/Metric/PercentileRanks/PercentileRanksAggregationJsonConverter.cs
@@ -17,8 +17,8 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 			var percentileRanks = new PercentileRanksAggregation();
 			ReadMetricProperties(percentileRanks, properties);
 			percentileRanks.Method = ReadMethodProperty(properties);
-			if (properties.ContainsKey("values"))
-				percentileRanks.Values = properties["values"].ToObject<List<double>>();
+			if (properties.TryGetValue("values", out JToken valuesToken))
+				percentileRanks.Values = valuesToken.ToObject<List<double>>();
 			return percentileRanks;
 
 			;
diff --git a/src/Nest/Aggregations/Metric/Percentiles/PercentilesAggregationJsonConverter.cs b/src/Nest/Aggregations/Metric/Percentiles/PercentilesAggregationJsonConverter.cs
@@ -17,39 +17,39 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 			var percentiles = new PercentilesAggregation();
 			ReadMetricProperties(percentiles, properties);
 			percentiles.Method = ReadMethodProperty(properties);
-			if (properties.ContainsKey("percents"))
-				percentiles.Percents = properties["percents"].ToObject<List<double>>();
+			if (properties.TryGetValue("percents", out JToken percentsToken))
+				percentiles.Percents = percentsToken.ToObject<List<double>>();
 			return percentiles;
 		}
 
 		protected IPercentilesMethod ReadMethodProperty(Dictionary<string, JToken> properties)
 		{
 			IPercentilesMethod method = null;
-			if (properties.ContainsKey("hdr"))
-				method = properties["hdr"].ToObject<HDRHistogramMethod>();
-			else if (properties.ContainsKey("tdigest"))
-				method = properties["tdigest"].ToObject<TDigestMethod>();
+			if (properties.TryGetValue("hdr", out JToken hdrToken))
+				method = hdrToken.ToObject<HDRHistogramMethod>();
+			else if (properties.TryGetValue("tdigest", out JToken tdigestToken))
+				method = tdigestToken.ToObject<TDigestMethod>();
 			return method;
 		}
 
 		protected void ReadMetricProperties(IMetricAggregation metric, Dictionary<string, JToken> properties)
 		{
-			if (properties.ContainsKey("field"))
-				metric.Field = properties["field"].ToString();
+			if (properties.TryGetValue("field", out JToken fieldToken))
+				metric.Field = fieldToken.ToString();
 
-			if (properties.ContainsKey("script"))
+			if (properties.TryGetValue("script", out JToken scriptToken))
 			{
-				var scriptProps = JObject.FromObject(properties["script"]).Properties().ToDictionary(p => p.Name, p => p.Value);
+				var scriptProps = JObject.FromObject(scriptToken).Properties().ToDictionary(p => p.Name, p => p.Value);
 				if (scriptProps.ContainsKey("inline"))
-					metric.Script = properties["script"].ToObject<InlineScript>();
-				else if (scriptProps.ContainsKey("file"))
-					metric.Script = properties["script"].ToObject<FileScript>();
-				else if (scriptProps.ContainsKey("id"))
-					metric.Script = properties["id"].ToObject<IndexedScript>();
+					metric.Script = scriptToken.ToObject<InlineScript>();
+			    else if (scriptProps.ContainsKey("file"))
+					metric.Script = scriptToken.ToObject<FileScript>();
+				else if (scriptProps.TryGetValue("id", out JToken idToken))
+					metric.Script = idToken.ToObject<IndexedScript>();
 			}
 
-			if (properties.ContainsKey("missing"))
-				metric.Missing = double.Parse(properties["missing"].ToString());
+			if (properties.TryGetValue("missing", out JToken missingToken))
+				metric.Missing = double.Parse(missingToken.ToString());
 		}
 
 		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
diff --git a/src/Nest/Aggregations/Pipeline/MovingAverage/MovingAverageAggregationJsonConverter.cs b/src/Nest/Aggregations/Pipeline/MovingAverage/MovingAverageAggregationJsonConverter.cs
@@ -83,11 +83,11 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 
 		private T GetOrDefault<T>(string key, Dictionary<string, JToken> properties)
 		{
-			if (!properties.ContainsKey(key)) return default(T);
+			if (!properties.TryGetValue(key, out JToken value)) return default(T);
 #if DOTNETCORE
-			return properties[key].ToObject<T>();
+			return value.ToObject<T>();
 #else
-			return (T)Convert.ChangeType(properties[key], typeof(T));
+			return (T)Convert.ChangeType(value, typeof(T));
 #endif
 		}
 
diff --git a/src/Nest/CommonAbstractions/ConnectionSettings/ConnectionSettingsBase.cs b/src/Nest/CommonAbstractions/ConnectionSettings/ConnectionSettingsBase.cs
@@ -200,9 +200,9 @@ public TConnectionSettings MapIdPropertyFor<TDocument>(Expression<Func<TDocument
 			var memberInfo = new MemberInfoResolver(objectPath);
 			var fieldName = memberInfo.Members.Single().Name;
 
-			if (_idProperties.ContainsKey(typeof(TDocument)))
+			if (_idProperties.TryGetValue(typeof(TDocument), out var idProperty))
 			{
-				if (_idProperties[typeof(TDocument)].Equals(fieldName))
+				if (idProperty.Equals(fieldName))
 					return (TConnectionSettings)this;
 
 				throw new ArgumentException(
@@ -245,10 +245,10 @@ private void ApplyPropertyMappings<TDocument>(IList<IClrTypePropertyMapping<TDoc
 					throw new ArgumentException($"Expression {e} does contain any member access");
 
 				var memberInfo = memberInfoResolver.Members.Last();
-				if (_propertyMappings.ContainsKey(memberInfo))
+				if (_propertyMappings.TryGetValue(memberInfo, out var propertyMapping))
 				{
 					var newName = mapping.NewName;
-					var mappedAs = _propertyMappings[memberInfo].Name;
+					var mappedAs = propertyMapping.Name;
 					var typeName = typeof(TDocument).Name;
 					if (mappedAs.IsNullOrEmpty() && newName.IsNullOrEmpty())
 						throw new ArgumentException($"Property mapping '{e}' on type is already ignored");
diff --git a/src/Nest/CommonOptions/Scripting/ScriptJsonConverter.cs b/src/Nest/CommonOptions/Scripting/ScriptJsonConverter.cs
@@ -20,32 +20,33 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 			if (!dict.HasAny()) return null;
 
 			IScript script = null;
-			if (dict.ContainsKey("inline"))
+			if (dict.TryGetValue("inline", out JToken inlineToken))
 			{
-				var inline = dict["inline"].ToString();
+				var inline = inlineToken.ToString();
 				script = new InlineScript(inline);
 			}
-			if (dict.ContainsKey("file"))
+			else if (dict.TryGetValue("file", out JToken fileToken))
 			{
-				var file = dict["file"].ToString();
+				var file = fileToken.ToString();
 				script = new FileScript(file);
 			}
-			if (dict.ContainsKey("id"))
+			else if (dict.TryGetValue("id", out JToken idToken))
 			{
-				var id = dict["id"].ToString();
+				var id = idToken.ToString();
 				script = new IndexedScript(id);
 			}
 
 			if (script == null) return null;
 
-			if (dict.ContainsKey("lang"))
-				script.Lang = dict["lang"].ToString();
-			if (dict.ContainsKey("params"))
-				script.Params = dict["params"].ToObject<Dictionary<string, object>>();
+			if (dict.TryGetValue("lang", out JToken langToken))
+				script.Lang = langToken.ToString();
+			if (dict.TryGetValue("params", out JToken paramsToken))
+				script.Params = paramsToken.ToObject<Dictionary<string, object>>();
 
 			return script;
 		}
 
-		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) => throw new NotSupportedException();
+		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) =>
+			throw new NotSupportedException();
 	}
 }
diff --git a/src/Nest/Modules/SnapshotAndRestore/Repositories/GetRepository/GetRepositoryResponse.cs b/src/Nest/Modules/SnapshotAndRestore/Repositories/GetRepository/GetRepositoryResponse.cs
@@ -40,9 +40,9 @@ private TRepository Get<TRepository>(string name)
 			where TRepository : class, ISnapshotRepository
 		{
 			if (Repositories == null) return null;
-			if (!Repositories.ContainsKey(name)) return null;
+			if (!Repositories.TryGetValue(name, out ISnapshotRepository repository)) return null;
 
-			return Repositories[name] as TRepository;
+			return repository as TRepository;
 		}
 	}
 }
diff --git a/src/Nest/XPack/Watcher/Condition/ScriptConditionBase.cs b/src/Nest/XPack/Watcher/Condition/ScriptConditionBase.cs
@@ -65,30 +65,30 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 			if (!dict.HasAny()) return null;
 
 			IScriptCondition scriptCondition = null;
-			if (dict.ContainsKey("inline"))
+			if (dict.TryGetValue("inline", out JToken inlineToken))
 			{
-				var inline = dict["inline"].ToString();
+				var inline = inlineToken.ToString();
 				scriptCondition = new InlineScriptCondition(inline);
 			}
-			if (dict.ContainsKey("file"))
+			else if (dict.TryGetValue("file", out JToken fileToken))
 			{
-				var file = dict["file"].ToString();
+				var file = fileToken.ToString();
 #pragma warning disable 618
 				scriptCondition = new FileScriptCondition(file);
 #pragma warning restore 618
 			}
-			if (dict.ContainsKey("id"))
+			else if (dict.TryGetValue("id", out JToken idToken))
 			{
-				var id = dict["id"].ToString();
+				var id = idToken.ToString();
 				scriptCondition = new IndexedScriptCondition(id);
 			}
 
 			if (scriptCondition == null) return null;
 
-			if (dict.ContainsKey("lang"))
-				scriptCondition.Lang = dict["lang"].ToString();
-			if (dict.ContainsKey("params"))
-				scriptCondition.Params = dict["params"].ToObject<Dictionary<string, object>>();
+			if (dict.TryGetValue("lang", out JToken langToken))
+				scriptCondition.Lang = langToken.ToString();
+			if (dict.TryGetValue("params", out JToken paramsToken))
+				scriptCondition.Params = paramsToken.ToObject<Dictionary<string, object>>();
 
 			return scriptCondition;
 		}
diff --git a/src/Nest/XPack/Watcher/Input/ChainInput.cs b/src/Nest/XPack/Watcher/Input/ChainInput.cs
@@ -42,10 +42,13 @@ public ChainInputDescriptor() { }
 		/// <inheritdoc />
 		public ChainInputDescriptor Input(string name, Func<InputDescriptor, InputContainer> selector)
 		{
-			if (Self.Inputs == null) Self.Inputs = new Dictionary<string, InputContainer>();
-
-			if (Self.Inputs.ContainsKey(name))
-				throw new InvalidOperationException($"An input named '{name}' has already been specified. Choose a different name");
+			if (Self.Inputs != null)
+			{
+				if (Self.Inputs.ContainsKey(name))
+					throw new InvalidOperationException($"An input named '{name}' has already been specified. Choose a different name");
+			}
+			else
+				Self.Inputs = new Dictionary<string, InputContainer>();
 
 			Self.Inputs.Add(name, selector.InvokeOrDefault(new InputDescriptor()));
 			return this;
diff --git a/src/Nest/XPack/Watcher/Transform/ScriptTransformBase.cs b/src/Nest/XPack/Watcher/Transform/ScriptTransformBase.cs
@@ -64,33 +64,28 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 			if (!dict.HasAny()) return null;
 
 			IScriptTransform scriptTransform = null;
-			if (dict.ContainsKey("inline"))
+			if (dict.TryGetValue("source", out JToken sourceToken))
 			{
-				var inline = dict["inline"].ToString();
+				var inline = sourceToken.ToString();
 				scriptTransform = new InlineScriptTransform(inline);
 			}
-			else if (dict.ContainsKey("source"))
+			else if (dict.TryGetValue("file", out var fileToken))
 			{
-				var inline = dict["source"].ToString();
-				scriptTransform = new InlineScriptTransform(inline);
-			}
-			else if (dict.ContainsKey("file"))
-			{
-				var file = dict["file"].ToString();
+				var file = fileToken.ToString();
 				scriptTransform = new FileScriptTransform(file);
 			}
-			else if (dict.ContainsKey("id"))
+			else if (dict.TryGetValue("id", out JToken idToken))
 			{
-				var id = dict["id"].ToString();
+				var id = idToken.ToString();
 				scriptTransform = new IndexedScriptTransform(id);
 			}
 
 			if (scriptTransform == null) return null;
 
-			if (dict.ContainsKey("lang"))
-				scriptTransform.Lang = dict["lang"].ToString();
-			if (dict.ContainsKey("params"))
-				scriptTransform.Params = dict["params"].ToObject<Dictionary<string, object>>();
+			if (dict.TryGetValue("lang", out JToken langToken))
+				scriptTransform.Lang = langToken.ToString();
+			if (dict.TryGetValue("params", out JToken paramsToken))
+				scriptTransform.Params = paramsToken.ToObject<Dictionary<string, object>>();
 
 			return scriptTransform;
 		}

Original file line number	Diff line number	Diff line change
`@@ -267,7 +267,7 @@ public void Clear()`
`267`	`267`	`/// </returns>`
`268`	`268`	`public bool Contains(KeyValuePair<string, object> item)`
`269`	`269`	`{`
`270`		`- return _members.ContainsKey(item.Key) && _members[item.Key] == item.Value;`
	`270`	`+ return _members.TryGetValue(item.Key, out object value) && value == item.Value;`
`271`	`271`	`}`
`272`	`272`
`273`	`273`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -79,8 +79,8 @@ internal bool HttpEnabled`
`79`	`79`	`{`
`80`	`80`	`get`
`81`	`81`	`{`
`82`		`- if (settings != null && settings.ContainsKey("http.enabled"))`
`83`		`- return Convert.ToBoolean(settings["http.enabled"]);`
	`82`	`+ if (settings != null && settings.TryGetValue("http.enabled", out object httpEnabled))`
	`83`	`+ return Convert.ToBoolean(httpEnabled);`
`84`	`84`
`85`	`85`	`return http != null;`
`86`	`86`	`}`
Original file line number	Diff line number	Diff line change
`@@ -83,11 +83,11 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s`
`83`	`83`
`84`	`84`	`private T GetOrDefault<T>(string key, Dictionary<string, JToken> properties)`
`85`	`85`	`{`
`86`		`- if (!properties.ContainsKey(key)) return default(T);`
	`86`	`+ if (!properties.TryGetValue(key, out JToken value)) return default(T);`
`87`	`87`	`#if DOTNETCORE`
`88`		`- return properties[key].ToObject<T>();`
	`88`	`+ return value.ToObject<T>();`
`89`	`89`	`#else`
`90`		`- return (T)Convert.ChangeType(properties[key], typeof(T));`
	`90`	`+ return (T)Convert.ChangeType(value, typeof(T));`
`91`	`91`	`#endif`
`92`	`92`	`}`
`93`	`93`
Original file line number	Diff line number	Diff line change
`@@ -20,32 +20,33 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist`
`20`	`20`	`if (!dict.HasAny()) return null;`
`21`	`21`
`22`	`22`	`IScript script = null;`
`23`		`- if (dict.ContainsKey("inline"))`
	`23`	`+ if (dict.TryGetValue("inline", out JToken inlineToken))`
`24`	`24`	`{`
`25`		`- var inline = dict["inline"].ToString();`
	`25`	`+ var inline = inlineToken.ToString();`
`26`	`26`	`script = new InlineScript(inline);`
`27`	`27`	`}`
`28`		`- if (dict.ContainsKey("file"))`
	`28`	`+ else if (dict.TryGetValue("file", out JToken fileToken))`
`29`	`29`	`{`
`30`		`- var file = dict["file"].ToString();`
	`30`	`+ var file = fileToken.ToString();`
`31`	`31`	`script = new FileScript(file);`
`32`	`32`	`}`
`33`		`- if (dict.ContainsKey("id"))`
	`33`	`+ else if (dict.TryGetValue("id", out JToken idToken))`
`34`	`34`	`{`
`35`		`- var id = dict["id"].ToString();`
	`35`	`+ var id = idToken.ToString();`
`36`	`36`	`script = new IndexedScript(id);`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`if (script == null) return null;`
`40`	`40`
`41`		`- if (dict.ContainsKey("lang"))`
`42`		`- script.Lang = dict["lang"].ToString();`
`43`		`- if (dict.ContainsKey("params"))`
`44`		`- script.Params = dict["params"].ToObject<Dictionary<string, object>>();`
	`41`	`+ if (dict.TryGetValue("lang", out JToken langToken))`
	`42`	`+ script.Lang = langToken.ToString();`
	`43`	`+ if (dict.TryGetValue("params", out JToken paramsToken))`
	`44`	`+ script.Params = paramsToken.ToObject<Dictionary<string, object>>();`
`45`	`45`
`46`	`46`	`return script;`
`47`	`47`	`}`
`48`	`48`
`49`		`- public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) => throw new NotSupportedException();`
	`49`	`+ public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) =>`
	`50`	`+ throw new NotSupportedException();`
`50`	`51`	`}`
`51`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,9 +40,9 @@ private TRepository Get<TRepository>(string name)`
`40`	`40`	`where TRepository : class, ISnapshotRepository`
`41`	`41`	`{`
`42`	`42`	`if (Repositories == null) return null;`
`43`		`- if (!Repositories.ContainsKey(name)) return null;`
	`43`	`+ if (!Repositories.TryGetValue(name, out ISnapshotRepository repository)) return null;`
`44`	`44`
`45`		`- return Repositories[name] as TRepository;`
	`45`	`+ return repository as TRepository;`
`46`	`46`	`}`
`47`	`47`	`}`
`48`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,30 +65,30 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist`
`65`	`65`	`if (!dict.HasAny()) return null;`
`66`	`66`
`67`	`67`	`IScriptCondition scriptCondition = null;`
`68`		`- if (dict.ContainsKey("inline"))`
	`68`	`+ if (dict.TryGetValue("inline", out JToken inlineToken))`
`69`	`69`	`{`
`70`		`- var inline = dict["inline"].ToString();`
	`70`	`+ var inline = inlineToken.ToString();`
`71`	`71`	`scriptCondition = new InlineScriptCondition(inline);`
`72`	`72`	`}`
`73`		`- if (dict.ContainsKey("file"))`
	`73`	`+ else if (dict.TryGetValue("file", out JToken fileToken))`
`74`	`74`	`{`
`75`		`- var file = dict["file"].ToString();`
	`75`	`+ var file = fileToken.ToString();`
`76`	`76`	`#pragma warning disable 618`
`77`	`77`	`scriptCondition = new FileScriptCondition(file);`
`78`	`78`	`#pragma warning restore 618`
`79`	`79`	`}`
`80`		`- if (dict.ContainsKey("id"))`
	`80`	`+ else if (dict.TryGetValue("id", out JToken idToken))`
`81`	`81`	`{`
`82`		`- var id = dict["id"].ToString();`
	`82`	`+ var id = idToken.ToString();`
`83`	`83`	`scriptCondition = new IndexedScriptCondition(id);`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`if (scriptCondition == null) return null;`
`87`	`87`
`88`		`- if (dict.ContainsKey("lang"))`
`89`		`- scriptCondition.Lang = dict["lang"].ToString();`
`90`		`- if (dict.ContainsKey("params"))`
`91`		`- scriptCondition.Params = dict["params"].ToObject<Dictionary<string, object>>();`
	`88`	`+ if (dict.TryGetValue("lang", out JToken langToken))`
	`89`	`+ scriptCondition.Lang = langToken.ToString();`
	`90`	`+ if (dict.TryGetValue("params", out JToken paramsToken))`
	`91`	`+ scriptCondition.Params = paramsToken.ToObject<Dictionary<string, object>>();`
`92`	`92`
`93`	`93`	`return scriptCondition;`
`94`	`94`	`}`