Skip to content

Commit 4c79d57

Browse files
don't include propagated changes in the diff blob at all
1 parent 46500b8 commit 4c79d57

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

src/Share/NamespaceDiffs.hs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,6 @@ definitionDiffsToTree diff =
130130
expandedAliases,
131131
(diff.removed & Map.mapWithKey \n r -> Set.singleton $ Removed r n),
132132
(diff.updated & Map.mapWithKey \name (oldR, newR) -> Set.singleton $ Updated oldR newR name),
133-
(diff.propagated & Map.mapWithKey \name (oldR, newR) -> Set.singleton $ Propagated oldR newR name),
134133
expandedRenames
135134
]
136135
includeFQNs :: Map Name (Set (DefinitionDiffKind ref Name Name)) -> Map Name (Set (DefinitionDiff ref Name Name))

src/Share/Web/Share/Diffs/Impl.hs

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,11 @@ computeAndStoreCausalDiff authZReceipt old@(oldCodebase, _, oldCausalId) new@(ne
6464
Right diff -> NamespaceDiffs.NamespaceDiffResult'Ok diff
6565
Left err -> NamespaceDiffs.NamespaceDiffResult'Err err
6666
let encoded = Aeson.encode result
67-
ContributionQ.savePrecomputedNamespaceDiff
68-
(oldCodebase, oldCausalId)
69-
(newCodebase, newCausalId)
70-
(TL.toStrict $ TL.decodeUtf8 encoded)
67+
PG.transactionSpan "savePrecomputedNamespaceDiff" mempty do
68+
ContributionQ.savePrecomputedNamespaceDiff
69+
(oldCodebase, oldCausalId)
70+
(newCodebase, newCausalId)
71+
(TL.toStrict $ TL.decodeUtf8 encoded)
7172
pure (PreEncoded encoded)
7273

7374
tryComputeCausalDiff ::
@@ -188,7 +189,8 @@ tryComputeCausalDiff !_authZReceipt (oldCodebase, oldRuntime, oldCausalId) (newC
188189
-- relative to, unless there isn't an LCA (unlikely), in which case we fall back on the other branch (we won't have
189190
-- anything classified as an "update" in this case so it doesn't really matter).
190191

191-
let defns3 =
192+
let defns3 :: GNamespaceTreeDiff NameSegment (TermTag, ShortHash) (TypeTag, ShortHash) TermDefinition TypeDefinition TermDefinitionDiff TypeDefinitionDiff
193+
defns3 =
192194
defns2
193195
& NamespaceDiffs.namespaceTreeDiffTermDiffs_ %~ (\name -> (oldTermDefinitionsByName Map.! name, newTermDefinitionsByName Map.! name))
194196
& NamespaceDiffs.witherNamespaceTreeDiffTermDiffs (Identity . diffTermsPure)

0 commit comments

Comments
 (0)