Go fmt

Author: vitalif

core/backend.go

@@ -26,7 +26,7 @@ import (
 )
 
 type Capabilities struct {
-	MaxMultipartSize    uint64
+	MaxMultipartSize uint64
 	// indicates that the blob store has native support for directories
 	DirBlob bool
 	Name    string
@@ -43,7 +43,7 @@ type BlobItemOutput struct {
 	Size         uint64
 	StorageClass *string
 	// may be nil in list responses for backends that don't return metadata in listings
-	Metadata     map[string]*string
+	Metadata map[string]*string
 }
 
 type HeadBlobOutput struct {
@@ -194,7 +194,7 @@ type MultipartBlobAddInput struct {
 
 type MultipartBlobAddOutput struct {
 	RequestId string
-	PartId *string
+	PartId    *string
 }
 
 type MultipartBlobCopyInput struct {
@@ -207,7 +207,7 @@ type MultipartBlobCopyInput struct {
 
 type MultipartBlobCopyOutput struct {
 	RequestId string
-	PartId *string
+	PartId    *string
 }
 
 type MultipartBlobCommitOutput struct {
@@ -243,13 +243,13 @@ type MakeBucketOutput struct {
 	RequestId string
 }
 
-/// Implementations of all the functions here are expected to be
-/// concurrency-safe, except for
-///
-/// Init() is called exactly once before any other functions are
-/// called.
-///
-/// Capabilities()/Bucket() are expected to be const
+// Implementations of all the functions here are expected to be
+// concurrency-safe, except for:
+//
+// Init() is called exactly once before any other functions are
+// called.
+//
+// Capabilities()/Bucket() are expected to be const
 type StorageBackend interface {
 	Init(key string) error
 	Capabilities() *Capabilities

core/backend_adlv1.go

@@ -151,8 +151,8 @@ func NewADLv1(bucket string, flags *cfg.FlagStorage, config *cfg.ADLv1Config) (*
 		bucket:  bucket,
 		cap: Capabilities{
 			//NoParallelMultipart: true,
-			DirBlob:             true,
-			Name:                "adl",
+			DirBlob: true,
+			Name:    "adl",
 			// ADLv1 fails with 404 if we upload data
 			// larger than 30000000 bytes (28.6MB) (28MB
 			// also failed in at one point, but as of

core/backend_azblob.go

@@ -221,7 +221,7 @@ func (b *AZBlob) refreshToken() (*azblob.ContainerURL, error) {
 		// our token totally expired, renew inline before using it
 		b.mu.Unlock()
 		b.tokenRenewGate <- 1
-		defer func() { <- b.tokenRenewGate } ()
+		defer func() { <-b.tokenRenewGate }()
 
 		b.mu.Lock()
 		// check again, because in the mean time maybe it's renewed
@@ -247,7 +247,7 @@ func (b *AZBlob) refreshToken() (*azblob.ContainerURL, error) {
 				if err != nil {
 					azbLog.Errorf("Unable to refresh token: %v", err)
 				}
-				<- b.tokenRenewGate
+				<-b.tokenRenewGate
 			}()
 
 			// if we cannot renew token, treat it as a
@@ -664,7 +664,7 @@ func (b *AZBlob) DeleteBlobs(param *DeleteBlobsInput) (ret *DeleteBlobsOutput, d
 
 		go func(key string) {
 			defer func() {
-				<- SmallActionsGate
+				<-SmallActionsGate
 				wg.Done()
 			}()
 

core/backend_gcs3.go

@@ -30,7 +30,7 @@ import (
 // GCS variant of S3
 type GCS3 struct {
 	*S3Backend
-	gcs *storage.Client
+	gcs          *storage.Client
 	jsonCredFile string
 }
 
@@ -102,12 +102,12 @@ func (s *GCS3) ListBlobs(param *ListBlobsInput) (*ListBlobsOutput, error) {
 			})
 		} else {
 			items = append(items, BlobItemOutput{
-				Key: &attrs.Name,
-				ETag: &attrs.Etag,
+				Key:          &attrs.Name,
+				ETag:         &attrs.Etag,
 				LastModified: &attrs.Updated,
-				Size: uint64(attrs.Size),
+				Size:         uint64(attrs.Size),
 				StorageClass: &attrs.StorageClass,
-				Metadata: PMetadata(attrs.Metadata),
+				Metadata:     PMetadata(attrs.Metadata),
 			})
 		}
 		n++

core/backend_s3.go

@@ -54,20 +54,20 @@ type S3Backend struct {
 	gcs      bool
 	v2Signer bool
 
-	iam bool
-	iamToken atomic.Value
+	iam                bool
+	iamToken           atomic.Value
 	iamTokenExpiration time.Time
-	iamRefreshTimer *time.Timer
+	iamRefreshTimer    *time.Timer
 }
 
 func NewS3(bucket string, flags *cfg.FlagStorage, config *cfg.S3Config) (*S3Backend, error) {
 	if config.MultipartCopyThreshold == 0 {
-		config.MultipartCopyThreshold = 128*1024*1024
+		config.MultipartCopyThreshold = 128 * 1024 * 1024
 	}
 
 	if config.ProjectId != "" {
 		log.Infof("Using Ceph multitenancy format bucket naming: %s", bucket)
-		bucket = config.ProjectId+":"+bucket
+		bucket = config.ProjectId + ":" + bucket
 	}
 
 	awsConfig, err := config.ToAwsConfig(flags)
@@ -105,15 +105,15 @@ func NewS3(bucket string, flags *cfg.FlagStorage, config *cfg.S3Config) (*S3Back
 }
 
 type IMDSv1Response struct {
-	Code string
-	Token string
+	Code       string
+	Token      string
 	Expiration time.Time
 }
 
 type GCPCredResponse struct {
 	AccessToken string `json:"access_token"`
-	TokenType string `json:"token_type"`
-	ExpiresIn int `json:"expires_in"`
+	TokenType   string `json:"token_type"`
+	ExpiresIn   int    `json:"expires_in"`
 }
 
 func (s *S3Backend) TryIAM() (err error) {
@@ -366,7 +366,7 @@ func (s *S3Backend) testBucket(key string) (err error) {
 		s.flags.ReadRetryAttempts = 5
 	}
 	err = ReadBackoff(s.flags, func(attempt int) error {
-		_, err := s.HeadBlob(&HeadBlobInput{Key: key});
+		_, err := s.HeadBlob(&HeadBlobInput{Key: key})
 		return err
 	})
 	if err != nil {
@@ -699,7 +699,7 @@ func (s *S3Backend) mpuCopyParts(size int64, from string, to string, mpuId strin
 	wg.SetLimit(s.flags.MaxParallelParts)
 
 	var startOffset int64
-	var partIdx     int
+	var partIdx int
 	for _, cfg := range partSizes {
 		for i := 0; i < int(cfg.PartCount) && startOffset < size; i++ {
 			endOffset := MinInt64(startOffset+int64(cfg.PartSize), size)
@@ -1103,7 +1103,7 @@ func (s *S3Backend) MultipartBlobAdd(param *MultipartBlobAddInput) (*MultipartBl
 
 	return &MultipartBlobAddOutput{
 		RequestId: s.getRequestId(req),
-		PartId: resp.ETag,
+		PartId:    resp.ETag,
 	}, nil
 }
 
@@ -1112,7 +1112,7 @@ func (s *S3Backend) MultipartBlobCopy(param *MultipartBlobCopyInput) (*Multipart
 		Bucket:     &s.bucket,
 		Key:        param.Commit.Key,
 		PartNumber: aws.Int64(int64(param.PartNumber)),
-		CopySource: aws.String(pathEscape(s.bucket+"/"+param.CopySource)),
+		CopySource: aws.String(pathEscape(s.bucket + "/" + param.CopySource)),
 		UploadId:   param.Commit.UploadId,
 	}
 	if param.Size != 0 {
@@ -1134,7 +1134,7 @@ func (s *S3Backend) MultipartBlobCopy(param *MultipartBlobCopyInput) (*Multipart
 
 	return &MultipartBlobCopyOutput{
 		RequestId: s.getRequestId(req),
-		PartId: resp.CopyPartResult.ETag,
+		PartId:    resp.CopyPartResult.ETag,
 	}, nil
 }
 

core/backend_test.go

@@ -18,13 +18,13 @@ package core
 
 type TestBackend struct {
 	StorageBackend
-	ListBlobsFunc func(param *ListBlobsInput) (*ListBlobsOutput, error)
-	HeadBlobFunc func(param *HeadBlobInput) (*HeadBlobOutput, error)
-	MultipartBlobAddFunc func(param *MultipartBlobAddInput) (*MultipartBlobAddOutput, error)
-	MultipartBlobCopyFunc func(param *MultipartBlobCopyInput) (*MultipartBlobCopyOutput, error)
+	ListBlobsFunc           func(param *ListBlobsInput) (*ListBlobsOutput, error)
+	HeadBlobFunc            func(param *HeadBlobInput) (*HeadBlobOutput, error)
+	MultipartBlobAddFunc    func(param *MultipartBlobAddInput) (*MultipartBlobAddOutput, error)
+	MultipartBlobCopyFunc   func(param *MultipartBlobCopyInput) (*MultipartBlobCopyOutput, error)
 	MultipartBlobCommitFunc func(param *MultipartBlobCommitInput) (*MultipartBlobCommitOutput, error)
-	capabilities *Capabilities
-	err error
+	capabilities            *Capabilities
+	err                     error
 }
 
 func (s *TestBackend) Init(bucket string) error {

core/buffer_list.go

@@ -78,8 +78,8 @@ type BufferList struct {
 
 type FileBuffer struct {
 	queueId uint64
-	offset uint64
-	length uint64
+	offset  uint64
+	length  uint64
 	// Chunk state: 1 = clean. 2 = dirty. 3 = part flushed, but not finalized
 	// 4 = flushed, not finalized, but removed from memory
 	state BufferState
@@ -194,15 +194,15 @@ func (l *BufferList) EvictFromMemory(buf *FileBuffer) (allocated int64, deleted
 			prev.onDisk == buf.onDisk {
 			l.unqueue(buf)
 			l.unqueue(prev)
-			l.at.Delete(prev.offset+prev.length)
+			l.at.Delete(prev.offset + prev.length)
 			buf.length += prev.length
 			buf.offset = prev.offset
 			l.queue(buf)
 			deleted = true
 		}
 	} else if buf.state == BUF_CLEAN {
 		l.unqueue(buf)
-		l.at.Delete(buf.offset+buf.length)
+		l.at.Delete(buf.offset + buf.length)
 		deleted = true
 	} else if buf.state == BUF_FLUSHED_FULL {
 		// A flushed buffer can be removed at a cost of finalizing multipart upload
@@ -220,7 +220,7 @@ func (l *BufferList) EvictFromMemory(buf *FileBuffer) (allocated int64, deleted
 		})
 		if prev != nil && prev.offset+prev.length == buf.offset && prev.state == buf.state {
 			l.unqueue(prev)
-			l.at.Delete(prev.offset+prev.length)
+			l.at.Delete(prev.offset + prev.length)
 			buf.length += prev.length
 			buf.offset = prev.offset
 			deleted = true
@@ -259,7 +259,7 @@ func (l *BufferList) unqueue(b *FileBuffer) {
 	}
 	if b.state == BUF_DIRTY {
 		sp := l.helpers.PartNum(b.offset)
-		ep := l.helpers.PartNum(b.offset+b.length-1)
+		ep := l.helpers.PartNum(b.offset + b.length - 1)
 		for i := sp; i < ep+1; i++ {
 			p := l.dirtyParts[i]
 			if p == nil || p.refcnt == 0 {
@@ -303,7 +303,7 @@ func (l *BufferList) queue(b *FileBuffer) {
 			l.dirtyParts = make(map[uint64]*dirtyPart)
 		}
 		sp := l.helpers.PartNum(b.offset)
-		ep := l.helpers.PartNum(b.offset+b.length-1)
+		ep := l.helpers.PartNum(b.offset + b.length - 1)
 		for i := sp; i <= ep; i++ {
 			l.referenceDirtyPart(i)
 		}
@@ -324,8 +324,8 @@ func (l *BufferList) requeueSplit(left *FileBuffer) {
 			l.dirtyParts = make(map[uint64]*dirtyPart)
 		}
 		// most refcounts don't change - except if splitting not at part boundary
-		lbound := l.helpers.PartNum(left.offset+left.length-1)
-		rbound := l.helpers.PartNum(left.offset+left.length)
+		lbound := l.helpers.PartNum(left.offset + left.length - 1)
+		rbound := l.helpers.PartNum(left.offset + left.length)
 		if lbound == rbound {
 			l.referenceDirtyPart(lbound)
 		}
@@ -377,7 +377,7 @@ func (l *BufferList) delete(b *FileBuffer) (allocated int64) {
 		b.ptr = nil
 		b.data = nil
 	}
-	l.at.Delete(b.offset+b.length)
+	l.at.Delete(b.offset + b.length)
 	l.unqueue(b)
 	return
 }
@@ -801,14 +801,14 @@ func mergeRA(rr []Range, readAhead uint64, readMerge uint64) []Range {
 			rr[prev].End = rr[i].End
 		} else {
 			prev++
-			sz := rr[i].End-rr[i].Start
+			sz := rr[i].End - rr[i].Start
 			if sz < readAhead {
 				sz = readAhead
 			}
-			rr[prev] = Range{Start: rr[i].Start, End: rr[i].Start+sz}
+			rr[prev] = Range{Start: rr[i].Start, End: rr[i].Start + sz}
 		}
 	}
-	return rr[0:prev+1]
+	return rr[0 : prev+1]
 }
 
 func splitRA(rr []Range, maxPart uint64) []Range {
@@ -821,7 +821,7 @@ func splitRA(rr []Range, maxPart uint64) []Range {
 				split = true
 			}
 			for off := rr[i].Start; off < rr[i].End; off += maxPart {
-				res = append(res, Range{Start: off, End: off+maxPart})
+				res = append(res, Range{Start: off, End: off + maxPart})
 			}
 			res[len(res)-1].End = rr[i].End
 		} else if split {

core/buffer_list_test.go

@@ -119,7 +119,7 @@ func (s *BufferListTest) TestGetHolesEvicted(t *C) {
 	t.Assert(flcl, Equals, true)
 	// Now check previous part - it should have a hole, but no FL_CLEARED
 	holes, loading, flcl = l.GetHoles(5*1024, 5*1024)
-	t.Assert(holes, DeepEquals, []Range{{8*1024, 10*1024}})
+	t.Assert(holes, DeepEquals, []Range{{8 * 1024, 10 * 1024}})
 	t.Assert(loading, Equals, false)
 	t.Assert(flcl, Equals, false)
 }
@@ -162,7 +162,7 @@ func (s *BufferListTest) TestSplitDirtyQueue(t *C) {
 	// Now check dirty list - it should be empty
 	// With incorrect refcounting it would either be non-empty or the code would panic()
 	numDirty := 0
-	l.IterateDirtyParts(func(partNum uint64) bool { numDirty++; return true; })
+	l.IterateDirtyParts(func(partNum uint64) bool { numDirty++; return true })
 	t.Assert(numDirty, Equals, 0)
 }