diff --git a/go/stats/duration_counter_test.go b/go/stats/duration_counter_test.go index aa9d61c87..484d97009 100644 --- a/go/stats/duration_counter_test.go +++ b/go/stats/duration_counter_test.go @@ -7,10 +7,10 @@ func TestRobinCounter(t *testing.T) { rrc.Add(0, 1) rrc.Add(50, 2) if rrc.Count() != 2 { - t.Fatal() + t.Fatal("faild1") } if rrc.Sum() != 3 { - t.Fatal() + t.Fatal("faild2") } /* index out of range diff --git a/go/storage/chunked_file_reader.go b/go/storage/chunked_file_reader.go index 637c841ee..755d2966b 100644 --- a/go/storage/chunked_file_reader.go +++ b/go/storage/chunked_file_reader.go @@ -96,7 +96,7 @@ func (cf *ChunkedFileReader) readLocalChunkNeedle(fid *FileId, w io.Writer, offs return 0, e } if n.Cookie != cookie { - return 0, fmt.Errorf("read error: with unmaching cookie seen: %s expected: %s", cookie, n.Cookie) + return 0, fmt.Errorf("read error: with unmaching cookie seen: %x expected: %x", cookie, n.Cookie) } wn, e := w.Write(n.Data[offset:]) return int64(wn), e diff --git a/go/storage/compact_map.go b/go/storage/compact_map.go index 5271b5e9c..beb618963 100644 --- a/go/storage/compact_map.go +++ b/go/storage/compact_map.go @@ -121,8 +121,8 @@ type CompactMap struct { lock sync.RWMutex } -func NewCompactMap() CompactMap { - return CompactMap{} +func NewCompactMap() *CompactMap { + return &CompactMap{} } func (cm *CompactMap) Set(key Key, offset uint32, size uint32) uint32 { diff --git a/go/storage/compact_map_perf_test.go b/go/storage/compact_map_perf_test.go index 1b429f263..79e122227 100644 --- a/go/storage/compact_map_perf_test.go +++ b/go/storage/compact_map_perf_test.go @@ -19,7 +19,7 @@ func TestMemoryUsage(t *testing.T) { } -func LoadNewNeedleMap(file *os.File) CompactMap { +func LoadNewNeedleMap(file *os.File) *CompactMap { m := NewCompactMap() bytes := make([]byte, 16*1024) count, e := file.Read(bytes) diff --git a/go/storage/needle_map.go b/go/storage/needle_map.go index d594dd348..9e997e9ba 100644 --- a/go/storage/needle_map.go +++ b/go/storage/needle_map.go @@ -36,11 +36,11 @@ type NeedleMapper interface { type baseNeedleMapper struct { indexFile *os.File mutex sync.RWMutex - deletionCounter int `json:"DeletionCounter"` - fileCounter int `json:"FileCounter"` - deletionByteCounter uint64 `json:"DeletionByteCounter"` - fileByteCounter uint64 `json:"FileByteCounter"` - maximumFileKey uint64 `json:"MaxFileKey"` + deletionCounter int + fileCounter int + deletionByteCounter uint64 + fileByteCounter uint64 + maximumFileKey uint64 } func (nm *baseNeedleMapper) IndexFileSize() uint64 { diff --git a/go/storage/needle_map_memory.go b/go/storage/needle_map_memory.go index fabbcd62d..8e244169b 100644 --- a/go/storage/needle_map_memory.go +++ b/go/storage/needle_map_memory.go @@ -8,7 +8,7 @@ import ( ) type NeedleMap struct { - m CompactMap + m *CompactMap baseNeedleMapper } diff --git a/go/storage/volume_info_test.go b/go/storage/volume_info_test.go index c90ca2336..9c1a7b470 100644 --- a/go/storage/volume_info_test.go +++ b/go/storage/volume_info_test.go @@ -17,7 +17,7 @@ func TestSortVolumeInfos(t *testing.T) { sortVolumeInfos(vis) for i := 0; i < len(vis); i++ { if vis[i].Id != VolumeId(i+1) { - t.Fatal() + t.Fatal("id error") } } } diff --git a/go/storage/volume_pure_reader.go b/go/storage/volume_pure_reader.go index a03c88327..2b35397f5 100644 --- a/go/storage/volume_pure_reader.go +++ b/go/storage/volume_pure_reader.go @@ -140,7 +140,6 @@ func (cdr *PureReader) WriteTo(w io.Writer) (written int64, err error) { written += n } } - return } func (cr *PureReader) ReadAt(p []byte, off int64) (n int, err error) { diff --git a/go/storage/volume_sync.go b/go/storage/volume_sync.go index 7d09c873d..b1211acd5 100644 --- a/go/storage/volume_sync.go +++ b/go/storage/volume_sync.go @@ -48,7 +48,7 @@ optimized more later). func (v *Volume) Synchronize(volumeServer string) (err error) { var lastCompactRevision uint16 = 0 var compactRevision uint16 = 0 - var masterMap CompactMap + var masterMap *CompactMap for i := 0; i < 3; i++ { if masterMap, _, compactRevision, err = fetchVolumeFileEntries(volumeServer, v.Id); err != nil { return fmt.Errorf("Failed to sync volume %d entries with %s: %v", v.Id, volumeServer, err) @@ -77,7 +77,7 @@ func (a ByOffset) Less(i, j int) bool { return a[i].Offset < a[j].Offset } // trySynchronizing sync with remote volume server incrementally by // make up the local and remote delta. -func (v *Volume) trySynchronizing(volumeServer string, masterMap CompactMap, compactRevision uint16) error { +func (v *Volume) trySynchronizing(volumeServer string, masterMap *CompactMap, compactRevision uint16) error { slaveIdxFile, err := os.Open(v.nm.IndexFileName()) if err != nil { return fmt.Errorf("Open volume %d index file: %v", v.Id, err) @@ -137,7 +137,7 @@ func (v *Volume) trySynchronizing(volumeServer string, masterMap CompactMap, com return nil } -func fetchVolumeFileEntries(volumeServer string, vid VolumeId) (m CompactMap, lastOffset uint64, compactRevision uint16, err error) { +func fetchVolumeFileEntries(volumeServer string, vid VolumeId) (m *CompactMap, lastOffset uint64, compactRevision uint16, err error) { m = NewCompactMap() syncStatus, err := operation.GetVolumeSyncStatus(volumeServer, vid.String()) diff --git a/go/util/http_util.go b/go/util/http_util.go index 7a395aca6..2fbd76fb9 100644 --- a/go/util/http_util.go +++ b/go/util/http_util.go @@ -179,7 +179,6 @@ func GetBufferStream(url string, values url.Values, allocatedBytes []byte, eachB return err } } - return nil } func GetUrlStream(url string, values url.Values, readFn func(io.Reader) error) error {