Skip to content

Commit 7e59db9

Browse files
authored
Fix Split function with 0 erasure (#234)
Fixes #232
1 parent 6580cd4 commit 7e59db9

File tree

4 files changed

+34
-6
lines changed

4 files changed

+34
-6
lines changed

leopard.go

+6-2
Original file line numberDiff line numberDiff line change
@@ -272,6 +272,9 @@ func (r *leopardFF16) Split(data []byte) ([][]byte, error) {
272272
if len(data) == 0 {
273273
return nil, ErrShortData
274274
}
275+
if r.totalShards == 1 && len(data)&63 == 0 {
276+
return [][]byte{data}, nil
277+
}
275278
dataLen := len(data)
276279
// Calculate number of bytes per data shard.
277280
perShard := (len(data) + r.dataShards - 1) / r.dataShards
@@ -295,8 +298,9 @@ func (r *leopardFF16) Split(data []byte) ([][]byte, error) {
295298
copyFrom = copyFrom[copy(padding[i], copyFrom):]
296299
}
297300
} else {
298-
for i := dataLen; i < dataLen+r.dataShards; i++ {
299-
data[i] = 0
301+
zero := data[dataLen : r.totalShards*perShard]
302+
for i := range zero {
303+
zero[i] = 0
300304
}
301305
}
302306

leopard8.go

+7-2
Original file line numberDiff line numberDiff line change
@@ -312,6 +312,10 @@ func (r *leopardFF8) Split(data []byte) ([][]byte, error) {
312312
if len(data) == 0 {
313313
return nil, ErrShortData
314314
}
315+
if r.totalShards == 1 && len(data)&63 == 0 {
316+
return [][]byte{data}, nil
317+
}
318+
315319
dataLen := len(data)
316320
// Calculate number of bytes per data shard.
317321
perShard := (len(data) + r.dataShards - 1) / r.dataShards
@@ -335,8 +339,9 @@ func (r *leopardFF8) Split(data []byte) ([][]byte, error) {
335339
copyFrom = copyFrom[copy(padding[i], copyFrom):]
336340
}
337341
} else {
338-
for i := dataLen; i < dataLen+r.dataShards; i++ {
339-
data[i] = 0
342+
zero := data[dataLen : r.totalShards*perShard]
343+
for i := range zero {
344+
zero[i] = 0
340345
}
341346
}
342347

reedsolomon.go

+7-2
Original file line numberDiff line numberDiff line change
@@ -1551,6 +1551,10 @@ func (r *reedSolomon) Split(data []byte) ([][]byte, error) {
15511551
if len(data) == 0 {
15521552
return nil, ErrShortData
15531553
}
1554+
if r.totalShards == 1 {
1555+
return [][]byte{data}, nil
1556+
}
1557+
15541558
dataLen := len(data)
15551559
// Calculate number of bytes per data shard.
15561560
perShard := (len(data) + r.dataShards - 1) / r.dataShards
@@ -1574,8 +1578,9 @@ func (r *reedSolomon) Split(data []byte) ([][]byte, error) {
15741578
}
15751579
data = data[0 : perShard*fullShards]
15761580
} else {
1577-
for i := dataLen; i < dataLen+r.dataShards; i++ {
1578-
data[i] = 0
1581+
zero := data[dataLen : r.totalShards*perShard]
1582+
for i := range zero {
1583+
zero[i] = 0
15791584
}
15801585
}
15811586

reedsolomon_test.go

+14
Original file line numberDiff line numberDiff line change
@@ -1950,6 +1950,20 @@ func TestNew(t *testing.T) {
19501950
}
19511951
}
19521952

1953+
func TestSplitZero(t *testing.T) {
1954+
data := make([]byte, 512)
1955+
for _, opts := range testOpts() {
1956+
ecctest, err := New(1, 0, opts...)
1957+
if err != nil {
1958+
t.Fatal(err)
1959+
}
1960+
_, err = ecctest.Split(data)
1961+
if err != nil {
1962+
t.Fatal(err)
1963+
}
1964+
}
1965+
}
1966+
19531967
// Benchmark 10 data shards and 4 parity shards and 160MB data.
19541968
func BenchmarkSplit10x4x160M(b *testing.B) {
19551969
benchmarkSplit(b, 10, 4, 160*1024*1024)

0 commit comments

Comments
 (0)