Merge pull request #1487 from benbjohnson/proto-keys

codysoyland · web-flow · commit f50685d94c66 · 2018-07-11T14:19:03.000-05:00
encoding/proto: Fix key fields in protobuf.
diff --git a/encoding/proto/proto.go b/encoding/proto/proto.go
@@ -961,6 +961,7 @@ func encodeColumnAttrSets(a []*pilosa.ColumnAttrSet) []*internal.ColumnAttrSet {
 func encodeColumnAttrSet(set *pilosa.ColumnAttrSet) *internal.ColumnAttrSet {
 	return &internal.ColumnAttrSet{
 		ID:    set.ID,
+		Key:   set.Key,
 		Attrs: encodeAttrs(set.Attrs),
 	}
 }
@@ -972,6 +973,7 @@ func encodeRow(r *pilosa.Row) *internal.Row {
 
 	return &internal.Row{
 		Columns: r.Columns(),
+		Keys:    r.Keys,
 		Attrs:   encodeAttrs(r.Attrs),
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -961,6 +961,7 @@ func encodeColumnAttrSets(a []pilosa.ColumnAttrSet) []internal.ColumnAttrSet {`
`961`	`961`	`func encodeColumnAttrSet(set pilosa.ColumnAttrSet) internal.ColumnAttrSet {`
`962`	`962`	`return &internal.ColumnAttrSet{`
`963`	`963`	`ID: set.ID,`
	`964`	`+ Key: set.Key,`
`964`	`965`	`Attrs: encodeAttrs(set.Attrs),`
`965`	`966`	`}`
`966`	`967`	`}`
`@@ -972,6 +973,7 @@ func encodeRow(r pilosa.Row) internal.Row {`
`972`	`973`
`973`	`974`	`return &internal.Row{`
`974`	`975`	`Columns: r.Columns(),`
	`976`	`+ Keys: r.Keys,`
`975`	`977`	`Attrs: encodeAttrs(r.Attrs),`
`976`	`978`	`}`
`977`	`979`	`}`