Skip to content

Commit

Permalink
Feature/code spec (#336)
Browse files Browse the repository at this point in the history 
* Modify the code according to https://github.com/uber-go/guide/blob/master/style.md

Signed-off-by: santong <[email protected]>
Signed-off-by: Gaius <[email protected]>
  • Loading branch information
@244372610 @gaius-qi
244372610 authored and gaius-qi committed Jun 28, 2023
1 parent 5b9c303 commit 6cce5a9
Show file tree
Hide file tree
Showing 172 changed files with 675 additions and 718 deletions.
8 changes: 4 additions & 4 deletions cdnsystem/daemon/cdn/cache_data_mgr.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"d7y.io/dragonfly/v2/cdnsystem/daemon/cdn/storage"
"d7y.io/dragonfly/v2/cdnsystem/storedriver"
"d7y.io/dragonfly/v2/cdnsystem/types"
logger "d7y.io/dragonfly/v2/pkg/dflog"
logger "d7y.io/dragonfly/v2/internal/dflog"
"d7y.io/dragonfly/v2/pkg/synclock"
"d7y.io/dragonfly/v2/pkg/util/digestutils"
"d7y.io/dragonfly/v2/pkg/util/stringutils"
Expand Down Expand Up @@ -60,7 +60,7 @@ func (mm *cacheDataManager) writeFileMetaDataByTask(task *types.SeedTask) (*stor
}

if err := mm.storage.WriteFileMetaData(task.TaskID, metaData); err != nil {
return nil, errors.Wrapf(err, "failed to write file metadata to storage")
return nil, errors.Wrapf(err, "write task %s metadata file", task.TaskID)
}

return metaData, nil
Expand Down Expand Up @@ -170,7 +170,7 @@ func (mm *cacheDataManager) readPieceMetaRecords(taskID string) ([]*storage.Piec
func (mm *cacheDataManager) getPieceMd5Sign(taskID string) (string, []*storage.PieceMetaRecord, error) {
pieceMetaRecords, err := mm.storage.ReadPieceMetaRecords(taskID)
if err != nil {
return "", nil, errors.Wrapf(err, "failed to read piece meta file")
return "", nil, errors.Wrapf(err, "read piece meta file")
}
var pieceMd5 []string
sort.Slice(pieceMetaRecords, func(i, j int) bool {
Expand All @@ -185,7 +185,7 @@ func (mm *cacheDataManager) getPieceMd5Sign(taskID string) (string, []*storage.P
func (mm *cacheDataManager) readFileMetaData(taskID string) (*storage.FileMetaData, error) {
fileMeta, err := mm.storage.ReadFileMetaData(taskID)
if err != nil {
return nil, errors.Wrapf(err, "failed to read file metadata from storage")
return nil, errors.Wrapf(err, "read file metadata of task %s from storage", taskID)
}
return fileMeta, nil
}
Expand Down
16 changes: 8 additions & 8 deletions cdnsystem/daemon/cdn/cache_detector.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (
"d7y.io/dragonfly/v2/cdnsystem/daemon/cdn/storage"
cdnerrors "d7y.io/dragonfly/v2/cdnsystem/errors"
"d7y.io/dragonfly/v2/cdnsystem/types"
logger "d7y.io/dragonfly/v2/pkg/dflog"
logger "d7y.io/dragonfly/v2/internal/dflog"
"d7y.io/dragonfly/v2/pkg/source"
"d7y.io/dragonfly/v2/pkg/util/digestutils"
"d7y.io/dragonfly/v2/pkg/util/stringutils"
Expand Down Expand Up @@ -86,7 +86,7 @@ func (cd *cacheDetector) detectCache(task *types.SeedTask, fileMd5 hash.Hash) (*
func (cd *cacheDetector) doDetect(task *types.SeedTask, fileMd5 hash.Hash) (result *cacheResult, err error) {
fileMetaData, err := cd.cacheDataManager.readFileMetaData(task.TaskID)
if err != nil {
return nil, errors.Wrapf(err, "failed to read file meta data")
return nil, errors.Wrapf(err, "read file meta data of task %s", task.TaskID)
}
if err := checkSameFile(task, fileMetaData); err != nil {
return nil, errors.Wrapf(err, "task does not match meta information of task file")
Expand Down Expand Up @@ -114,7 +114,7 @@ func (cd *cacheDetector) doDetect(task *types.SeedTask, fileMd5 hash.Hash) (resu
defer rangeCancel()
supportRange, err := source.IsSupportRange(ctx, task.URL, task.Header)
if err != nil {
return nil, errors.Wrapf(err, "failed to check if url(%s) supports range request", task.URL)
return nil, errors.Wrapf(err, "check if url(%s) supports range request", task.URL)
}
if !supportRange {
return nil, errors.Wrapf(cdnerrors.ErrResourceNotSupportRangeRequest, "url:%s", task.URL)
Expand All @@ -129,15 +129,15 @@ func (cd *cacheDetector) parseByReadMetaFile(taskID string, fileMetaData *storag
}
pieceMetaRecords, err := cd.cacheDataManager.readAndCheckPieceMetaRecords(taskID, fileMetaData.PieceMd5Sign)
if err != nil {
return nil, errors.Wrapf(err, "failed to check piece meta integrity")
return nil, errors.Wrapf(err, "check piece meta integrity")
}
if fileMetaData.TotalPieceCount > 0 && len(pieceMetaRecords) != int(fileMetaData.TotalPieceCount) {
return nil, errors.Wrapf(cdnerrors.ErrPieceCountNotEqual, "piece file piece count(%d), "+
"meta file piece count(%d)", len(pieceMetaRecords), fileMetaData.TotalPieceCount)
}
storageInfo, err := cd.cacheDataManager.statDownloadFile(taskID)
if err != nil {
return nil, errors.Wrapf(err, "failed to get cdn file length")
return nil, errors.Wrapf(err, "get cdn file length")
}
// check file data integrity by file size
if fileMetaData.CdnFileLength != storageInfo.Size {
Expand All @@ -155,12 +155,12 @@ func (cd *cacheDetector) parseByReadMetaFile(taskID string, fileMetaData *storag
func (cd *cacheDetector) parseByReadFile(taskID string, metaData *storage.FileMetaData, fileMd5 hash.Hash) (*cacheResult, error) {
reader, err := cd.cacheDataManager.readDownloadFile(taskID)
if err != nil {
return nil, errors.Wrapf(err, "failed to read data file")
return nil, errors.Wrapf(err, "read data file")
}
defer reader.Close()
tempRecords, err := cd.cacheDataManager.readPieceMetaRecords(taskID)
if err != nil {
return nil, errors.Wrapf(err, "parseByReadFile:failed to read piece meta file")
return nil, errors.Wrapf(err, "read piece meta file")
}

// sort piece meta records by pieceNum
Expand All @@ -169,7 +169,7 @@ func (cd *cacheDetector) parseByReadFile(taskID string, metaData *storage.FileMe
})

var breakPoint uint64 = 0
pieceMetaRecords := make([]*storage.PieceMetaRecord, 0, 0)
pieceMetaRecords := make([]*storage.PieceMetaRecord, 0, len(tempRecords))
for index := range tempRecords {
if int32(index) != tempRecords[index].PieceNum {
break
Expand Down
2 changes: 1 addition & 1 deletion cdnsystem/daemon/cdn/cache_writer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"d7y.io/dragonfly/v2/cdnsystem/config"
"d7y.io/dragonfly/v2/cdnsystem/daemon/cdn/storage"
"d7y.io/dragonfly/v2/cdnsystem/types"
logger "d7y.io/dragonfly/v2/pkg/dflog"
logger "d7y.io/dragonfly/v2/internal/dflog"
"d7y.io/dragonfly/v2/pkg/util/digestutils"
"d7y.io/dragonfly/v2/pkg/util/rangeutils"
)
Expand Down
2 changes: 1 addition & 1 deletion cdnsystem/daemon/cdn/downloader.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"io"

"d7y.io/dragonfly/v2/cdnsystem/types"
logger "d7y.io/dragonfly/v2/pkg/dflog"
logger "d7y.io/dragonfly/v2/internal/dflog"
"d7y.io/dragonfly/v2/pkg/source"
"d7y.io/dragonfly/v2/pkg/structure/maputils"
"d7y.io/dragonfly/v2/pkg/util/rangeutils"
Expand Down
4 changes: 2 additions & 2 deletions cdnsystem/daemon/cdn/manager.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@ import (
"d7y.io/dragonfly/v2/cdnsystem/daemon"
_ "d7y.io/dragonfly/v2/cdnsystem/daemon/cdn/storage/disk" // To register diskStorage
_ "d7y.io/dragonfly/v2/cdnsystem/daemon/cdn/storage/hybrid" // To register hybridStorage
"d7y.io/dragonfly/v2/pkg/rpc/cdnsystem/server"
"d7y.io/dragonfly/v2/internal/rpc/cdnsystem/server"
"d7y.io/dragonfly/v2/pkg/synclock"
"d7y.io/dragonfly/v2/pkg/util/timeutils"

"d7y.io/dragonfly/v2/cdnsystem/config"
"d7y.io/dragonfly/v2/cdnsystem/daemon/cdn/storage"
"d7y.io/dragonfly/v2/cdnsystem/types"
logger "d7y.io/dragonfly/v2/pkg/dflog"
logger "d7y.io/dragonfly/v2/internal/dflog"
"d7y.io/dragonfly/v2/pkg/ratelimiter/limitreader"
"d7y.io/dragonfly/v2/pkg/ratelimiter/ratelimiter"
"d7y.io/dragonfly/v2/pkg/util/stringutils"
Expand Down
4 changes: 2 additions & 2 deletions cdnsystem/daemon/cdn/manager_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ import (
"d7y.io/dragonfly/v2/cdnsystem/daemon/mock"
"d7y.io/dragonfly/v2/cdnsystem/plugins"
"d7y.io/dragonfly/v2/cdnsystem/types"
"d7y.io/dragonfly/v2/pkg/idgen"
"d7y.io/dragonfly/v2/pkg/rpc/base"
"d7y.io/dragonfly/v2/internal/idgen"
"d7y.io/dragonfly/v2/internal/rpc/base"
"d7y.io/dragonfly/v2/pkg/source"
sourceMock "d7y.io/dragonfly/v2/pkg/source/mock"
"d7y.io/dragonfly/v2/pkg/util/net/urlutils"
Expand Down
4 changes: 2 additions & 2 deletions cdnsystem/daemon/cdn/reporter.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"d7y.io/dragonfly/v2/cdnsystem/daemon"
"d7y.io/dragonfly/v2/cdnsystem/daemon/cdn/storage"
"d7y.io/dragonfly/v2/cdnsystem/types"
logger "d7y.io/dragonfly/v2/pkg/dflog"
logger "d7y.io/dragonfly/v2/internal/dflog"
"github.com/pkg/errors"
"go.uber.org/zap"
)
Expand All @@ -46,7 +46,7 @@ func (re *reporter) reportCache(taskID string, detectResult *cacheResult) error
if detectResult != nil && detectResult.pieceMetaRecords != nil {
for _, record := range detectResult.pieceMetaRecords {
if err := re.reportPieceMetaRecord(taskID, record, CacheReport); err != nil {
return errors.Wrapf(err, "failed to publish pieceMetaRecord:%v, seedPiece:%v", record,
return errors.Wrapf(err, "publish pieceMetaRecord:%v, seedPiece:%v", record,
convertPieceMeta2SeedPiece(record))
}
}
Expand Down
12 changes: 6 additions & 6 deletions cdnsystem/daemon/cdn/storage/disk/disk.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
"d7y.io/dragonfly/v2/cdnsystem/storedriver"
"d7y.io/dragonfly/v2/cdnsystem/storedriver/local"
"d7y.io/dragonfly/v2/cdnsystem/types"
logger "d7y.io/dragonfly/v2/pkg/dflog"
logger "d7y.io/dragonfly/v2/internal/dflog"
"d7y.io/dragonfly/v2/pkg/synclock"
"d7y.io/dragonfly/v2/pkg/unit"
"d7y.io/dragonfly/v2/pkg/util/fileutils"
Expand Down Expand Up @@ -110,11 +110,11 @@ func (s *diskStorageMgr) ReadPieceMetaRecords(taskID string) ([]*storage.PieceMe
return nil, err
}
pieceMetaRecords := strings.Split(strings.TrimSpace(string(readBytes)), "\n")
var result = make([]*storage.PieceMetaRecord, 0)
var result = make([]*storage.PieceMetaRecord, 0, len(pieceMetaRecords))
for _, pieceStr := range pieceMetaRecords {
record, err := storage.ParsePieceMetaRecord(pieceStr)
if err != nil {
return nil, errors.Wrapf(err, "failed to get piece meta record: %v", pieceStr)
return nil, errors.Wrapf(err, "get piece meta record: %v", pieceStr)
}
result = append(result, record)
}
Expand Down Expand Up @@ -160,20 +160,20 @@ func (s *diskStorageMgr) WriteDownloadFile(taskID string, offset int64, len int6
func (s *diskStorageMgr) ReadFileMetaData(taskID string) (*storage.FileMetaData, error) {
bytes, err := s.diskDriver.GetBytes(storage.GetTaskMetaDataRaw(taskID))
if err != nil {
return nil, errors.Wrapf(err, "failed to get metadata bytes")
return nil, errors.Wrapf(err, "get metadata bytes")
}

metaData := &storage.FileMetaData{}
if err := json.Unmarshal(bytes, metaData); err != nil {
return nil, errors.Wrapf(err, "failed to unmarshal metadata bytes")
return nil, errors.Wrapf(err, "unmarshal metadata bytes")
}
return metaData, nil
}

func (s *diskStorageMgr) WriteFileMetaData(taskID string, metaData *storage.FileMetaData) error {
data, err := json.Marshal(metaData)
if err != nil {
return errors.Wrapf(err, "failed to marshal metadata")
return errors.Wrapf(err, "marshal metadata")
}
return s.diskDriver.PutBytes(storage.GetTaskMetaDataRaw(taskID), data)
}
Expand Down
12 changes: 6 additions & 6 deletions cdnsystem/daemon/cdn/storage/hybrid/hybrid.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import (
"d7y.io/dragonfly/v2/cdnsystem/storedriver"
"d7y.io/dragonfly/v2/cdnsystem/storedriver/local"
"d7y.io/dragonfly/v2/cdnsystem/types"
logger "d7y.io/dragonfly/v2/pkg/dflog"
logger "d7y.io/dragonfly/v2/internal/dflog"
"d7y.io/dragonfly/v2/pkg/synclock"
"d7y.io/dragonfly/v2/pkg/unit"
"d7y.io/dragonfly/v2/pkg/util/fileutils"
Expand Down Expand Up @@ -224,11 +224,11 @@ func (h *hybridStorageMgr) ReadPieceMetaRecords(taskID string) ([]*storage.Piece
return nil, err
}
pieceMetaRecords := strings.Split(strings.TrimSpace(string(readBytes)), "\n")
var result = make([]*storage.PieceMetaRecord, 0)
var result = make([]*storage.PieceMetaRecord, 0, len(pieceMetaRecords))
for _, pieceStr := range pieceMetaRecords {
record, err := storage.ParsePieceMetaRecord(pieceStr)
if err != nil {
return nil, errors.Wrapf(err, "failed to get piece meta record:%v", pieceStr)
return nil, errors.Wrapf(err, "get piece meta record:%v", pieceStr)
}
result = append(result, record)
}
Expand All @@ -238,12 +238,12 @@ func (h *hybridStorageMgr) ReadPieceMetaRecords(taskID string) ([]*storage.Piece
func (h *hybridStorageMgr) ReadFileMetaData(taskID string) (*storage.FileMetaData, error) {
readBytes, err := h.diskDriver.GetBytes(storage.GetTaskMetaDataRaw(taskID))
if err != nil {
return nil, errors.Wrapf(err, "failed to get metadata bytes")
return nil, errors.Wrapf(err, "get metadata bytes")
}

metaData := &storage.FileMetaData{}
if err := json.Unmarshal(readBytes, metaData); err != nil {
return nil, errors.Wrapf(err, "failed to unmarshal metadata bytes")
return nil, errors.Wrapf(err, "unmarshal metadata bytes")
}
return metaData, nil
}
Expand All @@ -255,7 +255,7 @@ func (h *hybridStorageMgr) AppendPieceMetaData(taskID string, record *storage.Pi
func (h *hybridStorageMgr) WriteFileMetaData(taskID string, metaData *storage.FileMetaData) error {
data, err := json.Marshal(metaData)
if err != nil {
return errors.Wrapf(err, "failed to marshal metadata")
return errors.Wrapf(err, "marshal metadata")
}
return h.diskDriver.PutBytes(storage.GetTaskMetaDataRaw(taskID), data)
}
Expand Down
2 changes: 1 addition & 1 deletion cdnsystem/daemon/cdn/storage/hybrid/shm_switch.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package hybrid
import (
"regexp"

logger "d7y.io/dragonfly/v2/pkg/dflog"
logger "d7y.io/dragonfly/v2/internal/dflog"
"go.uber.org/atomic"
)

Expand Down
6 changes: 3 additions & 3 deletions cdnsystem/daemon/cdn/storage/storage_gc.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,18 @@
package storage

import (
"fmt"
"os"
"strings"
"time"

"d7y.io/dragonfly/v2/cdnsystem/daemon"
cdnerrors "d7y.io/dragonfly/v2/cdnsystem/errors"
"d7y.io/dragonfly/v2/cdnsystem/storedriver"
logger "d7y.io/dragonfly/v2/pkg/dflog"
logger "d7y.io/dragonfly/v2/internal/dflog"
"d7y.io/dragonfly/v2/pkg/util/timeutils"
"github.com/emirpasic/gods/maps/treemap"
godsutils "github.com/emirpasic/gods/utils"
"github.com/pkg/errors"
)

type Cleaner struct {
Expand Down Expand Up @@ -57,7 +57,7 @@ func (cleaner *Cleaner) GC(storagePattern string, force bool) ([]string, error)
}
freeSpace, _ = cleaner.driver.GetAvailSpace()
} else {
return nil, errors.Wrapf(err, "failed to get avail space")
return nil, fmt.Errorf("get available space: %v", err)
}
}
fullGC := force
Expand Down
6 changes: 3 additions & 3 deletions cdnsystem/daemon/cdn/storage/storage_mgr.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -233,11 +233,11 @@ func Register(name string, builder ManagerBuilder) error {
Result: cfg,
})
if err != nil {
return nil, fmt.Errorf("failed to create decoder: %v", err)
return nil, fmt.Errorf("create decoder: %v", err)
}
err = decoder.Decode(conf)
if err != nil {
return nil, fmt.Errorf("failed to parse config: %v", err)
return nil, fmt.Errorf("parse config: %v", err)
}
return newManagerPlugin(name, builder, cfg)
}
Expand All @@ -251,7 +251,7 @@ func newManagerPlugin(name string, builder ManagerBuilder, cfg *Config) (plugins

instant, err := builder(cfg)
if err != nil {
return nil, fmt.Errorf("failed to init storage manager %s: %v", name, err)
return nil, fmt.Errorf("init storage manager %s: %v", name, err)
}

return &managerPlugin{
Expand Down
2 changes: 1 addition & 1 deletion cdnsystem/daemon/gc/manager.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"sync"
"time"

logger "d7y.io/dragonfly/v2/pkg/dflog"
logger "d7y.io/dragonfly/v2/internal/dflog"
)

type Executor interface {
Expand Down
Loading

0 comments on commit 6cce5a9

Please sign in to comment.