Browse Source

go fmt

pull/934/head
Chris Lu 6 years ago
parent
commit
b142f9f1d5
  1. 2
      weed/server/filer_grpc_server_rename.go
  2. 6
      weed/server/volume_grpc_copy.go
  3. 2
      weed/shell/command_fs_meta_load.go
  4. 2
      weed/shell/commands.go
  5. 1
      weed/storage/needle_map_metric.go
  6. 10
      weed/storage/volume.go

2
weed/server/filer_grpc_server_rename.go

@ -88,7 +88,7 @@ func (fs *FilerServer) moveFolderSubEntries(ctx context.Context, oldParent filer
return nil return nil
} }
func (fs *FilerServer) moveSelfEntry(ctx context.Context, oldParent filer2.FullPath, entry *filer2.Entry, newParent filer2.FullPath, newName string, events *MoveEvents) (error) {
func (fs *FilerServer) moveSelfEntry(ctx context.Context, oldParent filer2.FullPath, entry *filer2.Entry, newParent filer2.FullPath, newName string, events *MoveEvents) error {
oldPath, newPath := oldParent.Child(entry.Name()), newParent.Child(newName) oldPath, newPath := oldParent.Child(entry.Name()), newParent.Child(newName)

6
weed/server/volume_grpc_copy.go

@ -97,9 +97,9 @@ func (vs *VolumeServer) VolumeCopy(ctx context.Context, req *volume_server_pb.Vo
} }
/** /**
only check the the differ of the file size
todo: maybe should check the received count and deleted count of the volume
*/
only check the the differ of the file size
todo: maybe should check the received count and deleted count of the volume
*/
func checkCopyFiles(originFileInf *volume_server_pb.ReadVolumeFileStatusResponse, idxFileName, datFileName string) error { func checkCopyFiles(originFileInf *volume_server_pb.ReadVolumeFileStatusResponse, idxFileName, datFileName string) error {
stat, err := os.Stat(idxFileName) stat, err := os.Stat(idxFileName)
if err != nil { if err != nil {

2
weed/shell/command_fs_meta_load.go

@ -56,7 +56,7 @@ func (c *commandFsMetaLoad) Do(args []string, commandEnv *commandEnv, writer io.
for { for {
if n, err := dst.Read(sizeBuf); n != 4 { if n, err := dst.Read(sizeBuf); n != 4 {
if err == io.EOF{
if err == io.EOF {
return nil return nil
} }
return err return err

2
weed/shell/commands.go

@ -51,7 +51,7 @@ func (ce *commandEnv) parseUrl(input string) (filerServer string, filerPort int6
func (ce *commandEnv) isDirectory(ctx context.Context, filerServer string, filerPort int64, path string) bool { func (ce *commandEnv) isDirectory(ctx context.Context, filerServer string, filerPort int64, path string) bool {
return ce.checkDirectory(ctx,filerServer,filerPort,path) == nil
return ce.checkDirectory(ctx, filerServer, filerPort, path) == nil
} }

1
weed/storage/needle_map_metric.go

@ -60,7 +60,6 @@ func (mm mapMetric) MaybeSetMaxFileKey(key NeedleId) {
} }
} }
func newNeedleMapMetricFromIndexFile(r *os.File) (mm *mapMetric, err error) { func newNeedleMapMetricFromIndexFile(r *os.File) (mm *mapMetric, err error) {
mm = &mapMetric{} mm = &mapMetric{}
var bf *bloom.BloomFilter var bf *bloom.BloomFilter

10
weed/storage/volume.go

@ -79,22 +79,22 @@ func (v *Volume) Size() int64 {
return 0 // -1 causes integer overflow and the volume to become unwritable. return 0 // -1 causes integer overflow and the volume to become unwritable.
} }
func (v *Volume)IndexFileSize() uint64 {
func (v *Volume) IndexFileSize() uint64 {
return v.nm.IndexFileSize() return v.nm.IndexFileSize()
} }
func (v *Volume)DataFileSize() uint64 {
func (v *Volume) DataFileSize() uint64 {
return uint64(v.Size()) return uint64(v.Size())
} }
/** /**
unix time in seconds unix time in seconds
*/
func (v *Volume)LastModifiedTime() uint64 {
*/
func (v *Volume) LastModifiedTime() uint64 {
return v.lastModifiedTime return v.lastModifiedTime
} }
func (v *Volume)FileCount() uint64 {
func (v *Volume) FileCount() uint64 {
return uint64(v.nm.FileCount()) return uint64(v.nm.FileCount())
} }

Loading…
Cancel
Save