MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2024-12-24 06:05:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #94 from fkautz/pr_out_refactoring_file_storage_driver_to_fsstorage

Browse Source
This commit is contained in:
Frederick F. Kautz IV 2014-12-08 15:27:37 -08:00
commit c2917f0d64
5 changed files with 14 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/gateway/gateway.go
View File

@ -8,7 +8,7 @@ import (
"path" "path"
"github.com/gorilla/mux" "github.com/gorilla/mux"
"github.com/minio-io/minio/pkgs/storage" "github.com/minio-io/minio/pkgs/storage/fsstorage"
"github.com/tchap/go-patricia/patricia" "github.com/tchap/go-patricia/patricia"
) )
@ -197,7 +197,7 @@ func InMemoryStorageDriver(bucket string, input chan ObjectRequest, config Gatew
} }
func SimpleFileStorageDriver(bucket string, input chan ObjectRequest, config GatewayConfig) { func SimpleFileStorageDriver(bucket string, input chan ObjectRequest, config GatewayConfig) {
fileStorage := storage.FileStorage{ fileStorage := fsstorage.FileSystemStorage{
RootDir: config.dataDir, RootDir: config.dataDir,
} }
for request := range input { for request := range input {

8
pkgs/storage/file_storage.go → pkgs/storage/fsstorage/fs_storage.go
View File

@ -1,4 +1,4 @@
package storage package fsstorage
import ( import (
"io/ioutil" "io/ioutil"
@ -7,16 +7,16 @@ import (
"path/filepath" "path/filepath"
) )
type FileStorage struct { type FileSystemStorage struct {
RootDir string RootDir string
} }
func (storage FileStorage) Get(objectPath string) ([]byte, error) { func (storage FileSystemStorage) Get(objectPath string) ([]byte, error) {
return ioutil.ReadFile(path.Join(storage.RootDir, objectPath)) return ioutil.ReadFile(path.Join(storage.RootDir, objectPath))
} }
func (storage FileStorage) Put(objectPath string, object []byte) error { func (storage FileSystemStorage) Put(objectPath string, object []byte) error {
os.MkdirAll(filepath.Dir(path.Join(storage.RootDir, objectPath)), 0700) os.MkdirAll(filepath.Dir(path.Join(storage.RootDir, objectPath)), 0700)
return ioutil.WriteFile(path.Join(storage.RootDir, objectPath), object, 0600) return ioutil.WriteFile(path.Join(storage.RootDir, objectPath), object, 0600)
} }

4
pkgs/storage/file_storage_test.go → pkgs/storage/fsstorage/fs_storage_test.go
View File

@ -1,4 +1,4 @@
package storage package fsstorage
import ( import (
. "gopkg.in/check.v1" . "gopkg.in/check.v1"
@ -6,7 +6,7 @@ import (
"os" "os"
) )
type FileStorageSuite struct{} type FileSystemStorageSuite struct{}
var _ = Suite(&FileStorageSuite{}) var _ = Suite(&FileStorageSuite{})

14
pkgs/storage/storage.go
View File

@ -1,20 +1,6 @@
package storage package storage
import (
"fmt"
"github.com/gorilla/mux"
"net/http"
)
type ObjectStorage interface { type ObjectStorage interface {
Get(path string) ([]byte, error) Get(path string) ([]byte, error)
Put(path string, object []byte) error Put(path string, object []byte) error
} }
func RegisterStorageHandlers(router *mux.Router) {
router.HandleFunc("/storage/rpc", StorageHandler)
}
func StorageHandler(w http.ResponseWriter, req *http.Request) {
fmt.Fprintf(w, "Storage")
}

7
pkgs/storage/storage_test.go
View File

@ -1,6 +1,7 @@
package storage package storage
import ( import (
"fmt"
"io/ioutil" "io/ioutil"
"log" "log"
"net/http" "net/http"
@ -9,7 +10,7 @@ import (
) )
func TestPrintsStorage(t *testing.T) { func TestPrintsStorage(t *testing.T) {
server := httptest.NewServer(http.HandlerFunc(StorageHandler)) server := httptest.NewServer(http.HandlerFunc(storageHandler))
defer server.Close() defer server.Close()
res, err := http.Get(server.URL) res, err := http.Get(server.URL)
if err != nil { if err != nil {
@ -25,3 +26,7 @@ func TestPrintsStorage(t *testing.T) {
log.Fatal("Expected 'Storage', Received '" + bodyString + "'") log.Fatal("Expected 'Storage', Received '" + bodyString + "'")
} }
} }
func storageHandler(w http.ResponseWriter, req *http.Request) {
fmt.Fprintf(w, "Storage")
}