Keep isSoftRemoved calls in-iteration, prevent List updates.

dart-lang · Dec 6, 2024 · 72ba8c8 · 72ba8c8
1 parent 428fc56
commit 72ba8c8
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/app/bin/tools/search_benchmark.dart b/app/bin/tools/search_benchmark.dart
@@ -18,9 +18,9 @@ Future<void> main(List<String> args) async {
       json.decode(utf8.decode(gzip.decode(await file.readAsBytes())))
           as Map<String, Object?>;
   final snapshot = SearchSnapshot.fromJson(content);
-  snapshot.documents!
-      .removeWhere((packageName, doc) => isSoftRemoved(packageName));
-  final index = InMemoryPackageIndex(documents: snapshot.documents!.values);
+  final index = InMemoryPackageIndex(
+      documents:
+          snapshot.documents!.values.where((d) => !isSoftRemoved(d.package)));
 
   // NOTE: please add more queries to this list, especially if there is a performance bottleneck.
   final queries = [

diff --git a/app/lib/frontend/handlers/custom_api.dart b/app/lib/frontend/handlers/custom_api.dart
@@ -78,10 +78,8 @@ Future<shelf.Response> apiPackageNamesHandler(shelf.Request request) async {
 
   final bytes = await cache.packageNamesDataJsonGz().get(() async {
     final packageNames = await nameTracker.getVisiblePackageNames();
-    packageNames.removeWhere(isSoftRemoved);
-
     return gzip.encode(jsonUtf8Encoder.convert({
-      'packages': packageNames,
+      'packages': packageNames.where((p) => !isSoftRemoved(p)).toList(),
       // pagination is off for now
       'nextUrl': null,
     }));

diff --git a/app/lib/search/backend.dart b/app/lib/search/backend.dart
@@ -133,6 +133,9 @@ class SearchBackend {
       if (!claim.valid) {
         return;
       }
+      if (isSoftRemoved(package)) {
+        return;
+      }
       // Skip if the last document timestamp is before [updated].
       // 1-minute window is kept to reduce clock-skew.
       if (updated != null) {
@@ -471,9 +474,6 @@ class SearchBackend {
         return null;
       }
       final snapshot = SearchSnapshot.fromJson(map);
-      snapshot.documents!
-          .removeWhere((packageName, doc) => isSoftRemoved(packageName));
-
       final count = snapshot.documents!.length;
       _logger.info('Got $count packages from snapshot at ${snapshot.updated}');
       return snapshot.documents?.values.toList();