diff options
author | Jesse Hallam <jesse.hallam@gmail.com> | 2018-10-25 13:25:27 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-25 13:25:27 -0400 |
commit | 937b6480d534b3051cadf4a892a9aa210bec579a (patch) | |
tree | 7f8bcbde439f25cc9c0e405329ddf8a788208319 /store/sqlstore/supplier.go | |
parent | 1074a1c7ab0769b0da3525282fcabf961e2ddfce (diff) | |
download | chat-937b6480d534b3051cadf4a892a9aa210bec579a.tar.gz chat-937b6480d534b3051cadf4a892a9aa210bec579a.tar.bz2 chat-937b6480d534b3051cadf4a892a9aa210bec579a.zip |
* MM-12342: merge the experimental channel store
* gofmt after upgrading to go 1.11
Diffstat (limited to 'store/sqlstore/supplier.go')
-rw-r--r-- | store/sqlstore/supplier.go | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/store/sqlstore/supplier.go b/store/sqlstore/supplier.go index 2fc299dc9..c0c92aaaf 100644 --- a/store/sqlstore/supplier.go +++ b/store/sqlstore/supplier.go @@ -118,13 +118,8 @@ func NewSqlSupplier(settings model.SqlSettings, metrics einterfaces.MetricsInter supplier.initConnection() - enableExperimentalPublicChannelsMaterialization := true - if settings.EnablePublicChannelsMaterialization != nil && !*settings.EnablePublicChannelsMaterialization { - enableExperimentalPublicChannelsMaterialization = false - } - supplier.oldStores.team = NewSqlTeamStore(supplier) - supplier.oldStores.channel = NewSqlChannelStoreExperimental(supplier, metrics, enableExperimentalPublicChannelsMaterialization) + supplier.oldStores.channel = NewSqlChannelStore(supplier, metrics) supplier.oldStores.post = NewSqlPostStore(supplier, metrics) supplier.oldStores.user = NewSqlUserStore(supplier, metrics) supplier.oldStores.audit = NewSqlAuditStore(supplier) @@ -162,7 +157,7 @@ func NewSqlSupplier(settings model.SqlSettings, metrics einterfaces.MetricsInter UpgradeDatabase(supplier) supplier.oldStores.team.(*SqlTeamStore).CreateIndexesIfNotExists() - supplier.oldStores.channel.(*SqlChannelStoreExperimental).CreateIndexesIfNotExists() + supplier.oldStores.channel.(*SqlChannelStore).CreateIndexesIfNotExists() supplier.oldStores.post.(*SqlPostStore).CreateIndexesIfNotExists() supplier.oldStores.user.(*SqlUserStore).CreateIndexesIfNotExists() supplier.oldStores.audit.(*SqlAuditStore).CreateIndexesIfNotExists() |