Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mybee
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
vicotor
mybee
Commits
0e4333fb
Unverified
Commit
0e4333fb
authored
Mar 10, 2021
by
acud
Committed by
GitHub
Mar 10, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
pipeline: add special case for empty file (#1406)
parent
f954294e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
38 additions
and
2 deletions
+38
-2
builder_test.go
pkg/file/pipeline/builder/builder_test.go
+21
-0
feeder.go
pkg/file/pipeline/feeder/feeder.go
+15
-0
feeder_test.go
pkg/file/pipeline/feeder/feeder_test.go
+2
-2
No files found.
pkg/file/pipeline/builder/builder_test.go
View file @
0e4333fb
...
...
@@ -56,6 +56,27 @@ func TestHelloWorld(t *testing.T) {
}
}
// TestEmpty tests that a hash is generated for an empty file.
func
TestEmpty
(
t
*
testing
.
T
)
{
m
:=
mock
.
NewStorer
()
p
:=
builder
.
NewPipelineBuilder
(
context
.
Background
(),
m
,
storage
.
ModePutUpload
,
false
)
data
:=
[]
byte
{}
_
,
err
:=
p
.
Write
(
data
)
if
err
!=
nil
{
t
.
Fatal
(
err
)
}
sum
,
err
:=
p
.
Sum
()
if
err
!=
nil
{
t
.
Fatal
(
err
)
}
exp
:=
swarm
.
MustParseHexAddress
(
"ffd70157e48063fc33c97a050f7f640233bf646cc98d9524c6b92bcf3ab56f83"
)
if
!
bytes
.
Equal
(
exp
.
Bytes
(),
sum
)
{
t
.
Fatalf
(
"expected %s got %s"
,
exp
.
String
(),
hex
.
EncodeToString
(
sum
))
}
}
func
TestAllVectors
(
t
*
testing
.
T
)
{
for
i
:=
1
;
i
<=
20
;
i
++
{
data
,
expect
:=
test
.
GetVector
(
t
,
i
)
...
...
pkg/file/pipeline/feeder/feeder.go
View file @
0e4333fb
...
...
@@ -18,6 +18,7 @@ type chunkFeeder struct {
next
pipeline
.
ChainWriter
buffer
[]
byte
bufferIdx
int
wrote
int64
}
// newChunkFeederWriter creates a new chunkFeeder that allows for partial
...
...
@@ -83,6 +84,7 @@ func (f *chunkFeeder) Write(b []byte) (int, error) {
w
+=
sp
sp
=
0
}
f
.
wrote
+=
int64
(
w
)
return
w
,
nil
}
...
...
@@ -100,6 +102,19 @@ func (f *chunkFeeder) Sum() ([]byte, error) {
if
err
!=
nil
{
return
nil
,
err
}
f
.
wrote
+=
int64
(
len
(
d
))
}
if
f
.
wrote
==
0
{
// this is an empty file, we should write the span of
// an empty file (0).
d
:=
make
([]
byte
,
span
)
args
:=
&
pipeline
.
PipeWriteArgs
{
Data
:
d
,
Span
:
d
}
err
:=
f
.
next
.
ChainWrite
(
args
)
if
err
!=
nil
{
return
nil
,
err
}
f
.
wrote
+=
int64
(
len
(
d
))
}
return
f
.
next
.
Sum
()
...
...
pkg/file/pipeline/feeder/feeder_test.go
View file @
0e4333fb
...
...
@@ -129,9 +129,9 @@ func TestFeederFlush(t *testing.T) {
span
uint64
// expected span of written data
}{
{
name
:
"empty
writ
e"
,
name
:
"empty
fil
e"
,
dataSize
:
[]
int
{
0
},
expWrites
:
0
,
expWrites
:
1
,
},
{
name
:
"less than chunk, one write"
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment