Implement grpc-gateway Delimited interface

Implement the Delimited interface for the gogo/protobuf JSONPb marshaller. Fixes #20925
cockroachdb · Dec 22, 2017 · 295270c · 295270c
1 parent 52bd510
commit 295270c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/pkg/util/protoutil/jsonpb_marshal.go b/pkg/util/protoutil/jsonpb_marshal.go
@@ -133,3 +133,8 @@ func (j *JSONPb) NewEncoder(w io.Writer) gwruntime.Encoder {
 		return errors.Errorf("unexpected type %T does not implement %s", v, typeProtoMessage)
 	})
 }
+
+// Delimiter implements gwruntime.Delimited.
+func (*JSONPb) Delimiter() []byte {
+	return []byte("\n")
+}
diff --git a/pkg/util/protoutil/marshaler.go b/pkg/util/protoutil/marshaler.go
@@ -101,3 +101,8 @@ func (e *protoEncoder) Encode(v interface{}) error {
 	}
 	return errors.Errorf("unexpected type %T does not implement %s", v, typeProtoMessage)
 }
+
+// Delimiter implements gwruntime.Delimited.
+func (*ProtoPb) Delimiter() []byte {
+	return nil
+}