Update dependencies

Author: prashanthpai

README.md

@@ -34,7 +34,7 @@ Create a backend cache instance and install the interceptor:
 import (
 	"database/sql"
 
-	redis "github.com/go-redis/redis/v7"
+	"github.com/go-redis/redis/v8"
 	"github.com/jackc/pgx/v4/stdlib"
 	"github.com/prashanthpai/sqlcache"
 )

cache/cache.go

@@ -1,6 +1,7 @@
 package cache
 
 import (
+	"context"
 	"database/sql/driver"
 	"time"
 )
@@ -17,7 +18,7 @@ type Cacher interface {
 	// Get must return a pointer to the item, a boolean representing whether
 	// item is present or not, and an error (must be nil when key is not
 	// present).
-	Get(key string) (*Item, bool, error)
+	Get(ctx context.Context, key string) (*Item, bool, error)
 	// Set sets the item into cache with the given TTL.
-	Set(key string, item *Item, ttl time.Duration) error
+	Set(ctx context.Context, key string, item *Item, ttl time.Duration) error
 }

cache_redis.go

@@ -1,12 +1,13 @@
 package sqlcache
 
 import (
+	"context"
 	"time"
 
 	"github.com/prashanthpai/sqlcache/cache"
 
-	redis "github.com/go-redis/redis/v7"
-	msgpack "github.com/vmihailenco/msgpack/v4"
+	"github.com/go-redis/redis/v8"
+	"github.com/vmihailenco/msgpack/v4"
 )
 
 // Redis implements cache.Cacher interface to use redis as backend with
@@ -18,8 +19,8 @@ type Redis struct {
 
 // Get gets a cache item from redis. Returns pointer to the item, a boolean
 // which represents whether key exists or not and an error.
-func (r *Redis) Get(key string) (*cache.Item, bool, error) {
-	b, err := r.c.Get(r.keyPrefix + key).Bytes()
+func (r *Redis) Get(ctx context.Context, key string) (*cache.Item, bool, error) {
+	b, err := r.c.Get(ctx, r.keyPrefix+key).Bytes()
 	switch err {
 	case nil:
 		var item cache.Item
@@ -35,13 +36,13 @@ func (r *Redis) Get(key string) (*cache.Item, bool, error) {
 }
 
 // Set sets the given item into redis with provided TTL duration.
-func (r *Redis) Set(key string, item *cache.Item, ttl time.Duration) error {
+func (r *Redis) Set(ctx context.Context, key string, item *cache.Item, ttl time.Duration) error {
 	b, err := msgpack.Marshal(item)
 	if err != nil {
 		return err
 	}
 
-	_, err = r.c.Set(r.keyPrefix+key, b, ttl).Result()
+	_, err = r.c.Set(ctx, r.keyPrefix+key, b, ttl).Result()
 	return err
 }
 

cache_ristretto.go

@@ -1,6 +1,7 @@
 package sqlcache
 
 import (
+	"context"
 	"fmt"
 	"time"
 
@@ -17,7 +18,7 @@ type Ristretto struct {
 
 // Get gets a cache item from ristretto. Returns pointer to the item, a boolean
 // which represents whether key exists or not and an error.
-func (r *Ristretto) Get(key string) (*cache.Item, bool, error) {
+func (r *Ristretto) Get(ctx context.Context, key string) (*cache.Item, bool, error) {
 	i, ok := r.c.Get(key)
 	if !ok {
 		return nil, false, nil
@@ -32,7 +33,7 @@ func (r *Ristretto) Get(key string) (*cache.Item, bool, error) {
 }
 
 // Set sets the given item into ristretto with provided TTL duration.
-func (r *Ristretto) Set(key string, item *cache.Item, ttl time.Duration) error {
+func (r *Ristretto) Set(ctx context.Context, key string, item *cache.Item, ttl time.Duration) error {
 	// using # of rows as cost
 	_ = r.c.SetWithTTL(key, item, int64(len(item.Rows)), ttl)
 	return nil

doc.go

@@ -9,7 +9,7 @@ Usage:
 	import (
 		"database/sql"
 
-		redis "github.com/go-redis/redis/v7"
+		"github.com/go-redis/redis/v8"
 		"github.com/prashanthpai/sqlcache"
 		"github.com/jackc/pgx/v4/stdlib"
 	)

example/README.md

@@ -0,0 +1,23 @@
+# example
+
+```sh
+ppai@mbp:~/src/sqlcache/example$ go build .
+ppai@mbp:~/src/sqlcache/example$ ./example
+i=0; t=2.796458ms
+i=1; t=536.167µs
+i=2; t=242.125µs
+i=3; t=434.375µs
+i=4; t=273.666µs
+i=5; t=1.674375ms
+i=6; t=281.083µs
+i=7; t=166.167µs
+i=8; t=240.542µs
+i=9; t=211.375µs
+i=10; t=1.464042ms
+i=11; t=381.25µs
+i=12; t=293.459µs
+i=13; t=284.708µs
+i=14; t=240.75µs
+
+Interceptor metrics: &{Hits:12 Misses:3 Errors:0}
+```

example/main.go

@@ -11,8 +11,8 @@ import (
 	"github.com/prashanthpai/sqlcache/cache"
 
 	"github.com/dgraph-io/ristretto"
-	redis "github.com/go-redis/redis/v7"
 	"github.com/jackc/pgx/v4/stdlib"
+	//	"github.com/go-redis/redis/v8"
 )
 
 const (
@@ -32,17 +32,19 @@ func newRistrettoCache(maxRowsToCache int64) (cache.Cacher, error) {
 	return sqlcache.NewRistretto(c), nil
 }
 
+/*
 func newRedisCache() (cache.Cacher, error) {
 	r := redis.NewUniversalClient(&redis.UniversalOptions{
 		Addrs: []string{"127.0.0.1:6379"},
 	})
 
-	if _, err := r.Ping().Result(); err != nil {
+	if _, err := r.Ping(context.Background()).Result(); err != nil {
 		return nil, err
 	}
 
 	return sqlcache.NewRedis(r, "sqc:"), nil
 }
+*/
 
 func main() {
 
@@ -52,7 +54,7 @@ func main() {
 	}
 
 	/*
-		cache, err := newRedisCache()
+		cache, err = newRedisCache()
 		if err != nil {
 			log.Fatalf("newRedisCache() failed: %v", err)
 		}
@@ -80,7 +82,7 @@ func main() {
 func run() error {
 
 	db, err := sql.Open("pgx-sqlcache",
-		"host=127.0.0.1 port=5432 user=prashanthpai dbname=postgres sslmode=disable")
+		"host=localhost user=postgres dbname=postgres password=postgres")
 	if err != nil {
 		return err
 	}

go.mod

@@ -1,14 +1,41 @@
 module github.com/prashanthpai/sqlcache
 
-go 1.14
+go 1.19
 
 require (
-	github.com/DATA-DOG/go-sqlmock v1.4.1
-	github.com/dgraph-io/ristretto v0.0.3
-	github.com/go-redis/redis/v7 v7.4.0
-	github.com/jackc/pgx/v4 v4.6.0
-	github.com/mitchellh/hashstructure v1.0.0
-	github.com/ngrok/sqlmw v0.0.0-20200129213757-d5c93a81bec6
-	github.com/stretchr/testify v1.6.1
+	github.com/DATA-DOG/go-sqlmock v1.5.0
+	github.com/dgraph-io/ristretto v0.1.1
+	github.com/go-redis/redis/v8 v8.11.5
+	github.com/jackc/pgx/v4 v4.18.1
+	github.com/mitchellh/hashstructure/v2 v2.0.2
+	github.com/ngrok/sqlmw v0.0.0-20220520173518-97c9c04efc79
+	github.com/stretchr/testify v1.8.2
 	github.com/vmihailenco/msgpack/v4 v4.3.12
 )
+
+require (
+	github.com/cespare/xxhash/v2 v2.1.2 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
+	github.com/dustin/go-humanize v1.0.0 // indirect
+	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect
+	github.com/golang/protobuf v1.3.4 // indirect
+	github.com/jackc/chunkreader/v2 v2.0.1 // indirect
+	github.com/jackc/pgconn v1.14.0 // indirect
+	github.com/jackc/pgio v1.0.0 // indirect
+	github.com/jackc/pgpassfile v1.0.0 // indirect
+	github.com/jackc/pgproto3/v2 v2.3.2 // indirect
+	github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
+	github.com/jackc/pgtype v1.14.0 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/stretchr/objx v0.5.0 // indirect
+	github.com/vmihailenco/tagparser v0.1.1 // indirect
+	golang.org/x/crypto v0.6.0 // indirect
+	golang.org/x/net v0.6.0 // indirect
+	golang.org/x/sys v0.5.0 // indirect
+	golang.org/x/text v0.7.0 // indirect
+	google.golang.org/appengine v1.6.5 // indirect
+	gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+)