Dictionary.ContainsKey replaced with TryGetValue/TryAdd/TryRemove

Author: alex-kulakov

Orm/Xtensive.Orm.PostgreSql/Sql.Drivers.PostgreSql/v8_0/Extractor.cs

@@ -718,14 +718,14 @@ protected virtual void ReadColumnData(DbDataReader dataReader, ExtractionContext
       var columnOwnerId = Convert.ToInt64(dataReader["attrelid"]);
       var columnId = Convert.ToInt64(dataReader["attnum"]);
       var columnName = dataReader["attname"].ToString();
-      if (tableMap.ContainsKey(columnOwnerId)) {
-        var table = tableMap[columnOwnerId];
+      if (tableMap.TryGetValue(columnOwnerId, out var table)) {
         var col = table.CreateColumn(columnName);
-        if (!tableColumns.ContainsKey(columnOwnerId)) {
-          tableColumns.Add(columnOwnerId, new Dictionary<long, TableColumn>());
+        if (tableColumns.TryGetValue(columnId, out var column)) {
+          tableColumns.Add(columnId, new Dictionary<long, TableColumn>());
+        }
+        else {
+          column.Add(columnId, col);
         }
-
-        tableColumns[columnOwnerId].Add(columnId, col);
 
         var columnTypeName = dataReader["typname"].ToString();
         var columnTypeSpecificData = Convert.ToInt32(dataReader["atttypmod"]);

Orm/Xtensive.Orm/Modelling/Actions/ActionSequence.cs

@@ -51,8 +51,7 @@ public void Add(NodeAction action)
         var last = actions[lastIndex] as PropertyChangeAction;
         if (last!=null && ca.Path==last.Path) {
           foreach (var pair in last.Properties) {
-            if (!ca.Properties.ContainsKey(pair.Key))
-              ca.Properties.Add(pair.Key, pair.Value);
+            _ = ca.Properties.TryAdd(pair.Key, pair.Value);
           }
           actions.RemoveAt(lastIndex);
         }

Orm/Xtensive.Orm/Modelling/Actions/GroupingNodeAction.cs

@@ -56,8 +56,7 @@ public void Add(NodeAction action)
         var last = actions[lastIndex] as PropertyChangeAction;
         if (last!=null && ca.Path==last.Path) {
           foreach (var pair in last.Properties) {
-            if (!ca.Properties.ContainsKey(pair.Key))
-              ca.Properties.Add(pair.Key, pair.Value);
+            _ = ca.Properties.TryAdd(pair.Key, pair.Value);
           }
           actions.RemoveAt(lastIndex);
         }

Orm/Xtensive.Orm/Modelling/Comparison/Hints/HintSet.cs

@@ -77,31 +77,25 @@ public void Add(Hint hint)
         var nodes = new List<Node>();
         foreach (var target in targets) {
           Node node;
-          if (target.Model==ModelType.Source)
+          if (target.Model == ModelType.Source)
             node = (Node) SourceModel.Resolve(target.Path, true);
           else
             node = (Node) TargetModel.Resolve(target.Path, true);
           nodes.Add(node);
-          
-          if (!hintMap.ContainsKey(node))
-            hintMap.Add(node, new Dictionary<Type, object>());
-          var nodeHintMap = hintMap[node];
+
+          var nodeHintMap = GetNodeHints(node);
           var hintType = hint.GetType();
-          
-          if (!nodeHintMap.ContainsKey(hintType))
-            nodeHintMap.Add(hintType, null);
-          
-          var hintOrList = nodeHintMap[hintType];
-          if (hintOrList==null)
-            nodeHintMap[hintType] = hint;
-          else {
-            var list = hintOrList as List<Hint>;
-            if (list==null) {
-              var oldHint = (Hint) hintOrList;
-              nodeHintMap[hintType] = new List<Hint>(new[] {oldHint, hint});
-            }
-            else
+
+          if (nodeHintMap.TryGetValue(hintType, out var hintOrList)) {
+            if (hintOrList is List<Hint> list) {
               list.Add(hint);
+            }
+            else {
+              nodeHintMap[hintType] = new List<Hint>(new[] { (Hint) hintOrList, hint });
+            }
+          }
+          else {
+            nodeHintMap.Add(hintType, hint);
           }
         }
       }
@@ -126,46 +120,20 @@ public void Clear()
 
     /// <inheritdoc/>
     /// <exception cref="InvalidOperationException">Multiple hints found.</exception>
-    public THint GetHint<THint>(Node node)
-      where THint : Hint
-    {
-      ArgumentValidator.EnsureArgumentNotNull(node, "node");
-
-      if (!hintMap.ContainsKey(node))
-        hintMap.Add(node, new Dictionary<Type, object>());
-      var nodeHintMap = hintMap.GetValueOrDefault(node);
-      if (nodeHintMap==null)
-        return null;
-      var hintType = typeof(THint);
-      var hintOrList = nodeHintMap.GetValueOrDefault(hintType);
-      if (hintOrList==null)
-        return null;
-      var hint = hintOrList as THint;
-      if (hint!=null)
-        return hint;
-      throw new InvalidOperationException(Strings.ExMultipleHintsFound);
-    }
+    public THint GetHint<THint>(Node node) where THint : Hint =>
+      GetNodeHints(node).GetValueOrDefault(typeof(THint)) switch {
+        null => null,
+        THint hint => hint,
+        _ => throw new InvalidOperationException(Strings.ExMultipleHintsFound)
+      };
 
     /// <inheritdoc/>
-    public THint[] GetHints<THint>(Node node)
-      where THint : Hint
-    {
-      ArgumentValidator.EnsureArgumentNotNull(node, "node");
-
-      if (!hintMap.ContainsKey(node))
-        hintMap.Add(node, new Dictionary<Type, object>());
-      var nodeHintMap = hintMap.GetValueOrDefault(node);
-      if (nodeHintMap==null)
-        return ArrayUtils<THint>.EmptyArray;
-      var hintType = typeof (THint);
-      var hintOrList = nodeHintMap.GetValueOrDefault(hintType);
-      if (hintOrList==null)
-        return ArrayUtils<THint>.EmptyArray;
-      var hint = hintOrList as THint;
-      if (hint!=null)
-        return new[] {hint};
-      return ((List<Hint>) hintOrList).Cast<THint>().ToArray();
-    }
+    public THint[] GetHints<THint>(Node node) where THint : Hint =>
+      GetNodeHints(node).GetValueOrDefault(typeof(THint)) switch {
+        null => Array.Empty<THint>(),
+        THint hint => new[] { hint },
+        var list => ((List<Hint>) list).Cast<THint>().ToArray()
+      };
 
     /// <summary>
     /// Determines whether there are any hints associated with the specified.
@@ -175,29 +143,10 @@ public THint[] GetHints<THint>(Node node)
     /// <see langword="true"/> if the specified node has associated hints; 
     /// otherwise, <see langword="false"/>.
     /// </returns>
-    public bool HasHints(Node node)
-    {
-      ArgumentValidator.EnsureArgumentNotNull(node, "node");
+    public bool HasHints(Node node) => GetNodeHints(node).Count > 0;
 
-      if (!hintMap.ContainsKey(node))
-        hintMap.Add(node, new Dictionary<Type, object>());
-      var nodeHintMap = hintMap.GetValueOrDefault(node);
-      if (nodeHintMap==null)
-        return false;
-
-      return nodeHintMap.Values.Count > 0;
-    }
-
-    public bool HasHints<THint>(Node node)
-      where THint : Hint
-    {
-      ArgumentValidator.EnsureArgumentNotNull(node, "node");
-
-      if (!hintMap.TryGetValue(node, out var nodeHintMap)) {
-        hintMap.Add(node, nodeHintMap = new Dictionary<Type, object>());
-      }
-      return nodeHintMap.ContainsKey(typeof(THint));
-    }
+    public bool HasHints<THint>(Node node) where THint : Hint =>
+      GetNodeHints(node).ContainsKey(typeof(THint));
 
     #region IEnumerable<...> methods
 
@@ -215,6 +164,16 @@ IEnumerator IEnumerable.GetEnumerator()
 
     #endregion
 
+    private Dictionary<Type, object> GetNodeHints(Node node)
+    {
+      ArgumentValidator.EnsureArgumentNotNull(node, "node");
+
+      if (!hintMap.TryGetValue(node, out var nodeHintMap)) {
+        hintMap.Add(node, nodeHintMap = new Dictionary<Type, object>());
+      }
+      return nodeHintMap;
+    }
+
     #region ILockable methods
 
     /// <inheritdoc/>

Orm/Xtensive.Orm/Modelling/NodeCollection.cs

@@ -228,22 +228,22 @@ public override void Lock(bool recursive)
     internal void Add(Node node)
     {
       this.EnsureNotLocked();
-      if (node.Index!=list.Count)
+      if (node.Index != list.Count)
         throw Exceptions.InternalError("Wrong NodeCollection.Add arguments: node.Index!=list.Count!", CoreLog.Instance);
       string name = node.Name;
-      if (nameIndex.ContainsKey(name))
-        throw Exceptions.InternalError("Wrong NodeCollection.Add arguments: nameIndex[node.Name]!=null!", CoreLog.Instance);
       int count = list.Count;
+      if (!nameIndex.TryAdd(name, node)) {
+        throw Exceptions.InternalError("Wrong NodeCollection.Add arguments: nameIndex[node.Name]!=null!", CoreLog.Instance);
+      }
       try {
         list.Add(node);
-        nameIndex.Add(name, node);
         OnCollectionChanged(new NotifyCollectionChangedEventArgs(
           NotifyCollectionChangedAction.Add, node.Index));
       }
       catch {
-        if (list.Count>count)
+        if (list.Count > count)
           list.RemoveAt(count);
-        if (nameIndex.Count>count)
+        if (nameIndex.Count > count)
           nameIndex.Remove(name);
         throw;
       }
@@ -259,8 +259,7 @@ internal void Remove(Node node)
       string name = node.Name;
       try {
         list.RemoveAt(index);
-        if (nameIndex.ContainsKey(name))
-          nameIndex.Remove(name);
+        nameIndex.Remove(name);
         OnCollectionChanged(new NotifyCollectionChangedEventArgs(
           NotifyCollectionChangedAction.Remove, index));
       }
@@ -316,21 +315,18 @@ internal void RemoveName(Node node)
     internal void AddName(Node node)
     {
       this.EnsureNotLocked();
-      string name = node.Name;
-      if (nameIndex.ContainsKey(name))
+      if (!nameIndex.TryAdd(node.Name, node)) {
         throw Exceptions.InternalError("Wrong NodeCollection.AddName arguments: nameIndex[node.Name]!=null!", CoreLog.Instance);
-      nameIndex.Add(name, node);
+      }
     }
 
     /// <exception cref="InvalidOperationException">Internal error.</exception>
     internal void CheckIntegrity()
     {
       foreach (var node in list) {
-        var name = node.Name;
-        if (!nameIndex.ContainsKey(name))
-          throw Exceptions.InternalError("Integrity check failed.", CoreLog.Instance);
-        if (node!=nameIndex[name])
+        if (!nameIndex.TryGetValue(node.Name, out var value) || value != node) {
           throw Exceptions.InternalError("Integrity check failed.", CoreLog.Instance);
+        }
       }
     }
 

Orm/Xtensive.Orm/Orm/Building/Builders/AttributeProcessor.cs

@@ -387,12 +387,10 @@ private void ProcessKeyFields(string[] source, IDictionary<string, Direction> ta
 
         context.Validator.ValidateName(result.First, ValidationRule.Column);
 
-        if (target.ContainsKey(result.First)) {
+        if (!target.TryAdd(result.First, result.Second)) {
           throw new DomainBuilderException(
             string.Format(Strings.ExIndexAlreadyContainsField, fieldName));
         }
-
-        target.Add(result.First, result.Second);
       }
     }
 

Orm/Xtensive.Orm/Orm/Building/Builders/ModelBuilder.cs

@@ -464,16 +464,16 @@ private void RegiserReferences(Dictionary<TypeInfo, int> referenceRegistrator, p
         if (typeImplementors.Any())
         {
           foreach (var implementor in typeImplementors)
-            if (referenceRegistrator.ContainsKey(implementor))
-              referenceRegistrator[implementor] += 1;
+            if (referenceRegistrator.TryGetValue(implementor, out var refCount))
+              referenceRegistrator[implementor] = refCount + 1;
         }
         else {
-          if (referenceRegistrator.ContainsKey(type))
-            referenceRegistrator[type] += 1;
+          if (referenceRegistrator.TryGetValue(type, out var refCount))
+            referenceRegistrator[type] = refCount + 1;
           if (descendantTypes.Any()) {
             foreach (var descendant in descendantTypes) {
-              if (referenceRegistrator.ContainsKey(descendant))
-                referenceRegistrator[descendant] += 1;
+              if (referenceRegistrator.TryGetValue(descendant, out var refCount1))
+                referenceRegistrator[descendant] = refCount1 + 1;
             }
           }
         }

Orm/Xtensive.Orm/Orm/Internals/EntitySetState.cs

@@ -161,10 +161,7 @@ public bool Contains(Key key)
     /// <param name="key">The key to add.</param>
     public void Add(Key key)
     {
-      if (removedKeys.ContainsKey(key)) {
-        _ = removedKeys.Remove(key);
-      }
-      else {
+      if (!removedKeys.Remove(key)) {
         addedKeys[key] = key;
       }
       if (TotalItemCount != null) {
@@ -183,13 +180,10 @@ public void Add(Key key)
     /// <param name="key">The key to remove.</param>
     public void Remove(Key key)
     {
-      if (addedKeys.ContainsKey(key)) {
-        _ = addedKeys.Remove(key);
-      }
-      else {
+      if (!addedKeys.Remove(key)) {
         removedKeys[key] = key;
       }
-      if (TotalItemCount!=null) {
+      if (TotalItemCount != null) {
         TotalItemCount--;
       }
 
@@ -394,10 +388,7 @@ public void UpdateCachedState(IEnumerable<Key> syncronizedKeys, long? count)
       FetchedKeys.Clear();
       var becameRemovedOnSever = new HashSet<Key>(removedKeys.Keys);
       foreach (var key in syncronizedKeys) {
-        if (addedKeys.ContainsKey(key)) {
-          _ = addedKeys.Remove(key);
-        }
-        else if (becameRemovedOnSever.Contains(key)) {
+        if (!addedKeys.Remove(key)) {
           _ = becameRemovedOnSever.Remove(key);
         }
         FetchedKeys.Add(key);

Orm/Xtensive.Orm/Orm/Internals/Prefetch/EntityGroupTask.cs

@@ -86,18 +86,8 @@ public CacheKey(int[] columnIndexes, TypeInfo type, int cachedHashCode)
 
     public CompilableProvider Provider { get; private set; }
 
-    public void AddKey(Key key, bool exactType)
-    {
-      if (keys == null) {
-        keys = new Dictionary<Key, bool>();
-      }
-
-      if (keys.ContainsKey(key)) {
-        return;
-      }
-
-      keys.Add(key, exactType);
-    }
+    public void AddKey(Key key, bool exactType) =>
+      (keys ??= new Dictionary<Key, bool>()).TryAdd(key, exactType);
 
     public void RegisterQueryTasks()
     {

Orm/Xtensive.Orm/Orm/Linq/MemberCompilation/MemberCompilerProvider.cs

@@ -1,4 +1,4 @@
-// Copyright (C) 2009-2020 Xtensive LLC.
+// Copyright (C) 2009-2024 Xtensive LLC.
 // This code is distributed under MIT license terms.
 // See the License.txt file in the project root for more information.
 // Created by: Denis Krjuchkov
@@ -103,14 +103,15 @@ private void UpdateRegistry(
     {
       foreach (var (targetMember, compiler) in newRegistrations) {
         var key = GetCompilerKey(targetMember);
-        if (conflictHandlingMethod != ConflictHandlingMethod.Overwrite && compilers.ContainsKey(key)) {
-          if (conflictHandlingMethod == ConflictHandlingMethod.ReportError) {
-            throw new InvalidOperationException(string.Format(
-              Strings.ExCompilerForXIsAlreadyRegistered, targetMember.GetFullName(true)));
+        if (!compilers.TryAdd(key, compiler)) {
+          switch (conflictHandlingMethod) {
+            case ConflictHandlingMethod.Overwrite:
+              compilers[key] = compiler;
+              break;
+            case ConflictHandlingMethod.ReportError:
+              throw new InvalidOperationException(string.Format(Strings.ExCompilerForXIsAlreadyRegistered, targetMember.GetFullName(true)));
           }
-          continue;
         }
-        compilers[key] = compiler;
       }
     }