IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Adding emoji caching (#5433)

Browse Source
This commit is contained in:
Corey Hulen
2017-02-15 19:25:33 -05:00
committed by Joram Wilander
parent 727d067fce
commit 01a8114aa3
4 changed files with 46 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
api/emoji.go
View File

@@ -211,7 +211,7 @@ func deleteEmoji(c *Context, w http.ResponseWriter, r *http.Request) {
}
var emoji *model.Emoji
if result := <-app.Srv.Store.Emoji().Get(id); result.Err != nil {
if result := <-app.Srv.Store.Emoji().Get(id, false); result.Err != nil {
c.Err = result.Err
return
} else {
@@ -269,7 +269,7 @@ func getEmojiImage(c *Context, w http.ResponseWriter, r *http.Request) {
return
}
if result := <-app.Srv.Store.Emoji().Get(id); result.Err != nil {
if result := <-app.Srv.Store.Emoji().Get(id, true); result.Err != nil {
c.Err = result.Err
return
} else {
@@ -288,6 +288,7 @@ func getEmojiImage(c *Context, w http.ResponseWriter, r *http.Request) {
w.Header().Set("Content-Type", "image/"+imageType)
}
w.Header().Set("Cache-Control", "max-age=2592000, public")
w.Write(img)
}
}

36
store/sql_emoji_store.go
View File

@@ -4,9 +4,18 @@
package store
import (
"github.com/mattermost/platform/einterfaces"
"github.com/mattermost/platform/model"
"github.com/mattermost/platform/utils"
)
const (
EMOJI_CACHE_SIZE = 5000
EMOJI_CACHE_SEC = 1800 // 60 mins
)
var emojiCache *utils.Cache = utils.NewLru(EMOJI_CACHE_SIZE)
type SqlEmojiStore struct {
*SqlStore
}
@@ -58,11 +67,32 @@ func (es SqlEmojiStore) Save(emoji *model.Emoji) StoreChannel {
return storeChannel
}
func (es SqlEmojiStore) Get(id string) StoreChannel {
func (es SqlEmojiStore) Get(id string, allowFromCache bool) StoreChannel {
storeChannel := make(StoreChannel, 1)
go func() {
result := StoreResult{}
metrics := einterfaces.GetMetricsInterface()
if allowFromCache {
if cacheItem, ok := emojiCache.Get(id); ok {
if metrics != nil {
metrics.IncrementMemCacheHitCounter("Emoji")
}
result.Data = cacheItem.(map[string]*model.Emoji)
storeChannel <- result
close(storeChannel)
return
} else {
if metrics != nil {
metrics.IncrementMemCacheMissCounter("Emoji")
}
}
} else {
if metrics != nil {
metrics.IncrementMemCacheMissCounter("Emoji")
}
}
var emoji *model.Emoji
@@ -77,6 +107,10 @@ func (es SqlEmojiStore) Get(id string) StoreChannel {
result.Err = model.NewLocAppError("SqlEmojiStore.Get", "store.sql_emoji.get.app_error", nil, "id="+id+", "+err.Error())
} else {
result.Data = emoji
if allowFromCache {
emojiCache.AddWithExpiresInSecs(id, emoji, EMOJI_CACHE_SEC)
}
}
storeChannel <- result

8
store/sql_emoji_store_test.go
View File

@@ -74,7 +74,13 @@ func TestEmojiGet(t *testing.T) {
}()
for _, emoji := range emojis {
if result := <-store.Emoji().Get(emoji.Id); result.Err != nil {
if result := <-store.Emoji().Get(emoji.Id, false); result.Err != nil {
t.Fatalf("failed to get emoji with id %v: %v", emoji.Id, result.Err)
}
}
for _, emoji := range emojis {
if result := <-store.Emoji().Get(emoji.Id, true); result.Err != nil {
t.Fatalf("failed to get emoji with id %v: %v", emoji.Id, result.Err)
}
}

2
store/store.go
View File

@@ -304,7 +304,7 @@ type PasswordRecoveryStore interface {
type EmojiStore interface {
Save(emoji *model.Emoji) StoreChannel
Get(id string) StoreChannel
Get(id string, allowFromCache bool) StoreChannel
GetByName(name string) StoreChannel
GetAll() StoreChannel
Delete(id string, time int64) StoreChannel