Merge pull request #2 from shargon/review

Optimize remove
Qiao-Jin · Oct 23, 2019 · dd36f20 · dd36f20
2 parents a745880 + a84eff9
commit dd36f20
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/neo/Helper.cs b/neo/Helper.cs
@@ -54,6 +54,18 @@ internal static int GetLowestSetBit(this BigInteger i)
             throw new Exception();
         }
 
+        internal static void Remove<T>(this HashSet<T> set, IEnumerable<T> remove)
+        {
+            if (set.Count > 600000)
+            {
+                set.ExceptWith(remove);
+            }
+            else
+            {
+                set.RemoveWhere(u => remove.Contains(u));
+            }
+        }
+
         internal static string GetVersion(this Assembly assembly)
         {
             CustomAttributeData attribute = assembly.CustomAttributes.FirstOrDefault(p => p.AttributeType == typeof(AssemblyInformationalVersionAttribute));

diff --git a/neo/Network/P2P/TaskManager.cs b/neo/Network/P2P/TaskManager.cs
@@ -58,11 +58,11 @@ private void OnNewTasks(InvPayload payload)
                 return;
             }
             HashSet<UInt256> hashes = new HashSet<UInt256>(payload.Hashes);
-            hashes.RemoveWhere(q => knownHashes.Contains(q));
+            hashes.Remove(knownHashes);
             if (payload.Type == InventoryType.Block)
                 session.AvailableTasks.UnionWith(hashes.Where(p => globalTasks.ContainsKey(p)));
 
-            hashes.RemoveWhere(q => globalTasks.ContainsKey(q));
+            hashes.Remove(globalTasks.Keys);
             if (hashes.Count == 0)
             {
                 RequestTasks(session);
@@ -203,7 +203,7 @@ private void RequestTasks(TaskSession session)
             if (session.HasTask) return;
             if (session.AvailableTasks.Count > 0)
             {
-                session.AvailableTasks.RemoveWhere(q => knownHashes.Contains(q));
+                session.AvailableTasks.Remove(knownHashes);
                 session.AvailableTasks.RemoveWhere(p => Blockchain.Singleton.ContainsBlock(p));
                 HashSet<UInt256> hashes = new HashSet<UInt256>(session.AvailableTasks);
                 if (hashes.Count > 0)
@@ -213,7 +213,7 @@ private void RequestTasks(TaskSession session)
                         if (!IncrementGlobalTask(hash))
                             hashes.Remove(hash);
                     }
-                    session.AvailableTasks.ExceptWith(hashes);
+                    session.AvailableTasks.Remove(hashes);
                     foreach (UInt256 hash in hashes)
                         session.Tasks[hash] = DateTime.UtcNow;
                     foreach (InvPayload group in InvPayload.CreateGroup(InventoryType.Block, hashes.ToArray()))