From b4ef522a9b5c7992d864b7856c225da0b3475609 Mon Sep 17 00:00:00 2001 From: "Frederick F. Kautz IV" Date: Sun, 1 Mar 2015 00:02:14 -0800 Subject: [PATCH] Donut frame is now its own package --- pkg/storage/donut/{v1 => frame/frame_v1}/.gitignore | 0 pkg/storage/donut/{v1 => frame/frame_v1}/donut.go | 2 +- .../donut/{v1 => frame/frame_v1}/donut_gen_v1/.gitignore | 0 .../donut/{v1 => frame/frame_v1}/donut_gen_v1/donut_gen.go | 6 ++---- pkg/storage/donut/{v1 => frame/frame_v1}/donut_test.go | 2 +- 5 files changed, 4 insertions(+), 6 deletions(-) rename pkg/storage/donut/{v1 => frame/frame_v1}/.gitignore (100%) rename pkg/storage/donut/{v1 => frame/frame_v1}/donut.go (99%) rename pkg/storage/donut/{v1 => frame/frame_v1}/donut_gen_v1/.gitignore (100%) rename pkg/storage/donut/{v1 => frame/frame_v1}/donut_gen_v1/donut_gen.go (92%) rename pkg/storage/donut/{v1 => frame/frame_v1}/donut_test.go (99%) diff --git a/pkg/storage/donut/v1/.gitignore b/pkg/storage/donut/frame/frame_v1/.gitignore similarity index 100% rename from pkg/storage/donut/v1/.gitignore rename to pkg/storage/donut/frame/frame_v1/.gitignore diff --git a/pkg/storage/donut/v1/donut.go b/pkg/storage/donut/frame/frame_v1/donut.go similarity index 99% rename from pkg/storage/donut/v1/donut.go rename to pkg/storage/donut/frame/frame_v1/donut.go index f1c21bdf1..fde680f33 100644 --- a/pkg/storage/donut/v1/donut.go +++ b/pkg/storage/donut/frame/frame_v1/donut.go @@ -14,7 +14,7 @@ * limitations under the License. */ -package v1 +package frame_v1 import ( "bytes" diff --git a/pkg/storage/donut/v1/donut_gen_v1/.gitignore b/pkg/storage/donut/frame/frame_v1/donut_gen_v1/.gitignore similarity index 100% rename from pkg/storage/donut/v1/donut_gen_v1/.gitignore rename to pkg/storage/donut/frame/frame_v1/donut_gen_v1/.gitignore diff --git a/pkg/storage/donut/v1/donut_gen_v1/donut_gen.go b/pkg/storage/donut/frame/frame_v1/donut_gen_v1/donut_gen.go similarity index 92% rename from pkg/storage/donut/v1/donut_gen_v1/donut_gen.go rename to pkg/storage/donut/frame/frame_v1/donut_gen_v1/donut_gen.go index 301542df3..659ac9e08 100644 --- a/pkg/storage/donut/v1/donut_gen_v1/donut_gen.go +++ b/pkg/storage/donut/frame/frame_v1/donut_gen_v1/donut_gen.go @@ -1,5 +1,3 @@ -// +build ignore - package main import ( @@ -8,7 +6,7 @@ import ( "os" "reflect" - "github.com/minio-io/minio/pkg/storage/donut/v1" + "github.com/minio-io/minio/pkg/storage/donut/frame/frame_v1" ) func main() { @@ -22,7 +20,7 @@ func main() { dataBuffer := bytes.NewBuffer(data) - err = v1.Write(file, dataBuffer, uint64(dataBuffer.Len())) + err = frame_v1.WriteFrame(file, dataBuffer, uint64(dataBuffer.Len())) if err != nil { panic(err) } diff --git a/pkg/storage/donut/v1/donut_test.go b/pkg/storage/donut/frame/frame_v1/donut_test.go similarity index 99% rename from pkg/storage/donut/v1/donut_test.go rename to pkg/storage/donut/frame/frame_v1/donut_test.go index 9cc41f636..a6fe79245 100644 --- a/pkg/storage/donut/v1/donut_test.go +++ b/pkg/storage/donut/frame/frame_v1/donut_test.go @@ -14,7 +14,7 @@ * limitations under the License. */ -package v1 +package frame_v1 import ( "bytes"