From 458ada173ed6df2933c35fe0d3e3dd9457d3a975 Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Sun, 27 May 2018 11:52:26 -0700 Subject: [PATCH] go fmt --- weed/command/filer.go | 6 ++-- weed/command/filer_copy.go | 2 +- weed/command/mount_std.go | 2 +- .../filer2/abstract_sql/abstract_sql_store.go | 2 +- weed/filer2/cassandra/cassandra_store.go | 2 +- weed/filer2/configuration.go | 20 ++++++------- weed/filer2/entry.go | 2 +- weed/filer2/entry_codec.go | 4 +-- weed/filer2/filechunks.go | 2 +- weed/filer2/filechunks_test.go | 30 +++++++++---------- weed/filer2/filer.go | 26 ++++++++-------- weed/filer2/filerstore.go | 4 +-- weed/filer2/fullpath.go | 2 +- weed/filer2/leveldb/leveldb_store.go | 10 +++---- weed/filer2/leveldb/leveldb_store_test.go | 2 +- weed/filer2/memdb/memdb_store.go | 4 +-- weed/filer2/memdb/memdb_store_test.go | 2 +- weed/filer2/mysql/mysql_store.go | 6 ++-- weed/filer2/postgres/postgres_store.go | 6 ++-- weed/filer2/redis/redis_store.go | 2 +- weed/filesys/dir.go | 4 +-- weed/filesys/file.go | 6 ++-- weed/filesys/filehandle.go | 13 ++++---- weed/filesys/wfs.go | 4 +-- weed/images/favicon.go | 2 +- weed/server/filer_grpc_server.go | 8 ++--- weed/server/filer_server.go | 8 ++--- weed/server/filer_server_handlers_admin.go | 4 +-- weed/server/filer_server_handlers_read.go | 2 +- weed/server/filer_server_handlers_write.go | 5 ++-- weed/server/filer_ui/breadcrumb.go | 2 +- weed/server/raft_server.go | 2 +- weed/server/volume_server_handlers_admin.go | 2 +- weed/server/volume_server_handlers_ui.go | 2 +- weed/storage/needle_map_memory.go | 2 +- weed/storage/volume_checking.go | 2 +- 36 files changed, 101 insertions(+), 103 deletions(-) diff --git a/weed/command/filer.go b/weed/command/filer.go index 5f0ceab48..fd9419772 100644 --- a/weed/command/filer.go +++ b/weed/command/filer.go @@ -5,14 +5,14 @@ import ( "strconv" "time" + "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/server" "github.com/chrislusf/seaweedfs/weed/util" "github.com/soheilhy/cmux" - "google.golang.org/grpc/reflection" "google.golang.org/grpc" - "github.com/chrislusf/seaweedfs/weed/pb/filer_pb" - "github.com/chrislusf/seaweedfs/weed/filer2" + "google.golang.org/grpc/reflection" ) var ( diff --git a/weed/command/filer_copy.go b/weed/command/filer_copy.go index 4c203fc94..8a754bb55 100644 --- a/weed/command/filer_copy.go +++ b/weed/command/filer_copy.go @@ -68,7 +68,7 @@ func runCopy(cmd *Command, args []string) bool { return false } filerDestination := args[len(args)-1] - fileOrDirs := args[0: len(args)-1] + fileOrDirs := args[0 : len(args)-1] filerUrl, err := url.Parse(filerDestination) if err != nil { diff --git a/weed/command/mount_std.go b/weed/command/mount_std.go index 4908bdbff..b3f038cc2 100644 --- a/weed/command/mount_std.go +++ b/weed/command/mount_std.go @@ -8,9 +8,9 @@ import ( "bazil.org/fuse" "bazil.org/fuse/fs" + "github.com/chrislusf/seaweedfs/weed/filesys" "github.com/chrislusf/seaweedfs/weed/glog" "github.com/chrislusf/seaweedfs/weed/util" - "github.com/chrislusf/seaweedfs/weed/filesys" ) func runMount(cmd *Command, args []string) bool { diff --git a/weed/filer2/abstract_sql/abstract_sql_store.go b/weed/filer2/abstract_sql/abstract_sql_store.go index e924fa16a..aa3b82c5b 100644 --- a/weed/filer2/abstract_sql/abstract_sql_store.go +++ b/weed/filer2/abstract_sql/abstract_sql_store.go @@ -1,8 +1,8 @@ package abstract_sql import ( - "fmt" "database/sql" + "fmt" "github.com/chrislusf/seaweedfs/weed/filer2" "github.com/chrislusf/seaweedfs/weed/glog" diff --git a/weed/filer2/cassandra/cassandra_store.go b/weed/filer2/cassandra/cassandra_store.go index 316b6cce0..a1e63b87d 100644 --- a/weed/filer2/cassandra/cassandra_store.go +++ b/weed/filer2/cassandra/cassandra_store.go @@ -2,9 +2,9 @@ package cassandra import ( "fmt" - "github.com/gocql/gocql" "github.com/chrislusf/seaweedfs/weed/filer2" "github.com/chrislusf/seaweedfs/weed/glog" + "github.com/gocql/gocql" "github.com/spf13/viper" ) diff --git a/weed/filer2/configuration.go b/weed/filer2/configuration.go index 16c0f3fd0..46ed9e056 100644 --- a/weed/filer2/configuration.go +++ b/weed/filer2/configuration.go @@ -3,8 +3,8 @@ package filer2 import ( "os" - "github.com/spf13/viper" "github.com/chrislusf/seaweedfs/weed/glog" + "github.com/spf13/viper" ) const ( @@ -20,12 +20,11 @@ enabled = false enabled = false dir = "." # directory to store level db files -[mysql] +#################################################### # multiple filers on shared storage, fairly scalable -# -# need to choose or create a database. -# need to manually create a table "filemeta". -# +#################################################### + +[mysql] # CREATE TABLE IF NOT EXISTS filemeta ( # dirhash BIGINT COMMENT 'first 64 bits of MD5 hash value of directory field', # name VARCHAR(1000) COMMENT 'directory or file name', @@ -33,7 +32,6 @@ dir = "." # directory to store level db files # meta BLOB, # PRIMARY KEY (dirhash, name) # ) DEFAULT CHARSET=utf8; -# enabled = true hostname = "localhost" port = 3306 @@ -90,10 +88,10 @@ var ( func (f *Filer) LoadConfiguration() { // find a filer store - viper.SetConfigName("filer") // name of config file (without extension) - viper.AddConfigPath(".") // optionally look for config in the working directory - viper.AddConfigPath("$HOME/.seaweedfs") // call multiple times to add many search paths - viper.AddConfigPath("/etc/seaweedfs/") // path to look for the config file in + viper.SetConfigName("filer") // name of config file (without extension) + viper.AddConfigPath(".") // optionally look for config in the working directory + viper.AddConfigPath("$HOME/.seaweedfs") // call multiple times to add many search paths + viper.AddConfigPath("/etc/seaweedfs/") // path to look for the config file in if err := viper.ReadInConfig(); err != nil { // Handle errors reading the config file glog.Fatalf("Failed to load filer.toml file from current directory, or $HOME/.seaweedfs/, or /etc/seaweedfs/" + "\n\nPlease follow this example and add a filer.toml file to " + diff --git a/weed/filer2/entry.go b/weed/filer2/entry.go index f741d4bb3..cf7ad08aa 100644 --- a/weed/filer2/entry.go +++ b/weed/filer2/entry.go @@ -15,7 +15,7 @@ type Attr struct { Gid uint32 // group gid } -func (attr Attr) IsDirectory() (bool) { +func (attr Attr) IsDirectory() bool { return attr.Mode&os.ModeDir > 0 } diff --git a/weed/filer2/entry_codec.go b/weed/filer2/entry_codec.go index 7fafea3e3..8019b2193 100644 --- a/weed/filer2/entry_codec.go +++ b/weed/filer2/entry_codec.go @@ -4,9 +4,9 @@ import ( "os" "time" + "fmt" "github.com/chrislusf/seaweedfs/weed/pb/filer_pb" "github.com/gogo/protobuf/proto" - "fmt" ) func (entry *Entry) EncodeAttributesAndChunks() ([]byte, error) { @@ -23,7 +23,7 @@ func (entry *Entry) EncodeAttributesAndChunks() ([]byte, error) { return proto.Marshal(message) } -func (entry *Entry) DecodeAttributesAndChunks(blob []byte) (error) { +func (entry *Entry) DecodeAttributesAndChunks(blob []byte) error { message := &filer_pb.Entry{} diff --git a/weed/filer2/filechunks.go b/weed/filer2/filechunks.go index 5877f2f71..86b1a85b5 100644 --- a/weed/filer2/filechunks.go +++ b/weed/filer2/filechunks.go @@ -1,9 +1,9 @@ package filer2 import ( - "sort" "log" "math" + "sort" "github.com/chrislusf/seaweedfs/weed/pb/filer_pb" ) diff --git a/weed/filer2/filechunks_test.go b/weed/filer2/filechunks_test.go index 033e66b1e..134bb9c19 100644 --- a/weed/filer2/filechunks_test.go +++ b/weed/filer2/filechunks_test.go @@ -1,8 +1,8 @@ package filer2 import ( - "testing" "log" + "testing" "github.com/chrislusf/seaweedfs/weed/pb/filer_pb" ) @@ -163,9 +163,9 @@ func TestChunksReading(t *testing.T) { Offset: 0, Size: 250, Expected: []*ChunkView{ - {Offset: 0, Size: 100, FileId: "abc", LogicOffset:0}, - {Offset: 0, Size: 100, FileId: "asdf", LogicOffset:100}, - {Offset: 0, Size: 50, FileId: "fsad", LogicOffset:200}, + {Offset: 0, Size: 100, FileId: "abc", LogicOffset: 0}, + {Offset: 0, Size: 100, FileId: "asdf", LogicOffset: 100}, + {Offset: 0, Size: 50, FileId: "fsad", LogicOffset: 200}, }, }, // case 1: updates overwrite full chunks @@ -177,7 +177,7 @@ func TestChunksReading(t *testing.T) { Offset: 50, Size: 100, Expected: []*ChunkView{ - {Offset: 50, Size: 100, FileId: "asdf", LogicOffset:50}, + {Offset: 50, Size: 100, FileId: "asdf", LogicOffset: 50}, }, }, // case 2: updates overwrite part of previous chunks @@ -189,8 +189,8 @@ func TestChunksReading(t *testing.T) { Offset: 25, Size: 50, Expected: []*ChunkView{ - {Offset: 25, Size: 25, FileId: "asdf", LogicOffset:25}, - {Offset: 0, Size: 25, FileId: "abc", LogicOffset:50}, + {Offset: 25, Size: 25, FileId: "asdf", LogicOffset: 25}, + {Offset: 0, Size: 25, FileId: "abc", LogicOffset: 50}, }, }, // case 3: updates overwrite full chunks @@ -203,8 +203,8 @@ func TestChunksReading(t *testing.T) { Offset: 0, Size: 200, Expected: []*ChunkView{ - {Offset: 0, Size: 50, FileId: "asdf", LogicOffset:0}, - {Offset: 0, Size: 150, FileId: "xxxx", LogicOffset:50}, + {Offset: 0, Size: 50, FileId: "asdf", LogicOffset: 0}, + {Offset: 0, Size: 150, FileId: "xxxx", LogicOffset: 50}, }, }, // case 4: updates far away from prev chunks @@ -217,7 +217,7 @@ func TestChunksReading(t *testing.T) { Offset: 0, Size: 400, Expected: []*ChunkView{ - {Offset: 0, Size: 200, FileId: "asdf", LogicOffset:0}, + {Offset: 0, Size: 200, FileId: "asdf", LogicOffset: 0}, // {Offset: 0, Size: 150, FileId: "xxxx"}, // missing intervals should not happen }, }, @@ -232,8 +232,8 @@ func TestChunksReading(t *testing.T) { Offset: 0, Size: 220, Expected: []*ChunkView{ - {Offset: 0, Size: 200, FileId: "asdf", LogicOffset:0}, - {Offset: 0, Size: 20, FileId: "abc", LogicOffset:200}, + {Offset: 0, Size: 200, FileId: "asdf", LogicOffset: 0}, + {Offset: 0, Size: 20, FileId: "abc", LogicOffset: 200}, }, }, // case 6: same updates @@ -246,7 +246,7 @@ func TestChunksReading(t *testing.T) { Offset: 0, Size: 100, Expected: []*ChunkView{ - {Offset: 0, Size: 100, FileId: "abc", LogicOffset:0}, + {Offset: 0, Size: 100, FileId: "abc", LogicOffset: 0}, }, }, // case 7: edge cases @@ -259,8 +259,8 @@ func TestChunksReading(t *testing.T) { Offset: 0, Size: 200, Expected: []*ChunkView{ - {Offset: 0, Size: 100, FileId: "abc", LogicOffset:0}, - {Offset: 0, Size: 100, FileId: "asdf", LogicOffset:100}, + {Offset: 0, Size: 100, FileId: "abc", LogicOffset: 0}, + {Offset: 0, Size: 100, FileId: "asdf", LogicOffset: 100}, }, }, } diff --git a/weed/filer2/filer.go b/weed/filer2/filer.go index 35d69b32e..f182adb13 100644 --- a/weed/filer2/filer.go +++ b/weed/filer2/filer.go @@ -3,12 +3,12 @@ package filer2 import ( "fmt" + "github.com/chrislusf/seaweedfs/weed/glog" "github.com/karlseguin/ccache" - "strings" + "os" "path/filepath" + "strings" "time" - "os" - "github.com/chrislusf/seaweedfs/weed/glog" ) type Filer struct { @@ -24,15 +24,15 @@ func NewFiler(master string) *Filer { } } -func (f *Filer) SetStore(store FilerStore) () { +func (f *Filer) SetStore(store FilerStore) { f.store = store } -func (f *Filer) DisableDirectoryCache() () { +func (f *Filer) DisableDirectoryCache() { f.directoryCache = nil } -func (f *Filer) CreateEntry(entry *Entry) (error) { +func (f *Filer) CreateEntry(entry *Entry) error { dirParts := strings.Split(string(entry.FullPath), "/") @@ -94,11 +94,11 @@ func (f *Filer) CreateEntry(entry *Entry) (error) { } /* - if !hasWritePermission(lastDirectoryEntry, entry) { - glog.V(0).Infof("directory %s: %v, entry: uid=%d gid=%d", - lastDirectoryEntry.FullPath, lastDirectoryEntry.Attr, entry.Uid, entry.Gid) - return fmt.Errorf("no write permission in folder %v", lastDirectoryEntry.FullPath) - } + if !hasWritePermission(lastDirectoryEntry, entry) { + glog.V(0).Infof("directory %s: %v, entry: uid=%d gid=%d", + lastDirectoryEntry.FullPath, lastDirectoryEntry.Attr, entry.Uid, entry.Gid) + return fmt.Errorf("no write permission in folder %v", lastDirectoryEntry.FullPath) + } */ if err := f.store.InsertEntry(entry); err != nil { @@ -135,12 +135,12 @@ func (f *Filer) DeleteEntry(p FullPath) (fileEntry *Entry, err error) { func (f *Filer) ListDirectoryEntries(p FullPath, startFileName string, inclusive bool, limit int) ([]*Entry, error) { if strings.HasSuffix(string(p), "/") && len(p) > 1 { - p = p[0:len(p)-1] + p = p[0 : len(p)-1] } return f.store.ListDirectoryEntries(p, startFileName, inclusive, limit) } -func (f *Filer) cacheGetDirectory(dirpath string) (*Entry) { +func (f *Filer) cacheGetDirectory(dirpath string) *Entry { if f.directoryCache == nil { return nil } diff --git a/weed/filer2/filerstore.go b/weed/filer2/filerstore.go index b9f7d1198..a5cd3352e 100644 --- a/weed/filer2/filerstore.go +++ b/weed/filer2/filerstore.go @@ -7,8 +7,8 @@ import ( type FilerStore interface { GetName() string - Initialize(viper *viper.Viper) (error) - InsertEntry(*Entry) (error) + Initialize(viper *viper.Viper) error + InsertEntry(*Entry) error UpdateEntry(*Entry) (err error) FindEntry(FullPath) (entry *Entry, err error) DeleteEntry(FullPath) (fileEntry *Entry, err error) diff --git a/weed/filer2/fullpath.go b/weed/filer2/fullpath.go index 20e42e9b9..be6e34431 100644 --- a/weed/filer2/fullpath.go +++ b/weed/filer2/fullpath.go @@ -25,7 +25,7 @@ func (fp FullPath) DirAndName() (string, string) { return dir[:len(dir)-1], name } -func (fp FullPath) Name() (string) { +func (fp FullPath) Name() string { _, name := filepath.Split(string(fp)) return name } diff --git a/weed/filer2/leveldb/leveldb_store.go b/weed/filer2/leveldb/leveldb_store.go index 8b2df93ac..a3125e923 100644 --- a/weed/filer2/leveldb/leveldb_store.go +++ b/weed/filer2/leveldb/leveldb_store.go @@ -1,15 +1,15 @@ package leveldb import ( - "fmt" "bytes" + "fmt" - "github.com/syndtr/goleveldb/leveldb" "github.com/chrislusf/seaweedfs/weed/filer2" - leveldb_util "github.com/syndtr/goleveldb/leveldb/util" "github.com/chrislusf/seaweedfs/weed/glog" - "github.com/spf13/viper" weed_util "github.com/chrislusf/seaweedfs/weed/util" + "github.com/spf13/viper" + "github.com/syndtr/goleveldb/leveldb" + leveldb_util "github.com/syndtr/goleveldb/leveldb/util" ) const ( @@ -162,7 +162,7 @@ func genDirectoryKeyPrefix(fullpath filer2.FullPath, startFileName string) (keyP return keyPrefix } -func getNameFromKey(key []byte) (string) { +func getNameFromKey(key []byte) string { sepIndex := len(key) - 1 for sepIndex >= 0 && key[sepIndex] != DIR_FILE_SEPARATOR { diff --git a/weed/filer2/leveldb/leveldb_store_test.go b/weed/filer2/leveldb/leveldb_store_test.go index 87f77d138..896dabdc3 100644 --- a/weed/filer2/leveldb/leveldb_store_test.go +++ b/weed/filer2/leveldb/leveldb_store_test.go @@ -1,10 +1,10 @@ package leveldb import ( - "testing" "github.com/chrislusf/seaweedfs/weed/filer2" "io/ioutil" "os" + "testing" ) func TestCreateAndFind(t *testing.T) { diff --git a/weed/filer2/memdb/memdb_store.go b/weed/filer2/memdb/memdb_store.go index 452e4970c..098ed5dce 100644 --- a/weed/filer2/memdb/memdb_store.go +++ b/weed/filer2/memdb/memdb_store.go @@ -1,11 +1,11 @@ package memdb import ( + "fmt" "github.com/chrislusf/seaweedfs/weed/filer2" "github.com/google/btree" - "strings" - "fmt" "github.com/spf13/viper" + "strings" ) func init() { diff --git a/weed/filer2/memdb/memdb_store_test.go b/weed/filer2/memdb/memdb_store_test.go index a8631f969..bd1cdfdc0 100644 --- a/weed/filer2/memdb/memdb_store_test.go +++ b/weed/filer2/memdb/memdb_store_test.go @@ -1,8 +1,8 @@ package memdb import ( - "testing" "github.com/chrislusf/seaweedfs/weed/filer2" + "testing" ) func TestCreateAndFind(t *testing.T) { diff --git a/weed/filer2/mysql/mysql_store.go b/weed/filer2/mysql/mysql_store.go index e56b961bb..475e4a642 100644 --- a/weed/filer2/mysql/mysql_store.go +++ b/weed/filer2/mysql/mysql_store.go @@ -1,13 +1,13 @@ package mysql import ( - "fmt" "database/sql" + "fmt" "github.com/chrislusf/seaweedfs/weed/filer2" - "github.com/spf13/viper" - _ "github.com/go-sql-driver/mysql" "github.com/chrislusf/seaweedfs/weed/filer2/abstract_sql" + _ "github.com/go-sql-driver/mysql" + "github.com/spf13/viper" ) const ( diff --git a/weed/filer2/postgres/postgres_store.go b/weed/filer2/postgres/postgres_store.go index 19d97b443..3bec55def 100644 --- a/weed/filer2/postgres/postgres_store.go +++ b/weed/filer2/postgres/postgres_store.go @@ -1,13 +1,13 @@ package postgres import ( - "fmt" "database/sql" + "fmt" "github.com/chrislusf/seaweedfs/weed/filer2" - "github.com/spf13/viper" - _ "github.com/lib/pq" "github.com/chrislusf/seaweedfs/weed/filer2/abstract_sql" + _ "github.com/lib/pq" + "github.com/spf13/viper" ) const ( diff --git a/weed/filer2/redis/redis_store.go b/weed/filer2/redis/redis_store.go index cb8381bf5..5d1f51812 100644 --- a/weed/filer2/redis/redis_store.go +++ b/weed/filer2/redis/redis_store.go @@ -4,8 +4,8 @@ import ( "fmt" "github.com/chrislusf/seaweedfs/weed/filer2" "github.com/chrislusf/seaweedfs/weed/glog" - "github.com/spf13/viper" "github.com/go-redis/redis" + "github.com/spf13/viper" "sort" "strings" ) diff --git a/weed/filesys/dir.go b/weed/filesys/dir.go index 6406dff95..e53c4cfaf 100644 --- a/weed/filesys/dir.go +++ b/weed/filesys/dir.go @@ -7,12 +7,12 @@ import ( "path" "sync" - "bazil.org/fuse/fs" "bazil.org/fuse" + "bazil.org/fuse/fs" "github.com/chrislusf/seaweedfs/weed/glog" "github.com/chrislusf/seaweedfs/weed/pb/filer_pb" - "time" "path/filepath" + "time" ) type Dir struct { diff --git a/weed/filesys/file.go b/weed/filesys/file.go index d63f9d62d..7ea14cc49 100644 --- a/weed/filesys/file.go +++ b/weed/filesys/file.go @@ -1,15 +1,15 @@ package filesys import ( - "context" "bazil.org/fuse" "bazil.org/fuse/fs" + "context" + "github.com/chrislusf/seaweedfs/weed/filer2" "github.com/chrislusf/seaweedfs/weed/glog" "github.com/chrislusf/seaweedfs/weed/pb/filer_pb" - "path/filepath" "os" + "path/filepath" "time" - "github.com/chrislusf/seaweedfs/weed/filer2" ) var _ = fs.Node(&File{}) diff --git a/weed/filesys/filehandle.go b/weed/filesys/filehandle.go index d9dc6795e..81aca42a4 100644 --- a/weed/filesys/filehandle.go +++ b/weed/filesys/filehandle.go @@ -1,19 +1,19 @@ package filesys import ( + "bazil.org/fuse" "bazil.org/fuse/fs" + "bytes" + "context" "fmt" - "github.com/chrislusf/seaweedfs/weed/pb/filer_pb" "github.com/chrislusf/seaweedfs/weed/filer2" - "context" "github.com/chrislusf/seaweedfs/weed/glog" - "bazil.org/fuse" - "bytes" "github.com/chrislusf/seaweedfs/weed/operation" - "time" + "github.com/chrislusf/seaweedfs/weed/pb/filer_pb" + "github.com/chrislusf/seaweedfs/weed/util" "strings" "sync" - "github.com/chrislusf/seaweedfs/weed/util" + "time" ) type FileHandle struct { @@ -32,6 +32,7 @@ type FileHandle struct { } var _ = fs.Handle(&FileHandle{}) + // var _ = fs.HandleReadAller(&FileHandle{}) var _ = fs.HandleReader(&FileHandle{}) var _ = fs.HandleFlusher(&FileHandle{}) diff --git a/weed/filesys/wfs.go b/weed/filesys/wfs.go index 9f8f4649a..1b843e2d7 100644 --- a/weed/filesys/wfs.go +++ b/weed/filesys/wfs.go @@ -3,9 +3,9 @@ package filesys import ( "bazil.org/fuse/fs" "fmt" - "google.golang.org/grpc" "github.com/chrislusf/seaweedfs/weed/pb/filer_pb" "github.com/karlseguin/ccache" + "google.golang.org/grpc" ) type WFS struct { @@ -15,7 +15,7 @@ type WFS struct { func NewSeaweedFileSystem(filer string) *WFS { return &WFS{ - filer: filer, + filer: filer, listDirectoryEntriesCache: ccache.New(ccache.Configure().MaxSize(6000).ItemsToPrune(100)), } } diff --git a/weed/images/favicon.go b/weed/images/favicon.go index 09504976c..2f0af200d 100644 --- a/weed/images/favicon.go +++ b/weed/images/favicon.go @@ -181,6 +181,7 @@ type bintree struct { Func func() (*asset, error) Children map[string]*bintree } + var _bintree = &bintree{nil, map[string]*bintree{ "favicon": &bintree{nil, map[string]*bintree{ "favicon.ico": &bintree{favicon, map[string]*bintree{}}, @@ -233,4 +234,3 @@ func _filePath(dir, name string) string { cannonicalName := strings.Replace(name, "\\", "/", -1) return filepath.Join(append([]string{dir}, strings.Split(cannonicalName, "/")...)...) } - diff --git a/weed/server/filer_grpc_server.go b/weed/server/filer_grpc_server.go index ffa24a0d8..44f5320cb 100644 --- a/weed/server/filer_grpc_server.go +++ b/weed/server/filer_grpc_server.go @@ -1,16 +1,16 @@ package weed_server import ( - "fmt" "context" - "time" + "fmt" "os" "path/filepath" + "time" - "github.com/chrislusf/seaweedfs/weed/operation" - "github.com/chrislusf/seaweedfs/weed/pb/filer_pb" "github.com/chrislusf/seaweedfs/weed/filer2" "github.com/chrislusf/seaweedfs/weed/glog" + "github.com/chrislusf/seaweedfs/weed/operation" + "github.com/chrislusf/seaweedfs/weed/pb/filer_pb" ) func (fs *FilerServer) LookupDirectoryEntry(ctx context.Context, req *filer_pb.LookupDirectoryEntryRequest) (*filer_pb.LookupDirectoryEntryResponse, error) { diff --git a/weed/server/filer_server.go b/weed/server/filer_server.go index 012b0afbf..a1dc91650 100644 --- a/weed/server/filer_server.go +++ b/weed/server/filer_server.go @@ -7,10 +7,6 @@ import ( "sync" "time" - "github.com/chrislusf/seaweedfs/weed/glog" - "github.com/chrislusf/seaweedfs/weed/security" - "github.com/chrislusf/seaweedfs/weed/storage" - "github.com/chrislusf/seaweedfs/weed/util" "github.com/chrislusf/seaweedfs/weed/filer2" _ "github.com/chrislusf/seaweedfs/weed/filer2/cassandra" _ "github.com/chrislusf/seaweedfs/weed/filer2/leveldb" @@ -18,6 +14,10 @@ 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/glog" + "github.com/chrislusf/seaweedfs/weed/security" + "github.com/chrislusf/seaweedfs/weed/storage" + "github.com/chrislusf/seaweedfs/weed/util" ) type FilerServer struct { diff --git a/weed/server/filer_server_handlers_admin.go b/weed/server/filer_server_handlers_admin.go index f3cf2754f..91a0e6fa0 100644 --- a/weed/server/filer_server_handlers_admin.go +++ b/weed/server/filer_server_handlers_admin.go @@ -3,10 +3,10 @@ package weed_server import ( "net/http" - "github.com/chrislusf/seaweedfs/weed/glog" "github.com/chrislusf/seaweedfs/weed/filer2" - "strconv" + "github.com/chrislusf/seaweedfs/weed/glog" "github.com/chrislusf/seaweedfs/weed/pb/filer_pb" + "strconv" "time" ) diff --git a/weed/server/filer_server_handlers_read.go b/weed/server/filer_server_handlers_read.go index e451a81de..782ed55f1 100644 --- a/weed/server/filer_server_handlers_read.go +++ b/weed/server/filer_server_handlers_read.go @@ -7,11 +7,11 @@ import ( "strconv" "strings" + "github.com/chrislusf/seaweedfs/weed/filer2" "github.com/chrislusf/seaweedfs/weed/glog" "github.com/chrislusf/seaweedfs/weed/operation" ui "github.com/chrislusf/seaweedfs/weed/server/filer_ui" "github.com/chrislusf/seaweedfs/weed/util" - "github.com/chrislusf/seaweedfs/weed/filer2" ) // listDirectoryHandler lists directories and folers under a directory diff --git a/weed/server/filer_server_handlers_write.go b/weed/server/filer_server_handlers_write.go index 9d5c620de..78028051e 100644 --- a/weed/server/filer_server_handlers_write.go +++ b/weed/server/filer_server_handlers_write.go @@ -17,13 +17,12 @@ import ( "strconv" "strings" - "github.com/chrislusf/seaweedfs/weed/filer" + "github.com/chrislusf/seaweedfs/weed/filer2" "github.com/chrislusf/seaweedfs/weed/glog" "github.com/chrislusf/seaweedfs/weed/operation" + "github.com/chrislusf/seaweedfs/weed/pb/filer_pb" "github.com/chrislusf/seaweedfs/weed/storage" "github.com/chrislusf/seaweedfs/weed/util" - "github.com/chrislusf/seaweedfs/weed/filer2" - "github.com/chrislusf/seaweedfs/weed/pb/filer_pb" "time" ) diff --git a/weed/server/filer_ui/breadcrumb.go b/weed/server/filer_ui/breadcrumb.go index 146b6c6c4..d056a4b25 100644 --- a/weed/server/filer_ui/breadcrumb.go +++ b/weed/server/filer_ui/breadcrumb.go @@ -1,8 +1,8 @@ package master_ui import ( - "strings" "path/filepath" + "strings" ) type Breadcrumb struct { diff --git a/weed/server/raft_server.go b/weed/server/raft_server.go index 591bc7caf..61adcdc59 100644 --- a/weed/server/raft_server.go +++ b/weed/server/raft_server.go @@ -198,7 +198,7 @@ func postFollowingOneRedirect(target string, contentType string, b bytes.Buffer) reply := string(data) if strings.HasPrefix(reply, "\"http") { - urlStr := reply[1: len(reply)-1] + urlStr := reply[1 : len(reply)-1] glog.V(0).Infoln("Post redirected to ", urlStr) resp2, err2 := http.Post(urlStr, contentType, backupReader) diff --git a/weed/server/volume_server_handlers_admin.go b/weed/server/volume_server_handlers_admin.go index 79bb89756..f66ab2306 100644 --- a/weed/server/volume_server_handlers_admin.go +++ b/weed/server/volume_server_handlers_admin.go @@ -8,8 +8,8 @@ import ( "github.com/chrislusf/seaweedfs/weed/glog" "github.com/chrislusf/seaweedfs/weed/stats" - "github.com/chrislusf/seaweedfs/weed/util" "github.com/chrislusf/seaweedfs/weed/storage" + "github.com/chrislusf/seaweedfs/weed/util" ) func (vs *VolumeServer) statusHandler(w http.ResponseWriter, r *http.Request) { diff --git a/weed/server/volume_server_handlers_ui.go b/weed/server/volume_server_handlers_ui.go index 7923c95c0..6fc775a6d 100644 --- a/weed/server/volume_server_handlers_ui.go +++ b/weed/server/volume_server_handlers_ui.go @@ -5,9 +5,9 @@ import ( "path/filepath" "time" + ui "github.com/chrislusf/seaweedfs/weed/server/volume_server_ui" "github.com/chrislusf/seaweedfs/weed/stats" "github.com/chrislusf/seaweedfs/weed/util" - ui "github.com/chrislusf/seaweedfs/weed/server/volume_server_ui" ) func (vs *VolumeServer) uiStatusHandler(w http.ResponseWriter, r *http.Request) { diff --git a/weed/storage/needle_map_memory.go b/weed/storage/needle_map_memory.go index 6da4bf82b..261486cf8 100644 --- a/weed/storage/needle_map_memory.go +++ b/weed/storage/needle_map_memory.go @@ -86,7 +86,7 @@ func WalkIndexFile(r *os.File, fn func(key uint64, offset, size uint32) error) e for count > 0 && e == nil || e == io.EOF { for i = 0; i+16 <= count; i += 16 { - key, offset, size = idxFileEntry(bytes[i: i+16]) + key, offset, size = idxFileEntry(bytes[i : i+16]) if e = fn(key, offset, size); e != nil { return e } diff --git a/weed/storage/volume_checking.go b/weed/storage/volume_checking.go index 67538ebb2..5603a878b 100644 --- a/weed/storage/volume_checking.go +++ b/weed/storage/volume_checking.go @@ -12,7 +12,7 @@ func getActualSize(size uint32) int64 { return NeedleHeaderSize + int64(size) + NeedleChecksumSize + int64(padding) } -func CheckVolumeDataIntegrity(v *Volume, indexFile *os.File) (error) { +func CheckVolumeDataIntegrity(v *Volume, indexFile *os.File) error { var indexSize int64 var e error if indexSize, e = verifyIndexFileIntegrity(indexFile); e != nil {