Browse Source

refactoring: remove unused functions

pull/1076/head
Chris Lu 5 years ago
parent
commit
02710f9624
  1. 13
      weed/storage/needle_map.go
  2. 18
      weed/storage/volume.go

13
weed/storage/needle_map.go

@ -2,7 +2,6 @@ package storage
import ( import (
"fmt" "fmt"
"io/ioutil"
"os" "os"
"sync" "sync"
@ -31,8 +30,6 @@ type NeedleMapper interface {
DeletedCount() int DeletedCount() int
MaxFileKey() NeedleId MaxFileKey() NeedleId
IndexFileSize() uint64 IndexFileSize() uint64
IndexFileContent() ([]byte, error)
IndexFileName() string
} }
type baseNeedleMapper struct { type baseNeedleMapper struct {
@ -50,10 +47,6 @@ func (nm *baseNeedleMapper) IndexFileSize() uint64 {
return 0 return 0
} }
func (nm *baseNeedleMapper) IndexFileName() string {
return nm.indexFile.Name()
}
func (nm *baseNeedleMapper) appendToIndexFile(key NeedleId, offset Offset, size uint32) error { func (nm *baseNeedleMapper) appendToIndexFile(key NeedleId, offset Offset, size uint32) error {
bytes := needle_map.ToBytes(key, offset, size) 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) _, err := nm.indexFile.Write(bytes)
return err return err
} }
func (nm *baseNeedleMapper) IndexFileContent() ([]byte, error) {
nm.indexFileAccessLock.Lock()
defer nm.indexFileAccessLock.Unlock()
return ioutil.ReadFile(nm.indexFile.Name())
}

18
weed/storage/volume.go

@ -140,24 +140,6 @@ func (v *Volume) IndexFileSize() uint64 {
return v.nm.IndexFileSize() 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 // Close cleanly shuts down this volume
func (v *Volume) Close() { func (v *Volume) Close() {
v.dataFileAccessLock.Lock() v.dataFileAccessLock.Lock()

Loading…
Cancel
Save