summaryrefslogtreecommitdiffstats
path: root/store/sql_channel_store_test.go
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2016-10-19 14:49:25 -0400
committerGitHub <noreply@github.com>2016-10-19 14:49:25 -0400
commit365b8b465e8a53ebb2da2bf3aef659ac81a2bc6a (patch)
tree643b2dd52b478c2c0b049ac28798d870b9dfd397 /store/sql_channel_store_test.go
parent0512bd26ee85473aa47206d5f207a9a506019138 (diff)
downloadchat-365b8b465e8a53ebb2da2bf3aef659ac81a2bc6a.tar.gz
chat-365b8b465e8a53ebb2da2bf3aef659ac81a2bc6a.tar.bz2
chat-365b8b465e8a53ebb2da2bf3aef659ac81a2bc6a.zip
Merging performance branch into master (#4268)
* 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
Diffstat (limited to 'store/sql_channel_store_test.go')
-rw-r--r--store/sql_channel_store_test.go65
1 files changed, 36 insertions, 29 deletions
diff --git a/store/sql_channel_store_test.go b/store/sql_channel_store_test.go
index 19db3d003..d80d54d52 100644
--- a/store/sql_channel_store_test.go
+++ b/store/sql_channel_store_test.go
@@ -408,11 +408,6 @@ func TestChannelMemberStore(t *testing.T) {
t.Fatal("should have go member")
}
- extraMembers := (<-store.Channel().GetExtraMembers(o1.ChannelId, 20)).Data.([]model.ExtraMember)
- if len(extraMembers) != 1 {
- t.Fatal("should have 1 extra members")
- }
-
if err := (<-store.Channel().SaveMember(&o1)).Err; err == nil {
t.Fatal("Should have been a duplicate")
}
@@ -422,18 +417,6 @@ func TestChannelMemberStore(t *testing.T) {
if t4 != t3 {
t.Fatal("Should not update time upon failure")
}
-
- // rejoin the channel and make sure that an inactive user isn't returned by GetExtraMambers
- Must(store.Channel().SaveMember(&o2))
-
- u2.DeleteAt = 1000
- Must(store.User().Update(&u2, true))
-
- if result := <-store.Channel().GetExtraMembers(o1.ChannelId, 20); result.Err != nil {
- t.Fatal(result.Err)
- } else if extraMembers := result.Data.([]model.ExtraMember); len(extraMembers) != 1 {
- t.Fatal("should have 1 extra members")
- }
}
func TestChannelDeleteMemberStore(t *testing.T) {
@@ -534,6 +517,42 @@ func TestChannelStoreGetChannels(t *testing.T) {
if list.Channels[0].Id != o1.Id {
t.Fatal("missing channel")
}
+
+ acresult := <-store.Channel().GetAllChannelMembersForUser(m1.UserId, false)
+ ids := acresult.Data.(map[string]string)
+ if _, ok := ids[o1.Id]; !ok {
+ t.Fatal("missing channel")
+ }
+
+ acresult2 := <-store.Channel().GetAllChannelMembersForUser(m1.UserId, true)
+ ids2 := acresult2.Data.(map[string]string)
+ if _, ok := ids2[o1.Id]; !ok {
+ t.Fatal("missing channel")
+ }
+
+ acresult3 := <-store.Channel().GetAllChannelMembersForUser(m1.UserId, true)
+ ids3 := acresult3.Data.(map[string]string)
+ if _, ok := ids3[o1.Id]; !ok {
+ t.Fatal("missing channel")
+ }
+
+ if !store.Channel().IsUserInChannelUseCache(m1.UserId, o1.Id) {
+ t.Fatal("missing channel")
+ }
+
+ if store.Channel().IsUserInChannelUseCache(m1.UserId, o2.Id) {
+ t.Fatal("missing channel")
+ }
+
+ if store.Channel().IsUserInChannelUseCache(m1.UserId, "blahblah") {
+ t.Fatal("missing channel")
+ }
+
+ if store.Channel().IsUserInChannelUseCache("blahblah", "blahblah") {
+ t.Fatal("missing channel")
+ }
+
+ store.Channel().InvalidateAllChannelMembersForUser(m1.UserId)
}
func TestChannelStoreGetMoreChannels(t *testing.T) {
@@ -974,22 +993,10 @@ func TestUpdateExtrasByUser(t *testing.T) {
t.Fatal("failed to update extras by user: %v", result.Err)
}
- if result := <-store.Channel().GetExtraMembers(c1.Id, -1); result.Err != nil {
- t.Fatal("failed to get extras: %v", result.Err)
- } else if len(result.Data.([]model.ExtraMember)) != 0 {
- t.Fatal("got incorrect member count %v", len(result.Data.([]model.ExtraMember)))
- }
-
u1.DeleteAt = 0
Must(store.User().Update(u1, true))
if result := <-store.Channel().ExtraUpdateByUser(u1.Id, u1.DeleteAt); result.Err != nil {
t.Fatal("failed to update extras by user: %v", result.Err)
}
-
- if result := <-store.Channel().GetExtraMembers(c1.Id, -1); result.Err != nil {
- t.Fatal("failed to get extras: %v", result.Err)
- } else if len(result.Data.([]model.ExtraMember)) != 1 {
- t.Fatal("got incorrect member count %v", len(result.Data.([]model.ExtraMember)))
- }
}