From 6a92f0bc7a2cbf0828c720422220b600263b5217 Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Tue, 18 Aug 2020 17:04:28 -0700 Subject: refactoring to typed Size Go is amazing with refactoring! --- weed/storage/erasure_coding/ec_decoder.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'weed/storage/erasure_coding/ec_decoder.go') diff --git a/weed/storage/erasure_coding/ec_decoder.go b/weed/storage/erasure_coding/ec_decoder.go index 99bcb6ca5..6793faca5 100644 --- a/weed/storage/erasure_coding/ec_decoder.go +++ b/weed/storage/erasure_coding/ec_decoder.go @@ -52,7 +52,7 @@ func FindDatFileSize(baseFileName string) (datSize int64, err error) { return 0, fmt.Errorf("read ec volume %s version: %v", baseFileName, err) } - err = iterateEcxFile(baseFileName, func(key types.NeedleId, offset types.Offset, size uint32) error { + err = iterateEcxFile(baseFileName, func(key types.NeedleId, offset types.Offset, size types.Size) error { if size == types.TombstoneFileSize { return nil @@ -88,7 +88,7 @@ func readEcVolumeVersion(baseFileName string) (version needle.Version, err error } -func iterateEcxFile(baseFileName string, processNeedleFn func(key types.NeedleId, offset types.Offset, size uint32) error) error { +func iterateEcxFile(baseFileName string, processNeedleFn func(key types.NeedleId, offset types.Offset, size types.Size) error) error { ecxFile, openErr := os.OpenFile(baseFileName+".ecx", os.O_RDONLY, 0644) if openErr != nil { return fmt.Errorf("cannot open ec index %s.ecx: %v", baseFileName, openErr) -- cgit v1.2.3 From c026eb05921b180cad0b529634ff4c891cb5b61f Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Tue, 18 Aug 2020 17:39:29 -0700 Subject: refactoring --- weed/storage/erasure_coding/ec_decoder.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'weed/storage/erasure_coding/ec_decoder.go') diff --git a/weed/storage/erasure_coding/ec_decoder.go b/weed/storage/erasure_coding/ec_decoder.go index 6793faca5..795a7d523 100644 --- a/weed/storage/erasure_coding/ec_decoder.go +++ b/weed/storage/erasure_coding/ec_decoder.go @@ -54,7 +54,7 @@ func FindDatFileSize(baseFileName string) (datSize int64, err error) { err = iterateEcxFile(baseFileName, func(key types.NeedleId, offset types.Offset, size types.Size) error { - if size == types.TombstoneFileSize { + if size.IsDeleted() { return nil } -- cgit v1.2.3