perf: addAll to empty SortedMap from FilteredMapView

appsup-dart · Apr 22, 2024 · d889953 · d889953
1 parent 9ef6e1b
commit d889953
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/lib/src/sortedmap.dart b/lib/src/sortedmap.dart
@@ -210,8 +210,12 @@ class _SortedMap<K extends Comparable, V> extends MapBase<K, V>
       return;
     }
     if (this is! FilteredMap) {
-      _sortedEntries
-          .addAll(other.entries.map((e) => ordering.mapEntry(e.key, e.value)));
+      var entries = other.entries;
+      if (entries is! Iterable<_MapEntryWithIndex<K, V>>) {
+        entries = entries.map<_MapEntryWithIndex<K, V>>(
+            (e) => ordering.mapEntry(e.key, e.value));
+      }
+      _sortedEntries.addAll(entries);
       _map.addAll(other);
       return;
     }

diff --git a/lib/src/treeset.dart b/lib/src/treeset.dart
@@ -393,10 +393,12 @@ class AvlTreeSet<V> extends _BaseTreeSet<V> {
         identical((items as dynamic).comparator, comparator)) {
       _root = items._root;
       return _root != null;
-    }
-    if (_root == null) {
-      //
-      var l = items.toList()..sort(comparator);
+    } else if (_root == null) {
+      var l = items.toList();
+      if (items is! TreeSet<V> ||
+          !identical((items as dynamic).comparator, comparator)) {
+        l.sort(comparator);
+      }
       _root = AvlNode.fromOrderedList(l);
       return true;
     }