Skip to content

Commit 48ee987

Browse files
committed
kvpb: add (*RangeFeedEvent).EventType method
A small helper for printing the type of an event since this type is enum-like. Informs #135332 Release note: None
1 parent 6816c43 commit 48ee987

File tree

2 files changed

+23
-16
lines changed

2 files changed

+23
-16
lines changed

pkg/kv/kvpb/api.go

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2185,6 +2185,28 @@ func (e *RangeFeedEvent) ShallowCopy() *RangeFeedEvent {
21852185
return &cpy
21862186
}
21872187

2188+
// EventType returns a string description of the type of event..
2189+
func (e *RangeFeedEvent) EventType() string {
2190+
switch {
2191+
case e.Val != nil:
2192+
return "Value"
2193+
case e.Checkpoint != nil:
2194+
return "Checkpoint"
2195+
case e.SST != nil:
2196+
return "SST"
2197+
case e.DeleteRange != nil:
2198+
return "DeleteRange"
2199+
case e.Metadata != nil:
2200+
return "Metadata"
2201+
case e.Error != nil:
2202+
return "Error"
2203+
case e.BulkEvents != nil:
2204+
return "BulkEvents"
2205+
default:
2206+
return "Unknown"
2207+
}
2208+
}
2209+
21882210
// Timestamp is part of rangefeedbuffer.Event.
21892211
func (e *RangeFeedValue) Timestamp() hlc.Timestamp {
21902212
return e.Value.Timestamp

pkg/kv/kvserver/rangefeed/sender_helper_test.go

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -97,22 +97,7 @@ func (s *testServerStream) String() string {
9797
for streamID, eventList := range s.streamEvents {
9898
fmt.Fprintf(&str, "\tStreamID:%d, Len:%d", streamID, len(eventList))
9999
for _, ev := range eventList {
100-
switch {
101-
case ev.Val != nil:
102-
fmt.Fprintf(&str, "\t\tvalue")
103-
case ev.Checkpoint != nil:
104-
fmt.Fprintf(&str, "\t\tcheckpoint")
105-
case ev.SST != nil:
106-
fmt.Fprintf(&str, "\t\tsst")
107-
case ev.DeleteRange != nil:
108-
fmt.Fprintf(&str, "\t\tdelete")
109-
case ev.Metadata != nil:
110-
fmt.Fprintf(&str, "\t\tmetadata")
111-
case ev.Error != nil:
112-
fmt.Fprintf(&str, "\t\terror")
113-
default:
114-
panic("unknown event type")
115-
}
100+
fmt.Fprintf(&str, "\t\t%s", ev.EventType())
116101
}
117102
fmt.Fprintf(&str, "\n")
118103
}

0 commit comments

Comments
 (0)