Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(423)

Unified Diff: sdk/lib/_internal/pub/lib/src/solver/version_solver.dart

Issue 323073006: Cache version list results even when they fail. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Revise. Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sdk/lib/_internal/pub/lib/src/solver/backtracking_solver.dart ('k') | sdk/lib/_internal/pub/pub.status » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sdk/lib/_internal/pub/lib/src/solver/version_solver.dart
diff --git a/sdk/lib/_internal/pub/lib/src/solver/version_solver.dart b/sdk/lib/_internal/pub/lib/src/solver/version_solver.dart
index 3fc55d0f46bac5851bd9ab0c19b2efb015783caf..0803f81cb9dfa22d2ef1d13a2ba2d7237ff2c18d 100644
--- a/sdk/lib/_internal/pub/lib/src/solver/version_solver.dart
+++ b/sdk/lib/_internal/pub/lib/src/solver/version_solver.dart
@@ -7,6 +7,8 @@ library pub.solver.version_solver;
import 'dart:async';
import "dart:convert";
+import 'package:stack_trace/stack_trace.dart';
+
import '../lock_file.dart';
import '../log.dart' as log;
import '../package.dart';
@@ -111,6 +113,9 @@ class PubspecCache {
/// The already-requested cached version lists.
final _versions = new Map<PackageRef, List<PackageId>>();
+ /// The errors from failed version list requests.
+ final _versionErrors = new Map<PackageRef, Pair<Object, Chain>>();
+
/// The already-requested cached pubspecs.
final _pubspecs = new Map<PackageId, Pubspec>();
@@ -175,6 +180,14 @@ class PubspecCache {
_versionCacheHits++;
return new Future.value(versions);
}
+
+ // See if we cached a failure.
+ var error = _versionErrors[package];
+ if (error != null) {
+ _versionCacheHits++;
+ return new Future.error(error.first, error.last);
+ }
+
_versionCacheMisses++;
var source = _sources[package.source];
@@ -187,6 +200,12 @@ class PubspecCache {
(version) => package.atVersion(version)).toList();
_versions[package] = ids;
return ids;
+ }).catchError((error, trace) {
+ // If an error occurs, cache that too. We only want to do one request
+ // for any given package, successful or not.
+ log.solver("Could not get versions for $package:\n$error\n\n$trace");
+ _versionErrors[package] = new Pair(error, new Chain.forTrace(trace));
+ throw error;
});
}
« no previous file with comments | « sdk/lib/_internal/pub/lib/src/solver/backtracking_solver.dart ('k') | sdk/lib/_internal/pub/pub.status » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698