aboutsummaryrefslogtreecommitdiff
path: root/weed/storage
diff options
context:
space:
mode:
Diffstat (limited to 'weed/storage')
-rw-r--r--weed/storage/needle/needle.go1
-rw-r--r--weed/storage/needle/needle_read_write.go3
-rw-r--r--weed/storage/needle/volume_id_test.go6
-rw-r--r--weed/storage/volume_checking.go4
-rw-r--r--weed/storage/volume_info.go6
5 files changed, 9 insertions, 11 deletions
diff --git a/weed/storage/needle/needle.go b/weed/storage/needle/needle.go
index c224d2767..14265ec78 100644
--- a/weed/storage/needle/needle.go
+++ b/weed/storage/needle/needle.go
@@ -188,4 +188,3 @@ func ParseNeedleIdCookie(key_hash_string string) (NeedleId, Cookie, error) {
func (n *Needle) LastModifiedString() string {
return time.Unix(int64(n.LastModified), 0).Format("2006-01-02T15:04:05")
}
-
diff --git a/weed/storage/needle/needle_read_write.go b/weed/storage/needle/needle_read_write.go
index e1ad075b4..85f335892 100644
--- a/weed/storage/needle/needle_read_write.go
+++ b/weed/storage/needle/needle_read_write.go
@@ -185,7 +185,7 @@ func (n *Needle) ReadData(r *os.File, offset int64, size uint32, version Version
case Version2, Version3:
err = n.readNeedleDataVersion2(bytes[NeedleHeaderSize : NeedleHeaderSize+int(n.Size)])
}
- if err != nil && err != io.EOF{
+ if err != nil && err != io.EOF {
return err
}
if size > 0 {
@@ -390,4 +390,3 @@ func (n *Needle) SetHasPairs() {
func getActualSize(size uint32, version Version) int64 {
return NeedleHeaderSize + NeedleBodyLength(size, version)
}
-
diff --git a/weed/storage/needle/volume_id_test.go b/weed/storage/needle/volume_id_test.go
index c1c426989..5ffcd90f6 100644
--- a/weed/storage/needle/volume_id_test.go
+++ b/weed/storage/needle/volume_id_test.go
@@ -3,11 +3,11 @@ package needle
import "testing"
func TestNewVolumeId(t *testing.T) {
- if _,err := NewVolumeId("1"); err != nil {
+ if _, err := NewVolumeId("1"); err != nil {
t.Error(err)
}
- if _, err := NewVolumeId("a");err != nil {
+ if _, err := NewVolumeId("a"); err != nil {
t.Logf("a is not legal volume id, %v", err)
}
}
@@ -42,4 +42,4 @@ func TestVolumeId_Next(t *testing.T) {
if new := pvid.Next(); new != 12 {
t.Errorf("get next volume id failed")
}
-} \ No newline at end of file
+}
diff --git a/weed/storage/volume_checking.go b/weed/storage/volume_checking.go
index 980656823..7bb998fa6 100644
--- a/weed/storage/volume_checking.go
+++ b/weed/storage/volume_checking.go
@@ -15,7 +15,7 @@ func CheckVolumeDataIntegrity(v *Volume, indexFile *os.File) (lastAppendAtNs uin
return 0, fmt.Errorf("verifyIndexFileIntegrity %s failed: %v", indexFile.Name(), e)
}
if indexSize == 0 {
- return 0,nil
+ return 0, nil
}
var lastIdxEntry []byte
if lastIdxEntry, e = readIndexEntryAtOffset(indexFile, indexSize-NeedleMapEntrySize); e != nil {
@@ -23,7 +23,7 @@ func CheckVolumeDataIntegrity(v *Volume, indexFile *os.File) (lastAppendAtNs uin
}
key, offset, size := IdxFileEntry(lastIdxEntry)
if offset.IsZero() {
- return 0,nil
+ return 0, nil
}
if size == TombstoneFileSize {
size = 0
diff --git a/weed/storage/volume_info.go b/weed/storage/volume_info.go
index 0e05019d2..2f6d1e8f9 100644
--- a/weed/storage/volume_info.go
+++ b/weed/storage/volume_info.go
@@ -45,9 +45,9 @@ func NewVolumeInfo(m *master_pb.VolumeInformationMessage) (vi VolumeInfo, err er
func NewVolumeInfoFromShort(m *master_pb.VolumeShortInformationMessage) (vi VolumeInfo, err error) {
vi = VolumeInfo{
- Id: needle.VolumeId(m.Id),
- Collection: m.Collection,
- Version: needle.Version(m.Version),
+ Id: needle.VolumeId(m.Id),
+ Collection: m.Collection,
+ Version: needle.Version(m.Version),
}
rp, e := NewReplicaPlacementFromByte(byte(m.ReplicaPlacement))
if e != nil {