diff options
author | George Goldberg <george@gberg.me> | 2018-03-19 10:53:37 +0000 |
---|---|---|
committer | George Goldberg <george@gberg.me> | 2018-03-19 10:53:37 +0000 |
commit | 37f0e5e0ebc0595efe2c65ffb84fa096dc8c5493 (patch) | |
tree | 4b791b279109a10a66b62aaeeeae3d5243d2961b /store/sqlstore | |
parent | fadcdd271a68b38571b75d1d38ab023f940ac83a (diff) | |
parent | 4b675b347b5241def7807fab5e01ce9b98531815 (diff) | |
download | chat-37f0e5e0ebc0595efe2c65ffb84fa096dc8c5493.tar.gz chat-37f0e5e0ebc0595efe2c65ffb84fa096dc8c5493.tar.bz2 chat-37f0e5e0ebc0595efe2c65ffb84fa096dc8c5493.zip |
Merge branch 'master' into advanced-permissions-phase-1
Diffstat (limited to 'store/sqlstore')
-rw-r--r-- | store/sqlstore/post_store.go | 85 |
1 files changed, 62 insertions, 23 deletions
diff --git a/store/sqlstore/post_store.go b/store/sqlstore/post_store.go index 92ee28ffa..3ff9a3e1b 100644 --- a/store/sqlstore/post_store.go +++ b/store/sqlstore/post_store.go @@ -687,31 +687,70 @@ func (s SqlPostStore) getRootPosts(channelId string, offset int, limit int) stor func (s SqlPostStore) getParentsPosts(channelId string, offset int, limit int) store.StoreChannel { return store.Do(func(result *store.StoreResult) { var posts []*model.Post - _, err := s.GetReplica().Select(&posts, - `SELECT - q2.* + _, err := s.GetReplica().Select(&posts, ` + SELECT + * FROM - Posts q2 - INNER JOIN - (SELECT DISTINCT - q3.RootId - FROM - (SELECT - RootId - FROM - Posts - WHERE - ChannelId = :ChannelId1 - AND DeleteAt = 0 - ORDER BY CreateAt DESC - LIMIT :Limit OFFSET :Offset) q3 - WHERE q3.RootId != '') q1 - ON q1.RootId = q2.Id OR q1.RootId = q2.RootId + Posts WHERE - ChannelId = :ChannelId2 - AND DeleteAt = 0 - ORDER BY CreateAt`, - map[string]interface{}{"ChannelId1": channelId, "Offset": offset, "Limit": limit, "ChannelId2": channelId}) + Id IN (SELECT * FROM ( + -- The root post of any replies in the window + (SELECT * FROM ( + SELECT + CASE RootId + WHEN '' THEN NULL + ELSE RootId + END + FROM + Posts + WHERE + ChannelId = :ChannelId1 + AND DeleteAt = 0 + ORDER BY + CreateAt DESC + LIMIT :Limit1 OFFSET :Offset1 + ) x ) + + UNION + + -- The reply posts to all threads intersecting with the window, including replies + -- to root posts in the window itself. + ( + SELECT + Id + FROM + Posts + WHERE RootId IN (SELECT * FROM ( + SELECT + CASE RootId + -- If there is no RootId, return the post id itself to be considered + -- as a root post. + WHEN '' THEN Id + -- If there is a RootId, this post isn't a root post and return its + -- root to be considered as a root post. + ELSE RootId + END + FROM + Posts + WHERE + ChannelId = :ChannelId2 + AND DeleteAt = 0 + ORDER BY + CreateAt DESC + LIMIT :Limit2 OFFSET :Offset2 + ) x ) + ) + ) x ) + AND + DeleteAt = 0 + `, map[string]interface{}{ + "ChannelId1": channelId, + "ChannelId2": channelId, + "Offset1": offset, + "Offset2": offset, + "Limit1": limit, + "Limit2": limit, + }) if err != nil { result.Err = model.NewAppError("SqlPostStore.GetLinearPosts", "store.sql_post.get_parents_posts.app_error", nil, "channelId="+channelId+" err="+err.Error(), http.StatusInternalServerError) } else { |