Skip ChannelsMap storage on Marshal for the winning revision (it's stored elsewhere outside of the RevTree)

bbrks · bbrks · commit fa6d0edcec11 · 2023-09-13T14:16:26.000+01:00
diff --git a/db/revtree.go b/db/revtree.go
@@ -63,6 +63,8 @@ func (tree RevTree) MarshalJSON() ([]byte, error) {
 	}
 	revIndexes := map[string]int{"": -1}
 
+	winner, _, _ := tree.winningRevision()
+
 	i := 0
 	for _, info := range tree {
 		revIndexes[info.ID] = i
@@ -84,7 +86,7 @@ func (tree RevTree) MarshalJSON() ([]byte, error) {
 		}
 
 		// for non-winning leaf revisions we'll store channel information
-		if len(info.Channels) > 0 {
+		if winner != info.ID && len(info.Channels) > 0 {
 			if rep.ChannelsMap == nil {
 				rep.ChannelsMap = make(map[string]base.Set, 1)
 			}

Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,8 @@ func (tree RevTree) MarshalJSON() ([]byte, error) {`
`63`	`63`	`}`
`64`	`64`	`revIndexes := map[string]int{"": -1}`
`65`	`65`
	`66`	`+ winner, _, _ := tree.winningRevision()`
	`67`	`+`
`66`	`68`	`i := 0`
`67`	`69`	`for _, info := range tree {`
`68`	`70`	`revIndexes[info.ID] = i`
`@@ -84,7 +86,7 @@ func (tree RevTree) MarshalJSON() ([]byte, error) {`
`84`	`86`	`}`
`85`	`87`
`86`	`88`	`// for non-winning leaf revisions we'll store channel information`
`87`		`- if len(info.Channels) > 0 {`
	`89`	`+ if winner != info.ID && len(info.Channels) > 0 {`
`88`	`90`	`if rep.ChannelsMap == nil {`
`89`	`91`	`rep.ChannelsMap = make(map[string]base.Set, 1)`
`90`	`92`	`}`