Skip to content

Commit

Permalink
feat(storers): Use UUID for memcached keys
Browse files Browse the repository at this point in the history
  • Loading branch information
Vincent Jordan committed Feb 14, 2024
1 parent 95cace4 commit 182d3aa
Showing 1 changed file with 72 additions and 46 deletions.
118 changes: 72 additions & 46 deletions pkg/storage/nutsMemcachedProvider.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
t "github.com/darkweak/souin/configurationtypes"
"github.com/darkweak/souin/pkg/rfc"
"github.com/darkweak/souin/pkg/storage/types"
"github.com/google/uuid"
"github.com/imdario/mergo"
"github.com/nutsdb/nutsdb"
"go.uber.org/zap"
Expand Down Expand Up @@ -179,29 +180,10 @@ func (provider *NutsMemcached) MapKeys(prefix string) map[string]string {

// Get method returns the populated response if exists, empty response then
func (provider *NutsMemcached) Get(key string) (item []byte) {
// get from nuts
keyFound := false
{
_ = provider.DB.View(func(tx *nutsdb.Tx) error {
i, e := tx.Get(bucket, []byte(key))
if i != nil {
// Value is stored in memcached
//item = i.Value
keyFound = true
}
return e
})
}

// get from memcached
if keyFound {
// Reminder: the key must be at most 250 bytes in length
//fmt.Println("memcached GET", key)
i, e := provider.memcacheClient.Get(key)
if e == nil && i != nil {
item = i.Value
}
memcachedKey, _ := provider.getFromNuts(key)

if memcachedKey != "" {
item, _ = provider.getFromMemcached(memcachedKey)
}

return
Expand All @@ -220,14 +202,14 @@ func (provider *NutsMemcached) Prefix(key string, req *http.Request, validator *
for _, entry := range entries {
if varyVoter(key, req, string(entry.Key)) {
// TODO: improve this
// store header only in nuts and avoid query to memcached on each vary
// Store only response header in nuts and avoid query to memcached on each vary
// E.g, rfc.ValidateETag on NutsDB header value, retrieve response body later from memcached.

// Reminder: the key must be at most 250 bytes in length
//fmt.Println("memcached PREFIX", key, "GET", string(entry.Key))
i, e := provider.memcacheClient.Get(string(entry.Key))
if e == nil && i != nil {
res, err := http.ReadResponse(bufio.NewReader(bytes.NewBuffer(i.Value)), req)
i, e := provider.getFromMemcached(string(entry.Value))
if e == nil {
res, err := http.ReadResponse(bufio.NewReader(bytes.NewBuffer(i)), req)
if err == nil {
rfc.ValidateETag(res, validator)
if validator.Matched {
Expand Down Expand Up @@ -257,12 +239,14 @@ func (provider *NutsMemcached) Set(key string, value []byte, url t.URL, ttl time
if ttl == 0 {
ttl = url.TTL.Duration
}
memcachedKey := uuid.New().String()

// set to nuts (normal TTL)
{
err := provider.DB.Update(func(tx *nutsdb.Tx) error {
// No value is stored, value is stored in memcached
return tx.Put(bucket, []byte(key), []byte{}, uint32(ttl.Seconds()))

// key: cache-key, value: memcached-key
return tx.Put(bucket, []byte(key), []byte(memcachedKey), uint32(ttl.Seconds()))
})

if err != nil {
Expand All @@ -275,8 +259,8 @@ func (provider *NutsMemcached) Set(key string, value []byte, url t.URL, ttl time
staleTtl := int32((provider.stale + ttl).Seconds())
{
err := provider.DB.Update(func(tx *nutsdb.Tx) error {
// No value is stored, value is stored in memcached
return tx.Put(bucket, []byte(StalePrefix+key), []byte{}, uint32(staleTtl))
// key: "STALE_" + cache-key, value: memcached-key
return tx.Put(bucket, []byte(StalePrefix+key), []byte(memcachedKey), uint32(staleTtl))
})

if err != nil {
Expand All @@ -285,38 +269,36 @@ func (provider *NutsMemcached) Set(key string, value []byte, url t.URL, ttl time
}

// set to memcached with stale TTL
{
// Reminder: the key must be at most 250 bytes in length
//fmt.Println("memcached SET", key)
err := provider.memcacheClient.Set(
&memcache.Item{
Key: key,
Value: value,
Expiration: staleTtl,
},
)
if err != nil {
provider.logger.Sugar().Errorf("Impossible to set value into Memcached, %v", err)
}
}
_ = provider.setToMemcached(memcachedKey, value, staleTtl)

return nil
}

// Delete method will delete the response in Nuts provider if exists corresponding to key param
func (provider *NutsMemcached) Delete(key string) {
memcachedKey, _ := provider.getFromNuts(key)

// delete from memcached
if memcachedKey != "" {
_ = provider.delFromMemcached(memcachedKey)
}

// delete from nuts
_ = provider.DB.Update(func(tx *nutsdb.Tx) error {
return tx.Delete(bucket, []byte(key))
})
}

// DeleteMany method will delete the responses in Nuts provider if exists corresponding to the regex key param
func (provider *NutsMemcached) DeleteMany(key string) {
func (provider *NutsMemcached) DeleteMany(keyReg string) {
_ = provider.DB.Update(func(tx *nutsdb.Tx) error {
if entries, err := tx.PrefixSearchScan(bucket, []byte(""), key, 0, nutsLimit); err != nil {
if entries, err := tx.PrefixSearchScan(bucket, []byte(""), keyReg, 0, nutsLimit); err != nil {
return err
} else {
for _, entry := range entries {
// delete from memcached
_ = provider.delFromMemcached(string(entry.Value))
// delete from nuts
_ = tx.Delete(bucket, entry.Key)
}
}
Expand All @@ -335,3 +317,47 @@ func (provider *NutsMemcached) Reset() error {
return tx.DeleteBucket(1, bucket)
})
}

func (provider *NutsMemcached) getFromNuts(nutsKey string) (memcachedKey string, err error) {
err = provider.DB.View(func(tx *nutsdb.Tx) error {
i, e := tx.Get(bucket, []byte(nutsKey))
if i != nil {
memcachedKey = string(i.Value)
}
return e
})
return
}

// Reminder: the memcachedKey must be at most 250 bytes in length
func (provider *NutsMemcached) setToMemcached(memcachedKey string, value []byte, ttl int32) (err error) {
//fmt.Println("memcached SET", key)
err = provider.memcacheClient.Set(
&memcache.Item{
Key: memcachedKey,
Value: value,
Expiration: ttl,
},
)
if err != nil {
provider.logger.Sugar().Errorf("Failed to set into memcached, %v", err)
}
return
}

// Reminder: the memcachedKey must be at most 250 bytes in length
func (provider *NutsMemcached) getFromMemcached(memcachedKey string) (value []byte, err error) {
//fmt.Println("memcached GET", key)
i, err := provider.memcacheClient.Get(memcachedKey)
if err == nil && i != nil {
value = i.Value
} else {
provider.logger.Sugar().Errorf("Failed to get from memcached, %v", err)
}
return
}

func (provider *NutsMemcached) delFromMemcached(memcachedKey string) (err error) {
err = provider.memcacheClient.Delete(memcachedKey)
return
}

0 comments on commit 182d3aa

Please sign in to comment.