From 995647be2c99224ffa60cb5f572e649b11ad0530 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Tue, 5 Mar 2019 14:22:22 +0100
Subject: [PATCH] removes memory as distcache option

if database caching is to expensive if should
not use distcache in the first place.
---
 pkg/infra/distcache/distcache.go           |  4 ---
 pkg/infra/distcache/memory_storage.go      | 35 ----------------------
 pkg/infra/distcache/memory_storage_test.go | 12 --------
 3 files changed, 51 deletions(-)
 delete mode 100644 pkg/infra/distcache/memory_storage.go
 delete mode 100644 pkg/infra/distcache/memory_storage_test.go

diff --git a/pkg/infra/distcache/distcache.go b/pkg/infra/distcache/distcache.go
index ee824ae4c52..44ab2e08583 100644
--- a/pkg/infra/distcache/distcache.go
+++ b/pkg/infra/distcache/distcache.go
@@ -40,10 +40,6 @@ func createClient(opts *setting.CacheOpts, sqlstore *sqlstore.SqlStore) cacheSto
 		return newMemcacheStorage(opts)
 	}
 
-	if opts.Name == "memory" {
-		return newMemoryStorage()
-	}
-
 	return newDatabaseCache(sqlstore)
 }
 
diff --git a/pkg/infra/distcache/memory_storage.go b/pkg/infra/distcache/memory_storage.go
deleted file mode 100644
index a1203cabe75..00000000000
--- a/pkg/infra/distcache/memory_storage.go
+++ /dev/null
@@ -1,35 +0,0 @@
-package distcache
-
-import (
-	"time"
-
-	gocache "github.com/patrickmn/go-cache"
-)
-
-type memoryStorage struct {
-	c *gocache.Cache
-}
-
-func newMemoryStorage() *memoryStorage {
-	return &memoryStorage{
-		c: gocache.New(time.Minute*30, time.Minute*30),
-	}
-}
-
-func (s *memoryStorage) Put(key string, val interface{}, expires time.Duration) error {
-	return s.c.Add(key, val, expires)
-}
-
-func (s *memoryStorage) Get(key string) (interface{}, error) {
-	val, exist := s.c.Get(key)
-	if !exist {
-		return nil, ErrCacheItemNotFound
-	}
-
-	return val, nil
-}
-
-func (s *memoryStorage) Delete(key string) error {
-	s.c.Delete(key)
-	return nil
-}
diff --git a/pkg/infra/distcache/memory_storage_test.go b/pkg/infra/distcache/memory_storage_test.go
deleted file mode 100644
index 5318b7c19b8..00000000000
--- a/pkg/infra/distcache/memory_storage_test.go
+++ /dev/null
@@ -1,12 +0,0 @@
-package distcache
-
-import (
-	"testing"
-
-	"github.com/grafana/grafana/pkg/setting"
-)
-
-func TestMemoryCacheStorage(t *testing.T) {
-	opts := &setting.CacheOpts{Name: "memory"}
-	runTestsForClient(t, createTestClient(t, opts, nil))
-}