refactoring

6 files changed, 14 insertions, 10 deletions

diff --git a/weed/storage/erasure_coding/ec_volume_test.go b/weed/storage/erasure_coding/ec_volume_test.go
index 47faf0b62..82df0b8b1 100644
--- a/weed/storage/erasure_coding/ec_volume_test.go
+++ b/weed/storage/erasure_coding/ec_volume_test.go
@@ -44,7 +44,7 @@ func TestPositioning(t *testing.T) {
 	fmt.Printf("offset: %d size: %d\n", offset.ToActualOffset(), size)
 
 	var shardEcdFileSize int64 = 1118830592 // 1024*1024*1024*3
-	intervals := LocateData(ErasureCodingLargeBlockSize, ErasureCodingSmallBlockSize, shardEcdFileSize, offset.ToActualOffset(), types.Size(needle.GetActualSize(size, needle.CurrentVersion)))
+	intervals := LocateData(ErasureCodingLargeBlockSize, ErasureCodingSmallBlockSize, shardEcdFileSize, offset.ToActualOffset(), types.Size(needle.GetActualSize(size, needle.GetCurrentVersion())))
 
 	for _, interval := range intervals {
 		shardId, shardOffset := interval.ToShardIdAndOffset(ErasureCodingLargeBlockSize, ErasureCodingSmallBlockSize)
diff --git a/weed/storage/needle/needle_write_test.go b/weed/storage/needle/needle_write_test.go
index 5ddc040fb..f91991171 100644
--- a/weed/storage/needle/needle_write_test.go
+++ b/weed/storage/needle/needle_write_test.go
@@ -59,7 +59,7 @@ func TestAppend(t *testing.T) {
 	datBackend := backend.NewDiskFile(tempFile)
 	defer datBackend.Close()
 
-	offset, _, _, _ := n.Append(datBackend, CurrentVersion)
+	offset, _, _, _ := n.Append(datBackend, GetCurrentVersion())
 	if offset != uint64(fileSize) {
 		t.Errorf("Fail to Append Needle.")
 	}
diff --git a/weed/storage/needle/volume_version.go b/weed/storage/needle/volume_version.go
index 54daac77f..15d2aa2a7 100644
--- a/weed/storage/needle/volume_version.go
+++ b/weed/storage/needle/volume_version.go
@@ -3,8 +3,11 @@ package needle
 type Version uint8
 
 const (
-	Version1       = Version(1)
-	Version2       = Version(2)
-	Version3       = Version(3)
-	CurrentVersion = Version3
+	Version1 = Version(1)
+	Version2 = Version(2)
+	Version3 = Version(3)
 )
+
+func GetCurrentVersion() Version {
+	return Version3
+}
diff --git a/weed/storage/super_block/super_block_test.go b/weed/storage/super_block/super_block_test.go
index 5a9c8e1a9..b952240ae 100644
--- a/weed/storage/super_block/super_block_test.go
+++ b/weed/storage/super_block/super_block_test.go
@@ -10,7 +10,7 @@ func TestSuperBlockReadWrite(t *testing.T) {
 	rp, _ := NewReplicaPlacementFromByte(byte(001))
 	ttl, _ := needle.ReadTTL("15d")
 	s := &SuperBlock{
-		Version:          needle.CurrentVersion,
+		Version:          needle.GetCurrentVersion(),
 		ReplicaPlacement: rp,
 		Ttl:              ttl,
 	}
diff --git a/weed/storage/volume_super_block.go b/weed/storage/volume_super_block.go
index 096d46906..1d411471f 100644
--- a/weed/storage/volume_super_block.go
+++ b/weed/storage/volume_super_block.go
@@ -18,7 +18,7 @@ func (v *Volume) maybeWriteSuperBlock() error {
 		return e
 	}
 	if datSize == 0 {
-		v.SuperBlock.Version = needle.CurrentVersion
+		v.SuperBlock.Version = needle.GetCurrentVersion()
 		_, e = v.DataBackend.WriteAt(v.SuperBlock.Bytes(), 0)
 		if e != nil && os.IsPermission(e) {
 			//read-only, but zero length - recreate it!
diff --git a/weed/storage/volume_tier.go b/weed/storage/volume_tier.go
index 5d9b67192..d398503a3 100644
--- a/weed/storage/volume_tier.go
+++ b/weed/storage/volume_tier.go
@@ -2,6 +2,8 @@ package storage
 
 import (
 	"fmt"
+	"time"
+
 	"github.com/seaweedfs/seaweedfs/weed/glog"
 	"github.com/seaweedfs/seaweedfs/weed/pb/volume_server_pb"
 	"github.com/seaweedfs/seaweedfs/weed/storage/backend"
@@ -10,7 +12,6 @@ import (
 	"github.com/seaweedfs/seaweedfs/weed/storage/needle"
 	"github.com/seaweedfs/seaweedfs/weed/storage/types"
 	"github.com/seaweedfs/seaweedfs/weed/storage/volume_info"
-	"time"
 )
 
 func (v *Volume) GetVolumeInfo() *volume_server_pb.VolumeInfo {
@@ -23,7 +24,7 @@ func (v *Volume) maybeLoadVolumeInfo() (found bool) {
 	v.volumeInfo, v.hasRemoteFile, found, err = volume_info.MaybeLoadVolumeInfo(v.FileName(".vif"))
 
 	if v.volumeInfo.Version == 0 {
-		v.volumeInfo.Version = uint32(needle.CurrentVersion)
+		v.volumeInfo.Version = uint32(needle.GetCurrentVersion())
 	}
 
 	if v.hasRemoteFile {