From 81c1fad4d4fcc48eebc61905fe4a6226350edd88 Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Fri, 1 Dec 2017 23:20:11 -0800 Subject: Revert "Hash key for plugin store table and limit plugin ID length (#7915)" (#7931) This reverts commit c3af8785734803b6199a28249537ef3e47fe4caa. --- store/sqlstore/plugin_store.go | 4 ++-- store/sqlstore/upgrade.go | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'store') diff --git a/store/sqlstore/plugin_store.go b/store/sqlstore/plugin_store.go index 66a082cdf..a4b49cb27 100644 --- a/store/sqlstore/plugin_store.go +++ b/store/sqlstore/plugin_store.go @@ -21,8 +21,8 @@ func NewSqlPluginStore(sqlStore SqlStore) store.PluginStore { for _, db := range sqlStore.GetAllConns() { table := db.AddTableWithName(model.PluginKeyValue{}, "PluginKeyValueStore").SetKeys(false, "PluginId", "Key") - table.ColMap("PluginId").SetMaxSize(200) - table.ColMap("Key").SetMaxSize(50) + table.ColMap("PluginId").SetMaxSize(100) + table.ColMap("Key").SetMaxSize(100) table.ColMap("Value").SetMaxSize(8192) } diff --git a/store/sqlstore/upgrade.go b/store/sqlstore/upgrade.go index 55a408c7f..d10235135 100644 --- a/store/sqlstore/upgrade.go +++ b/store/sqlstore/upgrade.go @@ -323,10 +323,6 @@ func UpgradeDatabaseToVersion44(sqlStore SqlStore) { } func UpgradeDatabaseToVersion45(sqlStore SqlStore) { - //TODO: Remove next two lines before 4.5 release. They're just here to fix CI servers - sqlStore.AlterColumnTypeIfExists("PluginKeyValueStore", "PluginId", "varchar(50)", "varchar(50)") - sqlStore.AlterColumnTypeIfExists("PluginKeyValueStore", "PKey", "varchar(200)", "varchar(200)") - //TODO: Uncomment when 4.5 is released /*if shouldPerformUpgrade(sqlStore, VERSION_4_4_0, VERSION_4_5_0) { -- cgit v1.2.3-1-g7c22