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

Migrate POST.AnalyticsPostCount to Sync by default (#11179)

Browse Source 
* Migrate POST.AnalyticsPostCount to Sync by default

* Fix: Query identation
This commit is contained in:
Rodrigo Villablanca Vásquez
2019-06-14 11:52:17 -04:00
committed by Jesús Espino
parent 9ec99593eb
commit bd8e047458
8 changed files with 74 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
app/analytics.go
View File

@@ -59,7 +59,12 @@ func (a *App) GetAnalytics(name string, teamId string) (model.AnalyticsRows, *mo
var postChan store.StoreChannel
if !skipIntensiveQueries {
postChan = a.Srv.Store.Post().AnalyticsPostCount(teamId, false, false)
postChan = make(chan store.StoreResult, 1)
go func() {
count, err := a.Srv.Store.Post().AnalyticsPostCount(teamId, false, false)
postChan <- store.StoreResult{Data: count, Err: err}
close(postChan)
}()
}
dailyActiveChan := a.Srv.Store.User().AnalyticsActiveCount(DAY_MILLISECONDS)
@@ -212,9 +217,21 @@ func (a *App) GetAnalytics(name string, teamId string) (model.AnalyticsRows, *mo
var fileChan store.StoreChannel
var hashtagChan store.StoreChannel
if !skipIntensiveQueries {
fileChan = a.Srv.Store.Post().AnalyticsPostCount(teamId, true, false)
hashtagChan = a.Srv.Store.Post().AnalyticsPostCount(teamId, false, true)
fileChan = make(chan store.StoreResult, 1)
go func() {
count, err := a.Srv.Store.Post().AnalyticsPostCount(teamId, true, false)
fileChan <- store.StoreResult{Data: count, Err: err}
close(fileChan)
}()
hashtagChan = make(chan store.StoreResult, 1)
go func() {
count, err := a.Srv.Store.Post().AnalyticsPostCount(teamId, false, true)
hashtagChan <- store.StoreResult{Data: count, Err: err}
close(hashtagChan)
}()
}
if fileChan == nil {

4
app/diagnostics.go
View File

@@ -191,9 +191,7 @@ func (a *App) trackActivity() {
deletedPrivateChannelCount = dpccr.Data.(int64)
}
if pcr := <-a.Srv.Store.Post().AnalyticsPostCount("", false, false); pcr.Err == nil {
postsCount = pcr.Data.(int64)
}
postsCount, _ = a.Srv.Store.Post().AnalyticsPostCount("", false, false)
slashCommandsCount, _ = a.Srv.Store.Command().AnalyticsCommandCount("")

20
app/import_functions_test.go
View File

@@ -1799,11 +1799,9 @@ func TestImportImportPost(t *testing.T) {
}
// Count the number of posts in the testing team.
var initialPostCount int64
if result := <-th.App.Srv.Store.Post().AnalyticsPostCount(team.Id, false, false); result.Err != nil {
t.Fatal(result.Err)
} else {
initialPostCount = result.Data.(int64)
initialPostCount, err := th.App.Srv.Store.Post().AnalyticsPostCount(team.Id, false, false)
if err != nil {
t.Fatal(err)
}
// Try adding an invalid post in dry run mode.
@@ -2368,9 +2366,9 @@ func TestImportImportDirectPost(t *testing.T) {
directChannel = channel
// Get the number of posts in the system.
result := <-th.App.Srv.Store.Post().AnalyticsPostCount("", false, false)
require.Nil(t, result.Err)
initialPostCount := result.Data.(int64)
result, err := th.App.Srv.Store.Post().AnalyticsPostCount("", false, false)
require.Nil(t, err)
initialPostCount := result
// Try adding an invalid post in dry run mode.
data := &DirectPostImportData{
@@ -2534,9 +2532,9 @@ func TestImportImportDirectPost(t *testing.T) {
groupChannel = channel
// Get the number of posts in the system.
result = <-th.App.Srv.Store.Post().AnalyticsPostCount("", false, false)
require.Nil(t, result.Err)
initialPostCount = result.Data.(int64)
result, err = th.App.Srv.Store.Post().AnalyticsPostCount("", false, false)
require.Nil(t, err)
initialPostCount = result
// Try adding an invalid post in dry run mode.
data = &DirectPostImportData{

6
app/import_test.go
View File

@@ -81,10 +81,10 @@ func checkNoError(t *testing.T, err *model.AppError) {
}
func AssertAllPostsCount(t *testing.T, a *App, initialCount int64, change int64, teamName string) {
if result := <-a.Srv.Store.Post().AnalyticsPostCount(teamName, false, false); result.Err != nil {
t.Fatal(result.Err)
if result, err := a.Srv.Store.Post().AnalyticsPostCount(teamName, false, false); err != nil {
t.Fatal(err)
} else {
if initialCount+change != result.Data.(int64) {
if initialCount+change != result {
debug.PrintStack()
t.Fatalf("Did not find the expected number of posts.")
}

49
store/sqlstore/post_store.go
View File

@@ -1043,35 +1043,34 @@ func (s *SqlPostStore) AnalyticsPostCountsByDay(teamId string) (model.AnalyticsR
return rows, nil
}
func (s *SqlPostStore) AnalyticsPostCount(teamId string, mustHaveFile bool, mustHaveHashtag bool) store.StoreChannel {
return store.Do(func(result *store.StoreResult) {
query :=
`SELECT
COUNT(Posts.Id) AS Value
FROM
Posts,
Channels
WHERE
Posts.ChannelId = Channels.Id`
func (s *SqlPostStore) AnalyticsPostCount(teamId string, mustHaveFile bool, mustHaveHashtag bool) (int64, *model.AppError) {
query :=
`SELECT
COUNT(Posts.Id) AS Value
FROM
Posts,
Channels
WHERE
Posts.ChannelId = Channels.Id`
if len(teamId) > 0 {
query += " AND Channels.TeamId = :TeamId"
}
if len(teamId) > 0 {
query += " AND Channels.TeamId = :TeamId"
}
if mustHaveFile {
query += " AND (Posts.FileIds != '[]' OR Posts.Filenames != '[]')"
}
if mustHaveFile {
query += " AND (Posts.FileIds != '[]' OR Posts.Filenames != '[]')"
}
if mustHaveHashtag {
query += " AND Posts.Hashtags != ''"
}
if mustHaveHashtag {
query += " AND Posts.Hashtags != ''"
}
if v, err := s.GetReplica().SelectInt(query, map[string]interface{}{"TeamId": teamId}); err != nil {
result.Err = model.NewAppError("SqlPostStore.AnalyticsPostCount", "store.sql_post.analytics_posts_count.app_error", nil, err.Error(), http.StatusInternalServerError)
} else {
result.Data = v
}
})
v, err := s.GetReplica().SelectInt(query, map[string]interface{}{"TeamId": teamId})
if err != nil {
return 0, model.NewAppError("SqlPostStore.AnalyticsPostCount", "store.sql_post.analytics_posts_count.app_error", nil, err.Error(), http.StatusInternalServerError)
}
return v, nil
}
func (s *SqlPostStore) GetPostsCreatedAt(channelId string, time int64) ([]*model.Post, *model.AppError) {

2
store/store.go
View File

@@ -228,7 +228,7 @@ type PostStore interface {
Search(teamId string, userId string, params *model.SearchParams) StoreChannel
AnalyticsUserCountsWithPostsByDay(teamId string) (model.AnalyticsRows, *model.AppError)
AnalyticsPostCountsByDay(teamId string) (model.AnalyticsRows, *model.AppError)
AnalyticsPostCount(teamId string, mustHaveFile bool, mustHaveHashtag bool) StoreChannel
AnalyticsPostCount(teamId string, mustHaveFile bool, mustHaveHashtag bool) (int64, *model.AppError)
ClearCaches()
InvalidateLastPostTimeCache(channelId string)
GetPostsCreatedAt(channelId string, time int64) ([]*model.Post, *model.AppError)

19
store/storetest/mocks/PostStore.go
View File

@@ -14,19 +14,26 @@ type PostStore struct {
}
// AnalyticsPostCount provides a mock function with given fields: teamId, mustHaveFile, mustHaveHashtag
func (_m *PostStore) AnalyticsPostCount(teamId string, mustHaveFile bool, mustHaveHashtag bool) store.StoreChannel {
func (_m *PostStore) AnalyticsPostCount(teamId string, mustHaveFile bool, mustHaveHashtag bool) (int64, *model.AppError) {
ret := _m.Called(teamId, mustHaveFile, mustHaveHashtag)
var r0 store.StoreChannel
if rf, ok := ret.Get(0).(func(string, bool, bool) store.StoreChannel); ok {
var r0 int64
if rf, ok := ret.Get(0).(func(string, bool, bool) int64); ok {
r0 = rf(teamId, mustHaveFile, mustHaveHashtag)
} else {
if ret.Get(0) != nil {
r0 = ret.Get(0).(store.StoreChannel)
r0 = ret.Get(0).(int64)
}
var r1 *model.AppError
if rf, ok := ret.Get(1).(func(string, bool, bool) *model.AppError); ok {
r1 = rf(teamId, mustHaveFile, mustHaveHashtag)
} else {
if ret.Get(1) != nil {
r1 = ret.Get(1).(*model.AppError)
}
}
return r0
return r0, r1
}
// AnalyticsPostCountsByDay provides a mock function with given fields: teamId

6
store/storetest/post_store.go
View File

@@ -1368,10 +1368,10 @@ func testPostCountsByDay(t *testing.T, ss store.Store) {
}
}
if r1 := <-ss.Post().AnalyticsPostCount(t1.Id, false, false); r1.Err != nil {
t.Fatal(r1.Err)
if r1, err := ss.Post().AnalyticsPostCount(t1.Id, false, false); err != nil {
t.Fatal(err)
} else {
if r1.Data.(int64) != 4 {
if r1 != 4 {
t.Fatal("wrong value")
}
}