From 02710f96244903bb99fc6376531159d18735afdc Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Mon, 9 Sep 2019 10:03:41 -0700 Subject: [PATCH] refactoring: remove unused functions --- weed/storage/needle_map.go | 13 ------------- weed/storage/volume.go | 18 ------------------ 2 files changed, 31 deletions(-) diff --git a/weed/storage/needle_map.go b/weed/storage/needle_map.go index 876839be1..77d081ea7 100644 --- a/weed/storage/needle_map.go +++ b/weed/storage/needle_map.go @@ -2,7 +2,6 @@ package storage import ( "fmt" - "io/ioutil" "os" "sync" @@ -31,8 +30,6 @@ type NeedleMapper interface { DeletedCount() int MaxFileKey() NeedleId IndexFileSize() uint64 - IndexFileContent() ([]byte, error) - IndexFileName() string } type baseNeedleMapper struct { @@ -50,10 +47,6 @@ func (nm *baseNeedleMapper) IndexFileSize() uint64 { return 0 } -func (nm *baseNeedleMapper) IndexFileName() string { - return nm.indexFile.Name() -} - func (nm *baseNeedleMapper) appendToIndexFile(key NeedleId, offset Offset, size uint32) error { bytes := needle_map.ToBytes(key, offset, size) @@ -66,9 +59,3 @@ func (nm *baseNeedleMapper) appendToIndexFile(key NeedleId, offset Offset, size _, err := nm.indexFile.Write(bytes) return err } - -func (nm *baseNeedleMapper) IndexFileContent() ([]byte, error) { - nm.indexFileAccessLock.Lock() - defer nm.indexFileAccessLock.Unlock() - return ioutil.ReadFile(nm.indexFile.Name()) -} diff --git a/weed/storage/volume.go b/weed/storage/volume.go index 9c3f74ca4..301610ab6 100644 --- a/weed/storage/volume.go +++ b/weed/storage/volume.go @@ -140,24 +140,6 @@ func (v *Volume) IndexFileSize() uint64 { return v.nm.IndexFileSize() } -func (v *Volume) IndexFileContent() ([]byte, error) { - v.dataFileAccessLock.Lock() - defer v.dataFileAccessLock.Unlock() - if v.nm == nil { - return nil, nil - } - return v.nm.IndexFileContent() -} - -func (v *Volume) IndexFileName() string { - v.dataFileAccessLock.Lock() - defer v.dataFileAccessLock.Unlock() - if v.nm == nil { - return "" - } - return v.nm.IndexFileName() -} - // Close cleanly shuts down this volume func (v *Volume) Close() { v.dataFileAccessLock.Lock()