projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '16535-s3'
[arvados.git]
/
sdk
/
go
/
arvados
/
fs_collection.go
diff --git
a/sdk/go/arvados/fs_collection.go
b/sdk/go/arvados/fs_collection.go
index 0edc48162b1a031b8487ac9b38997c0a4b6f3f4d..060b57b493cbf555d4d87d9b71db4f6171ff85b8 100644
(file)
--- a/
sdk/go/arvados/fs_collection.go
+++ b/
sdk/go/arvados/fs_collection.go
@@
-568,8
+568,6
@@
func (fn *filenode) Write(p []byte, startPtr filenodePtr) (n int, ptr filenodePt
seg.Truncate(len(cando))
fn.memsize += int64(len(cando))
fn.segments[cur] = seg
seg.Truncate(len(cando))
fn.memsize += int64(len(cando))
fn.segments[cur] = seg
- cur++
- prev++
}
}
}
}
@@
-1109,9
+1107,9
@@
func (dn *dirnode) loadManifest(txt string) error {
// situation might be rare anyway)
segIdx, pos = 0, 0
}
// situation might be rare anyway)
segIdx, pos = 0, 0
}
- for
next := int64(0)
; segIdx < len(segments); segIdx++ {
+ for ; segIdx < len(segments); segIdx++ {
seg := segments[segIdx]
seg := segments[segIdx]
- next = pos + int64(seg.Len())
+ next
:
= pos + int64(seg.Len())
if next <= offset || seg.Len() == 0 {
pos = next
continue
if next <= offset || seg.Len() == 0 {
pos = next
continue