Cider. Use CiderByteStore in tests.

Simplify MemoryByteStore.

In Cider we discard values when the last use of the key is released.

OTOH, outside of Cider, we use FileByteStore, which does not immediately discard values, but might eventually when the storage directory overflows. Using the infinite MemoryByteStore in tests is better suited for most tests.

But for Cider we need its own implementation of ByteStore that reflects the discarding behaviour.

Change-Id: Ief83eabac7f4a240feabf609b0dd0d5548bfc70f
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/420640
Reviewed-by: Paul Berry <[email protected]>

Author: scheglov

pkg/analyzer/lib/src/dart/analysis/byte_store.dart

@@ -37,14 +37,11 @@ abstract class ByteStore {
   void release(Iterable<String> keys);
 }
 
-/// [ByteStore] which stores data only in memory.
-class MemoryByteStore implements ByteStore {
-  @visibleForTesting
-  final Map<String, MemoryByteStoreEntry> map = {};
-
-  /// Throws [StateError] if [release] invoked when there is no entry.
+/// [ByteStore] which stores data only in memory, and evicts data as soon as it
+/// becomes unreferenced.
+class CiderByteStore implements ByteStore {
   @visibleForTesting
-  bool throwIfReleaseWithoutEntry = false;
+  final Map<String, CiderByteStoreEntry> map = {};
 
   @override
   Uint8List? get(String key) {
@@ -65,39 +62,59 @@ class MemoryByteStore implements ByteStore {
       return entry.bytes;
     }
 
-    map[key] = MemoryByteStoreEntry._(bytes);
+    map[key] = CiderByteStoreEntry._(bytes);
     return bytes;
   }
 
   @override
   void release(Iterable<String> keys) {
     for (var key in keys) {
       var entry = map[key];
-      if (entry != null) {
-        entry.refCount--;
-        if (entry.refCount == 0) {
-          map.remove(key);
-        }
-      } else if (throwIfReleaseWithoutEntry) {
-        throw StateError('No entry: $key');
+      if (entry == null) {
+        // TODO(scheglov): enable and fix
+        // throw StateError('No entry: $key');
+        return;
+      }
+      entry.refCount--;
+      if (entry.refCount == 0) {
+        map.remove(key);
       }
     }
   }
 }
 
 @visibleForTesting
-class MemoryByteStoreEntry {
+class CiderByteStoreEntry {
   final Uint8List bytes;
   int refCount = 1;
 
-  MemoryByteStoreEntry._(this.bytes);
+  CiderByteStoreEntry._(this.bytes);
 
   @override
   String toString() {
     return '(length: ${bytes.length}, refCount: $refCount)';
   }
 }
 
+/// [ByteStore] which stores data only in memory.
+class MemoryByteStore implements ByteStore {
+  final Map<String, Uint8List> map = {};
+
+  @override
+  Uint8List? get(String key) {
+    return map[key];
+  }
+
+  @override
+  Uint8List putGet(String key, Uint8List bytes) {
+    map[key] = bytes;
+    return bytes;
+  }
+
+  @override
+  void release(Iterable<String> keys) {}
+}
+
 /// A wrapper around [ByteStore] which adds an in-memory LRU cache to it.
 class MemoryCachingByteStore implements ByteStore {
   final ByteStore _store;

pkg/analyzer/test/src/dart/analysis/analyzer_state_printer.dart

@@ -16,7 +16,7 @@ import 'package:collection/collection.dart';
 import 'package:test/test.dart';
 
 class AnalyzerStatePrinter {
-  final MemoryByteStore byteStore;
+  final ByteStore byteStore;
   final UnlinkedUnitStoreImpl unlinkedUnitStore;
   final IdProvider idProvider;
   final LibraryContext libraryContext;
@@ -98,14 +98,19 @@ class AnalyzerStatePrinter {
   void _writeByteStore() {
     sink.writelnWithIndent('byteStore');
     sink.withIndent(() {
-      var groups = byteStore.map.entries.groupListsBy((element) {
-        return element.value.refCount;
-      });
-
-      for (var groupEntry in groups.entries) {
-        var keys = groupEntry.value.map((e) => e.key).toList();
-        var shortKeys = idProvider.shortKeys(keys)..sort();
-        sink.writelnWithIndent('${groupEntry.key}: $shortKeys');
+      switch (byteStore) {
+        case CiderByteStore byteStore:
+          var groups = byteStore.map.entries.groupListsBy((element) {
+            return element.value.refCount;
+          });
+
+          for (var groupEntry in groups.entries) {
+            var keys = groupEntry.value.map((e) => e.key).toList();
+            var shortKeys = idProvider.shortKeys(keys)..sort();
+            sink.writelnWithIndent('${groupEntry.key}: $shortKeys');
+          }
+        default:
+          throw UnimplementedError('${byteStore.runtimeType}');
       }
     });
   }

pkg/analyzer/test/src/dart/micro/file_resolution.dart

@@ -32,7 +32,7 @@ import '../resolution/resolution.dart';
 
 /// [FileResolver] based implementation of [ResolutionTest].
 class FileResolutionTest with ResourceProviderMixin, ResolutionTest {
-  final MemoryByteStore byteStore = MemoryByteStore();
+  final CiderByteStore byteStore = CiderByteStore();
 
   final FileResolverTestData testData = FileResolverTestData();
 

pkg/analyzer/test/src/dart/micro/simple_file_resolver_test.dart

@@ -1666,7 +1666,7 @@ elementFactory
 unlinkedUnitStore
   1: [k00, k02, k03, k04, k05, k06, k07]
 byteStore
-  1: [k00, k02, k03, k04, k05, k06, k07]
+  1: [k00, k02, k03, k04, k05, k06, k07, k08]
 ''');
 
     var b_library = await fileResolver.getLibraryByUri2(
@@ -1735,7 +1735,7 @@ elementFactory
 unlinkedUnitStore
   1: [k00, k02, k03, k04, k05, k06, k07]
 byteStore
-  1: [k00, k02, k03, k04, k05, k06, k07]
+  1: [k00, k02, k03, k04, k05, k06, k07, k08]
 ''');
   }