Merge pull request #1098 from jmank88/bolt_cache

gps: source cache: add persistent BoltDB cache

Gopkg.toml

@@ -18,3 +18,7 @@
 [[constraint]]
   name = "github.com/pkg/errors"
   version = "0.8.0"
+
+[[constraint]]
+  name = "github.com/boltdb/bolt"
+  version = "1.0.0"

internal/gps/source.go

@@ -65,13 +65,7 @@ func newSourceCoordinator(superv *supervisor, deducer deducer, cachedir string,
 	}
 }
 
-func (sc *sourceCoordinator) close() {
-	for k, v := range sc.srcs {
-		if err := v.close(); err != nil {
-			sc.logger.Println(errors.Wrapf(err, "error closing source gateway for %q", k))
-		}
-	}
-}
+func (sc *sourceCoordinator) close() {}
 
 func (sc *sourceCoordinator) getSourceGatewayFor(ctx context.Context, id ProjectIdentifier) (*sourceGateway, error) {
 	if sc.supervisor.getLifetimeContext().Err() != nil {
@@ -211,10 +205,6 @@ func newSourceGateway(maybe maybeSource, superv *supervisor, cachedir string) *s
 	return sg
 }
 
-func (sg *sourceGateway) close() error {
-	return errors.Wrap(sg.cache.close(), "error closing cache")
-}
-
 func (sg *sourceGateway) syncLocal(ctx context.Context) error {
 	sg.mu.Lock()
 	defer sg.mu.Unlock()

internal/gps/source_cache.go

@@ -58,9 +58,6 @@ type singleSourceCache interface {
 	// If the input is a revision and multiple UnpairedVersions are associated
 	// with it, whatever happens to be the first is returned.
 	toUnpaired(v Version) (UnpairedVersion, bool)
-
-	// close closes the cache and any backing resources.
-	close() error
 }
 
 type singleSourceCacheMemory struct {
@@ -80,8 +77,6 @@ func newMemoryCache() singleSourceCache {
 	}
 }
 
-func (*singleSourceCacheMemory) close() error { return nil }
-
 type projectInfo struct {
 	Manifest
 	Lock
@@ -225,39 +220,3 @@ func (c *singleSourceCacheMemory) toUnpaired(v Version) (UnpairedVersion, bool)
 		panic(fmt.Sprintf("unknown version type %T", v))
 	}
 }
-
-// cachedManifest implements RootManifest and is populated from cached data.
-type cachedManifest struct {
-	constraints, overrides ProjectConstraints
-	ignored, required      map[string]bool
-}
-
-func (m *cachedManifest) DependencyConstraints() ProjectConstraints {
-	return m.constraints
-}
-
-func (m *cachedManifest) Overrides() ProjectConstraints {
-	return m.overrides
-}
-
-func (m *cachedManifest) IgnoredPackages() map[string]bool {
-	return m.ignored
-}
-
-func (m *cachedManifest) RequiredPackages() map[string]bool {
-	return m.required
-}
-
-// cachedManifest implements Lock and is populated from cached data.
-type cachedLock struct {
-	inputHash []byte
-	projects  []LockedProject
-}
-
-func (l *cachedLock) InputHash() []byte {
-	return l.inputHash
-}
-
-func (l *cachedLock) Projects() []LockedProject {
-	return l.projects
-}