[MM-19914] Fix data races in WebSocketEvent (#13039)
* Make WebSocketEvent type immutable * Update code to use updated immutable WebSocketEvent type * Export WebSocketEvent fields and mark them as deprecated
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
9ab7bee0a6
Коммит
80dd2915db
@@ -17,14 +17,68 @@ func TestWebSocketEvent(t *testing.T) {
|
||||
json := m.ToJson()
|
||||
result := WebSocketEventFromJson(strings.NewReader(json))
|
||||
|
||||
badresult := WebSocketEventFromJson(strings.NewReader("junk"))
|
||||
require.Nil(t, badresult, "should not have parsed")
|
||||
|
||||
require.True(t, m.IsValid(), "should be valid")
|
||||
require.Equal(t, m.GetBroadcast().TeamId, result.GetBroadcast().TeamId, "Ids do not match")
|
||||
require.Equal(t, m.GetData()["RootId"], result.GetData()["RootId"], "Ids do not match")
|
||||
}
|
||||
|
||||
require.Equal(t, m.Broadcast.TeamId, result.Broadcast.TeamId, "Ids do not match")
|
||||
func TestWebSocketEventImmutable(t *testing.T) {
|
||||
m := NewWebSocketEvent("some_event", NewId(), NewId(), NewId(), nil)
|
||||
|
||||
require.Equal(t, m.Data["RootId"], result.Data["RootId"], "Ids do not match")
|
||||
new := m.SetEvent("new_event")
|
||||
if new == m {
|
||||
require.Fail(t, "pointers should not be the same")
|
||||
}
|
||||
require.NotEqual(t, m.Event, new.Event)
|
||||
require.Equal(t, new.Event, "new_event")
|
||||
require.Equal(t, new.Event, new.EventType())
|
||||
|
||||
new = m.SetSequence(45)
|
||||
if new == m {
|
||||
require.Fail(t, "pointers should not be the same")
|
||||
}
|
||||
require.NotEqual(t, m.Sequence, new.Sequence)
|
||||
require.Equal(t, new.Sequence, int64(45))
|
||||
require.Equal(t, new.Sequence, new.GetSequence())
|
||||
|
||||
broadcast := &WebsocketBroadcast{}
|
||||
new = m.SetBroadcast(broadcast)
|
||||
if new == m {
|
||||
require.Fail(t, "pointers should not be the same")
|
||||
}
|
||||
require.NotEqual(t, m.Broadcast, new.Broadcast)
|
||||
require.Equal(t, new.Broadcast, broadcast)
|
||||
require.Equal(t, new.Broadcast, new.GetBroadcast())
|
||||
|
||||
data := map[string]interface{}{
|
||||
"key": "val",
|
||||
"key2": "val2",
|
||||
}
|
||||
new = m.SetData(data)
|
||||
if new == m {
|
||||
require.Fail(t, "pointers should not be the same")
|
||||
}
|
||||
require.NotEqual(t, m, new)
|
||||
require.Equal(t, new.Data, data)
|
||||
require.Equal(t, new.Data, new.GetData())
|
||||
|
||||
copy := m.Copy()
|
||||
if copy == m {
|
||||
require.Fail(t, "pointers should not be the same")
|
||||
}
|
||||
require.Equal(t, m, copy)
|
||||
}
|
||||
|
||||
func TestWebSocketEventFromJson(t *testing.T) {
|
||||
ev := WebSocketEventFromJson(strings.NewReader("junk"))
|
||||
require.Nil(t, ev, "should not have parsed")
|
||||
data := `{"event": "test", "data": {"key": "val"}, "seq": 45, "broadcast": {"user_id": "userid"}}`
|
||||
ev = WebSocketEventFromJson(strings.NewReader(data))
|
||||
require.NotNil(t, ev, "should have parsed")
|
||||
require.Equal(t, ev.Event, "test")
|
||||
require.Equal(t, ev.Sequence, int64(45))
|
||||
require.Equal(t, ev.Data, map[string]interface{}{"key": "val"})
|
||||
require.Equal(t, ev.Broadcast, &WebsocketBroadcast{UserId: "userid"})
|
||||
}
|
||||
|
||||
func TestWebSocketResponse(t *testing.T) {
|
||||
@@ -46,7 +100,7 @@ func TestWebSocketResponse(t *testing.T) {
|
||||
|
||||
func TestWebSocketEvent_PrecomputeJSON(t *testing.T) {
|
||||
event := NewWebSocketEvent(WEBSOCKET_EVENT_POSTED, "foo", "bar", "baz", nil)
|
||||
event.Sequence = 7
|
||||
event = event.SetSequence(7)
|
||||
|
||||
before := event.ToJson()
|
||||
event.PrecomputeJSON()
|
||||
@@ -60,7 +114,7 @@ var stringSink string
|
||||
func BenchmarkWebSocketEvent_ToJson(b *testing.B) {
|
||||
event := NewWebSocketEvent(WEBSOCKET_EVENT_POSTED, "foo", "bar", "baz", nil)
|
||||
for i := 0; i < 100; i++ {
|
||||
event.Data[NewId()] = NewId()
|
||||
event.GetData()[NewId()] = NewId()
|
||||
}
|
||||
|
||||
b.Run("SerializedNTimes", func(b *testing.B) {
|
||||
|
||||
Ссылка в новой задаче
Block a user