Browse Source

go fmt

pull/1293/head
Chris Lu 5 years ago
parent
commit
cb3985be70
  1. 2
      weed/filer2/leveldb/leveldb_store_test.go
  2. 4
      weed/filer2/leveldb2/leveldb2_store_test.go
  3. 8
      weed/filer2/mongodb/mongodb_store.go
  4. 2
      weed/messaging/broker/topic_lock.go
  5. 4
      weed/messaging/client/publisher.go
  6. 2
      weed/server/filer_server.go
  7. 6
      weed/util/chunk_cache/on_disk_cache_layer.go
  8. 2
      weed/util/log_buffer/log_read.go

2
weed/filer2/leveldb/leveldb_store_test.go

@ -11,7 +11,7 @@ import (
)
func TestCreateAndFind(t *testing.T) {
filer := filer2.NewFiler(nil, nil, "",0, "", "", nil)
filer := filer2.NewFiler(nil, nil, "", 0, "", "", nil)
dir, _ := ioutil.TempDir("", "seaweedfs_filer_test")
defer os.RemoveAll(dir)
store := &LevelDBStore{}

4
weed/filer2/leveldb2/leveldb2_store_test.go

@ -11,7 +11,7 @@ import (
)
func TestCreateAndFind(t *testing.T) {
filer := filer2.NewFiler(nil, nil, "",0, "", "", nil)
filer := filer2.NewFiler(nil, nil, "", 0, "", "", nil)
dir, _ := ioutil.TempDir("", "seaweedfs_filer_test")
defer os.RemoveAll(dir)
store := &LevelDB2Store{}
@ -66,7 +66,7 @@ func TestCreateAndFind(t *testing.T) {
}
func TestEmptyRoot(t *testing.T) {
filer := filer2.NewFiler(nil, nil, "",0, "", "", nil)
filer := filer2.NewFiler(nil, nil, "", 0, "", "", nil)
dir, _ := ioutil.TempDir("", "seaweedfs_filer_test2")
defer os.RemoveAll(dir)
store := &LevelDB2Store{}

8
weed/filer2/mongodb/mongodb_store.go

@ -38,7 +38,7 @@ func (store *MongodbStore) Initialize(configuration util.Configuration, prefix s
store.database = configuration.GetString(prefix + "database")
store.collectionName = "filemeta"
poolSize := configuration.GetInt(prefix + "option_pool_size")
return store.connection(configuration.GetString(prefix + "uri"), uint64(poolSize))
return store.connection(configuration.GetString(prefix+"uri"), uint64(poolSize))
}
func (store *MongodbStore) connection(uri string, poolSize uint64) (err error) {
@ -60,7 +60,7 @@ func (store *MongodbStore) connection(uri string, poolSize uint64) (err error) {
return err
}
func (store *MongodbStore) createIndex (c *mongo.Collection, index mongo.IndexModel, opts *options.CreateIndexesOptions) error {
func (store *MongodbStore) createIndex(c *mongo.Collection, index mongo.IndexModel, opts *options.CreateIndexesOptions) error {
_, err := c.Indexes().CreateOne(context.Background(), index, opts)
return err
}
@ -169,14 +169,14 @@ func (store *MongodbStore) DeleteFolderChildren(ctx context.Context, fullpath ut
func (store *MongodbStore) ListDirectoryEntries(ctx context.Context, fullpath util.FullPath, startFileName string, inclusive bool, limit int) (entries []*filer2.Entry, err error) {
var where = bson.M{"directory": string(fullpath), "name": bson.M{"$gt": startFileName,}}
var where = bson.M{"directory": string(fullpath), "name": bson.M{"$gt": startFileName}}
if inclusive {
where["name"] = bson.M{
"$gte": startFileName,
}
}
optLimit := int64(limit)
opts := &options.FindOptions{Limit: &optLimit, Sort: bson.M{ "name": 1 }}
opts := &options.FindOptions{Limit: &optLimit, Sort: bson.M{"name": 1}}
cur, err := store.connect.Database(store.database).Collection(store.collectionName).Find(ctx, where, opts)
for cur.Next(ctx) {
var data Model

2
weed/messaging/broker/topic_lock.go

@ -18,7 +18,7 @@ type TopicPartition struct {
}
type TopicLock struct {
sync.Mutex
cond *sync.Cond
cond *sync.Cond
subscriberCount int
publisherCount int
logBuffer *log_buffer.LogBuffer

4
weed/messaging/client/publisher.go

@ -49,9 +49,9 @@ func (mc *MessagingClient) NewPublisher(namespace, topic string) (*Publisher, er
doneChan <- err
return
}
if in.Redirect != nil{
if in.Redirect != nil {
}
if in.Config != nil{
if in.Config != nil {
}
}
}()

2
weed/server/filer_server.go

@ -21,11 +21,11 @@ import (
_ "github.com/chrislusf/seaweedfs/weed/filer2/etcd"
_ "github.com/chrislusf/seaweedfs/weed/filer2/leveldb"
_ "github.com/chrislusf/seaweedfs/weed/filer2/leveldb2"
_ "github.com/chrislusf/seaweedfs/weed/filer2/mongodb"
_ "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/filer2/redis2"
_ "github.com/chrislusf/seaweedfs/weed/filer2/mongodb"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/notification"
_ "github.com/chrislusf/seaweedfs/weed/notification/aws_sqs"

6
weed/util/chunk_cache/on_disk_cache_layer.go

@ -14,7 +14,7 @@ type OnDiskCacheLayer struct {
diskCaches []*ChunkCacheVolume
}
func NewOnDiskCacheLayer(dir, namePrefix string, diskSizeMB int64, segmentCount int) *OnDiskCacheLayer{
func NewOnDiskCacheLayer(dir, namePrefix string, diskSizeMB int64, segmentCount int) *OnDiskCacheLayer {
volumeCount, volumeSize := int(diskSizeMB/30000), int64(30000)
if volumeCount < segmentCount {
@ -58,7 +58,7 @@ func (c *OnDiskCacheLayer) setChunk(needleId types.NeedleId, data []byte) {
}
func (c *OnDiskCacheLayer) getChunk(needleId types.NeedleId) (data []byte){
func (c *OnDiskCacheLayer) getChunk(needleId types.NeedleId) (data []byte) {
var err error
@ -80,7 +80,7 @@ func (c *OnDiskCacheLayer) getChunk(needleId types.NeedleId) (data []byte){
}
func (c *OnDiskCacheLayer) shutdown(){
func (c *OnDiskCacheLayer) shutdown() {
for _, diskCache := range c.diskCaches {
diskCache.Shutdown()

2
weed/util/log_buffer/log_read.go

@ -72,4 +72,4 @@ func (logBuffer *LogBuffer) LoopProcessLogData(
// fmt.Printf("sent message ts[%d,%d] size %d\n", startReadTime.UnixNano(), lastReadTime.UnixNano(), batchSize)
}
}
}
Loading…
Cancel
Save