Merge pull request #181 from fkautz/pr_out_donut_structure_refined

pkg/storage/donut/donut.go

@@ -17,42 +17,39 @@
 package donut
 
 import (
-	"bytes"
-	"encoding/binary"
-	"encoding/gob"
 	"io"
 )
 
 /*
    ** DONUT v1 Spec **
 
-   BlockStart      uint32             // Magic="MINI"
+   BlockStart      [4]byte             // Magic="MINI"
    VersionMajor    uint16
    VersionMinor    uint16
    VersionPatch    uint16
    VersionReserved uint16
    Reserved        uint64
    GobHeaderLen    uint32
-   GobHeader       Sizeof(GobHeader)
+   GobHeader       io.Reader           // matches length
-   BlockData       uint32             // Magic="DATA"
+   BlockData       [4]byte             // Magic="DATA"
-   Data            []byte
+   Data            io.Reader           // matches length
-   BlockLen        uint64
+   BlockLen        uint64              // length to block start
-   BlockEnd        uint32             // Magic="INIM"
+   BlockEnd        [4]byte             // Magic="INIM"
-
 */
 
-type DonutHeader struct {
+type DonutStructure struct {
-	BlockStart      uint32 // Magic="MINI"
+	BlockStart      [4]byte // Magic="MINI"
 	VersionMajor    uint16
 	VersionMinor    uint16
 	VersionPatch    uint16
 	VersionReserved uint16
 	Reserved        uint64
 	GobHeaderLen    uint32
-}
+	GobHeader       GobHeader
-
+	BlockData       [4]byte
-type DonutGobHeader struct {
+	Data            io.Reader
-	DataLen uint64
+	BlockLen        uint64
+	BlockEnd        [4]byte
 }
 
 type DonutFooter struct {
@@ -62,63 +59,32 @@ type DonutFooter struct {
 
 type Donut struct {
 	file io.Writer
+	// mutex
 }
 
-func (donut Donut) Write(header Header, object io.Reader) error {
+type GobHeader struct{}
-	var newObjectBuffer bytes.Buffer
+
-	var headerBuffer bytes.Buffer
+func (donut *Donut) Write(gobHeader GobHeader, object io.Reader) error {
-
+	// TODO mutex
-	// create gob header
+	// Create bytes buffer representing the new object
-	headerEncoder := gob.NewEncoder(&headerBuffer)
+	donutStructure := DonutStructure{
-	err := headerEncoder.Encode(header)
+		BlockStart:      [4]byte{'M', 'I', 'N', 'I'},
-	if err != nil {
+		VersionMajor:    1,
-		return err
+		VersionMinor:    0,
-	}
+		VersionPatch:    0,
-
+		VersionReserved: 0,
-	// prefix consists of a version number and a length
+		Reserved:        0,
-	var headerPrefixBuffer bytes.Buffer
+		GobHeaderLen:    0,
-	// write version
+		GobHeader:       gobHeader,
-	var version int
+		BlockData:       [4]byte{'D', 'A', 'T', 'A'},
-	version = 1
+		Data:            object,
-	err = binary.Write(&headerPrefixBuffer, binary.LittleEndian, version)
+		BlockLen:        0,
-	if err != nil {
+		BlockEnd:        [4]byte{'I', 'N', 'I', 'M'},
-		return err
-	}
-
-	// write length
-	var headerLength int
-	headerLength = headerBuffer.Len()
-	err = binary.Write(&headerPrefixBuffer, binary.LittleEndian, headerLength)
-	if err != nil {
-		return err
-	}
-
-	// write header prefix
-	io.Copy(&newObjectBuffer, &headerPrefixBuffer)
-
-	// write header
-	io.Copy(&newObjectBuffer, &headerBuffer)
-
-	// write header marker
-
-	// TODO
-
-	// write data
-	_, err = io.Copy(&newObjectBuffer, object)
-	if err != nil {
-		return err
 	}
-
+	if err := WriteStructure(donut.file, donutStructure); err != nil {
-	// write footer
-	// TODO
-
-	// write footer marker
-	// TODO
-
-	// write new object
-	_, err = io.Copy(donut.file, &newObjectBuffer)
-	if err != nil {
 		return err
 	}
 	return nil
 }
+
+func WriteStructure(target io.Writer, donutStructure DonutStructure) error { return nil }