From 365b8b465e8a53ebb2da2bf3aef659ac81a2bc6a Mon Sep 17 00:00:00 2001 From: Joram Wilander Date: Wed, 19 Oct 2016 14:49:25 -0400 Subject: Merging performance branch into master (#4268) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * improve performance on sendNotifications * Fix SQL queries * Remove get direct profiles, not needed anymore * Add raw data to error details if AppError fails to decode * men * Fix decode (#4052) * Fixing json decode * Adding unit test * Initial work for client scaling (#4051) * Begin adding paging to profiles API * Added more paging functionality * Finish hooking up admin console user lists * Add API for searching users and add searching to all user lists * Add lazy loading of profiles * Revert config.json * Fix unit tests and some style issues * Add GetProfilesFromList to Go driver and fix web unit test * Update etag for GetProfiles * Updating ui for filters and pagination (#4044) * Updating UI for pagination * Adjusting margins for filter row * Adjusting margin for specific modals * Adding relative padding to system console * Adjusting responsive view * Update client user tests * Minor fixes for direct messages modal (#4056) * Remove some unneeded initial load calls (#4057) * UX updates to user lists, added smart counts and bug fixes (#4059) * Improved getExplicitMentions and unit tests (#4064) * Refactor getting posts to lazy load profiles correctly (#4062) * Comment out SetActiveChannel test (#4066) * Profiler cpu, block, and memory profiler. (#4081) * Fix TestSetActiveChannel unit test (#4071) * Fixing build failure caused by dependancies updating (#4076) * Adding profiler * Fix admin_team_member_dropdown eslint errors * Bumping session cache size (#4077) * Bumping session cache size * Bumping status cache * Refactor how the client handles channel members to be large team friendly (#4106) * Refactor how the client handles channel members to be large team friendly * Change Id to ChannelId in ChannelStats model * Updated getChannelMember and getProfilesByIds routes to match proposal * Performance improvements (#4100) * Performance improvements * Fixing re-connect issue * Fixing error message * Some other minor perf tweaks * Some other minor perf tweaks * Fixing config file * Fixing buffer size * Fixing web socket send message * adding some error logging * fix getMe to be user required * Fix websocket event for new user * Fixing shutting down * Reverting web socket changes * Fixing logging lvl * Adding caching to GetMember * Adding some logging * Fixing caching * Fixing caching invalidate * Fixing direct message caching * Fixing caching * Fixing caching * Remove GetDirectProfiles from initial load * Adding logging and fixing websocket client * Adding back caching from bad merge. * Explicitly close go driver requests (#4162) * Refactored how the client handles team members to be more large team friendly (#4159) * Refactor getProfilesForDirectMessageList API into getAllProfiles API * Refactored how the client handles team members to be more large team friendly * Fix js error when receiving a notification * Fix JS error caused by current user being overwritten with sanitized version (#4165) * Adding error message to status failure (#4167) * Fix a few bugs caused by client scaling refactoring (#4170) * When there is no read replica, don't open a second set of connections to the master database (#4173) * Adding connection tacking to stats (#4174) * Reduce DB writes for statuses and other status related changes (#4175) * Fix bug preventing opening of DM channels from more modal (#4181) * Fixing socket timing error (#4183) * Fixing ping/pong handler * Fixing socket timing error * Commenting out status broadcasting * Removing user status changes * Removing user status changes * Removing user status changes * Removing user status changes * Adding DoPreComputeJson() * Performance improvements (#4194) * * Fix System Console Analytics queries * Add db.SetConnMaxLifetime to 15 minutes * Add "net/http/pprof" for profiling * Add FreeOSMemory() to manually release memory on reload config * Add flag to enable http profiler * Fix memory leak (#4197) * Fix memory leak * removed unneeded nil assignment * Fixing go routine leak (#4208) * Merge fixes * Merge fix * Refactored statuses to be queried by the client rather than broadcast by the server (#4212) * Refactored server code to reduce status broadcasts and to allow getting statuses by IDs * Refactor client code to periodically fetch statuses * Add store unit test for getting statuses by ids * Fix status unit test * Add getStatusesByIds REST API and move the client over to use that instead of the WebSocket * Adding multiple threads to websocket hub (#4230) * Adding multiple threads to websocket hub * Fixing unit tests * Fixing so websocket connections from the same user end up in the same… (#4240) * Fixing so websocket connections from the same user end up in the same list * Removing old comment * Refactor user autocomplete to query the server (#4239) * Add API for autocompleting users * Converted at mention autocomplete to query server * Converted user search autocomplete to query server * Switch autocomplete API naming to use term instead of username * Split autocomplete API into two, one for channels and for teams * Fix copy/paste error * Some final client scaling fixes (#4246) * Add lazy loading of profiles to integration pages * Add lazy loading of profiles to emoji page * Fix JS error when receiving post in select team menu and also clean up channel store --- api/channel_test.go | 149 +++++++++++++++------------------------------------- 1 file changed, 42 insertions(+), 107 deletions(-) (limited to 'api/channel_test.go') diff --git a/api/channel_test.go b/api/channel_test.go index 1d0f0270d..4835ee9b7 100644 --- a/api/channel_test.go +++ b/api/channel_test.go @@ -10,7 +10,6 @@ import ( "time" "github.com/mattermost/platform/model" - "github.com/mattermost/platform/store" "github.com/mattermost/platform/utils" ) @@ -1106,7 +1105,7 @@ func TestDeleteChannel(t *testing.T) { } } -func TestGetChannelExtraInfo(t *testing.T) { +func TestGetChannelStats(t *testing.T) { th := Setup().InitBasic() Client := th.BasicClient team := th.BasicTeam @@ -1114,115 +1113,13 @@ func TestGetChannelExtraInfo(t *testing.T) { channel1 := &model.Channel{DisplayName: "A Test API Name", Name: "a" + model.NewId() + "a", Type: model.CHANNEL_OPEN, TeamId: team.Id} channel1 = Client.Must(Client.CreateChannel(channel1)).Data.(*model.Channel) - rget := Client.Must(Client.GetChannelExtraInfo(channel1.Id, -1, "")) - data := rget.Data.(*model.ChannelExtra) - if data.Id != channel1.Id { + rget := Client.Must(Client.GetChannelStats(channel1.Id, "")) + data := rget.Data.(*model.ChannelStats) + if data.ChannelId != channel1.Id { t.Fatal("couldnt't get extra info") - } else if len(data.Members) != 1 { - t.Fatal("got incorrect members") } else if data.MemberCount != 1 { t.Fatal("got incorrect member count") } - - // - // Testing etag caching - // - - currentEtag := rget.Etag - - if cache_result, err := Client.GetChannelExtraInfo(channel1.Id, -1, currentEtag); err != nil { - t.Fatal(err) - } else if cache_result.Data.(*model.ChannelExtra) != nil { - t.Log(cache_result.Data) - t.Fatal("response should be empty") - } else { - currentEtag = cache_result.Etag - } - - Client2 := model.NewClient("http://localhost" + utils.Cfg.ServiceSettings.ListenAddress) - - user2 := &model.User{Email: "success+" + model.NewId() + "@simulator.amazonses.com", Nickname: "Tester 2", Password: "passwd1"} - user2 = Client2.Must(Client2.CreateUser(user2, "")).Data.(*model.User) - LinkUserToTeam(user2, team) - Client2.SetTeamId(team.Id) - store.Must(Srv.Store.User().VerifyEmail(user2.Id)) - - Client2.Login(user2.Email, "passwd1") - Client2.Must(Client2.JoinChannel(channel1.Id)) - - if cache_result, err := Client.GetChannelExtraInfo(channel1.Id, -1, currentEtag); err != nil { - t.Fatal(err) - } else if cache_result.Data.(*model.ChannelExtra) == nil { - t.Log(cache_result.Data) - t.Fatal("response should not be empty") - } else { - currentEtag = cache_result.Etag - } - - if cache_result, err := Client.GetChannelExtraInfo(channel1.Id, -1, currentEtag); err != nil { - t.Fatal(err) - } else if cache_result.Data.(*model.ChannelExtra) != nil { - t.Log(cache_result.Data) - t.Fatal("response should be empty") - } else { - currentEtag = cache_result.Etag - } - - Client2.Must(Client2.LeaveChannel(channel1.Id)) - - if cache_result, err := Client.GetChannelExtraInfo(channel1.Id, -1, currentEtag); err != nil { - t.Fatal(err) - } else if cache_result.Data.(*model.ChannelExtra) == nil { - t.Log(cache_result.Data) - t.Fatal("response should not be empty") - } else { - currentEtag = cache_result.Etag - } - - if cache_result, err := Client.GetChannelExtraInfo(channel1.Id, -1, currentEtag); err != nil { - t.Fatal(err) - } else if cache_result.Data.(*model.ChannelExtra) != nil { - t.Log(cache_result.Data) - t.Fatal("response should be empty") - } else { - currentEtag = cache_result.Etag - } - - Client2.Must(Client2.JoinChannel(channel1.Id)) - - if cache_result, err := Client.GetChannelExtraInfo(channel1.Id, 2, currentEtag); err != nil { - t.Fatal(err) - } else if extra := cache_result.Data.(*model.ChannelExtra); extra == nil { - t.Fatal("response should not be empty") - } else if len(extra.Members) != 2 { - t.Fatal("should've returned 2 members") - } else if extra.MemberCount != 2 { - t.Fatal("should've returned member count of 2") - } else { - currentEtag = cache_result.Etag - } - - if cache_result, err := Client.GetChannelExtraInfo(channel1.Id, 1, currentEtag); err != nil { - t.Fatal(err) - } else if extra := cache_result.Data.(*model.ChannelExtra); extra == nil { - t.Fatal("response should not be empty") - } else if len(extra.Members) != 1 { - t.Fatal("should've returned only 1 member") - } else if extra.MemberCount != 2 { - t.Fatal("should've returned member count of 2") - } else { - currentEtag = cache_result.Etag - } - - if cache_result, err := Client.GetChannelExtraInfo(channel1.Id, 1, currentEtag); err != nil { - t.Fatal(err) - } else if cache_result.Data.(*model.ChannelExtra) != nil { - t.Log(cache_result.Data) - t.Fatal("response should be empty") - } else { - currentEtag = cache_result.Etag - } - } func TestAddChannelMember(t *testing.T) { @@ -1495,3 +1392,41 @@ func TestFuzzyChannel(t *testing.T) { } } } + +func TestGetChannelMember(t *testing.T) { + th := Setup().InitBasic() + Client := th.BasicClient + team := th.BasicTeam + + channel1 := &model.Channel{DisplayName: "A Test API Name", Name: "a" + model.NewId() + "a", Type: model.CHANNEL_OPEN, TeamId: team.Id} + channel1 = Client.Must(Client.CreateChannel(channel1)).Data.(*model.Channel) + + if result, err := Client.GetChannelMember(channel1.Id, th.BasicUser.Id); err != nil { + t.Fatal(err) + } else { + cm := result.Data.(*model.ChannelMember) + + if cm.UserId != th.BasicUser.Id { + t.Fatal("user ids didn't match") + } + if cm.ChannelId != channel1.Id { + t.Fatal("channel ids didn't match") + } + } + + if _, err := Client.GetChannelMember(channel1.Id, th.BasicUser2.Id); err == nil { + t.Fatal("should have failed - user not in channel") + } + + if _, err := Client.GetChannelMember("junk", th.BasicUser2.Id); err == nil { + t.Fatal("should have failed - bad channel id") + } + + if _, err := Client.GetChannelMember(channel1.Id, "junk"); err == nil { + t.Fatal("should have failed - bad user id") + } + + if _, err := Client.GetChannelMember("junk", "junk"); err == nil { + t.Fatal("should have failed - bad channel and user id") + } +} -- cgit v1.2.3-1-g7c22