mirrors/mostlymatter
1
0
Форкнуть 0
Код Задачи Запросы на слияние Действия Пакеты Проекты Релизы Вики Активность

PLT-4358 Exclude Channels from query when not necessary (#4269)

Просмотр исходного кода
Этот коммит содержится в:
enahum
2016-10-20 11:28:19 -03:00
коммит произвёл Harrison Healey
родитель 2e34d8843e
Коммит 162282d42c
1 изменённых файлов: 20 добавлений и 21 удалений
Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

41
store/sql_post_store.go
Просмотреть файл

@@ -815,15 +815,15 @@ func (s SqlPostStore) AnalyticsUserCountsWithPostsByDay(teamId string) StoreChan
`SELECT DISTINCT `SELECT DISTINCT
DATE(FROM_UNIXTIME(Posts.CreateAt / 1000)) AS Name, DATE(FROM_UNIXTIME(Posts.CreateAt / 1000)) AS Name,
COUNT(DISTINCT Posts.UserId) AS Value COUNT(DISTINCT Posts.UserId) AS Value
FROM Posts FROM Posts`
INNER JOIN Channels
ON Posts.ChannelId = Channels.Id`
if len(teamId) > 0 { if len(teamId) > 0 {
query += " AND Channels.TeamId = :TeamId" query += " INNER JOIN Channels ON Posts.ChannelId = Channels.Id AND Channels.TeamId = :TeamId AND"
} else {
query += " WHERE"
} }
query += ` AND Posts.CreateAt >= :StartTime AND Posts.CreateAt <= :EndTime query += ` Posts.CreateAt >= :StartTime AND Posts.CreateAt <= :EndTime
GROUP BY DATE(FROM_UNIXTIME(Posts.CreateAt / 1000)) GROUP BY DATE(FROM_UNIXTIME(Posts.CreateAt / 1000))
ORDER BY Name DESC ORDER BY Name DESC
LIMIT 30` LIMIT 30`
@@ -832,15 +832,15 @@ func (s SqlPostStore) AnalyticsUserCountsWithPostsByDay(teamId string) StoreChan
query = query =
`SELECT `SELECT
TO_CHAR(DATE(TO_TIMESTAMP(Posts.CreateAt / 1000)), 'YYYY-MM-DD') AS Name, COUNT(DISTINCT Posts.UserId) AS Value TO_CHAR(DATE(TO_TIMESTAMP(Posts.CreateAt / 1000)), 'YYYY-MM-DD') AS Name, COUNT(DISTINCT Posts.UserId) AS Value
FROM Posts FROM Posts`
INNER JOIN Channels
ON Posts.ChannelId = Channels.Id`
if len(teamId) > 0 { if len(teamId) > 0 {
query += " AND Channels.TeamId = :TeamId" query += " INNER JOIN Channels ON Posts.ChannelId = Channels.Id AND Channels.TeamId = :TeamId AND"
} else {
query += " WHERE"
} }
query += ` AND Posts.CreateAt >= :StartTime AND Posts.CreateAt <= :EndTime query += ` Posts.CreateAt >= :StartTime AND Posts.CreateAt <= :EndTime
GROUP BY DATE(TO_TIMESTAMP(Posts.CreateAt / 1000)) GROUP BY DATE(TO_TIMESTAMP(Posts.CreateAt / 1000))
ORDER BY Name DESC ORDER BY Name DESC
LIMIT 30` LIMIT 30`
@@ -877,16 +877,15 @@ func (s SqlPostStore) AnalyticsPostCountsByDay(teamId string) StoreChannel {
`SELECT `SELECT
DATE(FROM_UNIXTIME(Posts.CreateAt / 1000)) AS Name, DATE(FROM_UNIXTIME(Posts.CreateAt / 1000)) AS Name,
COUNT(Posts.Id) AS Value COUNT(Posts.Id) AS Value
FROM Posts FROM Posts`
INNER JOIN Channels
ON
Posts.ChannelId = Channels.Id`
if len(teamId) > 0 { if len(teamId) > 0 {
query += " AND Channels.TeamId = :TeamId" query += " INNER JOIN Channels ON Posts.ChannelId = Channels.Id AND Channels.TeamId = :TeamId AND"
} else {
query += " WHERE"
} }
query += ` AND Posts.CreateAt <= :EndTime query += ` Posts.CreateAt <= :EndTime
AND Posts.CreateAt >= :StartTime AND Posts.CreateAt >= :StartTime
GROUP BY DATE(FROM_UNIXTIME(Posts.CreateAt / 1000)) GROUP BY DATE(FROM_UNIXTIME(Posts.CreateAt / 1000))
ORDER BY Name DESC ORDER BY Name DESC
@@ -896,15 +895,15 @@ func (s SqlPostStore) AnalyticsPostCountsByDay(teamId string) StoreChannel {
query = query =
`SELECT `SELECT
TO_CHAR(DATE(TO_TIMESTAMP(Posts.CreateAt / 1000)), 'YYYY-MM-DD') AS Name, Count(Posts.Id) AS Value TO_CHAR(DATE(TO_TIMESTAMP(Posts.CreateAt / 1000)), 'YYYY-MM-DD') AS Name, Count(Posts.Id) AS Value
FROM Posts FROM Posts`
INNER JOIN Channels
ON Posts.ChannelId = Channels.Id`
if len(teamId) > 0 { if len(teamId) > 0 {
query += " AND Channels.TeamId = :TeamId" query += " INNER JOIN Channels ON Posts.ChannelId = Channels.Id AND Channels.TeamId = :TeamId AND"
} else {
query += " WHERE"
} }
query += ` AND Posts.CreateAt <= :EndTime query += ` Posts.CreateAt <= :EndTime
AND Posts.CreateAt >= :StartTime AND Posts.CreateAt >= :StartTime
GROUP BY DATE(TO_TIMESTAMP(Posts.CreateAt / 1000)) GROUP BY DATE(TO_TIMESTAMP(Posts.CreateAt / 1000))
ORDER BY Name DESC ORDER BY Name DESC