Repository: kythe/kythe
Pull request #4153 (2019-10-21 20:54:40)

chore: Don't reuse proto field name


Patch:
diff --git a/kythe/go/platform/kzip/info/info.go b/kythe/go/platform/kzip/info/info.go
index badb9b848..9281dde7e 100644
--- a/kythe/go/platform/kzip/info/info.go
+++ b/kythe/go/platform/kzip/info/info.go
@@ -77,15 +77,15 @@ func KzipInfo(f kzip.File, scanOpts ...kzip.ScanOption) (*apb.KzipInfo, error) {
 // KzipInfoTotalCount returns the total CompilationUnits counts for infos split apart by language.
 func KzipInfoTotalCount(infos []*apb.KzipInfo) apb.KzipInfo_CorpusInfo {
 	totals := apb.KzipInfo_CorpusInfo{
-		Units: make(map[string]*apb.KzipInfo_CorpusInfo_CompilationUnits),
+		LanguageCompilationUnits: make(map[string]*apb.KzipInfo_CorpusInfo_CompilationUnits),
 	}
 	for _, info := range infos {
 		for _, i := range info.GetCorpora() {
-			for lang, stats := range i.GetUnits() {
-				langTotal := totals.Units[lang]
+			for lang, stats := range i.GetLanguageCompilationUnits() {
+				langTotal := totals.LanguageCompilationUnits[lang]
 				if langTotal == nil {
 					langTotal = &apb.KzipInfo_CorpusInfo_CompilationUnits{}
-					totals.Units[lang] = langTotal
+					totals.LanguageCompilationUnits[lang] = langTotal
 				}
 				langTotal.Count += stats.GetCount()
 				langTotal.Sources += stats.GetSources()
@@ -103,7 +103,7 @@ func MergeKzipInfo(infos []*apb.KzipInfo) *apb.KzipInfo {
 	for _, i := range infos {
 		for corpus, cinfo := range i.GetCorpora() {
 			mergedCorpInfo := corpusInfo(corpus, kzipInfo)
-			for lang, cu := range cinfo.GetUnits() {
+			for lang, cu := range cinfo.GetLanguageCompilationUnits() {
 				cui := cuLangInfo(lang, mergedCorpInfo)
 				cui.Count += cu.GetCount()
 				cui.Sources += cu.GetSources()
@@ -118,7 +118,7 @@ func corpusInfo(corpus string, kzipInfo *apb.KzipInfo) *apb.KzipInfo_CorpusInfo
 	i := kzipInfo.GetCorpora()[corpus]
 	if i == nil {
 		i = &apb.KzipInfo_CorpusInfo{
-			Units: make(map[string]*apb.KzipInfo_CorpusInfo_CompilationUnits),
+			LanguageCompilationUnits: make(map[string]*apb.KzipInfo_CorpusInfo_CompilationUnits),
 		}
 		kzipInfo.Corpora[corpus] = i
 	}
@@ -126,10 +126,10 @@ func corpusInfo(corpus string, kzipInfo *apb.KzipInfo) *apb.KzipInfo_CorpusInfo
 }
 
 func cuLangInfo(lang string, c *apb.KzipInfo_CorpusInfo) *apb.KzipInfo_CorpusInfo_CompilationUnits {
-	cui := c.Units[lang]
+	cui := c.LanguageCompilationUnits[lang]
 	if cui == nil {
 		cui = &apb.KzipInfo_CorpusInfo_CompilationUnits{}
-		c.Units[lang] = cui
+		c.LanguageCompilationUnits[lang] = cui
 	}
 	return cui
 }
diff --git a/kythe/proto/analysis.proto b/kythe/proto/analysis.proto
index b75fe47ae..917de393c 100644
--- a/kythe/proto/analysis.proto
+++ b/kythe/proto/analysis.proto
@@ -198,7 +198,7 @@ message KzipInfo {
 
     // Map from compilation unit language to stats about compilation units with
     // that language.
-    map<string, CompilationUnits> units = 3;
+    map<string, CompilationUnits> language_compilation_units = 3;
   }
 
   // Map from corpus name to corpus info.
diff --git a/kythe/proto/analysis_go_proto/analysis.pb.go b/kythe/proto/analysis_go_proto/analysis.pb.go
index 9c8de7d4d..f2f03ccff 100644
--- a/kythe/proto/analysis_go_proto/analysis.pb.go
+++ b/kythe/proto/analysis_go_proto/analysis.pb.go
@@ -460,10 +460,10 @@ func (m *KzipInfo) GetCorpora() map[string]*KzipInfo_CorpusInfo {
 }
 
 type KzipInfo_CorpusInfo struct {
-	Units                map[string]*KzipInfo_CorpusInfo_CompilationUnits `protobuf:"bytes,3,rep,name=units,proto3" json:"units,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	XXX_NoUnkeyedLiteral struct{}                                         `json:"-"`
-	XXX_unrecognized     []byte                                           `json:"-"`
-	XXX_sizecache        int32                                            `json:"-"`
+	LanguageCompilationUnits map[string]*KzipInfo_CorpusInfo_CompilationUnits `protobuf:"bytes,3,rep,name=language_compilation_units,json=languageCompilationUnits,proto3" json:"language_compilation_units,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
+	XXX_NoUnkeyedLiteral     struct{}                                         `json:"-"`
+	XXX_unrecognized         []byte                                           `json:"-"`
+	XXX_sizecache            int32                                            `json:"-"`
 }
 
 func (m *KzipInfo_CorpusInfo) Reset()         { *m = KzipInfo_CorpusInfo{} }
@@ -491,9 +491,9 @@ func (m *KzipInfo_CorpusInfo) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_KzipInfo_CorpusInfo proto.InternalMessageInfo
 
-func (m *KzipInfo_CorpusInfo) GetUnits() map[string]*KzipInfo_CorpusInfo_CompilationUnits {
+func (m *KzipInfo_CorpusInfo) GetLanguageCompilationUnits() map[string]*KzipInfo_CorpusInfo_CompilationUnits {
 	if m != nil {
-		return m.Units
+		return m.LanguageCompilationUnits
 	}
 	return nil
 }
@@ -838,7 +838,7 @@ func init() {
 	proto.RegisterType((*KzipInfo)(nil), "kythe.proto.KzipInfo")
 	proto.RegisterMapType((map[string]*KzipInfo_CorpusInfo)(nil), "kythe.proto.KzipInfo.CorporaEntry")
 	proto.RegisterType((*KzipInfo_CorpusInfo)(nil), "kythe.proto.KzipInfo.CorpusInfo")
-	proto.RegisterMapType((map[string]*KzipInfo_CorpusInfo_CompilationUnits)(nil), "kythe.proto.KzipInfo.CorpusInfo.UnitsEntry")
+	proto.RegisterMapType((map[string]*KzipInfo_CorpusInfo_CompilationUnits)(nil), "kythe.proto.KzipInfo.CorpusInfo.LanguageCompilationUnitsEntry")
 	proto.RegisterType((*KzipInfo_CorpusInfo_CompilationUnits)(nil), "kythe.proto.KzipInfo.CorpusInfo.CompilationUnits")
 	proto.RegisterType((*FilesRequest)(nil), "kythe.proto.FilesRequest")
 	proto.RegisterType((*FileInfo)(nil), "kythe.proto.FileInfo")
@@ -851,69 +851,70 @@ func init() {
 func init() { proto.RegisterFile("kythe/proto/analysis.proto", fileDescriptor_8e4ea7eca60afe48) }
 
 var fileDescriptor_8e4ea7eca60afe48 = []byte{
-	// 1009 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0xdd, 0x6e, 0x1b, 0x45,
-	0x1b, 0xfe, 0xd6, 0xf6, 0xda, 0xeb, 0xd7, 0x6e, 0xe2, 0xcc, 0x57, 0xd0, 0xd6, 0x14, 0xd5, 0x5a,
-	0x54, 0x48, 0x09, 0xda, 0x40, 0x90, 0x0a, 0x6a, 0x50, 0xa5, 0xfc, 0x18, 0xe4, 0xb4, 0x4d, 0x61,
-	0xd2, 0xf6, 0x00, 0x21, 0xad, 0x26, 0xde, 0xb1, 0x33, 0xca, 0x7a, 0xc6, 0x9d, 0x99, 0x35, 0x35,
-	0x37, 0xc2, 0x05, 0x70, 0x86, 0x38, 0x84, 0x9b, 0xe2, 0x0a, 0x38, 0x44, 0x33, 0xb3, 0x1b, 0xdb,
-	0x81, 0xa4, 0x2d, 0x47, 0xd9, 0xe7, 0xfd, 0xff, 0x79, 0x5e, 0x4f, 0xa0, 0x7b, 0x3e, 0xd7, 0x67,
-	0x74, 0x7b, 0x2a, 0x85, 0x16, 0xdb, 0x84, 0x93, 0x6c, 0xae, 0x98, 0x8a, 0x2d, 0x44, 0x2d, 0xab,
-	0x73, 0xa0, 0x7b, 0x6b, 0x2c, 0xc4, 0x38, 0x2b, 0x2c, 0x4f, 0xf3, 0xd1, 0x36, 0xe1, 0xf3, 0x52,
-	0xb5, 0x1c, 0x43, 0x69, 0x21, 0xc9, 0xb8, 0xf0, 0x8a, 0x7e, 0xf7, 0x60, 0x7d, 0xaf, 0x88, 0x8a,
-	0xe9, 0xcb, 0x9c, 0x2a, 0x8d, 0x1e, 0x42, 0x6b, 0x28, 0x26, 0x53, 0x96, 0x11, 0xcd, 0x04, 0x0f,
-	0xbd, 0x9e, 0xb7, 0xd9, 0xda, 0xb9, 0x1d, 0x2f, 0x25, 0x8b, 0x0f, 0x16, 0xfa, 0xe7, 0x9c, 0x69,
-	0xbc, 0xec, 0x80, 0x3e, 0x86, 0x8d, 0x11, 0xcb, 0x68, 0x92, 0x12, 0x4d, 0x12, 0x45, 0xe5, 0x8c,
-	0x0d, 0x69, 0x58, 0xe9, 0x79, 0x9b, 0x4d, 0xbc, 0x6e, 0x14, 0x87, 0x44, 0x93, 0x13, 0x27, 0x46,
-	0x5d, 0x08, 0x24, 0x9d, 0x31, 0x65, 0x12, 0x55, 0xad, 0xc9, 0x05, 0x46, 0xb7, 0x20, 0x38, 0xcd,
-	0x59, 0x96, 0x26, 0x2c, 0x0d, 0x6b, 0x56, 0xd7, 0xb0, 0x78, 0x90, 0x46, 0x23, 0x58, 0x2b, 0xab,
-	0x7e, 0x9a, 0xeb, 0x69, 0xae, 0xd1, 0x4d, 0xf0, 0x67, 0x24, 0xcb, 0xa9, 0x2d, 0xb7, 0x8d, 0x1d,
-	0x40, 0x0f, 0xa1, 0x3d, 0x62, 0x9c, 0x64, 0x89, 0xa4, 0x2a, 0xcf, 0x74, 0x08, 0xb6, 0x97, 0xf7,
-	0x56, 0x7a, 0x59, 0xb4, 0x6f, 0x4c, 0x70, 0xcb, 0x3a, 0x38, 0x10, 0xfd, 0xe2, 0x2d, 0x12, 0x39,
-	0x11, 0x7a, 0x00, 0x75, 0xa5, 0x89, 0xce, 0x95, 0xcd, 0xb4, 0xb6, 0x13, 0x5d, 0x13, 0x2c, 0x3e,
-	0xb1, 0x96, 0xb8, 0xf0, 0x40, 0x21, 0x34, 0x54, 0x3e, 0x99, 0x10, 0x39, 0x2f, 0xe6, 0x51, 0xc2,
-	0x68, 0x17, 0xea, 0xce, 0x16, 0xb5, 0x21, 0x38, 0x78, 0xfa, 0xe4, 0xdb, 0xc7, 0xfd, 0x67, 0xfd,
-	0xce, 0xff, 0xd0, 0x1a, 0xc0, 0xe0, 0xf8, 0x02, 0x7b, 0xe8, 0xff, 0xb0, 0x3e, 0x38, 0x7e, 0xb1,
-	0xf7, 0x78, 0x70, 0x98, 0xe0, 0xfe, 0x77, 0xcf, 0xfb, 0x27, 0xcf, 0x3a, 0x95, 0xe8, 0x37, 0x1f,
-	0xd6, 0x2f, 0x6d, 0x04, 0xdd, 0x83, 0xfa, 0x2c, 0xe1, 0x64, 0x42, 0x8b, 0xfd, 0xa1, 0x95, 0x32,
-	0x5f, 0x1c, 0x93, 0x09, 0xc5, 0xfe, 0xcc, 0xfc, 0x41, 0x4f, 0x60, 0x4d, 0xd2, 0x97, 0x39, 0x93,
-	0x34, 0x4d, 0x18, 0x9f, 0xe6, 0x3a, 0xac, 0xf6, 0xaa, 0x9b, 0xad, 0x9d, 0x0f, 0xaf, 0x5b, 0x79,
-	0xfc, 0x35, 0xcb, 0xe8, 0xc0, 0x58, 0xe3, 0x1b, 0xa5, 0xb7, 0x85, 0xe8, 0x13, 0x40, 0x67, 0x44,
-	0x25, 0x8e, 0x11, 0x34, 0xa1, 0x52, 0x0a, 0xa9, 0xec, 0x02, 0x03, 0xdc, 0x39, 0x23, 0xca, 0x05,
-	0xa2, 0x7d, 0x2b, 0x37, 0x04, 0x20, 0x72, 0x9c, 0x4f, 0x28, 0xd7, 0xa1, 0xdf, 0xab, 0x1a, 0x02,
-	0x94, 0x18, 0xdd, 0x81, 0x96, 0x12, 0xb9, 0x1c, 0xd2, 0xc4, 0xd0, 0x26, 0xac, 0x5b, 0x35, 0x38,
-	0x91, 0x49, 0x8f, 0xde, 0x07, 0x10, 0x76, 0xfd, 0xc9, 0x39, 0x9d, 0x87, 0x0d, 0x3b, 0xd2, 0xa6,
-	0x93, 0x3c, 0xa2, 0x73, 0xb4, 0x05, 0x1b, 0x3f, 0x0a, 0x79, 0xce, 0xf8, 0x38, 0x49, 0x99, 0xa4,
-	0x43, 0x2d, 0xe4, 0x3c, 0x0c, 0xac, 0x55, 0xa7, 0x50, 0x1c, 0x96, 0x72, 0xf4, 0x01, 0xdc, 0xa0,
-	0x5c, 0xcb, 0x79, 0x32, 0x14, 0x5c, 0xd3, 0x57, 0x3a, 0x6c, 0x5a, 0xc3, 0xb6, 0x15, 0x1e, 0x38,
-	0x19, 0xda, 0x87, 0x16, 0xe5, 0x33, 0x26, 0x05, 0xb7, 0x05, 0x83, 0x9d, 0x53, 0xef, 0xda, 0x39,
-	0xf5, 0xf9, 0x0c, 0x2f, 0x3b, 0xa1, 0x18, 0x1a, 0x29, 0xd5, 0x84, 0x65, 0x2a, 0x6c, 0x59, 0xff,
-	0x9b, 0xb1, 0x3b, 0xdd, 0xb8, 0x3c, 0xdd, 0x78, 0x8f, 0xcf, 0x71, 0x69, 0xd4, 0xfd, 0xd9, 0x83,
-	0xe6, 0xc5, 0xb0, 0xdf, 0x66, 0xaf, 0xf7, 0xa0, 0xc6, 0xf8, 0x48, 0x58, 0xaa, 0xb5, 0x76, 0xde,
-	0x59, 0x31, 0x74, 0x01, 0x47, 0x02, 0x5b, 0x93, 0xe5, 0x9a, 0x6a, 0x6f, 0x50, 0xd3, 0x51, 0x2d,
-	0xa8, 0x76, 0x6a, 0xdd, 0x6d, 0xa8, 0xf6, 0xf9, 0x0c, 0x21, 0xa8, 0x5d, 0x14, 0xd4, 0xc4, 0xf6,
-	0x7b, 0x71, 0x8e, 0x8e, 0xe7, 0x0e, 0x1c, 0xd5, 0x82, 0x4a, 0xa7, 0x1a, 0xfd, 0x59, 0x85, 0xe0,
-	0xd1, 0x4f, 0x6c, 0x6a, 0xf2, 0xa3, 0xaf, 0xa0, 0x31, 0x14, 0x72, 0x2a, 0x24, 0x09, 0x3d, 0x9b,
-	0x79, 0xf5, 0x9e, 0x4a, 0xbb, 0xf8, 0xc0, 0x19, 0xf5, 0xcd, 0x36, 0x70, 0xe9, 0xd2, 0xfd, 0xa3,
-	0x02, 0x60, 0x34, 0xb9, 0xb2, 0xc1, 0xf6, 0xc0, 0xcf, 0x39, 0xd3, 0xaa, 0x20, 0xf0, 0xd6, 0xd5,
-	0xa1, 0x9c, 0x43, 0x6c, 0x36, 0xa4, 0x5c, 0x4c, 0xe7, 0xd9, 0x3d, 0x87, 0xce, 0xa5, 0x0d, 0x2a,
-	0xd3, 0xcc, 0x50, 0xe4, 0x5c, 0xdb, 0x0e, 0x7d, 0xec, 0x80, 0x3d, 0x66, 0x4b, 0x45, 0x65, 0x9b,
-	0xf4, 0x71, 0x09, 0xd1, 0x47, 0xb0, 0xbe, 0x7a, 0x50, 0xca, 0xfe, 0xb6, 0xf9, 0x78, 0x6d, 0xe5,
-	0x52, 0x4c, 0x32, 0x58, 0x54, 0x80, 0x3a, 0x50, 0x35, 0x34, 0x76, 0x63, 0x34, 0x9f, 0xe8, 0x9b,
-	0xe5, 0x29, 0xb6, 0x76, 0x3e, 0x7b, 0x6d, 0x3f, 0x97, 0x4b, 0x2f, 0x06, 0xff, 0xa0, 0xf2, 0xa5,
-	0x77, 0x54, 0x0b, 0xbc, 0x4e, 0xc5, 0xad, 0xa0, 0xfb, 0x03, 0xb4, 0x97, 0x07, 0xfa, 0x2f, 0xa9,
-	0xef, 0xaf, 0xa6, 0xee, 0xbd, 0x2e, 0xf5, 0x6a, 0xa6, 0x4a, 0xa7, 0xea, 0x38, 0x12, 0xed, 0x42,
-	0xdb, 0x70, 0xed, 0xe2, 0x71, 0xd9, 0x02, 0xdf, 0x1c, 0xb3, 0x2a, 0xb6, 0x7d, 0x05, 0x2b, 0x9d,
-	0x4d, 0x74, 0x1f, 0x82, 0x52, 0x64, 0x58, 0x36, 0x25, 0xfa, 0xac, 0x64, 0x99, 0xf9, 0x46, 0xef,
-	0x42, 0x3d, 0x65, 0x63, 0xaa, 0x74, 0x41, 0xb3, 0x02, 0x45, 0xcc, 0xf9, 0x99, 0x87, 0xc6, 0xac,
-	0xc9, 0x5e, 0x74, 0xb1, 0xbe, 0x36, 0x2e, 0xe1, 0xdb, 0xdc, 0x47, 0x08, 0x8d, 0x09, 0x53, 0x8a,
-	0xf1, 0xb1, 0xdd, 0x64, 0x80, 0x4b, 0x18, 0x49, 0xd8, 0x58, 0x1a, 0xfa, 0x7e, 0xce, 0xd3, 0x8c,
-	0xa2, 0x4f, 0xa1, 0x66, 0xd8, 0xf4, 0x46, 0x4f, 0xa7, 0xb5, 0x5c, 0x8c, 0xa5, 0x72, 0xc5, 0x58,
-	0x4c, 0x2f, 0xe5, 0x58, 0x7e, 0xf5, 0x00, 0x0d, 0x78, 0x4a, 0x5f, 0xd1, 0x74, 0x29, 0xda, 0x7f,
-	0xc8, 0xba, 0x0b, 0x3e, 0x33, 0x71, 0x8a, 0x11, 0xdc, 0x5d, 0x71, 0xf9, 0x67, 0x06, 0x27, 0xc2,
-	0xce, 0xa7, 0x7b, 0x17, 0x7c, 0x8b, 0xd1, 0x6d, 0x68, 0x96, 0x6f, 0xb6, 0x5b, 0x6b, 0x13, 0x2f,
-	0x04, 0xfb, 0x5f, 0xc0, 0x9d, 0xa1, 0x98, 0x94, 0x3f, 0x27, 0x29, 0x9d, 0x69, 0x21, 0x32, 0xb5,
-	0x9c, 0xe9, 0xfb, 0x8d, 0xf2, 0xff, 0x9a, 0x64, 0x2c, 0x12, 0x2b, 0xfa, 0xcb, 0xf3, 0x4e, 0xeb,
-	0xf6, 0xeb, 0xf3, 0xbf, 0x03, 0x00, 0x00, 0xff, 0xff, 0x08, 0x53, 0x03, 0x4b, 0x02, 0x09, 0x00,
-	0x00,
+	// 1029 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0x4d, 0x6f, 0x1b, 0x45,
+	0x18, 0x66, 0xfd, 0xb9, 0x7e, 0xed, 0x26, 0xce, 0x50, 0xd0, 0x76, 0x69, 0x55, 0x6b, 0x51, 0xa1,
+	0xa5, 0x68, 0x03, 0x41, 0x2a, 0xa8, 0x41, 0x91, 0xf2, 0x61, 0x90, 0xd3, 0x34, 0x85, 0x49, 0xdb,
+	0x03, 0x42, 0x5a, 0x4d, 0xbc, 0x63, 0x67, 0x94, 0xf5, 0x8c, 0xbb, 0x33, 0x6b, 0x6a, 0x84, 0xb8,
+	0xf0, 0x23, 0xf8, 0x01, 0xdc, 0x10, 0x47, 0x0e, 0xfc, 0x34, 0x8e, 0x68, 0x66, 0x76, 0xed, 0x75,
+	0x20, 0x69, 0xcb, 0xc9, 0xfb, 0xbc, 0x9f, 0xb3, 0xef, 0xf3, 0xbc, 0xb3, 0x06, 0xff, 0x7c, 0xae,
+	0xce, 0xe8, 0xe6, 0x34, 0x15, 0x4a, 0x6c, 0x12, 0x4e, 0x92, 0xb9, 0x64, 0x32, 0x34, 0x10, 0xb5,
+	0x8d, 0xcf, 0x02, 0xff, 0xc6, 0x58, 0x88, 0x71, 0x92, 0x47, 0x9e, 0x66, 0xa3, 0x4d, 0xc2, 0xe7,
+	0x85, 0xab, 0x5c, 0x43, 0x2a, 0x91, 0x92, 0x71, 0x9e, 0x15, 0xfc, 0xe9, 0xc0, 0xfa, 0x6e, 0x5e,
+	0x15, 0xd3, 0x17, 0x19, 0x95, 0x0a, 0xed, 0x40, 0x7b, 0x28, 0x26, 0x53, 0x96, 0x10, 0xc5, 0x04,
+	0xf7, 0x9c, 0x9e, 0x73, 0xb7, 0xbd, 0x75, 0x33, 0x2c, 0x35, 0x0b, 0xf7, 0x97, 0xfe, 0x67, 0x9c,
+	0x29, 0x5c, 0x4e, 0x40, 0x1f, 0xc1, 0xc6, 0x88, 0x25, 0x34, 0x8a, 0x89, 0x22, 0x91, 0xa4, 0xe9,
+	0x8c, 0x0d, 0xa9, 0x57, 0xe9, 0x39, 0x77, 0x5b, 0x78, 0x5d, 0x3b, 0x0e, 0x88, 0x22, 0x27, 0xd6,
+	0x8c, 0x7c, 0x70, 0x53, 0x3a, 0x63, 0x52, 0x37, 0xaa, 0x9a, 0x90, 0x05, 0x46, 0x37, 0xc0, 0x3d,
+	0xcd, 0x58, 0x12, 0x47, 0x2c, 0xf6, 0x6a, 0xc6, 0xd7, 0x34, 0x78, 0x10, 0x07, 0x23, 0x58, 0x2b,
+	0x4e, 0xfd, 0x24, 0x53, 0xd3, 0x4c, 0xa1, 0xeb, 0x50, 0x9f, 0x91, 0x24, 0xa3, 0xe6, 0xb8, 0x1d,
+	0x6c, 0x01, 0xda, 0x81, 0xce, 0x88, 0x71, 0x92, 0x44, 0x29, 0x95, 0x59, 0xa2, 0x3c, 0x30, 0xef,
+	0xf2, 0xde, 0xca, 0xbb, 0x2c, 0x5f, 0x5f, 0x87, 0xe0, 0xb6, 0x49, 0xb0, 0x20, 0xf8, 0xcd, 0x59,
+	0x36, 0xb2, 0x26, 0xf4, 0x10, 0x1a, 0x52, 0x11, 0x95, 0x49, 0xd3, 0x69, 0x6d, 0x2b, 0xb8, 0xa2,
+	0x58, 0x78, 0x62, 0x22, 0x71, 0x9e, 0x81, 0x3c, 0x68, 0xca, 0x6c, 0x32, 0x21, 0xe9, 0x3c, 0x9f,
+	0x47, 0x01, 0x83, 0x6d, 0x68, 0xd8, 0x58, 0xd4, 0x01, 0x77, 0xff, 0xc9, 0xe3, 0x6f, 0x8e, 0xfa,
+	0x4f, 0xfb, 0xdd, 0xb7, 0xd0, 0x1a, 0xc0, 0xe0, 0x78, 0x81, 0x1d, 0xf4, 0x36, 0xac, 0x0f, 0x8e,
+	0x9f, 0xef, 0x1e, 0x0d, 0x0e, 0x22, 0xdc, 0xff, 0xf6, 0x59, 0xff, 0xe4, 0x69, 0xb7, 0x12, 0xfc,
+	0x51, 0x87, 0xf5, 0x0b, 0x8c, 0xa0, 0x7b, 0xd0, 0x98, 0x45, 0x9c, 0x4c, 0x68, 0xce, 0x1f, 0x5a,
+	0x39, 0xe6, 0xf3, 0x63, 0x32, 0xa1, 0xb8, 0x3e, 0xd3, 0x3f, 0xe8, 0x31, 0xac, 0xa5, 0xf4, 0x45,
+	0xc6, 0x52, 0x1a, 0x47, 0x8c, 0x4f, 0x33, 0xe5, 0x55, 0x7b, 0xd5, 0xbb, 0xed, 0xad, 0x0f, 0xae,
+	0xa2, 0x3c, 0xfc, 0x8a, 0x25, 0x74, 0xa0, 0xa3, 0xf1, 0xb5, 0x22, 0xdb, 0x40, 0xf4, 0x31, 0xa0,
+	0x33, 0x22, 0x23, 0xab, 0x08, 0x1a, 0xd1, 0x34, 0x15, 0xa9, 0x34, 0x04, 0xba, 0xb8, 0x7b, 0x46,
+	0xa4, 0x2d, 0x44, 0xfb, 0xc6, 0xae, 0x05, 0x40, 0xd2, 0x71, 0x36, 0xa1, 0x5c, 0x79, 0xf5, 0x5e,
+	0x55, 0x0b, 0xa0, 0xc0, 0xe8, 0x36, 0xb4, 0xa5, 0xc8, 0xd2, 0x21, 0x8d, 0xb4, 0x6c, 0xbc, 0x86,
+	0x71, 0x83, 0x35, 0xe9, 0xf6, 0xe8, 0x16, 0x80, 0x30, 0xf4, 0x47, 0xe7, 0x74, 0xee, 0x35, 0xcd,
+	0x48, 0x5b, 0xd6, 0xf2, 0x88, 0xce, 0xd1, 0x7d, 0xd8, 0xf8, 0x41, 0xa4, 0xe7, 0x8c, 0x8f, 0xa3,
+	0x98, 0xa5, 0x74, 0xa8, 0x44, 0x3a, 0xf7, 0x5c, 0x13, 0xd5, 0xcd, 0x1d, 0x07, 0x85, 0x1d, 0xbd,
+	0x0f, 0xd7, 0x28, 0x57, 0xe9, 0x3c, 0x1a, 0x0a, 0xae, 0xe8, 0x4b, 0xe5, 0xb5, 0x4c, 0x60, 0xc7,
+	0x18, 0xf7, 0xad, 0x0d, 0xed, 0x41, 0x9b, 0xf2, 0x19, 0x4b, 0x05, 0x37, 0x07, 0x06, 0x33, 0xa7,
+	0xde, 0x95, 0x73, 0xea, 0xf3, 0x19, 0x2e, 0x27, 0xa1, 0x10, 0x9a, 0x31, 0x55, 0x84, 0x25, 0xd2,
+	0x6b, 0x9b, 0xfc, 0xeb, 0xa1, 0x5d, 0xdd, 0xb0, 0x58, 0xdd, 0x70, 0x97, 0xcf, 0x71, 0x11, 0xe4,
+	0xff, 0xea, 0x40, 0x6b, 0x31, 0xec, 0x37, 0xe1, 0xf5, 0x1e, 0xd4, 0x18, 0x1f, 0x09, 0x23, 0xb5,
+	0xf6, 0xd6, 0x3b, 0x2b, 0x81, 0xb6, 0xe0, 0x48, 0x60, 0x13, 0x52, 0x3e, 0x53, 0xed, 0x35, 0xce,
+	0x74, 0x58, 0x73, 0xab, 0xdd, 0x9a, 0xbf, 0x09, 0xd5, 0x3e, 0x9f, 0x21, 0x04, 0xb5, 0xc5, 0x81,
+	0x5a, 0xd8, 0x3c, 0x2f, 0xd7, 0xd1, 0xea, 0xdc, 0x82, 0xc3, 0x9a, 0x5b, 0xe9, 0x56, 0x83, 0xbf,
+	0x6a, 0xe0, 0x3e, 0xfa, 0x91, 0x4d, 0x75, 0x7f, 0xf4, 0x25, 0x34, 0x87, 0x22, 0x9d, 0x8a, 0x94,
+	0x78, 0x8e, 0xe9, 0xbc, 0xba, 0x4f, 0x45, 0x5c, 0xb8, 0x6f, 0x83, 0xfa, 0x9a, 0x0d, 0x5c, 0xa4,
+	0xf8, 0xbf, 0x54, 0x01, 0xb4, 0x27, 0x93, 0xa6, 0xd8, 0x4f, 0xe0, 0x27, 0x84, 0x8f, 0x33, 0x32,
+	0xa6, 0x51, 0xe9, 0x46, 0x8a, 0x32, 0xce, 0x94, 0xcc, 0x55, 0xbd, 0x73, 0x79, 0x7d, 0x5b, 0x25,
+	0x3c, 0xca, 0x4b, 0x5c, 0x60, 0x52, 0xda, 0xde, 0x5e, 0x72, 0x89, 0xdb, 0x3f, 0x87, 0xee, 0x45,
+	0x9b, 0x9e, 0xc3, 0x50, 0x64, 0x5c, 0x99, 0xe1, 0xd4, 0xb1, 0x05, 0xe6, 0x1e, 0x30, 0x2a, 0x96,
+	0x66, 0x3e, 0x75, 0x5c, 0x40, 0xf4, 0x21, 0xac, 0xaf, 0xee, 0xa2, 0x34, 0xd7, 0x62, 0x1d, 0xaf,
+	0xad, 0x2c, 0x99, 0xf4, 0x7f, 0x86, 0x5b, 0x57, 0x9e, 0x13, 0x75, 0xa1, 0xaa, 0x97, 0xc2, 0x92,
+	0xa2, 0x1f, 0xd1, 0xd7, 0x65, 0x4e, 0xda, 0x5b, 0x9f, 0xbe, 0x72, 0x10, 0x17, 0x0b, 0xe7, 0x34,
+	0x3e, 0xac, 0x7c, 0xe1, 0x1c, 0xd6, 0x5c, 0xa7, 0x5b, 0xb1, 0x84, 0xfa, 0xdf, 0x43, 0xa7, 0x4c,
+	0xcf, 0x7f, 0xb4, 0x7e, 0xb0, 0xda, 0xba, 0xf7, 0xaa, 0xd6, 0xab, 0x9d, 0x2a, 0xdd, 0xaa, 0x55,
+	0x5c, 0xb0, 0x0d, 0x1d, 0xad, 0xdc, 0xc5, 0xa7, 0xea, 0x3e, 0xd4, 0xf5, 0xd5, 0x20, 0x73, 0xed,
+	0x5c, 0xa2, 0x71, 0x1b, 0x13, 0x3c, 0x00, 0xb7, 0x30, 0x69, 0xcd, 0x4e, 0x89, 0x3a, 0x2b, 0x34,
+	0xab, 0x9f, 0xd1, 0xbb, 0xd0, 0x88, 0xd9, 0x98, 0x4a, 0x95, 0x8b, 0x36, 0x47, 0x01, 0xb3, 0x79,
+	0xfa, 0xb3, 0xa5, 0x99, 0x33, 0xf7, 0x43, 0xce, 0x68, 0x07, 0x17, 0xf0, 0x4d, 0xb6, 0xcd, 0x83,
+	0xe6, 0x84, 0x49, 0xc9, 0xf8, 0xd8, 0x90, 0xeb, 0xe2, 0x02, 0x06, 0x29, 0x6c, 0x94, 0x86, 0xbe,
+	0x97, 0xf1, 0x38, 0xa1, 0xe8, 0x13, 0xa8, 0x69, 0x01, 0xbf, 0xd6, 0x87, 0xd8, 0x44, 0x2e, 0xc7,
+	0x52, 0xb9, 0x64, 0x2c, 0xfa, 0x5d, 0x8a, 0xb1, 0xfc, 0xee, 0x00, 0x1a, 0xf0, 0x98, 0xbe, 0xa4,
+	0x71, 0xa9, 0xda, 0xff, 0xe8, 0xba, 0x0d, 0x75, 0xa6, 0xeb, 0xe4, 0x23, 0xb8, 0xb3, 0x92, 0xf2,
+	0xef, 0x0e, 0xd6, 0x84, 0x6d, 0x8e, 0x7f, 0x07, 0xea, 0x06, 0xa3, 0x9b, 0xd0, 0x2a, 0xfe, 0x01,
+	0x58, 0x5a, 0x5b, 0x78, 0x69, 0xd8, 0xfb, 0x1c, 0x6e, 0x0f, 0xc5, 0xa4, 0xb8, 0x9c, 0x62, 0x3a,
+	0x53, 0x42, 0x24, 0xb2, 0xdc, 0xe9, 0xbb, 0x8d, 0xe2, 0x5f, 0x52, 0x34, 0x16, 0x91, 0x31, 0xfd,
+	0xed, 0x38, 0xa7, 0x0d, 0xf3, 0xf4, 0xd9, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xbc, 0x06, 0x68,
+	0xbc, 0x50, 0x09, 0x00, 0x00,
 }


Test patch:
diff --git a/kythe/go/platform/kzip/info/info_test.go b/kythe/go/platform/kzip/info/info_test.go
index c5432a040..cef1a3ba0 100644
--- a/kythe/go/platform/kzip/info/info_test.go
+++ b/kythe/go/platform/kzip/info/info_test.go
@@ -29,7 +29,7 @@ func TestMergeKzipInfo(t *testing.T) {
 		{
 			Corpora: map[string]*apb.KzipInfo_CorpusInfo{
 				"corpus1": {
-					Units: map[string]*apb.KzipInfo_CorpusInfo_CompilationUnits{
+					LanguageCompilationUnits: map[string]*apb.KzipInfo_CorpusInfo_CompilationUnits{
 						"python": {
 							Count:          1,
 							Sources:        1,
@@ -42,7 +42,7 @@ func TestMergeKzipInfo(t *testing.T) {
 		{
 			Corpora: map[string]*apb.KzipInfo_CorpusInfo{
 				"corpus1": {
-					Units: map[string]*apb.KzipInfo_CorpusInfo_CompilationUnits{
+					LanguageCompilationUnits: map[string]*apb.KzipInfo_CorpusInfo_CompilationUnits{
 						"python": {
 							Count:          1,
 							Sources:        0,
@@ -56,7 +56,7 @@ func TestMergeKzipInfo(t *testing.T) {
 					},
 				},
 				"corpus2": {
-					Units: map[string]*apb.KzipInfo_CorpusInfo_CompilationUnits{
+					LanguageCompilationUnits: map[string]*apb.KzipInfo_CorpusInfo_CompilationUnits{
 						"python": {
 							Count:          4,
 							Sources:        5,
@@ -76,7 +76,7 @@ func TestMergeKzipInfo(t *testing.T) {
 	want := &apb.KzipInfo{
 		Corpora: map[string]*apb.KzipInfo_CorpusInfo{
 			"corpus1": {
-				Units: map[string]*apb.KzipInfo_CorpusInfo_CompilationUnits{
+				LanguageCompilationUnits: map[string]*apb.KzipInfo_CorpusInfo_CompilationUnits{
 					"python": {
 						Count:          2,
 						Sources:        1,
@@ -90,7 +90,7 @@ func TestMergeKzipInfo(t *testing.T) {
 				},
 			},
 			"corpus2": {
-				Units: map[string]*apb.KzipInfo_CorpusInfo_CompilationUnits{
+				LanguageCompilationUnits: map[string]*apb.KzipInfo_CorpusInfo_CompilationUnits{
 					"python": {
 						Count:          4,
 						Sources:        5,
@@ -106,7 +106,7 @@ func TestMergeKzipInfo(t *testing.T) {
 		},
 	}
 	wantTotal := apb.KzipInfo_CorpusInfo{
-		Units: map[string]*apb.KzipInfo_CorpusInfo_CompilationUnits{
+		LanguageCompilationUnits: map[string]*apb.KzipInfo_CorpusInfo_CompilationUnits{
 			"python": {
 				Count:          6,
 				Sources:        6,