From b7f0ba3800b2a2e9a1268e8b90714d3ab1281c72 Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Sat, 11 Apr 2020 12:37:41 -0700 Subject: [PATCH] refactoring --- weed/filer2/filer.go | 6 +++--- weed/{queue => log_buffer}/log_buffer.go | 2 +- weed/{queue => log_buffer}/sealed_buffer.go | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) rename weed/{queue => log_buffer}/log_buffer.go (99%) rename weed/{queue => log_buffer}/sealed_buffer.go (97%) diff --git a/weed/filer2/filer.go b/weed/filer2/filer.go index af17bf56c..578a2707f 100644 --- a/weed/filer2/filer.go +++ b/weed/filer2/filer.go @@ -12,8 +12,8 @@ import ( "github.com/karlseguin/ccache" "github.com/chrislusf/seaweedfs/weed/glog" + "github.com/chrislusf/seaweedfs/weed/log_buffer" "github.com/chrislusf/seaweedfs/weed/pb/filer_pb" - "github.com/chrislusf/seaweedfs/weed/queue" "github.com/chrislusf/seaweedfs/weed/util" "github.com/chrislusf/seaweedfs/weed/wdclient" ) @@ -35,7 +35,7 @@ type Filer struct { DirQueuesPath string buckets *FilerBuckets Cipher bool - metaLogBuffer *queue.LogBuffer + metaLogBuffer *log_buffer.LogBuffer } func NewFiler(masters []string, grpcDialOption grpc.DialOption, filerGrpcPort uint32, notifyFn func()) *Filer { @@ -45,7 +45,7 @@ func NewFiler(masters []string, grpcDialOption grpc.DialOption, filerGrpcPort ui fileIdDeletionQueue: util.NewUnboundedQueue(), GrpcDialOption: grpcDialOption, } - f.metaLogBuffer = queue.NewLogBuffer(time.Minute, f.logFlushFunc, notifyFn) + f.metaLogBuffer = log_buffer.NewLogBuffer(time.Minute, f.logFlushFunc, notifyFn) go f.loopProcessingDeletion() diff --git a/weed/queue/log_buffer.go b/weed/log_buffer/log_buffer.go similarity index 99% rename from weed/queue/log_buffer.go rename to weed/log_buffer/log_buffer.go index 78c5b75ae..3b3396128 100644 --- a/weed/queue/log_buffer.go +++ b/weed/log_buffer/log_buffer.go @@ -1,4 +1,4 @@ -package queue +package log_buffer import ( "sync" diff --git a/weed/queue/sealed_buffer.go b/weed/log_buffer/sealed_buffer.go similarity index 97% rename from weed/queue/sealed_buffer.go rename to weed/log_buffer/sealed_buffer.go index 23cec92c9..c5160fad0 100644 --- a/weed/queue/sealed_buffer.go +++ b/weed/log_buffer/sealed_buffer.go @@ -1,4 +1,4 @@ -package queue +package log_buffer import "time"