From 937b6480d534b3051cadf4a892a9aa210bec579a Mon Sep 17 00:00:00 2001 From: Jesse Hallam Date: Thu, 25 Oct 2018 13:25:27 -0400 Subject: MM-12342: merge the experimental channel store (#9681) * MM-12342: merge the experimental channel store * gofmt after upgrading to go 1.11 --- store/sqlstore/supplier.go | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'store/sqlstore/supplier.go') 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() -- cgit v1.2.3-1-g7c22