feat: Add interchangeable write buffers based on io.File and filebuffer.Buffer

This commit is contained in:
Felicitas Pojtinger
2021-12-24 16:55:14 +01:00
parent 31459e0efd
commit 087630710c
9 changed files with 159 additions and 69 deletions

View File

@@ -1,16 +1,32 @@
package cache
func CheckCacheType(cacheType string) error {
func CheckFileSystemCacheType(cacheType string) error {
cacheTypeIsKnown := false
for _, candidate := range KnownCacheTypes {
for _, candidate := range KnownFileSystemCacheTypes {
if cacheType == candidate {
cacheTypeIsKnown = true
}
}
if !cacheTypeIsKnown {
return ErrCacheTypeUnknown
return ErrFileSystemCacheTypeUnknown
}
return nil
}
func CheckWriteCacheType(cacheType string) error {
cacheTypeIsKnown := false
for _, candidate := range KnownWriteCacheTypes {
if cacheType == candidate {
cacheTypeIsKnown = true
}
}
if !cacheTypeIsKnown {
return ErrWriteCacheTypeUnknown
}
return nil

View File

@@ -5,10 +5,15 @@ import (
)
const (
CacheTypeMemory = "memory"
CacheTypeDir = "dir"
FileSystemCacheTypeMemory = "memory"
FileSystemCacheTypeDir = "dir"
WriteCacheTypeMemory = "memory"
WriteCacheTypeFile = "file"
)
var (
KnownCacheTypes = []string{config.NoneKey, CacheTypeMemory, CacheTypeDir}
KnownFileSystemCacheTypes = []string{config.NoneKey, FileSystemCacheTypeMemory, FileSystemCacheTypeDir}
KnownWriteCacheTypes = []string{WriteCacheTypeMemory, WriteCacheTypeFile}
)

View File

@@ -3,6 +3,9 @@ package cache
import "errors"
var (
ErrCacheTypeUnsupported = errors.New("cache type unsupported")
ErrCacheTypeUnknown = errors.New("cache type unknown")
ErrFileSystemCacheTypeUnsupported = errors.New("file system cache type unsupported")
ErrFileSystemCacheTypeUnknown = errors.New("file system cache type unknown")
ErrWriteCacheTypeUnsupported = errors.New("write cache type unsupported")
ErrWriteCacheTypeUnknown = errors.New("write cache type unknown")
)

View File

@@ -9,7 +9,7 @@ import (
"github.com/spf13/afero"
)
func Cache(
func NewCacheFilesystem(
base afero.Fs,
root string,
cacheType string,
@@ -17,13 +17,13 @@ func Cache(
cacheDir string,
) (afero.Fs, error) {
switch cacheType {
case CacheTypeMemory:
case FileSystemCacheTypeMemory:
if pathext.IsRoot(root) {
return afero.NewCacheOnReadFs(base, afero.NewMemMapFs(), ttl), nil
}
return afero.NewCacheOnReadFs(afero.NewBasePathFs(base, root), afero.NewMemMapFs(), ttl), nil
case CacheTypeDir:
case FileSystemCacheTypeDir:
if err := os.MkdirAll(cacheDir, os.ModePerm); err != nil {
return nil, err
}
@@ -40,6 +40,6 @@ func Cache(
return afero.NewBasePathFs(base, root), nil
default:
return nil, ErrCacheTypeUnsupported
return nil, ErrFileSystemCacheTypeUnsupported
}
}

76
internal/cache/write.go vendored Normal file
View File

@@ -0,0 +1,76 @@
package cache
import (
"io/ioutil"
"os"
"path/filepath"
"github.com/mattetti/filebuffer"
"github.com/pojntfx/stfs/internal/fs"
"github.com/spf13/afero"
)
type fileWithSize struct {
afero.File
}
func (f fileWithSize) Size() (int64, error) {
info, err := f.Stat()
if err != nil {
return -1, err
}
return info.Size(), nil
}
type filebufferWithSize struct {
*filebuffer.Buffer
}
func (f filebufferWithSize) Size() (int64, error) {
return int64(f.Buff.Len()), nil
}
func (f filebufferWithSize) Sync() error {
// No need to sync a in-memory buffer
return nil
}
func (f filebufferWithSize) Truncate(size int64) error {
f.Buff.Truncate(int(size))
return nil
}
func NewCacheWrite(
root string,
cacheType string,
) (cache fs.WriteCache, cleanup func() error, err error) {
switch cacheType {
case WriteCacheTypeMemory:
buff := &filebufferWithSize{filebuffer.New([]byte{})}
return buff, func() error {
buff = nil
return nil
}, nil
case WriteCacheTypeFile:
tmpdir := filepath.Join(root, "io")
if err := os.MkdirAll(tmpdir, os.ModePerm); err != nil {
return nil, nil, err
}
f, err := ioutil.TempFile(tmpdir, "*")
if err != nil {
return nil, nil, err
}
return fileWithSize{f}, func() error {
return os.Remove(filepath.Join(tmpdir, f.Name()))
}, nil
default:
return nil, nil, ErrWriteCacheTypeUnsupported
}
}