MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-11-07 04:42:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

More refactoring to meet new donut spec

Browse Source
This commit is contained in:
Frederick F. Kautz IV
2015-03-12 01:52:14 -07:00
parent 9889796c9c
commit 94fe03cfc1
5 changed files with 61 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/storage/donut/erasure/erasure.go
View File

@@ -18,7 +18,7 @@ const (
)
// Write latest donut format
func Write(target io.Writer, key string, part uint8, length uint32, k, m uint8, technique EncoderTechnique, data io.Reader) error {
func Write(target io.Writer, length uint32, k, m uint8, technique EncoderTechnique, data io.Reader) error {
var versionedTechnique erasure1.EncoderTechnique
switch {
case technique == Vandermonde:
@@ -28,7 +28,7 @@ func Write(target io.Writer, key string, part uint8, length uint32, k, m uint8,
default:
errors.New("Unknown encoder technique")
}
return erasure1.Write(target, key, part, length, k, m, versionedTechnique, data)
return erasure1.Write(target, length, k, m, versionedTechnique, data)
}
// Read any donut format

13
pkg/storage/donut/erasure/erasure1/erasure.go
View File

@@ -32,11 +32,6 @@ const (
// DataHeader represents the structure serialized to gob.
type DataHeader struct {
// object + block stored
Key string
// chunk index of encoded block
ChunkIndex uint8
// Original Length of the block output
OriginalLength uint32
// Data Blocks
EncoderK uint8
@@ -58,10 +53,6 @@ const (
// validate populated header
func validateHeader(header DataHeader) error {
if header.Key == "" {
return errors.New("Empty Key")
}
if header.EncoderTechnique > 1 {
return errors.New("Invalid encoder technique")
}
@@ -70,10 +61,8 @@ func validateHeader(header DataHeader) error {
}
// Write returns error upon any failure
func Write(target io.Writer, key string, part uint8, length uint32, k, m uint8, technique EncoderTechnique, data io.Reader) error {
func Write(target io.Writer, length uint32, k, m uint8, technique EncoderTechnique, data io.Reader) error {
header := DataHeader{
Key: key,
ChunkIndex: part,
OriginalLength: length,
EncoderK: k,
EncoderM: m,

8
pkg/storage/donut/erasure/erasure1/erasure_test.go
View File

@@ -36,15 +36,13 @@ func (s *MySuite) TestSingleWrite(c *C) {
var testBuffer bytes.Buffer
testData := "Hello, World"
testHeader := DataHeader{
Key: "testobj",
ChunkIndex: 1,
OriginalLength: uint32(len(testData)),
EncoderK: 8,
EncoderM: 8,
EncoderTechnique: Cauchy,
}
err := Write(&testBuffer, testHeader.Key, testHeader.ChunkIndex, testHeader.OriginalLength, testHeader.EncoderK, testHeader.EncoderM, testHeader.EncoderTechnique, bytes.NewBufferString(testData))
err := Write(&testBuffer, testHeader.OriginalLength, testHeader.EncoderK, testHeader.EncoderM, testHeader.EncoderTechnique, bytes.NewBufferString(testData))
c.Assert(err, IsNil)
actualVersion := make([]byte, 4)
@@ -71,15 +69,13 @@ func (s *MySuite) TestReadWrite(c *C) {
var testBuffer bytes.Buffer
testData := "Hello, World"
testHeader := DataHeader{
Key: "testobj",
ChunkIndex: 1,
OriginalLength: uint32(len(testData)),
EncoderK: 8,
EncoderM: 8,
EncoderTechnique: Cauchy,
}
err := Write(&testBuffer, testHeader.Key, testHeader.ChunkIndex, testHeader.OriginalLength, testHeader.EncoderK, testHeader.EncoderM, testHeader.EncoderTechnique, bytes.NewBufferString(testData))
err := Write(&testBuffer, testHeader.OriginalLength, testHeader.EncoderK, testHeader.EncoderM, testHeader.EncoderTechnique, bytes.NewBufferString(testData))
c.Assert(err, IsNil)
header, err := ReadHeader(&testBuffer)