feat(columnar): support build_config filtering of columnar decorations (

#3450)

kythe/go/serving/pipeline/beam_integration_test.go

@@ -96,6 +96,9 @@ func TestServingSimpleDecorations(t *testing.T) {
 		}, {
 			Name:  &scpb.Fact_KytheName{scpb.FactName_LOC_END},
 			Value: []byte("9"),
+		}, {
+			Name:  &scpb.Fact_KytheName{scpb.FactName_BUILD_CONFIG},
+			Value: []byte("test-build-config"),
 		}},
 		Edge: []*scpb.Edge{{
 			Kind:   &scpb.Edge_KytheKind{scpb.EdgeKind_REF},
@@ -202,6 +205,7 @@ func TestServingSimpleDecorations(t *testing.T) {
 					LineNumber:   1,
 				},
 			},
+			BuildConfig:  "test-build-config",
 			Kind:         "/kythe/edge/ref",
 			TargetTicket: "kythe:#decorWithDef",
 			// TargetDefinition: explicitly not requested
@@ -242,6 +246,7 @@ func TestServingSimpleDecorations(t *testing.T) {
 					LineNumber:   1,
 				},
 			},
+			BuildConfig:  "test-build-config",
 			Kind:         "/kythe/edge/ref",
 			TargetTicket: "kythe:#decorWithDef",
 			// TargetDefinition: explicitly not requested
@@ -288,6 +293,7 @@ func TestServingSimpleDecorations(t *testing.T) {
 					LineNumber:   1,
 				},
 			},
+			BuildConfig:      "test-build-config",
 			Kind:             "/kythe/edge/ref",
 			TargetTicket:     "kythe:#decorWithDef",
 			TargetDefinition: "kythe:#def1", // expected definition

kythe/go/serving/pipeline/encoding.go

@@ -136,6 +136,7 @@ func encodeDecorRef(file *spb.VName, ref *ppb.Reference, emit func([]byte, []byt
 	target := &xspb.FileDecorations_Target{
 		StartOffset: ref.Anchor.Span.Start.ByteOffset,
 		EndOffset:   ref.Anchor.Span.End.ByteOffset,
+		BuildConfig: ref.Anchor.BuildConfiguration,
 		Target:      ref.Source,
 	}
 	if k := ref.GetGenericKind(); k != "" {

kythe/go/serving/xrefs/columnar.go

@@ -124,6 +124,7 @@ func (c *ColumnarTable) Decorations(ctx context.Context, req *xpb.DecorationsReq
 	var norm *span.Normalizer                                          // span normalizer for references
 	refsByTarget := make(map[string][]*xpb.DecorationsReply_Reference) // target -> set<Reference>
 	defs := stringset.New()                                            // set<needed definition tickets>
+	buildConfigs := stringset.New(req.BuildConfig...)
 	patterns := xrefs.ConvertFilters(req.Filter)
 	emitSnippets := req.Snippets != xpb.SnippetsKind_NONE
 
@@ -168,12 +169,17 @@ func (c *ColumnarTable) Decorations(ctx context.Context, req *xpb.DecorationsReq
 				continue
 			}
 			t := e.Target
+			// Filter decorations by requested build configs.
+			if len(buildConfigs) != 0 && !buildConfigs.Contains(t.BuildConfig) {
+				continue
+			}
 			kind := t.GetGenericKind()
 			if kind == "" {
 				kind = schema.EdgeKindString(t.GetKytheKind())
 			}
 			ref := &xpb.DecorationsReply_Reference{
 				TargetTicket: kytheuri.ToString(t.Target),
+				BuildConfig:  t.BuildConfig,
 				Kind:         kind,
 				Span:         norm.SpanOffsets(t.StartOffset, t.EndOffset),
 			}

kythe/go/serving/xrefs/columnar/columnar_encoding.go

@@ -118,7 +118,7 @@ func encodeDecorText(prefix []byte, file *spb.VName, t *xspb.FileDecorations_Tex
 
 func encodeDecorTarget(prefix []byte, file *spb.VName, t *xspb.FileDecorations_Target) (*KV, error) {
 	key, err := keys.Append(prefix, file,
-		columnarDecorationsTargetGroup, t.StartOffset, t.EndOffset,
+		columnarDecorationsTargetGroup, t.BuildConfig, t.StartOffset, t.EndOffset,
 		t.GetGenericKind(), int32(t.GetKytheKind()), t.Target)
 	if err != nil {
 		return nil, err
@@ -268,7 +268,9 @@ func decodeDecorTarget(file *spb.VName, key string, val []byte) (*xspb.FileDecor
 		kytheKindNum int32
 		genericKind  string
 	)
-	key, err := keys.Parse(key, &target.StartOffset, &target.EndOffset, &genericKind, &kytheKindNum, target.Target)
+	key, err := keys.Parse(key,
+		&target.BuildConfig, &target.StartOffset, &target.EndOffset,
+		&genericKind, &kytheKindNum, target.Target)
 	if err != nil {
 		return nil, err
 	}

kythe/proto/xref_serving.proto

@@ -66,7 +66,7 @@ message FileDecorations {
 
   // File decoration target
   //
-  // Columnar key: 10-start-end-kind-target
+  // Columnar key: 10-build_config-start-end-kind-target
   message Target {
     // Starting offset of this file decoration.
     int32 start_offset = 1;
@@ -79,6 +79,8 @@ message FileDecorations {
     }
 
     kythe.proto.VName target = 5;
+
+    string build_config = 6;
   }
 
   // Override per file decoration target node.
@@ -131,6 +133,7 @@ message FileDecorations {
   // Diagnostic per file span
   //
   // Columnar key: 70-start-end-hash
+  // TODO(schroederc): add build_config to spanning Diagnostics and key
   message Diagnostic {
     kythe.proto.common.Diagnostic diagnostic = 1;
   }