summaryrefslogtreecommitdiffstats
path: root/store/sqlstore/channel_store.go
diff options
context:
space:
mode:
authorChris <ccbrown112@gmail.com>2018-01-31 08:26:40 -0600
committerJoram Wilander <jwawilander@gmail.com>2018-01-31 09:26:40 -0500
commite0ee73ef9963ab398bcc6011795ad23e8e003147 (patch)
tree37c773074588792a3badd2a68dfbbdbfa459164d /store/sqlstore/channel_store.go
parent0c8968fb8df4ce302c928118cd81e75f5bef2861 (diff)
downloadchat-e0ee73ef9963ab398bcc6011795ad23e8e003147.tar.gz
chat-e0ee73ef9963ab398bcc6011795ad23e8e003147.tar.bz2
chat-e0ee73ef9963ab398bcc6011795ad23e8e003147.zip
ABC-79: Optimize channel autocomplete query (#8163)
* optimize channel autocomplete query * move to new autocomplete endpoint
Diffstat (limited to 'store/sqlstore/channel_store.go')
-rw-r--r--store/sqlstore/channel_store.go152
1 files changed, 105 insertions, 47 deletions
diff --git a/store/sqlstore/channel_store.go b/store/sqlstore/channel_store.go
index af78b06e0..c2979526c 100644
--- a/store/sqlstore/channel_store.go
+++ b/store/sqlstore/channel_store.go
@@ -7,6 +7,7 @@ import (
"database/sql"
"fmt"
"net/http"
+ "sort"
"strconv"
"strings"
@@ -81,6 +82,7 @@ func NewSqlChannelStore(sqlStore SqlStore, metrics einterfaces.MetricsInterface)
func (s SqlChannelStore) CreateIndexesIfNotExists() {
s.CreateIndexIfNotExists("idx_channels_team_id", "Channels", "TeamId")
s.CreateIndexIfNotExists("idx_channels_name", "Channels", "Name")
+ s.CreateIndexIfNotExists("idx_channels_displayname", "Channels", "DisplayName")
s.CreateIndexIfNotExists("idx_channels_update_at", "Channels", "UpdateAt")
s.CreateIndexIfNotExists("idx_channels_create_at", "Channels", "CreateAt")
s.CreateIndexIfNotExists("idx_channels_delete_at", "Channels", "DeleteAt")
@@ -1257,18 +1259,58 @@ func (s SqlChannelStore) GetMembersForUser(teamId string, userId string) store.S
})
}
+func (s SqlChannelStore) AutocompleteInTeam(teamId string, term string) store.StoreChannel {
+ return store.Do(func(result *store.StoreResult) {
+ queryFormat := `
+ SELECT
+ *
+ FROM
+ Channels
+ WHERE
+ TeamId = :TeamId
+ AND Type = 'O'
+ AND DeleteAt = 0
+ %v
+ LIMIT 50`
+
+ var channels model.ChannelList
+
+ if likeClause, likeTerm := s.buildLIKEClause(term); likeClause == "" {
+ if _, err := s.GetReplica().Select(&channels, fmt.Sprintf(queryFormat, ""), map[string]interface{}{"TeamId": teamId}); err != nil {
+ result.Err = model.NewAppError("SqlChannelStore.AutocompleteInTeam", "store.sql_channel.search.app_error", nil, "term="+term+", "+", "+err.Error(), http.StatusInternalServerError)
+ }
+ } else {
+ // Using a UNION results in index_merge and fulltext queries and is much faster than the ref
+ // query you would get using an OR of the LIKE and full-text clauses.
+ fulltextClause, fulltextTerm := s.buildFulltextClause(term)
+ likeQuery := fmt.Sprintf(queryFormat, "AND "+likeClause)
+ fulltextQuery := fmt.Sprintf(queryFormat, "AND "+fulltextClause)
+ query := fmt.Sprintf("(%v) UNION (%v) LIMIT 50", likeQuery, fulltextQuery)
+
+ if _, err := s.GetReplica().Select(&channels, query, map[string]interface{}{"TeamId": teamId, "LikeTerm": likeTerm, "FulltextTerm": fulltextTerm}); err != nil {
+ result.Err = model.NewAppError("SqlChannelStore.AutocompleteInTeam", "store.sql_channel.search.app_error", nil, "term="+term+", "+", "+err.Error(), http.StatusInternalServerError)
+ }
+ }
+
+ sort.Slice(channels, func(a, b int) bool {
+ return channels[a].DisplayName < channels[b].DisplayName
+ })
+ result.Data = &channels
+ })
+}
+
func (s SqlChannelStore) SearchInTeam(teamId string, term string) store.StoreChannel {
return store.Do(func(result *store.StoreResult) {
searchQuery := `
SELECT
- *
+ *
FROM
- Channels
+ Channels
WHERE
- TeamId = :TeamId
+ TeamId = :TeamId
AND Type = 'O'
AND DeleteAt = 0
- SEARCH_CLAUSE
+ SEARCH_CLAUSE
ORDER BY DisplayName
LIMIT 100`
@@ -1305,13 +1347,8 @@ func (s SqlChannelStore) SearchMore(userId string, teamId string, term string) s
})
}
-func (s SqlChannelStore) performSearch(searchQuery string, term string, parameters map[string]interface{}) store.StoreResult {
- result := store.StoreResult{}
-
- // Copy the terms as we will need to prepare them differently for each search type.
- likeTerm := term
- fulltextTerm := term
-
+func (s SqlChannelStore) buildLIKEClause(term string) (likeClause, likeTerm string) {
+ likeTerm = term
searchColumns := "Name, DisplayName"
// These chars must be removed from the like query.
@@ -1324,56 +1361,77 @@ func (s SqlChannelStore) performSearch(searchQuery string, term string, paramete
likeTerm = strings.Replace(likeTerm, c, "*"+c, -1)
}
+ if likeTerm == "" {
+ return
+ }
+
+ // Prepare the LIKE portion of the query.
+ var searchFields []string
+ for _, field := range strings.Split(searchColumns, ", ") {
+ if s.DriverName() == model.DATABASE_DRIVER_POSTGRES {
+ searchFields = append(searchFields, fmt.Sprintf("lower(%s) LIKE lower(%s) escape '*'", field, ":LikeTerm"))
+ } else {
+ searchFields = append(searchFields, fmt.Sprintf("%s LIKE %s escape '*'", field, ":LikeTerm"))
+ }
+ }
+
+ likeClause = fmt.Sprintf("(%s)", strings.Join(searchFields, " OR "))
+ likeTerm += "%"
+ return
+}
+
+func (s SqlChannelStore) buildFulltextClause(term string) (fulltextClause, fulltextTerm string) {
+ // Copy the terms as we will need to prepare them differently for each search type.
+ fulltextTerm = term
+
+ searchColumns := "Name, DisplayName"
+
// These chars must be treated as spaces in the fulltext query.
for _, c := range spaceFulltextSearchChar {
fulltextTerm = strings.Replace(fulltextTerm, c, " ", -1)
}
- if likeTerm == "" {
- // If the likeTerm is empty after preparing, then don't bother searching.
- searchQuery = strings.Replace(searchQuery, "SEARCH_CLAUSE", "", 1)
- } else {
- // Prepare the LIKE portion of the query.
- var searchFields []string
- for _, field := range strings.Split(searchColumns, ", ") {
- if s.DriverName() == model.DATABASE_DRIVER_POSTGRES {
- searchFields = append(searchFields, fmt.Sprintf("lower(%s) LIKE lower(%s) escape '*'", field, ":LikeTerm"))
+ // Prepare the FULLTEXT portion of the query.
+ if s.DriverName() == model.DATABASE_DRIVER_POSTGRES {
+ splitTerm := strings.Fields(fulltextTerm)
+ for i, t := range strings.Fields(fulltextTerm) {
+ if i == len(splitTerm)-1 {
+ splitTerm[i] = t + ":*"
} else {
- searchFields = append(searchFields, fmt.Sprintf("%s LIKE %s escape '*'", field, ":LikeTerm"))
+ splitTerm[i] = t + ":* &"
}
}
- likeSearchClause := fmt.Sprintf("(%s)", strings.Join(searchFields, " OR "))
- parameters["LikeTerm"] = fmt.Sprintf("%s%%", likeTerm)
- // Prepare the FULLTEXT portion of the query.
- if s.DriverName() == model.DATABASE_DRIVER_POSTGRES {
- splitTerm := strings.Fields(fulltextTerm)
- for i, t := range strings.Fields(fulltextTerm) {
- if i == len(splitTerm)-1 {
- splitTerm[i] = t + ":*"
- } else {
- splitTerm[i] = t + ":* &"
- }
- }
-
- fulltextTerm = strings.Join(splitTerm, " ")
+ fulltextTerm = strings.Join(splitTerm, " ")
- fulltextSearchClause := fmt.Sprintf("((%s) @@ to_tsquery(:FulltextTerm))", convertMySQLFullTextColumnsToPostgres(searchColumns))
- searchQuery = strings.Replace(searchQuery, "SEARCH_CLAUSE", "AND ("+likeSearchClause+" OR "+fulltextSearchClause+")", 1)
- } else if s.DriverName() == model.DATABASE_DRIVER_MYSQL {
- splitTerm := strings.Fields(fulltextTerm)
- for i, t := range strings.Fields(fulltextTerm) {
- splitTerm[i] = "+" + t + "*"
- }
+ fulltextClause = fmt.Sprintf("((%s) @@ to_tsquery(:FulltextTerm))", convertMySQLFullTextColumnsToPostgres(searchColumns))
+ } else if s.DriverName() == model.DATABASE_DRIVER_MYSQL {
+ splitTerm := strings.Fields(fulltextTerm)
+ for i, t := range strings.Fields(fulltextTerm) {
+ splitTerm[i] = "+" + t + "*"
+ }
- fulltextTerm = strings.Join(splitTerm, " ")
+ fulltextTerm = strings.Join(splitTerm, " ")
- fulltextSearchClause := fmt.Sprintf("MATCH(%s) AGAINST (:FulltextTerm IN BOOLEAN MODE)", searchColumns)
- searchQuery = strings.Replace(searchQuery, "SEARCH_CLAUSE", fmt.Sprintf("AND (%s OR %s)", likeSearchClause, fulltextSearchClause), 1)
- }
+ fulltextClause = fmt.Sprintf("MATCH(%s) AGAINST (:FulltextTerm IN BOOLEAN MODE)", searchColumns)
}
- parameters["FulltextTerm"] = fulltextTerm
+ return
+}
+
+func (s SqlChannelStore) performSearch(searchQuery string, term string, parameters map[string]interface{}) store.StoreResult {
+ result := store.StoreResult{}
+
+ likeClause, likeTerm := s.buildLIKEClause(term)
+ if likeTerm == "" {
+ // If the likeTerm is empty after preparing, then don't bother searching.
+ searchQuery = strings.Replace(searchQuery, "SEARCH_CLAUSE", "", 1)
+ } else {
+ parameters["LikeTerm"] = likeTerm
+ fulltextClause, fulltextTerm := s.buildFulltextClause(term)
+ parameters["FulltextTerm"] = fulltextTerm
+ searchQuery = strings.Replace(searchQuery, "SEARCH_CLAUSE", "AND ("+likeClause+" OR "+fulltextClause+")", 1)
+ }
var channels model.ChannelList