* MM-25516: Changed to byte slice instead of string for cluster messages https://mattermost.atlassian.net/browse/MM-25116 Testing: Manually tested. Load-tested with Cluster Controller. I looked into changing the serialization method to use msgpack, but the ClusterMessage struct was mainly used for only 3 fields which didn't lead to much of a CPU time improvement, whereas actually led to more allocations using msgpack. Hence, I chose to remain with JSON. ``` name old time/op new time/op delta ClusterMarshal-8 3.51µs ± 1% 3.10µs ± 2% -11.59% (p=0.000 n=9+10) name old alloc/op new alloc/op delta ClusterMarshal-8 776B ± 0% 1000B ± 0% +28.87% (p=0.000 n=10+10) name old allocs/op new allocs/op delta ClusterMarshal-8 12.0 ± 0% 13.0 ± 0% +8.33% (p=0.000 n=10+10) ``` ```release-note Changed the field type of Data in model.ClusterMessage to []byte from string. ``` * Trigger CI ```release-note NONE ```
149 строки
4.2 KiB
Go
149 строки
4.2 KiB
Go
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
|
|
// See LICENSE.txt for license information.
|
|
|
|
package model
|
|
|
|
import (
|
|
"bytes"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestWebSocketEvent(t *testing.T) {
|
|
userId := NewId()
|
|
m := NewWebSocketEvent("some_event", NewId(), NewId(), userId, nil)
|
|
m.Add("RootId", NewId())
|
|
user := &User{
|
|
Id: userId,
|
|
}
|
|
m.Add("user", user)
|
|
json := m.ToJson()
|
|
result := WebSocketEventFromJson(bytes.NewReader(json))
|
|
|
|
require.True(t, m.IsValid(), "should be valid")
|
|
require.Equal(t, m.GetBroadcast().TeamId, result.GetBroadcast().TeamId, "Team ids do not match")
|
|
require.Equal(t, m.GetData()["RootId"], result.GetData()["RootId"], "Root ids do not match")
|
|
require.Equal(t, m.GetData()["user"].(*User).Id, result.GetData()["user"].(*User).Id, "User ids do not match")
|
|
}
|
|
|
|
func TestWebSocketEventImmutable(t *testing.T) {
|
|
m := NewWebSocketEvent("some_event", NewId(), NewId(), NewId(), nil)
|
|
|
|
new := m.SetEvent("new_event")
|
|
if new == m {
|
|
require.Fail(t, "pointers should not be the same")
|
|
}
|
|
require.NotEqual(t, m.EventType(), new.EventType())
|
|
require.Equal(t, new.EventType(), "new_event")
|
|
|
|
new = m.SetSequence(45)
|
|
if new == m {
|
|
require.Fail(t, "pointers should not be the same")
|
|
}
|
|
require.NotEqual(t, m.GetSequence(), new.GetSequence())
|
|
require.Equal(t, new.GetSequence(), int64(45))
|
|
|
|
broadcast := &WebsocketBroadcast{}
|
|
new = m.SetBroadcast(broadcast)
|
|
if new == m {
|
|
require.Fail(t, "pointers should not be the same")
|
|
}
|
|
require.NotEqual(t, m.GetBroadcast(), new.GetBroadcast())
|
|
require.Equal(t, new.GetBroadcast(), broadcast)
|
|
|
|
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(bytes.NewReader([]byte("junk")))
|
|
require.Nil(t, ev, "should not have parsed")
|
|
data := []byte(`{"event": "test", "data": {"key": "val"}, "seq": 45, "broadcast": {"user_id": "userid"}}`)
|
|
ev = WebSocketEventFromJson(bytes.NewReader(data))
|
|
require.NotNil(t, ev, "should have parsed")
|
|
require.Equal(t, ev.EventType(), "test")
|
|
require.Equal(t, ev.GetSequence(), int64(45))
|
|
require.Equal(t, ev.data, map[string]interface{}{"key": "val"})
|
|
require.Equal(t, ev.GetBroadcast(), &WebsocketBroadcast{UserId: "userid"})
|
|
}
|
|
|
|
func TestWebSocketResponse(t *testing.T) {
|
|
m := NewWebSocketResponse("OK", 1, map[string]interface{}{})
|
|
e := NewWebSocketError(1, &AppError{})
|
|
m.Add("RootId", NewId())
|
|
json := m.ToJson()
|
|
result := WebSocketResponseFromJson(bytes.NewReader(json))
|
|
json2 := e.ToJson()
|
|
WebSocketResponseFromJson(bytes.NewReader(json2))
|
|
|
|
badresult := WebSocketResponseFromJson(bytes.NewReader([]byte("junk")))
|
|
require.Nil(t, badresult, "should not have parsed")
|
|
|
|
require.True(t, m.IsValid(), "should be valid")
|
|
|
|
require.Equal(t, m.Data["RootId"], result.Data["RootId"], "Ids do not match")
|
|
}
|
|
|
|
func TestWebSocketEvent_PrecomputeJSON(t *testing.T) {
|
|
event := NewWebSocketEvent(WebsocketEventPosted, "foo", "bar", "baz", nil)
|
|
event = event.SetSequence(7)
|
|
|
|
before := event.ToJson()
|
|
event.PrecomputeJSON()
|
|
after := event.ToJson()
|
|
|
|
assert.Equal(t, before, after)
|
|
}
|
|
|
|
var stringSink []byte
|
|
|
|
func BenchmarkWebSocketEvent_ToJson(b *testing.B) {
|
|
event := NewWebSocketEvent(WebsocketEventPosted, "foo", "bar", "baz", nil)
|
|
for i := 0; i < 100; i++ {
|
|
event.GetData()[NewId()] = NewId()
|
|
}
|
|
|
|
b.Run("SerializedNTimes", func(b *testing.B) {
|
|
for i := 0; i < b.N; i++ {
|
|
stringSink = event.ToJson()
|
|
}
|
|
})
|
|
|
|
b.Run("PrecomputedNTimes", func(b *testing.B) {
|
|
for i := 0; i < b.N; i++ {
|
|
event.PrecomputeJSON()
|
|
}
|
|
})
|
|
|
|
b.Run("PrecomputedAndSerializedNTimes", func(b *testing.B) {
|
|
for i := 0; i < b.N; i++ {
|
|
event.PrecomputeJSON()
|
|
stringSink = event.ToJson()
|
|
}
|
|
})
|
|
|
|
event.PrecomputeJSON()
|
|
b.Run("PrecomputedOnceAndSerializedNTimes", func(b *testing.B) {
|
|
for i := 0; i < b.N; i++ {
|
|
stringSink = event.ToJson()
|
|
}
|
|
})
|
|
}
|