Skip to content

Commit 980d4de

Browse files
swordkeeswordkee
committedOct 31, 2023
init
1 parent 3127fb5 commit 980d4de

21 files changed

+164
-90
lines changed
 

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
```go
1515
import (
1616
"context"
17-
"github.com/asjdf/gorm-cache/cache"
18-
"github.com/asjdf/gorm-cache/storage"
17+
"github.com/swordkee/gorm-cache-v2/cache"
18+
"github.com/swordkee/gorm-cache-v2/storage"
1919
"github.com/redis/go-redis/v9"
2020
)
2121

‎cache/afterCreate.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package cache
22

33
import (
4-
"github.com/asjdf/gorm-cache/config"
5-
"github.com/asjdf/gorm-cache/util"
4+
"github.com/swordkee/gorm-cache-v2/config"
5+
"github.com/swordkee/gorm-cache-v2/util"
66
"gorm.io/gorm"
77
)
88

‎cache/afterDelete.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package cache
33
import (
44
"sync"
55

6-
"github.com/asjdf/gorm-cache/config"
7-
"github.com/asjdf/gorm-cache/util"
6+
"github.com/swordkee/gorm-cache-v2/config"
7+
"github.com/swordkee/gorm-cache-v2/util"
88
"gorm.io/gorm"
99
)
1010

‎cache/afterUpdate.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package cache
33
import (
44
"sync"
55

6-
"github.com/asjdf/gorm-cache/config"
7-
"github.com/asjdf/gorm-cache/util"
6+
"github.com/swordkee/gorm-cache-v2/config"
7+
"github.com/swordkee/gorm-cache-v2/util"
88
"gorm.io/gorm"
99
)
1010

‎cache/cache.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ package cache
22

33
import (
44
"context"
5-
"github.com/asjdf/gorm-cache/config"
6-
"github.com/asjdf/gorm-cache/storage"
7-
"github.com/asjdf/gorm-cache/util"
85
jsoniter "github.com/json-iterator/go"
6+
"github.com/swordkee/gorm-cache-v2/config"
7+
"github.com/swordkee/gorm-cache-v2/storage"
8+
"github.com/swordkee/gorm-cache-v2/util"
99
"gorm.io/gorm"
1010
)
1111

‎cache/entrance.go

+42-1
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,51 @@ package cache
22

33
import (
44
"fmt"
5+
"github.com/swordkee/gorm-cache-v2/storage"
6+
"gorm.io/gorm"
57

6-
"github.com/asjdf/gorm-cache/config"
8+
"github.com/swordkee/gorm-cache-v2/config"
79
)
810

11+
func NewPlugin(opts ...Option) gorm.Plugin {
12+
cacheConfig := newCache(opts...)
13+
cache := &Gorm2Cache{
14+
Config: cacheConfig,
15+
}
16+
err := cache.Init()
17+
if err != nil {
18+
return nil
19+
}
20+
return cache
21+
}
22+
func newCache(opts ...Option) *config.CacheConfig {
23+
opt := new(config.CacheConfig)
24+
for _, f := range opts {
25+
f(opt)
26+
}
27+
if len(opts) == 0 {
28+
return &config.CacheConfig{
29+
CacheLevel: config.CacheLevelAll,
30+
CacheStorage: storage.NewMem(),
31+
InvalidateWhenUpdate: true,
32+
CacheTTL: 5000,
33+
CacheMaxItemCnt: 50,
34+
}
35+
}
36+
return &config.CacheConfig{
37+
CacheLevel: opt.CacheLevel,
38+
CacheStorage: opt.CacheStorage,
39+
Tables: opt.Tables,
40+
InvalidateWhenUpdate: opt.InvalidateWhenUpdate,
41+
AsyncWrite: false,
42+
CacheTTL: opt.CacheTTL,
43+
CacheMaxItemCnt: opt.CacheMaxItemCnt,
44+
DisableCachePenetrationProtect: false,
45+
DebugMode: opt.DebugMode,
46+
DebugLogger: opt.DebugLogger,
47+
}
48+
}
49+
950
func NewGorm2Cache(cacheConfig *config.CacheConfig) (Cache, error) {
1051
if cacheConfig == nil {
1152
return nil, fmt.Errorf("you pass a nil config")

‎cache/option.go

+61
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
package cache
2+
3+
import (
4+
"github.com/swordkee/gorm-cache-v2/config"
5+
"github.com/swordkee/gorm-cache-v2/storage"
6+
"github.com/swordkee/gorm-cache-v2/util"
7+
)
8+
9+
type Option func(p *config.CacheConfig)
10+
11+
func WithLevel(level config.CacheLevel) Option {
12+
return func(p *config.CacheConfig) {
13+
p.CacheLevel = level
14+
}
15+
}
16+
func WithStorage(storage storage.DataStorage) Option {
17+
return func(p *config.CacheConfig) {
18+
p.CacheStorage = storage
19+
}
20+
}
21+
func WithTables(tables []string) Option {
22+
return func(p *config.CacheConfig) {
23+
p.Tables = tables
24+
}
25+
}
26+
func WithInvalidateWhenUpdate(isBool bool) Option {
27+
return func(p *config.CacheConfig) {
28+
p.InvalidateWhenUpdate = isBool
29+
}
30+
}
31+
func WithAsyncWrite(isBool bool) Option {
32+
return func(p *config.CacheConfig) {
33+
p.AsyncWrite = isBool
34+
}
35+
}
36+
func WithCacheTTL(ttl int64) Option {
37+
return func(p *config.CacheConfig) {
38+
p.CacheTTL = ttl
39+
}
40+
}
41+
func WithCacheMaxItemCnt(cnt int64) Option {
42+
return func(p *config.CacheConfig) {
43+
p.CacheMaxItemCnt = cnt
44+
}
45+
}
46+
func WithDisableCachePenetrationProtect(isBool bool) Option {
47+
return func(p *config.CacheConfig) {
48+
p.DisableCachePenetrationProtect = isBool
49+
}
50+
}
51+
52+
func WithDebugMode(debug bool) Option {
53+
return func(p *config.CacheConfig) {
54+
p.DebugMode = debug
55+
}
56+
}
57+
func WithDebugLogger(log util.LoggerInterface) Option {
58+
return func(p *config.CacheConfig) {
59+
p.DebugLogger = log
60+
}
61+
}

‎cache/query.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ package cache
33
import (
44
"errors"
55
"fmt"
6-
"github.com/asjdf/gorm-cache/config"
7-
"github.com/asjdf/gorm-cache/storage"
8-
"github.com/asjdf/gorm-cache/util"
96
"github.com/hashicorp/go-multierror"
7+
"github.com/swordkee/gorm-cache-v2/config"
8+
"github.com/swordkee/gorm-cache-v2/storage"
9+
"github.com/swordkee/gorm-cache-v2/util"
1010
"gorm.io/gorm"
1111
"gorm.io/gorm/callbacks"
1212
"reflect"

‎config/config.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package config
22

33
import (
4-
"github.com/asjdf/gorm-cache/storage"
5-
"github.com/asjdf/gorm-cache/util"
4+
"github.com/swordkee/gorm-cache-v2/storage"
5+
"github.com/swordkee/gorm-cache-v2/util"
66
)
77

88
type CacheConfig struct {

‎go.mod

+6-15
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,28 @@
1-
module github.com/asjdf/gorm-cache
1+
module github.com/swordkee/gorm-cache-v2
22

3-
go 1.18
3+
go 1.20
44

55
require (
66
github.com/bluele/gcache v0.0.2
7-
github.com/glebarez/sqlite v1.7.0
87
github.com/hashicorp/go-multierror v1.1.1
98
github.com/json-iterator/go v1.1.12
109
github.com/karlseguin/ccache/v3 v3.0.3
11-
github.com/redis/go-redis/v9 v9.0.2
10+
github.com/redis/go-redis/v9 v9.2.1
1211
github.com/smartystreets/goconvey v1.7.2
13-
gorm.io/gorm v1.24.5
12+
gorm.io/driver/mysql v1.5.2
13+
gorm.io/gorm v1.25.2-0.20230530020048-26663ab9bf55
1414
)
1515

1616
require (
1717
github.com/cespare/xxhash/v2 v2.2.0 // indirect
1818
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
19-
github.com/dustin/go-humanize v1.0.1 // indirect
20-
github.com/glebarez/go-sqlite v1.20.3 // indirect
21-
github.com/google/uuid v1.3.0 // indirect
19+
github.com/go-sql-driver/mysql v1.7.0 // indirect
2220
github.com/gopherjs/gopherjs v1.17.2 // indirect
2321
github.com/hashicorp/errwrap v1.0.0 // indirect
2422
github.com/jinzhu/inflection v1.0.0 // indirect
2523
github.com/jinzhu/now v1.1.5 // indirect
2624
github.com/jtolds/gls v4.20.0+incompatible // indirect
27-
github.com/mattn/go-isatty v0.0.17 // indirect
2825
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 // indirect
2926
github.com/modern-go/reflect2 v1.0.2 // indirect
30-
github.com/remyoudompheng/bigfft v0.0.0-20230126093431-47fa9a501578 // indirect
3127
github.com/smartystreets/assertions v1.13.0 // indirect
32-
golang.org/x/sys v0.4.0 // indirect
33-
modernc.org/libc v1.22.2 // indirect
34-
modernc.org/mathutil v1.5.0 // indirect
35-
modernc.org/memory v1.5.0 // indirect
36-
modernc.org/sqlite v1.20.3 // indirect
3728
)

‎go.sum

+11-34
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,17 @@
11
github.com/bluele/gcache v0.0.2 h1:WcbfdXICg7G/DGBh1PFfcirkWOQV+v077yF1pSy3DGw=
22
github.com/bluele/gcache v0.0.2/go.mod h1:m15KV+ECjptwSPxKhOhQoAFQVtUFjTVkc3H8o0t/fp0=
3-
github.com/bsm/ginkgo/v2 v2.5.0 h1:aOAnND1T40wEdAtkGSkvSICWeQ8L3UASX7YVCqQx+eQ=
4-
github.com/bsm/gomega v1.20.0 h1:JhAwLmtRzXFTx2AkALSLa8ijZafntmhSoU63Ok18Uq8=
3+
github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs=
4+
github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA=
55
github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
66
github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
77
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
88
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
99
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
1010
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
1111
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
12-
github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
13-
github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
14-
github.com/glebarez/go-sqlite v1.20.3 h1:89BkqGOXR9oRmG58ZrzgoY/Fhy5x0M+/WV48U5zVrZ4=
15-
github.com/glebarez/go-sqlite v1.20.3/go.mod h1:u3N6D/wftiAzIOJtZl6BmedqxmmkDfH3q+ihjqxC9u0=
16-
github.com/glebarez/sqlite v1.7.0 h1:A7Xj/KN2Lvie4Z4rrgQHY8MsbebX3NyWsL3n2i82MVI=
17-
github.com/glebarez/sqlite v1.7.0/go.mod h1:PkeevrRlF/1BhQBCnzcMWzgrIk7IOop+qS2jUYLfHhk=
12+
github.com/go-sql-driver/mysql v1.7.0 h1:ueSltNNllEqE3qcWBTD0iQd3IpL/6U+mJxLkazJ7YPc=
13+
github.com/go-sql-driver/mysql v1.7.0/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
1814
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
19-
github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26 h1:Xim43kblpZXfIBQsbuBVKCudVG457BR2GZFIz3uw3hQ=
20-
github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
21-
github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
2215
github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
2316
github.com/gopherjs/gopherjs v1.17.2 h1:fQnZVsXk8uxXIStYb0N4bGk7jeyTalG/wsZjQ25dO0g=
2417
github.com/gopherjs/gopherjs v1.17.2/go.mod h1:pRRIvn/QzFLrKfvEz3qUuEhtE/zLCWfreZ6J5gM2i+k=
@@ -28,7 +21,6 @@ github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+l
2821
github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
2922
github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
3023
github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
31-
github.com/jinzhu/now v1.1.4/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
3224
github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
3325
github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
3426
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
@@ -37,43 +29,28 @@ github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7
3729
github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
3830
github.com/karlseguin/ccache/v3 v3.0.3 h1:cz+3tSdTrovp00xHPP3Y6ca/YuSl5kchhYG83wUPYN0=
3931
github.com/karlseguin/ccache/v3 v3.0.3/go.mod h1:qxC372+Qn+IBj8Pe3KvGjHPj0sWwEF7AeZVhsNPZ6uY=
40-
github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng=
41-
github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
4232
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc=
4333
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
4434
github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
4535
github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
4636
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
4737
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
48-
github.com/redis/go-redis/v9 v9.0.2 h1:BA426Zqe/7r56kCcvxYLWe1mkaz71LKF77GwgFzSxfE=
49-
github.com/redis/go-redis/v9 v9.0.2/go.mod h1:/xDTe9EF1LM61hek62Poq2nzQSGj0xSrEtEHbBQevps=
50-
github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
51-
github.com/remyoudompheng/bigfft v0.0.0-20230126093431-47fa9a501578 h1:VstopitMQi3hZP0fzvnsLmzXZdQGc4bEcgu24cp+d4M=
52-
github.com/remyoudompheng/bigfft v0.0.0-20230126093431-47fa9a501578/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
38+
github.com/redis/go-redis/v9 v9.2.1 h1:WlYJg71ODF0dVspZZCpYmoF1+U1Jjk9Rwd7pq6QmlCg=
39+
github.com/redis/go-redis/v9 v9.2.1/go.mod h1:hdY0cQFCN4fnSYT6TkisLufl/4W5UIXyv0b/CLO2V2M=
5340
github.com/smartystreets/assertions v1.2.0/go.mod h1:tcbTF8ujkAEcZ8TElKY+i30BzYlVhC/LOxJk7iOWnoo=
5441
github.com/smartystreets/assertions v1.13.0 h1:Dx1kYM01xsSqKPno3aqLnrwac2LetPvN23diwyr69Qs=
5542
github.com/smartystreets/assertions v1.13.0/go.mod h1:wDmR7qL282YbGsPy6H/yAsesrxfxaaSlJazyFLYVFx8=
5643
github.com/smartystreets/goconvey v1.7.2 h1:9RBaZCeXEQ3UselpuwUQHltGVXvdwm6cv1hgR6gDIPg=
5744
github.com/smartystreets/goconvey v1.7.2/go.mod h1:Vw0tHAZW6lzCRk3xgdin6fKYcG+G3Pg9vgXWeJpQFMM=
5845
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
46+
github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
5947
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
60-
github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
6148
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
6249
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
6350
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
64-
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
65-
golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18=
66-
golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
6751
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
6852
golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
69-
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
70-
gorm.io/gorm v1.24.5 h1:g6OPREKqqlWq4kh/3MCQbZKImeB9e6Xgc4zD+JgNZGE=
71-
gorm.io/gorm v1.24.5/go.mod h1:DVrVomtaYTbqs7gB/x2uVvqnXzv0nqjB396B8cG4dBA=
72-
modernc.org/libc v1.22.2 h1:4U7v51GyhlWqQmwCHj28Rdq2Yzwk55ovjFrdPjs8Hb0=
73-
modernc.org/libc v1.22.2/go.mod h1:uvQavJ1pZ0hIoC/jfqNoMLURIMhKzINIWypNM17puug=
74-
modernc.org/mathutil v1.5.0 h1:rV0Ko/6SfM+8G+yKiyI830l3Wuz1zRutdslNoQ0kfiQ=
75-
modernc.org/mathutil v1.5.0/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
76-
modernc.org/memory v1.5.0 h1:N+/8c5rE6EqugZwHii4IFsaJ7MUhoWX07J5tC/iI5Ds=
77-
modernc.org/memory v1.5.0/go.mod h1:PkUhL0Mugw21sHPeskwZW4D6VscE/GQJOnIpCnW6pSU=
78-
modernc.org/sqlite v1.20.3 h1:SqGJMMxjj1PHusLxdYxeQSodg7Jxn9WWkaAQjKrntZs=
79-
modernc.org/sqlite v1.20.3/go.mod h1:zKcGyrICaxNTMEHSr1HQ2GUraP0j+845GYw37+EyT6A=
53+
gorm.io/driver/mysql v1.5.2 h1:QC2HRskSE75wBuOxe0+iCkyJZ+RqpudsQtqkp+IMuXs=
54+
gorm.io/driver/mysql v1.5.2/go.mod h1:pQLhh1Ut/WUAySdTHwBpBv6+JKcj+ua4ZFx1QQTBzb8=
55+
gorm.io/gorm v1.25.2-0.20230530020048-26663ab9bf55 h1:sC1Xj4TYrLqg1n3AN10w871An7wJM0gzgcm8jkIkECQ=
56+
gorm.io/gorm v1.25.2-0.20230530020048-26663ab9bf55/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k=

‎storage/gcache.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ package storage
22

33
import (
44
"context"
5-
"github.com/asjdf/gorm-cache/util"
65
"github.com/bluele/gcache"
6+
"github.com/swordkee/gorm-cache-v2/util"
77
"strings"
88
"sync"
99
"time"

‎storage/interface.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package storage
33
import (
44
"context"
55
"errors"
6-
"github.com/asjdf/gorm-cache/util"
6+
"github.com/swordkee/gorm-cache-v2/util"
77
)
88

99
var (

‎storage/memory.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"sync"
88
"time"
99

10-
"github.com/asjdf/gorm-cache/util"
10+
"github.com/swordkee/gorm-cache-v2/util"
1111
)
1212

1313
var _ DataStorage = &Memory{}

‎storage/redis.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@ import (
55
"sync"
66
"time"
77

8-
"github.com/asjdf/gorm-cache/util"
98
"github.com/redis/go-redis/v9"
9+
"github.com/swordkee/gorm-cache-v2/util"
1010
)
1111

1212
var _ DataStorage = &Redis{}
1313

1414
type RedisStoreConfig struct {
1515
KeyPrefix string // key prefix will be random if not set
1616

17-
Client *redis.Client // if Client is not nil, Options will be ignored
18-
Options *redis.Options
17+
Client redis.UniversalClient // if Client is not nil, Options will be ignored
18+
Options *redis.UniversalOptions
1919
}
2020

2121
func NewRedis(config ...*RedisStoreConfig) *Redis {
@@ -32,12 +32,12 @@ func NewRedis(config ...*RedisStoreConfig) *Redis {
3232
r.client = config[0].Client
3333
return r
3434
}
35-
r.client = redis.NewClient(config[0].Options)
35+
r.client = redis.NewUniversalClient(config[0].Options)
3636
return r
3737
}
3838

3939
type Redis struct {
40-
client *redis.Client
40+
client redis.UniversalClient
4141
ttl int64
4242
logger util.LoggerInterface
4343
keyPrefix string

0 commit comments

Comments
 (0)