go fmt

weed/command/filer_copy.go

@@ -8,16 +8,16 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/chrislusf/seaweedfs/weed/operation"
-	"github.com/chrislusf/seaweedfs/weed/security"
-	"path"
-	"net/http"
-	"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
-	"strconv"
-	"io"
-	"time"
 	"context"
+	"github.com/chrislusf/seaweedfs/weed/operation"
+	"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
+	"github.com/chrislusf/seaweedfs/weed/security"
 	"github.com/chrislusf/seaweedfs/weed/util"
+	"io"
+	"net/http"
+	"path"
+	"strconv"
+	"time"
 )
 
 var (

weed/command/mount_std.go

@@ -11,8 +11,8 @@ import (
 	"github.com/chrislusf/seaweedfs/weed/filesys"
 	"github.com/chrislusf/seaweedfs/weed/glog"
 	"github.com/chrislusf/seaweedfs/weed/util"
-	"strings"
 	"strconv"
+	"strings"
 )
 
 func runMount(cmd *Command, args []string) bool {

weed/command/s3.go

@@ -4,11 +4,11 @@ import (
 	"net/http"
 	"time"
 
+	"fmt"
 	"github.com/chrislusf/seaweedfs/weed/glog"
+	"github.com/chrislusf/seaweedfs/weed/s3api"
 	"github.com/chrislusf/seaweedfs/weed/util"
 	"github.com/gorilla/mux"
-	"fmt"
-	"github.com/chrislusf/seaweedfs/weed/s3api"
 )
 
 var (

weed/filer2/abstract_sql/abstract_sql_store.go

@@ -77,7 +77,7 @@ func (store *AbstractSqlStore) FindEntry(fullpath filer2.FullPath) (*filer2.Entr
 	return entry, nil
 }
 
-func (store *AbstractSqlStore) DeleteEntry(fullpath filer2.FullPath) (error) {
+func (store *AbstractSqlStore) DeleteEntry(fullpath filer2.FullPath) error {
 
 	dir, name := fullpath.DirAndName()
 

weed/filer2/filer_master.go

@@ -1,12 +1,12 @@
 package filer2
 
 import (
-	"fmt"
 	"context"
+	"fmt"
 	"time"
 
-	"github.com/chrislusf/seaweedfs/weed/pb/master_pb"
 	"github.com/chrislusf/seaweedfs/weed/glog"
+	"github.com/chrislusf/seaweedfs/weed/pb/master_pb"
 	"github.com/chrislusf/seaweedfs/weed/util"
 )
 

weed/filesys/dir.go

@@ -9,9 +9,9 @@ import (
 
 	"bazil.org/fuse"
 	"bazil.org/fuse/fs"
+	"github.com/chrislusf/seaweedfs/weed/filer2"
 	"github.com/chrislusf/seaweedfs/weed/glog"
 	"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
-	"github.com/chrislusf/seaweedfs/weed/filer2"
 )
 
 type Dir struct {

weed/filesys/dir_rename.go

@@ -1,9 +1,9 @@
 package filesys
 
 import (
-	"context"
 	"bazil.org/fuse"
 	"bazil.org/fuse/fs"
+	"context"
 	"github.com/chrislusf/seaweedfs/weed/glog"
 	"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
 	"path/filepath"

weed/filesys/dirty_page.go

@@ -1,14 +1,14 @@
 package filesys
 
 import (
-	"fmt"
 	"bytes"
-	"time"
 	"context"
+	"fmt"
+	"time"
 
-	"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
-	"github.com/chrislusf/seaweedfs/weed/operation"
 	"github.com/chrislusf/seaweedfs/weed/glog"
+	"github.com/chrislusf/seaweedfs/weed/operation"
+	"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
 )
 
 type ContinuousDirtyPages struct {

weed/filesys/filehandle.go

@@ -9,9 +9,9 @@ import (
 	"github.com/chrislusf/seaweedfs/weed/glog"
 	"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
 	"github.com/chrislusf/seaweedfs/weed/util"
+	"net/http"
 	"strings"
 	"sync"
-	"net/http"
 )
 
 type FileHandle struct {

weed/filesys/wfs.go

@@ -1,15 +1,15 @@
 package filesys
 
 import (
+	"bazil.org/fuse"
 	"bazil.org/fuse/fs"
 	"fmt"
-	"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
-	"github.com/karlseguin/ccache"
-	"sync"
-	"bazil.org/fuse"
 	"github.com/chrislusf/seaweedfs/weed/glog"
+	"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
 	"github.com/chrislusf/seaweedfs/weed/util"
+	"github.com/karlseguin/ccache"
 	"strings"
+	"sync"
 )
 
 type WFS struct {

weed/operation/sync_volume.go

@@ -6,8 +6,8 @@ import (
 	"net/url"
 
 	"github.com/chrislusf/seaweedfs/weed/glog"
-	"github.com/chrislusf/seaweedfs/weed/util"
 	. "github.com/chrislusf/seaweedfs/weed/storage/types"
+	"github.com/chrislusf/seaweedfs/weed/util"
 )
 
 type SyncVolumeResponse struct {

weed/s3api/s3api_bucket_handlers.go

@@ -1,14 +1,14 @@
 package s3api
 
 import (
-	"net/http"
-	"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
-	"github.com/chrislusf/seaweedfs/weed/glog"
-	"time"
 	"context"
 	"fmt"
+	"github.com/chrislusf/seaweedfs/weed/glog"
+	"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
 	"github.com/gorilla/mux"
+	"net/http"
 	"os"
+	"time"
 )
 
 var (

weed/s3api/s3api_handlers.go

@@ -1,17 +1,17 @@
 package s3api
 
 import (
-	"net/http"
-	"net/url"
-	"fmt"
-	"time"
-	"github.com/gorilla/mux"
+	"bytes"
 	"context"
+	"encoding/base64"
+	"encoding/xml"
+	"fmt"
 	"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
 	"github.com/chrislusf/seaweedfs/weed/util"
-	"bytes"
-	"encoding/xml"
-	"encoding/base64"
+	"github.com/gorilla/mux"
+	"net/http"
+	"net/url"
+	"time"
 )
 
 type mimeType string

weed/s3api/s3api_object_handlers.go

@@ -1,12 +1,12 @@
 package s3api
 
 import (
-	"net/http"
-	"github.com/chrislusf/seaweedfs/weed/glog"
+	"encoding/json"
 	"fmt"
+	"github.com/chrislusf/seaweedfs/weed/glog"
 	"github.com/gorilla/mux"
 	"io/ioutil"
-	"encoding/json"
+	"net/http"
 )
 
 var (

weed/server/filer_grpc_server.go

@@ -11,8 +11,8 @@ import (
 	"github.com/chrislusf/seaweedfs/weed/glog"
 	"github.com/chrislusf/seaweedfs/weed/operation"
 	"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
-	"strconv"
 	"github.com/chrislusf/seaweedfs/weed/util"
+	"strconv"
 )
 
 func (fs *FilerServer) LookupDirectoryEntry(ctx context.Context, req *filer_pb.LookupDirectoryEntryRequest) (*filer_pb.LookupDirectoryEntryResponse, error) {

weed/server/filer_server.go

@@ -1,7 +1,6 @@
 package weed_server
 
 import (
-	"net/http"
 	"github.com/chrislusf/seaweedfs/weed/filer2"
 	_ "github.com/chrislusf/seaweedfs/weed/filer2/cassandra"
 	_ "github.com/chrislusf/seaweedfs/weed/filer2/leveldb"
@@ -9,8 +8,9 @@ import (
 	_ "github.com/chrislusf/seaweedfs/weed/filer2/mysql"
 	_ "github.com/chrislusf/seaweedfs/weed/filer2/postgres"
 	_ "github.com/chrislusf/seaweedfs/weed/filer2/redis"
-	"github.com/chrislusf/seaweedfs/weed/security"
 	"github.com/chrislusf/seaweedfs/weed/glog"
+	"github.com/chrislusf/seaweedfs/weed/security"
+	"net/http"
 )
 
 type FilerOption struct {

weed/server/filer_server_handlers_read.go

@@ -10,10 +10,10 @@ import (
 	"github.com/chrislusf/seaweedfs/weed/glog"
 	"github.com/chrislusf/seaweedfs/weed/operation"
 	"github.com/chrislusf/seaweedfs/weed/util"
-	"strconv"
-	"mime/multipart"
 	"mime"
+	"mime/multipart"
 	"path"
+	"strconv"
 )
 
 func (fs *FilerServer) GetOrHeadHandler(w http.ResponseWriter, r *http.Request, isGetMethod bool) {

weed/server/raft_server_handlers.go

@@ -1,8 +1,8 @@
 package weed_server
 
 import (
-	"net/http"
 	"github.com/chrislusf/seaweedfs/weed/operation"
+	"net/http"
 )
 
 func (s *RaftServer) HandleFunc(pattern string, handler func(http.ResponseWriter, *http.Request)) {

weed/server/volume_grpc_client.go

@@ -7,8 +7,8 @@ import (
 	"github.com/chrislusf/seaweedfs/weed/glog"
 	"github.com/chrislusf/seaweedfs/weed/pb/master_pb"
 	"github.com/chrislusf/seaweedfs/weed/security"
-	"golang.org/x/net/context"
 	"github.com/chrislusf/seaweedfs/weed/util"
+	"golang.org/x/net/context"
 )
 
 func (vs *VolumeServer) GetMaster() string {

weed/server/volume_server.go

@@ -1,10 +1,10 @@
 package weed_server
 
 import (
-	"net/http"
 	"github.com/chrislusf/seaweedfs/weed/glog"
 	"github.com/chrislusf/seaweedfs/weed/security"
 	"github.com/chrislusf/seaweedfs/weed/storage"
+	"net/http"
 )
 
 type VolumeServer struct {

weed/server/volume_server_handlers_sync.go

@@ -6,8 +6,8 @@ import (
 
 	"github.com/chrislusf/seaweedfs/weed/glog"
 	"github.com/chrislusf/seaweedfs/weed/storage"
-	"github.com/chrislusf/seaweedfs/weed/util"
 	"github.com/chrislusf/seaweedfs/weed/storage/types"
+	"github.com/chrislusf/seaweedfs/weed/util"
 )
 
 func (vs *VolumeServer) getVolumeSyncStatusHandler(w http.ResponseWriter, r *http.Request) {

weed/storage/needle/btree_map.go

@@ -1,8 +1,8 @@
 package needle
 
 import (
-	"github.com/google/btree"
 	. "github.com/chrislusf/seaweedfs/weed/storage/types"
+	"github.com/google/btree"
 )
 
 //This map assumes mostly inserting increasing keys

weed/storage/needle/compact_map.go

@@ -1,8 +1,8 @@
 package needle
 
 import (
-	"sync"
 	. "github.com/chrislusf/seaweedfs/weed/storage/types"
+	"sync"
 )
 
 type CompactSection struct {

weed/storage/needle/compact_map_perf_test.go

@@ -6,8 +6,8 @@ import (
 	"testing"
 
 	"github.com/chrislusf/seaweedfs/weed/glog"
-	"github.com/chrislusf/seaweedfs/weed/util"
 	. "github.com/chrislusf/seaweedfs/weed/storage/types"
+	"github.com/chrislusf/seaweedfs/weed/util"
 )
 
 func TestMemoryUsage(t *testing.T) {

weed/storage/needle/compact_map_test.go

@@ -1,8 +1,8 @@
 package needle
 
 import (
-	"testing"
 	. "github.com/chrislusf/seaweedfs/weed/storage/types"
+	"testing"
 )
 
 func TestIssue52(t *testing.T) {

weed/storage/needle/needle_value.go

@@ -1,8 +1,8 @@
 package needle
 
 import (
-	"github.com/google/btree"
 	. "github.com/chrislusf/seaweedfs/weed/storage/types"
+	"github.com/google/btree"
 )
 
 const (

weed/storage/needle_map_boltdb.go

@@ -6,11 +6,11 @@ import (
 
 	"github.com/boltdb/bolt"
 
+	"errors"
 	"github.com/chrislusf/seaweedfs/weed/glog"
 	"github.com/chrislusf/seaweedfs/weed/storage/needle"
 	. "github.com/chrislusf/seaweedfs/weed/storage/types"
 	"github.com/chrislusf/seaweedfs/weed/util"
-	"errors"
 )
 
 type BoltDbNeedleMap struct {

weed/storage/needle_map_metric.go

@@ -2,10 +2,10 @@ package storage
 
 import (
 	"fmt"
-	"os"
-	"github.com/willf/bloom"
 	"github.com/chrislusf/seaweedfs/weed/glog"
 	. "github.com/chrislusf/seaweedfs/weed/storage/types"
+	"github.com/willf/bloom"
+	"os"
 )
 
 type mapMetric struct {

weed/storage/needle_map_metric_test.go

@@ -1,11 +1,11 @@
 package storage
 
 import (
-	"testing"
-	"io/ioutil"
-	"math/rand"
 	"github.com/chrislusf/seaweedfs/weed/glog"
 	. "github.com/chrislusf/seaweedfs/weed/storage/types"
+	"io/ioutil"
+	"math/rand"
+	"testing"
 )
 
 func TestFastLoadingNeedleMapMetrics(t *testing.T) {

weed/storage/needle_parse_multipart.go

@@ -1,12 +1,12 @@
 package storage
 
 import (
-	"mime"
-	"github.com/chrislusf/seaweedfs/weed/operation"
 	"github.com/chrislusf/seaweedfs/weed/glog"
+	"github.com/chrislusf/seaweedfs/weed/operation"
+	"io/ioutil"
+	"mime"
 	"net/http"
 	"path"
-	"io/ioutil"
 	"strings"
 )
 

weed/storage/needle_read_write.go

@@ -6,8 +6,8 @@ import (
 	"io"
 	"os"
 
-	. "github.com/chrislusf/seaweedfs/weed/storage/types"
 	"github.com/chrislusf/seaweedfs/weed/glog"
+	. "github.com/chrislusf/seaweedfs/weed/storage/types"
 	"github.com/chrislusf/seaweedfs/weed/util"
 )
 

weed/storage/needle_test.go

@@ -1,8 +1,8 @@
 package storage
 
 import (
-	"testing"
 	"github.com/chrislusf/seaweedfs/weed/storage/types"
+	"testing"
 )
 
 func TestParseKeyHash(t *testing.T) {

weed/storage/store.go

@@ -5,9 +5,9 @@ import (
 	"strconv"
 	"strings"
 
-	. "github.com/chrislusf/seaweedfs/weed/storage/types"
 	"github.com/chrislusf/seaweedfs/weed/glog"
 	"github.com/chrislusf/seaweedfs/weed/pb/master_pb"
+	. "github.com/chrislusf/seaweedfs/weed/storage/types"
 )
 
 const (

weed/storage/types/needle_id_type.go

@@ -1,9 +1,9 @@
 package types
 
 import (
+	"fmt"
 	"github.com/chrislusf/seaweedfs/weed/util"
 	"strconv"
-	"fmt"
 )
 
 type NeedleId uint64
@@ -21,11 +21,11 @@ func NeedleIdToUint64(needleId NeedleId) uint64 {
 	return uint64(needleId)
 }
 
-func Uint64ToNeedleId(needleId uint64) (NeedleId) {
+func Uint64ToNeedleId(needleId uint64) NeedleId {
 	return NeedleId(needleId)
 }
 
-func BytesToNeedleId(bytes []byte) (NeedleId) {
+func BytesToNeedleId(bytes []byte) NeedleId {
 	return NeedleId(util.BytesToUint64(bytes))
 }
 

weed/storage/types/needle_types.go

@@ -1,10 +1,10 @@
 package types
 
 import (
-	"math"
-	"github.com/chrislusf/seaweedfs/weed/util"
-	"strconv"
 	"fmt"
+	"github.com/chrislusf/seaweedfs/weed/util"
+	"math"
+	"strconv"
 )
 
 type Offset uint32
@@ -23,11 +23,11 @@ const (
 func CookieToBytes(bytes []byte, cookie Cookie) {
 	util.Uint32toBytes(bytes, uint32(cookie))
 }
-func Uint32ToCookie(cookie uint32) (Cookie) {
+func Uint32ToCookie(cookie uint32) Cookie {
 	return Cookie(cookie)
 }
 
-func BytesToCookie(bytes []byte) (Cookie) {
+func BytesToCookie(bytes []byte) Cookie {
 	return Cookie(util.BytesToUint32(bytes[0:4]))
 }
 
@@ -43,10 +43,10 @@ func OffsetToBytes(bytes []byte, offset Offset) {
 	util.Uint32toBytes(bytes, uint32(offset))
 }
 
-func Uint32ToOffset(offset uint32) (Offset) {
+func Uint32ToOffset(offset uint32) Offset {
 	return Offset(offset)
 }
 
-func BytesToOffset(bytes []byte) (Offset) {
+func BytesToOffset(bytes []byte) Offset {
 	return Offset(util.BytesToUint32(bytes[0:4]))
 }

weed/storage/volume_vacuum.go

@@ -5,8 +5,8 @@ import (
 	"os"
 	"time"
 
-	. "github.com/chrislusf/seaweedfs/weed/storage/types"
 	"github.com/chrislusf/seaweedfs/weed/glog"
+	. "github.com/chrislusf/seaweedfs/weed/storage/types"
 	"github.com/chrislusf/seaweedfs/weed/util"
 )
 

weed/storage/volume_vacuum_test.go

@@ -1,11 +1,11 @@
 package storage
 
 import (
+	"github.com/chrislusf/seaweedfs/weed/storage/types"
 	"io/ioutil"
 	"math/rand"
 	"os"
 	"testing"
-	"github.com/chrislusf/seaweedfs/weed/storage/types"
 )
 
 /*