Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use new Data.Store.Version to address #2296 #2425

Merged
merged 1 commit into from
Aug 6, 2016
Merged

Conversation

mgsloan
Copy link
Contributor

@mgsloan mgsloan commented Aug 2, 2016

Not quite ready yet, still pending review and release of the changes to store.

Also, the type hashes change when moving to 7.8 due to a type changing location:

--- /home/mgsloan/fpco/stack/.stack-work/store-versioned/aHzcZ6_w3rL6NtEJUqEfh6fcjAc=   2016-08-02 02:54:02.680394461 -0700
+++ /home/mgsloan/fpco/stack/.stack-work/store-versioned/QQs6brImltateKQyGnt1TgdkoVM=   2016-08-02 02:59:26.306286816 -0700
@@ -13,6 +13,13 @@
     slot 0 :: [(Stack.Types.PackageIdentifier.PackageIdentifier,Stack.Types.PackageIndex.PackageCache)]
   }

+data-type Data.Maybe.Maybe Stack.Types.PackageIndex.PackageDownload
+  = Nothing {
+  }
+  | Just {
+    slot 0 :: Stack.Types.PackageIndex.PackageDownload
+  }
+
 data-type Data.Text.Internal.Text
   = pack {
     slot 0 :: [GHC.Types.Char]
@@ -20,13 +27,6 @@

 data-type Data.Vector.Unboxed.Base.Vector GHC.Types.Word ignored

-data-type GHC.Base.Maybe Stack.Types.PackageIndex.PackageDownload
-  = Nothing {
-  }
-  | Just {
-    slot 0 :: Stack.Types.PackageIndex.PackageDownload
-  }
-
 data-type GHC.Int.Int64 has IntRep

 data-type GHC.Types.Char has CharRep
@@ -43,7 +43,7 @@
   = PackageCache {
     pcOffset :: GHC.Int.Int64
     pcSize :: GHC.Int.Int64
-    pcDownload :: GHC.Base.Maybe Stack.Types.PackageIndex.PackageDownload
+    pcDownload :: Data.Maybe.Maybe Stack.Types.PackageIndex.PackageDownload
   }

 data-type Stack.Types.PackageIndex.PackageCacheMap

@mgsloan mgsloan force-pushed the 2296-versioned-store branch 7 times, most recently from 5fc324c to ea896fc Compare August 6, 2016 01:03
@mgsloan mgsloan force-pushed the 2296-versioned-store branch from ea896fc to b5571e7 Compare August 6, 2016 01:50
@mgsloan mgsloan merged commit b5571e7 into master Aug 6, 2016
@borsboom
Copy link
Contributor

borsboom commented Aug 7, 2016

Does this merge unblock making a new Stack release?

@Blaisorblade Blaisorblade deleted the 2296-versioned-store branch August 7, 2016 14:12
@mgsloan
Copy link
Contributor Author

mgsloan commented Aug 8, 2016

I believe so, yes. One of the nice things about this new Data.Store.Version stuff is it gives full control of the actual tag used for serialization, while still checking the structure hash. This means that we'll have full control of when the binary caches get invalidated.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants