Merge branch 'trunk' into fix/float-redundancy

.github/workflows/ci.yaml

@@ -60,8 +60,8 @@ jobs:
           # recent branch cache.
           # Then it will save a new cache at this commit sha, which should be used by
           # the next build on this branch.
-          key: stack-work-2_${{matrix.os}}-${{github.sha}}
-          restore-keys: stack-work-2_${{matrix.os}}
+          key: stack-work-3_${{matrix.os}}-${{github.sha}}
+          restore-keys: stack-work-3_${{matrix.os}}
 
       # Install stack by downloading the binary from GitHub. The installation process is different for Linux and macOS,
       # so this is split into two steps, only one of which will run on any particular build.

.github/workflows/pre-release.yaml

@@ -33,8 +33,8 @@ jobs:
           mkdir -p /tmp/ucm/ui
           UCM=$(stack path | awk '/local-install-root/{print $2}')/bin/unison
           cp $UCM /tmp/ucm/ucm
-          wget -O/tmp/ucm.zip https://github.com/unisonweb/codebase-ui/releases/download/latest/ucm.zip
-          unzip -d /tmp/ucm/ui /tmp/ucm.zip
+          wget -O/tmp/unisonLocal.zip https://github.com/unisonweb/codebase-ui/releases/download/latest/unisonLocal.zip
+          unzip -d /tmp/ucm/ui /tmp/unisonLocal.zip
           tar -c -z -f ucm-linux.tar.gz -C /tmp/ucm .
 
       - name: Upload linux artifact
@@ -72,8 +72,8 @@ jobs:
           mkdir -p /tmp/ucm/ui
           UCM=$(stack path | awk '/local-install-root/{print $2}')/bin/unison
           cp $UCM /tmp/ucm/ucm
-          wget -O/tmp/ucm.zip https://github.com/unisonweb/codebase-ui/releases/download/latest/ucm.zip
-          unzip -d /tmp/ucm/ui /tmp/ucm.zip
+          wget -O/tmp/unisonLocal.zip https://github.com/unisonweb/codebase-ui/releases/download/latest/unisonLocal.zip
+          unzip -d /tmp/ucm/ui /tmp/unisonLocal.zip
           tar -c -z -f ucm-macos.tar.gz -C /tmp/ucm .
 
       - name: Upload macos artifact

.github/workflows/release.yaml

@@ -6,23 +6,6 @@ on:
       - "release/*"
 
 jobs:
-  release:
-    name: "release"
-    runs-on: "ubuntu-latest"
-
-    strategy:
-      # Run each build to completion, regardless of if any have failed
-      fail-fast: false
-    steps:
-      - name: create-release
-        uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-        with:
-          if-no-files-found: error
-          name: build-linux
-          path: ucm-linux.tar.gz
-
   release:
     name: "create_release"
     runs-on: "ubuntu-latest"
@@ -53,3 +36,78 @@ jobs:
         with:
           files: /tmp/ucm/**/*.tar.gz
 
+  build_linux:
+
+    name: "build_linux"
+    runs-on: ubuntu-18.04
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: install stack
+        run: |
+          curl -L https://github.com/commercialhaskell/stack/releases/download/v2.5.1/stack-2.5.1-linux-x86_64.tar.gz | tar -xz
+          echo "$HOME/stack-2.5.1-linux-x86_64/" >> $GITHUB_PATH
+
+      # One of the transcripts fails if the user's git name hasn't been set.
+      - name: set git user info
+        run: |
+          git config --global user.name "GitHub Actions"
+          git config --global user.email "[email protected]"
+
+      - name: build
+        run: stack --no-terminal build --flag unison-parser-typechecker:optimized
+
+      - name: fetch latest codebase-ui and package with ucm
+        run: |
+          mkdir -p /tmp/ucm/ui
+          UCM=$(stack path | awk '/local-install-root/{print $2}')/bin/unison
+          cp $UCM /tmp/ucm/ucm
+          wget -O/tmp/unisonLocal.zip https://github.com/unisonweb/codebase-ui/releases/download/latest/unisonLocal.zip
+          unzip -d /tmp/ucm/ui /tmp/unisonLocal.zip
+          tar -c -z -f ucm-linux.tar.gz -C /tmp/ucm .
+
+      - name: Upload linux artifact
+        uses: actions/upload-artifact@v2
+        with:
+          if-no-files-found: error
+          name: build-linux
+          path: ucm-linux.tar.gz
+
+  build_macos:
+    name: "build_macos"
+    runs-on: macos-10.15
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: install stack
+        run: |
+          curl -L https://github.com/commercialhaskell/stack/releases/download/v2.5.1/stack-2.5.1-osx-x86_64.tar.gz | tar -xz
+          echo "$HOME/stack-2.5.1-osx-x86_64/" >> $GITHUB_PATH
+
+      # One of the transcripts fails if the user's git name hasn't been set.
+      - name: set git user info
+        run: |
+          git config --global user.name "GitHub Actions"
+          git config --global user.email "[email protected]"
+
+      - name: remove ~/.stack/setup-exe-cache on macOS
+        run: rm -rf ~/.stack/setup-exe-cache
+
+      - name: build
+        run: stack --no-terminal build --flag unison-parser-typechecker:optimized
+
+      - name: fetch latest codebase-ui and package with ucm
+        run: |
+          mkdir -p /tmp/ucm/ui
+          UCM=$(stack path | awk '/local-install-root/{print $2}')/bin/unison
+          cp $UCM /tmp/ucm/ucm
+          wget -O/tmp/unisonLocal.zip https://github.com/unisonweb/codebase-ui/releases/download/latest/unisonLocal.zip
+          unzip -d /tmp/ucm/ui /tmp/unisonLocal.zip
+          tar -c -z -f ucm-macos.tar.gz -C /tmp/ucm .
+
+      - name: Upload macos artifact
+        uses: actions/upload-artifact@v2
+        with:
+          if-no-files-found: error
+          name: build-macos
+          path: ucm-macos.tar.gz

.gitignore

@@ -13,3 +13,4 @@ dist-newstyle
 
 # GHC
 *.hie
+*.prof

CONTRIBUTORS.markdown

@@ -63,3 +63,7 @@ The format for this list: name, GitHub handle, and then optional blurb about wha
 * Alberto Flores (@albertoefguerrero)
 * Shawn Bachlet (@shawn-bachlet)
 * Solomon Bothwell (@solomon-b)
+* Sameer Kolhar (@kolharsam)
+* Nicole Prindle (@nprindle)
+* Harald Gliebe (@hagl)
+* Phil de Joux (@philderbeast)

codebase2/codebase-sqlite/U/Codebase/Sqlite/Branch/Diff.hs

@@ -1,3 +1,4 @@
+{- ORMOLU_DISABLE -} -- Remove this when the file is ready to be auto-formatted
 {-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE DeriveFunctor #-}
@@ -14,7 +15,7 @@ import U.Codebase.Reference (Reference')
 import U.Codebase.Referent (Referent')
 import U.Codebase.Sqlite.DbId (BranchObjectId, CausalHashId, ObjectId, PatchObjectId, TextId)
 import U.Codebase.Sqlite.LocalIds (LocalBranchChildId, LocalDefnId, LocalPatchObjectId, LocalTextId)
-import qualified U.Util.Map as Map
+import qualified Unison.Util.Map as Map
 import Data.Bifunctor (Bifunctor(bimap))
 import qualified Data.Set as Set
 

codebase2/codebase-sqlite/U/Codebase/Sqlite/Branch/Format.hs

@@ -1,25 +1,68 @@
-module U.Codebase.Sqlite.Branch.Format where
+{- ORMOLU_DISABLE -} -- Remove this when the file is ready to be auto-formatted
+module U.Codebase.Sqlite.Branch.Format
+  ( BranchFormat (..),
+    BranchLocalIds (..),
+    SyncBranchFormat (..),
+    localToDbBranch,
+    localToDbDiff,
+    -- dbToLocalDiff,
+  ) where
 
 import Data.Vector (Vector)
-import U.Codebase.Sqlite.Branch.Diff (LocalDiff)
-import U.Codebase.Sqlite.Branch.Full (LocalBranch)
-import U.Codebase.Sqlite.DbId (CausalHashId, BranchObjectId, ObjectId, PatchObjectId, TextId)
-import Data.ByteString (ByteString)
+import qualified Data.Vector as Vector
+import U.Codebase.Sqlite.Branch.Diff (Diff, LocalDiff)
+import qualified U.Codebase.Sqlite.Branch.Diff as Branch.Diff
+import U.Codebase.Sqlite.Branch.Full (DbBranch, LocalBranch)
+import qualified U.Codebase.Sqlite.Branch.Full as Branch.Full
+import U.Codebase.Sqlite.DbId (BranchObjectId, CausalHashId, ObjectId, PatchObjectId, TextId)
+import U.Codebase.Sqlite.LocalIds
+  ( LocalBranchChildId (..),
+    LocalDefnId (..),
+    LocalPatchObjectId (..),
+    LocalTextId (..),
+  )
+import Unison.Prelude
 
--- |you can use the exact same `BranchLocalIds` when converting between `Full` and `Diff`
+-- | A 'BranchFormat' is a deserialized namespace object (@object.bytes@).
+--
+-- you can use the exact same `BranchLocalIds` when converting between `Full` and `Diff`
 data BranchFormat
   = Full BranchLocalIds LocalBranch
   | Diff BranchObjectId BranchLocalIds LocalDiff
-  deriving Show
+  deriving (Show)
 
+-- | A 'BranchLocalIds' is a mapping between local ids (local to this object) encoded as offsets, and actual database ids.
+--
+-- For example, a @branchTextLookup@ vector of @[50, 74]@ means "local id 0 corresponds to database text id 50, and
+-- local id 1 corresponds to database text id 74".
 data BranchLocalIds = LocalIds
   { branchTextLookup :: Vector TextId,
     branchDefnLookup :: Vector ObjectId,
     branchPatchLookup :: Vector PatchObjectId,
     branchChildLookup :: Vector (BranchObjectId, CausalHashId)
   }
-  deriving Show
+  deriving (Show)
 
 data SyncBranchFormat
   = SyncFull BranchLocalIds ByteString
   | SyncDiff BranchObjectId BranchLocalIds ByteString
+
+localToDbBranch :: BranchLocalIds -> LocalBranch -> DbBranch
+localToDbBranch li =
+  Branch.Full.quadmap (lookupBranchLocalText li) (lookupBranchLocalDefn li) (lookupBranchLocalPatch li) (lookupBranchLocalChild li)
+
+localToDbDiff :: BranchLocalIds -> LocalDiff -> Diff
+localToDbDiff li =
+  Branch.Diff.quadmap (lookupBranchLocalText li) (lookupBranchLocalDefn li) (lookupBranchLocalPatch li) (lookupBranchLocalChild li)
+
+lookupBranchLocalText :: BranchLocalIds -> LocalTextId -> TextId
+lookupBranchLocalText li (LocalTextId w) = branchTextLookup li Vector.! fromIntegral w
+
+lookupBranchLocalDefn :: BranchLocalIds -> LocalDefnId -> ObjectId
+lookupBranchLocalDefn li (LocalDefnId w) = branchDefnLookup li Vector.! fromIntegral w
+
+lookupBranchLocalPatch :: BranchLocalIds -> LocalPatchObjectId -> PatchObjectId
+lookupBranchLocalPatch li (LocalPatchObjectId w) = branchPatchLookup li Vector.! fromIntegral w
+
+lookupBranchLocalChild :: BranchLocalIds -> LocalBranchChildId -> (BranchObjectId, CausalHashId)
+lookupBranchLocalChild li (LocalBranchChildId w) = branchChildLookup li Vector.! fromIntegral w

codebase2/codebase-sqlite/U/Codebase/Sqlite/Branch/Full.hs

@@ -1,20 +1,45 @@
+{- ORMOLU_DISABLE -} -- Remove this when the file is ready to be auto-formatted
+{-# LANGUAGE DataKinds #-}
+{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE RankNTypes #-}
+{-# LANGUAGE RecordWildCards #-}
 {-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE TypeApplications #-}
 
 module U.Codebase.Sqlite.Branch.Full where
 
-import Data.Map (Map)
-import Data.Set (Set)
+import Control.Lens
+import qualified Data.Set as Set
 import U.Codebase.Reference (Reference')
+import qualified U.Codebase.Reference as Reference
 import U.Codebase.Referent (Referent')
 import U.Codebase.Sqlite.DbId (BranchObjectId, CausalHashId, ObjectId, PatchObjectId, TextId)
 import U.Codebase.Sqlite.LocalIds (LocalBranchChildId, LocalDefnId, LocalPatchObjectId, LocalTextId)
-import qualified U.Util.Map as Map
-import Data.Bifunctor (Bifunctor(bimap))
-import qualified Data.Set as Set
+import qualified Unison.Util.Set as Set
+import Unison.Prelude
+import qualified Unison.Util.Map as Map
+import qualified Data.Map as Map
 
+-- |
+-- @
+-- Branch
+--   { terms :: Map LocalTextId (Map LocalReferent LocalMetadataSet),
+--     types :: Map LocalTextId (Map LocalReference LocalMetadataSet),
+--     patches :: Map LocalTextId LocalPatchObjectId,
+--     children :: Map LocalTextId LocalBranchChildId
+--   }
+-- @
 type LocalBranch = Branch' LocalTextId LocalDefnId LocalPatchObjectId LocalBranchChildId
 
+-- |
+-- @
+-- Branch
+--   { terms :: Map TextId (Map Referent DbMetadataSet),
+--     types :: Map TextId (Map Reference DbMetadataSet),
+--     patches :: Map TextId PatchObjectId,
+--     children :: Map TextId (BranchObjectId, CausalHashId)
+--   }
+-- @
 type DbBranch = Branch' TextId ObjectId PatchObjectId (BranchObjectId, CausalHashId)
 
 type Referent'' t h = Referent' (Reference' t h) (Reference' t h)
@@ -25,14 +50,38 @@ data Branch' t h p c = Branch
     patches :: Map t p,
     children :: Map t c
   }
-  deriving Show
+  deriving (Show, Generic)
+
+emptyBranch :: Branch' t h p c
+emptyBranch = Branch Map.empty Map.empty Map.empty Map.empty
+
+branchHashes_ :: (Ord h', Ord t, Ord h) => Traversal (Branch' t h p c) (Branch' t h' p c) h h'
+branchHashes_ f Branch {..} = do
+  newTerms <- for terms (Map.bitraversed both metadataSetFormatReferences_ . Reference.h_ %%~ f)
+  newTypes <- for types (Map.bitraversed id metadataSetFormatReferences_ . Reference.h_ %%~ f)
+  pure Branch {terms = newTerms, types = newTypes, patches, children}
+
+patches_ :: Traversal (Branch' t h p c) (Branch' t h p' c) p p'
+patches_ f Branch {..} = (\newPatches -> Branch terms types newPatches children) <$> traverse f patches
+
+childrenHashes_ :: Traversal (Branch' t h p c) (Branch' t h p c') c c'
+childrenHashes_ f Branch {..} = Branch terms types patches <$> traverse f children
+
+branchCausalHashes_ :: Traversal (Branch' t h p c) (Branch' t h p c') c c'
+branchCausalHashes_ f Branch {..} =
+  Branch terms types patches <$> traverse f children
 
 type LocalMetadataSet = MetadataSetFormat' LocalTextId LocalDefnId
 
 type DbMetadataSet = MetadataSetFormat' TextId ObjectId
 
 data MetadataSetFormat' t h = Inline (Set (Reference' t h))
-  deriving Show
+  deriving (Show)
+
+metadataSetFormatReferences_ ::
+  (Ord t, Ord h, Ord h') =>
+  Traversal (MetadataSetFormat' t h) (MetadataSetFormat' t h') (Reference' t h) (Reference' t h')
+metadataSetFormatReferences_ f (Inline refs) = Inline <$> Set.traverse f refs
 
 quadmap :: forall t h p c t' h' p' c'. (Ord t', Ord h') => (t -> t') -> (h -> h') -> (p -> p') -> (c -> c') -> Branch' t h p c -> Branch' t' h' p' c'
 quadmap ft fh fp fc (Branch terms types patches children) =

codebase2/codebase-sqlite/U/Codebase/Sqlite/Causal.hs

@@ -0,0 +1,42 @@
+{-# LANGUAGE RecordWildCards #-}
+
+module U.Codebase.Sqlite.Causal where
+
+import U.Codebase.Sqlite.DbId (BranchHashId, CausalHashId)
+import Unison.Prelude
+
+data GDbCausal causalHash valueHash = DbCausal
+  { selfHash :: causalHash,
+    valueHash :: valueHash,
+    parents :: Set causalHash
+  }
+
+-- Causal Plan
+-- * Load a DbCausal (how do we do this)
+-- => new function Queries.localCausalByCausalHashId, can model after loadCausalByCausalHash or factor out of
+-- * Add valueHashId as a dependency if unmigrated
+-- * Add parent causal hash ids as dependencies if unmigrated
+  -- => Queries.loadCausalParents
+-- * Map over Branch hash IDs
+-- * Inside saveDBCausal (new / factored out of original)
+--   * Save as a new self-hash
+--    ==> Queries.saveCausal
+--   * Map over parent causal hash IDs
+--    ==> Queries.saveCausalParents
+
+type DbCausal = GDbCausal CausalHashId BranchHashId
+
+-- causalHashes_ :: Traversal (GDbCausal ch vh) (GDbCausal ch' vh) ch ch'
+-- causalHashes_ f DbCausal {..} =
+--     DbCausal <$> f selfHash <*> pure valueHash <*> (fmap Set.fromList . traverse f . Set.toList $ parents)
+
+-- valueHashes_ :: Lens (GDbCausal ch vh) (GDbCausal ch vh) vh vh'
+-- valueHashes_ f DbCausal{..} =
+--     (\p vh -> DbCausal selfHash vh p) parents <$> f valueHash
+
+-- data Causal m hc he e = Causal
+--   { causalHash :: hc,
+--     valueHash :: he,
+--     parents :: Map hc (m (Causal m hc he e)),
+--     value :: m e
+--   }

codebase2/codebase-sqlite/U/Codebase/Sqlite/DbId.hs

@@ -1,3 +1,4 @@
+{- ORMOLU_DISABLE -} -- Remove this when the file is ready to be auto-formatted
 {-# LANGUAGE DerivingVia #-}
 {-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE PatternSynonyms #-}