MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-12-07 08:12:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

Removing fsstorage

Browse Source
This commit is contained in:
Frederick F. Kautz IV
2014-12-15 16:13:41 +13:00
parent 62797cd6a7
commit 05baa6d9a2
9 changed files with 22 additions and 334 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
pkgs/gateway/gateway.go
View File

@@ -26,7 +26,6 @@ import (
"github.com/gorilla/mux"
"github.com/minio-io/minio/pkgs/storage/encodedstorage"
"github.com/minio-io/minio/pkgs/storage/fsstorage"
"github.com/tchap/go-patricia/patricia"
)
@@ -243,24 +242,24 @@ func SimpleEncodedStorageDriver(bucket string, input chan ObjectRequest, config
}
}
func SimpleFileStorageDriver(bucket string, input chan ObjectRequest, config GatewayConfig) {
fileStorage, _ := fsstorage.NewStorage(config.DataDir, config.BlockSize)
for request := range input {
switch request.requestType {
case "GET":
objectPath := path.Join(bucket, request.path)
object, err := fileStorage.Get(objectPath)
if err != nil {
request.callback <- nil
} else {
request.callback <- object
}
case "PUT":
objectPath := path.Join(bucket, request.path)
fileStorage.Put(objectPath, bytes.NewBuffer(request.object))
request.callback <- nil
default:
request.callback <- errors.New("Unexpected message")
}
}
}
//func SimpleFileStorageDriver(bucket string, input chan ObjectRequest, config GatewayConfig) {
// fileStorage, _ := fsstorage.NewStorage(config.DataDir, config.BlockSize)
// for request := range input {
// switch request.requestType {
// case "GET":
// objectPath := path.Join(bucket, request.path)
// object, err := fileStorage.Get(objectPath)
// if err != nil {
// request.callback <- nil
// } else {
// request.callback <- object
// }
// case "PUT":
// objectPath := path.Join(bucket, request.path)
// fileStorage.Put(objectPath, bytes.NewBuffer(request.object))
// request.callback <- nil
// default:
// request.callback <- errors.New("Unexpected message")
// }
// }
//}

5
pkgs/gateway/gateway_test.go
View File

@@ -116,11 +116,6 @@ func (s *GatewaySuite) TestInMemoryBucketOperations(c *C) {
StorageDriver: InMemoryStorageDriver,
requestBucketChan: make(chan BucketRequest),
},
GatewayConfig{
StorageDriver: SimpleFileStorageDriver,
requestBucketChan: make(chan BucketRequest),
DataDir: simpleFileStorageRootDir,
},
GatewayConfig{
StorageDriver: SimpleEncodedStorageDriver,
requestBucketChan: make(chan BucketRequest),