feat: support return RedundancyType #16
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
flywukong
force-pushed
the
dev-redundancy
branch
2 times, most recently
from
f22f523
to
0260e3b
Compare
flywukong
changed the title
flywukong
force-pushed
the
dev-redundancy
branch
2 times, most recently
from
878f529
to
437af93
Compare
forcodedancing
approved these changes
Mar 27, 2023
sysvm
reviewed
Mar 27, 2023
go/hash/hash.go
Outdated
| } | ||
|
|
||
| // ComputerHashFromFile open a local file and compute hash result and size | ||
| func ComputerHashFromFile(filePath string, segmentSize int64, dataShards, parityShards int) ([][]byte, int64, error) { | ||
| func ComputerHashFromFile(filePath string, segmentSize int64, dataShards, parityShards int) ([][]byte, int64, storageTypes.RedundancyType, error) { | ||
| f, err := os.Open(filePath) | ||
| if err != nil { | ||
| log.Error().Msg("open file fail:" + err.Error()) |
sysvm
reviewed
Mar 27, 2023
go/hash/hash_test.go
Outdated
| @@ -24,25 +25,28 @@ func TestHash(t *testing.T) { | |||
| contentToHash := createTestData(length) | |||
| start := time.Now() | |||
|
|
|||
| hashResult, size, err := ComputeIntegrityHash(contentToHash, int64(segmentSize), redundancy.DataBlocks, redundancy.ParityBlocks) | |||
| hashResult, size, redundnacyType, err := ComputeIntegrityHash(contentToHash, int64(segmentSize), redundancy.DataBlocks, redundancy.ParityBlocks) | |||
There was a problem hiding this comment.
fix redundnacyType to redundancyType
sysvm
reviewed
Mar 27, 2023
go/hash/hash_test.go
Outdated
| if err != nil { | ||
| t.Errorf(err.Error()) | ||
| } | ||
| fmt.Println("hash cost time:", time.Since(start).Milliseconds(), "ms") | ||
| if size != length { | ||
| t.Errorf("compute size error") | ||
| } | ||
| if redundnacyType != types.REDUNDANCY_EC_TYPE { |
flywukong
force-pushed
the
dev-redundancy
branch
from
9ed1461
to
c6369a4
Compare
sysvm
reviewed
Mar 27, 2023
go/hash/hash.go
Outdated
| f, err := os.Open(filePath) | ||
| if err != nil { | ||
| log.Error().Msg("open file fail:" + err.Error()) | ||
| return nil, 0, err | ||
| log.Error().Msg("failed open file:" + err.Error()) |
sysvm
reviewed
Mar 27, 2023
go/hash/hash.go
Outdated
| @@ -30,7 +32,7 @@ func ComputeIntegrityHash(reader io.Reader, segmentSize int64, dataShards, parit | |||
| if err != nil { | |||
| if err != io.EOF { | |||
| log.Error().Msg("content read failed:" + err.Error()) | |||
flywukong
force-pushed
the
dev-redundancy
branch
from
d31e674
to
a113b16
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
support return RedundancyType in computing hash function
Rationale
createObject need to pass the right RedundancyType with this function
Example
NA
Changes
Notable changes: