Revert fast-lane search isolate. (#8840)

Author: isoos

CHANGELOG.md

@@ -2,6 +2,8 @@ Important changes to data models, configuration, and migrations between each
 AppEngine version, listed here to ease deployment and troubleshooting.
 
 ## Next Release (replace with git tag when deployed)
+ * Bump runtimeVersion to `2025.07.01`.
+ * Note: search instance uses single isolate for package queries. (reverted fast-lane isolate)
 
 ## `20250626t093300-all`
  * Bump runtimeVersion to `2025.06.20`.

app/bin/tools/isolate_search_benchmark.dart

@@ -26,28 +26,22 @@ final queries = [
 Future<void> main(List<String> args) async {
   print('Started. Current memory: ${ProcessInfo.currentRss ~/ 1024} KiB,  '
       'max memory: ${ProcessInfo.maxRss ~/ 1024} KiB');
-  final primaryRunner = await startSearchIsolate(snapshot: args.first);
-  final reducedRunner = await startSearchIsolate(
-    snapshot: args.first,
-    removeTextContent: true,
-  );
+  final runner = await startSearchIsolate(snapshot: args.first);
   print('Loaded. Current memory: ${ProcessInfo.currentRss ~/ 1024} KiB,  '
       'max memory: ${ProcessInfo.maxRss ~/ 1024} KiB');
 
   for (var i = 0; i < 5; i++) {
-    await _benchmark(primaryRunner, primaryRunner);
-    await _benchmark(primaryRunner, reducedRunner);
+    await _benchmark(runner);
     print('--');
   }
 
-  await primaryRunner.close();
-  await reducedRunner.close();
+  await runner.close();
   print('Done. Current memory: ${ProcessInfo.currentRss ~/ 1024} KiB,  '
       'max memory: ${ProcessInfo.maxRss ~/ 1024} KiB');
 }
 
-Future<void> _benchmark(IsolateRunner primary, IsolateRunner reduced) async {
-  final index = IsolateSearchIndex(primary, reduced);
+Future<void> _benchmark(IsolateRunner primary) async {
+  final index = IsolateSearchIndex(primary);
   final durations = <String, List<int>>{};
   for (var i = 0; i < 100; i++) {
     final random = Random(i);

app/lib/search/search_service.dart

@@ -137,29 +137,6 @@ class PackageDocument {
   Map<String, dynamic> toJson() => _$PackageDocumentToJson(this);
 
   late final packageNameLowerCased = package.toLowerCase();
-
-  /// Removes the text-heavy content from the current object,
-  /// making it lightweight for no-text indexing.
-  PackageDocument removeTextContent() => PackageDocument(
-        package: package,
-        version: version,
-        created: created,
-        updated: updated,
-        sourceUpdated: sourceUpdated,
-        timestamp: timestamp,
-        apiDocPages: null,
-        dependencies: dependencies,
-        description: null,
-        downloadCount: downloadCount,
-        downloadScore: downloadScore,
-        grantedPoints: grantedPoints,
-        likeCount: likeCount,
-        likeScore: likeScore,
-        maxPoints: maxPoints,
-        readme: null,
-        tags: tags,
-        trendScore: trendScore,
-      );
 }
 
 /// A reference to an API doc page

app/lib/search/updater.dart

@@ -30,18 +30,15 @@ IndexUpdater get indexUpdater => ss.lookup(#_indexUpdater) as IndexUpdater;
 
 /// Loads a local search snapshot file and builds an in-memory package index from it.
 Future<InMemoryPackageIndex> loadInMemoryPackageIndexFromFile(
-  String path, {
-  bool removeTextContent = false,
-}) async {
+    String path) async {
   final file = File(path);
   final content =
       json.decode(utf8.decode(gzip.decode(await file.readAsBytes())))
           as Map<String, Object?>;
   final snapshot = SearchSnapshot.fromJson(content);
   return InMemoryPackageIndex(
-    documents: snapshot.documents!.values
-        .where((d) => !isSdkPackage(d.package))
-        .map((d) => removeTextContent ? d.removeTextContent() : d),
+    documents:
+        snapshot.documents!.values.where((d) => !isSdkPackage(d.package)),
   );
 }
 
@@ -64,8 +61,8 @@ class IndexUpdater {
 
   /// Loads the package index snapshot, or if it fails, creates a minimal
   /// package index with only package names and minimal information.
-  Future<void> init({bool removeTextContent = false}) async {
-    final isReady = await _initSnapshot(removeTextContent);
+  Future<void> init() async {
+    final isReady = await _initSnapshot();
     if (!isReady) {
       _logger.info('Loading minimum package index...');
       final documents = await searchBackend.loadMinimumPackageIndex().toList();
@@ -89,17 +86,14 @@ class IndexUpdater {
   }
 
   /// Returns whether the snapshot was initialized and loaded properly.
-  Future<bool> _initSnapshot(bool removeTextContent) async {
+  Future<bool> _initSnapshot() async {
     try {
       _logger.info('Loading snapshot...');
       final documents = await searchBackend.fetchSnapshotDocuments();
       if (documents == null) {
         return false;
       }
-      updatePackageIndex(InMemoryPackageIndex(
-        documents:
-            documents.map((d) => removeTextContent ? d.removeTextContent() : d),
-      ));
+      updatePackageIndex(InMemoryPackageIndex(documents: documents));
       // Arbitrary sanity check that the snapshot is not entirely bogus.
       // Index merge will enable search.
       if (documents.length > 10) {

app/lib/service/entrypoint/search.dart

@@ -38,14 +38,8 @@ class SearchCommand extends Command {
 
     envConfig.checkServiceEnvironment(name);
     await withServices(() async {
-      final primaryIsolate = await startSearchIsolate(logger: _logger);
-      registerScopeExitCallback(primaryIsolate.close);
-
-      final reducedIsolate = await startSearchIsolate(
-        logger: _logger,
-        removeTextContent: true,
-      );
-      registerScopeExitCallback(reducedIsolate.close);
+      final packageIsolate = await startSearchIsolate(logger: _logger);
+      registerScopeExitCallback(packageIsolate.close);
 
       final sdkIsolate = await startQueryIsolate(
         logger: _logger,
@@ -57,9 +51,8 @@ class SearchCommand extends Command {
 
       registerSearchIndex(
         SearchResultCombiner(
-          primaryIndex: LatencyAwareSearchIndex(
-            IsolateSearchIndex(primaryIsolate, reducedIsolate),
-          ),
+          primaryIndex:
+              LatencyAwareSearchIndex(IsolateSearchIndex(packageIsolate)),
           sdkIndex: SdkIsolateIndex(sdkIsolate),
         ),
       );
@@ -72,10 +65,7 @@ class SearchCommand extends Command {
           await Future.delayed(delay);
 
           // create a new index and handover with a 2-minute maximum wait
-          await Future.wait([
-            primaryIsolate.renew(count: 1, wait: Duration(minutes: 2)),
-            reducedIsolate.renew(count: 1, wait: Duration(minutes: 2)),
-          ]);
+          await packageIsolate.renew(count: 1, wait: Duration(minutes: 2));
 
           // schedule the renewal again
           scheduleRenew();

app/lib/service/entrypoint/search_index.dart

@@ -22,11 +22,6 @@ import 'package:pub_dev/shared/utils.dart';
 final _logger = Logger('search_index');
 
 final _argParser = ArgParser()
-  ..addFlag(
-    'remove-text-content',
-    defaultsTo: false,
-    help: 'When set, the text content of the index will be removed.',
-  )
   ..addOption(
     'snapshot',
     help:
@@ -39,7 +34,6 @@ Future<void> main(List<String> args, var message) async {
 
   final argv = _argParser.parse(args);
   final snapshot = argv['snapshot'] as String?;
-  final removeTextContent = (argv['remove-text-content'] as bool?) ?? false;
 
   final ServicesWrapperFn servicesWrapperFn;
   if (envConfig.isRunningInAppengine) {
@@ -52,10 +46,9 @@ Future<void> main(List<String> args, var message) async {
   await fork(() async {
     await servicesWrapperFn(() async {
       if (snapshot == null) {
-        await indexUpdater.init(removeTextContent: removeTextContent);
+        await indexUpdater.init();
       } else {
-        updatePackageIndex(await loadInMemoryPackageIndexFromFile(snapshot,
-            removeTextContent: removeTextContent));
+        updatePackageIndex(await loadInMemoryPackageIndexFromFile(snapshot));
       }
 
       await runIsolateFunctions(
@@ -85,16 +78,14 @@ Future<void> main(List<String> args, var message) async {
 /// Starts a new search isolate with optional overrides.
 Future<IsolateRunner> startSearchIsolate({
   Logger? logger,
-  bool removeTextContent = false,
   String? snapshot,
 }) async {
   return await startQueryIsolate(
     logger: logger ?? _logger,
-    kind: removeTextContent ? 'reduced' : 'primary',
+    kind: 'package',
     spawnUri: Uri.parse('package:pub_dev/service/entrypoint/search_index.dart'),
     spawnArgs: [
       if (snapshot != null) ...['--snapshot', snapshot],
-      if (removeTextContent) '--remove-text-content',
     ],
   );
 }
@@ -103,9 +94,8 @@ Future<IsolateRunner> startSearchIsolate({
 /// across isolate boundaries. The instance should be registered inside the
 /// `frontend` isolate, and it calls the `index` isolate as a delegate.
 class IsolateSearchIndex implements SearchIndex {
-  final IsolateRunner _primary;
-  final IsolateRunner _reduced;
-  IsolateSearchIndex(this._primary, this._reduced);
+  final IsolateRunner _runner;
+  IsolateSearchIndex(this._runner);
   var _isReady = false;
 
   @override
@@ -121,7 +111,7 @@ class IsolateSearchIndex implements SearchIndex {
   @override
   FutureOr<IndexInfo> indexInfo() async {
     try {
-      final info = await _primary.sendRequest(
+      final info = await _runner.sendRequest(
         'info',
         timeout: Duration(seconds: 5),
       );
@@ -139,8 +129,7 @@ class IsolateSearchIndex implements SearchIndex {
   @override
   FutureOr<PackageSearchResult> search(ServiceSearchQuery query) async {
     try {
-      final runner = query.parsedQuery.hasFreeText ? _primary : _reduced;
-      final rs = await runner.sendRequest(
+      final rs = await _runner.sendRequest(
         Uri(queryParameters: query.toUriQueryParameters()).toString(),
         timeout: Duration(minutes: 1),
       );

app/lib/shared/versions.dart

@@ -24,10 +24,10 @@ final RegExp runtimeVersionPattern = RegExp(r'^\d{4}\.\d{2}\.\d{2}$');
 /// when the version switch happens.
 const _acceptedRuntimeVersions = <String>[
   // The current [runtimeVersion].
-  '2025.06.20',
+  '2025.07.01',
   // Fallback runtime versions.
+  '2025.06.20',
   '2025.06.03',
-  '2025.06.02',
 ];
 
 /// Sets the current runtime versions.

app/test/service/entrypoint/search_index_test.dart

@@ -12,19 +12,15 @@ import 'package:test/test.dart';
 
 void main() {
   group('Search index inside an isolate', () {
-    late IsolateRunner primaryRunner;
-    late IsolateRunner reducedRunner;
+    late IsolateRunner runner;
 
     tearDown(() async {
-      await primaryRunner.close();
-      await reducedRunner.close();
+      await runner.close();
     });
 
     test('start and work with local index', () async {
       await withTempDirectory((tempDir) async {
-        // NOTE: The primary and the reduced index loads two different dataset,
-        //       in order to make the testing of the executation path unambigious.
-        final primaryPath = p.join(tempDir.path, 'primary.json.gz');
+        final snapshotPath = p.join(tempDir.path, 'snapshot.json.gz');
         await saveInMemoryPackageIndexToFile(
           [
             PackageDocument(
@@ -33,36 +29,16 @@ void main() {
               tags: ['sdk:dart'],
             ),
           ],
-          primaryPath,
+          snapshotPath,
         );
 
-        primaryRunner = await startSearchIsolate(snapshot: primaryPath);
-
-        final reducedPath = p.join(tempDir.path, 'reduced.json.gz');
-        await saveInMemoryPackageIndexToFile(
-          [
-            PackageDocument(
-              package: 'reduced_json_annotation',
-              description: 'Annotation metadata for JSON serialization.',
-              tags: ['sdk:dart'],
-              downloadScore: 1.0,
-              maxPoints: 100,
-              grantedPoints: 100,
-            ),
-          ],
-          reducedPath,
-        );
-
-        reducedRunner = await startSearchIsolate(
-          snapshot: reducedPath,
-          removeTextContent: true,
-        );
+        runner = await startSearchIsolate(snapshot: snapshotPath);
 
         // index calling the sendport
-        final searchIndex = IsolateSearchIndex(primaryRunner, reducedRunner);
+        final searchIndex = IsolateSearchIndex(runner);
         expect(await searchIndex.isReady(), true);
 
-        // text query - result from primary index
+        // text query - result from package index
         final rs =
             await searchIndex.search(ServiceSearchQuery.parse(query: 'json'));
         expect(rs.toJson(), {
@@ -76,21 +52,6 @@ void main() {
             },
           ],
         });
-
-        // predicate query - result from reduced index
-        final rs2 = await searchIndex
-            .search(ServiceSearchQuery.parse(query: 'sdk:dart'));
-        expect(rs2.toJson(), {
-          'timestamp': isNotEmpty,
-          'totalCount': 1,
-          'sdkLibraryHits': [],
-          'packageHits': [
-            {
-              'package': 'reduced_json_annotation',
-              'score': greaterThan(0.5),
-            },
-          ],
-        });
       });
     }, timeout: Timeout(Duration(minutes: 5)));
   });